diff options
Diffstat (limited to 'indra/newview/skins/default')
4884 files changed, 17354 insertions, 6015 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 9bf2922033..a9176595c7 100644..100755 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -1,103 +1,109 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <colors> - <!-- Named Colors --> - <color - name="EmphasisColor" - value="0.38 0.694 0.573 1" /> - <color - name="EmphasisColor_13" - value="0.38 0.694 0.573 0.13" /> - <color - name="EmphasisColor_35" - value="0.38 0.694 0.573 0.35" /> - <color - name="White" - value="1 1 1 1" /> - <color - name="White_05" - value="1 1 1 0.05" /> - <color - name="White_10" - value="1 1 1 0.1" /> - <color - name="White_25" - value="1 1 1 0.25" /> - <color - name="White_50" - value="1 1 1 0.5" /> - <color - name="LtGray" - value="0.75 0.75 0.75 1" /> - <color - name="LtGray_35" - value="0.75 0.75 0.75 0.35" /> - <color - name="LtGray_50" - value="0.75 0.75 0.75 0.50" /> - <color - name="Gray" - value="0.5 0.5 0.5 1" /> - <color - name="DkGray" - value="0.125 0.125 0.125 1" /> - <color - name="DkGray_66" - value="0.125 0.125 0.125 .66" /> - <color - name="DkGray2" - value="0.169 0.169 0.169 1" /> - <color - name="MouseGray" - value="0.191 0.191 0.191 1" /> - <color - name="Black" - value="0 0 0 1" /> - <colork - name="Black_10" - value="0 0 0 0.1" /> - <color - name="Black_25" - value="0 0 0 0.25" /> - <color - name="Black_50" - value="0 0 0 0.5" /> - <color - name="FrogGreen" - value="0.26 0.345 0.263 1" /> - <color - name="Red" - value="1 0 0 1" /> - <color - name="Blue" - value="0 0 1 1" /> - <color - name="Yellow" - value="1 1 0 1" /> - <color - name="Green" - value="0 1 0 1" /> - <color - name="Transparent" - value="0 0 0 0" /> - <color - name="Purple" - value="1 0 1 1" /> - <color - name="Lime" - value=".8 1 .73 1" /> - <color - name="LtYellow" - value="1 1 .79 1" /> - <color - name="DrYellow" - value="1 0.86 0 1" /> - <color - name="LtOrange" - value="1 .85 .73 1" /> - <color - name="MdBlue" - value=".07 .38 .51 1" /> + <!-- Named Colors --> + <color + name="EmphasisColor" + value="0.38 0.694 0.573 1" /> + <color + name="EmphasisColor_13" + value="0.38 0.694 0.573 0.13" /> + <color + name="EmphasisColor_35" + value="0.38 0.694 0.573 0.35" /> + <color + name="BeaconColor" + value="0.749 0.298 0 1" /> + <color + name="White" + value="1 1 1 1" /> + <color + name="White_05" + value="1 1 1 0.05" /> + <color + name="White_10" + value="1 1 1 0.1" /> + <color + name="White_25" + value="1 1 1 0.25" /> + <color + name="White_50" + value="1 1 1 0.5" /> + <color + name="LtGray" + value="0.75 0.75 0.75 1" /> + <color + name="LtGray_35" + value="0.75 0.75 0.75 0.35" /> + <color + name="LtGray_50" + value="0.75 0.75 0.75 0.50" /> + <color + name="Gray" + value="0.5 0.5 0.5 1" /> + <color + name="DkGray" + value="0.125 0.125 0.125 1" /> + <color + name="DkGray_66" + value="0.125 0.125 0.125 .66" /> + <color + name="DkGray2" + value="0.169 0.169 0.169 1" /> + <color + name="MouseGray" + value="0.191 0.191 0.191 1" /> + <color + name="Black" + value="0 0 0 1" /> + <colork + name="Black_10" + value="0 0 0 0.1" /> + <color + name="Black_25" + value="0 0 0 0.25" /> + <color + name="Black_50" + value="0 0 0 0.5" /> + <color + name="FrogGreen" + value="0.26 0.345 0.263 1" /> + <color + name="Red" + value="1 0 0 1" /> + <color + name="Blue" + value="0 0 1 1" /> + <color + name="Yellow" + value="1 1 0 1" /> + <color + name="Green" + value="0 1 0 1" /> + <color + name="Transparent" + value="0 0 0 0" /> + <color + name="Purple" + value="1 0 1 1" /> + <color + name="Lime" + value=".8 1 .73 1" /> + <color + name="LtYellow" + value="1 1 .79 1" /> + <color + name="DrYellow" + value="1 0.86 0 1" /> + <color + name="LtOrange" + value="1 .85 .73 1" /> + <color + name="MdBlue" + value=".07 .38 .51 1" /> + <color + name="DkBlue" + value=".06 .06 .3 1" /> <color name="LtRed" value="1 0.2 0.2 1" /> @@ -108,6 +114,9 @@ name="Red_80" value="1 0 0 0.8" /> <color + name="DkRed" + value="0.3 0.06 0.06 1" /> + <color name="Green_80" value="0 1 0 0.8" /> <color @@ -115,527 +124,530 @@ value="0 0 1 0.8" /> <!-- This color name makes potentially unused colors show up bright purple. - Leave this here until all Unused? are removed below, otherwise - the viewer generates many warnings on startup. --> + Leave this here until all Unused? are removed below, otherwise + the viewer generates many warnings on startup. --> <color - name="Unused?" - value=".831 1 0 1" /> + name="Unused?" + value=".831 1 0 1" /> <!-- UI Definitions --> - <color - name="AccordionHeaderTextColor" - reference="LtGray" /> - <color - name="AgentChatColor" - reference="White" /> - <color - name="AlertBoxColor" - value="0.24 0.24 0.24 1" /> - <color - name="AlertCautionBoxColor" - value="1 0.82 0.46 1" /> - <color - name="AlertCautionTextColor" - reference="LtYellow" /> - <color - name="AvatarListItemIconDefaultColor" - reference="White" /> - <color - name="AvatarListItemIconOnlineColor" - reference="White" /> - <color - name="AvatarListItemIconOfflineColor" - value="0.5 0.5 0.5 0.5" /> - <color - name="AvatarListItemIconVoiceInvitedColor" - reference="AvatarListItemIconOfflineColor" /> - <color - name="AvatarListItemIconVoiceJoinedColor" - reference="AvatarListItemIconOnlineColor" /> - <color - name="AvatarListItemIconVoiceLeftColor" - reference="AvatarListItemIconOfflineColor" /> - <color - name="BadgeImageColor" - value="1.0 0.40 0.0 1.0" /> - <color - name="BadgeBorderColor" - value="0.9 0.9 0.9 1.0" /> - <color - name="BadgeLabelColor" - reference="White" /> - <color - name="ButtonBorderColor" - reference="Unused?" /> - <color - name="ButtonCautionImageColor" - reference="Unused?" /> - <color - name="ButtonColor" - reference="Unused?" /> - <color - name="ButtonFlashBgColor" - reference="Unused?" /> - <color - name="ButtonImageColor" - reference="White" /> - <color - name="ButtonLabelColor" - reference="LtGray" /> - <color - name="ButtonLabelDisabledColor" - reference="White_25" /> - <color - name="ButtonLabelSelectedColor" - reference="White" /> - <color - name="ButtonLabelSelectedDisabledColor" - reference="White_25" /> - <color - name="ButtonSelectedBgColor" - reference="Unused?" /> - <color - name="ButtonSelectedColor" - reference="Unused?" /> - <color - name="ButtonUnselectedBgColor" - reference="Unused?" /> - <color - name="ButtonUnselectedFgColor" - reference="Unused?" /> - <color - name="ChatHistoryBgColor" - reference="Transparent" /> - <color - name="ChatHistoryTextColor" - reference="LtGray" /> - <color - name="ChicletFlashColor" - value="0.114 0.65 0.1" /> - <color - name="ColorDropShadow" - reference="Black_50" /> - <color - name="ColorPaletteEntry01" - reference="Black" /> - <color - name="ColorPaletteEntry02" - reference="Gray" /> - <color - name="ColorPaletteEntry03" - value="0.5 0 0 1" /> - <color - name="ColorPaletteEntry04" - value="0.5 0.5 0 1" /> - <color - name="ColorPaletteEntry05" - value="0 0.5 0 1" /> - <color - name="ColorPaletteEntry06" - value="0 0.5 0.5 1" /> - <color - name="ColorPaletteEntry07" - value="0 0 0.5 1" /> - <color - name="ColorPaletteEntry08" - value="0.5 0 0.5 1" /> - <color - name="ColorPaletteEntry09" - value="0.5 0.5 0 1" /> - <color - name="ColorPaletteEntry10" - value="0 0.25 0.25 1" /> - <color - name="ColorPaletteEntry11" - value="0 0.5 1 1" /> - <color - name="ColorPaletteEntry12" - value="0 0.25 0.5 1" /> - <color - name="ColorPaletteEntry13" - value="0.5 0 1 1" /> - <color - name="ColorPaletteEntry14" - value="0.5 0.25 0 1" /> - <color - name="ColorPaletteEntry15" - reference="White" /> - <color - name="ColorPaletteEntry16" - reference="LtYellow" /> - <color - name="ColorPaletteEntry17" - reference="White" /> - <color - name="ColorPaletteEntry18" - reference="LtGray" /> - <color - name="ColorPaletteEntry19" - reference="Red" /> - <color - name="ColorPaletteEntry20" - reference="Yellow" /> - <color - name="ColorPaletteEntry21" - reference="Green" /> - <color - name="ColorPaletteEntry22" - value="0 1 1 1" /> - <color - name="ColorPaletteEntry23" - reference="Blue" /> - <color - name="ColorPaletteEntry24" - reference="Purple" /> - <color - name="ColorPaletteEntry25" - value="1 1 0.5 1" /> - <color - name="ColorPaletteEntry26" - value="0 1 0.5 1" /> - <color - name="ColorPaletteEntry27" - value="0.5 1 1 1" /> - <color - name="ColorPaletteEntry28" - value="0.5 0.5 1 1" /> - <color - name="ColorPaletteEntry29" - value="1 0 0.5 1" /> - <color - name="ColorPaletteEntry30" - value="1 0.5 0 1" /> - <color - name="ColorPaletteEntry31" - reference="White" /> - <color - name="ColorPaletteEntry32" - reference="White" /> - <color - name="ComboListBgColor" - reference="DkGray" /> - <color - name="ConsoleBackground" - reference="Black" /> - <color - name="ContextSilhouetteColor" - reference="EmphasisColor" /> - <color - name="DefaultHighlightDark" - reference="White_10" /> - <color - name="DefaultHighlightLight" - reference="White_25" /> - <color - name="DefaultShadowDark" - reference="Black_50" /> - <color - name="DefaultShadowLight" - reference="Black_50" /> - <color - name="EffectColor" - reference="White" /> - <color - name="FilterBackgroundColor" - reference="Black" /> - <color - name="FilterTextColor" - value="0.38 0.69 0.57 1" /> - <color - name="FloaterButtonImageColor" - reference="LtGray" /> - <color - name="FloaterDefaultBackgroundColor" - reference="DkGray_66" /> - <color - name="FloaterFocusBackgroundColor" - reference="DkGray2" /> - <color - name="FloaterFocusBorderColor" - reference="Black_50" /> - <color - name="FloaterUnfocusBorderColor" - reference="Black_50" /> - <color - name="FocusColor" - reference="EmphasisColor" /> - <color - name="FolderViewLoadingMessageTextColor" - value="0.3344 0.5456 0.5159 1" /> - <color - name="GridFocusPointColor" - reference="White_50" /> - <color - name="GridlineBGColor" - value="0.92 0.92 1 0.78" /> - <color - name="GridlineColor" - reference="White" /> - <color - name="GridlineShadowColor" - value="0 0 0 0.31" /> - <color - name="GroupNotifyBoxColor" - value="0.3344 0.5456 0.5159 1" /> - <color - name="GroupNotifyTextColor" - reference="White"/> - <color - name="GroupNotifyDimmedTextColor" - reference="LtGray" /> - <color - name="GroupOverTierColor" - value="0.43 0.06 0.06 1" /> - <color - name="HTMLLinkColor" - reference="EmphasisColor" /> - <color - name="HealthTextColor" - reference="White" /> - <color - name="HelpBgColor" - reference="Unused?" /> - <color - name="HelpFgColor" - reference="Unused?" /> - <color - name="HelpScrollHighlightColor" - reference="Unused?" /> - <color - name="HelpScrollShadowColor" - reference="Unused?" /> - <color - name="HelpScrollThumbColor" - reference="Unused?" /> - <color - name="HelpScrollTrackColor" - reference="Unused?" /> - <color - name="HighlightChildColor" - reference="Yellow" /> - <color - name="HighlightInspectColor" - value="1 0 1 1" /> - <color - name="HighlightParentColor" - value="0.67 0.83 0.96 1" /> - <color - name="IMHistoryBgColor" - reference="Unused?" /> - <color - name="IMHistoryTextColor" - reference="Unused?" /> - <color - name="IconDisabledColor" - reference="White_25" /> - <color - name="IconEnabledColor" - reference="White" /> - <color - name="InventoryBackgroundColor" - reference="DkGray2" /> - <color - name="InventoryFocusOutlineColor" - reference="White_25" /> - <color - name="InventoryItemSuffixColor" - reference="White_25" /> - <color - name="InventoryItemLibraryColor" - reference="EmphasisColor" /> - <color - name="InventoryItemLinkColor" - reference="LtGray_50" /> - <color - name="InventoryMouseOverColor" - reference="LtGray_35" /> - <color - name="InventorySearchStatusColor" - reference="EmphasisColor" /> - <color - name="LabelDisabledColor" - reference="White_25" /> - <color - name="LabelSelectedColor" - reference="White" /> - <color - name="LabelSelectedDisabledColor" - reference="White_25" /> - <color - name="LabelTextColor" - reference="LtGray" /> - <color - name="LoginProgressBarBgColor" - reference="Unused?" /> - <color - name="LoginProgressBarFgColor" - reference="Unused?" /> - <color - name="LoginProgressBoxBorderColor" - value="0 0.12 0.24 0" /> - <color - name="LoginProgressBoxCenterColor" - value="0 0 0 0.78" /> - <color - name="LoginProgressBoxShadowColor" - value="0 0 0 0.78" /> - <color - name="LoginProgressBoxTextColor" - reference="White" /> - <color - name="MapAvatarColor" - reference="Green" /> - <color - name="MapAvatarFriendColor" - reference="Yellow" /> - <color - name="MapAvatarSelfColor" - value="0.53125 0 0.498047 1" /> - <color - name="MapFrustumColor" - reference="White_10" /> - <color - name="MapFrustumRotatingColor" - value="1 1 1 0.2" /> - <color - name="MapTrackColor" - reference="Red" /> - <color - name="MapTrackDisabledColor" - value="0.5 0 0 1" /> - <color - name="MenuBarBgColor" - reference="DkGray" /> - <color - name="MenuBarGodBgColor" - reference="FrogGreen" /> - <color - name="MenuDefaultBgColor" - reference="DkGray2" /> - <color - name="MenuItemDisabledColor" - reference="LtGray_50" /> - <color - name="MenuItemEnabledColor" - reference="LtGray" /> - <color - name="MenuItemHighlightBgColor" - reference="EmphasisColor_35" /> - <color - name="MenuItemHighlightFgColor" - reference="White" /> - <color - name="MenuNonProductionBgColor" - reference="Black" /> - <color - name="MenuNonProductionGodBgColor" - value="0.263 0.325 0.345 1" /> - <color - name="MenuPopupBgColor" - reference="DkGray2" /> - <color - name="ModelUploaderLabels" - value="1 0.6 0 1" /> - <color - name="MultiSliderDisabledThumbColor" - reference="Black" /> - <color - name="MultiSliderThumbCenterColor" - reference="White" /> - <color - name="MultiSliderThumbCenterSelectedColor" - reference="Green" /> - <color - name="MultiSliderThumbOutlineColor" - reference="Unused?" /> - <color - name="MultiSliderTrackColor" - reference="LtGray" /> - <color - name="MultiSliderTriangleColor" - reference="Yellow" /> + <color + name="AccordionHeaderTextColor" + reference="LtGray" /> + <color + name="AgentChatColor" + reference="White" /> + <color + name="AlertBoxColor" + value="0.24 0.24 0.24 1" /> + <color + name="AlertCautionBoxColor" + value="1 0.82 0.46 1" /> + <color + name="AlertCautionTextColor" + reference="LtYellow" /> + <color + name="AvatarListItemIconDefaultColor" + reference="White" /> + <color + name="AvatarListItemIconOnlineColor" + reference="White" /> + <color + name="AvatarListItemIconOfflineColor" + value="0.5 0.5 0.5 0.5" /> + <color + name="AvatarListItemIconVoiceInvitedColor" + reference="AvatarListItemIconOfflineColor" /> + <color + name="AvatarListItemIconVoiceJoinedColor" + reference="AvatarListItemIconOnlineColor" /> + <color + name="AvatarListItemIconVoiceLeftColor" + reference="AvatarListItemIconOfflineColor" /> + <color + name="BadgeImageColor" + value="1.0 0.40 0.0 1.0" /> + <color + name="BadgeBorderColor" + value="0.9 0.9 0.9 1.0" /> + <color + name="BadgeLabelColor" + reference="White" /> + <color + name="ButtonBorderColor" + reference="Unused?" /> + <color + name="ButtonCautionImageColor" + reference="Unused?" /> + <color + name="ButtonColor" + reference="Unused?" /> + <color + name="ButtonFlashBgColor" + reference="Unused?" /> + <color + name="ButtonImageColor" + reference="White" /> + <color + name="ButtonLabelColor" + reference="LtGray" /> + <color + name="ButtonLabelDisabledColor" + reference="White_25" /> + <color + name="ButtonLabelSelectedColor" + reference="White" /> + <color + name="ButtonLabelSelectedDisabledColor" + reference="White_25" /> + <color + name="ButtonSelectedBgColor" + reference="Unused?" /> + <color + name="ButtonSelectedColor" + reference="Unused?" /> + <color + name="ButtonUnselectedBgColor" + reference="Unused?" /> + <color + name="ButtonUnselectedFgColor" + reference="Unused?" /> + <color + name="ChatHistoryBgColor" + reference="Transparent" /> + <color + name="ChatHistoryTextColor" + reference="LtGray" /> + <color + name="ChicletFlashColor" + value="0.114 0.65 0.1" /> + <color + name="ColorDropShadow" + reference="Black_50" /> + <color + name="ColorPaletteEntry01" + reference="Black" /> + <color + name="ColorPaletteEntry02" + reference="Gray" /> + <color + name="ColorPaletteEntry03" + value="0.5 0 0 1" /> + <color + name="ColorPaletteEntry04" + value="0.5 0.5 0 1" /> + <color + name="ColorPaletteEntry05" + value="0 0.5 0 1" /> + <color + name="ColorPaletteEntry06" + value="0 0.5 0.5 1" /> + <color + name="ColorPaletteEntry07" + value="0 0 0.5 1" /> + <color + name="ColorPaletteEntry08" + value="0.5 0 0.5 1" /> + <color + name="ColorPaletteEntry09" + value="0.5 0.5 0 1" /> + <color + name="ColorPaletteEntry10" + value="0 0.25 0.25 1" /> + <color + name="ColorPaletteEntry11" + value="0 0.5 1 1" /> + <color + name="ColorPaletteEntry12" + value="0 0.25 0.5 1" /> + <color + name="ColorPaletteEntry13" + value="0.5 0 1 1" /> + <color + name="ColorPaletteEntry14" + value="0.5 0.25 0 1" /> + <color + name="ColorPaletteEntry15" + reference="White" /> + <color + name="ColorPaletteEntry16" + reference="LtYellow" /> + <color + name="ColorPaletteEntry17" + reference="White" /> + <color + name="ColorPaletteEntry18" + reference="LtGray" /> + <color + name="ColorPaletteEntry19" + reference="Red" /> + <color + name="ColorPaletteEntry20" + reference="Yellow" /> + <color + name="ColorPaletteEntry21" + reference="Green" /> + <color + name="ColorPaletteEntry22" + value="0 1 1 1" /> + <color + name="ColorPaletteEntry23" + reference="Blue" /> + <color + name="ColorPaletteEntry24" + reference="Purple" /> + <color + name="ColorPaletteEntry25" + value="1 1 0.5 1" /> + <color + name="ColorPaletteEntry26" + value="0 1 0.5 1" /> + <color + name="ColorPaletteEntry27" + value="0.5 1 1 1" /> + <color + name="ColorPaletteEntry28" + value="0.5 0.5 1 1" /> + <color + name="ColorPaletteEntry29" + value="1 0 0.5 1" /> + <color + name="ColorPaletteEntry30" + value="1 0.5 0 1" /> + <color + name="ColorPaletteEntry31" + reference="White" /> + <color + name="ColorPaletteEntry32" + reference="White" /> + <color + name="ComboListBgColor" + reference="DkGray" /> + <color + name="ConsoleBackground" + reference="Black" /> + <color + name="ContextSilhouetteColor" + reference="EmphasisColor" /> + <color + name="DefaultHighlightDark" + reference="White_10" /> + <color + name="DefaultHighlightLight" + reference="White_25" /> + <color + name="DefaultShadowDark" + reference="Black_50" /> + <color + name="DefaultShadowLight" + reference="Black_50" /> + <color + name="EffectColor" + reference="White" /> + <color + name="FilterBackgroundColor" + reference="Black" /> + <color + name="FilterTextColor" + value="0.38 0.69 0.57 1" /> + <color + name="FloaterButtonImageColor" + reference="LtGray" /> + <color + name="FloaterDefaultBackgroundColor" + reference="DkGray_66" /> + <color + name="FloaterFocusBackgroundColor" + reference="DkGray2" /> + <color + name="FloaterFocusBorderColor" + reference="Black_50" /> + <color + name="FloaterUnfocusBorderColor" + reference="Black_50" /> + <color + name="FocusColor" + reference="EmphasisColor" /> + <color + name="FolderViewLoadingMessageTextColor" + value="0.3344 0.5456 0.5159 1" /> + <color + name="GridFocusPointColor" + reference="White_50" /> + <color + name="GridlineBGColor" + value="0.92 0.92 1 0.78" /> + <color + name="GridlineColor" + reference="White" /> + <color + name="GridlineShadowColor" + value="0 0 0 0.31" /> + <color + name="GroupNotifyBoxColor" + value="0.3344 0.5456 0.5159 1" /> + <color + name="GroupNotifyTextColor" + reference="White"/> + <color + name="GroupNotifyDimmedTextColor" + reference="LtGray" /> + <color + name="GroupOverTierColor" + value="0.43 0.06 0.06 1" /> + <color + name="HTMLLinkColor" + reference="EmphasisColor" /> + <color + name="HealthTextColor" + reference="White" /> + <color + name="HelpBgColor" + reference="Unused?" /> + <color + name="HelpFgColor" + reference="Unused?" /> + <color + name="HelpScrollHighlightColor" + reference="Unused?" /> + <color + name="HelpScrollShadowColor" + reference="Unused?" /> + <color + name="HelpScrollThumbColor" + reference="Unused?" /> + <color + name="HelpScrollTrackColor" + reference="Unused?" /> + <color + name="HighlightChildColor" + reference="Yellow" /> + <color + name="HighlightInspectColor" + value="1 0 1 1" /> + <color + name="HighlightParentColor" + value="0.67 0.83 0.96 1" /> + <color + name="IMHistoryBgColor" + reference="Unused?" /> + <color + name="IMHistoryTextColor" + reference="Unused?" /> + <color + name="IconDisabledColor" + reference="White_25" /> + <color + name="IconEnabledColor" + reference="White" /> + <color + name="InventoryBackgroundColor" + reference="DkGray2" /> + <color + name="InventoryFocusOutlineColor" + reference="White_25" /> + <color + name="InventoryItemSuffixColor" + reference="White_25" /> + <color + name="InventoryItemLibraryColor" + reference="EmphasisColor" /> + <color + name="InventoryItemLinkColor" + reference="LtGray_50" /> + <color + name="InventoryMouseOverColor" + reference="LtGray_35" /> + <color + name="InventorySearchStatusColor" + reference="EmphasisColor" /> + <color + name="LabelDisabledColor" + reference="White_25" /> + <color + name="LabelSelectedColor" + reference="White" /> + <color + name="LabelSelectedDisabledColor" + reference="White_25" /> + <color + name="LabelTextColor" + reference="LtGray" /> + <color + name="LoginProgressBarBgColor" + reference="Unused?" /> + <color + name="LoginProgressBarFgColor" + reference="Unused?" /> + <color + name="LoginProgressBoxBorderColor" + value="0 0.12 0.24 0" /> + <color + name="LoginProgressBoxCenterColor" + value="0 0 0 0.78" /> + <color + name="LoginProgressBoxShadowColor" + value="0 0 0 0.78" /> + <color + name="LoginProgressBoxTextColor" + reference="White" /> + <color + name="MapAvatarColor" + reference="Green" /> + <color + name="MapAvatarFriendColor" + reference="Yellow" /> + <color + name="MapAvatarSelfColor" + value="0.53125 0 0.498047 1" /> + <color + name="MapFrustumColor" + reference="White_10" /> + <color + name="MapFrustumRotatingColor" + value="1 1 1 0.2" /> + <color + name="MapTrackColor" + reference="Red" /> + <color + name="MapTrackDisabledColor" + value="0.5 0 0 1" /> + <color + name="MenuBarBgColor" + reference="DkGray" /> + <color + name="MenuBarGodBgColor" + reference="FrogGreen" /> + <color + name="MenuDefaultBgColor" + reference="DkGray2" /> + <color + name="MenuItemDisabledColor" + reference="LtGray_50" /> + <color + name="MenuItemEnabledColor" + reference="LtGray" /> + <color + name="MenuItemHighlightBgColor" + reference="EmphasisColor_35" /> + <color + name="MenuItemFlashBgColor" + reference="BeaconColor" /> + <color + name="MenuItemHighlightFgColor" + reference="White" /> + <color + name="MenuNonProductionBgColor" + reference="Black" /> + <color + name="MenuNonProductionGodBgColor" + value="0.263 0.325 0.345 1" /> + <color + name="MenuPopupBgColor" + reference="DkGray2" /> + <color + name="ModelUploaderLabels" + value="1 0.6 0 1" /> + <color + name="MultiSliderDisabledThumbColor" + reference="Black" /> + <color + name="MultiSliderThumbCenterColor" + reference="White" /> + <color + name="MultiSliderThumbCenterSelectedColor" + reference="Green" /> + <color + name="MultiSliderThumbOutlineColor" + reference="Unused?" /> + <color + name="MultiSliderTrackColor" + reference="LtGray" /> + <color + name="MultiSliderTriangleColor" + reference="Yellow" /> <!-- - <color + <color name="NameTagBackground" value="0.85 0.85 0.85 0.80" /> - --> - <color + --> + <color name="NameTagBackground" value="0 0 0 1" /> - <color - name="NameTagChat" - reference="White" /> - <color - name="NameTagFriend" - value="0.447 0.784 0.663 1" /> - <color - name="NameTagLegacy" - reference="White" /> - <color - name="NameTagMatch" - reference="White" /> - <color - name="NameTagMismatch" - reference="White" /> - <color - name="NetMapBackgroundColor" - value="0 0 0 1" /> - <color - name="NetMapGroupOwnAboveWater" - reference="Purple" /> - <color - name="NetMapGroupOwnBelowWater" - value="0.78 0 0.78 1" /> - <color - name="NetMapOtherOwnAboveWater" - value="0.24 0.24 0.24 1" /> - <color - name="NetMapOtherOwnBelowWater" - value="0.12 0.12 0.12 1" /> - <color - name="NetMapYouOwnAboveWater" - value="0 1 1 1" /> - <color - name="NetMapYouOwnBelowWater" - value="0 0.78 0.78 1" /> - <color - name="NotifyBoxColor" - value="LtGray" /> - <color - name="NotifyCautionBoxColor" - value="1 0.82 0.46 1" /> - <color - name="NotifyCautionWarnColor" - reference="White" /> - <color - name="NotifyTextColor" - reference="White" /> - <color - name="ObjectBubbleColor" - reference="DkGray_66" /> - <color - name="ObjectChatColor" - reference="EmphasisColor" /> - <color - name="OverdrivenColor" - reference="Red" /> - <color - name="PanelDefaultBackgroundColor" - reference="DkGray" /> - <color - name="PanelDefaultHighlightLight" - reference="White_50" /> - <color - name="PanelFocusBackgroundColor" - reference="DkGray2" /> - <color - name="PanelNotificationBackground" - value="1 0.3 0.3 0" /> - <color - name="ParcelHoverColor" - reference="White" /> - <color + <color + name="NameTagChat" + reference="White" /> + <color + name="NameTagFriend" + value="0.447 0.784 0.663 1" /> + <color + name="NameTagLegacy" + reference="White" /> + <color + name="NameTagMatch" + reference="White" /> + <color + name="NameTagMismatch" + reference="White" /> + <color + name="NetMapBackgroundColor" + value="0 0 0 1" /> + <color + name="NetMapGroupOwnAboveWater" + reference="Purple" /> + <color + name="NetMapGroupOwnBelowWater" + value="0.78 0 0.78 1" /> + <color + name="NetMapOtherOwnAboveWater" + value="0.24 0.24 0.24 1" /> + <color + name="NetMapOtherOwnBelowWater" + value="0.12 0.12 0.12 1" /> + <color + name="NetMapYouOwnAboveWater" + value="0 1 1 1" /> + <color + name="NetMapYouOwnBelowWater" + value="0 0.78 0.78 1" /> + <color + name="NotifyBoxColor" + value="LtGray" /> + <color + name="NotifyCautionBoxColor" + value="1 0.82 0.46 1" /> + <color + name="NotifyCautionWarnColor" + reference="White" /> + <color + name="NotifyTextColor" + reference="White" /> + <color + name="ObjectBubbleColor" + reference="DkGray_66" /> + <color + name="ObjectChatColor" + reference="EmphasisColor" /> + <color + name="OverdrivenColor" + reference="Red" /> + <color + name="PanelDefaultBackgroundColor" + reference="DkGray" /> + <color + name="PanelDefaultHighlightLight" + reference="White_50" /> + <color + name="PanelFocusBackgroundColor" + reference="DkGray2" /> + <color + name="PanelNotificationBackground" + value="1 0.3 0.3 0" /> + <color + name="ParcelHoverColor" + reference="White" /> + <color name="PathfindingErrorColor" reference="LtRed" /> <color @@ -645,6 +657,15 @@ name="PathfindingGoodColor" reference="LtGreen" /> <color + name="MaterialErrorColor" + reference="LtRed" /> + <color + name="MaterialWarningColor" + reference="DrYellow" /> + <color + name="MaterialGoodColor" + reference="LtGreen" /> + <color name="PathfindingDefaultBeaconColor" reference="Red_80" /> <color @@ -657,205 +678,210 @@ name="PathfindingCharacterBeaconColor" reference="Red_80" /> <color - name="PieMenuBgColor" - value="0.24 0.24 0.24 0.59" /> - <color - name="PieMenuLineColor" - value="0 0 0 0.5" /> - <color - name="PieMenuSelectedColor" - value="0.72 0.72 0.74 0.3" /> - <color - name="PropertyColorAuction" - value="0.5 0 1 0.4" /> - <color - name="PropertyColorAvail" - reference="Transparent" /> - <color - name="PropertyColorForSale" - value="1 0.5 0 0.4" /> - <color - name="PropertyColorGroup" - value="0 0.72 0.72 0.4" /> - <color - name="PropertyColorOther" - value="1 0 0 0.4" /> - <color - name="PropertyColorSelf" - value="0 1 0 0.4" /> - <color - name="ScriptBgReadOnlyColor" - value="0.39 0.39 0.39 1" /> - <color - name="ScriptErrorColor" - reference="Red" /> - <color - name="ScrollBGStripeColor" - reference="Transparent" /> - <color - name="ScrollBgReadOnlyColor" + name="PieMenuBgColor" + value="0.24 0.24 0.24 0.59" /> + <color + name="PieMenuLineColor" + value="0 0 0 0.5" /> + <color + name="PieMenuSelectedColor" + value="0.72 0.72 0.74 0.3" /> + <color + name="PropertyColorAuction" + value="0.5 0 1 0.4" /> + <color + name="PropertyColorAvail" + reference="Transparent" /> + <color + name="PropertyColorForSale" + value="1 0.5 0 0.4" /> + <color + name="PropertyColorGroup" + value="0 0.72 0.72 0.4" /> + <color + name="PropertyColorOther" + value="1 0 0 0.4" /> + <color + name="PropertyColorSelf" + value="0 1 0 0.4" /> + <color + name="ScriptBgReadOnlyColor" + value="0.39 0.39 0.39 1" /> + <color + name="ScriptErrorColor" + reference="Red" /> + <color + name="ScrollBGStripeColor" + reference="Transparent" /> + <color + name="ScrollBgReadOnlyColor" reference="Transparent" /> - <color - name="ScrollBgWriteableColor" - reference="White_05" /> - <color - name="ScrollDisabledColor" - reference="White_25" /> - <color - name="ScrollHighlightedColor" - reference="Unused?" /> - <color - name="ScrollHoveredColor" - reference="EmphasisColor_13" /> - <color - name="ScrollSelectedBGColor" - reference="EmphasisColor_35" /> - <color - name="ScrollSelectedFGColor" - reference="White" /> - <color - name="ScrollUnselectedColor" - reference="LtGray" /> - <color - name="ScrollbarThumbColor" - reference="White" /> - <color - name="ScrollbarTrackColor" - reference="Black" /> - <color - name="SelectedOutfitTextColor" - reference="EmphasisColor" /> - <color - name="SilhouetteChildColor" - value="0.13 0.42 0.77 1" /> - <color - name="SilhouetteParentColor" - reference="Yellow" /> - <color - name="SliderDisabledThumbColor" - reference="White_25" /> - <color - name="SliderThumbCenterColor" - reference="White" /> - <color - name="SliderThumbOutlineColor" - reference="White" /> - <color - name="SliderTrackColor" - reference="Unused?" /> - <color - name="SpeakingColor" - reference="FrogGreen" /> - <color - name="SystemChatColor" - reference="LtGray" /> - <color - name="TextBgFocusColor" - reference="White" /> - <color - name="TextBgReadOnlyColor" - reference="White_05" /> - <color - name="TextBgWriteableColor" - reference="LtGray" /> - <color - name="TextCursorColor" - reference="Black" /> - <color - name="TextDefaultColor" - reference="Black" /> - <color - name="TextEmbeddedItemColor" - value="0 0 0.5 1" /> - <color - name="TextEmbeddedItemReadOnlyColor" - reference="Unused?" /> - <color - name="TextFgColor" - value="0.102 0.102 0.102 1" /> - <color - name="TextFgReadOnlyColor" - reference="LtGray" /> - <color - name="TextFgTentativeColor" - value="0.4 0.4 0.4 1" /> - <color - name="TimeTextColor" - reference="LtGray" /> - <color - name="TitleBarFocusColor" - reference="White_10" /> - <color - name="ToastBackground" - value="0.3 0.3 0.3 0" /> - <color - name="ToolTipBgColor" - value="0.937 0.89 0.655 1" /> - <color - name="ToolTipBorderColor" - value="0.812 0.753 0.451 1" /> - <color - name="ToolTipTextColor" - reference="DkGray2" /> - <color - name="InspectorTipTextColor" - reference="LtGray" /> - <color - name="UserChatColor" - reference="White" /> - <color - name="llOwnerSayChatColor" - reference="LtYellow" /> + <color + name="ScrollBgWriteableColor" + reference="White_05" /> + <color + name="ScrollDisabledColor" + reference="White_25" /> + <color + name="ScrollHighlightedColor" + reference="Unused?" /> + <color + name="ScrollHoveredColor" + reference="EmphasisColor_13" /> + <color + name="ScrollSelectedBGColor" + reference="EmphasisColor_35" /> + <color + name="ScrollSelectedFGColor" + reference="White" /> + <color + name="ScrollUnselectedColor" + reference="LtGray" /> + <color + name="ScrollbarThumbColor" + reference="White" /> + <color + name="ScrollbarTrackColor" + reference="Black" /> + <color + name="SelectedOutfitTextColor" + reference="EmphasisColor" /> + <color + name="SilhouetteChildColor" + value="0.13 0.42 0.77 1" /> + <color + name="SilhouetteParentColor" + reference="Yellow" /> + <color + name="SliderDisabledThumbColor" + reference="White_25" /> + <color + name="SliderThumbCenterColor" + reference="White" /> + <color + name="SliderThumbOutlineColor" + reference="White" /> + <color + name="SliderTrackColor" + reference="Unused?" /> + <color + name="SpeakingColor" + reference="FrogGreen" /> + <color + name="SystemChatColor" + reference="LtGray" /> + <color + name="TextBgFocusColor" + reference="White" /> + <color + name="TextBgReadOnlyColor" + reference="White_05" /> + <color + name="TextBgWriteableColor" + reference="LtGray" /> + <color + name="TextCursorColor" + reference="Black" /> + <color + name="TextDefaultColor" + reference="Black" /> + <color + name="TextEmbeddedItemColor" + value="0 0 0.5 1" /> + <color + name="TextEmbeddedItemReadOnlyColor" + reference="Unused?" /> + <color + name="TextFgColor" + value="0.102 0.102 0.102 1" /> + <color + name="TextFgReadOnlyColor" + reference="LtGray" /> + <color + name="TextFgTentativeColor" + value="0.4 0.4 0.4 1" /> + <color + name="TimeTextColor" + reference="LtGray" /> + <color + name="TitleBarFocusColor" + reference="White_10" /> + <color + name="ToastBackground" + value="0.3 0.3 0.3 0" /> + <color + name="ToolTipBgColor" + value="0.937 0.89 0.655 1" /> + <color + name="ToolTipBorderColor" + value="0.812 0.753 0.451 1" /> + <color + name="ToolTipTextColor" + reference="DkGray2" /> + <color + name="InspectorTipTextColor" + reference="LtGray" /> + <color + name="UserChatColor" + reference="Yellow" /> + <color + name="llOwnerSayChatColor" + reference="LtYellow" /> - <!-- New Colors --> - <color - name="OutputMonitorMutedColor" - reference="DkGray2" /> - <color - name="SysWellItemUnselected" - value="0 0 0 0" /> - <color - name="SysWellItemSelected" - value="0.3 0.3 0.3 1.0" /> - <color - name="ColorSwatchBorderColor" - value="0.45098 0.517647 0.607843 1"/> - <color - name="ChatTimestampColor" - reference="White" /> - <color - name="MenuBarProjectBgColor" - reference="MdBlue" /> - - <color + <!-- New Colors --> + <color + name="OutputMonitorMutedColor" + reference="DkGray2" /> + <color + name="SysWellItemUnselected" + value="0 0 0 0" /> + <color + name="SysWellItemSelected" + value="0.3 0.3 0.3 1.0" /> + <color + name="ColorSwatchBorderColor" + value="0.45098 0.517647 0.607843 1"/> + <color + name="ChatTimestampColor" + reference="White" /> + <color + name="MenuBarBetaBgColor" + reference="DkBlue" /> + <color + name="MenuBarProjectBgColor" + reference="MdBlue" /> + <color + name="MenuBarTestBgColor" + reference="DkRed" /> + <color name="MeshImportTableNormalColor" value="1 1 1 1"/> - <color + <color name="MeshImportTableHighlightColor" value="0.2 0.8 1 1"/> - <color - name="DirectChatColor" - reference="LtOrange" /> + <color + name="DirectChatColor" + reference="LtOrange" /> - <color + <color name="ToolbarDropZoneColor" value=".48 .69 1 .5" /> - <!-- Generic color names (legacy) --> + <!-- Generic color names (legacy) --> <color - name="white" - value="1 1 1 1"/> + name="white" + value="1 1 1 1"/> <color - name="black" - value="0 0 0 1"/> + name="black" + value="0 0 0 1"/> <color - name="red" - value="1 0 0 1"/> + name="red" + value="1 0 0 1"/> <color - name="green" - value="0 1 0 1"/> + name="green" + value="0 1 0 1"/> <color - name="blue" - value="0 0 1 1"/> + name="blue" + value="0 0 1 1"/> </colors> diff --git a/indra/newview/skins/default/html/btn_purplepill_bg.png b/indra/newview/skins/default/html/btn_purplepill_bg.png Binary files differindex b78127ae30..b78127ae30 100644..100755 --- a/indra/newview/skins/default/html/btn_purplepill_bg.png +++ b/indra/newview/skins/default/html/btn_purplepill_bg.png diff --git a/indra/newview/skins/default/html/da/loading/loading.html b/indra/newview/skins/default/html/da/loading/loading.html index 5f3426eb60..5f3426eb60 100644..100755 --- a/indra/newview/skins/default/html/da/loading/loading.html +++ b/indra/newview/skins/default/html/da/loading/loading.html diff --git a/indra/newview/skins/default/html/de/loading-error/index.html b/indra/newview/skins/default/html/de/loading-error/index.html index fbde825b4a..fbde825b4a 100644..100755 --- a/indra/newview/skins/default/html/de/loading-error/index.html +++ b/indra/newview/skins/default/html/de/loading-error/index.html diff --git a/indra/newview/skins/default/html/de/loading/loading.html b/indra/newview/skins/default/html/de/loading/loading.html index 44a621b216..44a621b216 100644..100755 --- a/indra/newview/skins/default/html/de/loading/loading.html +++ b/indra/newview/skins/default/html/de/loading/loading.html diff --git a/indra/newview/skins/default/html/en-us/help-offline/index.html b/indra/newview/skins/default/html/en-us/help-offline/index.html index bf3677603e..bf3677603e 100644..100755 --- a/indra/newview/skins/default/html/en-us/help-offline/index.html +++ b/indra/newview/skins/default/html/en-us/help-offline/index.html diff --git a/indra/newview/skins/default/html/en-us/loading-error/index.html b/indra/newview/skins/default/html/en-us/loading-error/index.html index 71f9c86f76..71f9c86f76 100644..100755 --- a/indra/newview/skins/default/html/en-us/loading-error/index.html +++ b/indra/newview/skins/default/html/en-us/loading-error/index.html diff --git a/indra/newview/skins/default/html/en-us/loading/loading.html b/indra/newview/skins/default/html/en-us/loading/loading.html index 1c62d2f73e..1c62d2f73e 100644..100755 --- a/indra/newview/skins/default/html/en-us/loading/loading.html +++ b/indra/newview/skins/default/html/en-us/loading/loading.html diff --git a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif Binary files differindex e3ccc7c769..e3ccc7c769 100644..100755 --- a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif +++ b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif diff --git a/indra/newview/skins/default/html/es/loading-error/index.html b/indra/newview/skins/default/html/es/loading-error/index.html index c1e75bc475..c1e75bc475 100644..100755 --- a/indra/newview/skins/default/html/es/loading-error/index.html +++ b/indra/newview/skins/default/html/es/loading-error/index.html diff --git a/indra/newview/skins/default/html/es/loading/loading.html b/indra/newview/skins/default/html/es/loading/loading.html index c4260b34c0..c4260b34c0 100644..100755 --- a/indra/newview/skins/default/html/es/loading/loading.html +++ b/indra/newview/skins/default/html/es/loading/loading.html diff --git a/indra/newview/skins/default/html/fr/loading-error/index.html b/indra/newview/skins/default/html/fr/loading-error/index.html index 69c796cb55..69c796cb55 100644..100755 --- a/indra/newview/skins/default/html/fr/loading-error/index.html +++ b/indra/newview/skins/default/html/fr/loading-error/index.html diff --git a/indra/newview/skins/default/html/fr/loading/loading.html b/indra/newview/skins/default/html/fr/loading/loading.html index b3953448e9..b3953448e9 100644..100755 --- a/indra/newview/skins/default/html/fr/loading/loading.html +++ b/indra/newview/skins/default/html/fr/loading/loading.html diff --git a/indra/newview/skins/default/html/hu/loading/loading.html b/indra/newview/skins/default/html/hu/loading/loading.html index ab15a073ba..ab15a073ba 100644..100755 --- a/indra/newview/skins/default/html/hu/loading/loading.html +++ b/indra/newview/skins/default/html/hu/loading/loading.html diff --git a/indra/newview/skins/default/html/it/loading/loading.html b/indra/newview/skins/default/html/it/loading/loading.html index ab37e41f04..ab37e41f04 100644..100755 --- a/indra/newview/skins/default/html/it/loading/loading.html +++ b/indra/newview/skins/default/html/it/loading/loading.html diff --git a/indra/newview/skins/default/html/ja/loading-error/index.html b/indra/newview/skins/default/html/ja/loading-error/index.html index d969c03098..d969c03098 100644..100755 --- a/indra/newview/skins/default/html/ja/loading-error/index.html +++ b/indra/newview/skins/default/html/ja/loading-error/index.html diff --git a/indra/newview/skins/default/html/ja/loading/loading.html b/indra/newview/skins/default/html/ja/loading/loading.html index 35cf74a35f..35cf74a35f 100644..100755 --- a/indra/newview/skins/default/html/ja/loading/loading.html +++ b/indra/newview/skins/default/html/ja/loading/loading.html diff --git a/indra/newview/skins/default/html/ko/loading-error/index.html b/indra/newview/skins/default/html/ko/loading-error/index.html index 02b87132b9..02b87132b9 100644..100755 --- a/indra/newview/skins/default/html/ko/loading-error/index.html +++ b/indra/newview/skins/default/html/ko/loading-error/index.html diff --git a/indra/newview/skins/default/html/nl/loading/loading.html b/indra/newview/skins/default/html/nl/loading/loading.html index 0215bd7e47..0215bd7e47 100644..100755 --- a/indra/newview/skins/default/html/nl/loading/loading.html +++ b/indra/newview/skins/default/html/nl/loading/loading.html diff --git a/indra/newview/skins/default/html/pl/loading/loading.html b/indra/newview/skins/default/html/pl/loading/loading.html index 50f3dfb0c5..50f3dfb0c5 100644..100755 --- a/indra/newview/skins/default/html/pl/loading/loading.html +++ b/indra/newview/skins/default/html/pl/loading/loading.html diff --git a/indra/newview/skins/default/html/pt/loading-error/index.html b/indra/newview/skins/default/html/pt/loading-error/index.html index 7f17b3a7bf..7f17b3a7bf 100644..100755 --- a/indra/newview/skins/default/html/pt/loading-error/index.html +++ b/indra/newview/skins/default/html/pt/loading-error/index.html diff --git a/indra/newview/skins/default/html/pt/loading/loading.html b/indra/newview/skins/default/html/pt/loading/loading.html index a83e1123d0..a83e1123d0 100644..100755 --- a/indra/newview/skins/default/html/pt/loading/loading.html +++ b/indra/newview/skins/default/html/pt/loading/loading.html diff --git a/indra/newview/skins/default/html/ru/loading/loading.html b/indra/newview/skins/default/html/ru/loading/loading.html index 892c0b9f7f..892c0b9f7f 100644..100755 --- a/indra/newview/skins/default/html/ru/loading/loading.html +++ b/indra/newview/skins/default/html/ru/loading/loading.html diff --git a/indra/newview/skins/default/html/tr/loading/loading.html b/indra/newview/skins/default/html/tr/loading/loading.html index 1ac07bff34..1ac07bff34 100644..100755 --- a/indra/newview/skins/default/html/tr/loading/loading.html +++ b/indra/newview/skins/default/html/tr/loading/loading.html diff --git a/indra/newview/skins/default/html/uk/loading/loading.html b/indra/newview/skins/default/html/uk/loading/loading.html index 3b5b8679b4..3b5b8679b4 100644..100755 --- a/indra/newview/skins/default/html/uk/loading/loading.html +++ b/indra/newview/skins/default/html/uk/loading/loading.html diff --git a/indra/newview/skins/default/html/unabletoconnect.png b/indra/newview/skins/default/html/unabletoconnect.png Binary files differindex 1383516509..1383516509 100644..100755 --- a/indra/newview/skins/default/html/unabletoconnect.png +++ b/indra/newview/skins/default/html/unabletoconnect.png diff --git a/indra/newview/skins/default/html/zh/loading-error/index.html b/indra/newview/skins/default/html/zh/loading-error/index.html index 97201318ff..97201318ff 100644..100755 --- a/indra/newview/skins/default/html/zh/loading-error/index.html +++ b/indra/newview/skins/default/html/zh/loading-error/index.html diff --git a/indra/newview/skins/default/html/zh/loading/loading.html b/indra/newview/skins/default/html/zh/loading/loading.html index d1d5d25c92..d1d5d25c92 100644..100755 --- a/indra/newview/skins/default/html/zh/loading/loading.html +++ b/indra/newview/skins/default/html/zh/loading/loading.html diff --git a/indra/newview/skins/default/textures/Blank.png b/indra/newview/skins/default/textures/Blank.png Binary files differindex f38e9f9100..f38e9f9100 100644..100755 --- a/indra/newview/skins/default/textures/Blank.png +++ b/indra/newview/skins/default/textures/Blank.png diff --git a/indra/newview/skins/default/textures/Rounded_Rect.png b/indra/newview/skins/default/textures/Rounded_Rect.png Binary files differindex c270c28039..c270c28039 100644..100755 --- a/indra/newview/skins/default/textures/Rounded_Rect.png +++ b/indra/newview/skins/default/textures/Rounded_Rect.png diff --git a/indra/newview/skins/default/textures/alpha_gradient.tga b/indra/newview/skins/default/textures/alpha_gradient.tga Binary files differindex 6fdba25d4e..6fdba25d4e 100644..100755 --- a/indra/newview/skins/default/textures/alpha_gradient.tga +++ b/indra/newview/skins/default/textures/alpha_gradient.tga diff --git a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c Binary files differindex 5de5a80a65..5de5a80a65 100644..100755 --- a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c +++ b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c diff --git a/indra/newview/skins/default/textures/arrow_down.tga b/indra/newview/skins/default/textures/arrow_down.tga Binary files differindex 81dc9d3b6c..81dc9d3b6c 100644..100755 --- a/indra/newview/skins/default/textures/arrow_down.tga +++ b/indra/newview/skins/default/textures/arrow_down.tga diff --git a/indra/newview/skins/default/textures/arrow_up.tga b/indra/newview/skins/default/textures/arrow_up.tga Binary files differindex 22195cf7fb..22195cf7fb 100644..100755 --- a/indra/newview/skins/default/textures/arrow_up.tga +++ b/indra/newview/skins/default/textures/arrow_up.tga diff --git a/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png b/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png Binary files differindex 84cc2159c1..84cc2159c1 100644..100755 --- a/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png +++ b/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png diff --git a/indra/newview/skins/default/textures/badge_note.j2c b/indra/newview/skins/default/textures/badge_note.j2c Binary files differindex 1ab5233faf..1ab5233faf 100644..100755 --- a/indra/newview/skins/default/textures/badge_note.j2c +++ b/indra/newview/skins/default/textures/badge_note.j2c diff --git a/indra/newview/skins/default/textures/badge_ok.j2c b/indra/newview/skins/default/textures/badge_ok.j2c Binary files differindex f85b880f1d..f85b880f1d 100644..100755 --- a/indra/newview/skins/default/textures/badge_ok.j2c +++ b/indra/newview/skins/default/textures/badge_ok.j2c diff --git a/indra/newview/skins/default/textures/badge_warn.j2c b/indra/newview/skins/default/textures/badge_warn.j2c Binary files differindex 26437ca426..26437ca426 100644..100755 --- a/indra/newview/skins/default/textures/badge_warn.j2c +++ b/indra/newview/skins/default/textures/badge_warn.j2c diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png Binary files differindex 6b725e153a..6b725e153a 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png Binary files differindex 9f22080d13..9f22080d13 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png Binary files differindex 5b2a8eb339..5b2a8eb339 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png Binary files differindex 9acf7053d5..9acf7053d5 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png Binary files differindex 00158a7bc2..00158a7bc2 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png Binary files differindex 3748f5e190..3748f5e190 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png Binary files differindex 2b50986780..2b50986780 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png Binary files differindex c49b8f9a27..c49b8f9a27 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png Binary files differindex bc8c4db04d..bc8c4db04d 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png Binary files differindex b919a0a152..b919a0a152 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png Binary files differindex de9da359a0..de9da359a0 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png Binary files differindex c8560c0869..c8560c0869 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png Binary files differindex b09f7c64d3..b09f7c64d3 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png Binary files differindex ae2c57c207..ae2c57c207 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png Binary files differindex c5cd8cca92..c5cd8cca92 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png +++ b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png diff --git a/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png b/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png Binary files differindex 8b58db0cba..8b58db0cba 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png +++ b/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png diff --git a/indra/newview/skins/default/textures/bottomtray/DownArrow.png b/indra/newview/skins/default/textures/bottomtray/DownArrow.png Binary files differindex 82f58b22b9..82f58b22b9 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/DownArrow.png +++ b/indra/newview/skins/default/textures/bottomtray/DownArrow.png diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png Binary files differindex 8d32cad95f..8d32cad95f 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png Binary files differindex 4c98e35868..4c98e35868 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png Binary files differindex 9e7291d6fb..9e7291d6fb 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png Binary files differindex e2eb38e12d..e2eb38e12d 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png Binary files differindex f314d4e001..f314d4e001 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png Binary files differindex 4dddc2b391..4dddc2b391 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png Binary files differindex 9f31d461b5..9f31d461b5 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png Binary files differindex 2893c9a9f1..2893c9a9f1 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png Binary files differindex f7ed4c25fb..f7ed4c25fb 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png Binary files differindex 80d227b6a7..80d227b6a7 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png Binary files differindex d0a825a682..d0a825a682 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png Binary files differindex 3602efa9d9..3602efa9d9 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png Binary files differindex 2f81fb1588..2f81fb1588 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png Binary files differindex 9c3fc37dfe..9c3fc37dfe 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png Binary files differindex 4f86e81a15..4f86e81a15 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png Binary files differindex 282e8d62de..282e8d62de 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png Binary files differindex b211371e64..b211371e64 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png Binary files differindex 5039e57c32..5039e57c32 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png Binary files differindex e937c3f012..e937c3f012 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png Binary files differindex a49c43c2cf..a49c43c2cf 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png Binary files differindex ed4902f3ee..ed4902f3ee 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png Binary files differindex 0ac5b72b8f..0ac5b72b8f 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png +++ b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png Binary files differindex e9dea7e17e..e9dea7e17e 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_On.png b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png Binary files differindex 7a348ba22e..7a348ba22e 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Object_View_On.png +++ b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png Binary files differindex 53efa3a9a9..53efa3a9a9 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png b/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png Binary files differindex d7ec04237b..d7ec04237b 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png Binary files differindex e8fe243dc7..e8fe243dc7 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png +++ b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png Binary files differdeleted file mode 100644 index 5c0c85b864..0000000000 --- a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png Binary files differindex cd18ae310d..cd18ae310d 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png Binary files differdeleted file mode 100644 index 857fa1e047..0000000000 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png Binary files differindex b0ed6ee8eb..b0ed6ee8eb 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png Binary files differdeleted file mode 100644 index 453bb53673..0000000000 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png Binary files differindex 14ec77b99a..14ec77b99a 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png Binary files differdeleted file mode 100644 index 135a66ca0d..0000000000 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png Binary files differindex 48be51e9af..48be51e9af 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png Binary files differdeleted file mode 100644 index a63aec5e6d..0000000000 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png Binary files differindex be4881b64c..be4881b64c 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png Binary files differdeleted file mode 100644 index 1719eb3e84..0000000000 --- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png Binary files differindex 6cb33efb93..6cb33efb93 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png Binary files differindex 6cb33efb93..6cb33efb93 100644..100755 --- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Cone.png b/indra/newview/skins/default/textures/build/Object_Cone.png Binary files differindex 5167f1a820..5167f1a820 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Cone.png +++ b/indra/newview/skins/default/textures/build/Object_Cone.png diff --git a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png Binary files differindex d50dc69ffe..d50dc69ffe 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Cube.png b/indra/newview/skins/default/textures/build/Object_Cube.png Binary files differindex e82af1ca82..e82af1ca82 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Cube.png +++ b/indra/newview/skins/default/textures/build/Object_Cube.png diff --git a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png Binary files differindex 3d6964530d..3d6964530d 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder.png b/indra/newview/skins/default/textures/build/Object_Cylinder.png Binary files differindex fe1041d4c7..fe1041d4c7 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Cylinder.png +++ b/indra/newview/skins/default/textures/build/Object_Cylinder.png diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png Binary files differindex 3ed0389961..3ed0389961 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Grass.png b/indra/newview/skins/default/textures/build/Object_Grass.png Binary files differindex a88efd5f3e..a88efd5f3e 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Grass.png +++ b/indra/newview/skins/default/textures/build/Object_Grass.png diff --git a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png Binary files differindex 3ebd5ea7a1..3ebd5ea7a1 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png Binary files differindex 595f64d480..595f64d480 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png +++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png Binary files differindex 3bdc4d1fd5..3bdc4d1fd5 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png Binary files differindex dd41d56fb3..dd41d56fb3 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png +++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png Binary files differindex 0912442e29..0912442e29 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png Binary files differindex 1489630624..1489630624 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png +++ b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png Binary files differindex 33db4a2de8..33db4a2de8 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Prism.png b/indra/newview/skins/default/textures/build/Object_Prism.png Binary files differindex 51c6c161a0..51c6c161a0 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Prism.png +++ b/indra/newview/skins/default/textures/build/Object_Prism.png diff --git a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png Binary files differindex 9e80fe2b84..9e80fe2b84 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid.png b/indra/newview/skins/default/textures/build/Object_Pyramid.png Binary files differindex a147b59553..a147b59553 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Pyramid.png +++ b/indra/newview/skins/default/textures/build/Object_Pyramid.png diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png Binary files differindex d36bfa55d4..d36bfa55d4 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Ring.png b/indra/newview/skins/default/textures/build/Object_Ring.png Binary files differindex a9790fd60c..a9790fd60c 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Ring.png +++ b/indra/newview/skins/default/textures/build/Object_Ring.png diff --git a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png Binary files differindex 962f6efb93..962f6efb93 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Sphere.png b/indra/newview/skins/default/textures/build/Object_Sphere.png Binary files differindex 8e2dd92a82..8e2dd92a82 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Sphere.png +++ b/indra/newview/skins/default/textures/build/Object_Sphere.png diff --git a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png Binary files differindex 715d597144..715d597144 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron.png Binary files differindex 23e22b1796..23e22b1796 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Tetrahedron.png +++ b/indra/newview/skins/default/textures/build/Object_Tetrahedron.png diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png Binary files differindex b2ea680f23..b2ea680f23 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Torus.png b/indra/newview/skins/default/textures/build/Object_Torus.png Binary files differindex 15c62423a9..15c62423a9 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Torus.png +++ b/indra/newview/skins/default/textures/build/Object_Torus.png diff --git a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png Binary files differindex 1fc22686eb..1fc22686eb 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Tree.png b/indra/newview/skins/default/textures/build/Object_Tree.png Binary files differindex 82c422419b..82c422419b 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Tree.png +++ b/indra/newview/skins/default/textures/build/Object_Tree.png diff --git a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png Binary files differindex 5bd87f8a2f..5bd87f8a2f 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png diff --git a/indra/newview/skins/default/textures/build/Object_Tube.png b/indra/newview/skins/default/textures/build/Object_Tube.png Binary files differindex e47fce7511..e47fce7511 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Tube.png +++ b/indra/newview/skins/default/textures/build/Object_Tube.png diff --git a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png Binary files differindex a4c3f39e14..a4c3f39e14 100644..100755 --- a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png +++ b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png diff --git a/indra/newview/skins/default/textures/build/Tool_Create.png b/indra/newview/skins/default/textures/build/Tool_Create.png Binary files differindex 1f1097def5..1f1097def5 100644..100755 --- a/indra/newview/skins/default/textures/build/Tool_Create.png +++ b/indra/newview/skins/default/textures/build/Tool_Create.png diff --git a/indra/newview/skins/default/textures/build/Tool_Dozer.png b/indra/newview/skins/default/textures/build/Tool_Dozer.png Binary files differindex 61744666f4..61744666f4 100644..100755 --- a/indra/newview/skins/default/textures/build/Tool_Dozer.png +++ b/indra/newview/skins/default/textures/build/Tool_Dozer.png diff --git a/indra/newview/skins/default/textures/build/Tool_Face.png b/indra/newview/skins/default/textures/build/Tool_Face.png Binary files differindex 5ab42a4ad6..5ab42a4ad6 100644..100755 --- a/indra/newview/skins/default/textures/build/Tool_Face.png +++ b/indra/newview/skins/default/textures/build/Tool_Face.png diff --git a/indra/newview/skins/default/textures/build/Tool_Grab.png b/indra/newview/skins/default/textures/build/Tool_Grab.png Binary files differindex 5c58288d5e..5c58288d5e 100644..100755 --- a/indra/newview/skins/default/textures/build/Tool_Grab.png +++ b/indra/newview/skins/default/textures/build/Tool_Grab.png diff --git a/indra/newview/skins/default/textures/build/Tool_Zoom.png b/indra/newview/skins/default/textures/build/Tool_Zoom.png Binary files differindex ad493b0d66..ad493b0d66 100644..100755 --- a/indra/newview/skins/default/textures/build/Tool_Zoom.png +++ b/indra/newview/skins/default/textures/build/Tool_Zoom.png diff --git a/indra/newview/skins/default/textures/button_anim_pause.tga b/indra/newview/skins/default/textures/button_anim_pause.tga Binary files differindex 577f9195d0..577f9195d0 100644..100755 --- a/indra/newview/skins/default/textures/button_anim_pause.tga +++ b/indra/newview/skins/default/textures/button_anim_pause.tga diff --git a/indra/newview/skins/default/textures/button_anim_pause_selected.tga b/indra/newview/skins/default/textures/button_anim_pause_selected.tga Binary files differindex 21384316a8..21384316a8 100644..100755 --- a/indra/newview/skins/default/textures/button_anim_pause_selected.tga +++ b/indra/newview/skins/default/textures/button_anim_pause_selected.tga diff --git a/indra/newview/skins/default/textures/button_anim_play.tga b/indra/newview/skins/default/textures/button_anim_play.tga Binary files differindex 9ed55f829d..9ed55f829d 100644..100755 --- a/indra/newview/skins/default/textures/button_anim_play.tga +++ b/indra/newview/skins/default/textures/button_anim_play.tga diff --git a/indra/newview/skins/default/textures/button_anim_play_selected.tga b/indra/newview/skins/default/textures/button_anim_play_selected.tga Binary files differindex b166a4178d..b166a4178d 100644..100755 --- a/indra/newview/skins/default/textures/button_anim_play_selected.tga +++ b/indra/newview/skins/default/textures/button_anim_play_selected.tga diff --git a/indra/newview/skins/default/textures/checker.png b/indra/newview/skins/default/textures/checker.png Binary files differindex 1ab87e3f02..1ab87e3f02 100644..100755 --- a/indra/newview/skins/default/textures/checker.png +++ b/indra/newview/skins/default/textures/checker.png diff --git a/indra/newview/skins/default/textures/cloud-particle.j2c b/indra/newview/skins/default/textures/cloud-particle.j2c Binary files differindex 6c03bf6d05..6c03bf6d05 100644..100755 --- a/indra/newview/skins/default/textures/cloud-particle.j2c +++ b/indra/newview/skins/default/textures/cloud-particle.j2c diff --git a/indra/newview/skins/default/textures/color_swatch_alpha.tga b/indra/newview/skins/default/textures/color_swatch_alpha.tga Binary files differindex 814a004e62..814a004e62 100644..100755 --- a/indra/newview/skins/default/textures/color_swatch_alpha.tga +++ b/indra/newview/skins/default/textures/color_swatch_alpha.tga diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png Binary files differindex 19c842b816..19c842b816 100644..100755 --- a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png Binary files differindex b9879dcc8a..b9879dcc8a 100644..100755 --- a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png Binary files differindex d506cda5c9..d506cda5c9 100644..100755 --- a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png Binary files differindex 08f7493a02..08f7493a02 100644..100755 --- a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_Off.png b/indra/newview/skins/default/textures/containers/Accordion_Off.png Binary files differindex 414f4509c6..414f4509c6 100644..100755 --- a/indra/newview/skins/default/textures/containers/Accordion_Off.png +++ b/indra/newview/skins/default/textures/containers/Accordion_Off.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_Over.png b/indra/newview/skins/default/textures/containers/Accordion_Over.png Binary files differindex 5416d73310..5416d73310 100644..100755 --- a/indra/newview/skins/default/textures/containers/Accordion_Over.png +++ b/indra/newview/skins/default/textures/containers/Accordion_Over.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_Press.png b/indra/newview/skins/default/textures/containers/Accordion_Press.png Binary files differindex 1578e0dfc5..1578e0dfc5 100644..100755 --- a/indra/newview/skins/default/textures/containers/Accordion_Press.png +++ b/indra/newview/skins/default/textures/containers/Accordion_Press.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_Selected.png b/indra/newview/skins/default/textures/containers/Accordion_Selected.png Binary files differindex 0616dea6a3..0616dea6a3 100644..100755 --- a/indra/newview/skins/default/textures/containers/Accordion_Selected.png +++ b/indra/newview/skins/default/textures/containers/Accordion_Selected.png diff --git a/indra/newview/skins/default/textures/containers/Container.png b/indra/newview/skins/default/textures/containers/Container.png Binary files differindex 511eb94386..511eb94386 100644..100755 --- a/indra/newview/skins/default/textures/containers/Container.png +++ b/indra/newview/skins/default/textures/containers/Container.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png Binary files differindex 1951413f8d..1951413f8d 100644..100755 --- a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png +++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png Binary files differindex 8364716e02..8364716e02 100644..100755 --- a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png +++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png Binary files differindex 21f1c2d8a8..21f1c2d8a8 100644..100755 --- a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png +++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png Binary files differindex 3946917c7c..3946917c7c 100644..100755 --- a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png +++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png Binary files differindex eeef28e5a5..eeef28e5a5 100644..100755 --- a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png +++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png Binary files differindex b0f1f16398..b0f1f16398 100644..100755 --- a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png +++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png Binary files differindex 9f1e2a469d..9f1e2a469d 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png Binary files differindex 41b5d24d87..41b5d24d87 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png Binary files differindex 083acc0156..083acc0156 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png Binary files differindex ee4649a8f9..ee4649a8f9 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png Binary files differindex dd73d655e9..dd73d655e9 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png Binary files differindex 55c02160e3..55c02160e3 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png Binary files differindex 2f6ea90196..2f6ea90196 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png Binary files differindex 642113b135..642113b135 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png Binary files differindex f6b775c2a0..f6b775c2a0 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png Binary files differindex 01fd765c3d..01fd765c3d 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png Binary files differindex 74e00635f1..74e00635f1 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png Binary files differindex 8a0d98a780..8a0d98a780 100644..100755 --- a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png +++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png diff --git a/indra/newview/skins/default/textures/crosshairs.tga b/indra/newview/skins/default/textures/crosshairs.tga Binary files differindex ac4d63dc59..ac4d63dc59 100644..100755 --- a/indra/newview/skins/default/textures/crosshairs.tga +++ b/indra/newview/skins/default/textures/crosshairs.tga diff --git a/indra/newview/skins/default/textures/default_land_picture.j2c b/indra/newview/skins/default/textures/default_land_picture.j2c Binary files differindex 34df0291ae..34df0291ae 100644..100755 --- a/indra/newview/skins/default/textures/default_land_picture.j2c +++ b/indra/newview/skins/default/textures/default_land_picture.j2c diff --git a/indra/newview/skins/default/textures/default_profile_picture.j2c b/indra/newview/skins/default/textures/default_profile_picture.j2c Binary files differindex f21742cf09..f21742cf09 100644..100755 --- a/indra/newview/skins/default/textures/default_profile_picture.j2c +++ b/indra/newview/skins/default/textures/default_profile_picture.j2c diff --git a/indra/newview/skins/default/textures/direction_arrow.tga b/indra/newview/skins/default/textures/direction_arrow.tga Binary files differindex f3ef1068c4..f3ef1068c4 100644..100755 --- a/indra/newview/skins/default/textures/direction_arrow.tga +++ b/indra/newview/skins/default/textures/direction_arrow.tga diff --git a/indra/newview/skins/default/textures/down_arrow.png b/indra/newview/skins/default/textures/down_arrow.png Binary files differindex 155f80c97e..155f80c97e 100644..100755 --- a/indra/newview/skins/default/textures/down_arrow.png +++ b/indra/newview/skins/default/textures/down_arrow.png diff --git a/indra/newview/skins/default/textures/eye_button_active.tga b/indra/newview/skins/default/textures/eye_button_active.tga Binary files differindex 014f785a7b..014f785a7b 100644..100755 --- a/indra/newview/skins/default/textures/eye_button_active.tga +++ b/indra/newview/skins/default/textures/eye_button_active.tga diff --git a/indra/newview/skins/default/textures/eye_button_inactive.tga b/indra/newview/skins/default/textures/eye_button_inactive.tga Binary files differindex 8666f0bbe6..8666f0bbe6 100644..100755 --- a/indra/newview/skins/default/textures/eye_button_inactive.tga +++ b/indra/newview/skins/default/textures/eye_button_inactive.tga diff --git a/indra/newview/skins/default/textures/flatnormal.tga b/indra/newview/skins/default/textures/flatnormal.tga Binary files differnew file mode 100644 index 0000000000..6d5abd1782 --- /dev/null +++ b/indra/newview/skins/default/textures/flatnormal.tga diff --git a/indra/newview/skins/default/textures/folder_arrow.tga b/indra/newview/skins/default/textures/folder_arrow.tga Binary files differindex 77d470731b..77d470731b 100644..100755 --- a/indra/newview/skins/default/textures/folder_arrow.tga +++ b/indra/newview/skins/default/textures/folder_arrow.tga diff --git a/indra/newview/skins/default/textures/foot_shadow.j2c b/indra/newview/skins/default/textures/foot_shadow.j2c Binary files differindex f9ce9da7d1..f9ce9da7d1 100644..100755 --- a/indra/newview/skins/default/textures/foot_shadow.j2c +++ b/indra/newview/skins/default/textures/foot_shadow.j2c diff --git a/indra/newview/skins/default/textures/green_checkmark.png b/indra/newview/skins/default/textures/green_checkmark.png Binary files differindex d2a5b348dc..d2a5b348dc 100644..100755 --- a/indra/newview/skins/default/textures/green_checkmark.png +++ b/indra/newview/skins/default/textures/green_checkmark.png diff --git a/indra/newview/skins/default/textures/icn_media_movie.tga b/indra/newview/skins/default/textures/icn_media_movie.tga Binary files differindex 43dd342c9d..43dd342c9d 100644..100755 --- a/indra/newview/skins/default/textures/icn_media_movie.tga +++ b/indra/newview/skins/default/textures/icn_media_movie.tga diff --git a/indra/newview/skins/default/textures/icn_media_web.tga b/indra/newview/skins/default/textures/icn_media_web.tga Binary files differindex 7c9131dfff..7c9131dfff 100644..100755 --- a/indra/newview/skins/default/textures/icn_media_web.tga +++ b/indra/newview/skins/default/textures/icn_media_web.tga diff --git a/indra/newview/skins/default/textures/icon_avatar_offline.tga b/indra/newview/skins/default/textures/icon_avatar_offline.tga Binary files differindex cfa95eb00e..cfa95eb00e 100644..100755 --- a/indra/newview/skins/default/textures/icon_avatar_offline.tga +++ b/indra/newview/skins/default/textures/icon_avatar_offline.tga diff --git a/indra/newview/skins/default/textures/icon_avatar_online.tga b/indra/newview/skins/default/textures/icon_avatar_online.tga Binary files differindex 45221213eb..45221213eb 100644..100755 --- a/indra/newview/skins/default/textures/icon_avatar_online.tga +++ b/indra/newview/skins/default/textures/icon_avatar_online.tga diff --git a/indra/newview/skins/default/textures/icon_diurnal.tga b/indra/newview/skins/default/textures/icon_diurnal.tga Binary files differindex fc720c8269..fc720c8269 100644..100755 --- a/indra/newview/skins/default/textures/icon_diurnal.tga +++ b/indra/newview/skins/default/textures/icon_diurnal.tga diff --git a/indra/newview/skins/default/textures/icon_for_sale_adult.tga b/indra/newview/skins/default/textures/icon_for_sale_adult.tga Binary files differindex 6a99188f87..6a99188f87 100644..100755 --- a/indra/newview/skins/default/textures/icon_for_sale_adult.tga +++ b/indra/newview/skins/default/textures/icon_for_sale_adult.tga diff --git a/indra/newview/skins/default/textures/icon_top_pick.tga b/indra/newview/skins/default/textures/icon_top_pick.tga Binary files differindex 0b34882d2f..0b34882d2f 100644..100755 --- a/indra/newview/skins/default/textures/icon_top_pick.tga +++ b/indra/newview/skins/default/textures/icon_top_pick.tga diff --git a/indra/newview/skins/default/textures/icons/AddItem_Disabled.png b/indra/newview/skins/default/textures/icons/AddItem_Disabled.png Binary files differindex cf88c89ae5..cf88c89ae5 100644..100755 --- a/indra/newview/skins/default/textures/icons/AddItem_Disabled.png +++ b/indra/newview/skins/default/textures/icons/AddItem_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/AddItem_Off.png b/indra/newview/skins/default/textures/icons/AddItem_Off.png Binary files differindex 52d4f9bc80..52d4f9bc80 100644..100755 --- a/indra/newview/skins/default/textures/icons/AddItem_Off.png +++ b/indra/newview/skins/default/textures/icons/AddItem_Off.png diff --git a/indra/newview/skins/default/textures/icons/AddItem_Press.png b/indra/newview/skins/default/textures/icons/AddItem_Press.png Binary files differindex acc898e5f4..acc898e5f4 100644..100755 --- a/indra/newview/skins/default/textures/icons/AddItem_Press.png +++ b/indra/newview/skins/default/textures/icons/AddItem_Press.png diff --git a/indra/newview/skins/default/textures/icons/AudioMute_Off.png b/indra/newview/skins/default/textures/icons/AudioMute_Off.png Binary files differindex 938aaef491..938aaef491 100644..100755 --- a/indra/newview/skins/default/textures/icons/AudioMute_Off.png +++ b/indra/newview/skins/default/textures/icons/AudioMute_Off.png diff --git a/indra/newview/skins/default/textures/icons/AudioMute_Over.png b/indra/newview/skins/default/textures/icons/AudioMute_Over.png Binary files differindex 7bd1b12aae..7bd1b12aae 100644..100755 --- a/indra/newview/skins/default/textures/icons/AudioMute_Over.png +++ b/indra/newview/skins/default/textures/icons/AudioMute_Over.png diff --git a/indra/newview/skins/default/textures/icons/Audio_Off.png b/indra/newview/skins/default/textures/icons/Audio_Off.png Binary files differindex ef746aab92..ef746aab92 100644..100755 --- a/indra/newview/skins/default/textures/icons/Audio_Off.png +++ b/indra/newview/skins/default/textures/icons/Audio_Off.png diff --git a/indra/newview/skins/default/textures/icons/Audio_Press.png b/indra/newview/skins/default/textures/icons/Audio_Press.png Binary files differindex 25a669224a..25a669224a 100644..100755 --- a/indra/newview/skins/default/textures/icons/Audio_Press.png +++ b/indra/newview/skins/default/textures/icons/Audio_Press.png diff --git a/indra/newview/skins/default/textures/icons/BackArrow_Off.png b/indra/newview/skins/default/textures/icons/BackArrow_Off.png Binary files differindex ff32192856..ff32192856 100644..100755 --- a/indra/newview/skins/default/textures/icons/BackArrow_Off.png +++ b/indra/newview/skins/default/textures/icons/BackArrow_Off.png diff --git a/indra/newview/skins/default/textures/icons/Conv_log_inbox.png b/indra/newview/skins/default/textures/icons/Conv_log_inbox.png Binary files differnew file mode 100755 index 0000000000..bb6ca28147 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_log_inbox.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png Binary files differnew file mode 100755 index 0000000000..0631f16f3b --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png Binary files differnew file mode 100755 index 0000000000..578482f5ed --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png Binary files differnew file mode 100755 index 0000000000..7676131790 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png Binary files differnew file mode 100755 index 0000000000..2880eb766a --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_close.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_close.png Binary files differnew file mode 100755 index 0000000000..d009c8f446 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_close.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png Binary files differnew file mode 100755 index 0000000000..8d82960e28 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png Binary files differnew file mode 100755 index 0000000000..f718d3fc60 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png Binary files differnew file mode 100755 index 0000000000..315e2c581a --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.png Binary files differnew file mode 100755 index 0000000000..732ab02a20 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png Binary files differnew file mode 100755 index 0000000000..25a32cb2ba --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png Binary files differnew file mode 100755 index 0000000000..08debeb91f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png diff --git a/indra/newview/skins/default/textures/icons/Copy.png b/indra/newview/skins/default/textures/icons/Copy.png Binary files differindex d45134e9dd..d45134e9dd 100644..100755 --- a/indra/newview/skins/default/textures/icons/Copy.png +++ b/indra/newview/skins/default/textures/icons/Copy.png diff --git a/indra/newview/skins/default/textures/icons/DownArrow_Off.png b/indra/newview/skins/default/textures/icons/DownArrow_Off.png Binary files differindex 60f62eed4a..60f62eed4a 100644..100755 --- a/indra/newview/skins/default/textures/icons/DownArrow_Off.png +++ b/indra/newview/skins/default/textures/icons/DownArrow_Off.png diff --git a/indra/newview/skins/default/textures/icons/Edit_Wrench.png b/indra/newview/skins/default/textures/icons/Edit_Wrench.png Binary files differindex edb40b9c96..edb40b9c96 100644..100755 --- a/indra/newview/skins/default/textures/icons/Edit_Wrench.png +++ b/indra/newview/skins/default/textures/icons/Edit_Wrench.png diff --git a/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png b/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png Binary files differindex 69646ce473..69646ce473 100644..100755 --- a/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png +++ b/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png diff --git a/indra/newview/skins/default/textures/icons/Female.png b/indra/newview/skins/default/textures/icons/Female.png Binary files differindex 67b5653a94..67b5653a94 100644..100755 --- a/indra/newview/skins/default/textures/icons/Female.png +++ b/indra/newview/skins/default/textures/icons/Female.png diff --git a/indra/newview/skins/default/textures/icons/ForSale_Badge.png b/indra/newview/skins/default/textures/icons/ForSale_Badge.png Binary files differindex 5bee570cee..5bee570cee 100644..100755 --- a/indra/newview/skins/default/textures/icons/ForSale_Badge.png +++ b/indra/newview/skins/default/textures/icons/ForSale_Badge.png diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png Binary files differindex e9b72b0401..e9b72b0401 100644..100755 --- a/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png +++ b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png Binary files differindex c7b2c769ae..c7b2c769ae 100644..100755 --- a/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png +++ b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png diff --git a/indra/newview/skins/default/textures/icons/Generic_Group.png b/indra/newview/skins/default/textures/icons/Generic_Group.png Binary files differindex 9d76f75d0f..9d76f75d0f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Generic_Group.png +++ b/indra/newview/skins/default/textures/icons/Generic_Group.png 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 75833eccf3..75833eccf3 100644..100755 --- 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_Object_Small.png b/indra/newview/skins/default/textures/icons/Generic_Object_Small.png Binary files differindex 223874e631..223874e631 100644..100755 --- a/indra/newview/skins/default/textures/icons/Generic_Object_Small.png +++ b/indra/newview/skins/default/textures/icons/Generic_Object_Small.png diff --git a/indra/newview/skins/default/textures/icons/Generic_Person.png b/indra/newview/skins/default/textures/icons/Generic_Person.png Binary files differindex 45b491ab59..45b491ab59 100644..100755 --- a/indra/newview/skins/default/textures/icons/Generic_Person.png +++ b/indra/newview/skins/default/textures/icons/Generic_Person.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 532288b430..532288b430 100644..100755 --- 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/Hierarchy_View_Disabled.png b/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png Binary files differindex fb370f98d5..fb370f98d5 100644..100755 --- a/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png +++ b/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png b/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png Binary files differindex 296311e797..296311e797 100644..100755 --- a/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png +++ b/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png diff --git a/indra/newview/skins/default/textures/icons/Icon_For_Sale.png b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png Binary files differindex 3dec6b989c..3dec6b989c 100644..100755 --- a/indra/newview/skins/default/textures/icons/Icon_For_Sale.png +++ b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png diff --git a/indra/newview/skins/default/textures/icons/Info.png b/indra/newview/skins/default/textures/icons/Info.png Binary files differindex e52560281b..e52560281b 100644..100755 --- a/indra/newview/skins/default/textures/icons/Info.png +++ b/indra/newview/skins/default/textures/icons/Info.png diff --git a/indra/newview/skins/default/textures/icons/Info_Over.png b/indra/newview/skins/default/textures/icons/Info_Over.png Binary files differindex be1cd0706f..be1cd0706f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Info_Over.png +++ b/indra/newview/skins/default/textures/icons/Info_Over.png diff --git a/indra/newview/skins/default/textures/icons/Info_Small.png b/indra/newview/skins/default/textures/icons/Info_Small.png Binary files differindex 81078c32dc..81078c32dc 100644..100755 --- a/indra/newview/skins/default/textures/icons/Info_Small.png +++ b/indra/newview/skins/default/textures/icons/Info_Small.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Alpha.png b/indra/newview/skins/default/textures/icons/Inv_Alpha.png Binary files differindex b65dc1929d..b65dc1929d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Alpha.png +++ b/indra/newview/skins/default/textures/icons/Inv_Alpha.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Animation.png b/indra/newview/skins/default/textures/icons/Inv_Animation.png Binary files differindex ab42c61a92..ab42c61a92 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Animation.png +++ b/indra/newview/skins/default/textures/icons/Inv_Animation.png diff --git a/indra/newview/skins/default/textures/icons/Inv_BodyShape.png b/indra/newview/skins/default/textures/icons/Inv_BodyShape.png Binary files differindex 97e874d70d..97e874d70d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_BodyShape.png +++ b/indra/newview/skins/default/textures/icons/Inv_BodyShape.png diff --git a/indra/newview/skins/default/textures/icons/Inv_CallingCard.png b/indra/newview/skins/default/textures/icons/Inv_CallingCard.png Binary files differindex 1de96475f7..1de96475f7 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_CallingCard.png +++ b/indra/newview/skins/default/textures/icons/Inv_CallingCard.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Clothing.png b/indra/newview/skins/default/textures/icons/Inv_Clothing.png Binary files differindex e8d246c6fa..e8d246c6fa 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Clothing.png +++ b/indra/newview/skins/default/textures/icons/Inv_Clothing.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Eye.png b/indra/newview/skins/default/textures/icons/Inv_Eye.png Binary files differindex e619f56c2b..e619f56c2b 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Eye.png +++ b/indra/newview/skins/default/textures/icons/Inv_Eye.png diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png b/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png Binary files differindex 342a973d00..342a973d00 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png +++ b/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png b/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png Binary files differindex 0507c2cbaf..0507c2cbaf 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png +++ b/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Gesture.png b/indra/newview/skins/default/textures/icons/Inv_Gesture.png Binary files differindex 52695ec19b..52695ec19b 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Gesture.png +++ b/indra/newview/skins/default/textures/icons/Inv_Gesture.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Gloves.png b/indra/newview/skins/default/textures/icons/Inv_Gloves.png Binary files differindex d6a2113aaf..d6a2113aaf 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Gloves.png +++ b/indra/newview/skins/default/textures/icons/Inv_Gloves.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Hair.png b/indra/newview/skins/default/textures/icons/Inv_Hair.png Binary files differindex ae941b0dd5..ae941b0dd5 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Hair.png +++ b/indra/newview/skins/default/textures/icons/Inv_Hair.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 differindex 328be104ee..328be104ee 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Invalid.png +++ b/indra/newview/skins/default/textures/icons/Inv_Invalid.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Jacket.png b/indra/newview/skins/default/textures/icons/Inv_Jacket.png Binary files differindex 3859666f7c..3859666f7c 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Jacket.png +++ b/indra/newview/skins/default/textures/icons/Inv_Jacket.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Landmark.png b/indra/newview/skins/default/textures/icons/Inv_Landmark.png Binary files differindex 76df984596..76df984596 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Landmark.png +++ b/indra/newview/skins/default/textures/icons/Inv_Landmark.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Link.png b/indra/newview/skins/default/textures/icons/Inv_Link.png Binary files differindex c1543dacb5..c1543dacb5 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Link.png +++ b/indra/newview/skins/default/textures/icons/Inv_Link.png diff --git a/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png b/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png Binary files differindex 73a708782c..73a708782c 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png +++ b/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png diff --git a/indra/newview/skins/default/textures/icons/Inv_LinkItem.png b/indra/newview/skins/default/textures/icons/Inv_LinkItem.png Binary files differindex 73a708782c..73a708782c 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_LinkItem.png +++ b/indra/newview/skins/default/textures/icons/Inv_LinkItem.png diff --git a/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png b/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png Binary files differindex f2ae828efc..f2ae828efc 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png +++ b/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png diff --git a/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png b/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png Binary files differindex d454d4cd48..d454d4cd48 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png +++ b/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png diff --git a/indra/newview/skins/default/textures/icons/Inv_LostClosed.png b/indra/newview/skins/default/textures/icons/Inv_LostClosed.png Binary files differindex a800217e0d..a800217e0d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_LostClosed.png +++ b/indra/newview/skins/default/textures/icons/Inv_LostClosed.png diff --git a/indra/newview/skins/default/textures/icons/Inv_LostOpen.png b/indra/newview/skins/default/textures/icons/Inv_LostOpen.png Binary files differindex 8c4a1a9ac0..8c4a1a9ac0 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_LostOpen.png +++ b/indra/newview/skins/default/textures/icons/Inv_LostOpen.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Mesh.png b/indra/newview/skins/default/textures/icons/Inv_Mesh.png Binary files differindex f1f21f7941..f1f21f7941 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Mesh.png +++ b/indra/newview/skins/default/textures/icons/Inv_Mesh.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Notecard.png b/indra/newview/skins/default/textures/icons/Inv_Notecard.png Binary files differindex 4645ab8e91..4645ab8e91 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Notecard.png +++ b/indra/newview/skins/default/textures/icons/Inv_Notecard.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Object.png b/indra/newview/skins/default/textures/icons/Inv_Object.png Binary files differindex f883696a82..f883696a82 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Object.png +++ b/indra/newview/skins/default/textures/icons/Inv_Object.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png Binary files differindex 11f4871ad8..11f4871ad8 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png +++ b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Pants.png b/indra/newview/skins/default/textures/icons/Inv_Pants.png Binary files differindex fe2389f074..fe2389f074 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Pants.png +++ b/indra/newview/skins/default/textures/icons/Inv_Pants.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Physics.png b/indra/newview/skins/default/textures/icons/Inv_Physics.png Binary files differindex 360baec46d..360baec46d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Physics.png +++ b/indra/newview/skins/default/textures/icons/Inv_Physics.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Script.png b/indra/newview/skins/default/textures/icons/Inv_Script.png Binary files differindex 0fba27a7aa..0fba27a7aa 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Script.png +++ b/indra/newview/skins/default/textures/icons/Inv_Script.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Shirt.png b/indra/newview/skins/default/textures/icons/Inv_Shirt.png Binary files differindex 81c1538dd2..81c1538dd2 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Shirt.png +++ b/indra/newview/skins/default/textures/icons/Inv_Shirt.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Shoe.png b/indra/newview/skins/default/textures/icons/Inv_Shoe.png Binary files differindex 1f52b0a6b6..1f52b0a6b6 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Shoe.png +++ b/indra/newview/skins/default/textures/icons/Inv_Shoe.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Skin.png b/indra/newview/skins/default/textures/icons/Inv_Skin.png Binary files differindex b7da922046..b7da922046 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Skin.png +++ b/indra/newview/skins/default/textures/icons/Inv_Skin.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Skirt.png b/indra/newview/skins/default/textures/icons/Inv_Skirt.png Binary files differindex 246e9a87aa..246e9a87aa 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Skirt.png +++ b/indra/newview/skins/default/textures/icons/Inv_Skirt.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Snapshot.png b/indra/newview/skins/default/textures/icons/Inv_Snapshot.png Binary files differindex 39efd2be1b..39efd2be1b 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Snapshot.png +++ b/indra/newview/skins/default/textures/icons/Inv_Snapshot.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Socks.png b/indra/newview/skins/default/textures/icons/Inv_Socks.png Binary files differindex 30d7d7c239..30d7d7c239 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Socks.png +++ b/indra/newview/skins/default/textures/icons/Inv_Socks.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Sound.png b/indra/newview/skins/default/textures/icons/Inv_Sound.png Binary files differindex 44c271c868..44c271c868 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Sound.png +++ b/indra/newview/skins/default/textures/icons/Inv_Sound.png diff --git a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png Binary files differindex dcf998449f..dcf998449f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png +++ b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png diff --git a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png Binary files differindex 0efd403c95..0efd403c95 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png +++ b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png Binary files differindex a632197eb5..a632197eb5 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png +++ b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Texture.png b/indra/newview/skins/default/textures/icons/Inv_Texture.png Binary files differindex dbc41c5e99..dbc41c5e99 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Texture.png +++ b/indra/newview/skins/default/textures/icons/Inv_Texture.png diff --git a/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png b/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png Binary files differindex c5201e6f9a..c5201e6f9a 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png +++ b/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png diff --git a/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png b/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png Binary files differindex 4a886a3f37..4a886a3f37 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png +++ b/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Underpants.png b/indra/newview/skins/default/textures/icons/Inv_Underpants.png Binary files differindex b1e7c2a55f..b1e7c2a55f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Underpants.png +++ b/indra/newview/skins/default/textures/icons/Inv_Underpants.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Undershirt.png b/indra/newview/skins/default/textures/icons/Inv_Undershirt.png Binary files differindex 9340dbb975..9340dbb975 100644..100755 --- a/indra/newview/skins/default/textures/icons/Inv_Undershirt.png +++ b/indra/newview/skins/default/textures/icons/Inv_Undershirt.png diff --git a/indra/newview/skins/default/textures/icons/List_View_Disabled.png b/indra/newview/skins/default/textures/icons/List_View_Disabled.png Binary files differindex 155dee5047..155dee5047 100644..100755 --- a/indra/newview/skins/default/textures/icons/List_View_Disabled.png +++ b/indra/newview/skins/default/textures/icons/List_View_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/List_View_On.png b/indra/newview/skins/default/textures/icons/List_View_On.png Binary files differindex 9127c92c3b..9127c92c3b 100644..100755 --- a/indra/newview/skins/default/textures/icons/List_View_On.png +++ b/indra/newview/skins/default/textures/icons/List_View_On.png diff --git a/indra/newview/skins/default/textures/icons/Lock.png b/indra/newview/skins/default/textures/icons/Lock.png Binary files differindex eb5b5ae7a9..eb5b5ae7a9 100644..100755 --- a/indra/newview/skins/default/textures/icons/Lock.png +++ b/indra/newview/skins/default/textures/icons/Lock.png diff --git a/indra/newview/skins/default/textures/icons/Locked_Icon.png b/indra/newview/skins/default/textures/icons/Locked_Icon.png Binary files differindex 8ead280794..8ead280794 100644..100755 --- a/indra/newview/skins/default/textures/icons/Locked_Icon.png +++ b/indra/newview/skins/default/textures/icons/Locked_Icon.png diff --git a/indra/newview/skins/default/textures/icons/Male.png b/indra/newview/skins/default/textures/icons/Male.png Binary files differindex f3fad77fd0..f3fad77fd0 100644..100755 --- a/indra/newview/skins/default/textures/icons/Male.png +++ b/indra/newview/skins/default/textures/icons/Male.png diff --git a/indra/newview/skins/default/textures/icons/Microphone_On.png b/indra/newview/skins/default/textures/icons/Microphone_On.png Binary files differindex c96b500fa1..c96b500fa1 100644..100755 --- a/indra/newview/skins/default/textures/icons/Microphone_On.png +++ b/indra/newview/skins/default/textures/icons/Microphone_On.png diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png Binary files differindex 75bd73cef1..75bd73cef1 100644..100755 --- a/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png +++ b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Off.png b/indra/newview/skins/default/textures/icons/MinusItem_Off.png Binary files differindex 6f285f3546..6f285f3546 100644..100755 --- a/indra/newview/skins/default/textures/icons/MinusItem_Off.png +++ b/indra/newview/skins/default/textures/icons/MinusItem_Off.png diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Press.png b/indra/newview/skins/default/textures/icons/MinusItem_Press.png Binary files differindex 50f65765d5..50f65765d5 100644..100755 --- a/indra/newview/skins/default/textures/icons/MinusItem_Press.png +++ b/indra/newview/skins/default/textures/icons/MinusItem_Press.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png Binary files differindex fb341e9c83..fb341e9c83 100644..100755 --- a/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png Binary files differindex 25b055bfc0..25b055bfc0 100644..100755 --- a/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png Binary files differindex 6e91dd7159..6e91dd7159 100644..100755 --- a/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png Binary files differindex be58114aa1..be58114aa1 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png Binary files differindex e6b9480ab1..e6b9480ab1 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On.png b/indra/newview/skins/default/textures/icons/OutboxPush_On.png Binary files differindex ffda2e92d4..ffda2e92d4 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_On.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_On.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png Binary files differindex 6b5911014f..6b5911014f 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png Binary files differindex 9c26b92e73..9c26b92e73 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png Binary files differindex 3b5d462975..3b5d462975 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png Binary files differindex f85be047b0..f85be047b0 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png Binary files differindex cd4e482216..cd4e482216 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png Binary files differindex d212a871ce..d212a871ce 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png Binary files differindex e5b6023e36..e5b6023e36 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png Binary files differindex e1911a092f..e1911a092f 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png Binary files differindex 9e59f7843a..9e59f7843a 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png Binary files differindex 51e8bff646..51e8bff646 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png Binary files differindex 300e2e69e1..300e2e69e1 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png Binary files differindex 32fb236381..32fb236381 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png Binary files differindex 827f343b1e..827f343b1e 100644..100755 --- a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png +++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png Binary files differindex fb1f7d3a6d..fb1f7d3a6d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png Binary files differindex e6f614b844..e6f614b844 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png Binary files differindex 84a96a60cb..84a96a60cb 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png Binary files differindex d55ebd7c67..d55ebd7c67 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png Binary files differindex ae4077488b..ae4077488b 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png b/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png Binary files differindex 4813d37198..4813d37198 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png Binary files differindex e0b18b2451..e0b18b2451 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png Binary files differindex 101aaa42b1..101aaa42b1 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png Binary files differindex c27f18e3c7..c27f18e3c7 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png b/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png Binary files differindex d28e5357df..d28e5357df 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png Binary files differindex d72f02f708..d72f02f708 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png Binary files differindex 60e6a00a25..60e6a00a25 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Light.png b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png Binary files differindex 55f97f3b4e..55f97f3b4e 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_M_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png Binary files differindex 11ab1f1e60..11ab1f1e60 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png Binary files differindex b536762ddc..b536762ddc 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png Binary files differindex 8f0fe6a04d..8f0fe6a04d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png Binary files differindex eba7070b4d..eba7070b4d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png Binary files differindex 08c2a18ac3..08c2a18ac3 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png Binary files differindex bf618752f6..bf618752f6 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Light.png b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png Binary files differindex a67bbd0cc5..a67bbd0cc5 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_R_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png Binary files differindex 8f9f37a1bf..8f9f37a1bf 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png Binary files differindex 8b1d6c5e14..8b1d6c5e14 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png Binary files differindex 956e02b14d..956e02b14d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png Binary files differindex 434caeda8b..434caeda8b 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png Binary files differindex 064687ed0f..064687ed0f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png Binary files differindex 5465650d0c..5465650d0c 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png Binary files differindex eace54ae79..eace54ae79 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png Binary files differindex 0d07e552b1..0d07e552b1 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png Binary files differindex b36a9bd2f0..b36a9bd2f0 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png b/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png Binary files differindex 86ce19474a..86ce19474a 100644..100755 --- a/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png Binary files differindex cfa12cb7cc..cfa12cb7cc 100644..100755 --- a/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png +++ b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png Binary files differindex 0622141848..0622141848 100644..100755 --- a/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png +++ b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/Pause_Off.png b/indra/newview/skins/default/textures/icons/Pause_Off.png Binary files differindex 77f6be569d..77f6be569d 100644..100755 --- a/indra/newview/skins/default/textures/icons/Pause_Off.png +++ b/indra/newview/skins/default/textures/icons/Pause_Off.png diff --git a/indra/newview/skins/default/textures/icons/Pause_Over.png b/indra/newview/skins/default/textures/icons/Pause_Over.png Binary files differindex 580808bf7e..580808bf7e 100644..100755 --- a/indra/newview/skins/default/textures/icons/Pause_Over.png +++ b/indra/newview/skins/default/textures/icons/Pause_Over.png diff --git a/indra/newview/skins/default/textures/icons/Pause_Press.png b/indra/newview/skins/default/textures/icons/Pause_Press.png Binary files differindex 859db34cae..859db34cae 100644..100755 --- a/indra/newview/skins/default/textures/icons/Pause_Press.png +++ b/indra/newview/skins/default/textures/icons/Pause_Press.png diff --git a/indra/newview/skins/default/textures/icons/Person_Check.png b/indra/newview/skins/default/textures/icons/Person_Check.png Binary files differindex f8638540d4..f8638540d4 100644..100755 --- a/indra/newview/skins/default/textures/icons/Person_Check.png +++ b/indra/newview/skins/default/textures/icons/Person_Check.png diff --git a/indra/newview/skins/default/textures/icons/Person_Star.png b/indra/newview/skins/default/textures/icons/Person_Star.png Binary files differindex ad10580ac4..ad10580ac4 100644..100755 --- a/indra/newview/skins/default/textures/icons/Person_Star.png +++ b/indra/newview/skins/default/textures/icons/Person_Star.png diff --git a/indra/newview/skins/default/textures/icons/Play_Off.png b/indra/newview/skins/default/textures/icons/Play_Off.png Binary files differindex e594c1a4cb..e594c1a4cb 100644..100755 --- a/indra/newview/skins/default/textures/icons/Play_Off.png +++ b/indra/newview/skins/default/textures/icons/Play_Off.png diff --git a/indra/newview/skins/default/textures/icons/Play_Over.png b/indra/newview/skins/default/textures/icons/Play_Over.png Binary files differindex 70ab94e8c2..70ab94e8c2 100644..100755 --- a/indra/newview/skins/default/textures/icons/Play_Over.png +++ b/indra/newview/skins/default/textures/icons/Play_Over.png diff --git a/indra/newview/skins/default/textures/icons/Play_Press.png b/indra/newview/skins/default/textures/icons/Play_Press.png Binary files differindex b52742c6da..b52742c6da 100644..100755 --- a/indra/newview/skins/default/textures/icons/Play_Press.png +++ b/indra/newview/skins/default/textures/icons/Play_Press.png diff --git a/indra/newview/skins/default/textures/icons/Progress_1.png b/indra/newview/skins/default/textures/icons/Progress_1.png Binary files differindex 5d6efbfa2a..5d6efbfa2a 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_1.png +++ b/indra/newview/skins/default/textures/icons/Progress_1.png diff --git a/indra/newview/skins/default/textures/icons/Progress_10.png b/indra/newview/skins/default/textures/icons/Progress_10.png Binary files differindex 28203324f1..28203324f1 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_10.png +++ b/indra/newview/skins/default/textures/icons/Progress_10.png diff --git a/indra/newview/skins/default/textures/icons/Progress_11.png b/indra/newview/skins/default/textures/icons/Progress_11.png Binary files differindex 6b87be0c3f..6b87be0c3f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_11.png +++ b/indra/newview/skins/default/textures/icons/Progress_11.png diff --git a/indra/newview/skins/default/textures/icons/Progress_12.png b/indra/newview/skins/default/textures/icons/Progress_12.png Binary files differindex 089d58b090..089d58b090 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_12.png +++ b/indra/newview/skins/default/textures/icons/Progress_12.png diff --git a/indra/newview/skins/default/textures/icons/Progress_2.png b/indra/newview/skins/default/textures/icons/Progress_2.png Binary files differindex 94cb73b1f7..94cb73b1f7 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_2.png +++ b/indra/newview/skins/default/textures/icons/Progress_2.png diff --git a/indra/newview/skins/default/textures/icons/Progress_3.png b/indra/newview/skins/default/textures/icons/Progress_3.png Binary files differindex a04a5b5263..a04a5b5263 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_3.png +++ b/indra/newview/skins/default/textures/icons/Progress_3.png diff --git a/indra/newview/skins/default/textures/icons/Progress_4.png b/indra/newview/skins/default/textures/icons/Progress_4.png Binary files differindex a467098d82..a467098d82 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_4.png +++ b/indra/newview/skins/default/textures/icons/Progress_4.png diff --git a/indra/newview/skins/default/textures/icons/Progress_5.png b/indra/newview/skins/default/textures/icons/Progress_5.png Binary files differindex ea64f1d907..ea64f1d907 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_5.png +++ b/indra/newview/skins/default/textures/icons/Progress_5.png diff --git a/indra/newview/skins/default/textures/icons/Progress_6.png b/indra/newview/skins/default/textures/icons/Progress_6.png Binary files differindex fe4447935f..fe4447935f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_6.png +++ b/indra/newview/skins/default/textures/icons/Progress_6.png diff --git a/indra/newview/skins/default/textures/icons/Progress_7.png b/indra/newview/skins/default/textures/icons/Progress_7.png Binary files differindex 64fa294771..64fa294771 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_7.png +++ b/indra/newview/skins/default/textures/icons/Progress_7.png diff --git a/indra/newview/skins/default/textures/icons/Progress_8.png b/indra/newview/skins/default/textures/icons/Progress_8.png Binary files differindex a1c9a7f2eb..a1c9a7f2eb 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_8.png +++ b/indra/newview/skins/default/textures/icons/Progress_8.png diff --git a/indra/newview/skins/default/textures/icons/Progress_9.png b/indra/newview/skins/default/textures/icons/Progress_9.png Binary files differindex f3e9723184..f3e9723184 100644..100755 --- a/indra/newview/skins/default/textures/icons/Progress_9.png +++ b/indra/newview/skins/default/textures/icons/Progress_9.png diff --git a/indra/newview/skins/default/textures/icons/Refresh_Off.png b/indra/newview/skins/default/textures/icons/Refresh_Off.png Binary files differindex a8acfda741..a8acfda741 100644..100755 --- a/indra/newview/skins/default/textures/icons/Refresh_Off.png +++ b/indra/newview/skins/default/textures/icons/Refresh_Off.png diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png Binary files differindex 8342d7cfee..8342d7cfee 100644..100755 --- a/indra/newview/skins/default/textures/icons/SL_Logo.png +++ b/indra/newview/skins/default/textures/icons/SL_Logo.png diff --git a/indra/newview/skins/default/textures/icons/Search_Icon.png b/indra/newview/skins/default/textures/icons/Search_Icon.png Binary files differindex 541aa8f52a..541aa8f52a 100644..100755 --- a/indra/newview/skins/default/textures/icons/Search_Icon.png +++ b/indra/newview/skins/default/textures/icons/Search_Icon.png diff --git a/indra/newview/skins/default/textures/icons/Shirt_Large.png b/indra/newview/skins/default/textures/icons/Shirt_Large.png Binary files differindex 0f3846bccc..0f3846bccc 100644..100755 --- a/indra/newview/skins/default/textures/icons/Shirt_Large.png +++ b/indra/newview/skins/default/textures/icons/Shirt_Large.png diff --git a/indra/newview/skins/default/textures/icons/Shop.png b/indra/newview/skins/default/textures/icons/Shop.png Binary files differindex 81c13eeabd..81c13eeabd 100644..100755 --- a/indra/newview/skins/default/textures/icons/Shop.png +++ b/indra/newview/skins/default/textures/icons/Shop.png diff --git a/indra/newview/skins/default/textures/icons/SkipBackward_Off.png b/indra/newview/skins/default/textures/icons/SkipBackward_Off.png Binary files differindex 8fc10e6583..8fc10e6583 100644..100755 --- a/indra/newview/skins/default/textures/icons/SkipBackward_Off.png +++ b/indra/newview/skins/default/textures/icons/SkipBackward_Off.png diff --git a/indra/newview/skins/default/textures/icons/SkipForward_Off.png b/indra/newview/skins/default/textures/icons/SkipForward_Off.png Binary files differindex 2892e3cfa9..2892e3cfa9 100644..100755 --- a/indra/newview/skins/default/textures/icons/SkipForward_Off.png +++ b/indra/newview/skins/default/textures/icons/SkipForward_Off.png diff --git a/indra/newview/skins/default/textures/icons/StopReload_Off.png b/indra/newview/skins/default/textures/icons/StopReload_Off.png Binary files differindex 698569a540..698569a540 100644..100755 --- a/indra/newview/skins/default/textures/icons/StopReload_Off.png +++ b/indra/newview/skins/default/textures/icons/StopReload_Off.png diff --git a/indra/newview/skins/default/textures/icons/StopReload_Over.png b/indra/newview/skins/default/textures/icons/StopReload_Over.png Binary files differindex 251b38630a..251b38630a 100644..100755 --- a/indra/newview/skins/default/textures/icons/StopReload_Over.png +++ b/indra/newview/skins/default/textures/icons/StopReload_Over.png diff --git a/indra/newview/skins/default/textures/icons/Stop_Off.png b/indra/newview/skins/default/textures/icons/Stop_Off.png Binary files differindex 3ee215d36f..3ee215d36f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Stop_Off.png +++ b/indra/newview/skins/default/textures/icons/Stop_Off.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Disabled.png b/indra/newview/skins/default/textures/icons/Sync_Disabled.png Binary files differindex ca2e8def97..ca2e8def97 100644..100755 --- a/indra/newview/skins/default/textures/icons/Sync_Disabled.png +++ b/indra/newview/skins/default/textures/icons/Sync_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Enabled.png b/indra/newview/skins/default/textures/icons/Sync_Enabled.png Binary files differindex bc236c8b98..bc236c8b98 100644..100755 --- a/indra/newview/skins/default/textures/icons/Sync_Enabled.png +++ b/indra/newview/skins/default/textures/icons/Sync_Enabled.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png Binary files differindex 624e556376..624e556376 100644..100755 --- a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png Binary files differindex 5769803b3f..5769803b3f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png Binary files differindex 92d4bfb020..92d4bfb020 100644..100755 --- a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png Binary files differindex 6d43eb3a9f..6d43eb3a9f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png Binary files differindex 766d063c99..766d063c99 100644..100755 --- a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png Binary files differindex dfe7f68b72..dfe7f68b72 100644..100755 --- a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png +++ b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png b/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png Binary files differindex caaf45a99f..caaf45a99f 100644..100755 --- a/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png +++ b/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Off.png b/indra/newview/skins/default/textures/icons/TrashItem_Off.png Binary files differindex bb64920ec4..bb64920ec4 100644..100755 --- a/indra/newview/skins/default/textures/icons/TrashItem_Off.png +++ b/indra/newview/skins/default/textures/icons/TrashItem_Off.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Press.png b/indra/newview/skins/default/textures/icons/TrashItem_Press.png Binary files differindex c62f833d86..c62f833d86 100644..100755 --- a/indra/newview/skins/default/textures/icons/TrashItem_Press.png +++ b/indra/newview/skins/default/textures/icons/TrashItem_Press.png diff --git a/indra/newview/skins/default/textures/icons/UnZoom_Off.png b/indra/newview/skins/default/textures/icons/UnZoom_Off.png Binary files differindex c794113755..c794113755 100644..100755 --- a/indra/newview/skins/default/textures/icons/UnZoom_Off.png +++ b/indra/newview/skins/default/textures/icons/UnZoom_Off.png diff --git a/indra/newview/skins/default/textures/icons/UpArrow_Off.png b/indra/newview/skins/default/textures/icons/UpArrow_Off.png Binary files differindex 00015bce20..00015bce20 100644..100755 --- a/indra/newview/skins/default/textures/icons/UpArrow_Off.png +++ b/indra/newview/skins/default/textures/icons/UpArrow_Off.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png Binary files differindex cd18ae310d..cd18ae310d 100644..100755 --- a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png Binary files differindex b0ed6ee8eb..b0ed6ee8eb 100644..100755 --- a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png Binary files differindex 14ec77b99a..14ec77b99a 100644..100755 --- a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Off.png b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png Binary files differindex 48be51e9af..48be51e9af 100644..100755 --- a/indra/newview/skins/default/textures/icons/VoicePTT_Off.png +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_On.png b/indra/newview/skins/default/textures/icons/VoicePTT_On.png Binary files differindex be4881b64c..be4881b64c 100644..100755 --- a/indra/newview/skins/default/textures/icons/VoicePTT_On.png +++ b/indra/newview/skins/default/textures/icons/VoicePTT_On.png diff --git a/indra/newview/skins/default/textures/icons/Web_Profile_Off.png b/indra/newview/skins/default/textures/icons/Web_Profile_Off.png Binary files differindex f5fb774a6f..f5fb774a6f 100644..100755 --- a/indra/newview/skins/default/textures/icons/Web_Profile_Off.png +++ b/indra/newview/skins/default/textures/icons/Web_Profile_Off.png diff --git a/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png b/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png Binary files differindex c057e9743d..c057e9743d 100644..100755 --- a/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png +++ b/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png diff --git a/indra/newview/skins/default/textures/icons/Zoom_Off.png b/indra/newview/skins/default/textures/icons/Zoom_Off.png Binary files differindex d096720c9c..d096720c9c 100644..100755 --- a/indra/newview/skins/default/textures/icons/Zoom_Off.png +++ b/indra/newview/skins/default/textures/icons/Zoom_Off.png diff --git a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg Binary files differindex 3bb7f7183c..3bb7f7183c 100644..100755 --- a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg +++ b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg diff --git a/indra/newview/skins/default/textures/icons/back_arrow_off.png b/indra/newview/skins/default/textures/icons/back_arrow_off.png Binary files differindex 422f67cf83..422f67cf83 100644..100755 --- a/indra/newview/skins/default/textures/icons/back_arrow_off.png +++ b/indra/newview/skins/default/textures/icons/back_arrow_off.png diff --git a/indra/newview/skins/default/textures/icons/back_arrow_over.png b/indra/newview/skins/default/textures/icons/back_arrow_over.png Binary files differindex b4cc170f37..b4cc170f37 100644..100755 --- a/indra/newview/skins/default/textures/icons/back_arrow_over.png +++ b/indra/newview/skins/default/textures/icons/back_arrow_over.png diff --git a/indra/newview/skins/default/textures/icons/back_arrow_press.png b/indra/newview/skins/default/textures/icons/back_arrow_press.png Binary files differindex a9e2f326a7..a9e2f326a7 100644..100755 --- a/indra/newview/skins/default/textures/icons/back_arrow_press.png +++ b/indra/newview/skins/default/textures/icons/back_arrow_press.png diff --git a/indra/newview/skins/default/textures/icons/check_mark.png b/indra/newview/skins/default/textures/icons/check_mark.png Binary files differindex 2c05297f4f..2c05297f4f 100644..100755 --- a/indra/newview/skins/default/textures/icons/check_mark.png +++ b/indra/newview/skins/default/textures/icons/check_mark.png diff --git a/indra/newview/skins/default/textures/icons/collapse_to_one_line.png b/indra/newview/skins/default/textures/icons/collapse_to_one_line.png Binary files differnew file mode 100755 index 0000000000..d57144a645 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/collapse_to_one_line.png diff --git a/indra/newview/skins/default/textures/icons/edit_mine.png b/indra/newview/skins/default/textures/icons/edit_mine.png Binary files differindex a0bc7efd25..a0bc7efd25 100644..100755 --- a/indra/newview/skins/default/textures/icons/edit_mine.png +++ b/indra/newview/skins/default/textures/icons/edit_mine.png diff --git a/indra/newview/skins/default/textures/icons/edit_theirs.png b/indra/newview/skins/default/textures/icons/edit_theirs.png Binary files differindex ed36ad7cfc..ed36ad7cfc 100644..100755 --- a/indra/newview/skins/default/textures/icons/edit_theirs.png +++ b/indra/newview/skins/default/textures/icons/edit_theirs.png diff --git a/indra/newview/skins/default/textures/icons/expand_one_liner.png b/indra/newview/skins/default/textures/icons/expand_one_liner.png Binary files differnew file mode 100755 index 0000000000..58b7d90131 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/expand_one_liner.png diff --git a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png Binary files differnew file mode 100755 index 0000000000..5ac4258b9d --- /dev/null +++ b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png diff --git a/indra/newview/skins/default/textures/icons/object_icon.png b/indra/newview/skins/default/textures/icons/object_icon.png Binary files differindex 223874e631..223874e631 100644..100755 --- a/indra/newview/skins/default/textures/icons/object_icon.png +++ b/indra/newview/skins/default/textures/icons/object_icon.png diff --git a/indra/newview/skins/default/textures/icons/pop_up_caution.png b/indra/newview/skins/default/textures/icons/pop_up_caution.png Binary files differindex 78b681cb33..78b681cb33 100644..100755 --- a/indra/newview/skins/default/textures/icons/pop_up_caution.png +++ b/indra/newview/skins/default/textures/icons/pop_up_caution.png diff --git a/indra/newview/skins/default/textures/icons/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png Binary files differindex 52dc2ae74f..52dc2ae74f 100644..100755 --- a/indra/newview/skins/default/textures/icons/see_me_online.png +++ b/indra/newview/skins/default/textures/icons/see_me_online.png diff --git a/indra/newview/skins/default/textures/icons/see_on_map.png b/indra/newview/skins/default/textures/icons/see_on_map.png Binary files differindex 200e649818..200e649818 100644..100755 --- a/indra/newview/skins/default/textures/icons/see_on_map.png +++ b/indra/newview/skins/default/textures/icons/see_on_map.png diff --git a/indra/newview/skins/default/textures/icons/unknown_icon.png b/indra/newview/skins/default/textures/icons/unknown_icon.png Binary files differindex 8441d86596..8441d86596 100644..100755 --- a/indra/newview/skins/default/textures/icons/unknown_icon.png +++ b/indra/newview/skins/default/textures/icons/unknown_icon.png diff --git a/indra/newview/skins/default/textures/jump_left_in.tga b/indra/newview/skins/default/textures/jump_left_in.tga Binary files differindex e0656c901d..e0656c901d 100644..100755 --- a/indra/newview/skins/default/textures/jump_left_in.tga +++ b/indra/newview/skins/default/textures/jump_left_in.tga diff --git a/indra/newview/skins/default/textures/jump_left_out.tga b/indra/newview/skins/default/textures/jump_left_out.tga Binary files differindex fb6dac0c3d..fb6dac0c3d 100644..100755 --- a/indra/newview/skins/default/textures/jump_left_out.tga +++ b/indra/newview/skins/default/textures/jump_left_out.tga diff --git a/indra/newview/skins/default/textures/jump_right_in.tga b/indra/newview/skins/default/textures/jump_right_in.tga Binary files differindex 010c748c2a..010c748c2a 100644..100755 --- a/indra/newview/skins/default/textures/jump_right_in.tga +++ b/indra/newview/skins/default/textures/jump_right_in.tga diff --git a/indra/newview/skins/default/textures/jump_right_out.tga b/indra/newview/skins/default/textures/jump_right_out.tga Binary files differindex 33355262d4..33355262d4 100644..100755 --- a/indra/newview/skins/default/textures/jump_right_out.tga +++ b/indra/newview/skins/default/textures/jump_right_out.tga diff --git a/indra/newview/skins/default/textures/lag_status_critical.tga b/indra/newview/skins/default/textures/lag_status_critical.tga Binary files differindex bbc71d9e77..bbc71d9e77 100644..100755 --- a/indra/newview/skins/default/textures/lag_status_critical.tga +++ b/indra/newview/skins/default/textures/lag_status_critical.tga diff --git a/indra/newview/skins/default/textures/lag_status_good.tga b/indra/newview/skins/default/textures/lag_status_good.tga Binary files differindex 680ba90f17..680ba90f17 100644..100755 --- a/indra/newview/skins/default/textures/lag_status_good.tga +++ b/indra/newview/skins/default/textures/lag_status_good.tga diff --git a/indra/newview/skins/default/textures/lag_status_warning.tga b/indra/newview/skins/default/textures/lag_status_warning.tga Binary files differindex 13ce3cc396..13ce3cc396 100644..100755 --- a/indra/newview/skins/default/textures/lag_status_warning.tga +++ b/indra/newview/skins/default/textures/lag_status_warning.tga diff --git a/indra/newview/skins/default/textures/legend.tga b/indra/newview/skins/default/textures/legend.tga Binary files differindex 0dbb8fda4f..0dbb8fda4f 100644..100755 --- a/indra/newview/skins/default/textures/legend.tga +++ b/indra/newview/skins/default/textures/legend.tga diff --git a/indra/newview/skins/default/textures/locked_image.j2c b/indra/newview/skins/default/textures/locked_image.j2c Binary files differindex 9e8998d675..9e8998d675 100644..100755 --- a/indra/newview/skins/default/textures/locked_image.j2c +++ b/indra/newview/skins/default/textures/locked_image.j2c diff --git a/indra/newview/skins/default/textures/map_avatar_16.tga b/indra/newview/skins/default/textures/map_avatar_16.tga Binary files differindex f59e9e9193..f59e9e9193 100644..100755 --- a/indra/newview/skins/default/textures/map_avatar_16.tga +++ b/indra/newview/skins/default/textures/map_avatar_16.tga diff --git a/indra/newview/skins/default/textures/map_avatar_32.tga b/indra/newview/skins/default/textures/map_avatar_32.tga Binary files differindex aebeab4093..aebeab4093 100644..100755 --- a/indra/newview/skins/default/textures/map_avatar_32.tga +++ b/indra/newview/skins/default/textures/map_avatar_32.tga diff --git a/indra/newview/skins/default/textures/map_avatar_8.tga b/indra/newview/skins/default/textures/map_avatar_8.tga Binary files differindex 8500eadeba..8500eadeba 100644..100755 --- a/indra/newview/skins/default/textures/map_avatar_8.tga +++ b/indra/newview/skins/default/textures/map_avatar_8.tga diff --git a/indra/newview/skins/default/textures/map_avatar_above_32.tga b/indra/newview/skins/default/textures/map_avatar_above_32.tga Binary files differindex 65bd0561a7..65bd0561a7 100644..100755 --- a/indra/newview/skins/default/textures/map_avatar_above_32.tga +++ b/indra/newview/skins/default/textures/map_avatar_above_32.tga diff --git a/indra/newview/skins/default/textures/map_avatar_below_32.tga b/indra/newview/skins/default/textures/map_avatar_below_32.tga Binary files differindex 496c44b369..496c44b369 100644..100755 --- a/indra/newview/skins/default/textures/map_avatar_below_32.tga +++ b/indra/newview/skins/default/textures/map_avatar_below_32.tga diff --git a/indra/newview/skins/default/textures/map_avatar_unknown_32.tga b/indra/newview/skins/default/textures/map_avatar_unknown_32.tga Binary files differindex d1192478c6..d1192478c6 100644..100755 --- a/indra/newview/skins/default/textures/map_avatar_unknown_32.tga +++ b/indra/newview/skins/default/textures/map_avatar_unknown_32.tga diff --git a/indra/newview/skins/default/textures/map_avatar_you_32.tga b/indra/newview/skins/default/textures/map_avatar_you_32.tga Binary files differindex 782207efd6..782207efd6 100644..100755 --- a/indra/newview/skins/default/textures/map_avatar_you_32.tga +++ b/indra/newview/skins/default/textures/map_avatar_you_32.tga diff --git a/indra/newview/skins/default/textures/map_event.tga b/indra/newview/skins/default/textures/map_event.tga Binary files differindex 2c06d08fd2..2c06d08fd2 100644..100755 --- a/indra/newview/skins/default/textures/map_event.tga +++ b/indra/newview/skins/default/textures/map_event.tga diff --git a/indra/newview/skins/default/textures/map_home.tga b/indra/newview/skins/default/textures/map_home.tga Binary files differindex acaaa3db44..acaaa3db44 100644..100755 --- a/indra/newview/skins/default/textures/map_home.tga +++ b/indra/newview/skins/default/textures/map_home.tga diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga Binary files differindex d0134fa5fe..d0134fa5fe 100644..100755 --- a/indra/newview/skins/default/textures/map_infohub.tga +++ b/indra/newview/skins/default/textures/map_infohub.tga diff --git a/indra/newview/skins/default/textures/map_telehub.tga b/indra/newview/skins/default/textures/map_telehub.tga Binary files differindex 545b8e532c..545b8e532c 100644..100755 --- a/indra/newview/skins/default/textures/map_telehub.tga +++ b/indra/newview/skins/default/textures/map_telehub.tga diff --git a/indra/newview/skins/default/textures/map_track_16.tga b/indra/newview/skins/default/textures/map_track_16.tga Binary files differindex 451ce24cf0..451ce24cf0 100644..100755 --- a/indra/newview/skins/default/textures/map_track_16.tga +++ b/indra/newview/skins/default/textures/map_track_16.tga diff --git a/indra/newview/skins/default/textures/materials_ui_x_24.png b/indra/newview/skins/default/textures/materials_ui_x_24.png Binary files differnew file mode 100644 index 0000000000..6d88554914 --- /dev/null +++ b/indra/newview/skins/default/textures/materials_ui_x_24.png diff --git a/indra/newview/skins/default/textures/menu_separator.png b/indra/newview/skins/default/textures/menu_separator.png Binary files differindex 89dcdcdff5..89dcdcdff5 100644..100755 --- a/indra/newview/skins/default/textures/menu_separator.png +++ b/indra/newview/skins/default/textures/menu_separator.png diff --git a/indra/newview/skins/default/textures/missing_asset.tga b/indra/newview/skins/default/textures/missing_asset.tga Binary files differindex 9a43f4db5d..9a43f4db5d 100644..100755 --- a/indra/newview/skins/default/textures/missing_asset.tga +++ b/indra/newview/skins/default/textures/missing_asset.tga diff --git a/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png b/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png Binary files differindex d0b213cdc5..d0b213cdc5 100644..100755 --- a/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png +++ b/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png diff --git a/indra/newview/skins/default/textures/model_wizard/progress_light.png b/indra/newview/skins/default/textures/model_wizard/progress_light.png Binary files differindex 019344f812..019344f812 100644..100755 --- a/indra/newview/skins/default/textures/model_wizard/progress_light.png +++ b/indra/newview/skins/default/textures/model_wizard/progress_light.png diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png Binary files differindex 19569501fe..19569501fe 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png +++ b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png Binary files differindex 3648c42656..3648c42656 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png +++ b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png Binary files differindex 0b3f252ccf..0b3f252ccf 100644..100755 --- a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png +++ b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png Binary files differindex 5c4c150bed..5c4c150bed 100644..100755 --- a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png +++ b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png Binary files differindex d4f126f969..d4f126f969 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png +++ b/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png Binary files differindex e27dbe2cad..e27dbe2cad 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png +++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png Binary files differindex 82d044d817..82d044d817 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png +++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png Binary files differindex 7909d54f2b..7909d54f2b 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png +++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png Binary files differindex 6670667022..6670667022 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png +++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png diff --git a/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png Binary files differindex 5ab4abc5b8..5ab4abc5b8 100644..100755 --- a/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png +++ b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png diff --git a/indra/newview/skins/default/textures/navbar/Flag.png b/indra/newview/skins/default/textures/navbar/Flag.png Binary files differindex df53c89224..df53c89224 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Flag.png +++ b/indra/newview/skins/default/textures/navbar/Flag.png diff --git a/indra/newview/skins/default/textures/navbar/Help_Press.png b/indra/newview/skins/default/textures/navbar/Help_Press.png Binary files differindex ed3695f9d5..ed3695f9d5 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Help_Press.png +++ b/indra/newview/skins/default/textures/navbar/Help_Press.png diff --git a/indra/newview/skins/default/textures/navbar/Home_Off.png b/indra/newview/skins/default/textures/navbar/Home_Off.png Binary files differindex fe3bc63b77..fe3bc63b77 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Home_Off.png +++ b/indra/newview/skins/default/textures/navbar/Home_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Info_Off.png b/indra/newview/skins/default/textures/navbar/Info_Off.png Binary files differindex 64722255a3..64722255a3 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Info_Off.png +++ b/indra/newview/skins/default/textures/navbar/Info_Off.png diff --git a/indra/newview/skins/default/textures/navbar/Info_Over.png b/indra/newview/skins/default/textures/navbar/Info_Over.png Binary files differindex 84f1d03129..84f1d03129 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Info_Over.png +++ b/indra/newview/skins/default/textures/navbar/Info_Over.png diff --git a/indra/newview/skins/default/textures/navbar/Info_Press.png b/indra/newview/skins/default/textures/navbar/Info_Press.png Binary files differindex 169105829e..169105829e 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Info_Press.png +++ b/indra/newview/skins/default/textures/navbar/Info_Press.png diff --git a/indra/newview/skins/default/textures/navbar/Lock.png b/indra/newview/skins/default/textures/navbar/Lock.png Binary files differindex cf569d6ad2..cf569d6ad2 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Lock.png +++ b/indra/newview/skins/default/textures/navbar/Lock.png diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG.png b/indra/newview/skins/default/textures/navbar/NavBar_BG.png Binary files differindex 38eea783e6..38eea783e6 100644..100755 --- a/indra/newview/skins/default/textures/navbar/NavBar_BG.png +++ b/indra/newview/skins/default/textures/navbar/NavBar_BG.png diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png Binary files differindex a79d999932..a79d999932 100644..100755 --- a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png +++ b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png Binary files differindex b692ed92da..b692ed92da 100644..100755 --- a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png +++ b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png Binary files differindex fc4f0c07ef..fc4f0c07ef 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Row_Selection.png +++ b/indra/newview/skins/default/textures/navbar/Row_Selection.png diff --git a/indra/newview/skins/default/textures/navbar/Search.png b/indra/newview/skins/default/textures/navbar/Search.png Binary files differindex 0d0e330bc7..0d0e330bc7 100644..100755 --- a/indra/newview/skins/default/textures/navbar/Search.png +++ b/indra/newview/skins/default/textures/navbar/Search.png diff --git a/indra/newview/skins/default/textures/navbar/separator.png b/indra/newview/skins/default/textures/navbar/separator.png Binary files differindex b93e5791a7..b93e5791a7 100644..100755 --- a/indra/newview/skins/default/textures/navbar/separator.png +++ b/indra/newview/skins/default/textures/navbar/separator.png diff --git a/indra/newview/skins/default/textures/notify_caution_icon.tga b/indra/newview/skins/default/textures/notify_caution_icon.tga Binary files differindex abc23d1d7a..abc23d1d7a 100644..100755 --- a/indra/newview/skins/default/textures/notify_caution_icon.tga +++ b/indra/newview/skins/default/textures/notify_caution_icon.tga diff --git a/indra/newview/skins/default/textures/pixiesmall.j2c b/indra/newview/skins/default/textures/pixiesmall.j2c Binary files differindex a1ff64014b..a1ff64014b 100644..100755 --- a/indra/newview/skins/default/textures/pixiesmall.j2c +++ b/indra/newview/skins/default/textures/pixiesmall.j2c diff --git a/indra/newview/skins/default/textures/red_x.png b/indra/newview/skins/default/textures/red_x.png Binary files differindex a61202f09b..a61202f09b 100644..100755 --- a/indra/newview/skins/default/textures/red_x.png +++ b/indra/newview/skins/default/textures/red_x.png diff --git a/indra/newview/skins/default/textures/rounded_square.j2c b/indra/newview/skins/default/textures/rounded_square.j2c Binary files differindex c8bb572fa9..c8bb572fa9 100644..100755 --- a/indra/newview/skins/default/textures/rounded_square.j2c +++ b/indra/newview/skins/default/textures/rounded_square.j2c diff --git a/indra/newview/skins/default/textures/script_error.j2c b/indra/newview/skins/default/textures/script_error.j2c Binary files differindex 893cb642e7..893cb642e7 100644..100755 --- a/indra/newview/skins/default/textures/script_error.j2c +++ b/indra/newview/skins/default/textures/script_error.j2c diff --git a/indra/newview/skins/default/textures/silhouette.j2c b/indra/newview/skins/default/textures/silhouette.j2c Binary files differindex 3859d4cb34..3859d4cb34 100644..100755 --- a/indra/newview/skins/default/textures/silhouette.j2c +++ b/indra/newview/skins/default/textures/silhouette.j2c diff --git a/indra/newview/skins/default/textures/slim_icon_16_viewer.tga b/indra/newview/skins/default/textures/slim_icon_16_viewer.tga Binary files differindex 552181d36a..552181d36a 100644..100755 --- a/indra/newview/skins/default/textures/slim_icon_16_viewer.tga +++ b/indra/newview/skins/default/textures/slim_icon_16_viewer.tga diff --git a/indra/newview/skins/default/textures/snapshot_download.png b/indra/newview/skins/default/textures/snapshot_download.png Binary files differindex 6aa1abded5..6aa1abded5 100644..100755 --- a/indra/newview/skins/default/textures/snapshot_download.png +++ b/indra/newview/skins/default/textures/snapshot_download.png diff --git a/indra/newview/skins/default/textures/snapshot_email.png b/indra/newview/skins/default/textures/snapshot_email.png Binary files differindex dee784a9bf..dee784a9bf 100644..100755 --- a/indra/newview/skins/default/textures/snapshot_email.png +++ b/indra/newview/skins/default/textures/snapshot_email.png diff --git a/indra/newview/skins/default/textures/spacer24.tga b/indra/newview/skins/default/textures/spacer24.tga Binary files differindex c7cab6b38c..c7cab6b38c 100644..100755 --- a/indra/newview/skins/default/textures/spacer24.tga +++ b/indra/newview/skins/default/textures/spacer24.tga diff --git a/indra/newview/skins/default/textures/tabarea.tga b/indra/newview/skins/default/textures/tabarea.tga Binary files differindex 5517aebfc8..5517aebfc8 100644..100755 --- a/indra/newview/skins/default/textures/tabarea.tga +++ b/indra/newview/skins/default/textures/tabarea.tga diff --git a/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png b/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png Binary files differindex 213acbe87b..213acbe87b 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png +++ b/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.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 differindex 50c01062a5..50c01062a5 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png +++ 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 differindex bf2065cd37..bf2065cd37 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png +++ 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 differindex 8b48258142..8b48258142 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png +++ 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 differindex 09efe779fe..09efe779fe 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png +++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png Binary files differindex bc4e00c646..bc4e00c646 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png Binary files differindex 293aeef5e6..293aeef5e6 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png Binary files differindex 760db9360d..760db9360d 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png Binary files differindex 4556602f58..4556602f58 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png Binary files differindex 691b600510..691b600510 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png Binary files differindex f5a5f7a846..f5a5f7a846 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png Binary files differindex e56eda9802..e56eda9802 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png Binary files differindex 4ed7a2b183..4ed7a2b183 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png Binary files differindex b3316386b9..b3316386b9 100644..100755 --- a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png +++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png diff --git a/indra/newview/skins/default/textures/tearoff_pressed.tga b/indra/newview/skins/default/textures/tearoff_pressed.tga Binary files differindex 620d109de0..620d109de0 100644..100755 --- a/indra/newview/skins/default/textures/tearoff_pressed.tga +++ b/indra/newview/skins/default/textures/tearoff_pressed.tga diff --git a/indra/newview/skins/default/textures/tearoffbox.tga b/indra/newview/skins/default/textures/tearoffbox.tga Binary files differindex 0670d2e91b..0670d2e91b 100644..100755 --- a/indra/newview/skins/default/textures/tearoffbox.tga +++ b/indra/newview/skins/default/textures/tearoffbox.tga diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 06f8f8c670..b0e4b71d21 100644..100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -162,7 +162,24 @@ with the same filename but different name <texture name="ComboButton_On" file_name="widgets/ComboButton_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="Container" file_name="containers/Container.png" preload="false" /> + + <texture name="Conv_toolbar_add_person" file_name="icons/Conv_toolbar_add_person.png" preload="false" /> + <texture name="Conv_toolbar_arrow_ne" file_name="icons/Conv_toolbar_arrow_ne.png" preload="false" /> + <texture name="Conv_toolbar_arrow_sw" file_name="icons/Conv_toolbar_arrow_sw.png" preload="false" /> + <texture name="Conv_toolbar_call_log" file_name="icons/Conv_toolbar_call_log.png" preload="false" /> + <texture name="Conv_toolbar_close" file_name="icons/Conv_toolbar_close.png" preload="false" /> + <texture name="Conv_toolbar_collapse" file_name="icons/Conv_toolbar_collapse.png" preload="false" /> + <texture name="Conv_collapse_to_one_line" file_name="icons/collapse_to_one_line.png" preload="false" /> + <texture name="Conv_expand_one_line" file_name="icons/expand_one_liner.png" preload="false" /> + <texture name="Conv_toolbar_expand" file_name="icons/Conv_toolbar_expand.png" preload="false" /> + <texture name="Conv_toolbar_hang_up" file_name="icons/Conv_toolbar_hang_up.png" preload="false" /> + <texture name="Conv_toolbar_open_call" file_name="icons/Conv_toolbar_open_call.png" preload="false" /> + <texture name="Conv_toolbar_plus" file_name="icons/Conv_toolbar_plus.png" preload="false" /> + <texture name="Conv_toolbar_sort" file_name="icons/Conv_toolbar_sort.png" preload="false" /> + <texture name="Conv_log_inbox" file_name="icons/Conv_log_inbox.png" preload="false" /> + <texture name="Copy" file_name="icons/Copy.png" preload="false" /> <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" /> @@ -348,6 +365,8 @@ with the same filename but different name <texture name="NavBar_BG_NoFav_Bevel" file_name="navbar/NavBar_BG_NoFav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="NavBar_BG_NoNav_Bevel" file_name="navbar/NavBar_BG_NoNav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> + <texture name="Nearby_chat_icon" file_name="icons/nearby_chat_icon.png" preload="false" /> + <texture name="Notices_Unread" file_name="bottomtray/Notices_Unread.png" preload="true" /> <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" /> @@ -625,7 +644,6 @@ with the same filename but different name <texture name="TrashItem_Press" file_name="icons/TrashItem_Press.png" preload="false" /> <texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" /> - <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" /> <texture name="UpArrow_Off" file_name="icons/UpArrow_Off.png" preload="false" /> @@ -638,12 +656,6 @@ with the same filename but different name <texture name="VoicePTT_Off" file_name="bottomtray/VoicePTT_Off.png" preload="false" /> <texture name="VoicePTT_On" file_name="bottomtray/VoicePTT_On.png" preload="false" /> - <texture name="VoicePTT_Lvl1_Dark" file_name="bottomtray/VoicePTT_Lvl1_Dark.png" preload="false" /> - <texture name="VoicePTT_Lvl2_Dark" file_name="bottomtray/VoicePTT_Lvl2_Dark.png" preload="false" /> - <texture name="VoicePTT_Lvl3_Dark" file_name="bottomtray/VoicePTT_Lvl3_Dark.png" preload="false" /> - <texture name="VoicePTT_Off_Dark" file_name="bottomtray/VoicePTT_Off_Dark.png" preload="false" /> - <texture name="VoicePTT_On_Dark" file_name="bottomtray/VoicePTT_On_Dark.png" preload="false" /> - <texture name="Wearables_Divider" file_name="windows/Wearables_Divider.png" preload="false" /> <texture name="Web_Profile_Off" file_name="icons/Web_Profile_Off.png" preload="false" /> @@ -712,9 +724,6 @@ with the same filename but different name <texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" /> <texture name="icon_top_pick.tga" /> - <texture name="inv_folder_mesh.tga"/> - <texture name="inv_item_mesh.tga"/> - <texture name="lag_status_critical.tga" /> <texture name="lag_status_good.tga" /> <texture name="lag_status_warning.tga" /> @@ -734,6 +743,7 @@ with the same filename but different name <texture name="default_land_picture.j2c" /> <texture name="default_profile_picture.j2c" /> <texture name="locked_image.j2c" /> + <texture name="materials_ui_x_24.png" /> <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" /> <texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" /> diff --git a/indra/newview/skins/default/textures/toolbar_icons/appearance.png b/indra/newview/skins/default/textures/toolbar_icons/appearance.png Binary files differindex e6b1365388..e6b1365388 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/appearance.png +++ b/indra/newview/skins/default/textures/toolbar_icons/appearance.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/avatars.png b/indra/newview/skins/default/textures/toolbar_icons/avatars.png Binary files differindex 8fa0600cee..8fa0600cee 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/avatars.png +++ b/indra/newview/skins/default/textures/toolbar_icons/avatars.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/build.png b/indra/newview/skins/default/textures/toolbar_icons/build.png Binary files differindex e21ab3f0e4..e21ab3f0e4 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/build.png +++ b/indra/newview/skins/default/textures/toolbar_icons/build.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png Binary files differindex 5f6a01eaa1..5f6a01eaa1 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png +++ b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png Binary files differindex 0b8090314c..0b8090314c 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png +++ b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png Binary files differindex 044751560f..044751560f 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png +++ b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/chat.png b/indra/newview/skins/default/textures/toolbar_icons/chat.png Binary files differindex e0dbac495f..e0dbac495f 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/chat.png +++ b/indra/newview/skins/default/textures/toolbar_icons/chat.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/destinations.png b/indra/newview/skins/default/textures/toolbar_icons/destinations.png Binary files differindex e2325f083a..e2325f083a 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/destinations.png +++ b/indra/newview/skins/default/textures/toolbar_icons/destinations.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/gestures.png b/indra/newview/skins/default/textures/toolbar_icons/gestures.png Binary files differindex 2404bb4e25..2404bb4e25 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/gestures.png +++ b/indra/newview/skins/default/textures/toolbar_icons/gestures.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/howto.png b/indra/newview/skins/default/textures/toolbar_icons/howto.png Binary files differindex 8594d71113..8594d71113 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/howto.png +++ b/indra/newview/skins/default/textures/toolbar_icons/howto.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/inventory.png b/indra/newview/skins/default/textures/toolbar_icons/inventory.png Binary files differindex ab3191255e..ab3191255e 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/inventory.png +++ b/indra/newview/skins/default/textures/toolbar_icons/inventory.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/land.png b/indra/newview/skins/default/textures/toolbar_icons/land.png Binary files differindex 89ea7604a4..89ea7604a4 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/land.png +++ b/indra/newview/skins/default/textures/toolbar_icons/land.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/map.png b/indra/newview/skins/default/textures/toolbar_icons/map.png Binary files differindex ed1049b7db..ed1049b7db 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/map.png +++ b/indra/newview/skins/default/textures/toolbar_icons/map.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/marketplace.png b/indra/newview/skins/default/textures/toolbar_icons/marketplace.png Binary files differindex 62bad20be6..62bad20be6 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/marketplace.png +++ b/indra/newview/skins/default/textures/toolbar_icons/marketplace.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png Binary files differindex 9fcf46794d..9fcf46794d 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png +++ b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png Binary files differindex ab0a654056..ab0a654056 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png +++ b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/move.png b/indra/newview/skins/default/textures/toolbar_icons/move.png Binary files differindex 5c2ced7375..5c2ced7375 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/move.png +++ b/indra/newview/skins/default/textures/toolbar_icons/move.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png Binary files differindex 77a7cd5f44..77a7cd5f44 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png +++ b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/outbox.png b/indra/newview/skins/default/textures/toolbar_icons/outbox.png Binary files differindex 0f3db1c47c..0f3db1c47c 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/outbox.png +++ b/indra/newview/skins/default/textures/toolbar_icons/outbox.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/people.png b/indra/newview/skins/default/textures/toolbar_icons/people.png Binary files differindex 7228ae8e2f..7228ae8e2f 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/people.png +++ b/indra/newview/skins/default/textures/toolbar_icons/people.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/picks.png b/indra/newview/skins/default/textures/toolbar_icons/picks.png Binary files differindex befda04b42..befda04b42 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/picks.png +++ b/indra/newview/skins/default/textures/toolbar_icons/picks.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/places.png b/indra/newview/skins/default/textures/toolbar_icons/places.png Binary files differindex 97d9fa066c..97d9fa066c 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/places.png +++ b/indra/newview/skins/default/textures/toolbar_icons/places.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/preferences.png b/indra/newview/skins/default/textures/toolbar_icons/preferences.png Binary files differindex 4ccd7b8ae1..4ccd7b8ae1 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/preferences.png +++ b/indra/newview/skins/default/textures/toolbar_icons/preferences.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/profile.png b/indra/newview/skins/default/textures/toolbar_icons/profile.png Binary files differindex 32fe2bf8ac..32fe2bf8ac 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/profile.png +++ b/indra/newview/skins/default/textures/toolbar_icons/profile.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/search.png b/indra/newview/skins/default/textures/toolbar_icons/search.png Binary files differindex bcb11e950d..bcb11e950d 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/search.png +++ b/indra/newview/skins/default/textures/toolbar_icons/search.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/snapshot.png b/indra/newview/skins/default/textures/toolbar_icons/snapshot.png Binary files differindex d26da9b1d2..d26da9b1d2 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/snapshot.png +++ b/indra/newview/skins/default/textures/toolbar_icons/snapshot.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/speak.png b/indra/newview/skins/default/textures/toolbar_icons/speak.png Binary files differindex 10cd354c5c..10cd354c5c 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/speak.png +++ b/indra/newview/skins/default/textures/toolbar_icons/speak.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/view.png b/indra/newview/skins/default/textures/toolbar_icons/view.png Binary files differindex ddf0df7c26..ddf0df7c26 100644..100755 --- a/indra/newview/skins/default/textures/toolbar_icons/view.png +++ b/indra/newview/skins/default/textures/toolbar_icons/view.png diff --git a/indra/newview/skins/default/textures/transparent.j2c b/indra/newview/skins/default/textures/transparent.j2c Binary files differindex 1068e940b9..1068e940b9 100644..100755 --- a/indra/newview/skins/default/textures/transparent.j2c +++ b/indra/newview/skins/default/textures/transparent.j2c diff --git a/indra/newview/skins/default/textures/up_arrow.png b/indra/newview/skins/default/textures/up_arrow.png Binary files differindex fe68ad49dc..fe68ad49dc 100644..100755 --- a/indra/newview/skins/default/textures/up_arrow.png +++ b/indra/newview/skins/default/textures/up_arrow.png diff --git a/indra/newview/skins/default/textures/uv_test1.j2c b/indra/newview/skins/default/textures/uv_test1.j2c Binary files differindex 3d5b541796..3d5b541796 100644..100755 --- a/indra/newview/skins/default/textures/uv_test1.j2c +++ b/indra/newview/skins/default/textures/uv_test1.j2c diff --git a/indra/newview/skins/default/textures/uv_test2.tga b/indra/newview/skins/default/textures/uv_test2.tga Binary files differindex a16000d1e4..a16000d1e4 100644..100755 --- a/indra/newview/skins/default/textures/uv_test2.tga +++ b/indra/newview/skins/default/textures/uv_test2.tga diff --git a/indra/newview/skins/default/textures/voice_meter_dot.j2c b/indra/newview/skins/default/textures/voice_meter_dot.j2c Binary files differindex e536c3338a..e536c3338a 100644..100755 --- a/indra/newview/skins/default/textures/voice_meter_dot.j2c +++ b/indra/newview/skins/default/textures/voice_meter_dot.j2c diff --git a/indra/newview/skins/default/textures/voice_meter_rings.j2c b/indra/newview/skins/default/textures/voice_meter_rings.j2c Binary files differindex 17e7c6c6a1..17e7c6c6a1 100644..100755 --- a/indra/newview/skins/default/textures/voice_meter_rings.j2c +++ b/indra/newview/skins/default/textures/voice_meter_rings.j2c diff --git a/indra/newview/skins/default/textures/white.tga b/indra/newview/skins/default/textures/white.tga Binary files differindex 9fe68631cf..9fe68631cf 100644..100755 --- a/indra/newview/skins/default/textures/white.tga +++ b/indra/newview/skins/default/textures/white.tga diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Down.png b/indra/newview/skins/default/textures/widgets/Arrow_Down.png Binary files differindex e10f6472eb..e10f6472eb 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Arrow_Down.png +++ b/indra/newview/skins/default/textures/widgets/Arrow_Down.png diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Left.png Binary files differindex a424282839..a424282839 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Arrow_Left.png +++ b/indra/newview/skins/default/textures/widgets/Arrow_Left.png diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Right.png Binary files differindex e32bee8f34..e32bee8f34 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Arrow_Right.png +++ b/indra/newview/skins/default/textures/widgets/Arrow_Right.png diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png Binary files differindex 2d624c3779..2d624c3779 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png +++ b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png Binary files differindex 91c03c426e..91c03c426e 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png +++ b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png Binary files differindex 38aac0e5ca..38aac0e5ca 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png +++ b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Up.png Binary files differindex 48df69d82e..48df69d82e 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Arrow_Up.png +++ b/indra/newview/skins/default/textures/widgets/Arrow_Up.png diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background.png b/indra/newview/skins/default/textures/widgets/Badge_Background.png Binary files differindex 5089c30312..5089c30312 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Badge_Background.png +++ b/indra/newview/skins/default/textures/widgets/Badge_Background.png diff --git a/indra/newview/skins/default/textures/widgets/Badge_Border.png b/indra/newview/skins/default/textures/widgets/Badge_Border.png Binary files differindex 4b086a63fb..4b086a63fb 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Badge_Border.png +++ b/indra/newview/skins/default/textures/widgets/Badge_Border.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png Binary files differindex c7c0eaa96b..c7c0eaa96b 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png Binary files differindex 4a73c254fc..4a73c254fc 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png Binary files differindex 6fb5c432de..6fb5c432de 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png Binary files differindex fa18517933..fa18517933 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png Binary files differindex bed1a701bd..bed1a701bd 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png Binary files differindex 57ce9af574..57ce9af574 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png Binary files differindex 2c43022f0e..2c43022f0e 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png Binary files differindex 6b8c1baca4..6b8c1baca4 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png Binary files differindex 51505e80c5..51505e80c5 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png Binary files differindex 9f93efbd93..9f93efbd93 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png Binary files differindex 3a4ec1a315..3a4ec1a315 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png Binary files differindex 1f1b4c2ed5..1f1b4c2ed5 100644..100755 --- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png +++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png Binary files differindex c1ee210099..c1ee210099 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png Binary files differindex 2525405f37..2525405f37 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png +++ b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png Binary files differindex 2d9dba1592..2d9dba1592 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Checkbox_On.png +++ b/indra/newview/skins/default/textures/widgets/Checkbox_On.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png Binary files differindex beaa7bcbf6..beaa7bcbf6 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png Binary files differindex 5bced95a89..5bced95a89 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png +++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png Binary files differindex 44be193678..44be193678 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png +++ b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png Binary files differindex d0fff1b3c3..d0fff1b3c3 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png Binary files differindex 80402458b7..80402458b7 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png +++ b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_On.png b/indra/newview/skins/default/textures/widgets/ComboButton_On.png Binary files differindex b42cc7542e..b42cc7542e 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ComboButton_On.png +++ b/indra/newview/skins/default/textures/widgets/ComboButton_On.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png Binary files differindex bbc0657487..bbc0657487 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png +++ b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png Binary files differindex 2330cb420b..2330cb420b 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png +++ b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png Binary files differindex b7b5c2e1d4..b7b5c2e1d4 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png +++ b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png Binary files differindex 75057938d2..75057938d2 100644..100755 --- a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png +++ b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png Binary files differindex b295752ea9..b295752ea9 100644..100755 --- a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png Binary files differindex 4764ed4ee2..4764ed4ee2 100644..100755 --- a/indra/newview/skins/default/textures/widgets/DropDown_Off.png +++ b/indra/newview/skins/default/textures/widgets/DropDown_Off.png diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png Binary files differindex 10262d3979..10262d3979 100644..100755 --- a/indra/newview/skins/default/textures/widgets/DropDown_On.png +++ b/indra/newview/skins/default/textures/widgets/DropDown_On.png diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png Binary files differindex 16cb25cc77..16cb25cc77 100644..100755 --- a/indra/newview/skins/default/textures/widgets/DropDown_Press.png +++ b/indra/newview/skins/default/textures/widgets/DropDown_Press.png diff --git a/indra/newview/skins/default/textures/widgets/DropTarget.png b/indra/newview/skins/default/textures/widgets/DropTarget.png Binary files differindex 3740c98cbc..3740c98cbc 100644..100755 --- a/indra/newview/skins/default/textures/widgets/DropTarget.png +++ b/indra/newview/skins/default/textures/widgets/DropTarget.png diff --git a/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png b/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png Binary files differindex c8dbc8e87a..c8dbc8e87a 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png +++ b/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png Binary files differindex a1f21e8194..a1f21e8194 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png +++ b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png Binary files differindex 61f9b076ce..61f9b076ce 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png +++ b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Over.png b/indra/newview/skins/default/textures/widgets/ListItem_Over.png Binary files differindex 4b2b9ab3e5..4b2b9ab3e5 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ListItem_Over.png +++ b/indra/newview/skins/default/textures/widgets/ListItem_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png Binary files differindex 317c672441..317c672441 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ListItem_Select.png +++ b/indra/newview/skins/default/textures/widgets/ListItem_Select.png diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png Binary files differindex e603c44384..e603c44384 100644..100755 --- a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png +++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png Binary files differindex fbc164123f..fbc164123f 100644..100755 --- a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png +++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/New_Tag_Background.png b/indra/newview/skins/default/textures/widgets/New_Tag_Background.png Binary files differindex cd639dd80f..cd639dd80f 100644..100755 --- a/indra/newview/skins/default/textures/widgets/New_Tag_Background.png +++ b/indra/newview/skins/default/textures/widgets/New_Tag_Background.png diff --git a/indra/newview/skins/default/textures/widgets/New_Tag_Border.png b/indra/newview/skins/default/textures/widgets/New_Tag_Border.png Binary files differindex 56df0d0127..56df0d0127 100644..100755 --- a/indra/newview/skins/default/textures/widgets/New_Tag_Border.png +++ b/indra/newview/skins/default/textures/widgets/New_Tag_Border.png diff --git a/indra/newview/skins/default/textures/widgets/ProgressBar.png b/indra/newview/skins/default/textures/widgets/ProgressBar.png Binary files differindex 3f0e4eba28..3f0e4eba28 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ProgressBar.png +++ b/indra/newview/skins/default/textures/widgets/ProgressBar.png diff --git a/indra/newview/skins/default/textures/widgets/ProgressTrack.png b/indra/newview/skins/default/textures/widgets/ProgressTrack.png Binary files differindex bb6d9f4144..bb6d9f4144 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ProgressTrack.png +++ b/indra/newview/skins/default/textures/widgets/ProgressTrack.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png Binary files differindex 04e91bdaab..04e91bdaab 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png Binary files differindex 1ee0329e66..1ee0329e66 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_Off.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_Off.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png Binary files differindex 661d1c5611..661d1c5611 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_On.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_On.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png Binary files differindex 48e8aa2eab..48e8aa2eab 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png Binary files differindex c227f07513..c227f07513 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_Over.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_Over.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png Binary files differindex 0a4a3a6ad9..0a4a3a6ad9 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_Press.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_Press.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png Binary files differindex 0a4a3a6ad9..0a4a3a6ad9 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_Selected.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png Binary files differindex 661d1c5611..661d1c5611 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png Binary files differindex 48e8aa2eab..48e8aa2eab 100644..100755 --- a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png +++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png Binary files differindex a1052684b9..a1052684b9 100644..100755 --- a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png Binary files differindex c58e0305ef..c58e0305ef 100644..100755 --- a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png +++ b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png Binary files differindex c09a2197c7..c09a2197c7 100644..100755 --- a/indra/newview/skins/default/textures/widgets/RadioButton_On.png +++ b/indra/newview/skins/default/textures/widgets/RadioButton_On.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png Binary files differindex d7d444fd0c..d7d444fd0c 100644..100755 --- a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png Binary files differindex a707e8ceb8..a707e8ceb8 100644..100755 --- a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png +++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png Binary files differindex 33eaa14030..33eaa14030 100644..100755 --- a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png +++ b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png Binary files differindex 186822da43..186822da43 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png Binary files differindex a396380fb2..a396380fb2 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png Binary files differindex 9568dea78a..9568dea78a 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png Binary files differindex 42f999a451..42f999a451 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png Binary files differindex 549b3980f6..549b3980f6 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png Binary files differindex a74abd5d8a..a74abd5d8a 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png Binary files differindex 176ffcdbb9..176ffcdbb9 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png Binary files differindex 36056d0ad9..36056d0ad9 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png Binary files differindex 0c1fd6956b..0c1fd6956b 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png Binary files differindex 4d245eb57a..4d245eb57a 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png Binary files differindex 67a7a5568b..67a7a5568b 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png Binary files differindex 0cc8c4404b..0cc8c4404b 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png Binary files differindex 8a085aa966..8a085aa966 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png +++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png Binary files differindex fc7fd93e7a..fc7fd93e7a 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png +++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png Binary files differindex 4f31c48c02..4f31c48c02 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png +++ b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png Binary files differindex f89ee3f68f..f89ee3f68f 100644..100755 --- a/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png +++ b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png Binary files differindex 3b39c51a77..3b39c51a77 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png Binary files differindex 57ed79d733..57ed79d733 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png Binary files differindex 5b8878e0cb..5b8878e0cb 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png Binary files differindex 379953216b..379953216b 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png Binary files differindex 379953216b..379953216b 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png Binary files differindex 77c4224539..77c4224539 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png Binary files differindex 8b93dd551e..8b93dd551e 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png Binary files differindex 3f207cbea2..3f207cbea2 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png Binary files differindex deb87c8489..deb87c8489 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png Binary files differindex ca7027da91..ca7027da91 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png Binary files differindex 220df9db25..220df9db25 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png Binary files differindex dde367f05e..dde367f05e 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png Binary files differindex 8e6b9c8c6f..8e6b9c8c6f 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png Binary files differindex b1521199ff..b1521199ff 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png Binary files differindex 1574f48b28..1574f48b28 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png Binary files differindex 2717e7d7b0..2717e7d7b0 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png Binary files differindex 3883518033..3883518033 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png Binary files differindex 3883518033..3883518033 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png Binary files differindex ab31f6ded7..ab31f6ded7 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png Binary files differindex 1574f48b28..1574f48b28 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png Binary files differindex b627232012..b627232012 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png Binary files differindex b627232012..b627232012 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png +++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png Binary files differindex 7081f9cfe0..7081f9cfe0 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png +++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png Binary files differindex 232006ee5a..232006ee5a 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png +++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png Binary files differindex cd002b3973..cd002b3973 100644..100755 --- a/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png +++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png Binary files differindex cf0d8ee2c1..cf0d8ee2c1 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png +++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png Binary files differindex fe3a7beafd..fe3a7beafd 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png +++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png Binary files differindex 133589b8a6..133589b8a6 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png +++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png Binary files differindex e83babc519..e83babc519 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png +++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Active.png Binary files differindex ca6daab4e0..ca6daab4e0 100644..100755 --- a/indra/newview/skins/default/textures/widgets/TextField_Active.png +++ b/indra/newview/skins/default/textures/widgets/TextField_Active.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png Binary files differindex 3d205a3f2e..3d205a3f2e 100644..100755 --- a/indra/newview/skins/default/textures/widgets/TextField_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Off.png Binary files differindex 911d907acc..911d907acc 100644..100755 --- a/indra/newview/skins/default/textures/widgets/TextField_Off.png +++ b/indra/newview/skins/default/textures/widgets/TextField_Off.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png Binary files differindex fa79cb6260..fa79cb6260 100644..100755 --- a/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png +++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png Binary files differindex 8b504af101..8b504af101 100644..100755 --- a/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png Binary files differindex 862b13d219..862b13d219 100644..100755 --- a/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png +++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Tooltip.png b/indra/newview/skins/default/textures/widgets/Tooltip.png Binary files differindex f989ac9083..f989ac9083 100644..100755 --- a/indra/newview/skins/default/textures/widgets/Tooltip.png +++ b/indra/newview/skins/default/textures/widgets/Tooltip.png diff --git a/indra/newview/skins/default/textures/widgets/bevel_background.png b/indra/newview/skins/default/textures/widgets/bevel_background.png Binary files differindex fb5067503d..fb5067503d 100644..100755 --- a/indra/newview/skins/default/textures/widgets/bevel_background.png +++ b/indra/newview/skins/default/textures/widgets/bevel_background.png diff --git a/indra/newview/skins/default/textures/widgets/buy_off.png b/indra/newview/skins/default/textures/widgets/buy_off.png Binary files differindex ee5979046f..ee5979046f 100644..100755 --- a/indra/newview/skins/default/textures/widgets/buy_off.png +++ b/indra/newview/skins/default/textures/widgets/buy_off.png diff --git a/indra/newview/skins/default/textures/widgets/buy_over.png b/indra/newview/skins/default/textures/widgets/buy_over.png Binary files differindex 93adb68c86..93adb68c86 100644..100755 --- a/indra/newview/skins/default/textures/widgets/buy_over.png +++ b/indra/newview/skins/default/textures/widgets/buy_over.png diff --git a/indra/newview/skins/default/textures/widgets/buy_press.png b/indra/newview/skins/default/textures/widgets/buy_press.png Binary files differindex 3f442d6eaa..3f442d6eaa 100644..100755 --- a/indra/newview/skins/default/textures/widgets/buy_press.png +++ b/indra/newview/skins/default/textures/widgets/buy_press.png diff --git a/indra/newview/skins/default/textures/widgets/jump_left_in.png b/indra/newview/skins/default/textures/widgets/jump_left_in.png Binary files differindex a1425ccfa0..a1425ccfa0 100644..100755 --- a/indra/newview/skins/default/textures/widgets/jump_left_in.png +++ b/indra/newview/skins/default/textures/widgets/jump_left_in.png diff --git a/indra/newview/skins/default/textures/widgets/jump_left_out.png b/indra/newview/skins/default/textures/widgets/jump_left_out.png Binary files differindex 38edf47d19..38edf47d19 100644..100755 --- a/indra/newview/skins/default/textures/widgets/jump_left_out.png +++ b/indra/newview/skins/default/textures/widgets/jump_left_out.png diff --git a/indra/newview/skins/default/textures/widgets/jump_right_in.png b/indra/newview/skins/default/textures/widgets/jump_right_in.png Binary files differindex 39359ab2e2..39359ab2e2 100644..100755 --- a/indra/newview/skins/default/textures/widgets/jump_right_in.png +++ b/indra/newview/skins/default/textures/widgets/jump_right_in.png diff --git a/indra/newview/skins/default/textures/widgets/jump_right_out.png b/indra/newview/skins/default/textures/widgets/jump_right_out.png Binary files differindex 3f76bbffac..3f76bbffac 100644..100755 --- a/indra/newview/skins/default/textures/widgets/jump_right_out.png +++ b/indra/newview/skins/default/textures/widgets/jump_right_out.png diff --git a/indra/newview/skins/default/textures/windows/Dragbar.png b/indra/newview/skins/default/textures/windows/Dragbar.png Binary files differindex d94dda1aae..d94dda1aae 100644..100755 --- a/indra/newview/skins/default/textures/windows/Dragbar.png +++ b/indra/newview/skins/default/textures/windows/Dragbar.png diff --git a/indra/newview/skins/default/textures/windows/Flyout_Left.png b/indra/newview/skins/default/textures/windows/Flyout_Left.png Binary files differindex 6ac9fe2efd..6ac9fe2efd 100644..100755 --- a/indra/newview/skins/default/textures/windows/Flyout_Left.png +++ b/indra/newview/skins/default/textures/windows/Flyout_Left.png diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png Binary files differindex 69fc08ceaa..69fc08ceaa 100644..100755 --- a/indra/newview/skins/default/textures/windows/Flyout_Pointer.png +++ b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png diff --git a/indra/newview/skins/default/textures/windows/Flyout_Right.png b/indra/newview/skins/default/textures/windows/Flyout_Right.png Binary files differindex aa1f0625aa..aa1f0625aa 100644..100755 --- a/indra/newview/skins/default/textures/windows/Flyout_Right.png +++ b/indra/newview/skins/default/textures/windows/Flyout_Right.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png Binary files differindex 2292b79eda..2292b79eda 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png Binary files differindex ea547fca6f..ea547fca6f 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png +++ b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png Binary files differindex ecf01c617a..ecf01c617a 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png +++ b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png Binary files differindex 4207ba68e5..4207ba68e5 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png Binary files differindex 2d09475783..2d09475783 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png +++ b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png Binary files differindex 93d62a8d4f..93d62a8d4f 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png Binary files differindex b2b2a77a88..b2b2a77a88 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png Binary files differindex 6fc3744d6b..6fc3744d6b 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png Binary files differindex 1a514742d3..1a514742d3 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Press.png b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png Binary files differindex 7478644b6a..7478644b6a 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Help_Press.png +++ b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png Binary files differindex 9f72a5422b..9f72a5422b 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png Binary files differindex 07db8be1b0..07db8be1b0 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png +++ b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png Binary files differindex 1e753aaf1d..1e753aaf1d 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png Binary files differindex be66b05230..be66b05230 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png +++ b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png Binary files differindex 9a71d16a3f..9a71d16a3f 100644..100755 --- a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Inspector_Background.png b/indra/newview/skins/default/textures/windows/Inspector_Background.png Binary files differindex 4c2a728ac5..4c2a728ac5 100644..100755 --- a/indra/newview/skins/default/textures/windows/Inspector_Background.png +++ b/indra/newview/skins/default/textures/windows/Inspector_Background.png diff --git a/indra/newview/skins/default/textures/windows/Inspector_Hover.png b/indra/newview/skins/default/textures/windows/Inspector_Hover.png Binary files differindex feeee78033..feeee78033 100644..100755 --- a/indra/newview/skins/default/textures/windows/Inspector_Hover.png +++ b/indra/newview/skins/default/textures/windows/Inspector_Hover.png diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png Binary files differindex b4875fd638..b4875fd638 100644..100755 --- a/indra/newview/skins/default/textures/windows/Inspector_I.png +++ b/indra/newview/skins/default/textures/windows/Inspector_I.png diff --git a/indra/newview/skins/default/textures/windows/Resize_Corner.png b/indra/newview/skins/default/textures/windows/Resize_Corner.png Binary files differindex 16ed63e428..16ed63e428 100644..100755 --- a/indra/newview/skins/default/textures/windows/Resize_Corner.png +++ b/indra/newview/skins/default/textures/windows/Resize_Corner.png diff --git a/indra/newview/skins/default/textures/windows/Toast_Background.png b/indra/newview/skins/default/textures/windows/Toast_Background.png Binary files differindex f27d1a12ec..f27d1a12ec 100644..100755 --- a/indra/newview/skins/default/textures/windows/Toast_Background.png +++ b/indra/newview/skins/default/textures/windows/Toast_Background.png diff --git a/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png Binary files differindex 78b137cdaf..78b137cdaf 100644..100755 --- a/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png +++ b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png diff --git a/indra/newview/skins/default/textures/windows/Toast_Over.png b/indra/newview/skins/default/textures/windows/Toast_Over.png Binary files differindex 807e8e553c..807e8e553c 100644..100755 --- a/indra/newview/skins/default/textures/windows/Toast_Over.png +++ b/indra/newview/skins/default/textures/windows/Toast_Over.png diff --git a/indra/newview/skins/default/textures/windows/Volume_Background.png b/indra/newview/skins/default/textures/windows/Volume_Background.png Binary files differindex 43aaa441f5..43aaa441f5 100644..100755 --- a/indra/newview/skins/default/textures/windows/Volume_Background.png +++ b/indra/newview/skins/default/textures/windows/Volume_Background.png diff --git a/indra/newview/skins/default/textures/windows/Wearables_Divider.png b/indra/newview/skins/default/textures/windows/Wearables_Divider.png Binary files differindex 9dce7bf45c..9dce7bf45c 100644..100755 --- a/indra/newview/skins/default/textures/windows/Wearables_Divider.png +++ b/indra/newview/skins/default/textures/windows/Wearables_Divider.png diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png Binary files differindex db253900af..db253900af 100644..100755 --- a/indra/newview/skins/default/textures/windows/Window_Background.png +++ b/indra/newview/skins/default/textures/windows/Window_Background.png diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png Binary files differindex b81ec5b43c..b81ec5b43c 100644..100755 --- a/indra/newview/skins/default/textures/windows/Window_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Window_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png Binary files differindex a570ac06bd..a570ac06bd 100644..100755 --- a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png +++ b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png Binary files differindex d573e8c69a..d573e8c69a 100644..100755 --- a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_down.png b/indra/newview/skins/default/textures/windows/hint_arrow_down.png Binary files differindex ddadef0978..ddadef0978 100644..100755 --- a/indra/newview/skins/default/textures/windows/hint_arrow_down.png +++ b/indra/newview/skins/default/textures/windows/hint_arrow_down.png diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_left.png Binary files differindex 2794b967e8..2794b967e8 100644..100755 --- a/indra/newview/skins/default/textures/windows/hint_arrow_left.png +++ b/indra/newview/skins/default/textures/windows/hint_arrow_left.png diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png Binary files differindex 0dfc99898d..0dfc99898d 100644..100755 --- a/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png +++ b/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_right.png b/indra/newview/skins/default/textures/windows/hint_arrow_right.png Binary files differindex 7ac57f805b..7ac57f805b 100644..100755 --- a/indra/newview/skins/default/textures/windows/hint_arrow_right.png +++ b/indra/newview/skins/default/textures/windows/hint_arrow_right.png diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_up.png b/indra/newview/skins/default/textures/windows/hint_arrow_up.png Binary files differindex bb3e1c07fa..bb3e1c07fa 100644..100755 --- a/indra/newview/skins/default/textures/windows/hint_arrow_up.png +++ b/indra/newview/skins/default/textures/windows/hint_arrow_up.png diff --git a/indra/newview/skins/default/textures/windows/hint_background.png b/indra/newview/skins/default/textures/windows/hint_background.png Binary files differindex cfac5deacb..cfac5deacb 100644..100755 --- a/indra/newview/skins/default/textures/windows/hint_background.png +++ b/indra/newview/skins/default/textures/windows/hint_background.png diff --git a/indra/newview/skins/default/textures/windows/startup_logo.png b/indra/newview/skins/default/textures/windows/startup_logo.png Binary files differindex b89449692b..b89449692b 100644..100755 --- a/indra/newview/skins/default/textures/windows/startup_logo.png +++ b/indra/newview/skins/default/textures/windows/startup_logo.png diff --git a/indra/newview/skins/default/textures/windows/yellow_gradient.png b/indra/newview/skins/default/textures/windows/yellow_gradient.png Binary files differindex 5fd847aaef..5fd847aaef 100644..100755 --- a/indra/newview/skins/default/textures/windows/yellow_gradient.png +++ b/indra/newview/skins/default/textures/windows/yellow_gradient.png diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png Binary files differindex 54934f738a..54934f738a 100644..100755 --- a/indra/newview/skins/default/textures/world/BeaconArrow.png +++ b/indra/newview/skins/default/textures/world/BeaconArrow.png diff --git a/indra/newview/skins/default/textures/world/CameraDragDot.png b/indra/newview/skins/default/textures/world/CameraDragDot.png Binary files differindex 57698e1956..57698e1956 100644..100755 --- a/indra/newview/skins/default/textures/world/CameraDragDot.png +++ b/indra/newview/skins/default/textures/world/CameraDragDot.png diff --git a/indra/newview/skins/default/textures/world/NoEntryLines.png b/indra/newview/skins/default/textures/world/NoEntryLines.png Binary files differindex 18e270bde5..18e270bde5 100644..100755 --- a/indra/newview/skins/default/textures/world/NoEntryLines.png +++ b/indra/newview/skins/default/textures/world/NoEntryLines.png diff --git a/indra/newview/skins/default/textures/world/NoEntryPassLines.png b/indra/newview/skins/default/textures/world/NoEntryPassLines.png Binary files differindex e4b8fc6ae2..e4b8fc6ae2 100644..100755 --- a/indra/newview/skins/default/textures/world/NoEntryPassLines.png +++ b/indra/newview/skins/default/textures/world/NoEntryPassLines.png diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index fc8bc33096..fc8bc33096 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index 5b9e618666..5b9e618666 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/da/floater_activeim.xml b/indra/newview/skins/default/xui/da/floater_activeim.xml index 6fdac8d880..6fdac8d880 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_activeim.xml +++ b/indra/newview/skins/default/xui/da/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml index adf96841c0..adf96841c0 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_auction.xml b/indra/newview/skins/default/xui/da/floater_auction.xml index e74e8a991b..e74e8a991b 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_auction.xml +++ b/indra/newview/skins/default/xui/da/floater_auction.xml diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml index e97089f61e..e97089f61e 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml index d0d766eaab..d0d766eaab 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml index 5100a6df1f..5100a6df1f 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_beacons.xml +++ b/indra/newview/skins/default/xui/da/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml index d3c3ac1899..d3c3ac1899 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_build_options.xml +++ b/indra/newview/skins/default/xui/da/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml index 58a1c1b73e..58a1c1b73e 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/da/floater_bumps.xml b/indra/newview/skins/default/xui/da/floater_bumps.xml index 6b265832cd..6b265832cd 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_bumps.xml +++ b/indra/newview/skins/default/xui/da/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml index 085fa2f9cc..085fa2f9cc 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml index 3c0428b2b0..3c0428b2b0 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml index e32b25ca17..e32b25ca17 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml index f6ee78fa6d..f6ee78fa6d 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/da/floater_buy_object.xml b/indra/newview/skins/default/xui/da/floater_buy_object.xml index 7eb4787139..7eb4787139 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml index b5d5e8bc08..b5d5e8bc08 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_camera.xml +++ b/indra/newview/skins/default/xui/da/floater_camera.xml diff --git a/indra/newview/skins/default/xui/da/floater_choose_group.xml b/indra/newview/skins/default/xui/da/floater_choose_group.xml index 1ccda4f1d7..1ccda4f1d7 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/da/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml index f744b06277..f744b06277 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/da/floater_critical.xml b/indra/newview/skins/default/xui/da/floater_critical.xml index 8c2672f39f..8c2672f39f 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_critical.xml +++ b/indra/newview/skins/default/xui/da/floater_critical.xml diff --git a/indra/newview/skins/default/xui/da/floater_display_name.xml b/indra/newview/skins/default/xui/da/floater_display_name.xml index e848006d8b..e848006d8b 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_display_name.xml +++ b/indra/newview/skins/default/xui/da/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml index a9eddaaf8d..a9eddaaf8d 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_event.xml +++ b/indra/newview/skins/default/xui/da/floater_event.xml diff --git a/indra/newview/skins/default/xui/da/floater_font_test.xml b/indra/newview/skins/default/xui/da/floater_font_test.xml index 591d07188c..591d07188c 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_font_test.xml +++ b/indra/newview/skins/default/xui/da/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/da/floater_gesture.xml b/indra/newview/skins/default/xui/da/floater_gesture.xml index b7075e356a..b7075e356a 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml index 5d3453e327..5d3453e327 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml index a5942eb625..a5942eb625 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml index 4eba4aee1f..4eba4aee1f 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/da/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/da/floater_hud.xml b/indra/newview/skins/default/xui/da/floater_hud.xml index c70da45955..c70da45955 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_hud.xml +++ b/indra/newview/skins/default/xui/da/floater_hud.xml diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml index 28b2f7f7eb..28b2f7f7eb 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_im_container.xml +++ b/indra/newview/skins/default/xui/da/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/da/floater_im_session.xml b/indra/newview/skins/default/xui/da/floater_im_session.xml index 16df7e4b03..16df7e4b03 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_im_session.xml +++ b/indra/newview/skins/default/xui/da/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/da/floater_image_preview.xml b/indra/newview/skins/default/xui/da/floater_image_preview.xml index 5355127ef5..5355127ef5 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_import_collada.xml b/indra/newview/skins/default/xui/da/floater_import_collada.xml index ebc7c86388..ebc7c86388 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/da/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml index dd8cb6f97a..dd8cb6f97a 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml index d0dca8863a..d0dca8863a 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_inspect.xml +++ b/indra/newview/skins/default/xui/da/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml index 3a4b0fbd6b..3a4b0fbd6b 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_inventory.xml +++ b/indra/newview/skins/default/xui/da/floater_inventory.xml diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml index 59dcc87140..59dcc87140 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml index 655701bb96..655701bb96 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml index 49e1397e9f..49e1397e9f 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_joystick.xml +++ b/indra/newview/skins/default/xui/da/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml index 149d174c34..149d174c34 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/da/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml index b3c12627f7..b3c12627f7 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml index 0cc13fd736..0cc13fd736 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml index 2594d6bb9d..2594d6bb9d 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml index 4912d73ba0..4912d73ba0 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_map.xml +++ b/indra/newview/skins/default/xui/da/floater_map.xml diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml index d3028c32f9..d3028c32f9 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/da/floater_media_settings.xml b/indra/newview/skins/default/xui/da/floater_media_settings.xml index 67c122b9d5..67c122b9d5 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/da/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/da/floater_mem_leaking.xml b/indra/newview/skins/default/xui/da/floater_mem_leaking.xml index 60bb3149a5..60bb3149a5 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/da/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/da/floater_model_preview.xml b/indra/newview/skins/default/xui/da/floater_model_preview.xml index a98c70ff52..a98c70ff52 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml index 14d3604b43..14d3604b43 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_moveview.xml +++ b/indra/newview/skins/default/xui/da/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml index 3b3f670792..3b3f670792 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/da/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml index 76bc40edac..76bc40edac 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/da/floater_openobject.xml b/indra/newview/skins/default/xui/da/floater_openobject.xml index 92fdd1e0a6..92fdd1e0a6 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_openobject.xml +++ b/indra/newview/skins/default/xui/da/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml index a5545668a2..a5545668a2 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/da/floater_pay.xml b/indra/newview/skins/default/xui/da/floater_pay.xml index 96ec106803..96ec106803 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_pay.xml +++ b/indra/newview/skins/default/xui/da/floater_pay.xml diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml index 260b257c33..260b257c33 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml index eecddbcdb0..eecddbcdb0 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/da/floater_postcard.xml b/indra/newview/skins/default/xui/da/floater_postcard.xml index 44b0fd4faa..44b0fd4faa 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_postcard.xml +++ b/indra/newview/skins/default/xui/da/floater_postcard.xml diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml index 6caac14cf5..6caac14cf5 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_preferences.xml +++ b/indra/newview/skins/default/xui/da/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml index 436843decc..436843decc 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml index bd2b194717..bd2b194717 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml index 5a0f5a32c0..5a0f5a32c0 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_sound.xml b/indra/newview/skins/default/xui/da/floater_preview_sound.xml index 21f7656462..21f7656462 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml index 48cf53f563..48cf53f563 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml index b091fa09b5..b091fa09b5 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/da/floater_publish_classified.xml b/indra/newview/skins/default/xui/da/floater_publish_classified.xml index 0f65e6c18a..0f65e6c18a 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/da/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/da/floater_region_debug_console.xml b/indra/newview/skins/default/xui/da/floater_region_debug_console.xml index 71313f4fea..71313f4fea 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/da/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/da/floater_region_info.xml b/indra/newview/skins/default/xui/da/floater_region_info.xml index ae00f90f16..ae00f90f16 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_region_info.xml +++ b/indra/newview/skins/default/xui/da/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml index 07978792b9..07978792b9 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_debug.xml b/indra/newview/skins/default/xui/da/floater_script_debug.xml index df60a2e23f..df60a2e23f 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/da/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml index a7f86a782a..a7f86a782a 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/da/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml index 1aacab6915..1aacab6915 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_queue.xml b/indra/newview/skins/default/xui/da/floater_script_queue.xml index 1ff5494458..1ff5494458 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/da/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/da/floater_script_search.xml b/indra/newview/skins/default/xui/da/floater_script_search.xml index f1605cac34..f1605cac34 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_script_search.xml +++ b/indra/newview/skins/default/xui/da/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/da/floater_search.xml b/indra/newview/skins/default/xui/da/floater_search.xml index 80a30b1aa1..80a30b1aa1 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_search.xml +++ b/indra/newview/skins/default/xui/da/floater_search.xml diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml index 9f7aad5e03..9f7aad5e03 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_select_key.xml +++ b/indra/newview/skins/default/xui/da/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml index 873e6d7995..873e6d7995 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml index f7eda56e48..f7eda56e48 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml index 926c2429ac..926c2429ac 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/da/floater_sound_devices.xml b/indra/newview/skins/default/xui/da/floater_sound_devices.xml index cb4cbba570..cb4cbba570 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/da/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml index 5f74f28a23..5f74f28a23 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml index fe3fa9626e..fe3fa9626e 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_stats.xml +++ b/indra/newview/skins/default/xui/da/floater_stats.xml diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml index f203c2504f..f203c2504f 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/da/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml index 5a0e89aa98..5a0e89aa98 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_telehub.xml +++ b/indra/newview/skins/default/xui/da/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml index fbc7fe2319..fbc7fe2319 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml index 815bde456e..815bde456e 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_tools.xml diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml index 86c24d2c19..86c24d2c19 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/da/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index af9ee0bd06..af9ee0bd06 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml diff --git a/indra/newview/skins/default/xui/da/floater_url_entry.xml b/indra/newview/skins/default/xui/da/floater_url_entry.xml index 30b3b7184b..30b3b7184b 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/da/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml index 69de696bf5..69de696bf5 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/da/floater_voice_effect.xml b/indra/newview/skins/default/xui/da/floater_voice_effect.xml index 86ad251103..86ad251103 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/da/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/da/floater_web_content.xml b/indra/newview/skins/default/xui/da/floater_web_content.xml index 74092e88ec..74092e88ec 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_web_content.xml +++ b/indra/newview/skins/default/xui/da/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml index 443e84b64a..443e84b64a 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml index db8ead21bd..db8ead21bd 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_window_size.xml +++ b/indra/newview/skins/default/xui/da/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml index 97364e0f9f..97364e0f9f 100644..100755 --- a/indra/newview/skins/default/xui/da/floater_world_map.xml +++ b/indra/newview/skins/default/xui/da/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml index dc1ed562eb..dc1ed562eb 100644..100755 --- a/indra/newview/skins/default/xui/da/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/da/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/da/inspect_group.xml b/indra/newview/skins/default/xui/da/inspect_group.xml index 486c5d8784..486c5d8784 100644..100755 --- a/indra/newview/skins/default/xui/da/inspect_group.xml +++ b/indra/newview/skins/default/xui/da/inspect_group.xml diff --git a/indra/newview/skins/default/xui/da/inspect_object.xml b/indra/newview/skins/default/xui/da/inspect_object.xml index 78ccc5b869..78ccc5b869 100644..100755 --- a/indra/newview/skins/default/xui/da/inspect_object.xml +++ b/indra/newview/skins/default/xui/da/inspect_object.xml diff --git a/indra/newview/skins/default/xui/da/inspect_remote_object.xml b/indra/newview/skins/default/xui/da/inspect_remote_object.xml index a06452afe6..a06452afe6 100644..100755 --- a/indra/newview/skins/default/xui/da/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/da/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/da/language_settings.xml b/indra/newview/skins/default/xui/da/language_settings.xml index 0e3cbfd2d2..0e3cbfd2d2 100644..100755 --- a/indra/newview/skins/default/xui/da/language_settings.xml +++ b/indra/newview/skins/default/xui/da/language_settings.xml diff --git a/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml index 1e8301dc4c..1e8301dc4c 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_attachment_other.xml b/indra/newview/skins/default/xui/da/menu_attachment_other.xml index ca7b184942..ca7b184942 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/da/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml index 35ba27f9e2..35ba27f9e2 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/da/menu_avatar_icon.xml b/indra/newview/skins/default/xui/da/menu_avatar_icon.xml index 26b58ce1ab..26b58ce1ab 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/da/menu_avatar_other.xml b/indra/newview/skins/default/xui/da/menu_avatar_other.xml index a778dedf0b..a778dedf0b 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml index 4e6b42a744..4e6b42a744 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml index a0d74db36d..a0d74db36d 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/menu_bottomtray.xml diff --git a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml index 9d7fc0f223..9d7fc0f223 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml index 0e90d5a3ae..0e90d5a3ae 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml index 16c225b7d9..16c225b7d9 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/da/menu_cof_gear.xml b/indra/newview/skins/default/xui/da/menu_cof_gear.xml index f44369fd84..f44369fd84 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_edit.xml b/indra/newview/skins/default/xui/da/menu_edit.xml index 3752f42b1c..3752f42b1c 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_edit.xml +++ b/indra/newview/skins/default/xui/da/menu_edit.xml diff --git a/indra/newview/skins/default/xui/da/menu_favorites.xml b/indra/newview/skins/default/xui/da/menu_favorites.xml index a4793e294c..a4793e294c 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_favorites.xml +++ b/indra/newview/skins/default/xui/da/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/da/menu_gesture_gear.xml b/indra/newview/skins/default/xui/da/menu_gesture_gear.xml index a9010e99b6..a9010e99b6 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_group_plus.xml b/indra/newview/skins/default/xui/da/menu_group_plus.xml index 97fbec1ed1..97fbec1ed1 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/da/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml index d96a8a8a17..d96a8a8a17 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/da/menu_im_well_button.xml b/indra/newview/skins/default/xui/da/menu_im_well_button.xml deleted file mode 100644 index 4889230919..0000000000 --- a/indra/newview/skins/default/xui/da/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Luk alle" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml index f64a6ad455..f64a6ad455 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml index b89d9a5789..b89d9a5789 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml index 6ebc40a8dd..6ebc40a8dd 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml index 8da35adb1b..8da35adb1b 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml index e28842836d..e28842836d 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml index 887c6484bc..887c6484bc 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml index c3b03232bf..c3b03232bf 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml index f9bdf36f1f..f9bdf36f1f 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml index eca03d3ee9..eca03d3ee9 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml index 4809b24463..4809b24463 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/da/menu_land.xml b/indra/newview/skins/default/xui/da/menu_land.xml index 1548f18f89..1548f18f89 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_land.xml +++ b/indra/newview/skins/default/xui/da/menu_land.xml diff --git a/indra/newview/skins/default/xui/da/menu_landmark.xml b/indra/newview/skins/default/xui/da/menu_landmark.xml index 3cf2ffe375..3cf2ffe375 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_landmark.xml +++ b/indra/newview/skins/default/xui/da/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml index 0b7a5040ae..0b7a5040ae 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_login.xml +++ b/indra/newview/skins/default/xui/da/menu_login.xml diff --git a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml index 788b1c4b59..788b1c4b59 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml index 186dbd476a..186dbd476a 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/da/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml index d9626692d5..d9626692d5 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/da/menu_navbar.xml b/indra/newview/skins/default/xui/da/menu_navbar.xml index c04206824a..c04206824a 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_navbar.xml +++ b/indra/newview/skins/default/xui/da/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/da/menu_nearby_chat.xml b/indra/newview/skins/default/xui/da/menu_nearby_chat.xml index be532ad406..be532ad406 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/da/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml index 40b35b5fdd..40b35b5fdd 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml index ba62ccf90c..ba62ccf90c 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_object.xml +++ b/indra/newview/skins/default/xui/da/menu_object.xml diff --git a/indra/newview/skins/default/xui/da/menu_object_icon.xml b/indra/newview/skins/default/xui/da/menu_object_icon.xml index 08aeb633b6..08aeb633b6 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/da/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml index 0b0fff3b93..0b0fff3b93 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml index d6a6f2724f..d6a6f2724f 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml index 5951d3ffb9..5951d3ffb9 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml index 32c5e6a6c7..32c5e6a6c7 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml index 841f58b619..841f58b619 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/da/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml index 0b9a791530..0b9a791530 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml index 5470c32761..5470c32761 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml index 9318a0e340..9318a0e340 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml index 2f35ff3c92..2f35ff3c92 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml index d081f637f2..d081f637f2 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/da/menu_picks.xml b/indra/newview/skins/default/xui/da/menu_picks.xml index 81ee900773..81ee900773 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_picks.xml +++ b/indra/newview/skins/default/xui/da/menu_picks.xml diff --git a/indra/newview/skins/default/xui/da/menu_picks_plus.xml b/indra/newview/skins/default/xui/da/menu_picks_plus.xml index d95071fbbb..d95071fbbb 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/da/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/da/menu_place.xml b/indra/newview/skins/default/xui/da/menu_place.xml index b87964ac14..b87964ac14 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_place.xml +++ b/indra/newview/skins/default/xui/da/menu_place.xml diff --git a/indra/newview/skins/default/xui/da/menu_place_add_button.xml b/indra/newview/skins/default/xui/da/menu_place_add_button.xml index 7ad2253550..7ad2253550 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/da/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml index 5f573c2363..5f573c2363 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml index 13dbcdd42e..13dbcdd42e 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml index 6745007c99..6745007c99 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/da/menu_save_outfit.xml b/indra/newview/skins/default/xui/da/menu_save_outfit.xml index 188229b586..188229b586 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/da/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/da/menu_script_chiclet.xml b/indra/newview/skins/default/xui/da/menu_script_chiclet.xml index cdd3212373..cdd3212373 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/da/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/da/menu_slurl.xml b/indra/newview/skins/default/xui/da/menu_slurl.xml index a9302e111e..a9302e111e 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_slurl.xml +++ b/indra/newview/skins/default/xui/da/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml index a1c25fea69..a1c25fea69 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml index dbaec62087..dbaec62087 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml index c4d4bb4b5b..c4d4bb4b5b 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/da/menu_text_editor.xml b/indra/newview/skins/default/xui/da/menu_text_editor.xml index 3ff31ea232..3ff31ea232 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/da/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/da/menu_topinfobar.xml b/indra/newview/skins/default/xui/da/menu_topinfobar.xml index 08d1c25d6f..08d1c25d6f 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/da/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_agent.xml b/indra/newview/skins/default/xui/da/menu_url_agent.xml index 491586f3b4..491586f3b4 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/da/menu_url_agent.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_group.xml b/indra/newview/skins/default/xui/da/menu_url_group.xml index c776159b0a..c776159b0a 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_group.xml +++ b/indra/newview/skins/default/xui/da/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_http.xml b/indra/newview/skins/default/xui/da/menu_url_http.xml index 4398777a39..4398777a39 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_http.xml +++ b/indra/newview/skins/default/xui/da/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_inventory.xml b/indra/newview/skins/default/xui/da/menu_url_inventory.xml index 9a7de23e06..9a7de23e06 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_map.xml b/indra/newview/skins/default/xui/da/menu_url_map.xml index ff4a4d5174..ff4a4d5174 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_map.xml +++ b/indra/newview/skins/default/xui/da/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_objectim.xml b/indra/newview/skins/default/xui/da/menu_url_objectim.xml index e27cf84959..e27cf84959 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/da/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_parcel.xml b/indra/newview/skins/default/xui/da/menu_url_parcel.xml index 0f21e14f66..0f21e14f66 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/da/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_slapp.xml b/indra/newview/skins/default/xui/da/menu_url_slapp.xml index dd25db2aa7..dd25db2aa7 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/da/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_slurl.xml b/indra/newview/skins/default/xui/da/menu_url_slurl.xml index 8d84a138bb..8d84a138bb 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/da/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/da/menu_url_teleport.xml b/indra/newview/skins/default/xui/da/menu_url_teleport.xml index e0ca7b920d..e0ca7b920d 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/da/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index d695cd1f89..f2ed7c2e64 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -245,7 +245,7 @@ <menu label="Gengivelse" name="Rendering"> <menu_item_check label="Akser" name="Axes"/> <menu_item_check label="Wireframe" name="Wireframe"/> - <menu_item_check label="Lys og skygger" name="Lighting and Shadows"/> + <menu_item_check label="Lys og skygger" name="Advanced Lighting Model"/> <menu_item_check label="Skygger fra sol/måne/andre lyskilder" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO og skygge udjævning" name="SSAO and Shadow Smoothing"/> <menu_item_check label="Globalt lys (eksperimentiel)" name="Global Illumination"/> diff --git a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml index 63f4b0b388..63f4b0b388 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml index 515a15b287..515a15b287 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml index c0db7b6842..c0db7b6842 100644..100755 --- a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/da/mime_types.xml b/indra/newview/skins/default/xui/da/mime_types.xml index 0b00a29f07..0b00a29f07 100644..100755 --- a/indra/newview/skins/default/xui/da/mime_types.xml +++ b/indra/newview/skins/default/xui/da/mime_types.xml diff --git a/indra/newview/skins/default/xui/da/mime_types_linux.xml b/indra/newview/skins/default/xui/da/mime_types_linux.xml index 69a0fb23f6..69a0fb23f6 100644..100755 --- a/indra/newview/skins/default/xui/da/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/da/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/da/mime_types_mac.xml b/indra/newview/skins/default/xui/da/mime_types_mac.xml index bd9981b045..bd9981b045 100644..100755 --- a/indra/newview/skins/default/xui/da/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/da/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 33b876bdb9..33b876bdb9 100644..100755 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml diff --git a/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml index e2d1f26d42..e2d1f26d42 100644..100755 --- a/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/da/panel_active_object_row.xml b/indra/newview/skins/default/xui/da/panel_active_object_row.xml index 9c27ea7fe2..9c27ea7fe2 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/da/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml index 1953fad31f..1953fad31f 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml index 890f4a2f0a..890f4a2f0a 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml index 4f5041ad54..4f5041ad54 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml index d2ade170d1..d2ade170d1 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml index 4cbcdebbe4..4cbcdebbe4 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml index 3cd9d55dd0..3cd9d55dd0 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml index bd31253ca4..bd31253ca4 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml index a54d320ffd..a54d320ffd 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/da/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml index c08d095c66..c08d095c66 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml index 88b0636e9e..88b0636e9e 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml index 92d78b01a2..92d78b01a2 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml index 700ad4fa14..700ad4fa14 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml index dd8d86cfbf..dd8d86cfbf 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml index 0f60a6df51..0f60a6df51 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_classified.xml b/indra/newview/skins/default/xui/da/panel_edit_classified.xml index fc4780a34e..fc4780a34e 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml index d801118cea..d801118cea 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml index 36f58428a6..36f58428a6 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_hair.xml b/indra/newview/skins/default/xui/da/panel_edit_hair.xml index e91e6324e8..e91e6324e8 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml index 4e7336747d..4e7336747d 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_pants.xml b/indra/newview/skins/default/xui/da/panel_edit_pants.xml index 61056e9e6c..61056e9e6c 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_physics.xml b/indra/newview/skins/default/xui/da/panel_edit_physics.xml index 16c9b16fa3..16c9b16fa3 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml index 3036f30240..3036f30240 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml index 14fd48ba2f..14fd48ba2f 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_shape.xml b/indra/newview/skins/default/xui/da/panel_edit_shape.xml index 7c1ffe5cfa..7c1ffe5cfa 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_shirt.xml b/indra/newview/skins/default/xui/da/panel_edit_shirt.xml index 4dfb47aab2..4dfb47aab2 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml index 653ea421b5..653ea421b5 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_skin.xml b/indra/newview/skins/default/xui/da/panel_edit_skin.xml index 608e1d6e0b..608e1d6e0b 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_skirt.xml b/indra/newview/skins/default/xui/da/panel_edit_skirt.xml index e80e60efd8..e80e60efd8 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_socks.xml b/indra/newview/skins/default/xui/da/panel_edit_socks.xml index 82a7341317..82a7341317 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml index d4a12209db..d4a12209db 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml index aacfae79e1..aacfae79e1 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml index a9db5d2ab0..a9db5d2ab0 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml index 906870e6d9..906870e6d9 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml index 26fe4f6ebe..26fe4f6ebe 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml index eccddb55c8..eccddb55c8 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_general.xml +++ b/indra/newview/skins/default/xui/da/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml index 3d561f1e5b..3d561f1e5b 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml index 49daf6c9f2..49daf6c9f2 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml index 49d415e515..49d415e515 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml index e77e548340..e77e548340 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml index 0a0b8f5e04..0a0b8f5e04 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml index 8a684ca031..8a684ca031 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml index ebc773f7ed..ebc773f7ed 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml index 5cecb93d40..5cecb93d40 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/da/panel_inventory_item.xml b/indra/newview/skins/default/xui/da/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/da/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml index 8503a41763..8503a41763 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/da/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml index e9e5e506fd..e9e5e506fd 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/da/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml index b7cb76d4cb..b7cb76d4cb 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_login.xml +++ b/indra/newview/skins/default/xui/da/panel_login.xml diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml index d6406939c1..d6406939c1 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml index f98ced5f91..f98ced5f91 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_me.xml +++ b/indra/newview/skins/default/xui/da/panel_me.xml diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml index 48f08b9dfd..48f08b9dfd 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml index 84468eb2a7..84468eb2a7 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml index 1b64888271..1b64888271 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml index 2ee87433a4..2ee87433a4 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml index 949cbcbd7b..eb104201f8 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="Klik her for at chatte." name="chat_box" tool_tip="Tryk på enter for at tale, Ctrl-Enter for at råbe."/> <button name="show_nearby_chat" tool_tip="Viser/skjuler log for chat nærved"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml index ef8ed3ad07..ef8ed3ad07 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml index 30ad4ff9f6..30ad4ff9f6 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml index 3736ea06ba..3736ea06ba 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml index 055c42c003..055c42c003 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml index 7b6469023b..7b6469023b 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfits_list.xml b/indra/newview/skins/default/xui/da/panel_outfits_list.xml index 72caedb461..72caedb461 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml index 8d25efa97b..8d25efa97b 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml index 66a128cd13..66a128cd13 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_people.xml +++ b/indra/newview/skins/default/xui/da/panel_people.xml diff --git a/indra/newview/skins/default/xui/da/panel_pick_info.xml b/indra/newview/skins/default/xui/da/panel_pick_info.xml index 8a5141f967..8a5141f967 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/da/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/da/panel_picks.xml b/indra/newview/skins/default/xui/da/panel_picks.xml index 8af68ee69a..8af68ee69a 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_picks.xml +++ b/indra/newview/skins/default/xui/da/panel_picks.xml diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml index 8dd0fb2d21..8dd0fb2d21 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml index c555f2fb09..c555f2fb09 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_places.xml +++ b/indra/newview/skins/default/xui/da/panel_places.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml index 48106c7dfe..48106c7dfe 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml index 7caa17d514..7caa17d514 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml 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 890a3038ef..890a3038ef 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml index cc3dc480bc..cc3dc480bc 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml 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 5702d48e97..5702d48e97 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml index 72200a07ad..72200a07ad 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_move.xml b/indra/newview/skins/default/xui/da/panel_preferences_move.xml index 98dfed92c1..98dfed92c1 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml index 0df330b016..0df330b016 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml index 479e98817e..479e98817e 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml index 26d2ae4abd..26d2ae4abd 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml index cfb32500c6..cfb32500c6 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml index 4b9c7539ea..4b9c7539ea 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_debug.xml b/indra/newview/skins/default/xui/da/panel_region_debug.xml index 08e2d1e263..08e2d1e263 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/da/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml index 65948ce481..65948ce481 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml index 667c88c5b1..667c88c5b1 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_region_general.xml +++ b/indra/newview/skins/default/xui/da/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_terrain.xml b/indra/newview/skins/default/xui/da/panel_region_terrain.xml index 14ef0060b1..14ef0060b1 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/da/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml index 45946fd222..45946fd222 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml diff --git a/indra/newview/skins/default/xui/da/panel_script_ed.xml b/indra/newview/skins/default/xui/da/panel_script_ed.xml index 3dec4bf101..3dec4bf101 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/da/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml index 821c82ccda..821c82ccda 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml index 91fc76dbb4..91fc76dbb4 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param.xml index 99f61b938b..99f61b938b 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/da/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml index 66c3e69904..66c3e69904 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/da/panel_side_tray.xml diff --git a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml index ce3a1d8b4e..ce3a1d8b4e 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/da/panel_sound_devices.xml b/indra/newview/skins/default/xui/da/panel_sound_devices.xml index 27b7666a1f..27b7666a1f 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/da/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml index f25639d56f..f25639d56f 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml index 6e7bdfc188..6e7bdfc188 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml index e6e78028f5..e6e78028f5 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml index 8148588c86..8148588c86 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml index 50f561ec7f..50f561ec7f 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/da/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/da/panel_world_map.xml b/indra/newview/skins/default/xui/da/panel_world_map.xml index 138b922df1..138b922df1 100644..100755 --- a/indra/newview/skins/default/xui/da/panel_world_map.xml +++ b/indra/newview/skins/default/xui/da/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/da/role_actions.xml b/indra/newview/skins/default/xui/da/role_actions.xml index 7e581200a5..7e581200a5 100644..100755 --- a/indra/newview/skins/default/xui/da/role_actions.xml +++ b/indra/newview/skins/default/xui/da/role_actions.xml diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml index c5caefe070..c5caefe070 100644..100755 --- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml index b3293b981e..b3293b981e 100644..100755 --- a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml index d52845160b..d52845160b 100644..100755 --- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml index f80d5aeb15..f80d5aeb15 100644..100755 --- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 11d100eeff..11d100eeff 100644..100755 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml index 0d89fae986..0d89fae986 100644..100755 --- a/indra/newview/skins/default/xui/da/teleport_strings.xml +++ b/indra/newview/skins/default/xui/da/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/da/xui_version.xml b/indra/newview/skins/default/xui/da/xui_version.xml index 0e777751d3..0e777751d3 100644..100755 --- a/indra/newview/skins/default/xui/da/xui_version.xml +++ b/indra/newview/skins/default/xui/da/xui_version.xml diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index 4387a61963..4387a61963 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml 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 44922fbe78..44922fbe78 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/de/floater_activeim.xml b/indra/newview/skins/default/xui/de/floater_activeim.xml index 416e31b2d6..416e31b2d6 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_activeim.xml +++ b/indra/newview/skins/default/xui/de/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml index 3dc554b120..3dc554b120 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml index 9a6f5e0166..9a6f5e0166 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_auction.xml b/indra/newview/skins/default/xui/de/floater_auction.xml index 8ededff319..8ededff319 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_auction.xml +++ b/indra/newview/skins/default/xui/de/floater_auction.xml diff --git a/indra/newview/skins/default/xui/de/floater_autoreplace.xml b/indra/newview/skins/default/xui/de/floater_autoreplace.xml index 0c774990ef..0c774990ef 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/de/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/de/floater_avatar.xml b/indra/newview/skins/default/xui/de/floater_avatar.xml index ba0dd54d96..ba0dd54d96 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_avatar.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml index f66b87b76c..f66b87b76c 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml index 8235eacde0..8235eacde0 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml index 1a052bd814..1a052bd814 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_beacons.xml +++ b/indra/newview/skins/default/xui/de/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml index 939fd5dee4..939fd5dee4 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_build_options.xml +++ b/indra/newview/skins/default/xui/de/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml index 8f99fc933c..8f99fc933c 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/de/floater_bumps.xml b/indra/newview/skins/default/xui/de/floater_bumps.xml index 5d02511ab1..5d02511ab1 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_bumps.xml +++ b/indra/newview/skins/default/xui/de/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/indra/newview/skins/default/xui/de/floater_buy_contents.xml index bd6ace6bda..bd6ace6bda 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml index 65926c088c..65926c088c 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml index 38d3bdd77f..38d3bdd77f 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml index ca4ee8981b..ca4ee8981b 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/de/floater_buy_object.xml b/indra/newview/skins/default/xui/de/floater_buy_object.xml index 29b49f57b3..29b49f57b3 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml index 163ef87d8c..163ef87d8c 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_camera.xml +++ b/indra/newview/skins/default/xui/de/floater_camera.xml diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml index 2464a55665..ab77d4dae5 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/de/floater_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="chat_bar" title="CHAT IN DER NÄHE"> +<floater name="nearby_chat" title="CHAT IN DER NÄHE"> <panel name="bottom_panel"> <line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabetaste zum Sprechen, Strg+Eingabe zum Rufen"/> <button name="show_nearby_chat" tool_tip="Chatprotokoll in der Nähe ein-/ausblenden"/> diff --git a/indra/newview/skins/default/xui/de/floater_choose_group.xml b/indra/newview/skins/default/xui/de/floater_choose_group.xml index 3d76b645fe..3d76b645fe 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/de/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml index 0fe154b531..0fe154b531 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/de/floater_conversation_log.xml b/indra/newview/skins/default/xui/de/floater_conversation_log.xml new file mode 100644 index 0000000000..19620a0fc9 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="UNTERHALTUNGSPROTOKOLL"> + <panel name="buttons_panel"> + <filter_editor label="Nach Personen filtern" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="Anzeige-/Sortieroptionen"/> + <menu_button name="conversations_gear_btn" tool_tip="Aktionen für ausgewählte Person/Gruppe"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml new file mode 100644 index 0000000000..010ad19076 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="UNTERHALTUNG:"> + <floater.string name="Title"> + UNTERHALTUNG: [NAME] + </floater.string> + <text name="page_label" value="Seite"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_critical.xml b/indra/newview/skins/default/xui/de/floater_critical.xml index 0b147926dd..0b147926dd 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_critical.xml +++ b/indra/newview/skins/default/xui/de/floater_critical.xml diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml index cc14ce640d..cc14ce640d 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/de/floater_destinations.xml b/indra/newview/skins/default/xui/de/floater_destinations.xml index 57881488fd..57881488fd 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_destinations.xml +++ b/indra/newview/skins/default/xui/de/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/de/floater_display_name.xml b/indra/newview/skins/default/xui/de/floater_display_name.xml index 4c2914fccb..4c2914fccb 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_display_name.xml +++ b/indra/newview/skins/default/xui/de/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml index 8b29428c24..8b29428c24 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml index ea4c5f7ebc..ea4c5f7ebc 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml index 9b9d5e7d77..9b9d5e7d77 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/de/floater_environment_settings.xml b/indra/newview/skins/default/xui/de/floater_environment_settings.xml index 946416980a..946416980a 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml index 5b3267d7c9..5b3267d7c9 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_event.xml +++ b/indra/newview/skins/default/xui/de/floater_event.xml diff --git a/indra/newview/skins/default/xui/de/floater_fast_timers.xml b/indra/newview/skins/default/xui/de/floater_fast_timers.xml index e61e542688..e61e542688 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/de/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/de/floater_font_test.xml b/indra/newview/skins/default/xui/de/floater_font_test.xml index 29357b8ee0..29357b8ee0 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_font_test.xml +++ b/indra/newview/skins/default/xui/de/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/de/floater_gesture.xml b/indra/newview/skins/default/xui/de/floater_gesture.xml index 7b35da8d5c..7b35da8d5c 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_gesture.xml +++ b/indra/newview/skins/default/xui/de/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml index 8cb1af9f7d..8cb1af9f7d 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml index fd6c9a0875..fd6c9a0875 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml index d55a3b0a26..d55a3b0a26 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/de/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/de/floater_how_to.xml b/indra/newview/skins/default/xui/de/floater_how_to.xml index caea221f83..caea221f83 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_how_to.xml +++ b/indra/newview/skins/default/xui/de/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/de/floater_hud.xml b/indra/newview/skins/default/xui/de/floater_hud.xml index 8a10eccabe..8a10eccabe 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_hud.xml +++ b/indra/newview/skins/default/xui/de/floater_hud.xml diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml index 95eda97938..5bf916c8e9 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_im_container.xml +++ b/indra/newview/skins/default/xui/de/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="GESPRÄCHE"/> +<multi_floater name="floater_im_box" title="GESPRÄCHE"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="Anzeige-/Sortieroptionen"/> + <button name="add_btn" tool_tip="Neue Unterhaltung starten"/> + <button name="speak_btn" tool_tip="Über Ihr Mikrofon mit anderen sprechen"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="Diese Liste schließen/erweitern"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="Dieses Fenster schließen"/> + <text name="stub_textbox"> + Diese Unterhaltung erscheint in einem separaten Fenster. [secondlife:/// Zurückholen.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml index abaf275651..f96eb72cb1 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_im_session.xml +++ b/indra/newview/skins/default/xui/de/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="An" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] wurde zur Unterhaltung eingeladen."/> + <floater.string name="multiple_participants_added" value="[NAME] wurden zur Unterhaltung eingeladen."/> + <floater.string name="tooltip_to_separate_window" value="Diese Unterhaltung in separates Fenster verschieben"/> + <floater.string name="tooltip_to_main_window" value="Diese Unterhaltung zurück ins Hauptfenster verschieben"/> + <floater.string name="start_call_button_tooltip" value="Voice-Verbindung öffnen"/> + <floater.string name="end_call_button_tooltip" value="Voice-Verbindung schließen"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="Dieses Fenster schließen"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Teilnehmerliste schließen"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Teilnehmerliste erweitern"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="Anzeige-/Sortieroptionen"/> + <menu_button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/> + <button name="add_btn" tool_tip="Jemanden zu dieser Unterhaltung hinzufügen"/> + <button name="voice_call_btn" tool_tip="Voice-Verbindung öffnen"/> + <button name="close_btn" tool_tip="Diese Unterhaltung beenden"/> + <button name="expand_collapse_btn" tool_tip="Dieses Fenster schließen/erweitern"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Chat übersetzen" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="An" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="Nachrichtenfenster anzeigen/ausblenden"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_image_preview.xml b/indra/newview/skins/default/xui/de/floater_image_preview.xml index d581c6051b..d581c6051b 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_import_collada.xml b/indra/newview/skins/default/xui/de/floater_import_collada.xml index 8b1313c7b5..8b1313c7b5 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/de/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml index 213d9f54f5..f13842f479 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml @@ -10,7 +10,7 @@ Anonym </floater.string> <floater.string name="VoiceInviteP2P"> - ruft an. + ruft Sie an. </floater.string> <floater.string name="VoiceInviteAdHoc"> ist einem Voice-Konferenz-Chat beigetreten. @@ -25,9 +25,9 @@ Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten? </floater.string> <text name="question"> - Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten? + Wenn Sie antworten, wird Ihre aktuelle Voice-Unterhaltung beendet. </text> - <button label="Akzeptieren" label_selected="Akzeptieren" name="Accept"/> - <button label="Ablehnen" label_selected="Ablehnen" name="Reject"/> - <button label="IM starten" name="Start IM"/> + <button label="Annehmen" label_selected="Annehmen" name="Accept"/> + <button label="Ignorieren" label_selected="Ignorieren" name="Reject"/> + <button label="Stattdessen IM öffnen" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml index da97ceb2d8..da97ceb2d8 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_inspect.xml +++ b/indra/newview/skins/default/xui/de/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml index 7f48105460..7f48105460 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml index d63426d684..d63426d684 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/de/floater_joystick.xml b/indra/newview/skins/default/xui/de/floater_joystick.xml index 2efc11df29..2efc11df29 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_joystick.xml +++ b/indra/newview/skins/default/xui/de/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml index 45ff37c147..45ff37c147 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/de/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/de/floater_land_holdings.xml b/indra/newview/skins/default/xui/de/floater_land_holdings.xml index 73559407a9..73559407a9 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/de/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml index 3b42a8b741..3b42a8b741 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml index 73c21edc67..73c21edc67 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml index c4c42af66d..c4c42af66d 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_map.xml +++ b/indra/newview/skins/default/xui/de/floater_map.xml diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml index 2d438dfe21..2d438dfe21 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/de/floater_media_settings.xml b/indra/newview/skins/default/xui/de/floater_media_settings.xml index 1b98ed7973..1b98ed7973 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml index fdc9b950b6..fdc9b950b6 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml index a412b530a4..a412b530a4 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml index 4285462bc8..4285462bc8 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml index c1c8271310..c1c8271310 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_moveview.xml +++ b/indra/newview/skins/default/xui/de/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml index 3f1af3dc63..3f1af3dc63 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/de/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/de/floater_my_appearance.xml b/indra/newview/skins/default/xui/de/floater_my_appearance.xml index e26b2434cc..e26b2434cc 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/de/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/de/floater_my_inventory.xml b/indra/newview/skins/default/xui/de/floater_my_inventory.xml index 0cfa17562e..0cfa17562e 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/de/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/de/floater_notification.xml b/indra/newview/skins/default/xui/de/floater_notification.xml index 7752d22b52..7752d22b52 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_notification.xml +++ b/indra/newview/skins/default/xui/de/floater_notification.xml diff --git a/indra/newview/skins/default/xui/de/floater_notifications_console.xml b/indra/newview/skins/default/xui/de/floater_notifications_console.xml index e271cdace2..e271cdace2 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/de/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/de/floater_object_weights.xml b/indra/newview/skins/default/xui/de/floater_object_weights.xml index e6641d3d18..e6641d3d18 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/de/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/de/floater_openobject.xml b/indra/newview/skins/default/xui/de/floater_openobject.xml index c3e7052283..c3e7052283 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_openobject.xml +++ b/indra/newview/skins/default/xui/de/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml index 7481e6d4b7..7481e6d4b7 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml index 81079a3c52..81079a3c52 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml index 7096dbc156..7096dbc156 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml index ebf8f01632..88e9f53a4c 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> Anzeigen: </text> - <check_box label="Welt" name="show_world"/> + <check_box label="Test" name="show_world"/> <check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/> <check_box label="Navmesh" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml index 0d3ba59efb..0d3ba59efb 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml index a0a622ecbc..a0a622ecbc 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_pay.xml +++ b/indra/newview/skins/default/xui/de/floater_pay.xml diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml index 7159bbadb3..7159bbadb3 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/de/floater_people.xml b/indra/newview/skins/default/xui/de/floater_people.xml index fd1db148ac..fd1db148ac 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_people.xml +++ b/indra/newview/skins/default/xui/de/floater_people.xml diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml index 9be22f3ccb..9be22f3ccb 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/de/floater_picks.xml b/indra/newview/skins/default/xui/de/floater_picks.xml index 2521920e83..2521920e83 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_picks.xml +++ b/indra/newview/skins/default/xui/de/floater_picks.xml diff --git a/indra/newview/skins/default/xui/de/floater_places.xml b/indra/newview/skins/default/xui/de/floater_places.xml index 80a1490afd..80a1490afd 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_places.xml +++ b/indra/newview/skins/default/xui/de/floater_places.xml diff --git a/indra/newview/skins/default/xui/de/floater_post_process.xml b/indra/newview/skins/default/xui/de/floater_post_process.xml index a6ed8cc3df..a6ed8cc3df 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_post_process.xml +++ b/indra/newview/skins/default/xui/de/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml index 3624c4c968..3624c4c968 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_preferences.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml index cdefb470c2..cdefb470c2 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml index 2dd47a27ad..2dd47a27ad 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml index 76dc623ca4..76dc623ca4 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml index 14e666fd22..14e666fd22 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_sound.xml b/indra/newview/skins/default/xui/de/floater_preview_sound.xml index 4629ec4a04..4629ec4a04 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml index 526c0813bd..526c0813bd 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml index bdd772a9c2..bdd772a9c2 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/de/floater_publish_classified.xml b/indra/newview/skins/default/xui/de/floater_publish_classified.xml index d91535ebc3..d91535ebc3 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/de/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/de/floater_region_debug_console.xml b/indra/newview/skins/default/xui/de/floater_region_debug_console.xml index b8a1a89c30..b8a1a89c30 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/de/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/de/floater_region_info.xml b/indra/newview/skins/default/xui/de/floater_region_info.xml index c0dc47a67d..c0dc47a67d 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_region_info.xml +++ b/indra/newview/skins/default/xui/de/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml index e37e298478..e37e298478 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_debug.xml b/indra/newview/skins/default/xui/de/floater_script_debug.xml index 585a6c36ea..585a6c36ea 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/de/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_limits.xml b/indra/newview/skins/default/xui/de/floater_script_limits.xml index 94a24a97ae..94a24a97ae 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/de/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_preview.xml b/indra/newview/skins/default/xui/de/floater_script_preview.xml index e0bcd42523..e0bcd42523 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_queue.xml b/indra/newview/skins/default/xui/de/floater_script_queue.xml index f267fe4b7c..f267fe4b7c 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/de/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/de/floater_script_search.xml b/indra/newview/skins/default/xui/de/floater_script_search.xml index ffae96f6a1..ffae96f6a1 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_script_search.xml +++ b/indra/newview/skins/default/xui/de/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml index bd39bf2bce..bd39bf2bce 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_search.xml +++ b/indra/newview/skins/default/xui/de/floater_search.xml diff --git a/indra/newview/skins/default/xui/de/floater_select_key.xml b/indra/newview/skins/default/xui/de/floater_select_key.xml index 8ab9db520a..8ab9db520a 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_select_key.xml +++ b/indra/newview/skins/default/xui/de/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml index 646138eaad..646138eaad 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/indra/newview/skins/default/xui/de/floater_settings_debug.xml index 004e54a339..004e54a339 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/de/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml index 798461c007..798461c007 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/de/floater_sound_devices.xml b/indra/newview/skins/default/xui/de/floater_sound_devices.xml index 22ccb2c1a2..22ccb2c1a2 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/de/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/de/floater_sound_preview.xml b/indra/newview/skins/default/xui/de/floater_sound_preview.xml index 1070c93405..1070c93405 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck.xml b/indra/newview/skins/default/xui/de/floater_spellcheck.xml index 213db277b6..213db277b6 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/de/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml index 374c0fc0d2..374c0fc0d2 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml index f3239f73c7..f3239f73c7 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_stats.xml +++ b/indra/newview/skins/default/xui/de/floater_stats.xml diff --git a/indra/newview/skins/default/xui/de/floater_sys_well.xml b/indra/newview/skins/default/xui/de/floater_sys_well.xml index ec79b862b4..ec79b862b4 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/de/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml index 83d37b2ce4..83d37b2ce4 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_telehub.xml +++ b/indra/newview/skins/default/xui/de/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml index 429447c378..429447c378 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml index 506d2b013a..506d2b013a 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml index 9585622516..b794d879f0 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml @@ -20,7 +20,7 @@ <button label="Leer" label_selected="Leer" name="Blank"/> <button label="Keine" label_selected="Keine" name="None"/> <button label="" label_selected="" name="Pipette"/> - <check_box initial_value="true" label="Live-Vorschau" name="apply_immediate_check"/> + <check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/> <text name="preview_disabled" value="Vorschau deaktiviert"/> <filter_editor label="Texturen filtern" name="inventory search editor"/> <check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml index 97b0364832..97b0364832 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index 5f5c34a5cf..5f5c34a5cf 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml index f8130c6379..f8130c6379 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/de/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/de/floater_tos.xml b/indra/newview/skins/default/xui/de/floater_tos.xml index ba329371f8..ba329371f8 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_tos.xml +++ b/indra/newview/skins/default/xui/de/floater_tos.xml diff --git a/indra/newview/skins/default/xui/de/floater_toybox.xml b/indra/newview/skins/default/xui/de/floater_toybox.xml index 90e50804d6..90e50804d6 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_toybox.xml +++ b/indra/newview/skins/default/xui/de/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/de/floater_translation_settings.xml b/indra/newview/skins/default/xui/de/floater_translation_settings.xml index 3d5d1d46a8..3d5d1d46a8 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/de/floater_url_entry.xml b/indra/newview/skins/default/xui/de/floater_url_entry.xml index f5fa449c85..f5fa449c85 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/de/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..15259639e8 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="VOICE-CHAT-LAUTSTÄRKE"> + <slider label="Voice-Chat" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml index 5efda4136e..5efda4136e 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml index 413a46525c..8d37950480 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Orte" name="voice_effects" title="VOICE MORPHING"> +<floater label="Orte" name="voice_effects" title="VOICE-MORPHING-VORSCHAU"> <string name="no_voice_effect"> (Kein Voice-Morphing) </string> diff --git a/indra/newview/skins/default/xui/de/floater_voice_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_volume.xml new file mode 100644 index 0000000000..258627c94f --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="LAUTSTÄRKE"> + <slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_web_content.xml b/indra/newview/skins/default/xui/de/floater_web_content.xml index 6ab119eeab..6ab119eeab 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_web_content.xml +++ b/indra/newview/skins/default/xui/de/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml index 1332509529..1332509529 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml index 6502f002a1..6502f002a1 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_window_size.xml +++ b/indra/newview/skins/default/xui/de/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml index befa46651a..befa46651a 100644..100755 --- a/indra/newview/skins/default/xui/de/floater_world_map.xml +++ b/indra/newview/skins/default/xui/de/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml index 4b8fd8a0ad..4b8fd8a0ad 100644..100755 --- a/indra/newview/skins/default/xui/de/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/de/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/de/inspect_group.xml b/indra/newview/skins/default/xui/de/inspect_group.xml index 60fa8ff0d8..60fa8ff0d8 100644..100755 --- a/indra/newview/skins/default/xui/de/inspect_group.xml +++ b/indra/newview/skins/default/xui/de/inspect_group.xml diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml index 72b8235828..72b8235828 100644..100755 --- a/indra/newview/skins/default/xui/de/inspect_object.xml +++ b/indra/newview/skins/default/xui/de/inspect_object.xml diff --git a/indra/newview/skins/default/xui/de/inspect_remote_object.xml b/indra/newview/skins/default/xui/de/inspect_remote_object.xml index 9fe05455eb..9fe05455eb 100644..100755 --- a/indra/newview/skins/default/xui/de/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/de/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/de/language_settings.xml b/indra/newview/skins/default/xui/de/language_settings.xml index f9346eef7d..f9346eef7d 100644..100755 --- a/indra/newview/skins/default/xui/de/language_settings.xml +++ b/indra/newview/skins/default/xui/de/language_settings.xml diff --git a/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml index f3775a05ec..f3775a05ec 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml index 237c92f7d2..237c92f7d2 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml index 325d52a22e..325d52a22e 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml index c036cf5515..c036cf5515 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml index 8aee0be3d2..8aee0be3d2 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml index c49f4b198b..c49f4b198b 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml index 05d3dfca9d..05d3dfca9d 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml index 07960a525c..07960a525c 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml index 7fced273a7..7fced273a7 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml index 54b218d22f..2dd871b2ea 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> +<toggleable_menu name="Gear COF"> <menu label="Neue Kleider" name="COF.Gear.New_Clothes"/> - <menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/> -</menu> + <menu label="Neue Körperteile" name="COF.Gear.New_Body_Parts"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml new file mode 100644 index 0000000000..30d3ab79e1 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="Unterhaltung schließen" name="close_conversation"/> + <menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/> + <menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/> + <menu_item_call label="Profil anzeigen" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Teleport anbieten" name="offer_teleport"/> + <menu_item_call label="Voice-Anruf" name="voice_call"/> + <menu_item_call label="Chatverlauf..." name="chat_history"/> + <menu_item_call label="Freund hinzufügen" name="add_friend"/> + <menu_item_call label="Freund entfernen" name="remove_friend"/> + <menu_item_call label="Freunde entfernen" name="remove_friends"/> + <menu_item_call label="In Gruppe einladen..." name="invite_to_group"/> + <menu_item_call label="Hineinzoomen" name="zoom_in"/> + <menu_item_call label="Karte" name="map"/> + <menu_item_call label="Freigeben" name="share"/> + <menu_item_call label="Bezahlen" name="pay"/> + <menu_item_check label="Voice ignorieren" name="block_unblock"/> + <menu_item_check label="Text ignorieren" name="MuteText"/> + <menu_item_call label="Gruppenprofil" name="group_profile"/> + <menu_item_call label="Gruppe aktivieren" name="activate_group"/> + <menu_item_call label="Gruppe verlassen" name="leave_group"/> + <context_menu label="Moderatoroptionen" name="Moderator Options"> + <menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/> + <menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/> + <menu_item_call label="Stummschaltung für alle aufheben" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..2ef8762128 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="IM..." name="IM"/> + <menu_item_call label="Voice-Anruf..." name="Call"/> + <menu_item_call label="Chatverlauf öffnen..." name="Chat history"/> + <menu_item_call label="Profil anzeigen" name="View Profile"/> + <menu_item_call label="Teleport anbieten" name="teleport"/> + <menu_item_call label="Freund hinzufügen" name="add_friend"/> + <menu_item_call label="Freund entfernen" name="remove_friend"/> + <menu_item_call label="In Gruppe einladen..." name="Invite"/> + <menu_item_call label="Karte" name="Map"/> + <menu_item_call label="Freigeben" name="Share"/> + <menu_item_call label="Bezahlen" name="Pay"/> + <menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml new file mode 100644 index 0000000000..ae3cc5bc97 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="Nach Namen sortieren" name="sort_by_name"/> + <menu_item_check label="Nach Datum sortieren" name="sort_by_date"/> + <menu_item_check label="Freunde oben anzeigen" name="sort_by_friends"/> + <menu_item_call label="Verlaufsliste für „Chat in der Nähe“ anzeigen..." name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_edit.xml b/indra/newview/skins/default/xui/de/menu_edit.xml index 37f68d68d5..37f68d68d5 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_edit.xml +++ b/indra/newview/skins/default/xui/de/menu_edit.xml diff --git a/indra/newview/skins/default/xui/de/menu_favorites.xml b/indra/newview/skins/default/xui/de/menu_favorites.xml index 0d0491d2eb..0d0491d2eb 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_favorites.xml +++ b/indra/newview/skins/default/xui/de/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml index 953c0eeed5..953c0eeed5 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_group_plus.xml b/indra/newview/skins/default/xui/de/menu_group_plus.xml index 583ee793be..583ee793be 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/de/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml index 33d55e85bd..33d55e85bd 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/de/menu_im_conversation.xml b/indra/newview/skins/default/xui/de/menu_im_conversation.xml new file mode 100644 index 0000000000..875524b19d --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="Profil anzeigen" name="View Profile"/> + <menu_item_call label="Freund hinzufügen" name="Add Friend"/> + <menu_item_call label="Freund entfernen" name="remove_friend"/> + <menu_item_call label="Teleport anbieten" name="offer_teleport"/> + <menu_item_call label="In Gruppe einladen..." name="invite_to_group"/> + <menu_item_call label="Chatverlauf..." name="chat_history"/> + <menu_item_call label="Hineinzoomen" name="zoom_in"/> + <menu_item_call label="Karte" name="map"/> + <menu_item_call label="Freigeben" name="Share"/> + <menu_item_call label="Bezahlen" name="Pay"/> + <menu_item_check label="Voice ignorieren" name="Block/Unblock"/> + <menu_item_check label="Text ignorieren" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..48f62d29a1 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="Kompaktansicht" name="compact_view"/> + <menu_item_check label="Erweiterte Ansicht" name="expanded_view"/> + <menu_item_check label="Zeit anzeigen" name="IMShowTime"/> + <menu_item_check label="Namen in privaten Unterhaltungen anzeigen" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_im_well_button.xml b/indra/newview/skins/default/xui/de/menu_im_well_button.xml deleted file mode 100644 index f464b71f4a..0000000000 --- a/indra/newview/skins/default/xui/de/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Alle schließen" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml index 11f93f47b4..11f93f47b4 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml index 81ef3b6569..81ef3b6569 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml index d123238246..d123238246 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml index 641a0ceebe..641a0ceebe 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml index 73e0029b76..73e0029b76 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml index 5979194bfb..5979194bfb 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml index 71cff7136b..71cff7136b 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml index cd2fca313e..cd2fca313e 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml index af70c08ba1..af70c08ba1 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml index 48dec3e856..48dec3e856 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/de/menu_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml index de679da3d8..de679da3d8 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_land.xml +++ b/indra/newview/skins/default/xui/de/menu_land.xml diff --git a/indra/newview/skins/default/xui/de/menu_landmark.xml b/indra/newview/skins/default/xui/de/menu_landmark.xml index 2aff0eec95..2aff0eec95 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_landmark.xml +++ b/indra/newview/skins/default/xui/de/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml index b43b41a5dc..b43b41a5dc 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_login.xml +++ b/indra/newview/skins/default/xui/de/menu_login.xml diff --git a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml index 59c1c2ee86..59c1c2ee86 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/de/menu_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml index 2e0d72c40c..2e0d72c40c 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/de/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml index e1faeedcde..e1faeedcde 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/de/menu_navbar.xml b/indra/newview/skins/default/xui/de/menu_navbar.xml index 5175f34b41..5175f34b41 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_navbar.xml +++ b/indra/newview/skins/default/xui/de/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml index 99d6428c3f..99d6428c3f 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml index 0f2784f160..0f2784f160 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml index 9f44ced928..9f44ced928 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_object.xml +++ b/indra/newview/skins/default/xui/de/menu_object.xml diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml index 8b6c558416..f92fa0f82b 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="Objektprofil..." name="Object Profile"/> <menu_item_call label="Ignorieren..." name="Block"/> + <menu_item_call label="Auf Karte anzeigen" name="show_on_map"/> + <menu_item_call label="Zu Objektposition teleportieren" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml index d56c93533c..0cf3c09882 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="Neues Haar" name="New Hair"/> <menu_item_call label="Neue Augen" name="New Eyes"/> </menu> + <menu_item_call label="Alle Ordner erweitern" name="expand"/> + <menu_item_call label="Alle Ordner schließen" name="collapse"/> <menu_item_call label="Outfit neu benennen" name="rename"/> <menu_item_call label="Outfit löschen" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml index 32a65c96fc..32a65c96fc 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml index 160f2f97be..160f2f97be 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/de/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/de/menu_participant_view.xml b/indra/newview/skins/default/xui/de/menu_participant_view.xml new file mode 100644 index 0000000000..6ceb9ac4c5 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="Unterhaltungen nach Typ sortieren" name="sort_sessions_by_type"/> + <menu_item_check label="Unterhaltungen nach Namen sortieren" name="sort_sessions_by_name"/> + <menu_item_check label="Unterhaltungen nach jüngster Aktivität sortieren" name="sort_sessions_by_recent"/> + <menu_item_check label="Teilnehmer nach Namen sortieren" name="sort_participants_by_name"/> + <menu_item_check label="Teilnehmer nach jüngster Aktivität sortieren" name="sort_participants_by_recent"/> + <menu_item_call label="Chat-Einstellungen..." name="chat_preferences"/> + <menu_item_call label="Privatsphäre-Einstellungen..." name="privacy_preferences"/> + <menu_item_check label="Unterhaltungsprotokoll..." name="Conversation"/> + <menu_item_check label="Chat in der Nähe übersetzen" name="Translate_chat"/> + <menu_item_check label="Übersetzungseinstellungen..." name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..f69a453e58 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="Nicht mehr ignorieren" name="unblock"/> + <menu_item_call label="Profil..." name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..041fde139d --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="Einwohner nach Namen ignorieren..." name="block_resident_by_name"/> + <menu_item_call label="Objekt nach Namen ignorieren" name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml new file mode 100644 index 0000000000..1dae593ebe --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="Nach Namen sortieren" name="sort_by_name"/> + <menu_item_check label="Nach Typ sortieren" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml new file mode 100644 index 0000000000..da4890fe96 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Nach Namen sortieren" name="sort_name"/> + <menu_item_check label="Nach Status sortieren" name="sort_status"/> + <menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/> + <menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/> + <menu_item_check label="Unterhaltungsprotokoll anzeigen..." name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml index 84d9d8938c..84d9d8938c 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml index 76225ba241..a69c82d3d8 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="Info anzeigen" name="View Info"/> <menu_item_call label="Chat" name="Chat"/> - <menu_item_call label="Anrufen" name="Call"/> + <menu_item_call label="Voice-Anruf" name="Call"/> <menu_item_call label="Aktivieren" name="Activate"/> <menu_item_call label="Verlassen" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml new file mode 100644 index 0000000000..20386bba56 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml index b68597d8aa..b68597d8aa 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml index 1db964357f..cdbb3ae917 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="Profil anzeigen" name="View Profile"/> - <menu_item_call label="Freund hinzufügen" name="Add Friend"/> - <menu_item_call label="Freund entfernen" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="Anrufen" name="Call"/> - <menu_item_call label="Karte" name="Map"/> - <menu_item_call label="Teilen" name="Share"/> - <menu_item_call label="Bezahlen" name="Pay"/> - <menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/> - <menu_item_call label="Teleport anbieten" name="teleport"/> + <menu_item_call label="Profil anzeigen" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Teleport anbieten" name="offer_teleport"/> + <menu_item_call label="Voice-Anruf" name="voice_call"/> + <menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/> + <menu_item_call label="Freund hinzufügen" name="add_friend"/> + <menu_item_call label="Freund entfernen" name="remove_friend"/> + <menu_item_call label="In Gruppe einladen..." name="invite_to_group"/> + <menu_item_call label="Hineinzoomen" name="zoom_in"/> + <menu_item_call label="Karte" name="map"/> + <menu_item_call label="Freigeben" name="share"/> + <menu_item_call label="Bezahlen" name="pay"/> + <menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml index b6e99edfe1..ba6578e2d1 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="Freunde hinzufügen" name="Add Friends"/> - <menu_item_call label="Freunde entfernen" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="Anrufen" name="Call"/> - <menu_item_call label="Teilen" name="Share"/> - <menu_item_call label="Bezahlen" name="Pay"/> - <menu_item_call label="Teleport anbieten" name="teleport"/> + <menu_item_call label="Freunde hinzufügen" name="add_friends"/> + <menu_item_call label="Freunde entfernen" name="remove_friends"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Anrufen" name="call"/> + <menu_item_call label="Freigeben" name="share"/> + <menu_item_call label="Bezahlen" name="pay"/> + <menu_item_call label="Teleport anbieten" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml new file mode 100644 index 0000000000..d38ec65037 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/> + <menu_item_check label="Nach Namen sortieren" name="sort_name"/> + <menu_item_check label="Nach Nähe sortieren" name="sort_distance"/> + <menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/> + <menu_item_check label="Karte anzeigen" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml index a001544f3e..a001544f3e 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml new file mode 100644 index 0000000000..a116ad0bc1 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Nach jüngsten sortieren" name="sort_most"/> + <menu_item_check label="Nach Namen sortieren" name="sort_name"/> + <menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml index 1ef020f5e1..1ef020f5e1 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/de/menu_picks.xml b/indra/newview/skins/default/xui/de/menu_picks.xml index 9aec4c83b0..9aec4c83b0 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_picks.xml +++ b/indra/newview/skins/default/xui/de/menu_picks.xml diff --git a/indra/newview/skins/default/xui/de/menu_picks_plus.xml b/indra/newview/skins/default/xui/de/menu_picks_plus.xml index 385ff25b95..385ff25b95 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/de/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/de/menu_place.xml b/indra/newview/skins/default/xui/de/menu_place.xml index d9c85f5b92..d9c85f5b92 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_place.xml +++ b/indra/newview/skins/default/xui/de/menu_place.xml diff --git a/indra/newview/skins/default/xui/de/menu_place_add_button.xml b/indra/newview/skins/default/xui/de/menu_place_add_button.xml index 7c0ff4a46a..7c0ff4a46a 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/de/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml index 892f075d3c..892f075d3c 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml index 8955f797a2..8955f797a2 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml index 9f3fcbca1d..9f3fcbca1d 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/de/menu_save_outfit.xml b/indra/newview/skins/default/xui/de/menu_save_outfit.xml index 986c78b318..986c78b318 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/de/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/de/menu_script_chiclet.xml b/indra/newview/skins/default/xui/de/menu_script_chiclet.xml index 3256aa1a87..3256aa1a87 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/de/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/de/menu_slurl.xml b/indra/newview/skins/default/xui/de/menu_slurl.xml index b2ec017f9f..b2ec017f9f 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_slurl.xml +++ b/indra/newview/skins/default/xui/de/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml index 68b8e21802..68b8e21802 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml index ff8fb0b181..ff8fb0b181 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml index 194dd16fd1..194dd16fd1 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/de/menu_text_editor.xml b/indra/newview/skins/default/xui/de/menu_text_editor.xml index 2e33ed3416..2e33ed3416 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/de/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/de/menu_toolbars.xml b/indra/newview/skins/default/xui/de/menu_toolbars.xml index 3fb48e26b2..3fb48e26b2 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/de/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/de/menu_topinfobar.xml b/indra/newview/skins/default/xui/de/menu_topinfobar.xml index 5b0a724244..5b0a724244 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/de/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml index 9a808088fb..c61ebb0eae 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Einwohnerprofil anzeigen" name="show_agent"/> + <menu_item_call label="Profil anzeigen" name="show_agent"/> + <menu_item_call label="IM senden..." name="send_im"/> + <menu_item_call label="Freund hinzufügen..." name="add_friend"/> <menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/> <menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_url_group.xml b/indra/newview/skins/default/xui/de/menu_url_group.xml index 6bd86414bc..6bd86414bc 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_group.xml +++ b/indra/newview/skins/default/xui/de/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_http.xml b/indra/newview/skins/default/xui/de/menu_url_http.xml index 30eb1668a5..30eb1668a5 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_http.xml +++ b/indra/newview/skins/default/xui/de/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_inventory.xml b/indra/newview/skins/default/xui/de/menu_url_inventory.xml index dc069df02b..dc069df02b 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_map.xml b/indra/newview/skins/default/xui/de/menu_url_map.xml index 2f6ffcd450..2f6ffcd450 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_map.xml +++ b/indra/newview/skins/default/xui/de/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml index 90d3763d9c..77b7004e44 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Objektinformationen anzeigen" name="show_object"/> + <menu_item_call label="Objektprofil..." name="show_object"/> <menu_item_call label="Auf Karte zeigen" name="show_on_map"/> <menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/> <menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/de/menu_url_parcel.xml b/indra/newview/skins/default/xui/de/menu_url_parcel.xml index 9169bca24f..9169bca24f 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/de/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_slapp.xml b/indra/newview/skins/default/xui/de/menu_url_slapp.xml index 72e916b902..72e916b902 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/de/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_slurl.xml b/indra/newview/skins/default/xui/de/menu_url_slurl.xml index 5d48230ebf..5d48230ebf 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/de/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/de/menu_url_teleport.xml b/indra/newview/skins/default/xui/de/menu_url_teleport.xml index 4cc1ecc70e..4cc1ecc70e 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/de/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 845df1f050..47d9fec352 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/> <menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/> </menu> - <menu label="Status" name="Status"> - <menu_item_call label="Abwesend" name="Set Away"/> - <menu_item_call label="Beschäftigt" name="Set Busy"/> - </menu> + <menu label="Status" name="Status"/> <menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/> <menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/> <menu_item_call label="Kontoübersicht..." name="Manage My Account"> @@ -32,14 +29,18 @@ <menu_item_call label="[APP_NAME] schließen" name="Quit"/> </menu> <menu label="Unterhalten" name="Communicate"> - <menu_item_check label="Chat..." name="Nearby Chat"/> + <menu_item_check label="Unterhaltungen..." name="Conversations"/> + <menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/> <menu_item_check label="Sprechen" name="Speak"/> - <menu_item_check label="Voice-Einstellungen..." name="Nearby Voice"/> - <menu_item_check label="Voice-Morphing..." name="ShowVoice"/> + <menu label="Voice-Morphing" name="VoiceMorphing"> + <menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/> + <menu_item_check label="Vorschau..." name="Preview"/> + <menu_item_call label="Abonnieren..." name="Subscribe"/> + </menu> <menu_item_check label="Gesten..." name="Gestures"/> - <menu_item_call label="Freunde" name="My Friends"/> - <menu_item_call label="Gruppen" name="My Groups"/> - <menu_item_call label="Leute in der Nähe" name="Active Speakers"/> + <menu_item_check label="Freunde" name="My Friends"/> + <menu_item_check label="Gruppen" name="My Groups"/> + <menu_item_check label="Leute in der Nähe" name="Active Speakers"/> <menu_item_call label="Blockierliste" name="Block List"/> </menu> <menu label="Welt" name="World"> @@ -115,7 +116,6 @@ <menu_item_call label="Kaufen" name="Menu Object Buy"/> <menu_item_call label="Nehmen" name="Menu Object Take"/> <menu_item_call label="Kopie nehmen" name="Take Copy"/> - <menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/> <menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/> <menu_item_call label="Objekt zurückgeben" name="Return Object back to Owner"/> </menu> @@ -130,6 +130,7 @@ <menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/> <menu_item_call label="Figuren..." name="pathfinding_characters_menu_item"/> <menu_item_call label="Anzeigen/Testen..." name="pathfinding_console_menu_item"/> + <menu_item_call label="Region neu formen" name="pathfinding_rebake_navmesh_item"/> </menu> <menu label="Optionen" name="Options"> <menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/> @@ -159,6 +160,13 @@ <menu label="Hilfe" name="Help"> <menu_item_call label="Anweisungen..." name="How To"/> <menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/> + <menu_item_call label="Benutzerhandbuch" name="User’s guide"/> + <menu_item_call label="Knowledge Base" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Community-Foren" name="Community Forums"/> + <menu_item_call label="Support-Portal" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/> <menu_item_call label="Missbrauch melden" name="Report Abuse"/> <menu_item_call label="Fehler melden" name="Report Bug"/> <menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/> @@ -307,7 +315,7 @@ <menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/> <menu_item_check label="Wireframe" name="Wireframe"/> <menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/> - <menu_item_check label="Licht und Schatten" name="Lighting and Shadows"/> + <menu_item_check label="Uber Licht Modell" name="Advanced Lighting Model"/> <menu_item_check label="Schatten von Sonne-/Mond-Projektoren" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO und Schattenglättung" name="SSAO and Shadow Smoothing"/> <menu_item_check label="Fehler in GL beseitigen" name="Debug GL"/> diff --git a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml index 283e454a06..283e454a06 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml index dacf898b6a..dacf898b6a 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml index 695451a105..695451a105 100644..100755 --- a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml index de93107e94..de93107e94 100644..100755 --- a/indra/newview/skins/default/xui/de/mime_types.xml +++ b/indra/newview/skins/default/xui/de/mime_types.xml diff --git a/indra/newview/skins/default/xui/de/mime_types_linux.xml b/indra/newview/skins/default/xui/de/mime_types_linux.xml index e4b5c53292..e4b5c53292 100644..100755 --- a/indra/newview/skins/default/xui/de/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/de/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/de/mime_types_mac.xml b/indra/newview/skins/default/xui/de/mime_types_mac.xml index e4b5c53292..e4b5c53292 100644..100755 --- a/indra/newview/skins/default/xui/de/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/de/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 4b7a60b4eb..dc0d7dc6b4 100644..100755 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -523,6 +523,24 @@ Weitere Informationen finden Sie auf [_URL]. </url> <usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/> </notification> + <notification name="AMDOldDriver"> + Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern. + + Unter [_URL] nach aktualisierten Treibern suchen? + <url name="url"> + http://support.amd.com/de/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/> + </notification> + <notification name="NVIDIAOldDriver"> + Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern. + + Unter [_URL] nach aktualisierten Treibern suchen? + <url name="url"> + http://www.nvidia.com/Download/index.aspx?lang=de-de + </url> + <usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/> + </notification> <notification name="UnknownGPU"> Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt. Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde. Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen. @@ -1558,10 +1576,13 @@ Diese Gruppe verlassen? Sie können gerade keine Freundschaft anbieten. Warten Sie kurz und versuchen Sie es dann noch einmal. <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="BusyModeSet"> - Beschäftigt-Modus ist aktiviert. -Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachrichten) erhalten Ihre Beschäftigt-Antwort. Alle Teleport-Angebote werden abgelehnt. Alle Inventar-Angebote werden in Ihren Papierkorb geschoben. - <usetemplate ignoretext="Ich ändere meinen Status zu Beschäftigt" name="okignore" yestext="OK"/> + <notification name="DoNotDisturbModeSet"> + Nicht-stören-Modus ist aktiviert: Sie erhalten keine Benachrichtigung über eingehende Kommunikation. + +- Andere Einwohner erhalten Ihre Nicht-stören-Antwort (festgelegt in Einstellungen > Allgemein). +- Teleport-Angebote werden abgelehnt. +- Voice-Anrufe werden abgelehnt. + <usetemplate ignoretext="Ich ändere meinen Status zu „Nicht stören“" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine andere Gruppe, um dieser beitreten zu können oder lehnen Sie das Angebot ab. @@ -2049,6 +2070,10 @@ Inventarobjekt(e) verschieben? Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihre Konto-Statistik anzuzeigen? <usetemplate ignoretext="Meinen Browser starten, um meine Konto-Statistik anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="Gehe zu Seite"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + Wenn Sie eine Person zu einer vorhandenen Unterhaltung hinzufügen, wird eine neue Unterhaltung erstellt. Alle Teilnehmer erhalten neue Unterhaltungsbenachrichtigungen. + <usetemplate ignoretext="Hinzufügen von Chat-Teilnehmern bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/> + </notification> <notification name="ConfirmQuit"> Wirklich beenden? <usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/> @@ -2122,14 +2147,14 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen? <button ignore="Nie ersetzen" name="No" text="Abbrechen"/> </form> </notification> - <notification label="Beschäftigt-Modus-Warnung" name="BusyModePay"> - Sie sind im Beschäftigt-Modus, sodass Sie im Austausch für diese Zahlung keine Objekte erhalten können. + <notification label="Warnung für Nicht-stören-Modus" name="DoNotDisturbModePay"> + Sie haben den Nicht-stören-Modus aktiviert. Sie erhalten keine Artikel, die im Gegenzug für diese Zahlung angeboten werden. -Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschließen? +Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion abschließen? <form name="form"> - <ignore name="ignore" save_option="true" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Modus Beschäftigt bin."/> - <button ignore="Beschäftigt-Modus immer deaktivieren" name="Yes" text="OK"/> - <button ignore="Beschäftigt-Modus aktiviert lassen" name="No" text="Abbrechen"/> + <ignore name="ignore" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Nicht-stören-Modus bin."/> + <button ignore="„Nicht stören“-Modus immer verlassen" name="Yes" text="OK"/> + <button ignore="„Nicht stören“-Modus nie verlassen" name="No" text="Abbrechen"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2264,11 +2289,8 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies <notification name="GroupNotice"> Betreff: [SUBJECT], Nachricht: [MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> ist online - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> ist offline + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> ist [STATUS] </notification> <notification name="AddSelfFriend"> Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufügen. @@ -2496,13 +2518,6 @@ Fliegen ist hier nicht möglich. <notification name="DynamicPathfindingDisabled"> Dynamisches Pathfinding ist in dieser Region nicht aktiviert. Geskriptete Objekte, die Pathfinding-LSL-Aufrufe verwenden, funktionieren in dieser Region u. U. nicht wie erwartet. </notification> - <notification name="PathfindingRebakeNavmesh"> - Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt. Um dieses Problem zu beheben, klicken Sie auf die Schaltfläche „Region neu formen“. Um weitere Informationen zu erhalten, klicken Sie auf „Hilfe“. - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="Hilfe" ignoretext="Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt." name="okhelpignore" yestext="OK"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> Fehler aufgetreten. Möglicherweise ist ein Netzwerk- oder Serverproblem aufgetreten oder Sie haben nicht die erforderlichen Baurechte. Dieses Problem lässt sich manchmal durch Ab- und Anmelden lösen. <usetemplate name="okbutton" yestext="OK"/> @@ -2765,7 +2780,7 @@ Ist das OK? <notification name="ScriptQuestionCaution"> Achtung: Das Objekt „<nolink>[OBJECTNAME]</nolink>“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren. -Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist. +Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist. <form name="form"> <button name="Grant" text="Uneingeschränkten Zugriff gewähren"/> <button name="Deny" text="Verweigern"/> @@ -3346,4 +3361,633 @@ Versuch abgebrochen. Sie sind dabei, [NUM_ITEMS] Objekte zu löschen. Möchten Sie diesen Vorgang wirklich fortsetzen? <usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte löschen?" name="okcancelignore" notext="Nein" yestext="Ja"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] hat Sie eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren. + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] hat Sie [AV_FREEZE_TIME] Sekunden lang eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren. + </notification> + <notification name="YouFrozeAvatar"> + Avatar eingefroren. + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] hat Sie aufgetaut. + </notification> + <notification name="AvatarUnFrozen"> + Avatar aufgetaut. + </notification> + <notification name="AvatarFreezeFailure"> + Einfrieren fehlgeschlagen, da Sie keine Berechtigung für diese Parzelle haben. + </notification> + <notification name="AvatarFreezeThaw"> + Sie sind nicht mehr eingefroren und können sich frei bewegen. + </notification> + <notification name="AvatarCantFreeze"> + Dieser Benutzer kann nicht eingefroren werden. + </notification> + <notification name="NowOwnObject"> + Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME] + </notification> + <notification name="CantRezOnLand"> + Objekt kann nicht an [OBJECT_POS] gerezzt werden, da der Landeigentümer dies nicht zulässt. Machen Sie den Landeigentümer mit dem Landwerkzeug ausfindig. + </notification> + <notification name="RezFailTooManyRequests"> + Objekt kann nicht gerezzt werden, da zu viele Anforderungen vorliegen. + </notification> + <notification name="SitFailCantMove"> + Sie können sich nicht hinsetzen, da Sie zur Zeit unbeweglich sind. + </notification> + <notification name="SitFailNotAllowedOnLand"> + Sie können sich nicht hinsetzen, da Sie auf diesem Land keine Berechtigung dazu haben. + </notification> + <notification name="SitFailNotSameRegion"> + Kommen Sie näher heran. Sitzen auf Objekt nicht möglich, da +es sich nicht in der gleichen Region befindet wie Sie. + </notification> + <notification name="NoNewObjectRegionFull"> + Neues Objekt kann nicht erstellt werden. Die Region ist voll. + </notification> + <notification name="FailedToPlaceObject"> + Objekt konnte nicht an festgelegtem Ort platziert werden. Versuchen Sie es erneut. + </notification> + <notification name="NoOwnNoGardening"> + Auf Land, das Sie nicht besitzen, können Sie keine Bäume und Gräser erstellen. + </notification> + <notification name="NoCopyPermsNoObject"> + Kopieren fehlgeschlagen, da Sie keine Berechtigung zum Kopieren des Objekts „OBJ_NAME]“ besitzen. + </notification> + <notification name="NoTransPermsNoObject"> + Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ nicht an Sie übertragen werden kann. + </notification> + <notification name="AddToNavMeshNoCopy"> + Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ zum Navmesh beiträgt. + </notification> + <notification name="DupeWithNoRootsSelected"> + Ohne ausgewählte Hauptobjekte duplizieren. + </notification> + <notification name="CantDupeCuzRegionIsFull"> + Objekte können nicht dupliziert werden, da die Region voll ist. + </notification> + <notification name="CantDupeCuzParcelNotFound"> + Objekte können nicht dupliziert werden, da die Parzelle, in der sie sich befinden, nicht auffindbar ist. + </notification> + <notification name="CantCreateCuzParcelFull"> + Objekt kann nicht erstellt werden, da +die Parzelle voll ist. + </notification> + <notification name="RezAttemptFailed"> + Versuch zum Rezzen eines Objekts fehlgeschlagen. + </notification> + <notification name="ToxicInvRezAttemptFailed"> + Objekt, das in dieser Region zu Problemen geführt hat, kann nicht erstellt werden. + </notification> + <notification name="InvItemIsBlacklisted"> + Dieses Inventarobjekt ist auf der schwarzen Liste. + </notification> + <notification name="NoCanRezObjects"> + Sie können gegenwärtig keine Objekte erstellen. + </notification> + <notification name="LandSearchBlocked"> + Landsuche blockiert. +Sie haben zu viele Landsuchen in zu kurzer Zeit durchgeführt. +Warten Sie kurz und versuchen Sie es noch einmal. + </notification> + <notification name="NotEnoughResourcesToAttach"> + Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen. + </notification> + <notification name="YouDiedAndGotTPHome"> + Sie sind gestorben und wurden nach Hause teleportiert + </notification> + <notification name="EjectComingSoon"> + Sie nicht hier nicht mehr zugelassen und haben [EJECT_TIME] Sekunden Zeit, um zu gehen. + </notification> + <notification name="NoEnterServerFull"> + Sie können diese Region nicht betreten, da +der Server voll ist. + </notification> + <notification name="SaveBackToInvDisabled"> + Erneutes Speichern im Inventar ist deaktiviert. + </notification> + <notification name="NoExistNoSaveToContents"> + „[OBJ_NAME]“ kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert. + </notification> + <notification name="NoModNoSaveToContents"> + „[OBJ_NAME]“ kann nicht in Objektinhalt gespeichert werden, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[DEST_NAME]“ besitzen. + </notification> + <notification name="NoSaveBackToInvDisabled"> + „[OBJ_NAME]“ kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert. + </notification> + <notification name="NoCopyNoSelCopy"> + Sie können Ihre Auswahl nicht kopieren, da Sie nicht die Berechtigung zum Kopieren des Objekts „[OBJ_NAME]“ haben. + </notification> + <notification name="NoTransNoSelCopy"> + Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist. + </notification> + <notification name="NoTransNoCopy"> + Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist. + </notification> + <notification name="NoPermsNoRemoval"> + Entfernen des Objekts „[OBJ_NAME]“ aus dem Simulator wird vom Berechtigungssystem nicht gestattet. + </notification> + <notification name="NoModNoSaveSelection"> + Sie können Ihre Auswahl nicht speichern, da Sie keine Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ besitzen. + </notification> + <notification name="NoCopyNoSaveSelection"> + Ihre Auswahl kann nicht gespeichert werden, da das Objekt „[OBJ_NAME]“ nicht kopiert werden kann. + </notification> + <notification name="NoModNoTaking"> + Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ haben. + </notification> + <notification name="RezDestInternalError"> + Interner Fehler: Unbekannter Zielttyp. + </notification> + <notification name="DeleteFailObjNotFound"> + Löschen fehlgeschlagen, da Objekt nicht gefunden wurde + </notification> + <notification name="SorryCantEjectUser"> + Dieser Benutzer kann nicht hinausgeworfen werden. + </notification> + <notification name="RegionSezNotAHome"> + Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen. + </notification> + <notification name="HomeLocationLimits"> + Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden. + </notification> + <notification name="HomePositionSet"> + Position für Zuhause festgelegt. + </notification> + <notification name="AvatarEjected"> + Avatar hinausgeworfen. + </notification> + <notification name="AvatarEjectFailed"> + Hinauswerfen fehlgeschlagen, da Sie keine Admin-Berechtigung für diese Parzelle haben. + </notification> + <notification name="CantMoveObjectParcelFull"> + Objekt „[OBJECT_NAME]“ kann nicht nach +[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die Parzelle voll ist. + </notification> + <notification name="CantMoveObjectParcelPerms"> + Objekt „[OBJECT_NAME]“ kann nicht nach +[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind. + </notification> + <notification name="CantMoveObjectParcelResources"> + Objekt „[OBJECT_NAME]“ kann nicht nach +[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind. + </notification> + <notification name="CantMoveObjectRegionVersion"> + Objekt „[OBJECT_NAME]“ kann nicht nach +[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt. + </notification> + <notification name="CantMoveObjectNavMesh"> + Objekt „[OBJECT_NAME]“ kann nicht nach +[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können. + </notification> + <notification name="CantMoveObjectWTF"> + Objekt „[OBJECT_NAME]“ kann nicht nach +[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE]) + </notification> + <notification name="NoPermModifyObject"> + Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts. + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + Physik kann nicht für ein Objekt aktiviert werden, das zum Navmesh beiträgt. + </notification> + <notification name="CantEnablePhysKeyframedObj"> + Physik für Keyframe-Objekte kann nicht aktiviert werden. + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + Physik für Objekte kann nicht aktiviert werden – nicht genügend Landressourcen. + </notification> + <notification name="CantEnablePhysCostTooGreat"> + Physik für Objekt mit Physikressourcenkosten höher als [MAX_OBJECTS] kann nicht aktiviert werden. + </notification> + <notification name="PhantomWithConcavePiece"> + Dieses Objekt kann kein konkaves Teil enthalten, da es ein Phantom ist und zum Navmesh beiträgt. + </notification> + <notification name="UnableAddItem"> + Objekt konnte nicht hinzugefügt werden. + </notification> + <notification name="UnableEditItem"> + Kein Bearbeiten möglich. + </notification> + <notification name="NoPermToEdit"> + Bearbeiten nicht gestattet. + </notification> + <notification name="NoPermToCopyInventory"> + Kopieren dieses Inventars nicht gestattet. + </notification> + <notification name="CantSaveItemDoesntExist"> + Kein Speichern in Objektinhalt möglich: Objekt nicht mehr vorhanden. + </notification> + <notification name="CantSaveItemAlreadyExists"> + Kein Speichern in Objektinhalt möglich: Artikel mit diesem Namen ist bereits im Inventar vorhanden. + </notification> + <notification name="CantSaveModifyAttachment"> + Kein Speichern in Objektinhalt möglich: Dadurch würden die Anhängeberechtigungen geändert. + </notification> + <notification name="TooManyScripts"> + Zu viele Skripts. + </notification> + <notification name="UnableAddScript"> + Skript konnte nicht hinzugefügt werden. + </notification> + <notification name="AssetServerTimeoutObjReturn"> + Asset-Server hat nicht rechtzeitig reagiert. Objekt wurde zum Sim zurückübertragen. + </notification> + <notification name="RegionDisablePhysicsShapes"> + In dieser Region sind keine Physikformen aktiviert. + </notification> + <notification name="NoModNavmeshAcrossRegions"> + Sie können das Navmesh nicht regionsübergreifend modifizieren. + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + Für diesen Objekttyp können keine Physikeigenschaften gesetzt werden. + </notification> + <notification name="NoSetRootPrimWithNoShape"> + Hauptprim kann nicht auf formlos eingestellt werden. + </notification> + <notification name="NoRegionSupportPhysMats"> + In dieser Region sind keine Physikmaterialien aktiviert. + </notification> + <notification name="OnlyRootPrimPhysMats"> + Nur bei Hauptprims können die Physikmaterialien angepasst werden. + </notification> + <notification name="NoSupportCharacterPhysMats"> + Die Anwendung von Physikmaterialien auf Personen wird noch nicht unterstützt. + </notification> + <notification name="InvalidPhysMatProperty"> + Eine oder mehrere der angegebenen Eigenschaften für Physikmaterialien waren ungültig. + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + Sie können den Nahttyp eines Mesh-Objekts nicht ändern. + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + Sie können die Form eines Mesh-Objekts nicht ändern. + </notification> + <notification name="FullRegionCantEnter"> + Sie können diese Region nicht betreten, \nda die Region voll ist. + </notification> + <notification name="LinkFailedOwnersDiffer"> + Verknüpfungsfehler – Eigentümer sind unterschiedlich + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + Verknüpfungsfehler – Navmesh kann nicht regionsübergreifend modifiziert werden. + </notification> + <notification name="LinkFailedNoPermToEdit"> + Verknüpfungsfehler, da Sie keine Berechtigung zum Bearbeiten haben. + </notification> + <notification name="LinkFailedTooManyPrims"> + Verknüpfungsfehler – zu viele Primitive + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + Verknüpfungsfehler – nichtkopierfähige Objekte können nicht mit nichtübertragungsfähigen Objekten verknüpft werden + </notification> + <notification name="LinkFailedNothingLinkable"> + Verknüpfungsfehler – nichts zum Verknüpfen vorhanden. + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + Verknüpfungsfehler – zu viele Pathfinding-Figuren + </notification> + <notification name="LinkFailedInsufficientLand"> + Verknüpfungsfehler – nicht genügend Landressourcen + </notification> + <notification name="LinkFailedTooMuchPhysics"> + Objekt verwendet zu viele Physikressourcen – seine Dynamik wurde deaktiviert. + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + Sie wurden vom Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ nach Hause teleportiert + </notification> + <notification name="TeleportedHomeByObject"> + Sie wurden von Objekt „[OBJECT_NAME]“ nach Hause teleportiert. + </notification> + <notification name="TeleportedByAttachment"> + Sie wurden von einem Anhang an [ITEM_ID] teleportiert + </notification> + <notification name="TeleportedByObjectOnParcel"> + Sie wurden von Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ teleportiert + </notification> + <notification name="TeleportedByObjectOwnedBy"> + Sie wurden von Objekt „[OBJECT_NAME]“, das [OWNER_ID] gehört, teleportiert + </notification> + <notification name="TeleportedByObjectUnknownUser"> + Sie wurden von Objekt „[OBJECT_NAME]“, das einem unbekannten Benutzer gehört, teleportiert. + </notification> + <notification name="CantCreateObjectRegionFull"> + Angefordertes Objekt kann nicht erstellt werden. Die Region ist voll. + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + Sie können nicht mehrere Objekte an ein und derselben Stelle anhängen. + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + Sie können hier nicht mehrere Objekte erstellen. + </notification> + <notification name="UnableToCreateObjTimeOut"> + Angefordertes Objekt kann nicht erstellt werden. Objekt fehlt in Datenbank. + </notification> + <notification name="UnableToCreateObjUnknown"> + Angefordertes Objekt kann nicht erstellt werden. Zeitüberschreitung bei Anforderung. Versuchen Sie es erneut. + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + Angefordertes Objekt kann nicht erstellt werden. Versuchen Sie es erneut. + </notification> + <notification name="RezFailureTookTooLong"> + Fehler beim Rezzen; Laden des angeforderten Objekts hat zu lang gedauert. + </notification> + <notification name="FailedToPlaceObjAtLoc"> + Objekt konnte nicht an angegebenem Ort platziert werden. Versuchen Sie es erneut. + </notification> + <notification name="CantCreatePlantsOnLand"> + Auf diesem Land können keine Pflanzen erstellt werden. + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + Objekt kann nicht wiederhergestellt werden. Keine Weltposition gefunden. + </notification> + <notification name="CantRezObjectInvalidMeshData"> + Objekt kann nicht gerezzt werden, da seine Meshdaten ungültig sind. + </notification> + <notification name="CantRezObjectTooManyScripts"> + Objekt kann nicht gerezzt werden, da die Region bereits zu viele Skripts aufweist. + </notification> + <notification name="CantCreateObjectNoAccess"> + Ihr Zugangsberechtigungen gestatten nicht das Erstellen von Objekten an dieser Stelle. + </notification> + <notification name="CantCreateObject"> + Sie können gegenwärtig keine Objekte erstellen. + </notification> + <notification name="InvalidObjectParams"> + Ungültige Objektparameter + </notification> + <notification name="CantDuplicateObjectNoAcess"> + Ihre Zugangsberechtigungen gestatten nicht das Duplizieren von Objekten an dieser Stelle. + </notification> + <notification name="CantChangeShape"> + Sie können diese Form nicht ändern. + </notification> + <notification name="NoAccessToClaimObjects"> + Ihr Zugangsberechtigungen gestatten nicht das Beanspruchen von Objekten an dieser Stelle. + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + Übertragung fehlgeschlagen, da Sie keine Berechtigung zum Übertragen von Objekten für Ihre Gruppe haben. + </notification> + <notification name="NoPrivsToBuyObject"> + Ihr Zugangsberechtigungen gestatten nicht das Kaufen von Objekten an dieser Stelle. + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + Objekt kann nicht angehängt werden, da ein Avatar darauf sitzt. + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + Bäume und Gräser können nicht als Anhänge getragen werden. + </notification> + <notification name="CantAttachGroupOwnedObjs"> + Objekte im Gruppenbesitz können nicht angehängt werden. + </notification> + <notification name="CantAttachObjectsNotOwned"> + Objekte, die Ihnen nicht gehören, können nicht angehängt werden. + </notification> + <notification name="CantAttachNavmeshObjects"> + Objekte, die zum Navmesh beitragen, können nicht angehängt werden. + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + Objekt kann nicht angehängt werden, weil Sie es nicht verschieben dürfen. + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen. + </notification> + <notification name="CantDropItemTrialUser"> + Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich. + </notification> + <notification name="CantDropMeshAttachment"> + Sie können keine Mesh-Anhänge ablegen. In Inventar zurückführen und inworld rezzen. + </notification> + <notification name="CantDropAttachmentNoPermission"> + Anhang konnte nicht abgelegt werden: Ihnen fehlt die Berechtigung zum Ablegen an dieser Stelle. + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + Anhang konnte nicht abgelegt werden: nicht genügend Landressourcen verfügbar. + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + Anhänge konnten nicht abgelegt werden: nicht genügend Ressourcen. + </notification> + <notification name="CantDropObjectFullParcel"> + Objekt kann nicht hier abgelegt werden. Die Parzelle ist voll. + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + Dieses Objekt kann nicht berührt/angefasst werden, da Sie von der Landparzelle verbannt sind. + </notification> + <notification name="PlzNarrowDeleteParams"> + Grenzen Sie Ihre Löschparameter ein. + </notification> + <notification name="UnableToUploadAsset"> + Asset kann nicht hochgeladen werden. + </notification> + <notification name="CantTeleportCouldNotFindUser"> + Keinen Benutzer zum Teleportieren nach Hause gefunden + </notification> + <notification name="GodlikeRequestFailed"> + Anforderdung nach übernatürlichen Kräften fehlgeschlagen + </notification> + <notification name="GenericRequestFailed"> + generische Anforderdung fehlgeschlagen + </notification> + <notification name="CantUploadPostcard"> + Postkarte kann nicht hochgeladen werden. Versuchen Sie es später erneut. + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + Inventardetails für Gruppenmitteilung kann nicht abgerufen werden. + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + Gruppenmitteilung kann nicht gesendet werden – Vorgang nicht gestattet. + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + Gruppenmitteilung kann nicht gesendet werden – Bauen von Inventar nicht möglich. + </notification> + <notification name="CantParceInventoryInNotice"> + Inventar in Mitteilung kann nicht geparst werden. + </notification> + <notification name="TerrainUploadFailed"> + Fehler beim Hochladen von Terrain. + </notification> + <notification name="TerrainFileWritten"> + Terraindatei geschrieben. + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + Terraindatei geschrieben, Download beginnt... + </notification> + <notification name="TerrainBaked"> + Terrain geformt. + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + Nur die ersten 10 ausgewählten Objekte wurden deaktiviert. Aktualisieren Sie die Anzeige und wählen Sie ggf. weitere Objekte aus. + </notification> + <notification name="UpdateViewerBuyParcel"> + Um diese Parzelle zu kaufen, müssen Sie Ihren Viewer aktualisieren. + </notification> + <notification name="CantBuyParcelNotForSale"> + Kein Kauf möglich; die ausgewählte Parzelle steht nicht zum Verkauf. + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + Kein Kauf möglich, da sich der Verkaufspreis oder die Fläche geändert haben. + </notification> + <notification name="CantBuyParcelNotAuthorized"> + Sie sind nicht der autorisierte Käufer dieser Parzelle. + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + Sie können diese Parzelle nicht kaufen, da sie bereits auf Kaufauthorisierung wartet. + </notification> + <notification name="CantBuildOverflowParcel"> + Sie können hier keine Objekte bauen, denn dies würde den Rahmen der Parzelle sprengen. + </notification> + <notification name="SelectedMultipleOwnedLand"> + Sie haben Land mit unterschiedlichen Besitzern ausgewählt. Wählen Sie ein kleineres Gebiet aus und versuchen Sie es erneut. + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + Auswahl enthält nicht genügend gemietete Parzellen zum Zusammenlegen. + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + Land kann nicht geteilt werden.\nMehr als eine Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus. + </notification> + <notification name="CantDivideLandCantFindParcel"> + Land kann nicht geteilt werden.\nParzelle nicht auffindbar.\nMelden Sie das Problem über „Hilfe“ -> „Fehler melden“... + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus. + </notification> + <notification name="LandHasBeenDivided"> + Land wurde geteilt. + </notification> + <notification name="PassPurchased"> + Sie haben einen Pass gekauft. + </notification> + <notification name="RegionDisallowsClassifieds"> + Region lässt keine Werbung zu. + </notification> + <notification name="LandPassExpireSoon"> + Ihr Pass für dieses Land läuft demnächst ab. + </notification> + <notification name="CantSitNoSuitableSurface"> + Keine geeignete Oberfläche zum Sitzen; probieren Sie es an einer anderen Stelle. + </notification> + <notification name="CantSitNoRoom"> + Kein Platz zum Hinsetzen; probieren Sie es an einer anderen Stelle. + </notification> + <notification name="ClaimObjectFailedNoPermission"> + Objektbeanspruchung fehlgeschlagen, da Sie keine Berechtigung haben. + </notification> + <notification name="ClaimObjectFailedNoMoney"> + Objektbeanspruchung fehlgeschlagen, da Sie nicht genügend L$ haben. + </notification> + <notification name="CantDeedGroupLand"> + Land in Gruppenbesitz kann nicht übertragen werden. + </notification> + <notification name="BuyObjectFailedNoMoney"> + Objektkauf fehlgeschlagen, da Sie nicht genügend L$ haben. + </notification> + <notification name="BuyInventoryFailedNoMoney"> + Inventarkauf fehlgeschlagen, da Sie nicht genügend L$ haben. + </notification> + <notification name="BuyPassFailedNoMoney"> + Sie haben nicht genügend L$, um einen Pass für dieses Land zu kaufen. + </notification> + <notification name="CantBuyPassTryAgain"> + Passkauf momentan nicht möglich. Versuchen Sie es später erneut. + </notification> + <notification name="CantCreateObjectParcelFull"> + Objekt kann nicht erstellt werden, \nda die Parzelle voll ist. + </notification> + <notification name="FailedPlacingObject"> + Objekt konnte nicht an festgelegtem Ort platziert werden. Versuchen Sie es erneut. + </notification> + <notification name="CantCreateLandmarkForEvent"> + Landmarke für dieses Ereignis kann nicht erstellt werden. + </notification> + <notification name="GodBeatsFreeze"> + Ihre übernatürlichen Kräfte heben das Einfrieren auf! + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + Anforderung nach Superpower fehlgeschlagen. Diese Anforderung wurde protokolliert. + </notification> + <notification name="ExpireExplanation"> + Das System kann Ihre Anfrage momentan nicht verarbeiten. Zeitüberschreitung bei Anforderung. + </notification> + <notification name="DieExplanation"> + Das System kann Ihre Anfrage nicht verarbeiten. + </notification> + <notification name="AddPrimitiveFailure"> + Sie haben nicht genügend Geld, um Primitive zu erstellen. + </notification> + <notification name="RezObjectFailure"> + Sie haben nicht genügend Geld, um Objekt zu erstellen. + </notification> + <notification name="ResetHomePositionNotLegal"> + Zuhause-Position neu festlegen, da Zuhause nicht zulässig war. + </notification> + <notification name="CantInviteRegionFull"> + Sie können gegenwärtig niemanden an Ihren Standort einladen, da die Region voll ist. Versuchen Sie es später erneut. + </notification> + <notification name="CantSetHomeAtRegion"> + Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen. + </notification> + <notification name="ListValidHomeLocations"> + Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden. + </notification> + <notification name="SetHomePosition"> + Position für Zuhause festgelegt. + </notification> + <notification name="CantDerezInventoryError"> + Aufgrund eines Inventarfehlers kann das Rezzen dieses Objekts nicht aufgehoben werden. + </notification> + <notification name="CantCreateRequestedInv"> + Angefordertes Inventar kann nicht erstellt werden. + </notification> + <notification name="CantCreateRequestedInvFolder"> + Angeforderter Inventarordner kann nicht erstellt werden. + </notification> + <notification name="CantCreateInventory"> + Dieses Inventar kann nicht erstellt werden. + </notification> + <notification name="CantCreateLandmark"> + Landmarke kann nicht erstellt werden. + </notification> + <notification name="CantCreateOutfit"> + Im Moment kann kein Outfit erstellt werden. Versuchen Sie es gleich noch einmal. + </notification> + <notification name="InventoryNotForSale"> + Inventar steht nicht zum Verkauf. + </notification> + <notification name="CantFindInvItem"> + Inventarobjekt kann nicht gefunden werden. + </notification> + <notification name="CantFindObject"> + Objekt kann nicht gefunden werden. + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + Geldüberweisungen an Objekte sind in dieser Region gegenwärtig deaktiviert. + </notification> + <notification name="CantPayNoAgent"> + Nicht ersichtlich, wer bezahlt werden muss. + </notification> + <notification name="CantDonateToPublicObjects"> + Sie können öffentlichen Objekten keine L$ geben. + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + Inventarerstellung für Inworld-Objekt fehlgeschlagen. + </notification> + <notification name="UserBalanceOrLandUsageError"> + Aufgrund eines internen Fehlers konnte Ihr Viewer nicht ordnungsgemäß aktualisiert werden. Der in Ihrem Viewer angezeigte L$-Kontostand oder Parzellenbesitz stimmt möglicherweise nicht mit dem aktuellen Stand auf den Servern überein. + </notification> + <notification name="LargePrimAgentIntersect"> + Große Prims, die sich mit anderen Spielern überschneiden, können nicht erstellt werden. Bitte erneut versuchen, wenn sich die anderen Spieler bewegt haben. + </notification> + <notification name="PreferenceChatClearLog"> + Dadurch werden die Protokolle vorheriger Unterhaltungen und alle Backups dieser Datei gelöscht. + <usetemplate ignoretext="Löschen des Protokolls vorheriger Unterhaltungen bestätigen." name="okcancelignore" notext="Abbrechen" yestext="OK"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + Dadurch werden die Transkripte aller vorherigen Unterhaltungen gelöscht. Die Liste vergangener Unterhaltungen ist davon nicht betroffen. Alle Dateien mit den Suffixen .txt und txt.backup im Order [FOLDER] werden gelöscht. + <usetemplate ignoretext="Um Bestätigung bitten, bevor ich Transkripte lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/> + </notification> + <notification name="PreferenceChatPathChanged"> + Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt. + <usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100644..100755 --- a/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/de/panel_active_object_row.xml b/indra/newview/skins/default/xui/de/panel_active_object_row.xml index 00de705a30..00de705a30 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/de/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml index 6ad18781f5..6ad18781f5 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml index dcfcffa6e2..79a2ebe9df 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml @@ -27,5 +27,6 @@ <icon name="permission_edit_mine_icon" tool_tip="Dieser Freund kann Ihre Objekte bearbeiten, löschen und an sich nehmen"/> <icon name="permission_map_icon" tool_tip="Dieser Freund kann Sie auf der Karte finden"/> <icon name="permission_online_icon" tool_tip="Dieser Freund kann sehen, wenn Sie online sind"/> + <button name="info_btn" tool_tip="Mehr Infos"/> <button name="profile_btn" tool_tip="Profil anzeigen"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml index 09f930ec01..09f930ec01 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml index 2d140515d4..c105a5b8a3 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel" width="300"> - <text left_pad="5" name="title_text" width="260"> - Liste der ignorierten Einwohner - </text> - <scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/> - <button label="Einwohner ignorieren" label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/> - <button label="Objekt nach Name ignorieren" label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/> - <button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="Filtern" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="Aktionen für ausgewählte(s) Person/Objekt"/> + <menu_button name="view_btn" tool_tip="Sortieroptionen"/> + <menu_button name="plus_btn" tool_tip="Einwohner oder Objekt zum ignorieren auswählen"/> + <button name="unblock_btn" tool_tip="Einwohner oder Objekt aus der Liste der ignorierten Einwohner oder Objekte entfernen"/> + </panel> + <block_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml index 799586f021..799586f021 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml index 4d7e65405a..4d7e65405a 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml index 9c84105254..9c84105254 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/de/panel_chat_header.xml b/indra/newview/skins/default/xui/de/panel_chat_header.xml index 7916bf5155..7916bf5155 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/de/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml index bcc6772bb9..bcc6772bb9 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml index 007e9d69f0..007e9d69f0 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/de/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml index fc45c9ce79..fc45c9ce79 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml index 945acb02d7..945acb02d7 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml index 12294a43ce..12294a43ce 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml new file mode 100644 index 0000000000..a9bfe4754e --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="(laden)"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..afeaa14e81 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="Enthielt eine Voice-Unterhaltung"/> + <icon name="unread_ims_icon" tool_tip="Nachrichten trafen ein, während Sie abgemeldet waren"/> + <button name="delete_btn" tool_tip="Diesen Eintrag entfernen"/> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml index a27252e23e..a27252e23e 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml index b7ad1bdc1b..b7ad1bdc1b 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml index 4c6facf5e3..4c6facf5e3 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml index bd270697ea..bd270697ea 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml index 69bcf2fb71..69bcf2fb71 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml index fb7d18f66c..fb7d18f66c 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_hair.xml b/indra/newview/skins/default/xui/de/panel_edit_hair.xml index d6efde8306..d6efde8306 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml index 1b7c1d79a5..1b7c1d79a5 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_pants.xml b/indra/newview/skins/default/xui/de/panel_edit_pants.xml index 533cf20412..533cf20412 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_physics.xml b/indra/newview/skins/default/xui/de/panel_edit_physics.xml index bd9c84577a..bd9c84577a 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml index aafffc7ae3..aafffc7ae3 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml index 03974e7f7f..03974e7f7f 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_shape.xml b/indra/newview/skins/default/xui/de/panel_edit_shape.xml index 80d3b29cad..80d3b29cad 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml index 4f140a2b01..4f140a2b01 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml index abedb8d89e..abedb8d89e 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml index 60f6919485..60f6919485 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml index 07ce8a7436..07ce8a7436 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_socks.xml b/indra/newview/skins/default/xui/de/panel_edit_socks.xml index 4e72b63f49..4e72b63f49 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml index 075a9d752a..075a9d752a 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml index 1fad0ccedb..1fad0ccedb 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml index 9d193ffedb..9d193ffedb 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml index 94a79a0bbd..94a79a0bbd 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml index 9cb72fafff..9cb72fafff 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml index 9d4301de73..9d4301de73 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_general.xml +++ b/indra/newview/skins/default/xui/de/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml index bf4d44af52..bf4d44af52 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml index c32d2fe4bf..c32d2fe4bf 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml index d9d237be2e..d9d237be2e 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml index d097a2b18c..fc911a64df 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/de/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Unbekannt"/> + <button name="info_btn" tool_tip="Mehr Infos"/> <button name="profile_btn" tool_tip="Profil anzeigen"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml index df423cc69a..df423cc69a 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_notify.xml b/indra/newview/skins/default/xui/de/panel_group_notify.xml index 9c05e99786..9c05e99786 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml index f297d32a91..f297d32a91 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml index abf8011d9d..abf8011d9d 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/de/panel_instant_message.xml b/indra/newview/skins/default/xui/de/panel_instant_message.xml index 372def78ca..372def78ca 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/de/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/de/panel_inventory_item.xml b/indra/newview/skins/default/xui/de/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/de/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml index 10cf34c170..10cf34c170 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/de/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/de/panel_landmarks.xml b/indra/newview/skins/default/xui/de/panel_landmarks.xml index c1f8a20728..c1f8a20728 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/de/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index 8cc467185c..8cc467185c 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index 2f00782ef0..2f00782ef0 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml index f49446fbbf..f49446fbbf 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_me.xml +++ b/indra/newview/skins/default/xui/de/panel_me.xml diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml index 75c9057571..75c9057571 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml index dd408b8275..dd408b8275 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml index adc0d22ce6..adc0d22ce6 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml index 53794b6619..53794b6619 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml index 07ad761791..07ad761791 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml index 08cc0b0ec8..69cf6d98de 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabe drücken, um zu sprechen, Strg-Eingabe drücken, um zu Rufen."/> <button name="show_nearby_chat" tool_tip="Protokoll des Chats in der Nähe anzeigen/ausblenden"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml index 90885c7192..90885c7192 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/de/panel_notifications_channel.xml b/indra/newview/skins/default/xui/de/panel_notifications_channel.xml index 35bd76ce70..35bd76ce70 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/de/panel_notifications_channel.xml diff --git a/indra/newview/skins/default/xui/de/panel_notify_textbox.xml b/indra/newview/skins/default/xui/de/panel_notify_textbox.xml index da672a0309..da672a0309 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/de/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml index 7c7448c061..7c7448c061 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml index 4006022ffc..4006022ffc 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml index 1af0492aa1..1af0492aa1 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml index d5158b2d97..d5158b2d97 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml index ad0e039070..ad0e039070 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfits_list.xml b/indra/newview/skins/default/xui/de/panel_outfits_list.xml index ea3a938be9..ea3a938be9 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml index 27141796a8..27141796a8 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml index 4e76147746..8c05ca2c24 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_people.xml +++ b/indra/newview/skins/default/xui/de/panel_people.xml @@ -14,81 +14,53 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte]. <string name="no_filtered_friends_msg"> Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche]. </string> - <string name="people_filter_label" value="Nach Leuten filtern"/> - <string name="groups_filter_label" value="Nach Gruppen filtern"/> <string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups/[SEARCH_TERM] Suche]."/> <string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/> <string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/> <string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/> - <filter_editor label="Filter" name="filter_input"/> <tab_container name="tabs"> <panel label="IN DER NÄHE" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="Optionen"/> - <button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="Nach Personen filtern" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/> + <menu_button name="nearby_view_btn" tool_tip="Anzeige-/Sortieroptionen"/> + <button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/> + <dnd_button name="nearby_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/> </panel> </panel> - <panel label="MEINE FREUNDE" name="friends_panel"> + <panel label="FREUNDE" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="Nach Personen filtern" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/> + <menu_button name="friends_view_btn" tool_tip="Anzeige-/Sortieroptionen"/> + <button name="friends_add_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/> + <dnd_button name="friends_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Online"/> <accordion_tab name="tab_all" title="Alle"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="Ausgewählte Person aus Ihrer Freundesliste entfernen"/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="MEINE GRUPPEN" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="Optionen"/> - <button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/> - <button name="activate_btn" tool_tip="Ausgewählte Gruppe aktivieren"/> + <panel label="GRUPPEN" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="Nach Gruppen filtern" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="Aktionen für ausgewählte Gruppe"/> + <menu_button name="groups_view_btn" tool_tip="Anzeige-/Sortieroptionen"/> + <menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/> + <dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/> </panel> </panel> <panel label="AKTUELL" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="Optionen"/> - <button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="Nach Personen filtern" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/> + <menu_button name="recent_view_btn" tool_tip="Anzeige-/Sortieroptionen"/> + <button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/> + <dnd_button name="recent_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/> </panel> </panel> + <panel label="IGNORIERT" name="blocked_panel"> + <panel label="Ignorierte Einwohner und Objekte" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="Gruppe anrufen" name="group_call_btn" tool_tip="Diese Gruppe anrufen"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_pick_info.xml b/indra/newview/skins/default/xui/de/panel_pick_info.xml index f215c43a3d..f215c43a3d 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/de/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/de/panel_picks.xml b/indra/newview/skins/default/xui/de/panel_picks.xml index 6aaa3151a8..6aaa3151a8 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_picks.xml +++ b/indra/newview/skins/default/xui/de/panel_picks.xml diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml index 4077fdab36..4077fdab36 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml index 602ffff94d..602ffff94d 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_places.xml +++ b/indra/newview/skins/default/xui/de/panel_places.xml diff --git a/indra/newview/skins/default/xui/de/panel_postcard_message.xml b/indra/newview/skins/default/xui/de/panel_postcard_message.xml index 6eeef8af71..6eeef8af71 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/de/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml index c1a1c0cc46..c1a1c0cc46 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml index 8a5c175f2f..8a5c175f2f 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml index fcb45e26be..fcb45e26be 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml 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 c9ae350147..8193fd42c1 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Text-Chat" name="chat"> - <text name="font_size"> - Schriftgröße: - </text> - <radio_group name="chat_font_size"> - <radio_item label="Klein" name="radio" value="0"/> - <radio_item label="Mittel" name="radio2" value="1"/> - <radio_item label="Groß" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/> - <check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/> - <check_box label="Kompakten IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/> - <check_box label="Blasen-Chat" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - IMs anzeigen in: - </text> - <text name="requires_restart_label"> - (Neustart erforderlich) - </text> - <radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit vielen Registerkarten an (Neustart erforderlich)."> - <radio_item label="Getrennte Fenster" name="radio" value="0"/> - <radio_item label="Registerkarten" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - Popups für eingehende Chats aktivieren: - </text> - <check_box label="Gruppen-Chats" name="EnableGroupChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Gruppen-Chat-Message eintrifft"/> - <check_box label="IM-Chats" name="EnableIMChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Instant Message eintrifft"/> - <spinner label="Lebenszeit von Toasts für Chat in der Nähe:" name="nearby_toasts_lifetime"/> - <spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/> + <check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/> + <check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/> + <text name="font_size"> + Schriftgröße: + </text> + <combo_box name="chat_font_size"> + <item label="Klein" name="Small" value="0"/> + <item label="Mittel" name="Medium" value="1"/> + <item label="Groß" name="Large" value="2"/> + </combo_box> + <check_box label="Blasen-Chat" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + Benachrichtigungen + </text> + <text name="friend_ims"> + IMs von Freunden: + </text> + <combo_box name="FriendIMOptions"> + <item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/> + <item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/> + <item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/> + <item label="None" name="None" value="none"/> + </combo_box> + <text name="non_friend_ims"> + IMs von anderen: + </text> + <combo_box name="NonFriendIMOptions"> + <item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/> + <item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/> + <item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/> + <item label="None" name="None" value="none"/> + </combo_box> + <text name="conference_ims"> + Konferenz-IMs: + </text> + <combo_box name="ConferenceIMOptions"> + <item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/> + <item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/> + <item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/> + <item label="None" name="None" value="none"/> + </combo_box> + <text name="group_chat"> + Gruppen-Chat: + </text> + <combo_box name="GroupChatOptions"> + <item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/> + <item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/> + <item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/> + <item label="None" name="None" value="none"/> + </combo_box> + <text name="nearby_chat"> + Chat in der Nähe: + </text> + <combo_box name="NearbyChatOptions"> + <item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/> + <item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/> + <item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/> + <item label="None" name="None" value="none"/> + </combo_box> + <text name="notifications_alert"> + Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ > „Nicht stören“. + </text> + </panel> + <panel> + <text name="play_sound"> + Sound abspielen: + </text> + <check_box label="Neue Unterhaltung" name="new_conversation"/> + <check_box label="Eingehender Anruf..." name="incoming_voice_call"/> + <check_box label="Teleport-Angebot" name="teleport_offer"/> + <check_box label="Inventarangebot" name="inventory_offer"/> + </panel> + <panel> + <button label="Protokoll löschen..." name="clear_log"/> + <button label="Protokolle löschen..." name="delete_transcripts"/> + <button label="Durchsuchen..." label_selected="Durchsuchen" name="log_path_button"/> + </panel> <button label="Übersetzen..." name="ok_btn"/> <button label="Automatisch ersetzen..." name="autoreplace_showgui"/> <button label="Rechtschreibprüfung..." name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml index 19c5efcb05..19c5efcb05 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index 979ccba48d..4e453b6969 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml @@ -69,9 +69,9 @@ <combo_box.item label="nie" name="item4"/> </combo_box> <text name="text_box3"> - Antwort, wenn im „Beschäftigt“-Modus: + Nicht-stören-Antwort: </text> - <text_editor name="busy_response"> + <text_editor name="do_not_disturb_response"> log_in_to_change </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml index 9175ea0bae..9175ea0bae 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml index 3e248f0bf0..3e248f0bf0 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml index e21bed6bb5..e21bed6bb5 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml index 8c7ea688d7..8c7ea688d7 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml index 1e6a03c99f..1e6a03c99f 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml index c85f2762b1..c85f2762b1 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_covenant.xml b/indra/newview/skins/default/xui/de/panel_region_covenant.xml index 225c98b84f..225c98b84f 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/de/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml index a03a0b8b7b..a03a0b8b7b 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_environment.xml b/indra/newview/skins/default/xui/de/panel_region_environment.xml index daadd30f62..daadd30f62 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/de/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml index b087451391..b087451391 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml index f383be992b..f383be992b 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_region_general.xml +++ b/indra/newview/skins/default/xui/de/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml index 7801be30e4..7801be30e4 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/de/panel_script_ed.xml b/indra/newview/skins/default/xui/de/panel_script_ed.xml index 7e03aeff15..7e03aeff15 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/de/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml index c91eb98e9c..c91eb98e9c 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml index 8d7cc1bf9a..8d7cc1bf9a 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param.xml index 50590b8d73..50590b8d73 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/de/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml index 652fb7c836..652fb7c836 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml index cf3080a4f9..cf3080a4f9 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml index 10827ce6f2..10827ce6f2 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml index 3aeae80388..3aeae80388 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml index e1d8a5dc6d..e1d8a5dc6d 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml index c9afe86d7f..c9afe86d7f 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml index 8d1c52dea8..8d1c52dea8 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/de/panel_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml index b739b6197f..b739b6197f 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/de/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml index be21429007..be21429007 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml index 14ace0ac3a..14ace0ac3a 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/de/panel_sys_well_item.xml b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml index 504f1727e2..504f1727e2 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history.xml b/indra/newview/skins/default/xui/de/panel_teleport_history.xml index 4d721f2af6..4d721f2af6 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/de/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml index 4b57aa69b6..4b57aa69b6 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/de/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml index 533deb8597..533deb8597 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/de/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml index 3d43200e48..3d43200e48 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/de/panel_world_map.xml b/indra/newview/skins/default/xui/de/panel_world_map.xml index 35fe3d3ffc..35fe3d3ffc 100644..100755 --- a/indra/newview/skins/default/xui/de/panel_world_map.xml +++ b/indra/newview/skins/default/xui/de/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml index 5d9dcacd51..5d9dcacd51 100644..100755 --- a/indra/newview/skins/default/xui/de/role_actions.xml +++ b/indra/newview/skins/default/xui/de/role_actions.xml diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml index 7fb9b34e0a..7fb9b34e0a 100644..100755 --- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml index 18aad64f96..18aad64f96 100644..100755 --- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml index 1b67eaf03b..1b67eaf03b 100644..100755 --- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml index 4c8d77d336..29239033fe 100644..100755 --- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="Objekt kaufen" name="Buyobject"/> <combo_box.item label="Objekt bezahlen" name="Payobject"/> <combo_box.item label="Öffnen" name="Open"/> + <combo_box.item label="Zoomen" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 79cb73ecf9..e142cb8029 100644..100755 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -137,7 +137,7 @@ Beenden </string> <string name="create_account_url"> - http://join.secondlife.com/index.php?lang=de-DE&sourceid=[sourceid] + http://join.secondlife.com/?sourceid=[sourceid] </string> <string name="LoginFailedViewerNotPermitted"> Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter: @@ -622,8 +622,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="AvatarAway"> Abwesend </string> - <string name="AvatarBusy"> - Beschäftigt + <string name="AvatarDoNotDisturb"> + Nicht stören </string> <string name="AvatarMuted"> Ignoriert @@ -859,6 +859,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="ST_NO_JOINT"> HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden. </string> + <string name="NearbyChatTitle"> + Chat in der Nähe + </string> + <string name="NearbyChatLabel"> + (Chat in der Nähe) + </string> <string name="whisper"> flüstert: </string> @@ -922,12 +928,15 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="ControlYourCamera"> Kamerasteuerung </string> - <string name="TeleportYourAgent"> - Sie teleportieren - </string> <string name="NotConnected"> Nicht verbunden </string> + <string name="AgentNameSubst"> + (Sie) + </string> + <string name="TeleportYourAgent"> + Sie teleportieren + </string> <string name="SIM_ACCESS_PG"> Generell </string> @@ -1009,18 +1018,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="dictionary_files"> Wörterbücher </string> - <string name="AvatarSetNotAway"> - Nicht abwesend - </string> - <string name="AvatarSetAway"> - Abwesend - </string> - <string name="AvatarSetNotBusy"> - Nicht beschäftigt - </string> - <string name="AvatarSetBusy"> - Beschäftigt - </string> <string name="shape"> Form </string> @@ -1989,8 +1986,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="PanelContentsNewScript"> Neues Skript </string> - <string name="BusyModeResponseDefault"> - Der Einwohner/Die Einwohnerin ist „beschäftigt”, d.h. er/sie möchte im Moment nicht gestört werden. Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden. + <string name="DoNotDisturbModeResponseDefault"> + Dieser Einwohner hat den Nicht-stören-Modus aktiviert und wird Ihre Nachricht später sehen. </string> <string name="MuteByName"> (Nach Namen) @@ -2103,9 +2100,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="GroupMoneyDate"> [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc] </string> - <string name="ViewerObjectContents"> - Inhalte - </string> <string name="AcquiredItems"> Erworbene Artikel </string> @@ -3877,7 +3871,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ Generelle Region </string> <string name="LocationCtrlSeeAVsTooltip"> - Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet + Avatare in dieser Parzelle können von Avataren außerhalb dieser Parzelle weder gesehen noch gehört werden </string> <string name="LocationCtrlPathfindingDirtyTooltip"> Bewegliche Objekte verhalten sich in dieser Region u. U. erst dann korrekt, wenn die Region neu geformt wird. @@ -3954,6 +3948,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ <string name="IM_unblock_only_groups_friends"> Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ > „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren. </string> + <string name="OnlineStatus"> + Online + </string> + <string name="OfflineStatus"> + Offline + </string> <string name="answered_call"> Ihr Anruf wurde entgegengenommen </string> @@ -3963,6 +3963,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ <string name="you_joined_call"> Sie sind dem Gespräch beigetreten </string> + <string name="you_auto_rejected_call-im"> + Sie haben den Voice-Anruf automatisch abgelehnt, während der Nicht-stören-Modus aktiviert war. + </string> <string name="name_started_call"> [NAME] hat einen Voice-Anruf begonnen </string> @@ -3979,7 +3982,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ Wird verbunden... </string> <string name="conference-title"> - Ad-hoc-Konferenz + Chat mit mehreren Personen </string> <string name="conference-title-incoming"> Konferenz mit [AGENT_NAME] @@ -4859,6 +4862,9 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Chat_Label"> Chat </string> + <string name="Command_Conversations_Label"> + Unterhaltungen + </string> <string name="Command_Compass_Label"> Kompass </string> @@ -4934,6 +4940,9 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Chat_Tooltip"> Mit Leuten in der Nähe chatten </string> + <string name="Command_Conversations_Tooltip"> + Mit allen unterhalten + </string> <string name="Command_Compass_Tooltip"> Kompass </string> @@ -5063,4 +5072,13 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="UserDictionary"> [Benutzer] </string> + <string name="logging_calls_disabled_log_empty"> + Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ > „Chat“. + </string> + <string name="logging_calls_disabled_log_not_empty"> + Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ > „Chat“. + </string> + <string name="logging_calls_enabled_log_empty"> + Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden. + </string> </strings> diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml index 8062633df6..8062633df6 100644..100755 --- a/indra/newview/skins/default/xui/de/teleport_strings.xml +++ b/indra/newview/skins/default/xui/de/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/de/xui_version.xml b/indra/newview/skins/default/xui/de/xui_version.xml index 0e777751d3..0e777751d3 100644..100755 --- a/indra/newview/skins/default/xui/de/xui_version.xml +++ b/indra/newview/skins/default/xui/de/xui_version.xml diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml index e8a705e744..e8a705e744 100644..100755 --- a/indra/newview/skins/default/xui/en/accordion_drag.xml +++ b/indra/newview/skins/default/xui/en/accordion_drag.xml diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml index e17a0dd351..e17a0dd351 100644..100755 --- a/indra/newview/skins/default/xui/en/accordion_parent.xml +++ b/indra/newview/skins/default/xui/en/accordion_parent.xml diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml index a60e9afab1..a60e9afab1 100644..100755 --- a/indra/newview/skins/default/xui/en/alert_button.xml +++ b/indra/newview/skins/default/xui/en/alert_button.xml diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml index 5535a5dc2a..5535a5dc2a 100644..100755 --- a/indra/newview/skins/default/xui/en/alert_check_box.xml +++ b/indra/newview/skins/default/xui/en/alert_check_box.xml diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml index b0886fce06..b0886fce06 100644..100755 --- a/indra/newview/skins/default/xui/en/alert_icon.xml +++ b/indra/newview/skins/default/xui/en/alert_icon.xml diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml index 54dbc698c8..54dbc698c8 100644..100755 --- a/indra/newview/skins/default/xui/en/alert_line_editor.xml +++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index e7dd62eb64..e7dd62eb64 100644..100755 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index d11373ce1d..d11373ce1d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 63eb87f27a..63eb87f27a 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml 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 793a6e6fa1..793a6e6fa1 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml index b79c5d9a19..b79c5d9a19 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_activeim.xml +++ b/indra/newview/skins/default/xui/en/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml index b5538a511c..b5538a511c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml index cb6b2f6ebc..cb6b2f6ebc 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml index 9c6d114c4c..9c6d114c4c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_auction.xml +++ b/indra/newview/skins/default/xui/en/floater_auction.xml diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml index 0bfefc8abe..0bfefc8abe 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/en/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml index cd5cca02bd..cd5cca02bd 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_avatar.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index 1a55dc2e2c..1a55dc2e2c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml index bac3ea86f1..bac3ea86f1 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 3d29356b22..3d29356b22 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index 38428b36fc..38428b36fc 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 4e0cfb0cd4..4e0cfb0cd4 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml index 1f2fe62b3c..1f2fe62b3c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_bumps.xml +++ b/indra/newview/skins/default/xui/en/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index ac96a70805..ac96a70805 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 553c5d51d0..553c5d51d0 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml index 0637eedfb2..0637eedfb2 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 22cc058e46..22cc058e46 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml index 5fdd4aa49d..5fdd4aa49d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 22bc488a92..521389d7b3 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater positioning="specified" - left="458" - bottom="-80" + right="-460" + bottom="-50" follows="left|bottom" legacy_header_height="18" can_minimize="true" diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml deleted file mode 100644 index 405557242f..0000000000 --- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - positioning="specified" - left="10" - bottom="-10" - height="60" - layout="topleft" - legacy_header_height="25" - single_instance="true" - title="NEARBY CHAT" - save_rect="true" - save_visibility="true" - can_close="true" - can_minimize="true" - help_topic="chat_bar" - min_height="60" - min_width="150" - can_resize="true" - default_tab_group="1" - name="chat_bar" - width="300"> - <panel - top="20" - class="panel_nearby_chat" - follow="all" - width="300" - height="0" - visible="false" - filename="panel_nearby_chat.xml" - name="nearby_chat" /> - <panel width="300" - height="31" - left="0" - name="bottom_panel" - bottom="-1" - follows="left|right|bottom" - tab_group="1"> - <line_editor - border_style="line" - border_thickness="1" - follows="left|right" - height="23" - label="Click here to chat." - layout="topleft" - left_delta="7" - left="0" - max_length_bytes="1023" - name="chat_box" - spellcheck="true" - text_pad_left="5" - text_pad_right="25" - tool_tip="Press Enter to say, Ctrl+Enter to shout" - top="2" - width="255" /> - <output_monitor - auto_update="true" - follows="right" - draw_border="false" - height="16" - layout="topleft" - left_pad="-24" - mouse_opaque="true" - name="chat_zone_indicator" - top="6" - visible="true" - width="20" /> - <button - follows="right" - is_toggle="true" - width="20" - top="2" - layout="topleft" - left_pad="12" - image_disabled="ComboButton_UpOff" - image_unselected="ComboButton_UpOff" - image_selected="ComboButton_On" - image_pressed="ComboButton_UpSelected" - image_pressed_selected="ComboButton_Selected" - height="23" - chrome="true" - name="show_nearby_chat" - tool_tip="Shows/hides nearby chat log"> - </button> - </panel> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml index 2cf6e682fd..2cf6e682fd 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/en/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml index e06d10606a..e06d10606a 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml new file mode 100755 index 0000000000..19a4cbc119 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> + +<floater + can_resize="true" + positioning="cascading" + help_topic="conversation_log" + height="200" + min_height="100" + min_width="230" + layout="topleft" + name="floater_conversation_log" + save_rect="true" + single_instance="true" + reuse_instance="true" + title="CONVERSATION LOG" + width="300"> + <panel + follows="left|top|right" + height="32" + left="0" + name="buttons_panel" + top="0"> + <filter_editor + follows="left|top|right" + height="23" + layout="topleft" + left="8" + label="Filter People" + max_length_chars="300" + name="people_filter_input" + text_color="Black" + text_pad_left="10" + top="4" + width="204" /> + <menu_button + follows="top|right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_sort" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="8" + menu_filename="menu_conversation_log_view.xml" + menu_position="bottomleft" + name="conversation_view_btn" + tool_tip="View/sort options" + top="3" + width="31" /> + <menu_button + follows="top|right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="8" + name="conversations_gear_btn" + tool_tip="Actions on selected person or group" + top="3" + width="31" /> + </panel> + <panel + bottom="-1" + follows="all" + left="0" + name="log_panel" + right="-1" + top="32"> + <conversation_log_list + allow_select="true" + bottom="-8" + opaque="true" + follows="all" + left="8" + keep_selection_visible_on_reshape="true" + item_pad="2" + multi_select="false" + name="conversation_log_list" + right="-8" + top="0" /> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml new file mode 100755 index 0000000000..764b9d8385 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + default_tab_group="1" + help_topic="conversation_preview" + height="391" + layout="topleft" + min_height="243" + min_width="234" + name="preview_conversation" + title="CONVERSATION:" + width="400"> + <floater.string + name="Title"> + CONVERSATION: [NAME] + </floater.string> + <chat_history + font="SansSerifSmall" + follows="all" + visible="true" + height="330" + name="chat_history" + notify_unread_msg="false" + parse_highlights="true" + parse_urls="true" + left="5" + top_pad="25" + width="390"> + </chat_history> + <text + follows="bottom|right" + font="SansSerif" + height="22" + layout="topleft" + name="page_label" + right="-110" + top_pad="7" + value="Page" + width="35"> + </text> + <spinner + allow_digits_only="true" + decimal_digits="0" + follows="bottom|right" + height="23" + increment="1" + label_width="40" + layout="topleft" + left_pad="0" + name="history_page_spin" + top_delta="-3" + width="50"/> + <text + follows="bottom|right" + font="SansSerif" + height="22" + layout="topleft" + name="page_num_label" + left_pad="5" + top_delta="4" + width="40"> + </text> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 143bcb4430..143bcb4430 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml index b5de4166f6..b5de4166f6 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml index 39aa8e07bb..94ebaa9cb2 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_destinations.xml +++ b/indra/newview/skins/default/xui/en/floater_destinations.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - positioning="cascading" + positioning="cascading" ignore_ui_scale="false" legacy_header_height="225" can_minimize="true" @@ -17,11 +17,11 @@ save_rect="true" save_visibility="true" title="DESTINATIONS" - width="840"> + width="550"> <web_browser top="25" height="200" - width="840" + width="550" follows="all" name="destination_guide_contents" trusted_content="true"/> diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml index 9a9fd32a77..9a9fd32a77 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_display_name.xml +++ b/indra/newview/skins/default/xui/en/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml index d9a3ad0c4b..d9a3ad0c4b 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml index 56233d91ee..56233d91ee 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml index 905983e7fa..905983e7fa 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml index 1b1cafaca6..1b1cafaca6 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index cf61b7d24d..cf61b7d24d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml index 77adb5524e..77adb5524e 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml index 3ab19ec9d9..3ab19ec9d9 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_font_test.xml +++ b/indra/newview/skins/default/xui/en/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 200e9b9537..200e9b9537 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index e7131e20cb..e7131e20cb 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index 9deb0d2030..9deb0d2030 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index c06cb63f8a..c06cb63f8a 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml index 8c0077a8cc..8c0077a8cc 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_how_to.xml +++ b/indra/newview/skins/default/xui/en/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml index e2d860881a..e2d860881a 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_hud.xml +++ b/indra/newview/skins/default/xui/en/floater_hud.xml diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index e123de46c2..65f623a47e 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -1,49 +1,180 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <multi_floater - can_close="false" + can_close="true" can_minimize="true" can_resize="true" - height="390" + height="210" layout="topleft" name="floater_im_box" help_topic="floater_im_box" save_rect="true" save_visibility="true" single_instance="true" + reuse_instance="true" title="CONVERSATIONS" - width="396"> - <tab_container - follows="left|right|top|bottom" - height="390" + bottom="-50" + right="-5" + width="450" + min_width="38"> + <string + name="collapse_icon" + value="Conv_toolbar_collapse"/> + <string + name="expand_icon" + value="Conv_toolbar_expand"/> + <layout_stack + animate="true" + bottom="-1" + follows="all" layout="topleft" - left="1" - name="im_box_tab_container" - tab_position="bottom" - tab_width="64" - tab_max_width = "134" - tab_height="16" - use_custom_icon_ctrl="true" - tab_icon_ctrl_pad="2" - halign="left" - use_ellipses="true" - top="0" - width="394"> - <first_tab - tab_bottom_image_flash="Toolbar_Left_Flash"/> - <middle_tab - tab_bottom_image_flash="Toolbar_Middle_Flash"/> - <last_tab - tab_bottom_image_flash="Toolbar_Right_Flash"/> - </tab_container> - <icon - color="DefaultShadowLight" - enabled="false" - follows="left|right|bottom" - height="17" - image_name="tabarea.tga" - layout="bottomleft" - left="1" - name="im_box_tab_container_icon" - bottom="10" - width="394" /> + left="0" + name="conversations_stack" + orientation="horizontal" + right="-1" + top="0"> + <layout_panel + auto_resize="false" + user_resize="true" + name="conversations_layout_panel" + min_dim="38" + expanded_min_dim="156"> + <layout_stack + animate="false" + follows="left|top|right" + height="35" + layout="topleft" + left="0" + name="conversations_pane_buttons_stack" + orientation="horizontal" + right="-1" + top="0"> + <layout_panel + auto_resize="true" + height="35" + name="conversations_pane_buttons_expanded"> + <menu_button + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_sort" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + menu_filename="menu_participant_view.xml" + layout="topleft" + left="5" + name="sort_btn" + tool_tip="View/sort options" + top="5" + width="31" /> + <button + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_plus" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left_pad="2" + name="add_btn" + tool_tip="Start a new conversation" + width="31"/> + <button + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Command_Speak_Icon" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left_pad="2" + name="speak_btn" + tool_tip="Speak with people using your microphone" + width="31"/> + </layout_panel> + <layout_panel + auto_resize="false" + height="35" + name="conversations_pane_buttons_collapsed" + width="41"> + <button + follows="right|top" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_collapse" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left="1" + name="expand_collapse_btn" + tool_tip="Collapse/Expand this list" + width="31" /> + </layout_panel> + </layout_stack> + <panel + bottom="-1" + follows="all" + layout="topleft" + name="conversations_list_panel" + opaque="true" + top="35" + left="5" + right="-1"/> + </layout_panel> + <layout_panel + auto_resize="true" + user_resize="true" + name="messages_layout_panel" + expanded_min_dim="222"> + <panel_container + bottom="-1" + follows="all" + layout="topleft" + left="0" + name="im_box_tab_container" + right="-1" + top="0"> + <panel + bottom="-1" + follows="all" + layout="topleft" + name="stub_panel" + opaque="true" + top_pad="0" + left="0" + right="-1"> + <button + follows="right|top" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_collapse" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + right="-10" + name="stub_collapse_btn" + tool_tip="Collapse this pane" + width="31" /> + <text + type="string" + clip_partial="false" + follows="left|top|right" + layout="topleft" + left="15" + right="-15" + name="stub_textbox" + top="25" + height="40" + valign="center" + parse_urls="true" + wrap="true"> + This conversation is in a separate window. [secondlife:/// Bring it back.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> </multi_floater> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 040b66623e..2152a9f6e9 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - legacy_header_height="18" background_visible="true" default_tab_group="1" height="355" @@ -10,84 +9,328 @@ can_dock="false" can_minimize="true" can_close="true" + save_rect="true" visible="false" width="394" can_resize="true" - min_width="250" - min_height="190"> - <layout_stack - animate="true" - default_tab_group="2" - follows="all" - height="320" - width="394" - layout="topleft" - orientation="horizontal" - name="im_panels" - tab_group="1" - top="20" - left="0"> - <layout_panel - name="im_control_panel_holder" - min_width="115" - width="150" - height="320" - auto_resize="false"> - <panel - name="panel_im_control_panel" - layout="topleft" - height="320" - width="150" - follows="all"/> - </layout_panel> - <layout_panel - default_tab_group="3" - left="0" - tab_group="2" - top="0" - height="200" - width="244" - user_resize="true"> - <button - height="20" - follows="left|top" - top="0" - left="2" - image_overlay="TabIcon_Open_Off" - layout="topleft" - width="25" - name="slide_left_btn" /> - <button - height="20" - follows="left|top" - top="0" - left="2" - image_overlay="TabIcon_Close_Off" - width="25" - name="slide_right_btn" /> - <chat_history - font="SansSerifSmall" - follows="left|right|top|bottom" - height="150" - name="chat_history" - parse_highlights="true" - parse_urls="true" - left="1" - width="238"> - </chat_history> - <line_editor - bottom="0" - left="3" - follows="left|right|bottom" - font="SansSerifSmall" - height="20" - label="To" - layout="bottomleft" - name="chat_editor" - spellcheck="true" - tab_group="3" - width="236"> - </line_editor> - </layout_panel> - </layout_stack> + can_tear_off="false" + min_height="190" + positioning="relative"> + <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string> + <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string> + <floater.string + name="collapseline_icon" + value="Conv_collapse_to_one_line"/> + <floater.string + name="expandline_icon" + value="Conv_expand_one_line"/> + <floater.string + name="collapse_icon" + value="Conv_toolbar_collapse"/> + <floater.string + name="expand_icon" + value="Conv_toolbar_expand"/> + <floater.string + name="tear_off_icon" + value="Conv_toolbar_arrow_ne"/> + <floater.string + name="return_icon" + value="Conv_toolbar_arrow_sw"/> + <floater.string + name="participant_added" + value="[NAME] was invited to the conversation."/> + <floater.string + name="multiple_participants_added" + value="[NAME] were invited to the conversation."/> + <floater.string + name="tooltip_to_separate_window" + value="Move this conversation to a separate window"/> + <floater.string + name="tooltip_to_main_window" + value="Move this conversation back to main window"/> + <floater.string + name="start_call_button_tooltip" + value="Open voice connection"/> + <floater.string + name="end_call_button_tooltip" + value="Close voice connection"/> + <floater.string + name="expcol_button_not_tearoff_tooltip" + value="Collapse this pane"/> + <floater.string + name="expcol_button_tearoff_and_expanded_tooltip" + value="Collapse participant list"/> + <floater.string + name="expcol_button_tearoff_and_collapsed_tooltip" + value="Expand participant list"/> + <view + follows="all" + layout="topleft" + name="contents_view" + top="0" + left="0" + right="-1" + bottom="-3"> + <layout_stack + animate="false" + default_tab_group="2" + follows="all" + right="-5" + bottom="-1" + top="0" + left="5" + border_size="0" + layout="topleft" + orientation="vertical" + name="main_stack" + tab_group="1"> + <layout_panel + auto_resize="false" + name="toolbar_panel" + height="35" + right="-1" + left="1"> + <menu_button + menu_filename="menu_im_session_showmodes.xml" + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_sort" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left="5" + name="view_options_btn" + tool_tip="View/sort options" + top="5" + width="31" /> + <menu_button + menu_filename="menu_im_conversation.xml" + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left_pad="2" + name="gear_btn" + visible="false" + tool_tip="Actions on selected person" + width="31"/> + <button + enabled="false" + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_add_person" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left_pad="2" + name="add_btn" + tool_tip="Add someone to this conversation" + width="31"/> + <button + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_open_call" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left_pad="2" + name="voice_call_btn" + tool_tip="Open voice connection" + width="31"/> + <output_monitor + auto_update="true" + follows="top|left" + draw_border="false" + height="16" + layout="topleft" + top="10" + left_pad="10" + mouse_opaque="true" + name="speaking_indicator" + visible="false" + width="20" /> + <button + follows="right|top" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_close" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + right="-67" + name="close_btn" + tool_tip="End this conversation" + width="31" /> + <button + follows="right|top" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_collapse" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left_pad="2" + name="expand_collapse_btn" + tool_tip="Collapse/Expand this pane" + width="31" /> + <button + follows="right|top" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_arrow_ne" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="2" + name="tear_off_btn" + top="5" + width="31" /> + </layout_panel> + <layout_panel + name="body_panel" + top="1" + bottom="-1"> + <layout_stack + default_tab_group="2" + follows="all" + orientation="horizontal" + name="im_panels" + tab_group="1" + top="0" + right="-1" + bottom="-1" + left="0"> + <layout_panel + name="speakers_list_panel" + expanded_min_dim="115" + min_dim="0" + width="150" + user_resize="true" + auto_resize="false" + bottom="-1" /> + <layout_panel + default_tab_group="3" + tab_group="2" + name="right_part_holder" + min_width="221" + bottom="-1"> + <layout_stack + animate="true" + default_tab_group="2" + follows="all" + orientation="vertical" + name="translate_and_chat_stack" + tab_group="1" + top="0" + left="0" + right="-1" + bottom="-1"> + <layout_panel + auto_resize="false" + height="26" + name="translate_chat_checkbox_lp"> + <check_box + top="10" + control_name="TranslateChat" + enabled="true" + height="16" + label="Translate chat" + left="5" + name="translate_chat_checkbox" + width="230" /> + </layout_panel> + <layout_panel + name="chat_holder"> + <chat_history + font="SansSerifSmall" + follows="all" + name="chat_history" + parse_highlights="true" + parse_urls="true" + right="-1" + left="5" + top="0" + bottom="-1" /> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel + top_delta="0" + top="0" + height="26" + bottom="-1" + auto_resize="false" + name="chat_layout_panel"> + <layout_stack + animate="false" + default_tab_group="2" + follows="all" + orientation="horizontal" + name="input_panels" + top="0" + bottom="-2" + left="0" + right="-1"> + <layout_panel + name="input_editor_layout_panel" + auto_resize="true" + user_resize="false" + top="0" + bottom="-1"> + <chat_editor + layout="topleft" + expand_lines_count="5" + follows="left|right|bottom" + font="SansSerifSmall" + height="20" + is_expandable="true" + text_tentative_color="TextFgTentativeColor" + name="chat_editor" + max_length="1023" + spellcheck="true" + tab_group="3" + top="1" + bottom="-2" + left="4" + right="-4" + wrap="true" /> + </layout_panel> + <layout_panel + auto_resize="false" + user_resize="false" + name="input_button_layout_panel" + width="30" + top="0" + bottom="-1"> + <button + layout="topleft" + left="1" + right="-1" + top="1" + height="22" + follows="left|right|top" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_expand_one_line" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + name="minz_btn" + tool_tip="Shows/hides message panel" /> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml index 44d2c14cc8..44d2c14cc8 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_import_collada.xml b/indra/newview/skins/default/xui/en/floater_import_collada.xml index 441ab6a2de..441ab6a2de 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/en/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index 81194f61cf..a7864381a9 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -8,8 +8,8 @@ layout="topleft" name="incoming call" help_topic="incoming_call" - title="Incoming call" - width="410"> + sound_flags="0" + width="550"> <floater.string name="lifetime"> 5 @@ -24,7 +24,7 @@ </floater.string> <floater.string name="VoiceInviteP2P"> - is calling. + is calling you. </floater.string> <floater.string name="VoiceInviteAdHoc"> @@ -49,14 +49,14 @@ image_name="icon_avatar_online.tga" layout="topleft" left_delta="19" - top="35" + top="20" width="36" /> <group_icon enabled="false" follows="left|top" height="36" layout="topleft" - top="35" + top="20" width="36" /> <text clip_partial="true" @@ -67,43 +67,43 @@ name="caller name" top="20" use_ellipses="true" - width="315" + width="475" word_wrap="true" /> - <text - clip_partial="true" - font="SansSerif" - height="30" - layout="topleft" - left="77" - name="question" - top_pad="5" - use_ellipses="true" - width="315" - word_wrap="true"> - Do you want to leave [CURRENT_CHAT] and join this voice chat? - </text> - <button + <button height="24" - label="Accept" - label_selected="Accept" + label="Answer" + label_selected="Answer" layout="topleft" left="70" name="Accept" - top="92" - width="100" /> + top_pad="5" + width="120" /> <button height="24" - label="Reject" - label_selected="Reject" + label="Ignore" + label_selected="Ignore" layout="topleft" name="Reject" left_pad="10" - width="100" /> + width="120" /> <button height="24" - label="Start IM" + label="Open IM instead" layout="topleft" name="Start IM" left_pad="10" - width="100" /> + width="120" /> + <text + clip_partial="true" + font="SansSerif" + height="30" + layout="topleft" + left="77" + name="question" + top_pad="5" + use_ellipses="true" + width="475" + word_wrap="true"> + If you answer, you will be disconnected from your current voice conversation. + </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index bea35e5fc1..bea35e5fc1 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml index adef066aef..adef066aef 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index c86ed595a7..c86ed595a7 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml index 59f6a9434c..59f6a9434c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_joystick.xml +++ b/indra/newview/skins/default/xui/en/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml index b24c745bdd..b24c745bdd 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 390ec9ab7d..390ec9ab7d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml index 5cd7cd196d..5cd7cd196d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml index e9676777f4..e9676777f4 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index b8893e11d9..b8893e11d9 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index ce788654aa..ce788654aa 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml index 0e03c0ab6d..0e03c0ab6d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml index fb7d09a21e..fb7d09a21e 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml index b98f280b56..b98f280b56 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 5e92a12251..5e92a12251 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 4e7ee7913f..5e84283ab0 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater positioning="specified" - left="320" - bottom="-80" + right="-693" + bottom="-50" legacy_header_height="18" can_dock="false" can_minimize="true" diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml index 22b0a1783f..22b0a1783f 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml index fdea7a821a..fdea7a821a 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml index ea44fd493e..178987962b 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml @@ -6,7 +6,7 @@ height="570" help_topic="sidebar_inventory" min_width="333" - min_height="560" + min_height="570" name="floater_my_inventory" save_rect="true" save_visibility="true" diff --git a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml index df46fc198f..df46fc198f 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml +++ b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml diff --git a/indra/newview/skins/default/xui/en/floater_notification.xml b/indra/newview/skins/default/xui/en/floater_notification.xml index 1f9ddecac2..1f9ddecac2 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_notification.xml +++ b/indra/newview/skins/default/xui/en/floater_notification.xml diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml index e243ccd2f9..e243ccd2f9 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml index eb283a1043..eb283a1043 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml index f526970ad0..f526970ad0 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_openobject.xml +++ b/indra/newview/skins/default/xui/en/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml index bbe280582b..bbe280582b 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml index ffbb6aa28b..ffbb6aa28b 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml index 46ee113b69..46ee113b69 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml index 2629313069..2629313069 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml index 4a457fb929..4a457fb929 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml index 41a7134b1d..41a7134b1d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_pay.xml +++ b/indra/newview/skins/default/xui/en/floater_pay.xml diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml index d3a35c2051..d3a35c2051 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml index 08d0b00a83..701233ba4a 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_people.xml +++ b/indra/newview/skins/default/xui/en/floater_people.xml @@ -6,21 +6,21 @@ can_resize="true" height="570" help_topic="sidebar_people" - min_height="440" - min_width="333" + min_height="220" + min_width="260" layout="topleft" name="floater_people" save_rect="true" single_instance="true" reuse_instance="true" title="PEOPLE" - width="333"> + width="370"> <panel_container default_panel_name="panel_people" follows="all" height="570" name="main_panel" - width="333"> + width="370"> <panel class="panel_people" name="panel_people" @@ -31,11 +31,5 @@ filename="panel_group_info_sidetray.xml" label="Group Profile" font="SansSerifBold"/> - <panel - class="panel_block_list_sidetray" - name="panel_block_list_sidetray" - filename="panel_block_list_sidetray.xml" - label="Blocked Residents & Objects" - font="SansSerifBold"/> </panel_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml index ff454e3ebf..ff454e3ebf 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml index 984894b016..984894b016 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_picks.xml +++ b/indra/newview/skins/default/xui/en/floater_picks.xml diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml index b241e265a9..b241e265a9 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_places.xml +++ b/indra/newview/skins/default/xui/en/floater_places.xml diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml index 05943a10d3..05943a10d3 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_post_process.xml +++ b/indra/newview/skins/default/xui/en/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index bd6faf4ed8..bd6faf4ed8 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml index 93bfe53aae..93bfe53aae 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 3ea5f54f2c..3ea5f54f2c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 8baa0a56f7..8baa0a56f7 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index 2e1c8ce670..2e1c8ce670 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index 83a1f5a96f..83a1f5a96f 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index 137e278ddc..137e278ddc 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml index 6312366b86..6312366b86 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml index 322e34272c..322e34272c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml index 7c7ee2df4c..7c7ee2df4c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 3b58cd08f6..3b58cd08f6 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index 9561f67941..9561f67941 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index bd4edb81c8..bd4edb81c8 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml index 53d4925214..53d4925214 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index b5dd2f97b9..b5dd2f97b9 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml index 6b36cdfcc5..6b36cdfcc5 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/en/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml index 91a9e67e4c..91a9e67e4c 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml index f4aca7bb3d..f4aca7bb3d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/en/floater_script_search.xml b/indra/newview/skins/default/xui/en/floater_script_search.xml index ade0156bc7..ade0156bc7 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_script_search.xml +++ b/indra/newview/skins/default/xui/en/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index c3e7028dc5..c3e7028dc5 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml index 4e89df5a73..4e89df5a73 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_select_key.xml +++ b/indra/newview/skins/default/xui/en/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 52de9ddd47..52de9ddd47 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index 3ed2bd7206..3ed2bd7206 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml 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 index 9f14e9ae0a..9f14e9ae0a 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml +++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 49d64767cc..49d64767cc 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml index dec0e9b6c6..dec0e9b6c6 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml index af791466b6..af791466b6 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck.xml b/indra/newview/skins/default/xui/en/floater_spellcheck.xml index 76a350dd29..76a350dd29 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/en/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml index b54090015d..b54090015d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index f9eb16d224..f9eb16d224 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index ecedb27438..ecedb27438 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index 547613fb67..547613fb67 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml index 9bc05107a2..9bc05107a2 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml index 95aaadfcf3..95aaadfcf3 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index 45e2e34da7..45e2e34da7 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml index 209285da2e..209285da2e 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml index 94f7e0b798..94f7e0b798 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_layout.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml index a04050e7eb..a04050e7eb 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml index 2894ad2a32..2894ad2a32 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml index 32ccc31dfd..32ccc31dfd 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml +++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml index f4a50ecc96..f4a50ecc96 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml index db14ecae83..db14ecae83 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml +++ b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml index 20bd555a03..20bd555a03 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_slider.xml +++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml index acd49aa492..acd49aa492 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml +++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml index e1fefc3631..e1fefc3631 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml index d11373ce1d..d11373ce1d 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index 1d31fbd6dc..1d31fbd6dc 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml index 067c1fed82..067c1fed82 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 10854f5a49..10854f5a49 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index 6021ba0a5a..6021ba0a5a 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml index 1ea256b8b3..1ea256b8b3 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 5204efbf65..8b9733df17 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2491,534 +2491,10 @@ even though the user gets a free copy. width="132" /> </panel> <panel - border="false" - follows="all" - height="367" label="Texture" - layout="topleft" - left_delta="0" - mouse_opaque="false" help_topic="toolbox_texture_tab" name="Texture" - top_delta="0" - width="295"> - <panel.string - name="string repeats per meter"> - Repeats Per Meter - </panel.string> - <panel.string - name="string repeats per face"> - Repeats Per Face - </panel.string> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - fallback_image="locked_image.j2c" - follows="left|top" - height="80" - label="Texture" - layout="topleft" - left="10" - name="texture control" - tool_tip="Click to choose a picture" - top="8" - width="64" /> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color" - layout="topleft" - left_pad="15" - name="colorswatch" - tool_tip="Click to open color picker" - top_delta="0" - width="64" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_pad="15" - name="color trans" - text_readonly_color="LabelDisabledColor" - top="6" - width="110"> - Transparency % - </text> - <spinner - decimal_digits="0" - follows="left|top" - height="19" - increment="2" - initial_value="0" - layout="topleft" - left_delta="0" - max_val="100" - name="ColorTrans" - top_pad="4" - width="80" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - name="glow label" - text_readonly_color="LabelDisabledColor" - top_pad="8" - width="80"> - Glow - </text> - <spinner - decimal_digits="2" - follows="left|top" - height="19" - initial_value="0" - layout="topleft" - left_delta="0" - name="glow" - top_pad="4" - width="80" /> - <check_box - height="19" - label="Full Bright" - layout="topleft" - left_delta="-5" - name="checkbox fullbright" - top_pad="4" - width="81" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="tex gen" - text_readonly_color="LabelDisabledColor" - top_pad="5" - width="90"> - Mapping - </text> - <combo_box - height="23" - layout="topleft" - left_delta="0" - name="combobox texgen" - top_pad="4" - width="90"> - <combo_box.item - label="Default" - name="Default" - value="Default" /> - <combo_box.item - label="Planar" - name="Planar" - value="Planar" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - name="label shininess" - left_pad="4" - text_readonly_color="LabelDisabledColor" - top_pad="-37" - width="90"> - Shininess - </text> - <combo_box - height="23" - layout="topleft" - left_delta="0" - name="combobox shininess" - top_pad="4" - width="90"> - <combo_box.item - label="None" - name="None" - value="None" /> - <combo_box.item - label="Low" - name="Low" - value="Low" /> - <combo_box.item - label="Medium" - name="Medium" - value="Medium" /> - <combo_box.item - label="High" - name="High" - value="High" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_pad="4" - name="label bumpiness" - text_readonly_color="LabelDisabledColor" - top_pad="-37" - width="90"> - Bumpiness - </text> - <combo_box - height="23" - layout="topleft" - left_delta="0" - name="combobox bumpiness" - top_pad="4" - width="90"> - <combo_box.item - label="None" - name="None" - value="None" /> - <combo_box.item - label="Brightness" - name="Brightness" - value="Brightness" /> - <combo_box.item - label="Darkness" - name="Darkness" - value="Darkness" /> - <combo_box.item - label="woodgrain" - name="woodgrain" - value="woodgrain" /> - <combo_box.item - label="bark" - name="bark" - value="bark" /> - <combo_box.item - label="bricks" - name="bricks" - value="bricks" /> - <combo_box.item - label="checker" - name="checker" - value="checker" /> - <combo_box.item - label="concrete" - name="concrete" - value="concrete" /> - <combo_box.item - label="crustytile" - name="crustytile" - value="crustytile" /> - <combo_box.item - label="cutstone" - name="cutstone" - value="cutstone" /> - <combo_box.item - label="discs" - name="discs" - value="discs" /> - <combo_box.item - label="gravel" - name="gravel" - value="gravel" /> - <combo_box.item - label="petridish" - name="petridish" - value="petridish" /> - <combo_box.item - label="siding" - name="siding" - value="siding" /> - <combo_box.item - label="stonetile" - name="stonetile" - value="stonetile" /> - <combo_box.item - label="stucco" - name="stucco" - value="stucco" /> - <combo_box.item - label="suction" - name="suction" - value="suction" /> - <combo_box.item - label="weave" - name="weave" - value="weave" /> - </combo_box> - <!-- - <line_editor - bevel_style="in" - border_style="line" - border_thickness="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - max_length_bytes="63" - name="Home Url" - select_on_focus="true" - top="134" - width="250" /> - <check_box - height="16" - label="Media Face" - layout="topleft" - left_delta="0" - name="has media" - top_pad="6" - width="70" /> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - label="Set Media Info" - label_selected="Set Media Info" - layout="topleft" - left_pad="60" - name="media info set" - top_delta="-4" - width="120" /> ---> - <check_box - follows="top|left" - height="16" - initial_value="false" - label="Align planar faces" - layout="topleft" - left="17" - name="checkbox planar align" - tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." - top_delta="26" - width="140" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="rpt" - text_readonly_color="LabelDisabledColor" - top_pad="2" - width="140"> - Repeats / Face - </text> - <spinner - follows="left|top" - height="19" - initial_value="0" - label="Horizontal (U)" - label_width="125" - layout="topleft" - left="20" - max_val="100" - name="TexScaleU" - top_pad="5" - width="185" /> - <check_box - height="19" - label="Flip" - layout="topleft" - left_pad="5" - name="checkbox flip s" - top_delta="0" - width="70" /> - <spinner - follows="left|top" - height="19" - initial_value="0" - label="Vertical (V)" - label_width="125" - layout="topleft" - left="20" - max_val="100" - name="TexScaleV" - width="185" /> - <check_box - height="19" - label="Flip" - layout="topleft" - left_pad="5" - name="checkbox flip t" - top_delta="0" - width="70" /> - <spinner - decimal_digits="2" - follows="left|top" - height="19" - increment="1" - initial_value="0" - label="Rotation˚" - layout="topleft" - label_width="135" - left="10" - max_val="9999" - min_val="-9999" - name="TexRot" - width="195" /> - - <spinner - decimal_digits="1" - follows="left|top" - height="23" - initial_value="1" - label="Repeats / Meter" - layout="topleft" - label_width="135" - left="10" - max_val="10" - min_val="0.1" - name="rptctrl" - width="195" /> - <button - follows="left|top" - height="23" - label="Apply" - label_selected="Apply" - layout="topleft" - left_pad="5" - name="button apply" - width="75" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="tex offset" - text_readonly_color="LabelDisabledColor" - width="200"> - Texture Offset - </text> - <spinner - follows="left|top" - height="19" - initial_value="0" - label="Horizontal (U)" - label_width="125" - layout="topleft" - left="20" - min_val="-1" - name="TexOffsetU" - width="185" /> - <spinner - follows="left|top" - height="19" - initial_value="0" - label="Vertical (V)" - label_width="125" - layout="topleft" - left_delta="0" - min_val="-1" - name="TexOffsetV" - top_pad="1" - width="185" /> - <panel - border="false" - follows="left|top" - layout="topleft" - mouse_opaque="false" - background_visible="true" - bg_alpha_color="DkGray" - name="Add_Media" - left="0" - height="47" - width="290"> - <text - type="string" - length="1" - follows="left|top" - height="18" - layout="topleft" - left="10" - top_pad="3" - name="media_tex" - width="190"> - Media - </text> - <button - follows="top|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" - layout="topleft" - left_pad="0" - name="add_media" - tab_stop="false" - top_delta="0" - tool_tip="Add Media" - width="18"> - <button.commit_callback - function="BuildTool.AddMedia"/> - </button> - <button - follows="top|left" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - left_pad="5" - name="delete_media" - tool_tip="Delete this media texture" - top_delta="0" - width="18"> - <button.commit_callback - function="BuildTool.DeleteMedia"/> - </button> - <button - follows="top|left" - tool_tip="Edit this Media" - height="12" - image_disabled="Icon_Gear_Background" - image_selected="Icon_Gear_Press" - image_unselected="Icon_Gear_Foreground" - layout="topleft" - left_pad="10" - name="edit_media" - top_delta="3" - width="12"> - <button.commit_callback - function="BuildTool.EditMedia"/> - </button> - <text - follows="left|top|right" - height="9" - layout="topleft" - left="10" - use_ellipses="true" - read_only="true" - name="media_info" - width="280" /> - <web_browser - visible="false" - enabled="false" - border_visible="true" - bottom_delta="0" - follows="top|left" - left="0" - name="title_media" - width="4" - height="4" - start_url="about:blank" - decouple_texture_size="true" /> - <button - follows="right|top" - height="22" - label="Align" - label_selected="Align Media" - layout="topleft" - right="-16" - name="button align" - top_delta="-4" - tool_tip="Align media texture (must load first)" - width="80" /> - </panel> + filename="panel_tools_texture.xml"> </panel> <panel border="false" diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 0b71177345..0b71177345 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml index af1617eb39..af1617eb39 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_tos.xml +++ b/indra/newview/skins/default/xui/en/floater_tos.xml diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml index d8211c24a7..d8211c24a7 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_toybox.xml +++ b/indra/newview/skins/default/xui/en/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml index a212ce7889..a212ce7889 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index 06d4327293..eb01294831 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -5,7 +5,7 @@ height="640" layout="topleft" min_height="230" - min_width="650" + min_width="750" name="gui_preview_tool" help_topic="gui_preview_tool" single_instance="true" diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml index 29fb29fabf..29fb29fabf 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml new file mode 100755 index 0000000000..5c71fd3bc6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + +<floater + legacy_header_height="25" + bevel_style="in" + bg_opaque_image="Inspector_Background" + can_close="false" + can_minimize="false" + height="90" + layout="topleft" + name="floater_voice_volume" + single_instance="true" + sound_flags="0" + title="VOICE CHAT VOLUME" + visible="true" + width="245"> + <slider + control_name="AudioLevelVoice" + disabled_control="MuteAudio" + follows="left|top" + height="16" + increment="0.025" + initial_value="0.5" + label="Voice Chat" + label_width="50" + layout="topleft" + left="15" + top="50" + name="chat_voice_volume" + show_text="false" + slider_label.halign="right" + volume="true" + width="200"> + </slider> + <button + control_name="MuteVoice" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml deleted file mode 100644 index dce2720cf8..0000000000 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ /dev/null @@ -1,155 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - positioning="cascading" - can_resize="true" - can_minimize="true" - can_close="true" - chrome="true" - height="205" - layout="topleft" - min_height="124" - min_width="190" - name="floater_voice_controls" - help_topic="floater_voice_controls" - title="VOICE CONTROLS" - save_dock_state="true" - save_visibility="true" - save_rect="true" - single_instance="true" - width="282"> - <string - name="title_nearby"> - VOICE SETTINGS - </string> - <string - name="title_group"> - GROUP CALL WITH [GROUP] - </string> - <string - name="title_adhoc"> - CONFERENCE CALL - </string> - <string - name="title_peer_2_peer"> - CALL WITH [NAME] - </string> - <string - name="no_one_near"> - No one near has voice enabled - </string> - <layout_stack - clip="false" - follows="all" - height="189" - layout="topleft" - left="10" - mouse_opaque="false" - name="my_call_stack" - orientation="vertical" - width="263"> - <layout_panel - follows="top|left|right" - auto_resize="false" - layout="topleft" - min_height="20" - height="20" - name="my_panel"> - <avatar_icon - enabled="false" - follows="left|top" - height="18" - default_icon_name="Generic_Person" - layout="topleft" - left="5" - name="user_icon" - top="0" - width="18" /> - <text - follows="top|left|right" - font="SansSerifSmallBold" - height="16" - layout="topleft" - left_pad="10" - name="user_text" - text_color="White" - top="4" - use_ellipses="true" - value="My Avatar:" - width="210" /> - <output_monitor - auto_update="true" - draw_border="false" - follows="top|right" - height="16" - layout="topleft" - right="-3" - name="speaking_indicator" - left_pad="5" - visible="true" - width="20" /> - </layout_panel> - <layout_panel name="leave_call_panel" height="26" min_height="26" auto_resize="false"> - <layout_stack - clip="true" - follows="left|top|right" - height="26" - layout="topleft" - mouse_opaque="false" - name="voice_effect_and_leave_call_stack" - orientation="horizontal" - width="262"> - <layout_panel - height="26" - width="200"> - <panel - class="panel_voice_effect" - name="panel_voice_effect" - visiblity_control="VoiceMorphingEnabled" - filename="panel_voice_effect.xml" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|right" - height="23" - visible="true" - layout="topleft" - name="leave_call_btn_panel" - width="100"> - <button - follows="right|top" - height="23" - label="Leave Call" - name="leave_call_btn" - width="100" /> - </layout_panel> - </layout_stack> - </layout_panel> - <layout_panel - follows="all" - layout="topleft" - left="2" - top_pad="0" - height="132" - name="callers_panel" - auto_resize="true" - width="280"> - <avatar_list - follows="all" - height="132" - ignore_online_status="true" - layout="topleft" - multi_select="true" - name="speakers_list" - width="280" /> - <panel - filename="panel_avatar_list_item.xml" - follows="left|right|top" - height="24" - layout="topleft" - left="0" - name="non_avatar_caller" - top="10" - width="276" /> - </layout_panel> - </layout_stack> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml index 35cb2670d0..146c3d7e30 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -5,12 +5,13 @@ height="500" name="voice_effects" help_topic="voice_effects" - title="VOICE MORPHING" + title="VOICE MORPHING PREVIEW" background_visible="true" label="Places" layout="topleft" min_height="360" min_width="200" + save_rect="true" width="300"> <string name="no_voice_effect"> (No Voice Morph) diff --git a/indra/newview/skins/default/xui/en/floater_voice_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_volume.xml new file mode 100755 index 0000000000..9346295d5b --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_voice_volume.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater + legacy_header_height="25" + bevel_style="in" + bg_opaque_image="Inspector_Background" + can_close="false" + can_minimize="false" + height="90" + layout="topleft" + name="floater_voice_volume" + single_instance="true" + sound_flags="0" + title="VOICE VOLUME" + visible="true" + width="245"> + <text + follows="top|left|right" + font="SansSerifSmall" + height="21" + left="10" + name="avatar_name" + parse_urls="false" + top="35" + text_color="White" + translate="false" + use_ellipses="true" + value="TestString PleaseIgnore" + width="225" /> + <slider + follows="top|left" + height="23" + increment="0.01" + left="1" + max_val="0.95" + min_val="0.05" + name="volume_slider" + show_text="false" + tool_tip="Voice volume" + top_pad="0" + value="0.5" + width="200" /> + <button + follows="top|left" + height="16" + image_disabled="Audio_Off" + image_disabled_selected="AudioMute_Off" + image_hover_selected="AudioMute_Over" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + left_pad="0" + top_delta="4" + name="mute_btn" + width="16" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index cea10adca8..cea10adca8 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml index d0225f78a9..d0225f78a9 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_web_profile.xml +++ b/indra/newview/skins/default/xui/en/floater_web_profile.xml diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml index 897d959b98..897d959b98 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml index 115fe413f3..115fe413f3 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_window_size.xml +++ b/indra/newview/skins/default/xui/en/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 83407069d2..83407069d2 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index ebbb53729d..ebbb53729d 100644..100755 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index bc3bcd331b..ef4f19cd4c 100644..100755 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -2,14 +2,14 @@ <!-- Not can_close / no title to avoid window chrome Single instance - only have one at a time, recycle it each spawn ---> +--> <floater legacy_header_height="25" bevel_style="in" bg_opaque_image="Inspector_Background" can_close="false" can_minimize="false" - height="164" + height="160" layout="topleft" name="inspect_avatar" single_instance="true" @@ -98,13 +98,13 @@ follows="top|left" height="23" increment="0.01" - left="1" + left="10" max_val="0.95" min_val="0.05" name="volume_slider" show_text="false" tool_tip="Voice volume" - top_pad="0" + top_pad="5" value="0.5" width="200" /> <button @@ -116,10 +116,21 @@ image_selected="AudioMute_Off" image_unselected="Audio_Off" is_toggle="true" - left_pad="0" + left_pad="5" top_delta="4" name="mute_btn" width="16" /> + <text + follows="top|left" + height="16" + left="8" + name="avatar_profile_link" + font="SansSerifSmall" + text_color="White" + top_pad="5" + translate="false" + value="[[LINK] View full profile]" + width="175" /> <avatar_icon follows="top|left" height="38" @@ -130,83 +141,4 @@ name="avatar_icon" top="10" width="38" /> -<!-- Overlapping buttons for default actions - llinspectavatar.cpp makes visible the most likely default action ---> - <button - follows="top|left" - height="20" - label="Add Friend" - left="8" - top="135" - name="add_friend_btn" - width="90" /> - <button - follows="top|left" - height="20" - label="IM" - left_delta="0" - top_delta="0" - name="im_btn" - width="80" - commit_callback.function="InspectAvatar.IM"/> - <button - follows="top|left" - height="20" - label="Profile" - layout="topleft" - name="view_profile_btn" - left_delta="96" - top_delta="0" - tab_stop="false" - width="80" /> - <!-- gear buttons here --> - <menu_button - follows="top|left" - height="20" - layout="topleft" - image_overlay="OptionsMenu_Off" - menu_filename="menu_inspect_avatar_gear.xml" - name="gear_btn" - right="-5" - top_delta="0" - width="35" /> - <menu_button - follows="top|left" - height="20" - image_overlay="OptionsMenu_Off" - menu_filename="menu_inspect_self_gear.xml" - name="gear_self_btn" - right="-5" - top_delta="0" - width="35" /> - <panel - follows="top|left" - top="164" - left="0" - height="60" - width="228" - visible="false" - background_visible="true" - name="moderator_panel" - background_opaque="true" - bg_opaque_color="MouseGray"> - <button - name="disable_voice" - label="Disable Voice" - top="20" - width="95" - height="20" - left="10" - commit_callback.function="InspectAvatar.DisableVoice"/> - <button - name="enable_voice" - label="Enable Voice" - top="20" - width="95" - height="20" - left="10" - visible="false" - commit_callback.function="InspectAvatar.EnableVoice"/> - </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml index 324ff3eabd..324ff3eabd 100644..100755 --- a/indra/newview/skins/default/xui/en/inspect_group.xml +++ b/indra/newview/skins/default/xui/en/inspect_group.xml diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index bfeb8fc470..bfeb8fc470 100644..100755 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml index e83257d2a0..e83257d2a0 100644..100755 --- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml index 0221397a8c..0221397a8c 100644..100755 --- a/indra/newview/skins/default/xui/en/inspect_toast.xml +++ b/indra/newview/skins/default/xui/en/inspect_toast.xml diff --git a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml index a7ecc39ed8..a7ecc39ed8 100644..100755 --- a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml +++ b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml index 51779e4bfd..51779e4bfd 100644..100755 --- a/indra/newview/skins/default/xui/en/language_settings.xml +++ b/indra/newview/skins/default/xui/en/language_settings.xml diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index a87027a113..a87027a113 100644..100755 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml index 5033ea9546..5033ea9546 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml index b46b62ec4d..46ba4bd29d 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml @@ -79,6 +79,14 @@ <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> <menu_item_call label="Zoom In" name="Zoom In"> diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index b8128da358..28e032ce5f 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -123,6 +123,14 @@ name="Edit Outfit"> <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml index 50910dff32..50910dff32 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index 276b5f106f..e7c2b80da2 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -79,6 +79,14 @@ <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> <menu_item_call label="Zoom In" name="Zoom In"> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml index d9bdfece38..c1ff026a74 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -261,4 +261,12 @@ <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml index c402100fb1..c402100fb1 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml index f0e8461360..f0e8461360 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml index 206d49e8c7..206d49e8c7 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml index a6e9a40e31..45cf780557 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_gear.xml @@ -9,5 +9,5 @@ <menu label="New Body Parts" layout="topleft" - name="COF.Geear.New_Body_Parts" /> + name="COF.Gear.New_Body_Parts" /> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml new file mode 100755 index 0000000000..5a13ef0a59 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + bottom="806" + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_conversation_participant" + visible="false"> + <menu_item_call + label="Close conversation" + layout="topleft" + name="close_conversation"> + <on_click function="Avatar.DoToSelected" parameter="close_conversation"/> + </menu_item_call> + <menu_item_call + label="Open voice conversation" + layout="topleft" + name="open_voice_conversation"> + <on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/> + </menu_item_call> + <menu_item_call + label="Disconnect from voice" + layout="topleft" + name="disconnect_from_voice"> + <on_click function="Avatar.DoToSelected" parameter="disconnect_from_voice"/> + </menu_item_call> + <menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/> + <menu_item_call + label="View Profile" + layout="topleft" + name="view_profile"> + <on_click function="Avatar.DoToSelected" parameter="view_profile"/> + <on_enable function="Avatar.EnableItem" parameter="can_view_profile"/> + </menu_item_call> + <menu_item_call + label="IM" + layout="topleft" + name="im"> + <on_click function="Avatar.DoToSelected" parameter="im"/> + <on_enable function="Avatar.EnableItem" parameter="can_im"/> + </menu_item_call> + <menu_item_call + label="Offer teleport" + layout="topleft" + name="offer_teleport"> + <on_click function="Avatar.DoToSelected" parameter="offer_teleport"/> + <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/> + </menu_item_call> + <menu_item_call + label="Voice call" + layout="topleft" + name="voice_call"> + <on_click function="Avatar.DoToSelected" parameter="voice_call"/> + <on_enable function="Avatar.EnableItem" parameter="can_call" /> + </menu_item_call> + <menu_item_call + label="Chat history..." + layout="topleft" + name="chat_history"> + <on_click function="Avatar.DoToSelected" parameter="chat_history"/> + <on_enable function="Avatar.EnableItem" parameter="can_chat_history"/> + </menu_item_call> + <menu_item_separator layout="topleft" name="separator_chat_history"/> + <menu_item_call + label="Add friend" + layout="topleft" + name="add_friend"> + <on_click function="Avatar.DoToSelected" parameter="add_friend"/> + <on_enable function="Avatar.EnableItem" parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="Remove friend" + layout="topleft" + name="remove_friend"> + <on_click function="Avatar.DoToSelected" parameter="remove_friend" /> + <on_enable function="Avatar.EnableItem" parameter="can_delete" /> + </menu_item_call> + <menu_item_call + label="Remove friends" + layout="topleft" + name="remove_friends"> + <on_click function="Avatar.DoToSelected" parameter="remove_friend" /> + <on_enable function="Avatar.EnableItem" parameter="can_delete" /> + </menu_item_call> + <menu_item_call + label="Invite to group..." + layout="topleft" + name="invite_to_group"> + <on_click function="Avatar.DoToSelected" parameter="invite_to_group" /> + <on_enable function="Avatar.EnableItem" parameter="can_invite" /> + </menu_item_call> + <menu_item_separator layout="topleft" name="separator_invite_to_group"/> + <menu_item_call + label="Zoom In" + layout="topleft" + name="zoom_in"> + <on_click function="Avatar.DoToSelected" parameter="zoom_in" /> + <on_enable function="Avatar.EnableItem" parameter="can_zoom_in" /> + </menu_item_call> + <menu_item_call + label="Map" + layout="topleft" + name="map"> + <on_click function="Avatar.DoToSelected" parameter="map" /> + <on_enable function="Avatar.EnableItem" parameter="can_show_on_map" /> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="share"> + <on_click function="Avatar.DoToSelected" parameter="share" /> + <on_enable function="Avatar.EnableItem" parameter="can_share" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="pay"> + <on_click function="Avatar.DoToSelected" parameter="pay" /> + <on_enable function="Avatar.EnableItem" parameter="can_pay" /> + </menu_item_call> + <menu_item_check + label="Block Voice" + layout="topleft" + name="block_unblock"> + <on_click function="Avatar.DoToSelected" parameter="block_unblock" /> + <on_check function="Avatar.CheckItem" parameter="is_blocked" /> + <on_enable function="Avatar.EnableItem" parameter="can_block" /> + </menu_item_check> + <menu_item_check + label="Block Text" + layout="topleft" + name="MuteText"> + <on_click function="Avatar.DoToSelected" parameter="mute_unmute" /> + <on_check function="Avatar.CheckItem" parameter="is_muted" /> + <on_enable function="Avatar.EnableItem" parameter="can_block" /> + </menu_item_check> + <menu_item_call + label="Group Profile" + layout="topleft" + name="group_profile"> + <on_click function="Group.DoToSelected" parameter="group_profile"/> + <on_enable function="Avatar.EnableItem" parameter="can_group_profile" /> + </menu_item_call> + <menu_item_call + label="Activate Group" + layout="topleft" + name="activate_group"> + <on_click function="Group.DoToSelected" parameter="activate_group"/> + <on_enable function="Avatar.EnableItem" parameter="can_activate_group" /> + </menu_item_call> + <menu_item_call + label="Leave Group" + layout="topleft" + name="leave_group"> + <on_click function="Group.DoToSelected" parameter="leave_group"/> + <on_enable function="Avatar.EnableItem" parameter="can_leave_group" /> + </menu_item_call> + <menu_item_separator layout="topleft" name="Moderator Options Separator"/> + <context_menu + label="Moderator Options" + layout="topleft" + name="Moderator Options"> + <menu_item_check + label="Allow text chat" + layout="topleft" + name="AllowTextChat"> + <on_check function="Avatar.CheckItem" parameter="is_allowed_text_chat" /> + <on_click function="Avatar.DoToSelected" parameter="toggle_allow_text_chat" /> + <on_enable function="Avatar.EnableItem" parameter="can_allow_text_chat" /> + </menu_item_check> + <menu_item_separator layout="topleft" name="moderate_voice_separator" /> + <menu_item_call + label="Mute this participant" + layout="topleft" + name="ModerateVoiceMuteSelected"> + <on_click function="Avatar.DoToSelected" parameter="selected" /> + <on_enable function="Avatar.EnableItem" parameter="can_mute" /> + <on_visible function="Avatar.VisibleItem" parameter="show_mute" /> + </menu_item_call> + <menu_item_call + label="Unmute this participant" + layout="topleft" + name="ModerateVoiceUnMuteSelected"> + <on_click function="Avatar.DoToSelected" parameter="selected" /> + <on_enable function="Avatar.EnableItem" parameter="can_unmute" /> + <on_visible function="Avatar.VisibleItem" parameter="show_unmute" /> + </menu_item_call> + <menu_item_call + label="Mute everyone" + layout="topleft" + name="ModerateVoiceMute"> + <on_click function="Avatar.DoToSelected" parameter="mute_all" /> + <on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" /> + </menu_item_call> + <menu_item_call + label="Unmute everyone" + layout="topleft" + name="ModerateVoiceUnmute"> + <on_click function="Avatar.DoToSelected" parameter="unmute_all" /> + <on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" /> + </menu_item_call> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml new file mode 100755 index 0000000000..8796b87955 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Conversation Context Menu"> + <menu_item_call + label="IM..." + layout="topleft" + name="IM"> + <on_click + function="Calllog.Action" + parameter="im" /> + <on_enable + function="Calllog.Enable" + parameter="can_im" /> + </menu_item_call> + <menu_item_call + label="Voice call..." + layout="topleft" + name="Call"> + <on_click + function="Calllog.Action" + parameter="call" /> + <on_enable + function="Calllog.Enable" + parameter="can_call" /> + </menu_item_call> + <menu_item_call + label="Open chat history..." + layout="topleft" + name="Chat history"> + <on_click + function="Calllog.Action" + parameter="chat_history" /> + <on_enable + function="Calllog.Enable" + parameter="can_view_chat_history" /> + </menu_item_call> + <menu_item_call + label="View Profile" + layout="topleft" + name="View Profile"> + <on_click + function="Calllog.Action" + parameter="view_profile" /> + <on_enable + function="Calllog.Enable" + parameter="can_view_profile" /> + </menu_item_call> + <menu_item_call + label="Offer Teleport" + name="teleport"> + <on_click + function="Calllog.Action" + parameter="offer_teleport"/> + <on_enable + function="Calllog.Enable" + parameter="can_offer_teleport"/> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Add Friend" + layout="topleft" + name="add_friend"> + <on_click + function="Calllog.Action" + parameter="add_friend"/> + <on_visible + function="Calllog.Check" + parameter="is_not_friend" /> + </menu_item_call> + <menu_item_call + label="Remove Friend" + layout="topleft" + name="remove_friend"> + <on_click + function="Calllog.Action" + parameter="remove_friend"/> + <on_visible + function="Calllog.Check" + parameter="is_friend" /> + </menu_item_call> + <menu_item_call + label="Invite to group..." + layout="topleft" + name="Invite"> + <on_click + function="Calllog.Action" + parameter="invite_to_group"/> + <on_enable + function="Calllog.Enable" + parameter="can_invite_to_group" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Map" + layout="topleft" + name="Map"> + <on_click + function="Calllog.Action" + parameter="show_on_map" /> + <on_enable + function="Calllog.Enable" + parameter="can_show_on_map" /> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="Share"> + <on_click + function="Calllog.Action" + parameter="share" /> + <on_enable + function="Calllog.Enable" + parameter="can_share" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="Pay"> + <on_click + function="Calllog.Action" + parameter="pay" /> + <on_enable + function="Calllog.Enable" + parameter="can_pay" /> + </menu_item_call> + <menu_item_check + label="Block/Unblock" + layout="topleft" + name="Block/Unblock"> + <menu_item_check.on_click + function="Calllog.Action" + parameter="block"/> + <menu_item_check.on_check + function="Calllog.Check" + parameter="is_blocked" /> + <menu_item_check.on_enable + function="Calllog.Enable" + parameter="can_block" /> + </menu_item_check> + +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml new file mode 100755 index 0000000000..ce65b23971 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + name="menu_conversation_view" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_check + label="Sort by name" + name="sort_by_name"> + <on_click + function="CallLog.Action" + parameter="sort_by_name"/> + <on_check + function="CallLog.Check" + parameter="sort_by_name"/> + </menu_item_check> + <menu_item_check + label="Sort by date" + name="sort_by_date"> + <on_click + function="CallLog.Action" + parameter="sort_by_date" /> + <on_check + function="CallLog.Check" + parameter="sort_by_date" /> + </menu_item_check> + <menu_item_separator /> + <menu_item_check + label="Sort friends on top" + name="sort_by_friends"> + <on_click + function="CallLog.Action" + parameter="sort_friends_on_top" /> + <on_check + function="CallLog.Check" + parameter="sort_friends_on_top" /> + </menu_item_check> + <menu_item_separator /> + <menu_item_call + label="View Nearby chat history..." + name="view_nearby_chat_history"> + <on_click + function="CallLog.Action" + parameter="view_nearby_chat_history" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml index 99061e089a..99061e089a 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_edit.xml +++ b/indra/newview/skins/default/xui/en/menu_edit.xml diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml index be380e11e5..be380e11e5 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_favorites.xml +++ b/indra/newview/skins/default/xui/en/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml index b08d21e8f4..b08d21e8f4 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml index fce7414d80..eca9e7f3c9 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<menu name="menu_group_plus" +<toggleable_menu name="menu_group_plus" left="0" bottom="0" visible="false" mouse_opaque="false"> <menu_item_call name="item_join" label="Join Group..."> @@ -8,4 +8,4 @@ <menu_item_call name="item_new" label="New Group..."> <menu_item_call.on_click function="People.Group.Plus.Action" userdata="new_group" /> </menu_item_call> -</menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml index b517fd7957..b517fd7957 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml new file mode 100755 index 0000000000..43287c6ec3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Conversation Gear Menu"> + <menu_item_call + label="View Profile" + layout="topleft" + name="View Profile"> + <on_click function="Avatar.GearDoToSelected" parameter="view_profile" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_view_profile" /> + </menu_item_call> + <menu_item_call + label="Add Friend" + layout="topleft" + name="Add Friend"> + <on_click function="Avatar.GearDoToSelected" parameter="add_friend" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="Remove friend" + layout="topleft" + name="remove_friend"> + <on_click function="Avatar.GearDoToSelected" parameter="remove_friend" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_delete" /> + </menu_item_call> + <menu_item_call + label="Offer teleport" + layout="topleft" + name="offer_teleport"> + <on_click function="Avatar.GearDoToSelected" parameter="offer_teleport"/> + <on_enable function="Avatar.EnableGearItem" parameter="can_offer_teleport"/> + </menu_item_call> + <menu_item_call + label="Invite to group..." + layout="topleft" + name="invite_to_group"> + <on_click function="Avatar.GearDoToSelected" parameter="invite_to_group" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_invite" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="View Icons Separator" /> + <menu_item_call + label="Chat history..." + layout="topleft" + name="chat_history"> + <on_click function="Avatar.GearDoToSelected" parameter="chat_history"/> + <on_enable function="Avatar.EnableGearItem" parameter="can_chat_history"/> + </menu_item_call> + <menu_item_separator + layout="topleft"/> + <menu_item_call + label="Zoom In" + layout="topleft" + name="zoom_in"> + <on_click function="Avatar.DoToSelected" parameter="zoom_in" /> + <on_enable function="Avatar.EnableItem" parameter="can_zoom_in" /> + </menu_item_call> + <menu_item_call + label="Map" + layout="topleft" + name="map"> + <on_click function="Avatar.GearDoToSelected" parameter="map" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_show_on_map" /> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="Share"> + <on_click function="Avatar.GearDoToSelected" parameter="share" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_share" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="Pay"> + <on_click function="Avatar.GearDoToSelected" parameter="pay" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_pay" /> + </menu_item_call> + <menu_item_separator + layout="topleft"/> + <menu_item_check + label="Block Voice" + layout="topleft" + name="Block/Unblock"> + <on_check function="Avatar.CheckGearItem" parameter="is_blocked" /> + <on_click function="Avatar.GearDoToSelected" parameter="block_unblock" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_block" /> + </menu_item_check> + <menu_item_check + label="Block Text" + layout="topleft" + name="MuteText"> + <on_check function="Avatar.CheckGearItem" parameter="is_muted" /> + <on_click function="Avatar.GearDoToSelected" parameter="mute_unmute" /> + <on_enable function="Avatar.EnableGearItem" parameter="can_block" /> + </menu_item_check> + <menu_item_separator + layout="topleft"/> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml new file mode 100755 index 0000000000..b0adca0e0e --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + name="menu_modes" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_check + label="Compact view" + name="compact_view"> + <menu_item_check.on_click + function="IMSession.Menu.Action" + parameter="compact_view"/> + <menu_item_check.on_check + function="IMSession.Menu.CompactExpandedModes.CheckItem" + parameter="compact_view"/> + </menu_item_check> + <menu_item_check + label="Expanded view" + name="expanded_view"> + <menu_item_check.on_click + function="IMSession.Menu.Action" + parameter="expanded_view"/> + <menu_item_check.on_check + function="IMSession.Menu.CompactExpandedModes.CheckItem" + parameter="expanded_view"/> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_check name="IMShowTime" label="Show time"> + <menu_item_check.on_click + function="IMSession.Menu.Action" + parameter="IMShowTime" /> + <menu_item_check.on_check + function="IMSession.Menu.ShowModes.CheckItem" + parameter="IMShowTime" /> + <menu_item_check.on_enable + function="IMSession.Menu.ShowModes.Enable" + parameter="IMShowTime" /> + </menu_item_check> + <menu_item_check name="IMShowNamesForP2PConv" label="Show names in one-to-one conversations"> + <menu_item_check.on_click + function="IMSession.Menu.Action" + parameter="IMShowNamesForP2PConv" /> + <menu_item_check.on_check + function="IMSession.Menu.ShowModes.CheckItem" + parameter="IMShowNamesForP2PConv" /> + <menu_item_check.on_enable + function="IMSession.Menu.ShowModes.Enable" + parameter="IMShowNamesForP2PConv" /> + </menu_item_check> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_im_well_button.xml b/indra/newview/skins/default/xui/en/menu_im_well_button.xml deleted file mode 100644 index f8dfba91ff..0000000000 --- a/indra/newview/skins/default/xui/en/menu_im_well_button.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<context_menu - layout="topleft" - name="IM Well Button Context Menu"> - <menu_item_call - label="Close All" - layout="topleft" - name="Close All"> - <menu_item_call.on_click - function="IMWellChicletMenu.Action" - parameter="close all" /> - <menu_item_call.on_enable - function="IMWellChicletMenu.EnableItem" - parameter="can close all" /> - </menu_item_call> -</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml index eb5e31b57d..eb5e31b57d 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml index 8cbe62cfb0..8cbe62cfb0 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml index 038b8328cb..038b8328cb 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml deleted file mode 100644 index 76b188220d..0000000000 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ /dev/null @@ -1,143 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<toggleable_menu - create_jump_keys="true" - layout="topleft" - mouse_opaque="false" - visible="false" - name="Gear Menu"> - <menu_item_call - label="View Profile" - enabled="true" - name="view_profile"> - <menu_item_call.on_click - function="InspectAvatar.ViewProfile"/> - </menu_item_call> - <menu_item_call - label="Add Friend" - name="add_friend"> - <menu_item_call.on_click - function="InspectAvatar.AddFriend"/> - <menu_item_call.on_enable - function="InspectAvatar.Gear.Enable"/> - </menu_item_call> - <menu_item_call - label="IM" - name="im"> - <menu_item_call.on_click - function="InspectAvatar.IM"/> - </menu_item_call> - <menu_item_call - label="Call" - enabled="true" - name="call"> - <menu_item_call.on_click - function="InspectAvatar.Call"/> - <menu_item_call.on_enable - function="InspectAvatar.Gear.EnableCall"/> - </menu_item_call> - <menu_item_call - label="Teleport" - name="teleport"> - <menu_item_call.on_click - function="InspectAvatar.Teleport"/> - <menu_item_call.on_enable - function="InspectAvatar.Gear.EnableTeleportOffer"/> - </menu_item_call> - <menu_item_call - label="Invite to Group" - name="invite_to_group"> - <menu_item_call.on_click - function="InspectAvatar.InviteToGroup"/> - </menu_item_call> - <menu_item_separator /> - <menu_item_call - label="Block" - name="block"> - <menu_item_call.on_click - function="InspectAvatar.ToggleMute"/> - <menu_item_call.on_visible - function="InspectAvatar.EnableMute" /> - </menu_item_call> - <menu_item_call - label="Unblock" - name="unblock"> - <menu_item_call.on_click - function="InspectAvatar.ToggleMute"/> - <menu_item_call.on_visible - function="InspectAvatar.EnableUnmute" /> - </menu_item_call> - <menu_item_call - label="Report" - name="report"> - <menu_item_call.on_click - function="InspectAvatar.Report"/> - </menu_item_call> - <menu_item_call - label="Freeze" - name="freeze"> - <menu_item_call.on_click - function="InspectAvatar.Freeze"/> - <menu_item_call.on_visible - function="InspectAvatar.VisibleFreeze"/> - </menu_item_call> - <menu_item_call - label="Eject" - name="eject"> - <menu_item_call.on_click - function="InspectAvatar.Eject"/> - <menu_item_call.on_visible - function="InspectAvatar.VisibleEject"/> - </menu_item_call> - <menu_item_call - label="Kick" - name="kick"> - <menu_item_call.on_click - function="InspectAvatar.Kick"/> - <menu_item_call.on_visible - function="InspectAvatar.EnableGod"/> - </menu_item_call> - <menu_item_call - label="CSR" - name="csr"> - <menu_item_call.on_click - function="InspectAvatar.CSR" /> - <menu_item_call.on_visible - function="InspectAvatar.EnableGod" /> - </menu_item_call> - <menu_item_call - label="Debug Textures" - name="debug"> - <menu_item_call.on_click - function="Avatar.Debug"/> - <menu_item_call.on_visible - function="IsGodCustomerService"/> - </menu_item_call> - <menu_item_call - label="Find On Map" - name="find_on_map"> - <menu_item_call.on_click - function="InspectAvatar.FindOnMap"/> - <menu_item_call.on_visible - function="InspectAvatar.VisibleFindOnMap"/> - </menu_item_call> - <menu_item_call - label="Zoom In" - name="zoom_in"> - <menu_item_call.on_click - function="InspectAvatar.ZoomIn"/> - <menu_item_call.on_visible - function="InspectAvatar.VisibleZoomIn"/> - </menu_item_call> - <menu_item_call - label="Pay" - name="pay"> - <menu_item_call.on_click - function="InspectAvatar.Pay"/> - </menu_item_call> - <menu_item_call - label="Share" - name="share"> - <menu_item_call.on_click - function="InspectAvatar.Share"/> - </menu_item_call> -</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml index 2c420aa1e3..2c420aa1e3 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml deleted file mode 100644 index 5e7b16ed4a..0000000000 --- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml +++ /dev/null @@ -1,252 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toggleable_menu - layout="topleft" - name="Self Pie"> - <menu_item_call - label="Sit Down" - layout="topleft" - name="Sit Down Here"> - <menu_item_call.on_click - function="Self.SitDown" - parameter="" /> - <menu_item_call.on_enable - function="Self.EnableSitDown" /> - </menu_item_call> - <menu_item_call - label="Stand Up" - layout="topleft" - name="Stand Up"> - <menu_item_call.on_click - function="Self.StandUp" - parameter="" /> - <menu_item_call.on_enable - function="Self.EnableStandUp" /> - </menu_item_call> - <context_menu - label="Take Off" - layout="topleft" - name="Take Off >"> - <context_menu - label="Clothes" - layout="topleft" - name="Clothes >"> - <menu_item_call - enabled="false" - label="Shirt" - layout="topleft" - name="Shirt"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="shirt" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="shirt" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Pants" - layout="topleft" - name="Pants"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="pants" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="pants" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Skirt" - layout="topleft" - name="Skirt"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="skirt" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="skirt" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Shoes" - layout="topleft" - name="Shoes"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="shoes" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="shoes" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Socks" - layout="topleft" - name="Socks"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="socks" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="socks" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Jacket" - layout="topleft" - name="Jacket"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="jacket" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="jacket" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Gloves" - layout="topleft" - name="Gloves"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="gloves" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="gloves" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Undershirt" - layout="topleft" - name="Self Undershirt"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="undershirt" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="undershirt" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Underpants" - layout="topleft" - name="Self Underpants"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="underpants" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="underpants" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Tattoo" - layout="topleft" - name="Self Tattoo"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="tattoo" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="tattoo" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Alpha" - layout="topleft" - name="Self Alpha"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="alpha" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="alpha" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="All Clothes" - layout="topleft" - name="All Clothes"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="all" /> - </menu_item_call> - </context_menu> - <context_menu - label="HUD" - layout="topleft" - name="Object Detach HUD" /> - <context_menu - label="Detach" - layout="topleft" - name="Object Detach" /> - <menu_item_call - label="Detach All" - layout="topleft" - name="Detach All"> - <menu_item_call.on_click - function="Self.RemoveAllAttachments" - parameter="" /> - <menu_item_call.on_enable - function="Self.EnableRemoveAllAttachments" /> - </menu_item_call> - </context_menu> - <menu_item_call - label="Change Outfit" - layout="topleft" - name="Chenge Outfit"> - <menu_item_call.on_click - function="CustomizeAvatar" /> - <menu_item_call.on_enable - function="Edit.EnableCustomizeAvatar" /> - </menu_item_call> - <menu_item_call label="Edit My Outfit" - layout="topleft" - name="Edit Outfit"> - <menu_item_call.on_click - function="EditOutfit" /> - <menu_item_call.on_enable - function="Edit.EnableCustomizeAvatar" /> - </menu_item_call> - <menu_item_call label="Edit My Shape" - layout="topleft" - name="Edit My Shape"> - <menu_item_call.on_click - function="EditShape" /> - <menu_item_call.on_enable - function="Edit.EnableEditShape" /> - </menu_item_call> - <menu_item_call - label="My Friends" - layout="topleft" - name="Friends..."> - <menu_item_call.on_click - function="SideTray.PanelPeopleTab" - parameter="friends_panel" /> - </menu_item_call> - <menu_item_call - label="My Groups" - layout="topleft" - name="Groups..."> - <menu_item_call.on_click - function="SideTray.PanelPeopleTab" - parameter="groups_panel" /> - </menu_item_call> - <menu_item_call - label="My Profile" - layout="topleft" - name="Profile..."> - <menu_item_call.on_click - function="ShowAgentProfile" - parameter="agent" /> - </menu_item_call> - <menu_item_call - label="Debug Textures" - name="Debug..."> - <menu_item_call.on_click - function="Avatar.Debug" /> - <menu_item_call.on_visible - function="IsGodCustomerService"/> - </menu_item_call> -</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml index 45a0a6635b..45a0a6635b 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 13dc0b941a..13dc0b941a 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index e91f5af3d5..29720a680b 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -3,7 +3,7 @@ layout="topleft" left="0" mouse_opaque="false" - can_tear_off="true" + can_tear_off="false" name="menu_inventory_add" visible="false"> <menu diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index d2519a5aa4..d2519a5aa4 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml index cc6d8ad9c1..cc6d8ad9c1 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_land.xml +++ b/indra/newview/skins/default/xui/en/menu_land.xml diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml index 93b6db222a..93b6db222a 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 101e104eab..52c4fb1613 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -180,7 +180,8 @@ name="Set Logging Level" tear_off="true"> <menu_item_check - label="Debug"> + name="Debug" + label="Debug"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="0" /> @@ -189,7 +190,8 @@ parameter="0" /> </menu_item_check> <menu_item_check - label="Info"> + name="Info" + label="Info"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="1" /> @@ -198,7 +200,8 @@ parameter="1" /> </menu_item_check> <menu_item_check - label="Warning"> + name="Warning" + label="Warning"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="2" /> @@ -207,7 +210,8 @@ parameter="2" /> </menu_item_check> <menu_item_check - label="Error"> + name="Error" + label="Error"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="3" /> @@ -216,7 +220,8 @@ parameter="3" /> </menu_item_check> <menu_item_check - label="None"> + name="None" + label="None"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="4" /> diff --git a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml index 960da4bd7a..960da4bd7a 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml 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 ea263d05ce..ea263d05ce 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml index 2650903f88..2650903f88 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml index b71b866c4b..b71b866c4b 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml index ff89e20ea5..ff89e20ea5 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml index 263ac40f4e..263ac40f4e 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index f6004621a6..f6004621a6 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml index 0c8a2af002..2d4f1792c2 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml @@ -24,4 +24,22 @@ function="ObjectIcon.Action" parameter="block" /> </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Show on Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="ObjectIcon.Action" + parameter="map" /> + </menu_item_call> + <menu_item_call + label="Teleport to Object Location" + layout="topleft" + name="teleport_to_object"> + <menu_item_call.on_click + function="ObjectIcon.Action" + parameter="teleport" /> + </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml index fc7272b904..3b8ace6308 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml @@ -195,6 +195,20 @@ <menu_item_separator name="sepatator2" /> <menu_item_call + label="Expand all folders" + layout="topleft" + name="expand"> + <on_click + function="Gear.Expand" /> + </menu_item_call> + <menu_item_call + label="Collapse all folders" + layout="topleft" + name="collapse"> + <on_click + function="Gear.Collapse" /> + </menu_item_call> + <menu_item_call label="Rename Outfit" layout="topleft" name="rename"> diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml index 8c8bb29baf..8c8bb29baf 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index 2c32d9d303..2c32d9d303 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml new file mode 100755 index 0000000000..7ea87ee05c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="participant_manu_view"> + <menu_item_check + label="Sort conversations by type" + layout="topleft" + name="sort_sessions_by_type"> + <on_click + function="IMFloaterContainer.Action" + parameter="sort_sessions_by_type" /> + <on_check + function="IMFloaterContainer.Check" + parameter="sort_sessions_by_type" /> + </menu_item_check> + <menu_item_check + label="Sort conversations by name" + layout="topleft" + name="sort_sessions_by_name"> + <on_click + function="IMFloaterContainer.Action" + parameter="sort_sessions_by_name" /> + <on_check + function="IMFloaterContainer.Check" + parameter="sort_sessions_by_name" /> + </menu_item_check> + <menu_item_check + label="Sort conversations by recent activity" + layout="topleft" + name="sort_sessions_by_recent"> + <on_click + function="IMFloaterContainer.Action" + parameter="sort_sessions_by_recent" /> + <on_check + function="IMFloaterContainer.Check" + parameter="sort_sessions_by_recent" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Sort participants by name" + layout="topleft" + name="sort_participants_by_name"> + <on_click + function="IMFloaterContainer.Action" + parameter="sort_participants_by_name" /> + <on_check + function="IMFloaterContainer.Check" + parameter="sort_participants_by_name" /> + </menu_item_check> + <menu_item_check + label="Sort participants by recent activity" + layout="topleft" + name="sort_participants_by_recent"> + <on_click + function="IMFloaterContainer.Action" + parameter="sort_participants_by_recent" /> + <on_check + function="IMFloaterContainer.Check" + parameter="sort_participants_by_recent" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Chat preferences..." + name="chat_preferences"> + <on_click + function="IMFloaterContainer.Action" + parameter="chat_preferences" /> + </menu_item_call> + <menu_item_call + label="Privacy preferences..." + name="privacy_preferences"> + <on_click + function="IMFloaterContainer.Action" + parameter="privacy_preferences" /> + </menu_item_call> + <menu_item_check + label="Conversation log..." + name="Conversation" + visible="true"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="conversation" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="conversation" /> + <menu_item_check.on_enable + function="Avatar.EnableItem" + parameter="conversation_log" /> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_check name="Translate_chat" label="Translate Nearby chat"> + <menu_item_check.on_click + function="IMFloaterContainer.Action" + parameter="Translating.Toggle" /> + <menu_item_check.on_check + function="IMFloaterContainer.Check" + parameter="Translating.On" /> + <menu_item_check.on_enable + function="IMFloaterContainer.Check" + parameter="Translating.Enabled" /> + </menu_item_check> + <menu_item_check name="Translation_settings" label="Translation settings..."> + <menu_item_check.on_check + function="Floater.Visible" + parameter="prefs_translation" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="prefs_translation" /> + </menu_item_check> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml new file mode 100755 index 0000000000..63295ea27b --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + name="menu_blocked_gear" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_call + label="Unblock" + name="unblock"> + <on_click + function="Block.Action" + parameter="unblock_item" /> + <on_enable + function="Block.Enable" + parameter="unblock_item" /> + </menu_item_call> + <menu_item_call + label="Profile..." + name="profile"> + <on_click + function="Block.Action" + parameter="profile_item"/> + <on_enable + function="Block.Enable" + parameter="profile_item" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml new file mode 100755 index 0000000000..0c7155667e --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + name="menu_blocked_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_call + label="Block Resident by name..." + name="block_resident_by_name"> + <on_click + function="Block.Action" + parameter="block_res_by_name"/> + </menu_item_call> + <menu_item_call + label="Block object by name" + name="block_object_by_name"> + <on_click + function="Block.Action" + parameter="block_obj_by_name"/> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml new file mode 100755 index 0000000000..2efb70ee37 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + name="menu_blocked_view" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_check + label="Sort by name" + name="sort_by_name"> + <on_click + function="Block.Action" + parameter="sort_by_name"/> + <on_check + function="Block.Check" + parameter="sort_by_name"/> + </menu_item_check> + <menu_item_check + label="Sort by type" + name="sort_by_type"> + <on_click + function="Block.Action" + parameter="sort_by_type" /> + <on_check + function="Block.Check" + parameter="sort_by_type" /> + </menu_item_check> +</toggleable_menu> 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.xml index b452f96e7a..dde9432867 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml @@ -40,8 +40,12 @@ 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="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" /> - </menu_item_call> + <menu_item_check name="view_conversation" label="View Conversation Log..."> + <menu_item_check.on_check + function="Floater.Visible" + parameter="conversation" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="conversation" /> + </menu_item_check> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml index 8f89d37dbb..1e0364b84e 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml @@ -1,8 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<menu name="menu_group_plus" +<toggleable_menu name="menu_group_plus" left="0" bottom="0" visible="false" mouse_opaque="false" opaque="true" color="MenuDefaultBgColor"> <menu_item_call + label="Activate" + name="Activate"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="activate" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="activate" /> + </menu_item_call> + <menu_item_call label="View Info" name="View Info"> <menu_item_call.on_click @@ -23,7 +33,7 @@ parameter="chat" /> </menu_item_call> <menu_item_call - label="Call" + label="Voice call" name="Call"> <menu_item_call.on_click function="People.Groups.Action" @@ -34,17 +44,6 @@ </menu_item_call> <menu_item_separator /> <menu_item_call - label="Activate" - name="Activate"> - <menu_item_call.on_click - function="People.Groups.Action" - parameter="activate" /> - <menu_item_call.on_enable - function="People.Groups.Enable" - parameter="activate" /> - </menu_item_call> - <menu_item_separator /> - <menu_item_call label="Leave" name="Leave"> <menu_item_call.on_click @@ -54,4 +53,4 @@ function="People.Groups.Enable" parameter="leave" /> </menu_item_call> -</menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml index c710fe3b9b..73f79f1e70 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml @@ -14,13 +14,4 @@ function="CheckControl" parameter="GroupListShowIcons" /> </menu_item_check> - <menu_item_call - label="Leave Selected Group" - layout="topleft" - name="Leave Selected Group"> - <menu_item_call.on_click - function="People.Group.Minus.Action"/> - <menu_item_call.on_enable - function="People.Group.Minus.Enable"/> - </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index d2e35e4cc0..3abb5f7bc8 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -1,28 +1,69 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <context_menu layout="topleft" - name="Avatar Context Menu"> + name="Nearby People Context Menu"> <menu_item_call label="View Profile" layout="topleft" - name="View Profile"> + name="view_profile"> <menu_item_call.on_click function="Avatar.Profile" /> </menu_item_call> <menu_item_call + label="IM" + layout="topleft" + name="im"> + <menu_item_call.on_click + function="Avatar.IM" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_im"/> + </menu_item_call> + <menu_item_call + label="Offer Teleport" + name="offer_teleport"> + <menu_item_call.on_click + function="Avatar.OfferTeleport"/> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_offer_teleport"/> + </menu_item_call> + <menu_item_call + label="Voice call" + layout="topleft" + name="voice_call"> + <menu_item_call.on_click + function="Avatar.Call" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_call" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="View chat history..." + layout="topleft" + name="chat_history"> + <menu_item_call.on_click + function="Avatar.Calllog" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_callog"/> + </menu_item_call> + <menu_item_separator name="separator_chat_history"/> + <menu_item_call label="Add Friend" layout="topleft" - name="Add Friend"> + name="add_friend"> <menu_item_call.on_click function="Avatar.AddFriend" /> - <menu_item_call.on_enable + <menu_item_call.on_visible function="Avatar.EnableItem" parameter="can_add" /> </menu_item_call> <menu_item_call label="Remove Friend" layout="topleft" - name="Remove Friend"> + name="remove_friend"> <menu_item_call.on_click function="Avatar.RemoveFriend" /> <menu_item_call.on_enable @@ -30,26 +71,30 @@ parameter="can_delete" /> </menu_item_call> <menu_item_call - label="IM" + label="Invite to group..." layout="topleft" - name="IM"> + name="invite_to_group"> <menu_item_call.on_click - function="Avatar.IM" /> + function="Avatar.InviteToGroup" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_invite"/> </menu_item_call> + <menu_item_separator name="separator_invite_to_group"/> <menu_item_call - label="Call" + label="Zoom In" layout="topleft" - name="Call"> - <menu_item_call.on_click - function="Avatar.Call" /> - <menu_item_call.on_enable - function="Avatar.EnableItem" - parameter="can_call" /> + name="zoom_in"> + <menu_item_call.on_click + function="Avatar.ZoomIn" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_zoom_in"/> </menu_item_call> <menu_item_call label="Map" layout="topleft" - name="Map"> + name="map"> <menu_item_call.on_click function="Avatar.ShowOnMap" /> <menu_item_call.on_enable @@ -59,21 +104,27 @@ <menu_item_call label="Share" layout="topleft" - name="Share"> + name="share"> <menu_item_call.on_click function="Avatar.Share" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_share"/> </menu_item_call> <menu_item_call label="Pay" layout="topleft" - name="Pay"> + name="pay"> <menu_item_call.on_click function="Avatar.Pay" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_pay"/> </menu_item_call> <menu_item_check label="Block/Unblock" layout="topleft" - name="Block/Unblock"> + name="block_unblock"> <menu_item_check.on_click function="Avatar.BlockUnblock" /> <menu_item_check.on_check @@ -83,13 +134,5 @@ function="Avatar.EnableItem" parameter="can_block" /> </menu_item_check> - <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> + <menu_item_separator /> </context_menu> 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 5d58a9d289..5f973088fd 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml @@ -6,7 +6,7 @@ enabled="false" label="Add Friends" layout="topleft" - name="Add Friends"> + name="add_friends"> <on_click function="Avatar.AddFriends" /> <on_enable @@ -16,7 +16,7 @@ <menu_item_call label="Remove Friends" layout="topleft" - name="Remove Friend"> + name="remove_friends"> <menu_item_call.on_click function="Avatar.RemoveFriend" /> <menu_item_call.on_enable @@ -26,7 +26,7 @@ <menu_item_call label="IM" layout="topleft" - name="IM"> + name="im"> <on_click function="Avatar.IM" /> </menu_item_call> @@ -34,7 +34,7 @@ enabled="false" label="Call" layout="topleft" - name="Call"> + name="call"> <on_click function="Avatar.Call" /> <on_enable @@ -45,7 +45,7 @@ enabled="false" label="Share" layout="topleft" - name="Share"> + name="share"> <on_click function="Avatar.Share" /> </menu_item_call> @@ -53,13 +53,13 @@ enabled="false" label="Pay" layout="topleft" - name="Pay"> + name="pay"> <on_click function="Avatar.Pay" /> </menu_item_call> <menu_item_call label="Offer Teleport" - name="teleport"> + name="offer_teleport"> <menu_item_call.on_click function="Avatar.OfferTeleport"/> <menu_item_call.on_enable diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml new file mode 100755 index 0000000000..da88ca9f4d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_check + label="Sort by Recent Speakers" + name="sort_by_recent_speakers"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="sort_by_recent_speakers"/> + <menu_item_check.on_check + function="People.Nearby.ViewSort.CheckItem" + parameter="sort_by_recent_speakers"/> + </menu_item_check> + <menu_item_check + label="Sort by Name" + name="sort_name"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="sort_name"/> + <menu_item_check.on_check + function="People.Nearby.ViewSort.CheckItem" + parameter="sort_name"/> + </menu_item_check> + <menu_item_check + label="Sort by Distance" + name="sort_distance"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="sort_distance"/> + <menu_item_check.on_check + function="People.Nearby.ViewSort.CheckItem" + parameter="sort_distance"/> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_check name="view_icons" label="View People Icons"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="view_icons" /> + <menu_item_check.on_check + function="CheckControl" + parameter="NearbyListShowIcons" /> + </menu_item_check> + <menu_item_check name ="view_map" label="View Map"> + <menu_item_check.on_check + function="CheckControl" + parameter="NearbyListShowMap" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="NearbyListShowMap" /> + </menu_item_check> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml deleted file mode 100644 index 614dd693c5..0000000000 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toggleable_menu - name="menu_group_plus" - left="0" bottom="0" visible="false" - mouse_opaque="false"> - <menu_item_check - label="Sort by Recent Speakers" - name="sort_by_recent_speakers"> - <menu_item_check.on_click - function="People.Nearby.ViewSort.Action" - parameter="sort_by_recent_speakers"/> - <menu_item_check.on_check - function="People.Nearby.ViewSort.CheckItem" - parameter="sort_by_recent_speakers"/> - </menu_item_check> - <menu_item_check - label="Sort by Name" - name="sort_name"> - <menu_item_check.on_click - function="People.Nearby.ViewSort.Action" - parameter="sort_name"/> - <menu_item_check.on_check - function="People.Nearby.ViewSort.CheckItem" - parameter="sort_name"/> - </menu_item_check> - <menu_item_check - label="Sort by Distance" - name="sort_distance"> - <menu_item_check.on_click - function="People.Nearby.ViewSort.Action" - parameter="sort_distance"/> - <menu_item_check.on_check - function="People.Nearby.ViewSort.CheckItem" - parameter="sort_distance"/> - </menu_item_check> - <menu_item_separator layout="topleft" /> - <menu_item_check name="view_icons" label="View People Icons"> - <menu_item_check.on_click - function="People.Nearby.ViewSort.Action" - parameter="view_icons" /> - <menu_item_check.on_check - function="CheckControl" - parameter="NearbyListShowIcons" /> - </menu_item_check> - <menu_item_check name ="view_map" label="View Map"> - <menu_item_check.on_check - function="CheckControl" - parameter="NearbyListShowMap" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="NearbyListShowMap" /> - </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="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" /> - </menu_item_call> -</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml index 485a5a658c..1dbc90dd2b 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml @@ -32,8 +32,4 @@ function="CheckControl" parameter="RecentListShowIcons" /> </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="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" /> - </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml index ebb49c9004..ebb49c9004 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_picks.xml +++ b/indra/newview/skins/default/xui/en/menu_picks.xml diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml index f3b207e36c..f3b207e36c 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml index 288811d2f6..288811d2f6 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_place.xml +++ b/indra/newview/skins/default/xui/en/menu_place.xml diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml index e3a39a1242..e3a39a1242 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/en/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml index 1aeb166e01..1aeb166e01 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml index ff5fdd3795..ff5fdd3795 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml index b0b7b554b0..b0b7b554b0 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml index 6285bf7417..6285bf7417 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml index db29d9cebc..db29d9cebc 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/en/menu_slurl.xml b/indra/newview/skins/default/xui/en/menu_slurl.xml index ee37d49946..ee37d49946 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_slurl.xml +++ b/indra/newview/skins/default/xui/en/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml index bc7d4fe33b..bc7d4fe33b 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml index 0160d52b17..0160d52b17 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml index ecc1d8a954..ecc1d8a954 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml index 70b40dd89b..70b40dd89b 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml index fbe40a7244..fbe40a7244 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml index cbe249ed4d..cbe249ed4d 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/en/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml index 73f0fa7979..7cd56f257a 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml @@ -1,13 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <context_menu layout="topleft" - name="Url Popup"> + name="Url Popup"> <menu_item_call - label="Show Resident Profile" + label="View Profile" layout="topleft" name="show_agent"> <menu_item_call.on_click - function="Url.ShowProfile" /> + function="Url.ShowProfile" /> + </menu_item_call> + <menu_item_call + label="Send IM..." + layout="topleft" + name="send_im"> + <menu_item_call.on_click + function="Url.SendIM" /> + </menu_item_call> + <menu_item_call + label="Add Friend..." + layout="topleft" + name="add_friend"> + <menu_item_call.on_click + function="Url.AddFriend" /> </menu_item_call> <menu_item_separator layout="topleft" /> diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml index 2cb125ce09..2cb125ce09 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_group.xml +++ b/indra/newview/skins/default/xui/en/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml index 7a4b1e619b..7a4b1e619b 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_http.xml +++ b/indra/newview/skins/default/xui/en/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_inventory.xml b/indra/newview/skins/default/xui/en/menu_url_inventory.xml index cf9d1d5881..cf9d1d5881 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_map.xml b/indra/newview/skins/default/xui/en/menu_url_map.xml index 2ca9e3b3fe..2ca9e3b3fe 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_map.xml +++ b/indra/newview/skins/default/xui/en/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml index 35c2269b0d..87ab58e622 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml @@ -3,7 +3,7 @@ layout="topleft" name="Url Popup"> <menu_item_call - label="Show Object Information" + label="Object Profile..." layout="topleft" name="show_object"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml index f477c310fb..f477c310fb 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/en/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml index 6d1060b633..6d1060b633 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/en/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml index 98abc206a5..98abc206a5 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/en/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml index 289e32bcf4..289e32bcf4 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/en/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 18932a32d0..b01c3067ff 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -130,19 +130,24 @@ label="Status" name="Status" tear_off="true"> - <menu_item_call - label="Away" - name="Set Away"> - <menu_item_call.on_click + <menu_item_check + name="Away" + label="Away"> + <menu_item_check.on_check + function="View.Status.CheckAway" /> + <menu_item_check.on_click function="World.SetAway" /> - </menu_item_call> - <menu_item_call - label="Busy" - name="Set Busy"> - <menu_item_call.on_click - function="World.SetBusy"/> - </menu_item_call> - </menu> + </menu_item_check> + <menu_item_check + name="Do Not Disturb" + label="Do Not Disturb"> + <menu_item_check.on_check + function="View.Status.CheckDoNotDisturb" /> + <menu_item_check.on_click + function="World.SetDoNotDisturb"/> + </menu_item_check> + + </menu> <menu_item_separator/> @@ -180,8 +185,7 @@ </menu_item_call> <menu_item_call label="Toolbar buttons..." - name="Toolbars" - shortcut="control|T"> + name="Toolbars"> <menu_item_call.on_click function="Floater.Toggle" parameter="toybox" /> @@ -218,17 +222,28 @@ label="Communicate" name="Communicate" tear_off="true"> - <menu_item_check - label="Chat..." + <menu_item_check + label="Conversations..." + name="Conversations" + shortcut="control|T"> + <menu_item_check.on_check + function="Floater.IsOpen" + parameter="im_container" /> + <menu_item_check.on_click + function="Floater.ToggleOrBringToFront" + parameter="im_container" /> + </menu_item_check> + <menu_item_check + label="Nearby Chat..." name="Nearby Chat" shortcut="control|H" use_mac_ctrl="true"> <menu_item_check.on_check function="Floater.Visible" - parameter="chat_bar" /> + parameter="nearby_chat" /> <menu_item_check.on_click - function="Floater.Toggle" - parameter="chat_bar" /> + function="Floater.ToggleOrBringToFront" + parameter="nearby_chat" /> </menu_item_check> <menu_item_check label="Speak" @@ -244,26 +259,48 @@ parameter="speak" /> </menu_item_check> <menu_item_check - label="Voice settings..." - name="Nearby Voice"> + name="Conversation Log..." + label="Conversation Log..."> <menu_item_check.on_check function="Floater.Visible" - parameter="voice_controls" /> + parameter="conversation" /> + <menu_item_check.on_enable + function="Conversation.IsConversationLoggingAllowed" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="voice_controls" /> + parameter="conversation" /> </menu_item_check> - <menu_item_check - label="Voice morphing..." - name="ShowVoice" + <menu_item_separator/> + <menu + label="Voice morphing" + name="VoiceMorphing" visibility_control="VoiceMorphingEnabled"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="voice_effect" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="voice_effect" /> - </menu_item_check> + <menu_item_check + label="No voice morphing" + name="NoVoiceMorphing"> + <menu_item_check.on_check + function="Communicate.VoiceMorphing.NoVoiceMorphing.Check" /> + <menu_item_check.on_click + function="Communicate.VoiceMorphing.NoVoiceMorphing.Click" /> + </menu_item_check> + <menu_item_separator/> + <menu_item_check + label="Preview..." + name="Preview"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="voice_effect" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="voice_effect" /> + </menu_item_check> + <menu_item_call + label="Subscribe..." + name="Subscribe"> + <menu_item_call.on_click + function="Communicate.VoiceMorphing.Subscribe" /> + </menu_item_call> + </menu> <menu_item_check label="Gestures..." name="Gestures" @@ -276,36 +313,56 @@ parameter="gestures" /> </menu_item_check> <menu_item_separator/> - <menu_item_call + <menu_item_check label="Friends" name="My Friends" shortcut="control|shift|F"> - <menu_item_call.on_click + <menu_item_check.on_check + function="SideTray.CheckPanelPeopleTab" + parameter="friends_panel" /> + <menu_item_check.on_click function="SideTray.PanelPeopleTab" parameter="friends_panel" /> - </menu_item_call> - <menu_item_call + </menu_item_check> + <menu_item_check label="Groups" name="My Groups" shortcut="control|shift|G"> - <menu_item_call.on_click + <menu_item_check.on_check + function="SideTray.CheckPanelPeopleTab" + parameter="groups_panel" /> + <menu_item_check.on_click function="SideTray.PanelPeopleTab" parameter="groups_panel" /> - </menu_item_call> - <menu_item_call + </menu_item_check> + <menu_item_check label="Nearby people" name="Active Speakers" shortcut="control|shift|A"> - <menu_item_call.on_click + <menu_item_check.on_check + function="SideTray.CheckPanelPeopleTab" + parameter="nearby_panel" /> + <menu_item_check.on_click function="SideTray.PanelPeopleTab" parameter="nearby_panel" /> - </menu_item_call> + </menu_item_check> <menu_item_call label="Block List" name="Block List"> <menu_item_call.on_click - function="Communicate.BlockList" /> + function="SideTray.PanelPeopleTab" + parameter="blocked_panel" /> </menu_item_call> + <menu_item_separator/> + <menu_item_check + name="Do Not Disturb" + label="Do Not Disturb"> + <menu_item_check.on_check + function="View.Status.CheckDoNotDisturb" /> + <menu_item_check.on_click + function="World.SetDoNotDisturb"/> + </menu_item_check> + </menu> <menu create_jump_keys="true" @@ -876,14 +933,6 @@ function="Tools.EnableTakeCopy" /> </menu_item_call> <menu_item_call - label="Save Back to My Inventory" - name="Save Object Back to My Inventory"> - <menu_item_call.on_click - function="Tools.SaveToInventory" /> - <menu_item_call.on_enable - function="Tools.EnableSaveToInventory" /> - </menu_item_call> - <menu_item_call label="Save Back to Object Contents" name="Save Object Back to Object Contents"> <menu_item_call.on_click @@ -1250,7 +1299,58 @@ function="Floater.Show" parameter="hud" /> </menu_item_call>--> - + <menu_item_separator/> + + <menu_item_call + label="User’s guide" + name="User’s guide"> + <menu_item_call.on_click + function="Advanced.ShowURL" + parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/> + </menu_item_call> + <menu_item_call + label="Knowledge Base" + name="Knowledge Base"> + <menu_item_call.on_click + function="Advanced.ShowURL" + parameter="http://community.secondlife.com/t5/tkb/communitypage"/> + </menu_item_call> + <menu_item_call + label="Wiki" + name="Wiki"> + <menu_item_call.on_click + function="Advanced.ShowURL" + parameter="http://wiki.secondlife.com"/> + </menu_item_call> + <menu_item_call + label="Community Forums" + name="Community Forums"> + <menu_item_call.on_click + function="Advanced.ShowURL" + parameter="http://community.secondlife.com/t5/Forums/ct-p/Forums"/> + </menu_item_call> + <menu_item_call + label="Support portal" + name="Support portal"> + <menu_item_call.on_click + function="Advanced.ShowURL" + parameter="https://support.secondlife.com/"/> + </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="[SECOND_LIFE] News" + name="Second Life News"> + <menu_item_call.on_click + function="Advanced.ShowURL" + parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/> + </menu_item_call> + <menu_item_call + label="[SECOND_LIFE] Blogs" + name="Second Life Blogs"> + <menu_item_call.on_click + function="Advanced.ShowURL" + parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/> + </menu_item_call> <menu_item_separator/> <menu_item_call @@ -2263,6 +2363,12 @@ <menu_item_check.on_click function="Advanced.ToggleFrameTest" /> </menu_item_check> + <menu_item_call + label="Frame Profile" + name="Frame Profile"> + <menu_item_call.on_click + function="Advanced.ClickRenderProfile" /> + </menu_item_call> </menu> <menu create_jump_keys="true" @@ -2558,6 +2664,13 @@ <menu_item_call.on_click function="Advanced.SelectedTextureInfo" /> </menu_item_call> + <menu_item_call + label="Selected Material Info" + name="Selected Material Info" + shortcut="control|alt|shift|M"> + <menu_item_call.on_click + function="Advanced.SelectedMaterialInfo" /> + </menu_item_call> <menu_item_check label="Wireframe" name="Wireframe" @@ -2584,8 +2697,8 @@ <menu_item_separator /> <menu_item_check - label="Lighting and Shadows" - name="Lighting and Shadows"> + label="Advanced Lighting Model" + name="Advanced Lighting Model"> <menu_item_check.on_check function="CheckControl" parameter="RenderDeferred" /> @@ -2692,16 +2805,6 @@ parameter="TextureLoadFullRes" /> </menu_item_check> <menu_item_check - label="Texture Atlas (experimental)" - name="Texture Atlas"> - <menu_item_check.on_check - function="CheckControl" - parameter="EnableTextureAtlas" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="EnableTextureAtlas" /> - </menu_item_check> - <menu_item_check label="Render Attached Lights" name="Render Attached Lights"> <menu_item_check.on_check @@ -2955,13 +3058,6 @@ <menu_item_call.on_click function="Advanced.PrintAgentInfo" /> </menu_item_call> - <menu_item_call - label="Memory Stats" - name="Memory Stats" - shortcut="control|alt|shift|M"> - <menu_item_call.on_click - function="Advanced.PrintTextureMemoryStats" /> - </menu_item_call> <menu_item_check label="Region Debug Console" name="Region Debug Console" @@ -3185,6 +3281,40 @@ parameter="AllowSelectAvatar" /> </menu_item_check> </menu> + <menu + create_jump_keys="true" + label="Animation Speed" + name="Animation Speed" + tear_off="true"> + <menu_item_call + label="All Animations 10% Faster" + name="All Animations 10 Faster"> + <menu_item_call.on_click + function="Advanced.AnimTenFaster" /> + </menu_item_call> + <menu_item_call + label="All Animations 10% Slower" + name="All Animations 10 Slower"> + <menu_item_call.on_click + function="Advanced.AnimTenSlower" /> + </menu_item_call> + <menu_item_call + label="Reset All Animation Speed" + name="Reset All Animation Speed"> + <menu_item_call.on_click + function="Advanced.AnimResetAll" /> + </menu_item_call> + <menu_item_check + label="Slow Motion Animations" + name="Slow Motion Animations"> + <menu_item_check.on_check + function="CheckControl" + parameter="SlowMotionAnimation" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="SlowMotionAnimation" /> + </menu_item_check> + </menu> <menu_item_call label="Force Params to Default" name="Force Params to Default"> @@ -3202,16 +3332,6 @@ parameter="" /> </menu_item_check> <menu_item_check - label="Slow Motion Animations" - name="Slow Motion Animations"> - <menu_item_check.on_check - function="CheckControl" - parameter="SlowMotionAnimation" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="SlowMotionAnimation" /> - </menu_item_check> - <menu_item_check label="Show Look At" name="Show Look At"> <menu_item_check.on_check diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml index aa56b4ba63..aa56b4ba63 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml 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 0e858ccf10..0e858ccf10 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml index 2d54e69601..2d54e69601 100644..100755 --- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index a585069faa..a585069faa 100644..100755 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml index e95b371d00..e95b371d00 100644..100755 --- a/indra/newview/skins/default/xui/en/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml index 7931e55c0a..7931e55c0a 100644..100755 --- a/indra/newview/skins/default/xui/en/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/en/notification_visibility.xml b/indra/newview/skins/default/xui/en/notification_visibility.xml index db292100d7..db292100d7 100644..100755 --- a/indra/newview/skins/default/xui/en/notification_visibility.xml +++ b/indra/newview/skins/default/xui/en/notification_visibility.xml diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9dae77a304..9e582cf0de 100644..100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -352,7 +352,7 @@ Save all changes to clothing/body parts? icon="alertmodal.tga" name="FriendsAndGroupsOnly" type="alertmodal"> - Non-friends won't know that you've choosen to ignore their calls and instant messages. + Non-friends won't know that you've chosen to ignore their calls and instant messages. <usetemplate name="okbutton" yestext="OK"/> @@ -1293,6 +1293,45 @@ Visit [_URL] for more information? <notification icon="alertmodal.tga" + name="AMDOldDriver" + type="alertmodal"> + There is likely a newer driver for your graphics chip. Updating graphics drivers can substantially improve performance. + + Visit [_URL] to check for driver updates? + <tag>confirm</tag> + <url option="0" name="url"> + http://support.amd.com/us/Pages/AMDSupportHub.aspx + </url> + <usetemplate + ignoretext="My graphics driver is out of date" + name="okcancelignore" + notext="No" + yestext="Yes"/> + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="NVIDIAOldDriver" + type="alertmodal"> + There is likely a newer driver for your graphics chip. Updating graphics drivers can substantially improve performance. + + Visit [_URL] to check for driver updates? + <tag>confirm</tag> + <url option="0" name="url"> + http://www.nvidia.com/Download/index.aspx?lang=en-us + </url> + <usetemplate + ignoretext="My graphics driver is out of date" + name="okcancelignore" + notext="No" + yestext="Yes"/> + <tag>fail</tag> + </notification> + + + <notification + icon="alertmodal.tga" name="UnknownGPU" type="alertmodal"> Your system contains a graphics card that [APP_NAME] doesn't recognize. @@ -3046,6 +3085,7 @@ Would you like to trust this authority? icon="alertmodal.tga" name="GrantedModifyRights" persist="true" + log_to_im="true" type="notify"> [NAME] has given you permission to edit their objects. </notification> @@ -3054,6 +3094,7 @@ Would you like to trust this authority? icon="alertmodal.tga" name="RevokedModifyRights" persist="true" + log_to_im="true" type="notify"> Your privilege to modify [NAME]'s objects has been revoked </notification> @@ -3439,7 +3480,7 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update] name="RequiredUpdateDownloadedVerboseDialog" type="alertmodal"> We have downloaded a required software update. -Version [VERSION] +Version [VERSION] [[INFO_URL] Information about this update] We must restart [APP_NAME] to install the update. <tag>confirm</tag> @@ -3453,6 +3494,66 @@ We must restart [APP_NAME] to install the update. name="RequiredUpdateDownloadedDialog" type="alertmodal"> We must restart [APP_NAME] to install the update. +[[INFO_URL] Information about this update] + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="notify.tga" + name="OtherChannelDownloadBackgroundTip" + type="notify"> +We have downloaded an update to your [APP_NAME] installation. +Version [VERSION] +This experimental viewer has been replaced by a [NEW_CHANNEL] viewer; +see [[INFO_URL] for details about this update] + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Later..." + yestext="Install now and restart [APP_NAME]"/> + </notification> + + <notification + icon="alertmodal.tga" + name="OtherChannelDownloadBackgroundDialog" + type="alertmodal"> +We have downloaded an update to your [APP_NAME] installation. +Version [VERSION] +This experimental viewer has been replaced by a [NEW_CHANNEL] viewer; +see [[INFO_URL] Information about this update] + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Later..." + yestext="Install now and restart [APP_NAME]"/> + </notification> + + <notification + icon="alertmodal.tga" + name="OtherChannelRequiredUpdateDownloadedVerboseDialog" + type="alertmodal"> +We have downloaded a required software update. +Version [VERSION] +This experimental viewer has been replaced by a [NEW_CHANNEL] viewer; +see [[INFO_URL] Information about this update] + +We must restart [APP_NAME] to install the update. + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="OtherChannelRequiredUpdateDownloadedDialog" + type="alertmodal"> +We must restart [APP_NAME] to install the update. +This experimental viewer has been replaced by a [NEW_CHANNEL] viewer; +see [[INFO_URL] Information about this update] <tag>confirm</tag> <usetemplate name="okbutton" @@ -3687,12 +3788,15 @@ Cannot offer friendship at this time. Please try again in a moment. <notification icon="alert.tga" - name="BusyModeSet" + name="DoNotDisturbModeSet" type="alert"> -Busy mode is set. -Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash. +Do Not Disturb is on. You will not be notified of incoming communications. + +- Other residents will receive your Do Not Disturb response (set in Preferences > General). +- Teleportation offers will be declined. +- Voice calls will be rejected. <usetemplate - ignoretext="I change my status to Busy mode" + ignoretext="I change my status to Do Not Disturb mode" name="okignore" yestext="OK"/> </notification> @@ -4238,6 +4342,8 @@ Are you sure you want to change the Estate Covenant? <notification icon="notifytip.tga" name="RegionEntryAccessBlocked_Notify" + log_to_im="false" + log_to_chat="true" type="notifytip"> <tag>fail</tag> The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. @@ -4246,6 +4352,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu <notification icon="notifytip.tga" name="RegionEntryAccessBlocked_NotifyAdultsOnly" + log_to_im="false" + log_to_chat="true" type="notifytip"> <tag>fail</tag> The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only. @@ -4317,6 +4425,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu <notification icon="notifytip.tga" name="TeleportEntryAccessBlocked_Notify" + log_to_im="false" + log_to_chat="true" type="notifytip"> <unique> <context>REGIONMATURITY</context> @@ -4328,6 +4438,8 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu <notification icon="notifytip.tga" name="TeleportEntryAccessBlocked_NotifyAdultsOnly" + log_to_im="false" + log_to_chat="true" type="notifytip"> <unique> <context>REGIONMATURITY</context> @@ -4448,6 +4560,8 @@ You won't receive any more notifications that you're about to visit a region wit <notification icon="notifytip.tga" name="LandClaimAccessBlocked_Notify" + log_to_im="false" + log_to_chat="true" type="notifytip"> The land you're trying to claim contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. <tag>fail</tag> @@ -4456,6 +4570,8 @@ You won't receive any more notifications that you're about to visit a region wit <notification icon="notifytip.tga" name="LandClaimAccessBlocked_NotifyAdultsOnly" + log_to_im="false" + log_to_chat="true" type="notifytip"> <tag>fail</tag> The land you're trying to claim contains [REGIONMATURITY] content, which is accessible to adults only. @@ -4513,6 +4629,8 @@ You won't receive any more notifications that you're about to visit a region wit <notification icon="notifytip.tga" name="LandBuyAccessBlocked_Notify" + log_to_im="false" + log_to_chat="true" type="notifytip"> The land you're trying to buy contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. <tag>fail</tag> @@ -4521,6 +4639,8 @@ You won't receive any more notifications that you're about to visit a region wit <notification icon="notifytip.tga" name="LandBuyAccessBlocked_NotifyAdultsOnly" + log_to_im="false" + log_to_chat="true" type="notifytip"> <tag>fail</tag> The land you're trying to buy contains [REGIONMATURITY] content, which is accessible to adults only. @@ -4966,6 +5086,20 @@ Go to your [http://secondlife.com/account/ Dashboard] to see your account histor <notification icon="alertmodal.tga" + name="ConfirmAddingChatParticipants" + type="alertmodal"> + <unique/> +When you add a person to an existing conversation, a new conversation will be created. All participants will receive new conversation notifications. + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm adding chat paticipants" + name="okcancelignore" + notext="Cancel" + yestext="Ok"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmQuit" type="alertmodal"> <unique/> @@ -5133,25 +5267,25 @@ Do you want to replace it with the selected object? <notification icon="alert.tga" - label="Busy Mode Warning" - name="BusyModePay" + label="Do Not Disturb Mode Warning" + name="DoNotDisturbModePay" type="alert"> -You are in Busy Mode, which means you will not receive any items offered in exchange for this payment. +You have turned on Do Not Disturb. You will not receive any items offered in exchange for this payment. -Would you like to leave Busy Mode before completing this transaction? +Would you like to turn off Do Not Disturb before completing this transaction? <tag>confirm</tag> <form name="form"> <ignore name="ignore" save_option="true" - text="I am about to pay a person or object while I am in Busy mode"/> + text="I am about to pay a person or object while I am in Do Not Disturb mode"/> <button default="true" - ignore="Always leave Busy Mode" + ignore="Always leave Do Not Disturb Mode" index="0" name="Yes" text="OK"/> <button - ignore="Never leave Busy Mode" + ignore="Never leave Do Not Disturb Mode" index="1" name="No" text="Cancel"/> @@ -5462,6 +5596,8 @@ The string [STRING_NAME] is missing from strings.xml <notification icon="notifytip.tga" name="IMSystemMessageTip" + log_to_im="true" + log_to_chat="false" type="notifytip"> [MESSAGE] </notification> @@ -5505,18 +5641,14 @@ Topic: [SUBJECT], Message: [MESSAGE] <notification icon="notifytip.tga" - name="FriendOnline" - type="notifytip"> - <tag>friendship</tag> -<nolink>[NAME]</nolink> is Online - </notification> - - <notification - icon="notifytip.tga" - name="FriendOffline" + name="FriendOnlineOffline" + log_to_chat="false" type="notifytip"> <tag>friendship</tag> -<nolink>[NAME]</nolink> is Offline +<nolink>[NAME]</nolink> is [STATUS] + <unique combine="cancel_old"> + <context>NAME</context> + </unique> </notification> <notification @@ -5760,6 +5892,8 @@ You don't have permission to copy this. <notification icon="notifytip.tga" name="InventoryAccepted" + log_to_im="true" + log_to_chat="false" type="notifytip"> [NAME] received your inventory offer. </notification> @@ -5767,6 +5901,8 @@ You don't have permission to copy this. <notification icon="notifytip.tga" name="InventoryDeclined" + log_to_im="true" + log_to_chat="false" type="notifytip"> [NAME] declined your inventory offer. </notification> @@ -5848,6 +5984,7 @@ Please select at least one type of content to search (General, Moderate, or Adul <notification icon="notify.tga" name="PaymentReceived" + log_to_im="true" persist="true" type="notify"> <tag>funds</tag> @@ -5857,6 +5994,7 @@ Please select at least one type of content to search (General, Moderate, or Adul <notification icon="notify.tga" name="PaymentSent" + log_to_im="true" persist="true" type="notify"> <tag>funds</tag> @@ -6001,6 +6139,7 @@ The objects on the selected parcel that are NOT owned by you have been returned <notification icon="notify.tga" name="ServerObjectMessage" + log_to_im="true" persist="true" type="notify"> Message from [NAME]: @@ -6399,7 +6538,9 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th <notification icon="notify.tga" name="UserGiveItem" - type="offer"> + log_to_im ="true" + type="offer" + sound="UISndNewIncomingIMSession"> [NAME_SLURL] has given you this [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> @@ -6454,7 +6595,10 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th <notification icon="notify.tga" name="TeleportOffered" - type="offer"> + log_to_im="true" + log_to_chat="false" + type="offer" + sound="UISndNewIncomingIMSession"> [NAME_SLURL] has offered to teleport you to their location: “[MESSAGE]” @@ -6475,6 +6619,8 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th <notification icon="notify.tga" name="TeleportOffered_MaturityExceeded" + log_to_im="true" + log_to_chat="false" type="offer"> [NAME_SLURL] has offered to teleport you to their location: @@ -6498,6 +6644,8 @@ This region contains [REGION_CONTENT_MATURITY] content, but your current prefere <notification icon="notify.tga" name="TeleportOffered_MaturityBlocked" + log_to_im="true" + log_to_chat="false" type="notifytip"> [NAME_SLURL] has offered to teleport you to their location: @@ -6511,7 +6659,10 @@ However, this region contains content accessible to adults only. <notification icon="notify.tga" name="TeleportOfferSent" - type="offer"> + log_to_im="true" + log_to_chat="false" + show_toast="false" + type="notify"> Teleport offer sent to [TO_NAME] </notification> @@ -6538,6 +6689,7 @@ However, this region contains content accessible to adults only. <notification icon="notify.tga" name="OfferFriendship" + log_to_im="true" type="offer"> <tag>friendship</tag> <tag>confirm</tag> @@ -6561,7 +6713,9 @@ However, this region contains content accessible to adults only. <notification icon="notify.tga" name="FriendshipOffered" - type="offer"> + log_to_im="true" + show_toast="false" + type="notify"> <tag>friendship</tag> You have offered friendship to [TO_NAME] </notification> @@ -6590,7 +6744,8 @@ However, this region contains content accessible to adults only. <notification icon="notify.tga" name="FriendshipAccepted" - type="offer"> + log_to_im="true" + type="notify"> <tag>friendship</tag> <nolink>[NAME]</nolink> accepted your friendship offer. </notification> @@ -6598,6 +6753,7 @@ However, this region contains content accessible to adults only. <notification icon="notify.tga" name="FriendshipDeclined" + log_to_im="true" persist="true" type="notify"> <tag>friendship</tag> @@ -6607,7 +6763,9 @@ However, this region contains content accessible to adults only. <notification icon="notify.tga" name="FriendshipAcceptedByMe" - type="offer"> + log_to_im="true" + show_toast="false" + type="notify"> <tag>friendship</tag> Friendship offer accepted. </notification> @@ -6615,7 +6773,9 @@ Friendship offer accepted. <notification icon="notify.tga" name="FriendshipDeclinedByMe" - type="offer"> + log_to_im="true" + show_toast="false" + type="notify"> <tag>friendship</tag> Friendship offer declined. </notification> @@ -6664,6 +6824,7 @@ If you stay in this region you will be logged out. <notification icon="notify.tga" name="LoadWebPage" + show_toast="false" type="notify"> Load web page [URL]? @@ -6744,7 +6905,7 @@ Is this OK? type="notify"> Warning: The object '<nolink>[OBJECTNAME]</nolink>' wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings. -It is rare that such a request is legitimate. Do not allow access if you do not fully understand why it wants access to your account. +Do not allow access if you do not fully understand why it wants access to your account. <tag>confirm</tag> <form name="form"> @@ -6765,7 +6926,30 @@ It is rare that such a request is legitimate. Do not allow access if you do not <notification icon="notify.tga" + name="UnknownScriptQuestion" + persist="false" + type="notify"> +The runtime script permission requested by '<nolink>[OBJECTNAME]</nolink>', an object owned by '[NAME]', isn't recognized by the viewer and can't be granted. + +To grant this permission please update your viewer to the latest version from [DOWNLOADURL]. + <tag>confirm</tag> + <form name="form"> + <button + default="true" + index="1" + name="Deny" + text="Ok"/> + <button + index="2" + name="Mute" + text="Block"/> + </form> + </notification> + + <notification + icon="notify.tga" name="ScriptDialog" + show_toast="false" type="notify"> [NAME]'s '<nolink>[TITLE]</nolink>' [MESSAGE] @@ -6784,6 +6968,7 @@ It is rare that such a request is legitimate. Do not allow access if you do not <notification icon="notify.tga" name="ScriptDialogGroup" + show_toast="false" type="notify"> <tag>group</tag> [GROUPNAME]'s '<nolink>[TITLE]</nolink>' @@ -8252,4 +8437,1680 @@ Attempt cancelled. yestext="Yes"/> </notification> + + <notification + icon="alertmodal.tga" + name="AvatarFrozen" + type="notify"> + <tag>fail</tag> +[AV_FREEZER] has frozen you. You cannot move or interact with the world. + </notification> + + <notification + icon="alertmodal.tga" + name="AvatarFrozenDuration" + type="notify"> + <tag>fail</tag> +[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world. + </notification> + + <notification + icon="alertmodal.tga" + name="YouFrozeAvatar" + type="notify"> + <tag>fail</tag> +Avatar frozen. + </notification> + + <notification + icon="alertmodal.tga" + name="AvatarHasUnFrozenYou" + type="notify"> + <tag>fail</tag> +[AV_FREEZER] has unfrozen you. + </notification> + + <notification + icon="alertmodal.tga" + name="AvatarUnFrozen" + type="notify"> + <tag>fail</tag> +Avatar unfrozen. + </notification> + + <notification + icon="alertmodal.tga" + name="AvatarFreezeFailure" + type="notify"> + <tag>fail</tag> +Freeze failed because you don't have admin permission for that parcel. + </notification> + + <notification + icon="alertmodal.tga" + name="AvatarFreezeThaw" + type="notify"> + <tag>fail</tag> +Your freeze expired, go about your business. + </notification> + + <notification + icon="alertmodal.tga" + name="AvatarCantFreeze" + type="notify"> + <tag>fail</tag> +Sorry, can't freeze that user. + </notification> + + <notification + icon="alertmodal.tga" + name="NowOwnObject" + type="notify"> + <tag>fail</tag> +You are now the owner of object [OBJECT_NAME] + </notification> + + <notification + icon="alertmodal.tga" + name="CantRezOnLand" + type="notify"> + <tag>fail</tag> +Can't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership. + </notification> + + <notification + icon="alertmodal.tga" + name="RezFailTooManyRequests" + type="notify"> + <tag>fail</tag> +Object can not be rezzed because there are too many requests. + </notification> + + <notification + icon="alertmodal.tga" + name="SitFailCantMove" + type="notify"> + <tag>fail</tag> +You cannot sit because you cannot move at this time. + </notification> + + <notification + icon="alertmodal.tga" + name="SitFailNotAllowedOnLand" + type="notify"> + <tag>fail</tag> +You cannot sit because you are not allowed on that land. + </notification> + + <notification + icon="alertmodal.tga" + name="SitFailNotSameRegion" + type="notify"> + <tag>fail</tag> +Try moving closer. Can't sit on object because +it is not in the same region as you. + </notification> + + <notification + icon="alertmodal.tga" + name="NoNewObjectRegionFull" + type="notify"> + <tag>fail</tag> +Unable to create new object. The region is full. + </notification> + + <notification + icon="alertmodal.tga" + name="FailedToPlaceObject" + type="notify"> + <tag>fail</tag> +Failed to place object at specified location. Please try again. + </notification> + + <notification + icon="alertmodal.tga" + name="NoOwnNoGardening" + type="notify"> + <tag>fail</tag> +You Can't create trees and grass on land you don't own. + </notification> + + <notification + icon="alertmodal.tga" + name="NoCopyPermsNoObject" + type="notify"> + <tag>fail</tag> +Copy failed because you lack permission to copy the object '[OBJ_NAME]'. + </notification> + + <notification + icon="alertmodal.tga" + name="NoTransPermsNoObject" + type="notify"> + <tag>fail</tag> +Copy failed because the object '[OBJ_NAME]' cannot be transferred to you. + </notification> + + <notification + icon="alertmodal.tga" + name="AddToNavMeshNoCopy" + type="notify"> + <tag>fail</tag> +Copy failed because the object '[OBJ_NAME]' contributes to navmesh. + </notification> + + <notification + icon="alertmodal.tga" + name="DupeWithNoRootsSelected" + type="notify"> + <tag>fail</tag> +Duplicate with no root objects selected. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDupeCuzRegionIsFull" + type="notify"> + <tag>fail</tag> +Can't duplicate objects because the region is full. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDupeCuzParcelNotFound" + type="notify"> + <tag>fail</tag> +Can't duplicate objects - Can't find the parcel they are on. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateCuzParcelFull" + type="notify"> + <tag>fail</tag> +Can't create object because +the parcel is full. + </notification> + + <notification + icon="alertmodal.tga" + name="RezAttemptFailed" + type="notify"> + <tag>fail</tag> +Attempt to rez an object failed. + </notification> + + <notification + icon="alertmodal.tga" + name="ToxicInvRezAttemptFailed" + type="notify"> + <tag>fail</tag> +Unable to create item that has caused problems on this region. + </notification> + + <notification + icon="alertmodal.tga" + name="InvItemIsBlacklisted" + type="notify"> + <tag>fail</tag> +That inventory item has been blacklisted. + </notification> + + <notification + icon="alertmodal.tga" + name="NoCanRezObjects" + type="notify"> + <tag>fail</tag> +You are not currently allowed to create objects. + </notification> + + <notification + icon="alertmodal.tga" + name="LandSearchBlocked" + type="notify"> + <tag>fail</tag> +Land Search Blocked. +You have performed too many land searches too quickly. +Please try again in a minute. + </notification> + + <notification + icon="alertmodal.tga" + name="NotEnoughResourcesToAttach" + type="notify"> + <tag>fail</tag> +Not enough script resources available to attach object! + </notification> + + <notification + icon="alertmodal.tga" + name="YouDiedAndGotTPHome" + type="notify"> + <tag>fail</tag> +You died and have been teleported to your home location + </notification> + + <notification + icon="alertmodal.tga" + name="EjectComingSoon" + type="notify"> + <tag>fail</tag> +You are no longer allowed here and have [EJECT_TIME] seconds to leave. + </notification> + + <notification + icon="alertmodal.tga" + name="NoEnterServerFull" + type="notify"> + <tag>fail</tag> +You can't enter this region because +the server is full. + </notification> + + <notification + icon="alertmodal.tga" + name="SaveBackToInvDisabled" + type="notify"> + <tag>fail</tag> +Save Back To Inventory has been disabled. + </notification> + + <notification + icon="alertmodal.tga" + name="NoExistNoSaveToContents" + type="notify"> + <tag>fail</tag> +Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists. + </notification> + + <notification + icon="alertmodal.tga" + name="NoModNoSaveToContents" + type="notify"> + <tag>fail</tag> +Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'. + </notification> + + <notification + icon="alertmodal.tga" + name="NoSaveBackToInvDisabled" + type="notify"> + <tag>fail</tag> +Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled. + </notification> + + <notification + icon="alertmodal.tga" + name="NoCopyNoSelCopy" + type="notify"> + <tag>fail</tag> +You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'. + </notification> + + <notification + icon="alertmodal.tga" + name="NoTransNoSelCopy" + type="notify"> + <tag>fail</tag> +You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable. + </notification> + + <notification + icon="alertmodal.tga" + name="NoTransNoCopy" + type="notify"> + <tag>fail</tag> +You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable. + </notification> + + <notification + icon="alertmodal.tga" + name="NoPermsNoRemoval" + type="notify"> + <tag>fail</tag> +Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system. + </notification> + + <notification + icon="alertmodal.tga" + name="NoModNoSaveSelection" + type="notify"> + <tag>fail</tag> +Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'. + </notification> + + <notification + icon="alertmodal.tga" + name="NoCopyNoSaveSelection" + type="notify"> + <tag>fail</tag> +Cannot save your selection because the object '[OBJ_NAME]' is not copyable. + </notification> + + <notification + icon="alertmodal.tga" + name="NoModNoTaking" + type="notify"> + <tag>fail</tag> +You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'. + </notification> + + <notification + icon="alertmodal.tga" + name="RezDestInternalError" + type="notify"> + <tag>fail</tag> +Internal Error: Unknown destination type. + </notification> + + <notification + icon="alertmodal.tga" + name="DeleteFailObjNotFound" + type="notify"> + <tag>fail</tag> +Delete failed because object not found + </notification> + + <notification + icon="alertmodal.tga" + name="SorryCantEjectUser" + type="notify"> + <tag>fail</tag> +Sorry, can't eject that user. + </notification> + + <notification + icon="alertmodal.tga" + name="RegionSezNotAHome" + type="notify"> + <tag>fail</tag> +This region does not allow you to set your home location here. + </notification> + + <notification + icon="alertmodal.tga" + name="HomeLocationLimits" + type="notify"> + <tag>fail</tag> +You can only set your 'Home Location' on your land or at a mainland Infohub. + </notification> + + <notification + icon="alertmodal.tga" + name="HomePositionSet" + type="notify"> + <tag>fail</tag> +Home position set. + </notification> + + <notification + icon="alertmodal.tga" + name="AvatarEjected" + type="notify"> + <tag>fail</tag> +Avatar ejected. + </notification> + + <notification + icon="alertmodal.tga" + name="AvatarEjectFailed" + type="notify"> + <tag>fail</tag> +Eject failed because you don't have admin permission for that parcel. + </notification> + + <notification + icon="alertmodal.tga" + name="CantMoveObjectParcelFull" + type="notify"> + <tag>fail</tag> +Can't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because the parcel is full. + </notification> + + <notification + icon="alertmodal.tga" + name="CantMoveObjectParcelPerms" + type="notify"> + <tag>fail</tag> +Can't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel. + </notification> + + <notification + icon="alertmodal.tga" + name="CantMoveObjectParcelResources" + type="notify"> + <tag>fail</tag> +Can't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel. + </notification> + + <notification + icon="alertmodal.tga" + name="CantMoveObjectRegionVersion" + type="notify"> + <tag>fail</tag> +Can't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing. + </notification> + + <notification + icon="alertmodal.tga" + name="CantMoveObjectNavMesh" + type="notify"> + <tag>fail</tag> +Can't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries. + </notification> + + <notification + icon="alertmodal.tga" + name="CantMoveObjectWTF" + type="notify"> + <tag>fail</tag> +Can't move object '[OBJECT_NAME]' to +[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE]) + </notification> + + <notification + icon="alertmodal.tga" + name="NoPermModifyObject" + type="notify"> + <tag>fail</tag> +You don't have permission to modify that object + </notification> + + <notification + icon="alertmodal.tga" + name="CantEnablePhysObjContributesToNav" + type="notify"> + <tag>fail</tag> +Can't enable physics for an object that contributes to the navmesh. + </notification> + + <notification + icon="alertmodal.tga" + name="CantEnablePhysKeyframedObj" + type="notify"> + <tag>fail</tag> +Can't enable physics for keyframed objects. + </notification> + + <notification + icon="alertmodal.tga" + name="CantEnablePhysNotEnoughLandResources" + type="notify"> + <tag>fail</tag> +Can't enable physics for object -- insufficient land resources. + </notification> + + <notification + icon="alertmodal.tga" + name="CantEnablePhysCostTooGreat" + persist="true" + type="notify"> + <tag>fail</tag> +Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS] + </notification> + + <notification + icon="alertmodal.tga" + name="PhantomWithConcavePiece" + type="notify"> + <tag>fail</tag> +This object cannot have a concave piece because it is phantom and contributes to the navmesh. + </notification> + + <notification + icon="alertmodal.tga" + name="UnableAddItem" + type="notify"> + <tag>fail</tag> +Unable to add item! + </notification> + + <notification + icon="alertmodal.tga" + name="UnableEditItem" + type="notify"> + <tag>fail</tag> +Unable to edit this! + </notification> + + <notification + icon="alertmodal.tga" + name="NoPermToEdit" + type="notify"> + <tag>fail</tag> +Not permitted to edit this. + </notification> + + <notification + icon="alertmodal.tga" + name="NoPermToCopyInventory" + type="notify"> + <tag>fail</tag> +Not permitted to copy that inventory. + </notification> + + <notification + icon="alertmodal.tga" + name="CantSaveItemDoesntExist" + type="notify"> + <tag>fail</tag> +Cannot save to object contents: Item no longer exists. + </notification> + + <notification + icon="alertmodal.tga" + name="CantSaveItemAlreadyExists" + type="notify"> + <tag>fail</tag> +Cannot save to object contents: Item with that name already exists in inventory + </notification> + + <notification + icon="alertmodal.tga" + name="CantSaveModifyAttachment" + type="notify"> + <tag>fail</tag> +Cannot save to object contents: This would modify the attachment permissions. + </notification> + + <notification + icon="alertmodal.tga" + name="TooManyScripts" + type="notify"> + <tag>fail</tag> +Too many scripts. + </notification> + + <notification + icon="alertmodal.tga" + name="UnableAddScript" + type="notify"> + <tag>fail</tag> +Unable to add script! + </notification> + + <notification + icon="alertmodal.tga" + name="AssetServerTimeoutObjReturn" + type="notify"> + <tag>fail</tag> +Asset server didn't respond in a timely fashion. Object returned to sim. + </notification> + + <notification + icon="alertmodal.tga" + name="RegionDisablePhysicsShapes" + type="notify"> + <tag>fail</tag> +This region does not have physics shapes enabled. + </notification> + + <notification + icon="alertmodal.tga" + name="NoModNavmeshAcrossRegions" + type="notify"> + <tag>fail</tag> +You cannot modify the navmesh across region boundaries. + </notification> + + <notification + icon="alertmodal.tga" + name="NoSetPhysicsPropertiesOnObjectType" + type="notify"> + <tag>fail</tag> +Cannot set physics properties on that object type. + </notification> + + <notification + icon="alertmodal.tga" + name="NoSetRootPrimWithNoShape" + type="notify"> + <tag>fail</tag> +Cannot set root prim to have no shape. + </notification> + + <notification + icon="alertmodal.tga" + name="NoRegionSupportPhysMats" + type="notify"> + <tag>fail</tag> +This region does not have physics materials enabled. + </notification> + + <notification + icon="alertmodal.tga" + name="OnlyRootPrimPhysMats" + type="notify"> + <tag>fail</tag> +Only root prims may have their physics materials adjusted. + </notification> + + <notification + icon="alertmodal.tga" + name="NoSupportCharacterPhysMats" + type="notify"> + <tag>fail</tag> +Setting physics materials on characters is not yet supported. + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidPhysMatProperty" + type="notify"> + <tag>fail</tag> +One or more of the specified physics material properties was invalid. + </notification> + + <notification + icon="alertmodal.tga" + name="NoPermsAlterStitchingMeshObj" + type="notify"> + <tag>fail</tag> +You may not alter the stitching type of a mesh object. + </notification> + + <notification + icon="alertmodal.tga" + name="NoPermsAlterShapeMeshObj" + type="notify"> + <tag>fail</tag> +You may not alter the shape of a mesh object + </notification> + + <notification + icon="alertmodal.tga" + name="FullRegionCantEnter" + type="notify"> + <tag>fail</tag> +You can't enter this region because \nthe region is full. + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedOwnersDiffer" + type="notify"> + <tag>fail</tag> +Link failed -- owners differ + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedNoModNavmeshAcrossRegions" + type="notify"> + <tag>fail</tag> +Link failed -- cannot modify the navmesh across region boundaries. + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedNoPermToEdit" + type="notify"> + <tag>fail</tag> +Link failed because you do not have edit permission. + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedTooManyPrims" + type="notify"> + <tag>fail</tag> +Link failed -- too many primitives + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedCantLinkNoCopyNoTrans" + type="notify"> + <tag>fail</tag> +Link failed -- cannot link no-copy with no-transfer + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedNothingLinkable" + type="notify"> + <tag>fail</tag> +Link failed -- nothing linkable. + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedTooManyPathfindingChars" + type="notify"> + <tag>fail</tag> +Link failed -- too many pathfinding characters + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedInsufficientLand" + type="notify"> + <tag>fail</tag> +Link failed -- insufficient land resources + </notification> + + <notification + icon="alertmodal.tga" + name="LinkFailedTooMuchPhysics" + type="notify"> + <tag>fail</tag> +Object uses too many physics resources -- its dynamics have been disabled. + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportedHomeByObjectOnParcel" + persist="true" + type="notify"> + <tag>fail</tag> +You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]' + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportedHomeByObject" + persist="true" + type="notify"> + <tag>fail</tag> +You have been teleported home by the object '[OBJECT_NAME]' + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportedByAttachment" + type="notify"> + <tag>fail</tag> +You have been teleported by an attachment on [ITEM_ID] + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportedByObjectOnParcel" + type="notify"> + <tag>fail</tag> +You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]' + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportedByObjectOwnedBy" + type="notify"> + <tag>fail</tag> +You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID] + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportedByObjectUnknownUser" + type="notify"> + <tag>fail</tag> +You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateObjectRegionFull" + type="notify"> + <tag>fail</tag> +Unable to create requested object. The region is full. + </notification> + + <notification + icon="alertmodal.tga" + name="CantAttackMultipleObjOneSpot" + type="notify"> + <tag>fail</tag> +You can't attach multiple objects to one spot. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateMultipleObjAtLoc" + type="notify"> + <tag>fail</tag> +You can't create multiple objects here. + </notification> + + <notification + icon="alertmodal.tga" + name="UnableToCreateObjTimeOut" + type="notify"> + <tag>fail</tag> +Unable to create requested object. Object is missing from database. + </notification> + + <notification + icon="alertmodal.tga" + name="UnableToCreateObjUnknown" + type="notify"> + <tag>fail</tag> +Unable to create requested object. The request timed out. Please try again. + </notification> + + <notification + icon="alertmodal.tga" + name="UnableToCreateObjMissingFromDB" + type="notify"> + <tag>fail</tag> +Unable to create requested object. Please try again. + </notification> + + <notification + icon="alertmodal.tga" + name="RezFailureTookTooLong" + type="notify"> + <tag>fail</tag> +Rez failed, requested object took too long to load. + </notification> + + <notification + icon="alertmodal.tga" + name="FailedToPlaceObjAtLoc" + type="notify"> + <tag>fail</tag> +Failed to place object at specified location. Please try again. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreatePlantsOnLand" + type="notify"> + <tag>fail</tag> +You cannot create plants on this land. + </notification> + + <notification + icon="alertmodal.tga" + name="CantRestoreObjectNoWorldPos" + type="notify"> + <tag>fail</tag> +Cannot restore object. No world position found. + </notification> + + <notification + icon="alertmodal.tga" + name="CantRezObjectInvalidMeshData" + type="notify"> + <tag>fail</tag> +Unable to rez object because its mesh data is invalid. + </notification> + + <notification + icon="alertmodal.tga" + name="CantRezObjectTooManyScripts" + type="notify"> + <tag>fail</tag> +Unable to rez object because there are already too many scripts in this region. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateObjectNoAccess" + type="notify"> + <tag>fail</tag> +Your access privileges don't allow you to create objects there. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateObject" + type="notify"> + <tag>fail</tag> +You are not currently allowed to create objects. + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidObjectParams" + type="notify"> + <tag>fail</tag> +Invalid object parameters + </notification> + + <notification + icon="alertmodal.tga" + name="CantDuplicateObjectNoAcess" + type="notify"> + <tag>fail</tag> +Your access privileges don't allow you to duplicate objects here. + </notification> + + <notification + icon="alertmodal.tga" + name="CantChangeShape" + type="notify"> + <tag>fail</tag> +You are not allowed to change this shape. + </notification> + + <notification + icon="alertmodal.tga" + name="NoAccessToClaimObjects" + type="notify"> + <tag>fail</tag> +Your access privileges don't allow you to claim objects here. + </notification> + + <notification + icon="alertmodal.tga" + name="DeedFailedNoPermToDeedForGroup" + type="notify"> + <tag>fail</tag> +Deed failed because you do not have permission to deed objects for your group. + </notification> + + <notification + icon="alertmodal.tga" + name="NoPrivsToBuyObject" + type="notify"> + <tag>fail</tag> +Your access privileges don't allow you to buy objects here. + </notification> + + <notification + icon="alertmodal.tga" + name="CantAttachObjectAvatarSittingOnIt" + type="notify"> + <tag>fail</tag> +Cannot attach object because an avatar is sitting on it. + </notification> + + <notification + icon="alertmodal.tga" + name="WhyAreYouTryingToWearShrubbery" + type="notify"> + <tag>fail</tag> +Trees and grasses cannot be worn as attachments. + </notification> + + <notification + icon="alertmodal.tga" + name="CantAttachGroupOwnedObjs" + type="notify"> + <tag>fail</tag> +Cannot attach group-owned objects. + </notification> + + <notification + icon="alertmodal.tga" + name="CantAttachObjectsNotOwned" + type="notify"> + <tag>fail</tag> +Cannot attach objects that you don't own. + </notification> + + <notification + icon="alertmodal.tga" + name="CantAttachNavmeshObjects" + type="notify"> + <tag>fail</tag> +Cannot attach objects that contribute to navmesh. + </notification> + + <notification + icon="alertmodal.tga" + name="CantAttachObjectNoMovePermissions" + type="notify"> + <tag>fail</tag> +Cannot attach object because you do not have permission to move it. + </notification> + + <notification + icon="alertmodal.tga" + name="CantAttachNotEnoughScriptResources" + type="notify"> + <tag>fail</tag> +Not enough script resources available to attach object! + </notification> + + <notification + icon="alertmodal.tga" + name="CantDropItemTrialUser" + type="notify"> + <tag>fail</tag> +You can't drop objects here; try the Free Trial area. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDropMeshAttachment" + type="notify"> + <tag>fail</tag> +You can't drop mesh attachments. Detach to inventory and then rez in world. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDropAttachmentNoPermission" + type="notify"> + <tag>fail</tag> +Failed to drop attachment: you don't have permission to drop there. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDropAttachmentInsufficientLandResources" + type="notify"> + <tag>fail</tag> +Failed to drop attachment: insufficient available land resource. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDropAttachmentInsufficientResources" + type="notify"> + <tag>fail</tag> +Failed to drop attachments: insufficient available resources. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDropObjectFullParcel" + type="notify"> + <tag>fail</tag> +Cannot drop object here. Parcel is full. + </notification> + + <notification + icon="alertmodal.tga" + name="CantTouchObjectBannedFromParcel" + type="notify"> + <tag>fail</tag> +Can't touch/grab this object because you are banned from the land parcel. + </notification> + + <notification + icon="alertmodal.tga" + name="PlzNarrowDeleteParams" + type="notify"> + <tag>fail</tag> +Please narrow your delete parameters. + </notification> + + <notification + icon="alertmodal.tga" + name="UnableToUploadAsset" + type="notify"> + <tag>fail</tag> +Unable to upload asset. + </notification> + + <notification + icon="alertmodal.tga" + name="CantTeleportCouldNotFindUser" + type="notify"> + <tag>fail</tag> +Could not find user to teleport home + </notification> + + <notification + icon="alertmodal.tga" + name="GodlikeRequestFailed" + type="notify"> + <tag>fail</tag> +godlike request failed + </notification> + + <notification + icon="alertmodal.tga" + name="GenericRequestFailed" + type="notify"> + <tag>fail</tag> +generic request failed + </notification> + + <notification + icon="alertmodal.tga" + name="CantUploadPostcard" + type="notify"> + <tag>fail</tag> +Unable to upload postcard. Try again later. + </notification> + + <notification + icon="alertmodal.tga" + name="CantFetchInventoryForGroupNotice" + type="notify"> + <tag>fail</tag> +Unable to fetch inventory details for the group notice. + </notification> + + <notification + icon="alertmodal.tga" + name="CantSendGroupNoticeNotPermitted" + type="notify"> + <tag>fail</tag> +Unable to send group notice -- not permitted. + </notification> + + <notification + icon="alertmodal.tga" + name="CantSendGroupNoticeCantConstructInventory" + type="notify"> + <tag>fail</tag> +Unable to send group notice -- could not construct inventory. + </notification> + + <notification + icon="alertmodal.tga" + name="CantParceInventoryInNotice" + type="notify"> + <tag>fail</tag> +Unable to parse inventory in notice. + </notification> + + <notification + icon="alertmodal.tga" + name="TerrainUploadFailed" + type="notify"> + <tag>fail</tag> +Terrain upload failed. + </notification> + + <notification + icon="alertmodal.tga" + name="TerrainFileWritten" + type="notify"> + <tag>fail</tag> +Terrain file written. + </notification> + + <notification + icon="alertmodal.tga" + name="TerrainFileWrittenStartingDownload" + type="notify"> + <tag>fail</tag> +Terrain file written, starting download... + </notification> + + <notification + icon="alertmodal.tga" + name="TerrainBaked" + type="notify"> + <tag>fail</tag> +Terrain baked. + </notification> + + <notification + icon="alertmodal.tga" + name="TenObjectsDisabledPlzRefresh" + type="notify"> + <tag>fail</tag> +Only the first 10 selected objects have been disabled. Refresh and make additional selections if required. + </notification> + + <notification + icon="alertmodal.tga" + name="UpdateViewerBuyParcel" + type="notify"> + <tag>fail</tag> +You need to update your viewer to buy this parcel. + </notification> + + <notification + icon="alertmodal.tga" + name="LandBuyAccessBlocked" + type="notify"> + <tag>fail</tag> +You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating. + </notification> + + <notification + icon="alertmodal.tga" + name="CantBuyParcelNotForSale" + type="notify"> + <tag>fail</tag> +Unable to buy, this parcel is not for sale. + </notification> + + <notification + icon="alertmodal.tga" + name="CantBuySalePriceOrLandAreaChanged" + type="notify"> + <tag>fail</tag> +Unable to buy, the sale price or land area has changed. + </notification> + + <notification + icon="alertmodal.tga" + name="CantBuyParcelNotAuthorized" + type="notify"> + <tag>fail</tag> +You are not the authorized buyer for this parcel. + </notification> + + <notification + icon="alertmodal.tga" + name="CantBuyParcelAwaitingPurchaseAuth" + type="notify"> + <tag>fail</tag> +You cannot purchase this parcel because it is already awaiting purchase aut + </notification> + + <notification + icon="alertmodal.tga" + name="CantBuildOverflowParcel" + type="notify"> + <tag>fail</tag> +You cannot build objects here because doing so would overflow the parcel. + </notification> + + <notification + icon="alertmodal.tga" + name="SelectedMultipleOwnedLand" + type="notify"> + <tag>fail</tag> +You selected land with different owners. Please select a smaller area and try again. + </notification> + + <notification + icon="alertmodal.tga" + name="CantJoinTooFewLeasedParcels" + type="notify"> + <tag>fail</tag> +Not enough leased parcels in selection to join. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDivideLandMultipleParcelsSelected" + type="notify"> + <tag>fail</tag> +Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDivideLandCantFindParcel" + type="notify"> + <tag>fail</tag> +Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug... + </notification> + + <notification + icon="alertmodal.tga" + name="CantDivideLandWholeParcelSelected" + type="notify"> + <tag>fail</tag> +Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land. + </notification> + + <notification + icon="alertmodal.tga" + name="LandHasBeenDivided" + type="notify"> + <tag>fail</tag> +Land has been divided. + </notification> + + <notification + icon="alertmodal.tga" + name="PassPurchased" + type="notify"> + <tag>fail</tag> +You purchased a pass. + </notification> + + <notification + icon="alertmodal.tga" + name="RegionDisallowsClassifieds" + type="notify"> + <tag>fail</tag> +Region does not allow classified advertisements. + </notification> + + <notification + icon="alertmodal.tga" + name="LandPassExpireSoon" + type="notify"> + <tag>fail</tag> +Your pass to this land is about to expire. + </notification> + + <notification + icon="alertmodal.tga" + name="CantSitNoSuitableSurface" + type="notify"> + <tag>fail</tag> +There is no suitable surface to sit on, try another spot. + </notification> + + <notification + icon="alertmodal.tga" + name="CantSitNoRoom" + type="notify"> + <tag>fail</tag> +No room to sit here, try another spot. + </notification> + + <notification + icon="alertmodal.tga" + name="ClaimObjectFailedNoPermission" + type="notify"> + <tag>fail</tag> +Claim object failed because you don't have permission + </notification> + + <notification + icon="alertmodal.tga" + name="ClaimObjectFailedNoMoney" + type="notify"> + <tag>fail</tag> +Claim object failed because you don't have enough L$. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDeedGroupLand" + type="notify"> + <tag>fail</tag> +Cannot deed group-owned land. + </notification> + + <notification + icon="alertmodal.tga" + name="BuyObjectFailedNoMoney" + type="notify"> + <tag>fail</tag> +Buy object failed because you don't have enough L$. + </notification> + + <notification + icon="alertmodal.tga" + name="BuyInventoryFailedNoMoney" + type="notify"> + <tag>fail</tag> +Buy inventory failed because you do not have enough L$ + </notification> + + <notification + icon="alertmodal.tga" + name="BuyPassFailedNoMoney" + type="notify"> + <tag>fail</tag> +You don't have enough L$ to buy a pass to this land. + </notification> + + <notification + icon="alertmodal.tga" + name="CantBuyPassTryAgain" + type="notify"> + <tag>fail</tag> +Unable to buy pass right now. Try again later. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateObjectParcelFull" + type="notify"> + <tag>fail</tag> +Can't create object because \nthe parcel is full. + </notification> + + <notification + icon="alertmodal.tga" + name="FailedPlacingObject" + type="notify"> + <tag>fail</tag> +Failed to place object at specified location. Please try again. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateLandmarkForEvent" + type="notify"> + <tag>fail</tag> +Unable to create landmark for event. + </notification> + + <notification + icon="alertmodal.tga" + name="GodBeatsFreeze" + type="notify"> + <tag>fail</tag> +Your godlike powers break the freeze! + </notification> + + <notification + icon="alertmodal.tga" + name="SpecialPowersRequestFailedLogged" + type="notify"> + <tag>fail</tag> +Request for special powers failed. This request has been logged. + </notification> + + <notification + icon="alertmodal.tga" + name="ExpireExplanation" + type="notify"> + <tag>fail</tag> +The system is currently unable to process your request. The request timed out. + </notification> + + <notification + icon="alertmodal.tga" + name="DieExplanation" + type="notify"> + <tag>fail</tag> +The system is unable to process your request. + </notification> + + <notification + icon="alertmodal.tga" + name="AddPrimitiveFailure" + type="notify"> + <tag>fail</tag> +Insufficient funds to create primitve. + </notification> + + <notification + icon="alertmodal.tga" + name="RezObjectFailure" + type="notify"> + <tag>fail</tag> +Insufficient funds to create object. + </notification> + + <notification + icon="alertmodal.tga" + name="ResetHomePositionNotLegal" + type="notify"> + <tag>fail</tag> +Reset Home position since Home wasn't legal. + </notification> + + <notification + icon="alertmodal.tga" + name="CantInviteRegionFull" + type="notify"> + <tag>fail</tag> +You cannot currently invite anyone to your location because the region is full. Try again later. + </notification> + + <notification + icon="alertmodal.tga" + name="CantSetHomeAtRegion" + type="notify"> + <tag>fail</tag> +This region does not allow you to set your home location here. + </notification> + + <notification + icon="alertmodal.tga" + name="ListValidHomeLocations" + type="notify"> + <tag>fail</tag> +You can only set your 'Home Location' on your land or at a mainland Infohub. + </notification> + + <notification + icon="alertmodal.tga" + name="SetHomePosition" + type="notify"> + <tag>fail</tag> +Home position set. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDerezInventoryError" + type="notify"> + <tag>fail</tag> +Cannot derez object due to inventory fault. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateRequestedInv" + type="notify"> + <tag>fail</tag> +Cannot create requested inventory. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateRequestedInvFolder" + type="notify"> + <tag>fail</tag> +Cannot create requested inventory folder. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateInventory" + type="notify"> + <tag>fail</tag> +Cannot create that inventory. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateLandmark" + type="notify"> + <tag>fail</tag> +Cannot create landmark. + </notification> + + <notification + icon="alertmodal.tga" + name="CantCreateOutfit" + type="notify"> + <tag>fail</tag> +Cannot create outfit right now. Try again in a minute. + </notification> + + <notification + icon="alertmodal.tga" + name="InventoryNotForSale" + type="notify"> + <tag>fail</tag> +Inventory is not for sale. + </notification> + + <notification + icon="alertmodal.tga" + name="CantFindInvItem" + type="notify"> + <tag>fail</tag> +Unable to find inventory item. + </notification> + + <notification + icon="alertmodal.tga" + name="CantFindObject" + type="notify"> + <tag>fail</tag> +Unable to find object. + </notification> + + <notification + icon="alertmodal.tga" + name="CantTransfterMoneyRegionDisabled" + type="notify"> + <tag>fail</tag> +Money transfers to objects are currently disabled in this region. + </notification> + + <notification + icon="alertmodal.tga" + name="CantPayNoAgent" + type="notify"> + <tag>fail</tag> +Could not figure out who to pay. + </notification> + + <notification + icon="alertmodal.tga" + name="CantDonateToPublicObjects" + type="notify"> + <tag>fail</tag> +You cannot give L$ to public objects. + </notification> + + <notification + icon="alertmodal.tga" + name="InventoryCreationInWorldObjectFailed" + type="notify"> + <tag>fail</tag> +Inventory creation on in-world object failed. + </notification> + + <notification + icon="alertmodal.tga" + name="UserBalanceOrLandUsageError" + type="notify"> + <tag>fail</tag> +An internal error prevented us from properly updating your viewer. The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers. + </notification> + + <notification + icon="alertmodal.tga" + name="LargePrimAgentIntersect" + type="notify"> + <tag>fail</tag> +Cannot create large prims that intersect other players. Please re-try when other players have moved. + </notification> + + <notification + icon="alertmodal.tga" + name="PreferenceChatClearLog" + type="alertmodal"> + This will delete the logs of previous conversations, and any backups of that file. + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm before I delete the log of previous conversations." + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="PreferenceChatDeleteTranscripts" + type="alertmodal"> + This will delete the transcripts for all previous conversations. The list of past conversations will not be affected. All files with the suffixes .txt and txt.backup in the folder [FOLDER] will be deleted. + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm before I delete transcripts." + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alert.tga" + name="PreferenceChatPathChanged" + type="alert"> + Unable to move files. Restored previous path. + <usetemplate + ignoretext="Unable to move files. Restored previous path." + name="okignore" + yestext="OK"/> + </notification> + </notifications> diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml index 2a24c74feb..2a24c74feb 100644..100755 --- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml index 3e3271b181..3e3271b181 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml deleted file mode 100644 index 9369d1b5cf..0000000000 --- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - name="panel_activeim_row" - layout="topleft" - follows="left|right" - top="0" - left="0" - height="35" - width="318" - background_opaque="false" - background_visible="true" - bg_alpha_color="0.0 0.0 0.0 0.0" > - <chiclet_im_p2p - name="p2p_chiclet" - layout="topleft" - follows="left" - top="3" - left="5" - height="25" - width="25" - visible="false" - speaker.name="speaker_p2p" - speaker.width="20" - speaker.height="25" - speaker.left="25" - speaker.top="25" - speaker.auto_update="true" - speaker.draw_border="false" - speaker.visible="false"> - </chiclet_im_p2p> - <chiclet_im_group - name="group_chiclet" - layout="topleft" - follows="left" - top="3" - left="5" - height="25" - width="25" - visible="false" - speaker.name="speaker_grp" - speaker.width="20" - speaker.height="25" - speaker.left="25" - speaker.top="25" - speaker.auto_update="true" - speaker.draw_border="false" - speaker.visible="false"> - </chiclet_im_group> - <chiclet_im_adhoc - name="adhoc_chiclet" - layout="topleft" - follows="left" - top="3" - left="5" - height="25" - width="25" - visible="false" - speaker.name="speaker_hoc" - speaker.width="20" - speaker.height="25" - speaker.left="25" - speaker.top="25" - speaker.auto_update="true" - speaker.draw_border="false" - speaker.visible="false"> - </chiclet_im_adhoc> - <text - translate="false" - type="string" - name="contact_name" - layout="topleft" - top="10" - left_pad="10" - height="14" - width="250" - length="1" - follows="right|left" - parse_urls="false" - use_ellipses="true" - font="SansSerifBold"> - TestString PleaseIgnore - </text> - <button - top="10" - right="-5" - width="17" - height="17" - layout="topleft" - follows="right" - name="hide_btn" - mouse_opaque="true" - label="" - tab_stop="false" - image_unselected="Toast_CloseBtn" - image_selected="Toast_CloseBtn" - /> -</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml deleted file mode 100644 index d68fa6ca6c..0000000000 --- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - border="false" - follows="all" - height="215" - name="panel_im_control_panel" - width="150"> - <layout_stack - mouse_opaque="false" - border_size="0" - clip="false" - follows="all" - height="215" - layout="topleft" - left="3" - name="vertical_stack" - orientation="vertical" - top="0" - width="147"> - <layout_panel - auto_resize="true" - follows="top|left" - height="130" - layout="topleft" - left="0" - min_height="0" - mouse_opaque="false" - width="147" - top="0" - name="speakers_list_panel"> - <avatar_list - color="DkGray2" - follows="all" - height="130" - ignore_online_status="true" - layout="topleft" - name="speakers_list" - opaque="false" - show_info_btn="true" - show_profile_btn="false" - show_speaking_indicator="false" - width="147" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="130" - name="call_btn_panel" - visible="false"> - <button - follows="all" - height="20" - label="Call" - name="call_btn" - width="130" - top="0" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="130" - name="end_call_btn_panel" - visible="false"> - <button - follows="all" - height="20" - label="Leave Call" - name="end_call_btn" - top="0"/> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="130" - name="voice_ctrls_btn_panel" - visible="false"> - <button - follows="all" - height="20" - label="Voice Controls" - name="voice_ctrls_btn" - top="0" - use_ellipses="true" /> - </layout_panel> - </layout_stack> -</panel> 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 b7c58eb6ab..aa1b929412 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -129,6 +129,7 @@ left_pad="3" right="-53" name="info_btn" + tool_tip="More info" tab_stop="false" top_delta="0" width="16" /> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml index b779b08a63..b779b08a63 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 7c67fd7f83..53d0252215 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -4,88 +4,99 @@ follows="left|top|right|bottom" height="305" layout="topleft" + left="0" name="block_list_panel" help_topic="blocked_list" min_height="350" min_width="240" - width="280"> - <button - follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" - layout="topleft" - name="back" - left="4" - tab_stop="false" - top="1" - width="30"/> - <text - follows="top|left|right" - font="SansSerifLargeBold" - height="20" - layout="topleft" - left_pad="10" - name="title_text" - text_color="White" - top="5" - width="250"> - Block List - </text> - <scroll_list + width="323"> + <panel + follows="left|top|right" + height="27" + label="bottom_panel" + layout="topleft" + left="0" + name="blocked_buttons_panel" + right="-1" + top="0"> + <filter_editor + follows="left|top|right" + height="23" + layout="topleft" + left="6" + label="Filter" + max_length_chars="300" + name="blocked_filter_input" + text_color="Black" + text_pad_left="10" + top="4" + width="177" /> + <menu_button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="8" + menu_filename="menu_people_blocked_gear.xml" + menu_position="bottomleft" + name="blocked_gear_btn" + tool_tip="Actions on selected person or object" + top="3" + width="31" /> + <menu_button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_sort" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="2" + menu_filename="menu_people_blocked_view.xml" + menu_position="bottomleft" + name="view_btn" + tool_tip="Sort options" + top_delta="0" + width="31" /> + <menu_button + follows="right" + 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="2" + menu_filename="menu_people_blocked_plus.xml" + menu_position="bottomleft" + name="plus_btn" + tool_tip="Pick a Resident or an object to block" + top_delta="0" + width="31"/> + <button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + left_pad="2" + layout="topleft" + name="unblock_btn" + tool_tip="Remove Resident or object from blocked list" + top_delta="0" + width="31"/> + </panel> + <block_list follows="all" - height="190" + height="273" layout="topleft" - left="5" + left="3" name="blocked" tool_tip="List of currently blocked Residents" - top="30" - width="270"> - <scroll_list.columns - name="item_name" /> - <scroll_list.columns - name="item_type" - width="96" /> - </scroll_list> - <button - follows="left|bottom" - height="23" - label="Block person" - layout="topleft" - left_delta="0" - name="Block resident..." - tool_tip="Pick a Resident to block" - top_pad="4" - width="210"> - <button.commit_callback - function="Block.ClickPick" /> - </button> - <button - follows="left|bottom" - height="23" - label="Block object by name" - layout="topleft" - left_delta="0" - name="Block object by name..." - tool_tip="Pick an object to block by name" - top_pad="4" - width="210" > - <button.commit_callback - function="Block.ClickBlockByName" /> - </button> - <button - enabled="false" - follows="left|bottom" - height="23" - label="Unblock" - layout="topleft" - left_delta="0" - name="Unblock" - tool_tip="Remove Resident or object from blocked list" - top_pad="4" - width="210" > - <button.commit_callback - function="Block.ClickRemove" /> - </button> + top="31" + right="-1"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml new file mode 100755 index 0000000000..752321b949 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="blocked_list_item" + top="0" + width="380"> + <icon + height="24" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="380" /> + <icon + follows="top|right|left" + height="24" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="380" /> + <avatar_icon + default_icon_name="Generic_Person" + follows="top|left" + height="20" + layout="topleft" + left="5" + mouse_opaque="true" + top="2" + visible="false" + width="20" /> + <group_icon + default_icon_name="Generic_Group" + follows="top|left" + height="20" + layout="topleft" + left="5" + mouse_opaque="true" + top="2" + visible="false" + width="20" /> + <icon + follows="top|left" + height="16" + image_name="Inv_Object" + layout="topleft" + left="7" + name="object_icon" + top="4" + visible="false" + width="16" /> + <text + follows="left|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="item_name" + parse_urls="false" + top="6" + use_ellipses="true" + width="180" /> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml index 216a265164..216a265164 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml index dc123f13f4..dc123f13f4 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml index f4722b05d6..27a27473d8 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml @@ -46,7 +46,7 @@ follows="left|right" top="4" width="310" - name="chat_bar" + name="nearby_chat" mouse_opaque="false"/> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 5c5c718bdf..5c5c718bdf 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml index 1ef99649e6..1ef99649e6 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml index 357dbc07cc..357dbc07cc 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_chat_separator.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml index ff0146490b..fc321fdd23 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml @@ -87,54 +87,6 @@ layout="topleft" min_height="28" min_width="37" - name="im_well_panel" - top="0" - width="37"> - <chiclet_im_well - follows="right" - height="28" - layout="topleft" - left="0" - max_displayed_count="99" - name="im_well" - top="0" - width="35"> - <!-- -Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button -xml attribute Description -image_unselected "Unlit" - there are no new messages -image_selected "Unlit" + "Selected" - there are no new messages and the Well is open -image_pressed "Lit" - there are new messages -image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open - --> - <button - auto_resize="false" - follows="right" - halign="center" - height="23" - image_overlay="Unread_IM" - image_overlay_alignment="center" - image_pressed="WellButton_Lit" - image_pressed_selected="WellButton_Lit_Selected" - image_selected="PushButton_Press" - label_color="Black" - left="0" - name="Unread IM messages" - tool_tip="Conversations" - width="34"> - <init_callback - function="Button.SetDockableFloaterToggle" - parameter="im_well_window" /> - </button> - </chiclet_im_well> - </layout_panel> - <layout_panel - auto_resize="false" - follows="right" - height="28" - layout="topleft" - min_height="28" - min_width="37" name="notification_well_panel" top="0" width="37"> 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 d4a2745d1d..d4a2745d1d 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index 27c653bc35..27c653bc35 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml index 5b3f0b17a9..5b3f0b17a9 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml index cc0541e65c..cc0541e65c 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml index aa8e3d07a6..aa8e3d07a6 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml new file mode 100755 index 0000000000..a054e71e34 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|top|right" + height="24" + layout="topleft" + name="conversation_list_item" + mouse_opaque="false" + width="120"> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left="5" + top="2" + visible="false" + width="20" /> + <group_icon + follows="top|left" + height="20" + default_icon_name="Generic_Group" + layout="topleft" + left="5" + top="2" + visible="false" + width="20" /> + <icon + follows="top|left" + height="20" + image_name="Nearby_chat_icon" + layout="topleft" + left="5" + name="nearby_chat_icon" + top="2" + visible="false" + width="20"/> + <layout_stack + animate="false" + follows="all" + height="24" + layout="topleft" + left="30" + mouse_opaque="false" + name="conversation_item_stack" + orientation="horizontal" + top="0" + width="90"> + <layout_panel + auto_resize="false" + user_resize="false" + height="24" + mouse_opaque="false" + name="call_icon_panel" + visible="false" + width="20"> + <icon + height="18" + follows="top|right|left" + image_name="Conv_toolbar_open_call" + layout="topleft" + left="0" + name="selected_icon" + top="3" + width="18" /> + </layout_panel> + <layout_panel + auto_resize="true" + user_resize="false" + height="24" + mouse_opaque="false" + name="conversation_title_panel" + width="70"> + <text + follows="left|top|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left="5" + name="conversation_title" + parse_urls="false" + top="6" + use_ellipses="true" + value="(loading)" + width="35" /> + <output_monitor + auto_update="true" + follows="top|right" + draw_border="false" + height="16" + layout="topleft" + left_pad="5" + mouse_opaque="true" + name="speaking_indicator" + visible="false" + width="20" /> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml new file mode 100755 index 0000000000..78d4c174d2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="conversation_log_list_item" + top="0" + width="380"> + <icon + height="24" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="380" /> + <icon + follows="top|right|left" + height="24" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="380" /> + <icon + follows="top|left" + height="20" + layout="topleft" + left="5" + image_name="Conv_toolbar_open_call" + mouse_opaque="true" + name="voice_session_icon" + tool_tip="Included a voice conversation" + top="2" + visible="false" + width="20" /> + <icon + follows="top|left" + height="20" + layout="topleft" + left="5" + image_name="Conv_log_inbox" + mouse_opaque="false" + name="unread_ims_icon" + tool_tip="Messages arrived while you were logged out" + top="2" + visible="false" + width="20" /> + <avatar_icon + default_icon_name="Generic_Person" + follows="top|left" + height="20" + layout="topleft" + left_pad="5" + mouse_opaque="true" + top="2" + visible="false" + width="20" /> + <group_icon + default_icon_name="Generic_Group" + follows="top|left" + height="20" + layout="topleft" + mouse_opaque="true" + top="2" + visible="false" + width="20" /> + <text + follows="left|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="conversation_name" + parse_urls="false" + top="6" + use_ellipses="true" + width="180" /> + <text + follows="right" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="date_time" + parse_urls="false" + top="6" + use_ellipses="true" + width="110"/> + <button + name="delete_btn" + tool_tip="Remove this entry" + layout="topleft" + follows="top|right" + image_unselected="Conv_toolbar_close" + image_selected="Conv_toolbar_close" + top="5" + left_pad="0" + height="14" + width="14" + tab_stop="false"/> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml index de2ff0afc9..de2ff0afc9 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml index 4b05ab27e4..4b05ab27e4 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml index 813aa5d7a9..813aa5d7a9 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml 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 3509eaa285..3509eaa285 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml index f173a2f3cb..f173a2f3cb 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml index 8c0c543d71..8c0c543d71 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml index 6bb5d2fa9b..6bb5d2fa9b 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml index 0f8c37c691..0f8c37c691 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml index dd749a9259..dd749a9259 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml index 0092ceb0dd..0092ceb0dd 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml 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 553c112e6f..553c112e6f 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml 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 2c7c8133d1..2c7c8133d1 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml index d295f5fe4a..d295f5fe4a 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml index 5424b805e1..5424b805e1 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml index 859e7454a4..859e7454a4 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml index b61f65a3d1..b61f65a3d1 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml index 76d66cc5dc..76d66cc5dc 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml index 5f978174b3..5f978174b3 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml index 97f1a1a658..97f1a1a658 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml index 16f28377fb..16f28377fb 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml index 059485cfb4..059485cfb4 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml 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 f34b913218..f34b913218 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml index eea92895f5..eea92895f5 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_generic_tip.xml +++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml deleted file mode 100644 index ad10e53a4e..0000000000 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - border="false" - follows="all" - height="238" - name="panel_im_control_panel" - width="150"> - <layout_stack - mouse_opaque="false" - border_size="0" - clip="false" - follows="all" - height="238" - layout="topleft" - left="5" - name="vertical_stack" - orientation="vertical" - top="0" - width="145"> - <layout_panel - auto_resize="true" - follows="top|left" - height="100" - layout="topleft" - min_height="0" - mouse_opaque="false" - width="145" - top="0" - name="speakers_list_panel"> - <avatar_list - color="DkGray2" - follows="all" - height="100" - ignore_online_status="true" - layout="topleft" - name="speakers_list" - opaque="false" - show_info_btn="true" - show_profile_btn="false" - show_speaking_indicator="false" - width="145" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="28" - layout="topleft" - min_height="28" - width="130" - name="group_info_btn_panel"> - <button - follows="left|right|bottom" - height="23" - label="Group Profile" - name="group_info_btn" - use_ellipses="true" - top="5" - width="130" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="28" - layout="topleft" - min_height="28" - width="130" - name="call_btn_panel"> - <button - follows="all" - height="23" - label="Call Group" - name="call_btn" - use_ellipses="true" - width="130" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="28" - layout="topleft" - min_height="28" - width="130" - name="end_call_btn_panel" - visible="false"> - <button - follows="all" - height="23" - label="Leave Call" - name="end_call_btn" - use_ellipses="true" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="28" - layout="topleft" - min_height="28" - width="130" - name="voice_ctrls_btn_panel" - visible="false"> - <button - follows="all" - height="23" - label="Open Voice Controls" - name="voice_ctrls_btn" - use_ellipses="true" /> - </layout_panel> - </layout_stack> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 38b680ba86..38b680ba86 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml 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 206496cc0e..206496cc0e 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index 124c0596c3..124c0596c3 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index d4da55e32e..d4da55e32e 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml 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 12735026fa..cfe3aeb7c9 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -56,6 +56,7 @@ left_pad="3" right="-31" name="info_btn" + tool_tip="More info" tab_stop="false" top_delta="-2" width="16" /> diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 6d5fb51e85..6d5fb51e85 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index cded4cf31a..cded4cf31a 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index eea2606125..df91ad8b5e 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -254,7 +254,7 @@ things in this group. There's a broad variety of Abilities. column_padding="0" draw_stripes="true" height="200" - follows="left|top" + follows="left|top|right" layout="topleft" left="0" right="-1" diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml index f7434f0330..f7434f0330 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_hint.xml +++ b/indra/newview/skins/default/xui/en/panel_hint.xml diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml index df05d50dc5..df05d50dc5 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_hint_image.xml +++ b/indra/newview/skins/default/xui/en/panel_hint_image.xml diff --git a/indra/newview/skins/default/xui/en/panel_hud.xml b/indra/newview/skins/default/xui/en/panel_hud.xml index 3e9614a9b7..3e9614a9b7 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_hud.xml +++ b/indra/newview/skins/default/xui/en/panel_hud.xml diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml deleted file mode 100644 index 8fcd6ccbaf..0000000000 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ /dev/null @@ -1,166 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - border="false" - height="300" - name="panel_im_control_panel" - width="150"> - <avatar_icon - follows="left|top" - height="105" - left_delta="20" - name="avatar_icon" - top="-5" - width="114"/> - <layout_stack - mouse_opaque="false" - border_size="0" - clip="false" - follows="all" - height="183" - layout="topleft" - left="5" - name="button_stack" - orientation="vertical" - top_pad="5" - width="145"> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="20" - layout="topleft" - left="2" - min_height="20" - width="140" - name="view_profile_btn_panel" - top="0" > - <button - follows="left|top|right" - height="23" - label="Profile" - name="view_profile_btn" - top="0" - width="140" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="140" - name="add_friend_btn_panel"> - <button - follows="left|top|right" - height="23" - label="Add Friend" - name="add_friend_btn" - top="5" - width="140" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="140" - name="teleport_btn_panel"> - <button - auto_resize="false" - follows="left|top|right" - height="23" - label="Teleport" - name="teleport_btn" - tool_tip = "Offer to teleport this person" - width="140" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="140" - name="share_btn_panel"> - <button - auto_resize="true" - follows="left|top|right" - height="23" - label="Share" - name="share_btn" - width="140" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="140" - name="pay_btn_panel"> - <button - auto_resize="true" - follows="left|top|right" - height="23" - label="Pay" - name="pay_btn" - width="140" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="140" - name="call_btn_panel"> - <button - follows="left|top|right" - height="23" - label="Call" - name="call_btn" - width="140" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="140" - name="end_call_btn_panel" - visible="false"> - <button - follows="left|top|right" - height="23" - label="End Call" - name="end_call_btn" - width="140" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="top|left|right" - height="25" - layout="topleft" - min_height="25" - width="140" - name="voice_ctrls_btn_panel" - visible="false"> - <button - follows="left|top|right" - height="23" - label="Voice Controls" - name="voice_ctrls_btn" - width="140" /> - </layout_panel> - <layout_panel - mouse_opaque="false" - auto_resize="true" - follows="top|left" - height="0" - layout="topleft" - min_height="0" - width="140" - name="spacer"/> - </layout_stack> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml index 413e22e444..433a3181cd 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml @@ -2,7 +2,7 @@ <inbox_inventory_panel accepts_drag_and_drop="false" name="inventory_inbox" - start_folder="Received Items" + start_folder.type="inbox" follows="all" layout="topleft" top="0" left="0" height="165" width="308" top_pad="0" diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index 2e5d650902..2e5d650902 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml index 2e38835810..2e38835810 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/en/panel_inventory_item.xml 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 fd6e96b9a7..fd6e96b9a7 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index 2a5933e3e9..67a09949ce 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -35,7 +35,9 @@ left="0" mouse_opaque="true" name="favorites_list" - start_folder="Favorites" + scroll.hide_scrollbar="true" + folder_view.use_ellipses="true" + start_folder.name="Favorites" width="307"/> </accordion_tab> <accordion_tab @@ -51,7 +53,9 @@ left="0" mouse_opaque="true" name="landmarks_list" - start_folder="Landmarks" + scroll.hide_scrollbar="true" + folder_view.use_ellipses="true" + start_folder.name="Landmarks" width="307"/> </accordion_tab> <accordion_tab @@ -67,7 +71,9 @@ left="0" mouse_opaque="true" name="my_inventory_list" - start_folder="My Inventory" + scroll.hide_scrollbar="true" + folder_view.use_ellipses="true" + start_folder.name="My Inventory" width="307"/> </accordion_tab> <accordion_tab @@ -83,7 +89,9 @@ left="0" mouse_opaque="true" name="library_list" - start_folder="LIBRARY" + scroll.hide_scrollbar="true" + folder_view.use_ellipses="true" + start_folder.name="LIBRARY" width="313"/> </accordion_tab> </accordion> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 134ca75018..134ca75018 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 1c882bb099..1c882bb099 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml index 23e7814cad..23e7814cad 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_me.xml +++ b/indra/newview/skins/default/xui/en/panel_me.xml diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index cdf14572fe..e844a15118 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -30,7 +30,7 @@ (This page does not pass the specified whitelist) </text> <line_editor - max_length="1024" + max_length_bytes="1024" bottom_delta="-24" enabled="true" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml index d3a58fed58..d3a58fed58 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml index 1f580831f9..1f580831f9 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 3edeb9aa36..3edeb9aa36 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml index d683116eb8..4de56b424e 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml @@ -1,20 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel follows="all" - height="300" + top="0" + bottom_delta="10" help_topic="nearby_chat" layout="topleft" name="nearby_chat" - width="320"> + width="242" + height="169"> <layout_stack follows="all" - height="295" + height="164" layout="topleft" left="0" name="stack" top="5" orientation="vertical" - width="320"> + width="242"> <layout_panel auto_resize="false" height="26" @@ -23,7 +25,7 @@ name="translate_chat_checkbox_lp" top_delta="0" visible="true" - width="313"> + width="230"> <check_box top="10" control_name="TranslateChat" @@ -33,15 +35,15 @@ layout="topleft" left="5" name="translate_chat_checkbox" - width="300" /> + width="230" /> </layout_panel> <layout_panel auto_resize="true" - height="277" + height="138" left_delta="0" layout="topleft" name="chat_history_lp" - width="318"> + width="242"> <chat_history bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" @@ -49,7 +51,7 @@ layout="topleft" left="5" left_widget_pad="0" - height="272" + height="138" name="chat_history" parse_highlights="true" parse_urls="true" @@ -57,7 +59,7 @@ text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" top="0" - width="313" /> + width="237" /> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 6bc9c48729..19143cef89 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -5,7 +5,7 @@ height="25" layout="topleft" left="0" - name="chat_bar" + name="nearby_chat" top="21" width="308"> <line_editor diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index d1cb64f7ad..d1cb64f7ad 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 94c468e1bb..94c468e1bb 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml index c3dc588ba2..c3dc588ba2 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml index d5b6057233..d5b6057233 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml index dadbd9c9ab..dadbd9c9ab 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml index a3d39e55af..c80e5b168a 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<outbox_inventory_panel +<inventory_panel name="inventory_outbox" - start_folder="Outbox" + start_folder.name="Outbox" + show_empty_message="false" + show_load_status="false" + start_folder.type="outbox" follows="all" layout="topleft" top="0" left="0" height="165" width="308" top_pad="0" @@ -12,6 +15,18 @@ bevel_style="none" show_item_link_overlays="true" tool_tip="Drag and drop items here to prepare them for sale on your storefront" - > - <scroll reserve_scroll_corner="false" /> -</outbox_inventory_panel> + scroll.reserve_scroll_corner="false"> + <folder folder_arrow_image="Folder_Arrow" + folder_indentation="8" + item_height="20" + item_top_pad="4" + selection_image="Rounded_Square" + left_pad="5" + icon_pad="2" + icon_width="16" + text_pad="1" + text_pad_right="4" + arrow_size="12" + max_folder_item_overlap="2"/> + <item allow_open="false"/> +</inventory_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 b61f110e32..b61f110e32 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml 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 405d9513db..405d9513db 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml index 2c7a51f0e7..2c7a51f0e7 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml index a0096adc01..a0096adc01 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml index d85b778db2..d85b778db2 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 98c7c49ff4..7ce2627be9 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -38,12 +38,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M name="no_filtered_friends_msg"> Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]. </string> - <string - name="people_filter_label" - value="Filter People" /> - <string - name="groups_filter_label" - value="Filter Groups" /> <!-- *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes. They are not defined as translatable in VLT. See EXT-5931 @@ -60,21 +54,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M <string name="AltMiniMapToolTipMsg" value="[REGION](Double-click to teleport, shift-drag to pan)"/> - <filter_editor - follows="left|top|right" - height="23" - layout="topleft" - left="10" - label="Filter" - max_length_chars="300" - name="filter_input" - text_color="Black" - text_pad_left="10" - top="3" - width="303" /> <tab_container + bottom="-10" follows="all" - height="383" layout="topleft" left="3" name="tabs" @@ -82,31 +64,120 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M tab_min_width="70" tab_height="30" tab_position="top" - top_pad="10" + top="0" halign="center" - width="319"> - <panel + right="-5"> + +<!-- ================================= NEARBY tab =========================== --> + + <panel background_opaque="true" background_visible="true" bg_alpha_color="DkGray" bg_opaque_color="DkGray" + bottom="-1" follows="all" - height="383" label="NEARBY" layout="topleft" left="0" help_topic="people_nearby_tab" name="nearby_panel" - top="0" - width="313"> + right="-1" + top="0"> + <panel + follows="left|top|right" + height="27" + label="bottom_panel" + layout="topleft" + left="0" + name="nearby_buttons_panel" + right="-1" + top="0"> + <filter_editor + follows="left|top|right" + height="23" + layout="topleft" + left="6" + label="Filter People" + max_length_chars="300" + name="nearby_filter_input" + text_color="Black" + text_pad_left="10" + top="4" + width="178" /> + <button + commit_callback.function="People.Gear" + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="7" + name="gear_btn" + tool_tip="Actions on selected person" + top="3" + width="31" /> + <menu_button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_sort" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="2" + menu_filename="menu_people_nearby_view.xml" + menu_position="bottomleft" + name="nearby_view_btn" + tool_tip="View/sort options" + top_delta="0" + width="31" /> + <button + follows="right" + 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="2" + name="add_friend_btn" + tool_tip="Offer friendship to a resident" + top_delta="0" + width="31"> + <commit_callback + function="People.AddFriend" /> + </button> + <dnd_button + enabled="false" + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + left_pad="2" + layout="topleft" + name="nearby_del_btn" + tool_tip="Remove selected person as a friend" + top_delta="0" + width="31"> + <commit_callback + function="People.DelFriend" /> + </dnd_button> + </panel> <layout_stack clip="false" follows="all" - height="355" + height="410" layout="topleft" + left="0" mouse_opaque="false" orientation="vertical" - width="313"> + right="-1" + top_pad="0"> <layout_panel height="142" layout="topleft" @@ -123,16 +194,16 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M left="3" mouse_opaque="false" name="Net Map" - top="4" - width="305"/> + right="-1" + top="4" /> </layout_panel> <layout_panel height="213" layout="topleft" min_dim="100" mouse_opaque="false" - user_resize="true" - width="313"> + right="-1" + user_resize="true"> <avatar_list allow_select="true" follows="all" @@ -143,84 +214,122 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M keep_one_selected="false" multi_select="true" name="avatar_list" - top="2" - width="306" /> + right="-1" + top="2" /> </layout_panel> </layout_stack> - <panel - background_visible="true" - follows="left|right|bottom" - height="27" - label="bottom_panel" - layout="topleft" - left="3" - name="bottom_panel" - top_pad="0" - width="313"> - <menu_button - follows="bottom|left" - 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="nearby_view_sort_btn" - tool_tip="Options" - 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_friend_btn" - tool_tip="Add selected Resident to your friends List" - width="31"> - <commit_callback - function="People.addFriend" /> - </button> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="dummy_icon" - width="243" - /> - </panel> </panel> + +<!-- ================================= FRIENDS tab ========================== --> + <panel background_opaque="true" background_visible="true" bg_alpha_color="DkGray" bg_opaque_color="DkGray" + bottom="-1" follows="all" - height="383" - label="MY FRIENDS" + label="FRIENDS" layout="topleft" left="0" help_topic="people_friends_tab" name="friends_panel" - top="0" - width="313"> + right="-1" + top="0"> + <panel + follows="left|top|right" + height="27" + label="bottom_panel" + layout="topleft" + left="0" + name="friends_buttons_panel" + right="-1" + top="0"> + <filter_editor + follows="left|top|right" + height="23" + layout="topleft" + left="6" + label="Filter People" + max_length_chars="300" + name="friends_filter_input" + text_color="Black" + text_pad_left="10" + top="4" + width="177" /> + <button + commit_callback.function="People.Gear" + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="8" + name="gear_btn" + tool_tip="Actions on selected person" + top="3" + width="31" /> + <menu_button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_sort" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="2" + menu_filename="menu_people_friends_view.xml" + menu_position="bottomleft" + name="friends_view_btn" + tool_tip="View/sort options" + top_delta="0" + width="31" /> + <button + follows="right" + 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="2" + name="friends_add_btn" + tool_tip="Offer friendship to a resident" + top_delta="0" + width="31"> + <commit_callback + function="People.AddFriendWizard" /> + </button> + <dnd_button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + left_pad="2" + layout="topleft" + name="friends_del_btn" + tool_tip="Remove selected person as a friend" + top_delta="0" + width="31"> + <commit_callback + function="People.DelFriend" /> + </dnd_button> + </panel> <accordion background_visible="true" bg_alpha_color="DkGray2" bg_opaque_color="DkGray2" follows="all" - height="356" + height="408" layout="topleft" left="3" name="friends_accordion" - top="0" - width="307"> + right="-2" + top_pad="2"> <accordion_tab layout="topleft" height="172" @@ -257,247 +366,133 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M width="307" /> </accordion_tab> </accordion> - <panel - background_visible="true" - follows="left|right|bottom" - height="27" - label="bottom_panel" - layout="topleft" - left="3" - 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="308"> - <layout_panel - auto_resize="false" - height="25" - layout="topleft" - name="options_gear_btn_panel" - width="32"> - <menu_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="210"> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left="0" - top="0" - name="dummy_icon" - width="210" /> - </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="del_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" - 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="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="Offer friendship to a Resident" - width="31" /> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left_pad="1" - name="dummy_icon" - width="209" - /> - <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="del_btn" - tool_tip="Remove selected person from your Friends list" - width="31" /> - --></panel> <text follows="all" height="450" left="13" name="no_friends_help_text" - top="10" - width="293" + right="-13" + top="37" wrap="true" /> </panel> + +<!-- ================================= GROUPS tab =========================== --> + <panel background_opaque="true" background_visible="true" bg_alpha_color="DkGray" bg_opaque_color="DkGray" + bottom="-1" follows="all" - height="383" - label="MY GROUPS" + label="GROUPS" layout="topleft" left="0" help_topic="people_groups_tab" name="groups_panel" - top="0" - width="313"> + right="-1" + top="0"> <!-- *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931 Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild() --> - <group_list - allow_select="true" - follows="all" - height="356" - layout="topleft" - left="3" - name="group_list" - top="0" - width="307" /> <panel - background_visible="true" - follows="left|right|bottom" + follows="left|top|right" height="27" label="bottom_panel" layout="topleft" left="0" - name="bottom_panel" - top_pad="0" - width="313"> - <menu_button - follows="bottom|left" - tool_tip="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="3" - name="groups_viewsort_btn" - top="1" - width="31" /> - <button - follows="bottom|left" + name="groups_buttons_panel" + right="-1" + top="0"> + <filter_editor + follows="left|top|right" + height="23" + layout="topleft" + left="6" + label="Filter Groups" + max_length_chars="300" + name="groups_filter_input" + text_color="Black" + text_pad_left="10" + top="4" + width="177" /> + <menu_button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="8" + name="groups_gear_btn" + tool_tip="Actions on selected group" + top="3" + width="31" /> + <menu_button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_sort" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="2" + menu_filename="menu_people_groups_view.xml" + menu_position="bottomleft" + name="groups_view_btn" + tool_tip="View/sort options" + top_delta="0" + width="31" /> + <menu_button + follows="right" 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" + left_pad="2" + menu_filename="menu_group_plus.xml" + menu_position="bottomleft" name="plus_btn" tool_tip="Join group/Create new group" - width="31" /> - <button - follows="bottom|left" + top_delta="0" + width="31"> + <validate_callback + function="People.Group.Plus.Validate" /> + </menu_button> + <dnd_button + follows="right" height="25" image_hover_unselected="Toolbar_Middle_Over" - image_overlay="Activate_Checkmark" + image_overlay="TrashItem_Off" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" + left_pad="2" layout="topleft" - left_pad="1" - name="activate_btn" - tool_tip="Activate selected group" - width="31" /> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="dummy_icon" - width="212" - /> + name="minus_btn" + tool_tip="Leave selected group" + top_delta="0" + width="31"> + <commit_callback + function="People.Group.Minus" /> + </dnd_button> </panel> + <group_list + allow_select="true" + follows="all" + height="406" + layout="topleft" + left="3" + name="group_list" + right="-2" + top_pad="4" /> </panel> + +<!-- ================================= RECENT tab =========================== --> + <panel background_opaque="true" background_visible="true" @@ -510,265 +505,133 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M left="0" help_topic="people_recent_tab" name="recent_panel" - top="0" - width="313"> - <avatar_list - allow_select="true" - follows="all" - height="356" - layout="topleft" - left="3" - multi_select="true" - name="avatar_list" - show_last_interaction_time="true" - top="0" - width="307" /> + right="-1" + top="0"> <panel - background_visible="true" - follows="left|right|bottom" + follows="left|top|right" height="27" label="bottom_panel" layout="topleft" - left="3" - name="bottom_panel" - top_pad="0" - width="313"> - <menu_button - follows="bottom|left" - tool_tip="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" - name="recent_viewsort_btn" - top="1" - width="31" /> - <button - follows="bottom|left" + left="0" + name="recent_buttons_panel" + right="-1" + top="0"> + <filter_editor + follows="left|top|right" + height="23" + layout="topleft" + left="6" + label="Filter People" + max_length_chars="300" + name="recent_filter_input" + text_color="Black" + text_pad_left="10" + top="4" + width="177" /> + <button + commit_callback.function="People.Gear" + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="8" + name="gear_btn" + tool_tip="Actions on selected person" + top="3" + width="31" /> + <menu_button + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_toolbar_sort" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="2" + menu_filename="menu_people_recent_view.xml" + menu_position="bottomleft" + name="recent_view_btn" + tool_tip="View/sort options" + top_delta="0" + width="31" /> + <button + follows="right" 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" + left_pad="2" name="add_friend_btn" - tool_tip="Add selected Resident to your friends List" + tool_tip="Offer friendship to a resident" + top_delta="0" width="31"> - <commit_callback - function="People.addFriend" /> - </button> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="dummy_icon" - width="244" - /> + <commit_callback + function="People.AddFriend" /> + </button> + <dnd_button + enabled="false" + follows="right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + left_pad="2" + layout="topleft" + name="recent_del_btn" + tool_tip="Remove selected person as a friend" + top_delta="0" + width="31"> + <commit_callback + function="People.DelFriend" /> + </dnd_button> </panel> + <avatar_list + allow_select="true" + follows="all" + height="351" + layout="topleft" + left="3" + multi_select="true" + name="avatar_list" + show_last_interaction_time="true" + right="-2" + top_pad="4" /> </panel> - </tab_container> - <panel - follows="bottom|left|right" - height="23" - layout="topleft" - left="8" - top_pad="4" - name="button_bar" - width="313"> -<!--********************************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"> +<!-- ================================= BLOCKED tab ========================== --> - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left="0" - name="view_profile_btn_lp" - 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="im_btn_lp" - 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="call_btn_lp" - 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="share_btn_lp" - 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="teleport_btn_lp" - 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" - 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" - 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" - 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 + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="all" + height="383" + label="BLOCKED" + layout="topleft" + left="0" + help_topic="people_blocked_tab" + name="blocked_panel" + right="-1" + top="0"> + <panel + class="panel_block_list_sidetray" + height="383" + name="panel_block_list_sidetray" + filename="panel_block_list_sidetray.xml" + follows="all" + label="Blocked Residents & Objects" + layout="topleft" + left="0" + font="SansSerifBold" + top="0" + right="-1" /> + </panel> + </tab_container> </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 79d190e1e0..79d190e1e0 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 43d580844f..43d580844f 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 8def96cada..8def96cada 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml 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 308acf0c0c..308acf0c0c 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index f169dbb702..f169dbb702 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml index ab2a42ea01..ab2a42ea01 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml index 3f67a48b14..3f67a48b14 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 2cc9d9c1b0..2cc9d9c1b0 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml index 714dca7fac..714dca7fac 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml 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 27193a984f..bd096ebb88 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -1,242 +1,493 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" - follows="left|top|right|bottom" - height="408" - label="Text Chat" - layout="topleft" - left="102" - name="chat" - top="1" - width="517"> - <text - follows="left|top" - layout="topleft" - left="30" - height="12" - name="font_size" - width="120" - top="10"> - Font size: - </text> - <radio_group - height="30" - layout="topleft" - left="40" - control_name="ChatFontSize" - name="chat_font_size" - top_pad="0" - width="440"> - <radio_item - height="16" - label="Small" - layout="topleft" - left="0" - name="radio" - value="0" - top="10" - width="125" /> - <radio_item - height="16" - label="Medium" - layout="topleft" - left_delta="145" - name="radio2" - value="1" - top_delta="0" - width="125" /> - <radio_item - height="16" - label="Large" - layout="topleft" - left_delta="170" - name="radio3" - value="2" - top_delta="0" - width="125" /> - </radio_group> - + border="true" + has_border="true" + height="408" + label="Text Chat" + layout="topleft" + left="102" + name="chat" + top="1" + width="517"> + + <panel + border="false" + height="60" + layout="topleft" + top="10" + left="13" + width="517"> + <check_box - control_name="PlayTypingAnim" - height="16" - initial_value="true" - label="Play typing animation when chatting" - layout="topleft" - left="30" - name="play_typing_animation" - top_pad="10" - width="400" /> + control_name="PlayTypingAnim" + height="16" + initial_value="true" + label="Play typing animation when chatting" + layout="topleft" + top="0" + name="play_typing_animation" + width="330"> + </check_box> + <check_box - enabled="false" - height="16" - label="Email me IMs when I'm offline" - layout="topleft" - left_delta="0" - name="send_im_to_email" - top_pad="5" - width="400" /> + enabled="false" + height="16" + label="Email me IMs when I'm offline" + layout="topleft" + name="send_im_to_email" + top_pad="6" + width="330"> + </check_box> + <check_box - enabled="false" - height="16" - label="Enable plain text IM and chat history" - layout="topleft" - left_delta="0" - name="plain_text_chat_history" - top_pad="5" - width="400" /> + control_name="VoiceCallsFriendsOnly" + height="16" + label="Only friends and groups can call or IM me" + layout="topleft" + name="voice_call_friends_only_check" + top_pad="6" + width="350"> + </check_box> + + <text + layout="topleft" + left="345" + height="12" + name="font_size" + width="120" + top="0"> + Font size: + </text> + + <combo_box + control_name="ChatFontSize" + height="23" + layout="topleft" + left="341" + name="chat_font_size" + top_pad="5" + width="100"> + <item + label="Small" + name="Small" + value="0"/> + <item + label="Medium" + name="Medium" + value="1"/> + <item + label="Large" + name="Large" + value="2"/> + </combo_box> + <check_box - control_name="UseChatBubbles" - follows="left|top" - height="16" - label="Bubble Chat" - layout="topleft" - left_delta="0" - top_pad="5" - name="bubble_text_chat" - width="150" /> + control_name="UseChatBubbles" + height="16" + label="Bubble Chat" + layout="topleft" + top_pad="4" + name="bubble_text_chat" + width="330"> + </check_box> + + </panel> + + <panel + border="false" + height="165" + layout="topleft" + left="13" + width="517"> + <text - name="show_ims_in_label" - follows="left|top" - layout="topleft" - left="30" - height="20" - width="170" - top_pad="15"> - Show IMs in: + layout="topleft" + height="12" + name="notifications" + left="0" + width="120"> + Notifications </text> <text - name="requires_restart_label" - follows="left|top" - layout="topleft" - top_delta="0" - left="170" - height="20" - width="130" - text_color="White_25"> - (requires restart) - </text> - <radio_group - follows="left|top" - height="30" - left="40" - control_name="ChatWindow" - name="chat_window" - top_pad="0" - tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)" - width="150"> - <radio_item - height="16" - label="Separate Windows" - layout="topleft" - left="0" - name="radio" - value="0" - top="0" - width="150" /> - <radio_item - height="16" - label="Tabs" + layout="topleft" + height="12" + name="friend_ims" + width="145" + left="0" + top_pad="13"> + Friend IMs: + </text> + <combo_box + control_name="NotificationFriendIMOptions" + height="23" + layout="topleft" + left_pad="5" + top_delta="-6" + name="FriendIMOptions" + width="223"> + <item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <item + label="Pop up the message" + name="PopUpMessage" + value="toast"/> + <item + label="Flash toolbar button" + name="FlashToolbarButton" + value="flash"/> + <item + label="None" + name="None" + value="none"/> + </combo_box> + <text + layout="topleft" + height="12" + name="non_friend_ims" + width="145" + left="0" + top_pad="9"> + Non-friend IMs: + </text> + <combo_box + control_name="NotificationNonFriendIMOptions" + height="23" + layout="topleft" + left_pad="5" + top_delta="-6" + name="NonFriendIMOptions" + width="223"> + <item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <item + label="Pop up the message" + name="PopUpMessage" + value="toast"/> + <item + label="Flash toolbar button" + name="FlashToolbarButton" + value="flash"/> + <item + label="None" + name="None" + value="none"/> + </combo_box> + <text + layout="topleft" + left="0" + height="13" + name="conference_ims" + width="145" + top_pad="9"> + Conference IMs: + </text> + <combo_box + control_name="NotificationConferenceIMOptions" + height="23" + layout="topleft" + left_pad="5" + top_delta="-6" + name="ConferenceIMOptions" + width="223"> + <item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <item + label="Pop up the message" + name="PopUpMessage" + value="toast"/> + <item + label="Flash toolbar button" + name="FlashToolbarButton" + value="flash"/> + <item + label="None" + name="None" + value="none"/> + </combo_box> + <text + layout="topleft" + left="0" + height="13" + name="group_chat" + width="145" + top_pad="9"> + Group chat: + </text> + <combo_box + control_name="NotificationGroupChatOptions" + height="23" + layout="topleft" + left_pad="5" + top_delta="-6" + name="GroupChatOptions" + width="223"> + <item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <item + label="Pop up the message" + name="PopUpMessage" + value="toast"/> + <item + label="Flash toolbar button" + name="FlashToolbarButton" + value="flash"/> + <item + label="None" + name="None" + value="none"/> + </combo_box> + <text + layout="topleft" + left="0" + height="12" + name="nearby_chat" + width="145" + top_pad="9"> + Nearby chat: + </text> + <combo_box + control_name="NotificationNearbyChatOptions" + height="23" + layout="topleft" + left_pad="5" + top_delta="-6" + name="NearbyChatOptions" + width="223"> + <item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <item + label="Pop up the message" + name="PopUpMessage" + value="toast"/> + <item + label="Flash toolbar button" + name="FlashToolBarButton" + value="flash"/> + <item + label="None" + name="None" + value="none"/> + </combo_box> + <text + layout="topleft" + left="0" + height="13" + name="notifications_alert" + width="500" + top_pad="9" + visible="true" + text_color="DrYellow"> + To temporarily stop all notifications, use Communicate > Do Not Disturb. + </text> + + </panel> + + <panel + border="false" + height="50" layout="topleft" - left_delta="0" - name="radio2" - value="1" - top_pad="5" - width="150" /> - </radio_group> + left="13" + top_pad="10" + width="517"> + <text - name="disable_toast_label" - follows="left|top" - layout="topleft" - top_pad="20" - left="30" - height="10" - width="400"> - Enable incoming chat popups: - </text> + layout="topleft" + left="0" + name="play_sound" + width="100" + top_pad="8" + visible="true"> + Play sound: + </text> + <check_box + control_name="PlaySoundNewConversation" + height="16" + label="New conversation" + layout="topleft" + left_pad="15" + top_pad="-10" + name="new_conversation" + width="150" /> <check_box - control_name="EnableGroupChatPopups" - name="EnableGroupChatPopups" - label="Group Chats" - layout="topleft" - top_pad="5" - left_delta="10" - height="20" - tool_tip="Check to see popups when a Group Chat message arrives" - width="400" /> + control_name="PlaySoundIncomingVoiceCall" + height="16" + label="Incoming voice call" + layout="topleft" + top_pad="6" + name="incoming_voice_call" + width="150" /> <check_box - control_name="EnableIMChatPopups" - name="EnableIMChatPopups" - label="IM Chats" - layout="topleft" - top_pad="5" - height="16" - tool_tip="Check to see popups when an instant message arrives" - width="400" /> - <spinner - control_name="NearbyToastLifeTime" - decimal_digits="0" - follows="left|top" - height="23" - increment="1" - initial_value="23" - label="Nearby chat toasts life time:" - label_width="285" - layout="topleft" - left="45" - max_val="60" - min_val="1" - name="nearby_toasts_lifetime" - top_pad="10" - width="325" /> - <spinner - control_name="NearbyToastFadingTime" - decimal_digits="0" - follows="left|top" - height="23" - increment="1" - initial_value="3" - label="Nearby chat toasts fading time:" - label_width="285" - layout="topleft" - left_delta="0" - max_val="60" - min_val="0" - name="nearby_toasts_fadingtime" - top_pad="3" - width="325" /> + control_name="PlaySoundTeleportOffer" + height="16" + label="Teleport offer" + layout="topleft" + left_pad="35" + top_pad="-38" + name="teleport_offer" + width="150" /> + <check_box + control_name="PlaySoundInventoryOffer" + height="16" + label="Inventory offer" + layout="topleft" + top_pad="6" + name="inventory_offer" + width="150" /> + + </panel> + + <view_border + bevel_style="none" + height="0" + layout="topleft" + left="13" + name="cost_text_border" + top_pad="5" + width="495"/> + + <panel + height="50" + layout="topleft" + left="13" + top_pad="10" + width="505"> + + <text + layout="topleft" + left="0" + text_color="White" + height="12" + top="5" + width="55"> + Save: + </text> + + <combo_box + enabled="false" + control_name="KeepConversationLogTranscripts" + height="23" + layout="topleft" + left_pad="5" + name="chat_font_size" + top="0" + width="165"> + <item + label="Log and transcripts" + value="2"/> + <item + label="Log only" + value="1"/> + <item + label="No log or transcripts" + value="0"/> + </combo_box> + + <button + enabled="false" + height="23" + label="Clear log..." + layout="topleft" + left_pad="5" + top="0" + name="clear_log" + width="110"> + <commit_callback + function="Pref.ClearLog" /> + </button> + + <button + enabled="false" + height="23" + label="Delete transcripts..." + layout="topleft" + left_pad="5" + top="0" + name="delete_transcripts" + width="147"> + <button.commit_callback + function="Pref.DeleteTranscripts" /> + </button> + + <text + layout="topleft" + left="0" + text_color="White" + height="12" + top_pad="15" + width="55"> + Location: + </text> + + <line_editor + control_name="InstantMessageLogPath" + border_style="line" + border_thickness="1" + font="SansSerif" + height="23" + layout="topleft" + left_pad="55" + max_length="4096" + name="log_path_string" + top_delta="-5" + width="185"> + </line_editor> + + <button + enabled="false" + follows="left|top" + height="23" + label="Browse..." + label_selected="Browse" + layout="topleft" + left_pad="5" + name="log_path_button" + top_delta="0" + width="112"> + <commit_callback function="Pref.LogPath" /> + </button> + + </panel> + <button - follows="left|top" - height="23" - label="Translation..." - layout="topleft" - left="30" - name="ok_btn" - top="-50" - width="170"> - <button.commit_callback - function="Pref.TranslationSettings" /> + height="23" + label="Translation..." + layout="topleft" + left="9" + name="ok_btn" + top="-29" + width="170"> + <commit_callback + function="Pref.TranslationSettings" /> </button> <button - follows="top|left" - height="23" - layout="topleft" - top_pad="-23" - left_pad="5" - name="autoreplace_showgui" - commit_callback.function="Pref.AutoReplace" - label="Auto-Replace..." - width="150"> + height="23" + layout="topleft" + top_pad="-23" + left_pad="5" + name="autoreplace_showgui" + commit_callback.function="Pref.AutoReplace" + label="Auto-Replace..." + width="150"> </button> <button - follows="top|left" - height="23" - layout="topleft" - top_pad="-23" - left_pad="5" - name="spellcheck_showgui" - commit_callback.function="Pref.SpellChecker" - label="Spell Checking..." - width="150"> + height="23" + layout="topleft" + top_pad="-23" + left_pad="5" + name="spellcheck_showgui" + commit_callback.function="Pref.SpellChecker" + label="Spell Checking..." + width="150"> </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 2b22f0d6e3..9e825fe516 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -362,7 +362,7 @@ follows="left|top" height="16" increment="0.01" - initial_value="0.8" + initial_value="1.0" layout="topleft" label_width="115" label="Active:" @@ -380,7 +380,7 @@ follows="left|top" height="16" increment="0.01" - initial_value="0.5" + initial_value="0.95" layout="topleft" label_width="115" label="Inactive:" 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 24882988b0..ea0f7d8593 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -409,10 +409,10 @@ name="text_box3" top_pad="3" width="240"> - Busy mode response: + Do Not Disturb response: </text> <text_editor - control_name="BusyModeResponse" + control_name="DoNotDisturbModeResponse" text_readonly_color="LabelDisabledColor" bg_writeable_color="LtGray" use_ellipses="false" @@ -421,7 +421,7 @@ height="29" layout="topleft" left="30" - name="busy_response" + name="do_not_disturb_response" width="470" word_wrap="true"> log_in_to_change diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 849f3ef73d..d7db7caf66 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -147,12 +147,12 @@ height="12" layout="topleft" left_delta="87" - name="ShadersPrefText3" + name="ShadersPrefText2" top_delta="0" width="80"> Mid </text> - <text + <text type="string" length="1" follows="left|top" @@ -163,8 +163,8 @@ name="ShadersPrefText3" top_delta="0" width="80"> - High - </text> + High + </text> <text type="string" length="1" @@ -211,16 +211,19 @@ name="TransparentWater" top_pad="7" width="256" /> - <check_box - control_name="RenderObjectBump" - height="16" - initial_value="true" - label="Bump mapping and shiny" - layout="topleft" - left_delta="0" - name="BumpShiny" - top_pad="1" - width="256" /> + <check_box + control_name="RenderObjectBump" + height="16" + initial_value="true" + label="Bump mapping and shiny" + layout="topleft" + left_delta="0" + name="BumpShiny" + top_pad="1" + width="256"> + <check_box.commit_callback + function="Pref.VertexShaderEnable" /> + </check_box> <check_box control_name="RenderLocalLights" height="16" @@ -262,7 +265,7 @@ control_name="RenderDeferred" height="16" initial_value="true" - label="Lighting and Shadows" + label="Advanced Lighting Model" layout="topleft" left_delta="0" name="UseLightShaders" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index d9067b41c7..d9067b41c7 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 587c461bee..78743d26bb 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -1,72 +1,69 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" - follows="left|top|right|bottom" - height="408" - label="Communication" - layout="topleft" - left="102" - name="im" - top="1" - width="517"> - <panel.string - name="log_in_to_change"> - log in to change - </panel.string> - <button - follows="left|bottom" - height="23" - label="Clear History" - tool_tip="Clear login image, last location, teleport history, web, and texture cache" - layout="topleft" - left="30" - name="clear_cache" - top="10" - width="145"> - <button.commit_callback - function="Pref.WebClearCache" /> - </button> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_pad="10" - mouse_opaque="false" - name="cache_size_label_l" - top_delta="3" - text_color="LtGray_50" - width="300"> - (Locations, images, web, search history) - </text> - <check_box - height="16" - enabled="false" - label="Show me in Search results" - layout="topleft" - left="30" - name="online_searchresults" - top_pad="20" - width="350" /> - <check_box - height="16" - enabled="false" - label="Only friends and groups know I'm online" - layout="topleft" - left="30" - name="online_visibility" - top_pad="30" - width="350" /> - <check_box - control_name="VoiceCallsFriendsOnly" - height="16" - label="Only friends and groups can call or IM me" - layout="topleft" - left="30" - name="voice_call_friends_only_check" - top_pad="10" - width="350" /> + border="true" + follows="left|top|right|bottom" + height="408" + label="Communication" + layout="topleft" + left="102" + name="im" + top="1" + width="517"> + + <panel.string + name="log_in_to_change"> + log in to change + </panel.string> + + <button + follows="left|bottom" + height="23" + label="Clear History" + tool_tip="Clear login image, last location, teleport history, web, and texture cache" + layout="topleft" + left="30" + name="clear_cache" + top="10" + width="145"> + <button.commit_callback + function="Pref.WebClearCache" /> + </button> + + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="10" + mouse_opaque="false" + name="cache_size_label_l" + top_delta="3" + text_color="LtGray_50" + width="300"> + (Locations, images, web, search history) + </text> + + <check_box + height="16" + enabled="false" + label="Show me in Search results" + layout="topleft" + left="30" + name="online_searchresults" + top_pad="20" + width="350" /> + + <check_box + height="16" + enabled="false" + label="Only friends and groups know I'm online" + layout="topleft" + left="30" + name="online_visibility" + top_pad="30" + width="350" /> + <check_box enabled_control="EnableVoiceChat" control_name="AutoDisengageMic" @@ -87,100 +84,7 @@ name="favorites_on_login_check" top_pad="10" width="350" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="30" - mouse_opaque="false" - name="Logs:" - top_pad="20" - width="350"> - Chat Logs: - </text> - <check_box - enabled="false" - control_name="LogNearbyChat" - height="16" - label="Save nearby chat logs on my computer" - layout="topleft" - left="30" - name="log_nearby_chat" - top_pad="10" - width="350"> - </check_box> - <check_box - enabled="false" - control_name="LogInstantMessages" - height="16" - label="Save IM logs on my computer" - layout="topleft" - left="30" - name="log_instant_messages" - top_pad="10" - width="350"> - </check_box> - <check_box - control_name="LogTimestamp" - enabled="false" - height="16" - label="Add timestamp to each line in chat log" - layout="topleft" - left_delta="0" - name="show_timestamps_check_im" - top_pad="10" - width="237" /> - <check_box - control_name="LogFileNamewithDate" - enabled="false" - height="16" - label="Add datestamp to log file name." - layout="topleft" - left_delta="5" - name="logfile_name_datestamp" - top_pad="10" - width="350"/> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="log_path_desc" - top_pad="30" - width="128"> - Location of logs: - </text> - <line_editor - bottom="366" - control_name="InstantMessageLogPath" - follows="top|left|right" - halign="right" - height="23" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="log_path_string" - top_pad="5" - width="250"/> - <button - enabled="false" - follows="right|bottom" - height="23" - label="Browse" - label_selected="Browse" - layout="topleft" - left_pad="5" - name="log_path_button" - top_delta="0" - width="145"> - <button.commit_callback - function="Pref.LogPath" /> - </button> + <button follows="left|bottom" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 4aeea8823e..dd4533ae74 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -232,6 +232,18 @@ name="Install_manual" value="0" /> </combo_box> + <check_box + top_delta="4" + enabled="true" + follows="left|top" + height="14" + control_name="UpdaterWillingToTest" + label="Willing to update to release candidates" + left_delta="0" + mouse_opaque="true" + name="update_willing_to_test" + width="400" + top_pad="5"/> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index b71586aab1..b71586aab1 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 198ccd6e2f..198ccd6e2f 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 860caf2d21..860caf2d21 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index 112f12500d..112f12500d 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index 81b2281adb..81b2281adb 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index aa38c49fae..aa38c49fae 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index 76a82212ae..76a82212ae 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 44c84e69a1..44c84e69a1 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index 5d060c0a0d..5d060c0a0d 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index f6a8af0973..765b07ed8b 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -158,6 +158,7 @@ text_readonly_color="DkGray" width="487" show_line_numbers="true" + enable_tooltip_paste="true" word_wrap="true"> Loading... </text_editor> diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml index 629d8567d1..629d8567d1 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml index c5e8bf5803..c5e8bf5803 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml index b0436bb6dc..b0436bb6dc 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index a8cd380f20..a8cd380f20 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml index 1351f75623..1351f75623 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml 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 557b04d281..557b04d281 100644..100755 --- 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 diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 912f81f915..912f81f915 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml index 71d808fa4b..71d808fa4b 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml index 781ab17403..781ab17403 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml index d2f29ade44..d2f29ade44 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml index ebba292a93..ebba292a93 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml index 0dd357aa1a..0dd357aa1a 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml index 46cbc1e87f..46cbc1e87f 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml index 07642946f8..07642946f8 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index dd2a0c6627..dd2a0c6627 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml index 007b73a4bc..007b73a4bc 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml 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 768efc2f3f..768efc2f3f 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml 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 c5b0be0616..c5b0be0616 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index 37a904bca8..37a904bca8 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml index f5c559fe1d..f5c559fe1d 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml +++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml new file mode 100644 index 0000000000..5ac2ec2b20 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -0,0 +1,766 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="false" + follows="all" + height="420" + label="Texture" + layout="topleft" + left="0" + mouse_opaque="false" + help_topic="toolbox_texture_tab" + name="Texture" + top="0" + width="295"> + <panel.string + name="string repeats per meter"> + Repeats Per Meter + </panel.string> + <panel.string + name="string repeats per face"> + Repeats Per Face + </panel.string> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="color label" + text_readonly_color="LabelDisabledColor" + top="6" + width="64"> + Color + </text> + <!-- label is blank because control places it below the box --> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="45" + label="" + layout="topleft" + left="10" + name="colorswatch" + tool_tip="Click to open color picker" + top="20" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="15" + name="color trans" + text_readonly_color="LabelDisabledColor" + top="6" + width="110"> + Transparency % + </text> + <spinner + decimal_digits="0" + follows="left|top" + height="19" + increment="2" + initial_value="0" + layout="topleft" + left_delta="0" + max_val="100" + name="ColorTrans" + top_pad="4" + width="80" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="15" + name="glow label" + text_readonly_color="LabelDisabledColor" + top="6" + width="80"> + Glow + </text> + <spinner + decimal_digits="2" + follows="left|top" + height="19" + initial_value="0" + layout="topleft" + left_delta="0" + name="glow" + top_pad="4" + width="80" /> + <check_box + height="19" + label="Full Bright" + layout="topleft" + left="7" + name="checkbox fullbright" + top_pad="4" + width="81" /> + <combo_box + height="23" + layout="topleft" + left="10" + name="combobox matmedia" + top_pad="5" + width="100"> + <combo_box.item + label="Materials" + name="Materials" + value="Materials" /> + <combo_box.item + label="Media" + name="Media" + value="Media" /> + </combo_box> + <combo_box + height="23" + layout="topleft" + left_pad="10" + name="combobox mattype" + top_delta="0" + width="155"> + <combo_box.item + label="Texture (diffuse)" + name="Texture (diffuse)" + value="Texture (diffuse)" /> + <combo_box.item + label="Bumpiness (normal)" + name="Bumpiness (normal)" + value="Bumpiness (normal)" /> + <combo_box.item + label="Shininess (specular)" + name="Shininess (specular)" + value="Shininess (specular)" /> + </combo_box> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + follows="left|top" + height="80" + label="Texture " + layout="topleft" + left="10" + name="texture control" + tool_tip="Click to choose a picture" + top_pad="8" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="10" + name="label alphamode" + text_readonly_color="LabelDisabledColor" + top_delta="0" + width="90"> + Alpha mode + </text> + <combo_box + height="23" + layout="topleft" + left_delta="0" + name="combobox alphamode" + top_pad="4" + width="120"> + <combo_box.item + label="None" + name="None" + value="None" /> + <combo_box.item + label="Alpha blending" + name="Alpha blending" + value="Alpha blending" /> + <combo_box.item + label="Alpha masking" + name="Alpha masking" + value="Alpha masking" /> + <combo_box.item + label="Emissive mask" + name="Emissive mask" + value="Emissive mask" /> + </combo_box> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + name="label maskcutoff" + text_readonly_color="LabelDisabledColor" + top_pad="4" + width="90"> + Mask cutoff + </text> + <spinner + decimal_digits="0" + min_val="0" + max_val="255" + follows="left|top" + height="19" + initial_value="55" + layout="topleft" + top_pad="4" + left_delta="0" + increment="1" + name="maskcutoff" + width="80" /> + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + follows="left|top" + height="80" + label="Texture " + layout="topleft" + left="10" + name="bumpytexture control" + tool_tip="Click to choose a picture" + top_delta="-55" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="10" + name="label bumpiness" + text_readonly_color="LabelDisabledColor" + top_delta="0" + width="90"> + Bumpiness + </text> + <combo_box + height="23" + layout="topleft" + left_delta="0" + name="combobox bumpiness" + top_pad="4" + width="90"> + <combo_box.item + label="None" + name="None" + value="None" /> + <combo_box.item + label="Brightness" + name="Brightness" + value="Brightness" /> + <combo_box.item + label="Darkness" + name="Darkness" + value="Darkness" /> + <combo_box.item + label="woodgrain" + name="woodgrain" + value="woodgrain" /> + <combo_box.item + label="bark" + name="bark" + value="bark" /> + <combo_box.item + label="bricks" + name="bricks" + value="bricks" /> + <combo_box.item + label="checker" + name="checker" + value="checker" /> + <combo_box.item + label="concrete" + name="concrete" + value="concrete" /> + <combo_box.item + label="crustytile" + name="crustytile" + value="crustytile" /> + <combo_box.item + label="cutstone" + name="cutstone" + value="cutstone" /> + <combo_box.item + label="discs" + name="discs" + value="discs" /> + <combo_box.item + label="gravel" + name="gravel" + value="gravel" /> + <combo_box.item + label="petridish" + name="petridish" + value="petridish" /> + <combo_box.item + label="siding" + name="siding" + value="siding" /> + <combo_box.item + label="stonetile" + name="stonetile" + value="stonetile" /> + <combo_box.item + label="stucco" + name="stucco" + value="stucco" /> + <combo_box.item + label="suction" + name="suction" + value="suction" /> + <combo_box.item + label="weave" + name="weave" + value="weave" /> + <!-- + NORSPEC-182, ensure item doesn't show up in menu until it should + <combo_box.item + label="Use texture" + name="Use texture" + value="Use texture" /> + --> + </combo_box> + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + follows="left|top" + height="80" + label="Texture " + layout="topleft" + left="10" + name="shinytexture control" + tool_tip="Click to choose a picture" + top_delta="-14" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + name="label shininess" + left_pad="10" + text_readonly_color="LabelDisabledColor" + top_delta="6" + width="90"> + Shininess + </text> + <combo_box + height="23" + layout="topleft" + left_pad="10" + name="combobox shininess" + top_delta="-6" + width="90"> + <combo_box.item + label="None" + name="None" + value="None" /> + <combo_box.item + label="Low" + name="Low" + value="Low" /> + <combo_box.item + label="Medium" + name="Medium" + value="Medium" /> + <combo_box.item + label="High" + name="High" + value="High" /> + <!-- + NORSPEC-182, ensure item doesn't show up in menu until it should + <combo_box.item + label="Use texture" + name="Use texture" + value="Use texture" /> + --> + </combo_box> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="-100" + name="label glossiness" + text_readonly_color="LabelDisabledColor" + top_pad="8" + width="116"> + Glossiness + </text> + <spinner + decimal_digits="0" + min_val="0" + max_val="255" + follows="left|top" + height="19" + initial_value="51" + increment="1" + layout="topleft" + top_delta="-4" + left_pad="10" + name="glossiness" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="-126" + name="label environment" + text_readonly_color="LabelDisabledColor" + top_pad="8" + width="116"> + Environment + </text> + <spinner + decimal_digits="0" + min_val="0" + max_val="255" + increment="1" + follows="left|top" + height="19" + initial_value="0" + layout="topleft" + top_delta="-4" + left_pad="10" + name="environment" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="-126" + name="label shinycolor" + text_readonly_color="LabelDisabledColor" + top_pad="8" + width="116"> + Color + </text> + <!-- label is blank because control places it below the box --> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="45" + label="" + layout="topleft" + left_pad="10" + name="shinycolorswatch" + tool_tip="Click to open color picker" + top_delta="-4" + width="64" /> + <text + follows="left|top|right" + height="9" + layout="topleft" + left="10" + top_delta="-50" + use_ellipses="true" + read_only="true" + name="media_info" + width="280"> + URL of chosen media, if any, goes here + </text> + <button + follows="top|left" + height="18" + layout="topleft" + left="10" + name="add_media" + top_pad="4" + tool_tip="Add Media" + label="Choose..." + width="85"> + <button.commit_callback + function="BuildTool.AddMedia"/> + </button> + <button + follows="top|left" + height="18" + layout="topleft" + left_pad="5" + name="delete_media" + tool_tip="Delete this media texture" + top_delta="0" + label="Remove" + width="85"> + <button.commit_callback + function="BuildTool.DeleteMedia"/> + </button> + <button + follows="left|top" + height="18" + label="Align" + label_selected="Align Media" + layout="topleft" + left_pad="5" + name="button align" + top_delta="0" + tool_tip="Align media texture (must load first)" + width="85" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="tex gen" + text_readonly_color="LabelDisabledColor" + top_pad="60" + width="140"> + Mapping + </text> + <combo_box + height="23" + layout="topleft" + left_pad="0" + name="combobox texgen" + top_pad="-13" + width="125"> + <combo_box.item + label="Default" + name="Default" + value="Default" /> + <combo_box.item + label="Planar" + name="Planar" + value="Planar" /> + </combo_box> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="TexScaleU" + top_pad="5" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="TexScaleV" + width="265" /> + <spinner + decimal_digits="1" + follows="left|top" + height="19" + initial_value="" + label="Repeats per meter" + layout="topleft" + label_width="205" + left="10" + max_val="100" + min_val="0.1" + name="rptctrl" + width="265" /> + <spinner + decimal_digits="2" + follows="left|top" + height="19" + increment="1" + initial_value="0" + label="Rotation degrees" + layout="topleft" + label_width="205" + left="10" + max_val="9999" + min_val="-9999" + name="TexRot" + width="265" /> + + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="TexOffsetU" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="TexOffsetV" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="bumpyScaleU" + top_delta="-115" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="bumpyScaleV" + width="265" /> + <spinner + decimal_digits="2" + follows="left|top" + height="19" + top_pad="27" + increment="1" + initial_value="0" + label="Rotation degrees" + layout="topleft" + label_width="205" + left="10" + max_val="360" + min_val="0" + name="bumpyRot" + width="265" /> + + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="bumpyOffsetU" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="bumpyOffsetV" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="shinyScaleU" + top_delta="-115" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="shinyScaleV" + width="265" /> + <spinner + decimal_digits="2" + follows="left|top" + height="19" + top_pad="27" + increment="1" + initial_value="0" + label="Rotation degrees" + layout="topleft" + label_width="205" + left="10" + max_val="360" + min_val="0" + name="shinyRot" + width="265" /> + + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="shinyOffsetU" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="shinyOffsetV" + width="265" /> + <check_box + follows="top|left" + height="16" + initial_value="false" + label="Align planar faces" + layout="topleft" + left="7" + name="checkbox planar align" + tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." + top_delta="16" + width="260" /> + <web_browser + visible="false" + enabled="false" + border_visible="true" + bottom_delta="0" + follows="top|left" + left="0" + name="title_media" + width="4" + height="4" + start_url="about:blank" + decouple_texture_size="true" /> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml index fc527f5f9d..fc527f5f9d 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml index 93e79b7328..93e79b7328 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml index 6adede0362..6adede0362 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml index 16860a6117..16860a6117 100644..100755 --- a/indra/newview/skins/default/xui/en/panel_world_map.xml +++ b/indra/newview/skins/default/xui/en/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml index 89aef57cca..89aef57cca 100644..100755 --- a/indra/newview/skins/default/xui/en/role_actions.xml +++ b/indra/newview/skins/default/xui/en/role_actions.xml diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 1d98a84e25..1d98a84e25 100644..100755 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 14bd349480..14bd349480 100644..100755 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml 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 c5dfb703e5..c5dfb703e5 100644..100755 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index e69a17e037..6ee8fc3a4c 100644..100755 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -292,6 +292,10 @@ label="Open" name="Open" value="Open" /> + <combo_box.item + label="Zoom" + name="Zoom" + value="Zoom" /> </combo_box> <panel border="false" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2157a05bbf..f7b33b0a4a 100644..100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -61,6 +61,7 @@ <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string> + <string name="ViewerDownloadURL">http://secondlife.com/download</string> <string name="LoginFailedViewerNotPermitted"> The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: http://secondlife.com/download @@ -295,7 +296,7 @@ Please try logging in again in a minute.</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> <string name="AvatarAway">Away</string> - <string name="AvatarBusy">Busy</string> + <string name="AvatarDoNotDisturb">Do Not Disturb</string> <string name="AvatarMuted">Blocked</string> <!-- animations --> @@ -372,6 +373,8 @@ Please try logging in again in a minute.</string> <!-- build floater --> <string name="multiple_textures">Multiple</string> +<string name="use_texture">Use texture</string> + <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> @@ -384,6 +387,8 @@ Please try logging in again in a minute.</string> <string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string> <!-- Chat --> + <string name="NearbyChatTitle">Nearby chat</string> + <string name="NearbyChatLabel">(Nearby chat)</string> <string name="whisper">whispers:</string> <string name="shout">shouts:</string> <string name="ringing">Connecting to in-world Voice Chat...</string> @@ -405,8 +410,14 @@ Please try logging in again in a minute.</string> <string name="ChangePermissions">Change its permissions</string> <string name="TrackYourCamera">Track your camera</string> <string name="ControlYourCamera">Control your camera</string> + <string name="NotConnected">Not Connected</string> + <string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name --> <string name="TeleportYourAgent">Teleport you</string> - <string name="NotConnected">Not Connected</string> + <string name="JoinAnExperience">Join an experience</string> <!-- not used --> + <string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string> + <string name="OverrideYourAnimations">Replace your default animations</string> + <string name="ScriptReturnObjects">Return objects on your behalf</string> + <string name="UnknownScriptPermission">(unknown)!</string> <!-- Sim Access labels --> <string name="SIM_ACCESS_PG">General</string> @@ -1447,7 +1458,7 @@ integer llScriptDanger(vector pos) Returns TRUE if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts </string> <string name="LSLTipText_llDialog" translate="false"> -llDialog(key avatar, string message, list buttons, integer chat_channel +llDialog(key avatar, string message, list buttons, integer chat_channel) Shows a dialog box on the avatar's screen with a message and up to 12 buttons. If a button is pressed, the avatar says the text of the button label on chat_channel. </string> @@ -2071,12 +2082,6 @@ For AI Character: Get the closest navigable point to the point provided. </string> - <!-- Avatar busy/away mode --> - <string name="AvatarSetNotAway">Not Away</string> - <string name="AvatarSetAway">Away</string> - <string name="AvatarSetNotBusy">Not Busy</string> - <string name="AvatarSetBusy">Busy</string> - <!-- Wearable Types --> <string name="shape">Shape</string> <string name="skin">Skin</string> @@ -2270,7 +2275,8 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale <string name="InvFolder Gestures">Gestures</string> <string name="InvFolder Favorite">My Favorites</string> <!-- historically default name of the Favorites folder can start from either "f" or "F" letter. - We should localize both of them with the same value --> + Also, it can be written as "Favorite" or "Favorites". + We should localize all variants of them with the same value --> <string name="InvFolder favorite">My Favorites</string> <string name="InvFolder Favorites">My Favorites</string> <string name="InvFolder favorites">My Favorites</string> @@ -2284,6 +2290,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694--> <string name="InvFolder Friends">Friends</string> + <string name="InvFolder Received Items">Received Items</string> <string name="InvFolder All">All</string> <string name="no_attachments">No attachments worn</string> @@ -2524,7 +2531,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale <string name="PanelContentsNewScript">New Script</string> <!-- panel preferences general --> - <string name="BusyModeResponseDefault">The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> + <string name="DoNotDisturbModeResponseDefault">This resident has turned on 'Do Not Disturb' and will see your message later.</string> <!-- Mute --> <string name="MuteByName">(By name)</string> @@ -2583,9 +2590,6 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale <string name="GroupMoneyDebits">Debits</string> <string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string> - <!-- viewer object --> - <string name="ViewerObjectContents">Contents</string> - <!-- Viewer menu --> <string name="AcquiredItems">Acquired Items</string> <string name="Cancel">Cancel</string> @@ -2991,6 +2995,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Higher">Higher</string> <string name="Hip Length">Hip Length</string> <string name="Hip Width">Hip Width</string> +<string name="Hover">Hover</string> <string name="In">In</string> <string name="In Shdw Color">Inner Shadow Color</string> <string name="In Shdw Opacity">Inner Shadow Opacity</string> @@ -3330,7 +3335,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="LocationCtrlAdultIconTooltip">Adult Region</string> <string name="LocationCtrlModerateIconTooltip">Moderate Region</string> <string name="LocationCtrlGeneralIconTooltip">General Region</string> - <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string> + <string name="LocationCtrlSeeAVsTooltip">Avatars inside this parcel cannot be seen or heard by avatars outside this parcel</string> <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is rebaked.</string> <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string> <!-- Strings used by the (currently Linux) auto-updater app --> @@ -3381,12 +3386,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_moderator_label">(Moderator)</string> <string name="Saved_message">(Saved [LONG_TIMESTAMP])</string> <string name="IM_unblock_only_groups_friends">To see this message, you must uncheck 'Only friends and groups can call or IM me' in Preferences/Privacy.</string> + <string name="OnlineStatus">Online</string> + <string name="OfflineStatus">Offline</string> <!-- voice calls --> <string name="answered_call">Your call has been answered</string> <string name="you_started_call">You started a voice call</string> <string name="you_joined_call">You joined the voice call</string> - <string name="name_started_call">[NAME] started a voice call</string> + <string name="you_auto_rejected_call-im">You automatically rejected the voice call while 'Do Not Disturb' was on.</string> + <string name="name_started_call">[NAME] started a voice call</string> <string name="ringing-im"> Joining voice call... @@ -3401,7 +3409,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Connecting... </string> <string name="conference-title"> - Ad-hoc Conference + Multi-person chat </string> <string name="conference-title-incoming"> Conference with [AGENT_NAME] @@ -3827,6 +3835,7 @@ Try enclosing path to the editor with double quotes. <string name="Command_Avatar_Label">Avatar</string> <string name="Command_Build_Label">Build</string> <string name="Command_Chat_Label">Chat</string> + <string name="Command_Conversations_Label">Conversations</string> <string name="Command_Compass_Label">Compass</string> <string name="Command_Destinations_Label">Destinations</string> <string name="Command_Gestures_Label">Gestures</string> @@ -3853,6 +3862,7 @@ Try enclosing path to the editor with double quotes. <string name="Command_Avatar_Tooltip">Choose a complete avatar</string> <string name="Command_Build_Tooltip">Building objects and reshaping terrain</string> <string name="Command_Chat_Tooltip">Chat with people nearby using text</string> + <string name="Command_Conversations_Tooltip">Converse with everyone</string> <string name="Command_Compass_Tooltip">Compass</string> <string name="Command_Destinations_Tooltip">Destinations of interest</string> <string name="Command_Gestures_Tooltip">Gestures for your avatar</string> @@ -3907,4 +3917,15 @@ Try enclosing path to the editor with double quotes. <!-- Spell check settings floater --> <string name="UserDictionary">[User]</string> + <!-- Conversation log messages --> + <string name="logging_calls_disabled_log_empty"> + Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat. + </string> + <string name="logging_calls_disabled_log_not_empty"> + No more conversations will be logged. To resume keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat. + </string> + <string name="logging_calls_enabled_log_empty"> + There are no logged conversations. After you contact someone, or someone contacts you, a log entry will be shown here. + </string> + </strings> diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml index fdf41991cd..fdf41991cd 100644..100755 --- a/indra/newview/skins/default/xui/en/teleport_strings.xml +++ b/indra/newview/skins/default/xui/en/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml index 55dde492ca..55dde492ca 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/accordion.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index 6f68c99021..6f68c99021 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml index 4d69dda7eb..4d69dda7eb 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml index 8a4ccb19f9..8a4ccb19f9 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml index 738d150f64..738d150f64 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/badge.xml +++ b/indra/newview/skins/default/xui/en/widgets/badge.xml diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml index 0016a8cf53..0016a8cf53 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 2b2c3faf91..2b2c3faf91 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml new file mode 100755 index 0000000000..f9facb593a --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<chat_editor + name="chat_editor" + show_context_menu="true"/> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index c0a948931c..c0a948931c 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml index 8947024e45..8947024e45 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/check_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml deleted file mode 100644 index 0e29ed0d0b..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<chiclet_im_adhoc - height="23" - name="im_adhoc_chiclet" - show_speaker="false" - width="25"> - <chiclet_im_adhoc.chiclet_button - height="25" - image_selected="PushButton_On" - image_unselected="PushButton_Off" - name="chiclet_button" - tab_stop="false" - width="25" /> - <chiclet_im_adhoc.speaker - image_mute="Parcel_VoiceNo_Light" - image_off="VoicePTT_Off_Dark" - image_on="VoicePTT_On_Dark" - image_level_1="VoicePTT_Lvl1_Dark" - image_level_2="VoicePTT_Lvl2_Dark" - image_level_3="VoicePTT_Lvl3_Dark" - auto_update="true" - draw_border="false" - height="24" - left="25" - bottom="1" - name="speaker" - visible="false" - width="20" /> - <chiclet_im_adhoc.avatar_icon - bottom="3" - follows="left|top|bottom" - height="20" - left="2" - mouse_opaque="false" - name="adhoc_icon" - width="21" /> - <chiclet_im_adhoc.unread_notifications - halign="center" - height="23" - left="25" - mouse_opaque="false" - name="unread" - text_color="white" - v_pad="3" - visible="false" - width="20" /> - <chiclet_im_adhoc.new_message_icon - bottom="11" - height="14" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="14" /> -</chiclet_im_adhoc>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml deleted file mode 100644 index 77011139bf..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<chiclet_im_group - height="23" - name="im_group_chiclet" - show_speaker="false" - width="25"> - <chiclet_im_group.chiclet_button - height="25" - image_selected="PushButton_On" - image_unselected="PushButton_Off" - name="chiclet_button" - tab_stop="false" - width="25" /> - <chiclet_im_group.speaker - image_mute="Parcel_VoiceNo_Light" - image_off="VoicePTT_Off_Dark" - image_on="VoicePTT_On_Dark" - image_level_1="VoicePTT_Lvl1_Dark" - image_level_2="VoicePTT_Lvl2_Dark" - image_level_3="VoicePTT_Lvl3_Dark" - auto_update="true" - draw_border="false" - height="24" - left="25" - bottom="1" - name="speaker" - visible="false" - width="20" /> - <chiclet_im_group.group_icon - bottom="3" - default_icon="Generic_Group" - follows="left|top|bottom" - height="20" - left="2" - mouse_opaque="false" - name="group_icon" - width="21" /> - <chiclet_im_group.unread_notifications - height="23" - halign="center" - left="25" - mouse_opaque="false" - name="unread" - text_color="white" - v_pad="3" - visible="false" - width="20"/> - <chiclet_im_group.new_message_icon -bottom="11" - height="14" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="14" /> -</chiclet_im_group>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml deleted file mode 100644 index 8b56a8f0f6..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<chiclet_im_p2p - height="23" - name="im_p2p_chiclet" - show_speaker="false" - width="25"> - <chiclet_im_p2p.chiclet_button - height="25" - image_selected="PushButton_On" - image_unselected="PushButton_Off" - name="chiclet_button" - tab_stop="false" - width="25"/> - <chiclet_im_p2p.speaker - image_mute="Parcel_VoiceNo_Light" - image_off="VoicePTT_Off_Dark" - image_on="VoicePTT_On_Dark" - image_level_1="VoicePTT_Lvl1_Dark" - image_level_2="VoicePTT_Lvl2_Dark" - image_level_3="VoicePTT_Lvl3_Dark" - auto_update="true" - draw_border="false" - height="24" - left="25" - bottom="1" - name="speaker" - visible="false" - width="20" /> - <chiclet_im_p2p.avatar_icon - bottom="3" - color="white" - follows="left|top|bottom" - height="20" - left="2" - mouse_opaque="false" - name="avatar_icon" - width="21" /> - <chiclet_im_p2p.unread_notifications - height="23" - halign="center" - left="25" - mouse_opaque="false" - name="unread" - text_color="white" - v_pad="3" - visible="false" - width="20"/> - <chiclet_im_p2p.new_message_icon - bottom="11" - height="14" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="14" /> -</chiclet_im_p2p> diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml index 4bc295f747..4bc295f747 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml index 5f51f4afd9..5f51f4afd9 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index db6a9434df..db6a9434df 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml index d83f44737e..d83f44737e 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml index ab3de1eaab..ab3de1eaab 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml +++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 82d620d1e6..82d620d1e6 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml index 459706c689..459706c689 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/context_menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/context_menu.xml diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml new file mode 100755 index 0000000000..b83d9122f7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<conversation_view_participant + folder_arrow_image="Folder_Arrow" + item_height="24" + item_top_pad="0" + selection_image="Rounded_Square" + mouse_opaque="true" + follows="left|top|right" + left_pad="0" + icon_pad="10" + icon_width="20" + text_pad="7" + text_pad_right="4" + arrow_size="12" + max_folder_item_overlap="2" +> +<avatar_icon + follows="left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + top="2" + width="20" /> +<info_button + follows="right" + height="16" + image_pressed="Info_Press" + image_unselected="Info_Over" + right="-28" + name="info_btn" + width="16" /> +<output_monitor + follows="right" + auto_update="true" + draw_border="false" + height="16" + right="-3" + mouse_opaque="true" + name="speaking_indicator" + visible="true" + width="20" /> +</conversation_view_participant> diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml new file mode 100755 index 0000000000..b8c39eec1d --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<conversation_view_session + folder_arrow_image="Folder_Arrow" + folder_indentation="8" + item_height="24" + item_top_pad="4" + selection_image="Rounded_Square" + mouse_opaque="true" + follows="left|top|right" + left_pad="5" + icon_pad="2" + icon_width="16" + text_pad="1" + text_pad_right="4" + arrow_size="12" + max_folder_item_overlap="2"/> diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml index 0534485ddd..0534485ddd 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml index 602250ace6..602250ace6 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml +++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml index 8c805da048..8c805da048 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index c6331ec87b..c6331ec87b 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml index 2cc4abdd30..2cc4abdd30 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml index e05ddf9815..e05ddf9815 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 97a5ae7d4e..97a5ae7d4e 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml index 83df10e417..83df10e417 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml index 6fa74f403d..bbd53ccb12 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml @@ -7,4 +7,10 @@ selection_image="Rounded_Square" mouse_opaque="true" follows="left|top|right" - /> + left_pad="5" + icon_pad="2" + icon_width="16" + text_pad="1" + text_pad_right="4" + arrow_size="12" + max_folder_item_overlap="2"/> diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml index 808683864d..808683864d 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml index 36ee6dd7eb..36ee6dd7eb 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/group_icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml diff --git a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml index 92080df154..92080df154 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml +++ b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml diff --git a/indra/newview/skins/default/xui/en/widgets/icon.xml b/indra/newview/skins/default/xui/en/widgets/icon.xml index cf8edfcedb..cf8edfcedb 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/icon.xml diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml index 77d8024cb2..590a4730a9 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml @@ -5,7 +5,13 @@ item_height="20" item_top_pad="4" selection_image="Rounded_Square" - > + left_pad="5" + icon_pad="2" + icon_width="16" + text_pad="1" + text_pad_right="4" + arrow_size="12" + max_folder_item_overlap="2"> <new_badge label="New" label_offset_horiz="-1" diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml index 7a7a6e9a09..7a7a6e9a09 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml index 830c27bdac..d5b10e7f51 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml @@ -1,2 +1,3 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<inbox_inventory_panel show_load_status="false" /> +<inbox_inventory_panel show_load_status="false" + start_folder.type="inbox"/> diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml index 8c171c387f..8c171c387f 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/inspector.xml +++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml index da9059c819..da9059c819 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml index eaf148c5e4..eaf148c5e4 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml index a190da3909..a190da3909 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml +++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml diff --git a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml index 48bcb46533..48bcb46533 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml +++ b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index a054960bf8..a054960bf8 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml index 2e976bc755..2e976bc755 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/list_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml diff --git a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml index ea1d89c975..ea1d89c975 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml +++ b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 61ec046649..61ec046649 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml index 13ac84beb2..13ac84beb2 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml index 27efa72563..27efa72563 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml index 563f3dc5c2..563f3dc5c2 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml index 24bda97f44..24bda97f44 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml index f6b06cb50b..f6b06cb50b 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml index 7452d685eb..7452d685eb 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml index 72af3924c1..72af3924c1 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml index 90b0625982..90b0625982 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml +++ b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml index bbcb008df4..bbcb008df4 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/name_editor.xml b/indra/newview/skins/default/xui/en/widgets/name_editor.xml index 21ba5c77f8..21ba5c77f8 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/name_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/name_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/name_list.xml b/indra/newview/skins/default/xui/en/widgets/name_list.xml index 3ae0f68227..3ae0f68227 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/name_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/name_list.xml diff --git a/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml deleted file mode 100644 index d19c47f54f..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<outbox_folder_view_folder - folder_arrow_image="Folder_Arrow" - folder_indentation="8" - item_height="20" - item_top_pad="4" - selection_image="Rounded_Square" - > -</outbox_folder_view_folder> diff --git a/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml deleted file mode 100644 index 3964569da2..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<outbox_inventory_panel show_empty_message="false" show_load_status="false" /> diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml index 9d71ceca2f..9d71ceca2f 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml +++ b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index b36f723831..b36f723831 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml index 98707b8495..98707b8495 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml index 339e53fbb8..339e53fbb8 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml index ab3184d34b..ab3184d34b 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml index 3ddf18b2cb..3ddf18b2cb 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml index 682dcf40d8..682dcf40d8 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml index 8a48fcb32d..8a48fcb32d 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml index a6d096a964..a6d096a964 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index e43989c6c7..e43989c6c7 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml diff --git a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml index 40cbf5977a..40cbf5977a 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml index ce84cfedc0..ce84cfedc0 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml index faa0404b35..faa0404b35 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml index 022564c12f..022564c12f 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml +++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml diff --git a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml index aa8461d367..aa8461d367 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index a120b1aec8..a120b1aec8 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/slider.xml b/indra/newview/skins/default/xui/en/widgets/slider.xml index f735d09476..f735d09476 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/slider.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider.xml diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index 0335213ed6..0335213ed6 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml index d7af6077e5..d7af6077e5 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/spinner.xml +++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml index 2ff9ada90a..2ff9ada90a 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/split_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 0586119681..0586119681 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml index d792e9f29c..d792e9f29c 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml index 4f574d75d5..4f574d75d5 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 134f2d7522..2102074674 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -9,6 +9,7 @@ h_pad="0" allow_scroll="false" text_readonly_color="LabelTextColor" + text_tentative_color="TextFgTentativeColor" bg_writeable_color="FloaterDefaultBackgroundColor" use_ellipses="false" bg_visible="false" diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index 100571cc01..100571cc01 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index b2da2147c1..b2da2147c1 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml index ba2fdf4f1f..ba2fdf4f1f 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml +++ b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml index b5bdd564a6..b5bdd564a6 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/time.xml +++ b/indra/newview/skins/default/xui/en/widgets/time.xml diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml index 48950a98ad..48950a98ad 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml index 9ca15ae50d..9ca15ae50d 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml +++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index 0aa478ace9..0ace37a5dc 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -30,9 +30,9 @@ image_overlay_alignment="left" use_ellipses="true" auto_resize="true" - button_flash_count="99999" - button_flash_rate="1.0" - flash_color="EmphasisColor"/> + button_flash_count="4" + button_flash_rate="0.5" + flash_color="BeaconColor"/> <button_icon pad_left="10" pad_right="10" image_bottom_pad="10" @@ -51,7 +51,7 @@ chrome="true" use_ellipses="true" auto_resize="true" - button_flash_count="99999" - button_flash_rate="1.0" - flash_color="EmphasisColor"/> + button_flash_count="4" + button_flash_rate="0.5" + flash_color="BeaconColor"/> </toolbar> diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml index f4dbb8f404..f4dbb8f404 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml +++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml diff --git a/indra/newview/skins/default/xui/en/widgets/view_border.xml b/indra/newview/skins/default/xui/en/widgets/view_border.xml index bf40e3086b..bf40e3086b 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/view_border.xml +++ b/indra/newview/skins/default/xui/en/widgets/view_border.xml diff --git a/indra/newview/skins/default/xui/en/widgets/web_browser.xml b/indra/newview/skins/default/xui/en/widgets/web_browser.xml index 676fafd828..676fafd828 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/web_browser.xml +++ b/indra/newview/skins/default/xui/en/widgets/web_browser.xml diff --git a/indra/newview/skins/default/xui/en/widgets/window_shade.xml b/indra/newview/skins/default/xui/en/widgets/window_shade.xml index 23eb2f13fb..23eb2f13fb 100644..100755 --- a/indra/newview/skins/default/xui/en/widgets/window_shade.xml +++ b/indra/newview/skins/default/xui/en/widgets/window_shade.xml diff --git a/indra/newview/skins/default/xui/en/xui_version.xml b/indra/newview/skins/default/xui/en/xui_version.xml index 0e777751d3..0e777751d3 100644..100755 --- a/indra/newview/skins/default/xui/en/xui_version.xml +++ b/indra/newview/skins/default/xui/en/xui_version.xml diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml index 3696c7e12c..3696c7e12c 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_about.xml +++ b/indra/newview/skins/default/xui/es/floater_about.xml 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 f8c40d798a..f8c40d798a 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/es/floater_activeim.xml b/indra/newview/skins/default/xui/es/floater_activeim.xml index 988786c1ae..988786c1ae 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_activeim.xml +++ b/indra/newview/skins/default/xui/es/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml index 6faf19dbb5..6faf19dbb5 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_auction.xml +++ b/indra/newview/skins/default/xui/es/floater_auction.xml diff --git a/indra/newview/skins/default/xui/es/floater_autoreplace.xml b/indra/newview/skins/default/xui/es/floater_autoreplace.xml index 15abccc376..15abccc376 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/es/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/es/floater_avatar.xml b/indra/newview/skins/default/xui/es/floater_avatar.xml index 21d202309f..21d202309f 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_avatar.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml index 49fce5d4ec..49fce5d4ec 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml index 54ef34264c..54ef34264c 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml index 49f990c84d..49f990c84d 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_beacons.xml +++ b/indra/newview/skins/default/xui/es/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml index a3e656cc17..a3e656cc17 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_build_options.xml +++ b/indra/newview/skins/default/xui/es/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml index f1948220b4..f1948220b4 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml index 6d4196ca7c..6d4196ca7c 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_bumps.xml +++ b/indra/newview/skins/default/xui/es/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml index 3563d4bd0f..3563d4bd0f 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml index 2c8848265f..2c8848265f 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml index 08ea67d4cb..08ea67d4cb 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml index 005fe90318..005fe90318 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml index a774bc6d05..a774bc6d05 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml index b0704ab788..b0704ab788 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_camera.xml +++ b/indra/newview/skins/default/xui/es/floater_camera.xml diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml index 2e94805057..02369c9a43 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/es/floater_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="chat_bar" title="CHAT"> +<floater name="nearby_chat" title="CHAT"> <panel name="bottom_panel"> <line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/> <button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/> diff --git a/indra/newview/skins/default/xui/es/floater_choose_group.xml b/indra/newview/skins/default/xui/es/floater_choose_group.xml index a5967b814e..a5967b814e 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/es/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml index ed168c09d5..ed168c09d5 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/es/floater_conversation_log.xml b/indra/newview/skins/default/xui/es/floater_conversation_log.xml new file mode 100644 index 0000000000..9202fab92d --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="REGISTRO DE CONVERSACIONES"> + <panel name="buttons_panel"> + <filter_editor label="Filtrar la gente" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="Opciones de vista/orden"/> + <menu_button name="conversations_gear_btn" tool_tip="Acciones en la persona o el grupo seleccionado"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml new file mode 100644 index 0000000000..f579e720fb --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="CONVERSACIÓN:"> + <floater.string name="Title"> + CONVERSACIÓN: [NAME] + </floater.string> + <text name="page_label" value="Página"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_critical.xml b/indra/newview/skins/default/xui/es/floater_critical.xml index e5cbea8810..e5cbea8810 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_critical.xml +++ b/indra/newview/skins/default/xui/es/floater_critical.xml diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml index 5e7df8530e..5e7df8530e 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/es/floater_destinations.xml b/indra/newview/skins/default/xui/es/floater_destinations.xml index df18698d2f..df18698d2f 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_destinations.xml +++ b/indra/newview/skins/default/xui/es/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml index f1a31a6776..f1a31a6776 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_display_name.xml +++ b/indra/newview/skins/default/xui/es/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml index 6ac46351db..6ac46351db 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml index d2197b80fa..d2197b80fa 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml index f90ad59f78..f90ad59f78 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml index a9c5705d52..a9c5705d52 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml index d2724bf8b0..d2724bf8b0 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_event.xml +++ b/indra/newview/skins/default/xui/es/floater_event.xml diff --git a/indra/newview/skins/default/xui/es/floater_fast_timers.xml b/indra/newview/skins/default/xui/es/floater_fast_timers.xml index eeb39583ef..eeb39583ef 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/es/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/es/floater_font_test.xml b/indra/newview/skins/default/xui/es/floater_font_test.xml index 9a665321a4..9a665321a4 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_font_test.xml +++ b/indra/newview/skins/default/xui/es/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml index d90de8c9f4..d90de8c9f4 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_gesture.xml +++ b/indra/newview/skins/default/xui/es/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml index 218a5effe8..218a5effe8 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml index c351db5eae..c351db5eae 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml index 5ebd7ad6e0..5ebd7ad6e0 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/es/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/es/floater_how_to.xml b/indra/newview/skins/default/xui/es/floater_how_to.xml index 4a57dc3643..4a57dc3643 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_how_to.xml +++ b/indra/newview/skins/default/xui/es/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/es/floater_hud.xml b/indra/newview/skins/default/xui/es/floater_hud.xml index e458913452..e458913452 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_hud.xml +++ b/indra/newview/skins/default/xui/es/floater_hud.xml diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml index 1cd752e6ec..f772441141 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_im_container.xml +++ b/indra/newview/skins/default/xui/es/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="CONVERSACIONES"/> +<multi_floater name="floater_im_box" title="CONVERSACIONES"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="Opciones de vista/orden"/> + <button name="add_btn" tool_tip="Iniciar una conversación nueva"/> + <button name="speak_btn" tool_tip="Utiliza el micrófono para hablar con las personas"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="Cerrar/expandir esta lista"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="Cerrar este panel"/> + <text name="stub_textbox"> + Esta conversación está en una ventana aparte. [secondlife:/// Traerla de vuelta.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml index 3d9d17fc81..5f38fbd615 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_im_session.xml +++ b/indra/newview/skins/default/xui/es/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="A" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] ha sido invitado a la conversación."/> + <floater.string name="multiple_participants_added" value="[NAME] han sido invitados a la conversación."/> + <floater.string name="tooltip_to_separate_window" value="Mover esta conversación a otra ventana"/> + <floater.string name="tooltip_to_main_window" value="Volver a poner esta conversación en la ventana principal"/> + <floater.string name="start_call_button_tooltip" value="Abrir conexión de voz"/> + <floater.string name="end_call_button_tooltip" value="Cerrar la conexión de voz"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="Cerrar este panel"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Cerrar la lista de participantes"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir la lista de participantes"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="Opciones de vista/orden"/> + <menu_button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/> + <button name="add_btn" tool_tip="Añadir alguien a esta conversación"/> + <button name="voice_call_btn" tool_tip="Abrir conexión de voz"/> + <button name="close_btn" tool_tip="Finalizar esta conversación"/> + <button name="expand_collapse_btn" tool_tip="Cerrar/expandir este panel"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Traducir el chat" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="A" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="Muestra/oculta el panel de mensajes"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml index 84c5bfc824..84c5bfc824 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/es/floater_import_collada.xml b/indra/newview/skins/default/xui/es/floater_import_collada.xml index 7e9a00797a..7e9a00797a 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/es/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml index b5b756abb6..acbb25b713 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml @@ -10,7 +10,7 @@ anónimo </floater.string> <floater.string name="VoiceInviteP2P"> - está llamando. + te está llamando. </floater.string> <floater.string name="VoiceInviteAdHoc"> ha entrado en un chat de voz en multiconferencia. @@ -25,9 +25,9 @@ ¿Quieres dejar [CURRENT_CHAT] y entrar en este chat de voz? </floater.string> <text name="question"> - ¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz? + Si respondes, te desconectarás de la conversación de voz actual. </text> - <button label="Aceptar" label_selected="Aceptar" name="Accept"/> - <button label="Rechazar" label_selected="Rechazar" name="Reject"/> - <button label="Comenzar un MI" name="Start IM"/> + <button label="Responder" label_selected="Responder" name="Accept"/> + <button label="Ignorar" label_selected="Ignorar" name="Reject"/> + <button label="Abrir MI en su lugar" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml index d95653ddd0..d95653ddd0 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_inspect.xml +++ b/indra/newview/skins/default/xui/es/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml index bf84c3d808..bf84c3d808 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml index 6004034504..6004034504 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml index 2c1804bd90..2c1804bd90 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_joystick.xml +++ b/indra/newview/skins/default/xui/es/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml index 227689a194..227689a194 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml index ed7055b3a1..ed7055b3a1 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml index 4ff54bccb5..4ff54bccb5 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml index 43a7ede030..43a7ede030 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml index 69f638418e..69f638418e 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_map.xml +++ b/indra/newview/skins/default/xui/es/floater_map.xml diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml index 9c4ef1eb2f..9c4ef1eb2f 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/es/floater_media_settings.xml b/indra/newview/skins/default/xui/es/floater_media_settings.xml index 3f7cef5785..3f7cef5785 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml index da8ba780bc..da8ba780bc 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml index a7c17fc136..a7c17fc136 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml index e2313bce99..e2313bce99 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml index 0e7b950bd3..0e7b950bd3 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_moveview.xml +++ b/indra/newview/skins/default/xui/es/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml index 4cd16a59ed..4cd16a59ed 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/es/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/es/floater_my_appearance.xml b/indra/newview/skins/default/xui/es/floater_my_appearance.xml index 774babf04e..774babf04e 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/es/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/es/floater_my_inventory.xml b/indra/newview/skins/default/xui/es/floater_my_inventory.xml index 0efd9f1c6d..0efd9f1c6d 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/es/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/es/floater_object_weights.xml b/indra/newview/skins/default/xui/es/floater_object_weights.xml index 50c4f0518d..50c4f0518d 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/es/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml index b8b688df60..b8b688df60 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_openobject.xml +++ b/indra/newview/skins/default/xui/es/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml index f48d0d2d0c..f48d0d2d0c 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml index 5fd9dba9ac..5fd9dba9ac 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml index e3ee0563d2..e3ee0563d2 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml index e93ecc9e10..3602270e5a 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> Mostrar: </text> - <check_box label="Mundo virtual" name="show_world"/> + <check_box label="Prueba" name="show_world"/> <check_box label="Solamente los objetos movibles" name="show_world_movables_only"/> <check_box label="Navmesh" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml index e6f864eef5..e6f864eef5 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml index ad9a43ad71..ad9a43ad71 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_pay.xml +++ b/indra/newview/skins/default/xui/es/floater_pay.xml diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml index 4767f4dfa0..4767f4dfa0 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/es/floater_people.xml b/indra/newview/skins/default/xui/es/floater_people.xml index f5a3eab008..f5a3eab008 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_people.xml +++ b/indra/newview/skins/default/xui/es/floater_people.xml diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml index 93e2088aba..93e2088aba 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/es/floater_picks.xml b/indra/newview/skins/default/xui/es/floater_picks.xml index 255aa5dcdc..255aa5dcdc 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_picks.xml +++ b/indra/newview/skins/default/xui/es/floater_picks.xml diff --git a/indra/newview/skins/default/xui/es/floater_places.xml b/indra/newview/skins/default/xui/es/floater_places.xml index 12c6548205..12c6548205 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_places.xml +++ b/indra/newview/skins/default/xui/es/floater_places.xml diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml index 5c62ccde36..5c62ccde36 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_post_process.xml +++ b/indra/newview/skins/default/xui/es/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml index 372680f55d..372680f55d 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_preferences.xml +++ b/indra/newview/skins/default/xui/es/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml index f656f5d662..f656f5d662 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml index c3f377a71a..c3f377a71a 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml index bd13262dcd..bd13262dcd 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml index d05a023279..d05a023279 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml index 62525c9536..62525c9536 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml index 4012191c78..4012191c78 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml index 8d6cdc86c0..8d6cdc86c0 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/es/floater_publish_classified.xml b/indra/newview/skins/default/xui/es/floater_publish_classified.xml index a1645f0c64..a1645f0c64 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/es/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml index 40851f897e..40851f897e 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/es/floater_region_info.xml b/indra/newview/skins/default/xui/es/floater_region_info.xml index 46d0839238..46d0839238 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_region_info.xml +++ b/indra/newview/skins/default/xui/es/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml index dc5d430375..dc5d430375 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml index e7eddfd9f3..e7eddfd9f3 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/es/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml index db9fd5f36e..db9fd5f36e 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml index 410f7b5e36..410f7b5e36 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/es/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml index 5c190a4682..5c190a4682 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml index 39c84103c4..39c84103c4 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml index 1ab6682023..1ab6682023 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_script_search.xml +++ b/indra/newview/skins/default/xui/es/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml index e24d8064a1..e24d8064a1 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_search.xml +++ b/indra/newview/skins/default/xui/es/floater_search.xml diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml index 6503a3d5cb..6503a3d5cb 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_select_key.xml +++ b/indra/newview/skins/default/xui/es/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml index d883683945..d883683945 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml index 1da2e491e1..1da2e491e1 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml index 23078b3a55..23078b3a55 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/es/floater_sound_devices.xml b/indra/newview/skins/default/xui/es/floater_sound_devices.xml index 0291f9e796..0291f9e796 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/es/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/es/floater_sound_preview.xml b/indra/newview/skins/default/xui/es/floater_sound_preview.xml index 8b8d9f13ce..8b8d9f13ce 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck.xml b/indra/newview/skins/default/xui/es/floater_spellcheck.xml index b664b96928..b664b96928 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/es/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml index bd86ed00da..bd86ed00da 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml index 00601920f2..00601920f2 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_stats.xml +++ b/indra/newview/skins/default/xui/es/floater_stats.xml diff --git a/indra/newview/skins/default/xui/es/floater_sys_well.xml b/indra/newview/skins/default/xui/es/floater_sys_well.xml index 8c8190be55..8c8190be55 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/es/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml index 87cc9c1659..87cc9c1659 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_telehub.xml +++ b/indra/newview/skins/default/xui/es/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml index 93bc9f293c..01b024bc3e 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml @@ -20,7 +20,7 @@ <button label="Blanca" label_selected="Blanca" name="Blank"/> <button label="Ninguna" label_selected="Ninguna" left="90" name="None"/> <button label="" label_selected="" name="Pipette"/> - <check_box initial_value="true" label="Vista previa inmediata" name="apply_immediate_check"/> + <check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/> <text name="preview_disabled" value="Vista previa inhabilitada"/> <filter_editor label="Filtrar las texturas" name="inventory search editor"/> <check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml index 59aaf7f74a..59aaf7f74a 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index 15462c3726..15462c3726 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml index bb53f116c2..bb53f116c2 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml index 89092201d9..89092201d9 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_tos.xml +++ b/indra/newview/skins/default/xui/es/floater_tos.xml diff --git a/indra/newview/skins/default/xui/es/floater_toybox.xml b/indra/newview/skins/default/xui/es/floater_toybox.xml index 7275b0546b..7275b0546b 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_toybox.xml +++ b/indra/newview/skins/default/xui/es/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/es/floater_translation_settings.xml b/indra/newview/skins/default/xui/es/floater_translation_settings.xml index 765c9a05a2..765c9a05a2 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/es/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml index f7c85ff068..f7c85ff068 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/es/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..1115d67239 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="VOLUMEN DE CHAT DE VOZ"> + <slider label="Chat de voz" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_voice_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml index eff21239be..eff21239be 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/es/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml index 1a265845af..02ebe80ff7 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ"> +<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ"> <string name="no_voice_effect"> (Sin transformación de voz) </string> diff --git a/indra/newview/skins/default/xui/es/floater_voice_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_volume.xml new file mode 100644 index 0000000000..0ebc511887 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="VOLUMEN DE VOZ"> + <slider name="volume_slider" tool_tip="Volumen de la voz" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_web_content.xml b/indra/newview/skins/default/xui/es/floater_web_content.xml index 5e02fad2dd..5e02fad2dd 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_web_content.xml +++ b/indra/newview/skins/default/xui/es/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml index 7dc47ca367..7dc47ca367 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml index 6c1ad02319..6c1ad02319 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_window_size.xml +++ b/indra/newview/skins/default/xui/es/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml index acc63e52a0..acc63e52a0 100644..100755 --- a/indra/newview/skins/default/xui/es/floater_world_map.xml +++ b/indra/newview/skins/default/xui/es/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/es/inspect_avatar.xml b/indra/newview/skins/default/xui/es/inspect_avatar.xml index 1d70fa6a90..1d70fa6a90 100644..100755 --- a/indra/newview/skins/default/xui/es/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/es/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/es/inspect_group.xml b/indra/newview/skins/default/xui/es/inspect_group.xml index ba10b19f41..ba10b19f41 100644..100755 --- a/indra/newview/skins/default/xui/es/inspect_group.xml +++ b/indra/newview/skins/default/xui/es/inspect_group.xml diff --git a/indra/newview/skins/default/xui/es/inspect_object.xml b/indra/newview/skins/default/xui/es/inspect_object.xml index d608b4a0f7..d608b4a0f7 100644..100755 --- a/indra/newview/skins/default/xui/es/inspect_object.xml +++ b/indra/newview/skins/default/xui/es/inspect_object.xml diff --git a/indra/newview/skins/default/xui/es/inspect_remote_object.xml b/indra/newview/skins/default/xui/es/inspect_remote_object.xml index f814e84a6f..f814e84a6f 100644..100755 --- a/indra/newview/skins/default/xui/es/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/es/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/es/language_settings.xml b/indra/newview/skins/default/xui/es/language_settings.xml index 997293a741..997293a741 100644..100755 --- a/indra/newview/skins/default/xui/es/language_settings.xml +++ b/indra/newview/skins/default/xui/es/language_settings.xml diff --git a/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml index f2367c72a3..f2367c72a3 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml index 00bdb74881..00bdb74881 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml index 0ba39378bb..0ba39378bb 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml index fe7331a108..fe7331a108 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml index 7df2d7c4e0..7df2d7c4e0 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml index 268d6f70ab..268d6f70ab 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml index 7541530601..7541530601 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml index 56b95bdc3b..56b95bdc3b 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml index 3c0c588284..3c0c588284 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml index ff8ad0977a..a889992b8a 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> +<toggleable_menu name="Gear COF"> <menu label="Ropas nuevas" name="COF.Gear.New_Clothes"/> - <menu label="Nuevas partes del cuerpo" name="COF.Geear.New_Body_Parts"/> -</menu> + <menu label="Nuevas partes del cuerpo" name="COF.Gear.New_Body_Parts"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml new file mode 100644 index 0000000000..e4e9a0bf63 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="Cerrar conversación" name="close_conversation"/> + <menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/> + <menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/> + <menu_item_call label="Ver el perfil" name="view_profile"/> + <menu_item_call label="MI" name="im"/> + <menu_item_call label="Ofrecer teleporte" name="offer_teleport"/> + <menu_item_call label="Llamada de voz" name="voice_call"/> + <menu_item_call label="Historial del chat..." name="chat_history"/> + <menu_item_call label="Añadir como amigo" name="add_friend"/> + <menu_item_call label="Quitarle como amigo" name="remove_friend"/> + <menu_item_call label="Quitar amigos" name="remove_friends"/> + <menu_item_call label="Invitar al grupo..." name="invite_to_group"/> + <menu_item_call label="Acercar el zoom" name="zoom_in"/> + <menu_item_call label="Mapa" name="map"/> + <menu_item_call label="Compartir" name="share"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_check label="Ignorar la voz" name="block_unblock"/> + <menu_item_check label="Ignorar el texto" name="MuteText"/> + <menu_item_call label="Perfil del grupo" name="group_profile"/> + <menu_item_call label="Activar el grupo" name="activate_group"/> + <menu_item_call label="Abandonar el grupo" name="leave_group"/> + <context_menu label="Opciones del moderador" name="Moderator Options"> + <menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/> + <menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Silenciar a todos" name="ModerateVoiceMute"/> + <menu_item_call label="Quitar el silencio a todos" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..090e6fb0bf --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="MI..." name="IM"/> + <menu_item_call label="Llamada de voz..." name="Call"/> + <menu_item_call label="Abrir el historial de chat..." name="Chat history"/> + <menu_item_call label="Ver el perfil" name="View Profile"/> + <menu_item_call label="Ofrecer teleporte" name="teleport"/> + <menu_item_call label="Añadir como amigo" name="add_friend"/> + <menu_item_call label="Quitarle como amigo" name="remove_friend"/> + <menu_item_call label="Invitar al grupo..." name="Invite"/> + <menu_item_call label="Mapa" name="Map"/> + <menu_item_call label="Compartir" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> + <menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml new file mode 100644 index 0000000000..b8b4616b2d --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/> + <menu_item_check label="Ordenar por fecha" name="sort_by_date"/> + <menu_item_check label="Ordenar con los amigos al principio" name="sort_by_friends"/> + <menu_item_call label="Ver el historial de chat..." name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_edit.xml b/indra/newview/skins/default/xui/es/menu_edit.xml index 96fc9d8881..96fc9d8881 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_edit.xml +++ b/indra/newview/skins/default/xui/es/menu_edit.xml diff --git a/indra/newview/skins/default/xui/es/menu_favorites.xml b/indra/newview/skins/default/xui/es/menu_favorites.xml index 85210d5c49..85210d5c49 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_favorites.xml +++ b/indra/newview/skins/default/xui/es/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml index 24706eb2c8..24706eb2c8 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_group_plus.xml b/indra/newview/skins/default/xui/es/menu_group_plus.xml index 6b26ba42c4..6b26ba42c4 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/es/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml index 9945908c4f..9945908c4f 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/es/menu_im_conversation.xml b/indra/newview/skins/default/xui/es/menu_im_conversation.xml new file mode 100644 index 0000000000..5ba0fb898e --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="Ver el perfil" name="View Profile"/> + <menu_item_call label="Añadir como amigo" name="Add Friend"/> + <menu_item_call label="Quitarle como amigo" name="remove_friend"/> + <menu_item_call label="Ofrecer teleporte" name="offer_teleport"/> + <menu_item_call label="Invitar al grupo..." name="invite_to_group"/> + <menu_item_call label="Historial del chat..." name="chat_history"/> + <menu_item_call label="Acercar el zoom" name="zoom_in"/> + <menu_item_call label="Mapa" name="map"/> + <menu_item_call label="Compartir" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> + <menu_item_check label="Ignorar la voz" name="Block/Unblock"/> + <menu_item_check label="Ignorar el texto" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..6ea970b826 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="Vista compacta" name="compact_view"/> + <menu_item_check label="Vista ampliada" name="expanded_view"/> + <menu_item_check label="Mostrar tiempo" name="IMShowTime"/> + <menu_item_check label="Mostrar los nombres en las conversaciones individuales" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_im_well_button.xml b/indra/newview/skins/default/xui/es/menu_im_well_button.xml deleted file mode 100644 index c8f6c217cc..0000000000 --- a/indra/newview/skins/default/xui/es/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Cerrar todo" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml index e11e9bdc58..e11e9bdc58 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml index a5e60ea40b..a5e60ea40b 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml index 492801026c..492801026c 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml index 82fc8ddd39..82fc8ddd39 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml index 9d0a8c50ef..9d0a8c50ef 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml index 29ad718fdd..29ad718fdd 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml index 20d99afde1..20d99afde1 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml index 803d3f1331..803d3f1331 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/es/menu_inventory_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml index f17cfe4ceb..f17cfe4ceb 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml index 0e9644629e..0e9644629e 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/es/menu_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml index b0f15be1b6..b0f15be1b6 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_land.xml +++ b/indra/newview/skins/default/xui/es/menu_land.xml diff --git a/indra/newview/skins/default/xui/es/menu_landmark.xml b/indra/newview/skins/default/xui/es/menu_landmark.xml index f69b1539b8..f69b1539b8 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_landmark.xml +++ b/indra/newview/skins/default/xui/es/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml index 289ac3f075..289ac3f075 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_login.xml +++ b/indra/newview/skins/default/xui/es/menu_login.xml diff --git a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml index b4dfe9907a..b4dfe9907a 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml index 07d1b08572..07d1b08572 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml index 0d4f1314c9..0d4f1314c9 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/es/menu_navbar.xml b/indra/newview/skins/default/xui/es/menu_navbar.xml index 63e5468020..63e5468020 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_navbar.xml +++ b/indra/newview/skins/default/xui/es/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml index 94b281b6c7..94b281b6c7 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml index 0562d35be7..0562d35be7 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml index 33ea8c88d8..33ea8c88d8 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_object.xml +++ b/indra/newview/skins/default/xui/es/menu_object.xml diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml index 7e4578b950..a99c889bb0 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="Perfil del objeto..." name="Object Profile"/> <menu_item_call label="Ignorar..." name="Block"/> + <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> + <menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml index 558ff6afd3..56e64c729f 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="Pelo nuevo" name="New Hair"/> <menu_item_call label="Ojos nuevos" name="New Eyes"/> </menu> + <menu_item_call label="Abrir todas las carpetas" name="expand"/> + <menu_item_call label="Cerrar todas las carpetas" name="collapse"/> <menu_item_call label="Renombrar el vestuario" name="rename"/> <menu_item_call label="Borrar el vestuario" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml index 4136082a62..4136082a62 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml index f6eedd1170..f6eedd1170 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/es/menu_participant_view.xml b/indra/newview/skins/default/xui/es/menu_participant_view.xml new file mode 100644 index 0000000000..fcfeeb922b --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="Ordenar las conversaciones por tipo" name="sort_sessions_by_type"/> + <menu_item_check label="Ordenar las conversaciones por nombre" name="sort_sessions_by_name"/> + <menu_item_check label="Ordenar las conversaciones por actividad reciente" name="sort_sessions_by_recent"/> + <menu_item_check label="Ordenar los participantes por nombre" name="sort_participants_by_name"/> + <menu_item_check label="Ordenar los participantes por actividad reciente" name="sort_participants_by_recent"/> + <menu_item_call label="Preferencias de chat..." name="chat_preferences"/> + <menu_item_call label="Preferencias de privacidad..." name="privacy_preferences"/> + <menu_item_check label="Registro de conversaciones..." name="Conversation"/> + <menu_item_check label="Traducir el chat" name="Translate_chat"/> + <menu_item_check label="Configuración de traducción..." name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..986389a4fe --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="No ignorar" name="unblock"/> + <menu_item_call label="Perfil..." name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..10f6a3fc14 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="Ignorar residentes según el nombre..." name="block_resident_by_name"/> + <menu_item_call label="Ignorar objetos según el nombre" name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml new file mode 100644 index 0000000000..bc557c7ec1 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/> + <menu_item_check label="Ordenar por tipo" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml new file mode 100644 index 0000000000..ad896c1b74 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ordenar alfabéticamente" name="sort_name"/> + <menu_item_check label="Ordenar por estatus" name="sort_status"/> + <menu_item_check label="Ver los iconos de la gente" name="view_icons"/> + <menu_item_check label="Ver permisos concedidos" name="view_permissions"/> + <menu_item_check label="Ver el registro de conversaciones..." name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml index 3899ad9e96..3899ad9e96 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml index 51bd2c7208..125e25cd1a 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="Ver la información" name="View Info"/> <menu_item_call label="Chat" name="Chat"/> - <menu_item_call label="Llamar" name="Call"/> + <menu_item_call label="Llamada de voz" name="Call"/> <menu_item_call label="Activar" name="Activate"/> <menu_item_call label="Dejar" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml new file mode 100644 index 0000000000..c3973625b0 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml index 1bd3efb611..1bd3efb611 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml index dc1486d879..09bb119d5a 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="Ver el perfil" name="View Profile"/> - <menu_item_call label="Añadir como amigo" name="Add Friend"/> - <menu_item_call label="Quitarle como amigo" name="Remove Friend"/> - <menu_item_call label="MI" name="IM"/> - <menu_item_call label="Llamar" name="Call"/> - <menu_item_call label="Mapa" name="Map"/> - <menu_item_call label="Compartir" name="Share"/> - <menu_item_call label="Pagar" name="Pay"/> - <menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/> - <menu_item_call label="Ofrecer teleporte" name="teleport"/> + <menu_item_call label="Ver el perfil" name="view_profile"/> + <menu_item_call label="MI" name="im"/> + <menu_item_call label="Ofrecer teleporte" name="offer_teleport"/> + <menu_item_call label="Llamada de voz" name="voice_call"/> + <menu_item_call label="Ver el historial de chat..." name="chat_history"/> + <menu_item_call label="Añadir como amigo" name="add_friend"/> + <menu_item_call label="Quitarle como amigo" name="remove_friend"/> + <menu_item_call label="Invitar al grupo..." name="invite_to_group"/> + <menu_item_call label="Acercar el zoom" name="zoom_in"/> + <menu_item_call label="Mapa" name="map"/> + <menu_item_call label="Compartir" name="share"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_check label="Ignorar / No ignorar" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml index 227c5ebe58..9df160f5ad 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="Añadir como amigos" name="Add Friends"/> - <menu_item_call label="Quitar amigos" name="Remove Friend"/> - <menu_item_call label="MI" name="IM"/> - <menu_item_call label="Llamar" name="Call"/> - <menu_item_call label="Compartir" name="Share"/> - <menu_item_call label="Pagar" name="Pay"/> - <menu_item_call label="Ofrecer teleporte" name="teleport"/> + <menu_item_call label="Añadir como amigos" name="add_friends"/> + <menu_item_call label="Quitar amigos" name="remove_friends"/> + <menu_item_call label="MI" name="im"/> + <menu_item_call label="Visita" name="call"/> + <menu_item_call label="Compartir" name="share"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_call label="Ofrecer teleporte" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml new file mode 100644 index 0000000000..c2fb360dd1 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/> + <menu_item_check label="Ordenar alfabéticamente" name="sort_name"/> + <menu_item_check label="Ordenar según distancia" name="sort_distance"/> + <menu_item_check label="Ver los iconos de la gente" name="view_icons"/> + <menu_item_check label="Ver mapa" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml index 1403e4db01..1403e4db01 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml new file mode 100644 index 0000000000..f0ffd14024 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ordenar por más reciente" name="sort_most"/> + <menu_item_check label="Ordenar alfabéticamente" name="sort_name"/> + <menu_item_check label="Ver los iconos de la gente" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml index e4aaa89110..e4aaa89110 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/es/menu_picks.xml b/indra/newview/skins/default/xui/es/menu_picks.xml index 9da68d7c9b..9da68d7c9b 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_picks.xml +++ b/indra/newview/skins/default/xui/es/menu_picks.xml diff --git a/indra/newview/skins/default/xui/es/menu_picks_plus.xml b/indra/newview/skins/default/xui/es/menu_picks_plus.xml index cc59bf1d29..cc59bf1d29 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/es/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/es/menu_place.xml b/indra/newview/skins/default/xui/es/menu_place.xml index 675f0699e9..675f0699e9 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_place.xml +++ b/indra/newview/skins/default/xui/es/menu_place.xml diff --git a/indra/newview/skins/default/xui/es/menu_place_add_button.xml b/indra/newview/skins/default/xui/es/menu_place_add_button.xml index 4b2f908a06..4b2f908a06 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/es/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml index 4051ff4075..4051ff4075 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml index c92bd19787..c92bd19787 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml index 5ee8c50949..5ee8c50949 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/es/menu_save_outfit.xml b/indra/newview/skins/default/xui/es/menu_save_outfit.xml index a04ec75b60..a04ec75b60 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/es/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/es/menu_script_chiclet.xml b/indra/newview/skins/default/xui/es/menu_script_chiclet.xml index f517baf566..f517baf566 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/es/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/es/menu_slurl.xml b/indra/newview/skins/default/xui/es/menu_slurl.xml index ca19acec6e..ca19acec6e 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_slurl.xml +++ b/indra/newview/skins/default/xui/es/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml index b708f3bc20..b708f3bc20 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml index c482907812..c482907812 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml index 17e90422a5..17e90422a5 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/es/menu_text_editor.xml b/indra/newview/skins/default/xui/es/menu_text_editor.xml index 6253463725..6253463725 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/es/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/es/menu_toolbars.xml b/indra/newview/skins/default/xui/es/menu_toolbars.xml index 63f3dc43bd..63f3dc43bd 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/es/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/es/menu_topinfobar.xml b/indra/newview/skins/default/xui/es/menu_topinfobar.xml index 2125fd51b2..2125fd51b2 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/es/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml index a089c8f68e..69a03671ab 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Mostrar el perfil del Residente" name="show_agent"/> + <menu_item_call label="Ver el perfil" name="show_agent"/> + <menu_item_call label="Enviar un MI..." name="send_im"/> + <menu_item_call label="Añadir como amigo..." name="add_friend"/> <menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/> <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_group.xml b/indra/newview/skins/default/xui/es/menu_url_group.xml index 79374b9739..79374b9739 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_group.xml +++ b/indra/newview/skins/default/xui/es/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_http.xml b/indra/newview/skins/default/xui/es/menu_url_http.xml index 585c059ff3..585c059ff3 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_http.xml +++ b/indra/newview/skins/default/xui/es/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_inventory.xml b/indra/newview/skins/default/xui/es/menu_url_inventory.xml index 13a8711c76..13a8711c76 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_map.xml b/indra/newview/skins/default/xui/es/menu_url_map.xml index f96a0c7170..f96a0c7170 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_map.xml +++ b/indra/newview/skins/default/xui/es/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml index 8791a290af..e78fdec558 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Mostrar la información del objeto" name="show_object"/> + <menu_item_call label="Perfil del objeto..." name="show_object"/> <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> <menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/> <menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/es/menu_url_parcel.xml b/indra/newview/skins/default/xui/es/menu_url_parcel.xml index 9e789ef8ee..9e789ef8ee 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/es/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_slapp.xml b/indra/newview/skins/default/xui/es/menu_url_slapp.xml index 7147dcd3cf..7147dcd3cf 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/es/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_slurl.xml b/indra/newview/skins/default/xui/es/menu_url_slurl.xml index 4ab47c2f61..4ab47c2f61 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/es/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/es/menu_url_teleport.xml b/indra/newview/skins/default/xui/es/menu_url_teleport.xml index 8f86a91be3..8f86a91be3 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/es/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index d80150ef6d..1e0ceb2220 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/> <menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/> </menu> - <menu label="Estado" name="Status"> - <menu_item_call label="Ausente" name="Set Away"/> - <menu_item_call label="Ocupado" name="Set Busy"/> - </menu> + <menu label="Estado" name="Status"/> <menu_item_call label="Comprar L$..." name="Buy and Sell L$"/> <menu_item_call label="Panel de control de la cuenta..." name="Manage My Account"> <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/> @@ -31,14 +28,18 @@ <menu_item_call label="Salir de [APP_NAME]" name="Quit"/> </menu> <menu label="Comunicarme" name="Communicate"> + <menu_item_check label="Conversaciones..." name="Conversations"/> <menu_item_check label="Chat..." name="Nearby Chat"/> <menu_item_check label="Hablar" name="Speak"/> - <menu_item_check label="Configuración de voz..." name="Nearby Voice"/> - <menu_item_check label="Transformación de voz..." name="ShowVoice"/> + <menu label="Transformación de voz" name="VoiceMorphing"> + <menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/> + <menu_item_check label="Probar..." name="Preview"/> + <menu_item_call label="Suscribir..." name="Subscribe"/> + </menu> <menu_item_check label="Gestos..." name="Gestures"/> - <menu_item_call label="Amigos" name="My Friends"/> - <menu_item_call label="Grupos" name="My Groups"/> - <menu_item_call label="Gente cerca" name="Active Speakers"/> + <menu_item_check label="Amigos" name="My Friends"/> + <menu_item_check label="Grupos" name="My Groups"/> + <menu_item_check label="Gente cerca" name="Active Speakers"/> <menu_item_call label="Lista de ignorados" name="Block List"/> </menu> <menu label="Mundo" name="World"> @@ -114,7 +115,6 @@ <menu_item_call label="Comprar" name="Menu Object Buy"/> <menu_item_call label="Tomar" name="Menu Object Take"/> <menu_item_call label="Coger una copia" name="Take Copy"/> - <menu_item_call label="Guardar una copia en mi inventario" name="Save Object Back to My Inventory"/> <menu_item_call label="Guardar una copia del objeto en los contenidos de donde salió" name="Save Object Back to Object Contents"/> <menu_item_call label="Devolver objeto" name="Return Object back to Owner"/> </menu> @@ -129,6 +129,7 @@ <menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/> <menu_item_call label="Personajes..." name="pathfinding_characters_menu_item"/> <menu_item_call label="Ver/probar..." name="pathfinding_console_menu_item"/> + <menu_item_call label="Recargar la región" name="pathfinding_rebake_navmesh_item"/> </menu> <menu label="Opciones" name="Options"> <menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/> @@ -158,6 +159,13 @@ <menu label="Ayuda" name="Help"> <menu_item_call label="Cómo..." name="How To"/> <menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/> + <menu_item_call label="Guía del usuario" name="User’s guide"/> + <menu_item_call label="Base de Conocimientos" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Foros comunitarios" name="Community Forums"/> + <menu_item_call label="Portal de soporte" name="Support portal"/> + <menu_item_call label="Noticias de [SECOND_LIFE]" name="Second Life News"/> + <menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/> <menu_item_call label="Denunciar una infracción" name="Report Abuse"/> <menu_item_call label="Informar de un fallo" name="Report Bug"/> <menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/> @@ -285,7 +293,7 @@ <menu label="Rendering" name="Rendering"> <menu_item_check label="Axes" name="Axes"/> <menu_item_check label="Wireframe" name="Wireframe"/> - <menu_item_check label="Luces y sombras" name="Lighting and Shadows"/> + <menu_item_check label="Luces y sombras" name="Advanced Lighting Model"/> <menu_item_check label="Sombras del sol/la luna/proyectores" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO y sombras suavizadas" name="SSAO and Shadow Smoothing"/> <menu_item_check label="Capas alfa automáticas (deferidas)" name="Automatic Alpha Masks (deferred)"/> @@ -335,9 +343,14 @@ <menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/> <menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/> </menu> + <menu label="Velocidad de animación" name="Animation Speed"> + <menu_item_call label="Acelerar todas las animaciones un 10%" name="All Animations 10 Faster"/> + <menu_item_call label="Ralentizar todas las animaciones un 10%" name="All Animations 10 Slower"/> + <menu_item_call label="Restablecer la velocidad de todas las animaciones" name="Reset All Animation Speed"/> + <menu_item_check label="Animaciones a cámara lenta" name="Slow Motion Animations"/> + </menu> <menu_item_call label="Force Params to Default" name="Force Params to Default"/> <menu_item_check label="Animation Info" name="Animation Info"/> - <menu_item_check label="Slow Motion Animations" name="Slow Motion Animations"/> <menu_item_check label="Disable Level Of Detail" name="Disable LOD"/> <menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/> <menu_item_check label="Display Agent Target" name="Display Agent Target"/> diff --git a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml index 4bffa689e7..4bffa689e7 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml index ec13f99a01..ec13f99a01 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml index 64fd7ce4cf..64fd7ce4cf 100644..100755 --- a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/es/mime_types.xml b/indra/newview/skins/default/xui/es/mime_types.xml index 85ff4cfb48..85ff4cfb48 100644..100755 --- a/indra/newview/skins/default/xui/es/mime_types.xml +++ b/indra/newview/skins/default/xui/es/mime_types.xml diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml index 77d05934f4..77d05934f4 100644..100755 --- a/indra/newview/skins/default/xui/es/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/es/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/es/mime_types_mac.xml b/indra/newview/skins/default/xui/es/mime_types_mac.xml index 77d05934f4..77d05934f4 100644..100755 --- a/indra/newview/skins/default/xui/es/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/es/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 7dfb27717d..05455f54c3 100644..100755 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -511,6 +511,24 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range& </url> <usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/> </notification> + <notification name="AMDOldDriver"> + Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento. + + ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados? + <url name="url"> + http://support.amd.com/us/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/> + </notification> + <notification name="NVIDIAOldDriver"> + Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento. + + ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados? + <url name="url"> + http://www.nvidia.com/Download/index.aspx?lang=es + </url> + <usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/> + </notification> <notification name="UnknownGPU"> Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce. Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas. @@ -1553,10 +1571,13 @@ Debemos reiniciar [APP_NAME] para instalar la actualización. En este momento, no se puede ofrecer el ser amigo. Por favor, vuelve a intentarlo en un momento. <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="BusyModeSet"> - Pasar al modo ocupado. -Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respuesta en el modo ocupado). Se rehusarán todos los ofrecimientos de teleporte. Todas las ofertas de inventario irán a tu Papelera. - <usetemplate ignoretext="Cambio mi estado al modo ocupado" name="okignore" yestext="OK"/> + <notification name="DoNotDisturbModeSet"> + Está activado No molestar. No obtendrás un aviso cuando recibas comunicaciones. + +- Los otros residentes recibirán tu respuesta de No molestar (se configura en Preferencias > General). +- Se rehusarán los ofrecimientos de teleporte. +- Se rechazarán las llamadas de voz. + <usetemplate ignoretext="Cambio mi estado al modo No molestar" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta. @@ -2043,6 +2064,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u ¿Ir a tu [http://secondlife.com/account/ Panel de Control] para ver el historial de tu cuenta? <usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + Si agregas una persona a una conversación en curso, se creará una conversación nueva. Todos los participantes recibirán notificaciones de la nueva conversación. + <usetemplate ignoretext="Confirmar agregar participantes al chat" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/> + </notification> <notification name="ConfirmQuit"> ¿Estás seguro de que quieres salir? <usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/> @@ -2116,14 +2141,14 @@ Linden Lab <button ignore="Nunca reemplazar" name="No" text="Cancelar"/> </form> </notification> - <notification label="¡Aviso! Modo Ocupado" name="BusyModePay"> - Estás en el modo Ocupado. Por tanto, no recibirás ningún ítem a cambio de este pago. + <notification label="Advertencia del modo No molestar" name="DoNotDisturbModePay"> + Tienes activado No molestar. No podrás recibir ningún objeto ofrecido a cambio de este pago. -¿Quieres salir del modo Ocupado antes de completar esta transacción? +¿Deseas desactivar No molestar antes de finalizar esta transacción? <form name="form"> - <ignore name="ignore" save_option="true" text="Voy a pagar a una persona u objeto mientras estoy en el modo ocupado"/> - <button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/> - <button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/> + <ignore name="ignore" text="Voy a pagar a una persona u objeto mientras estoy en el modo No molestar"/> + <button ignore="Salir siempre del modo No molestar" name="Yes" text="OK"/> + <button ignore="No salir nunca del modo No molestar" name="No" text="Cancelar"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2258,11 +2283,8 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p <notification name="GroupNotice"> Asunto: [SUBJECT], Mensaje: [MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> está conectado - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> está desconectado + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> está [STATUS] </notification> <notification name="AddSelfFriend"> Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo. @@ -2490,13 +2512,6 @@ Aquí no puedes volar. <notification name="DynamicPathfindingDisabled"> Esta región no tiene activado el pathfinding dinámico. Los objetos programados que utilicen llamadas LSL de pathfinding pueden tener un comportamiento inesperado en ella. </notification> - <notification name="PathfindingRebakeNavmesh"> - Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto. Para que los objetos móviles se comporten correctamente, pulsa el botón “Recargar la región”. Si quieres más información, elige “Ayuda”. - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="Ayuda" ignoretext="Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto." name="okhelpignore" yestext="OK"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> Se ha producido un error. Puede haber ocurrido un problema en la red o el servidor, o quizás no tengas derechos de construcción. Este problema podría resolverse cerrando la sesión e iniciando una sesión nueva. <usetemplate name="okbutton" yestext="OK"/> @@ -2757,9 +2772,9 @@ Del objeto: <nolink>[OBJECTNAME]</nolink>, propietario: [NAME]? </form> </notification> <notification name="ScriptQuestionCaution"> - Atención: El objeto '<nolink>[OBJECTNAME]</nolink>' solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias. + Atención: El objeto '<nolink>[OBJECTNAME]</nolink>' solicita un acceso pleno a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, cuando lo desee y sin más advertencias. -Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta. +No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta. <form name="form"> <button name="Grant" text="Permitir acceso total"/> <button name="Deny" text="Denegar"/> @@ -3331,4 +3346,633 @@ Intento cancelado. Vas a eliminar [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar? <usetemplate ignoretext="¿Estás seguro de que quieres eliminar varios elementos?" name="okcancelignore" notext="No" yestext="Sí"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] te ha congelado. No puedes moverte ni interactuar con el mundo. + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] te ha congelado durante [AV_FREEZE_TIME] segundos. No puedes moverte ni interactuar con el mundo. + </notification> + <notification name="YouFrozeAvatar"> + Avatar congelado. + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] te ha descongelado. + </notification> + <notification name="AvatarUnFrozen"> + Avatar descongelado. + </notification> + <notification name="AvatarFreezeFailure"> + Error al congelar: no tienes permisos de administrador en esa parcela. + </notification> + <notification name="AvatarFreezeThaw"> + La congelación ha terminado, puedes seguir con tus asuntos. + </notification> + <notification name="AvatarCantFreeze"> + Lo sentimos, ese usuario no se puede congelar. + </notification> + <notification name="NowOwnObject"> + Ahora eres el propietario del objeto [OBJECT_NAME] + </notification> + <notification name="CantRezOnLand"> + No se puede colocar el objeto en [OBJECT_POS] porque el propietario de ese terreno no lo permite. Usa la herramienta de terreno para ver quién es el propietario. + </notification> + <notification name="RezFailTooManyRequests"> + El objeto no se puede colocar porque hay demasiadas solicitudes. + </notification> + <notification name="SitFailCantMove"> + No te puedes sentar porque en este momento no puedes desplazarte. + </notification> + <notification name="SitFailNotAllowedOnLand"> + No te puedes sentar porque no tienes permiso para estar en ese terreno. + </notification> + <notification name="SitFailNotSameRegion"> + Acércate. No te puedes sentar en el objeto porque +no está en la misma región que tú. + </notification> + <notification name="NoNewObjectRegionFull"> + No se puede crear el nuevo objeto. La región está llena. + </notification> + <notification name="FailedToPlaceObject"> + Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo. + </notification> + <notification name="NoOwnNoGardening"> + No puedes crear árboles y hierba en un terreno que no es tuyo. + </notification> + <notification name="NoCopyPermsNoObject"> + Error al copiar: careces de permiso para copiar el objeto '[OBJ_NAME]'. + </notification> + <notification name="NoTransPermsNoObject"> + Error al copiar: no se te puede transferir el objeto '[OBJ_NAME]'. + </notification> + <notification name="AddToNavMeshNoCopy"> + Error al copiar porque el objeto '[OBJ_NAME]' contribuye al navmesh. + </notification> + <notification name="DupeWithNoRootsSelected"> + Duplicación sin objetos raíz seleccionados. + </notification> + <notification name="CantDupeCuzRegionIsFull"> + No se pueden duplicar objetos porque la región está llena. + </notification> + <notification name="CantDupeCuzParcelNotFound"> + No se pueden duplicar los objetos: no se encuentra la parcela en la que se hallan. + </notification> + <notification name="CantCreateCuzParcelFull"> + No se puede crear el objeto porque +la parcela está llena. + </notification> + <notification name="RezAttemptFailed"> + Error al intentar colocar un objeto. + </notification> + <notification name="ToxicInvRezAttemptFailed"> + No se puede crear un objeto que ha causado problemas en esta región. + </notification> + <notification name="InvItemIsBlacklisted"> + Ese objeto de inventario está en la lista negra. + </notification> + <notification name="NoCanRezObjects"> + Actualmente no tienes autorización para crear objetos. + </notification> + <notification name="LandSearchBlocked"> + Búsqueda de terrenos bloqueada. +Has realizado demasiadas búsquedas de terreno con excesiva rapidez. +Prueba otra vez dentro de un minuto. + </notification> + <notification name="NotEnoughResourcesToAttach"> + No hay suficientes recursos de script disponibles para anexar el objeto + </notification> + <notification name="YouDiedAndGotTPHome"> + Has muerto y te has teleportado a tu lugar de origen + </notification> + <notification name="EjectComingSoon"> + Te han expulsado de aquí y tienes [EJECT_TIME] segundos para salir. + </notification> + <notification name="NoEnterServerFull"> + No puedes entrar en esta región porque +el servidor está lleno. + </notification> + <notification name="SaveBackToInvDisabled"> + Se ha deshabilitado Devolver el objeto a mi inventario. + </notification> + <notification name="NoExistNoSaveToContents"> + No se puede guardar '[OBJ_NAME]' en el contenido del objeto porque el objeto desde el cual ha sido colocado ya no existe. + </notification> + <notification name="NoModNoSaveToContents"> + No se puede guardar '[OBJ_NAME]' en el contenido del objeto porque no tienes permiso para modificar el objeto '[DEST_NAME]'. + </notification> + <notification name="NoSaveBackToInvDisabled"> + No se puede guardar '[OBJ_NAME]' de nuevo en el inventario; esta operación está desactivada. + </notification> + <notification name="NoCopyNoSelCopy"> + No se puede copiar tu selección porque no tienes permiso para copiar el objeto '[OBJ_NAME]'. + </notification> + <notification name="NoTransNoSelCopy"> + No se puede copiar tu selección porque el objeto '[OBJ_NAME]' es intransferible. + </notification> + <notification name="NoTransNoCopy"> + No se puede copiar tu selección porque el objeto '[OBJ_NAME]' es intransferible. + </notification> + <notification name="NoPermsNoRemoval"> + El sistema de permisos no admite la eliminación del objeto '[OBJ_NAME]' del simulador. + </notification> + <notification name="NoModNoSaveSelection"> + No se puede guardar tu selección porque no tienes permiso para modificar el objeto '[OBJ_NAME]'. + </notification> + <notification name="NoCopyNoSaveSelection"> + No se puede guardar tu selección porque el objeto '[OBJ_NAME]' no se puede copiar. + </notification> + <notification name="NoModNoTaking"> + No se puede aceptar tu selección porque no tienes permiso para modificar el objeto '[OBJ_NAME]'. + </notification> + <notification name="RezDestInternalError"> + Error interno: tipo de destino desconocido. + </notification> + <notification name="DeleteFailObjNotFound"> + Error al borrar: el objeto no se encuentra + </notification> + <notification name="SorryCantEjectUser"> + Lo sentimos, ese usuario no se puede expulsar. + </notification> + <notification name="RegionSezNotAHome"> + Esta región no te permite configurar aquí tu lugar de origen. + </notification> + <notification name="HomeLocationLimits"> + Tu 'Lugar de origen' solo se puede configurar en tu terreno o en un punto de información del continente. + </notification> + <notification name="HomePositionSet"> + Posición de origen ajustada. + </notification> + <notification name="AvatarEjected"> + Avatar expulsado. + </notification> + <notification name="AvatarEjectFailed"> + Error al expulsar: no tienes permiso de administrador en esa parcela. + </notification> + <notification name="CantMoveObjectParcelFull"> + No se puede mover el objeto '[OBJECT_NAME]' a +[OBJ_POSITION] en la región [REGION_NAME] porque la parcela está llena. + </notification> + <notification name="CantMoveObjectParcelPerms"> + No se puede mover el objeto '[OBJECT_NAME]' a +[OBJ_POSITION] de la región [REGION_NAME] porque tus objetos no están permitidos en esta parcela. + </notification> + <notification name="CantMoveObjectParcelResources"> + No se puede mover el objeto '[OBJECT_NAME]' a +[OBJ_POSITION] de la región [REGION_NAME] porque no hay suficientes recursos para este objeto en esta parcela. + </notification> + <notification name="CantMoveObjectRegionVersion"> + No se puede mover el objeto '[OBJECT_NAME]' a +[OBJ_POSITION] de la región [REGION_NAME] porque la otra región ejecuta una versión más antigua que no admite la recepción de este objeto atravesando regiones. + </notification> + <notification name="CantMoveObjectNavMesh"> + No se puede mover el objeto '[OBJECT_NAME]' a +[OBJ_POSITION] en la región [REGION_NAME] porque no puedes modificar el navmesh a través de límites de región. + </notification> + <notification name="CantMoveObjectWTF"> + No se puede mover el objeto '[OBJECT_NAME]' a +[OBJ_POSITION] en la región [REGION_NAME] por un motivo desconocido. ([FAILURE_TYPE]) + </notification> + <notification name="NoPermModifyObject"> + No tienes permiso para modificar ese objeto + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + No se puede habilitar la física para un objeto que contribuye al navmesh. + </notification> + <notification name="CantEnablePhysKeyframedObj"> + No se puede activar la física para los objetos con fotogramas clave. + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + No se puede habilitar la física para el objeto: recursos de terreno insuficientes. + </notification> + <notification name="CantEnablePhysCostTooGreat"> + No se puede activar la física para un objeto con un coste de recursos de física mayor que [MAX_OBJECTS] + </notification> + <notification name="PhantomWithConcavePiece"> + Este objeto no puede tener una pieza cóncava porque es inmaterial y contribuye al navmesh. + </notification> + <notification name="UnableAddItem"> + ¡No se puede añadir un objeto! + </notification> + <notification name="UnableEditItem"> + ¡No se puede editar esto! + </notification> + <notification name="NoPermToEdit"> + No puedes editar esto. + </notification> + <notification name="NoPermToCopyInventory"> + No está permitido copiar ese inventario. + </notification> + <notification name="CantSaveItemDoesntExist"> + No se puede guardar en el contenido del objeto: el objeto ya no existe. + </notification> + <notification name="CantSaveItemAlreadyExists"> + No se puede guardar en el contenido del objeto: el inventario ya contiene un objeto con ese nombre + </notification> + <notification name="CantSaveModifyAttachment"> + No se puede guardar en el contenido del objeto: se modificarían los permisos de anexo. + </notification> + <notification name="TooManyScripts"> + Demasiados scripts. + </notification> + <notification name="UnableAddScript"> + ¡No se puede añadir un script! + </notification> + <notification name="AssetServerTimeoutObjReturn"> + El servidor de objetos no respondió puntualmente. El objeto se ha devuelto al sim. + </notification> + <notification name="RegionDisablePhysicsShapes"> + Esta región no tiene habilitadas las formas de física. + </notification> + <notification name="NoModNavmeshAcrossRegions"> + No se puede modificar el navmesh a través de límites de región. + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + No se pueden establecer propiedades de física en ese tipo de objeto. + </notification> + <notification name="NoSetRootPrimWithNoShape"> + No se puede establecer que un prim raíz no tenga forma. + </notification> + <notification name="NoRegionSupportPhysMats"> + Esta región no tiene habilitados los materiales de física. + </notification> + <notification name="OnlyRootPrimPhysMats"> + Solo se pueden ajustar los materiales de física de las prims raíces. + </notification> + <notification name="NoSupportCharacterPhysMats"> + Aun no es posible configurar materiales de física para los personajes. + </notification> + <notification name="InvalidPhysMatProperty"> + Una o varias de las propiedades de los materiales de física especificados no son válidas. + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + No se puede cambiar el tipo de unión de un objeto de la malla. + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + No se puede cambiar la forma de un objeto de la malla + </notification> + <notification name="FullRegionCantEnter"> + No puedes entrar en esta región porque \nla región está llena. + </notification> + <notification name="LinkFailedOwnersDiffer"> + Error de vínculo: los propietarios son diferentes + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + Error de vínculo: no se puede modificar el navmesh a través de límites de región. + </notification> + <notification name="LinkFailedNoPermToEdit"> + Error de vínculo: no tienes permiso de edición. + </notification> + <notification name="LinkFailedTooManyPrims"> + Error de vínculo: demasiadas primitivas + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + Error de vínculo: no se pueden vincular 'no copiable' y 'no transferible' + </notification> + <notification name="LinkFailedNothingLinkable"> + Error de vínculo: no hay objetos que se puedan vincular. + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + Error de vínculo: demasiados personajes de pathfinding + </notification> + <notification name="LinkFailedInsufficientLand"> + Error de vínculo: recursos de terreno insuficientes + </notification> + <notification name="LinkFailedTooMuchPhysics"> + El objeto utiliza una cantidad excesiva de recursos de física; se ha desactivado su dinámica. + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + Has sido teleportado al origen por el objeto '[OBJECT_NAME]' de la parcela '[PARCEL_NAME]' + </notification> + <notification name="TeleportedHomeByObject"> + Has sido teleportado a tu origen por el objeto '[OBJECT_NAME]' + </notification> + <notification name="TeleportedByAttachment"> + Has sido teleportado por un anexo de [ITEM_ID] + </notification> + <notification name="TeleportedByObjectOnParcel"> + Has sido teleportado por el objeto '[OBJECT_NAME]' de la parcela '[PARCEL_NAME]' + </notification> + <notification name="TeleportedByObjectOwnedBy"> + Has sido teleportado por el objeto '[OBJECT_NAME]' que es propiedad de [OWNER_ID] + </notification> + <notification name="TeleportedByObjectUnknownUser"> + Has sido teleportado por el objeto '[OBJECT_NAME]' cuyo propietario es un usuario desconocido. + </notification> + <notification name="CantCreateObjectRegionFull"> + No se puede crear el objeto solicitado. La región está llena. + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + No puedes anexar varios objetos a un solo lugar. + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + Aquí no se pueden crear varios objetos. + </notification> + <notification name="UnableToCreateObjTimeOut"> + No se puede crear el objeto solicitado. El objeto no se encuentra en la base de datos. + </notification> + <notification name="UnableToCreateObjUnknown"> + No se puede crear el objeto solicitado. Ha expirado el tiempo de la solicitud. Vuelve a intentarlo. + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + No se puede crear el objeto solicitado. Vuelve a intentarlo. + </notification> + <notification name="RezFailureTookTooLong"> + Error al colocar: la carga del objeto solicitado ha tardado demasiado. + </notification> + <notification name="FailedToPlaceObjAtLoc"> + Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo. + </notification> + <notification name="CantCreatePlantsOnLand"> + No se pueden crear plantas en este terreno. + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + No se puede restaurar el objeto. No se ha encontrado una posición del mundo. + </notification> + <notification name="CantRezObjectInvalidMeshData"> + No se puede colocar el objeto porque sus datos de malla no son válidos. + </notification> + <notification name="CantRezObjectTooManyScripts"> + No se puede colocar el objeto porque la región ya contiene demasiados scripts. + </notification> + <notification name="CantCreateObjectNoAccess"> + Tus privilegios de acceso no te permiten crear objetos allí. + </notification> + <notification name="CantCreateObject"> + Actualmente no tienes autorización para crear objetos. + </notification> + <notification name="InvalidObjectParams"> + Los parámetros de objeto no son válidos + </notification> + <notification name="CantDuplicateObjectNoAcess"> + Tus privilegios de acceso no te permiten duplicar objetos aquí. + </notification> + <notification name="CantChangeShape"> + No tienes permiso para cambiar esta forma. + </notification> + <notification name="NoAccessToClaimObjects"> + Tus privilegios de acceso no te permiten reclamar objetos aquí. + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + Error de transferencia: no tienes permiso para transferir objetos para tu grupo. + </notification> + <notification name="NoPrivsToBuyObject"> + Tus privilegios de acceso no te autorizan a comprar objetos aquí. + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + No se puede anexar el objeto porque un avatar está sentado en él. + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + No te puedes poner árboles y hierba como anexos. + </notification> + <notification name="CantAttachGroupOwnedObjs"> + No se pueden anexar objetos que son propiedad de grupos. + </notification> + <notification name="CantAttachObjectsNotOwned"> + No puedes anexar objetos de los que no eres propietario. + </notification> + <notification name="CantAttachNavmeshObjects"> + No se pueden anexar objetos que contribuyen al navmesh. + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + No se puede anexar el objeto porque no tienes permiso para moverlo. + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + No hay suficientes recursos de script disponibles para anexar el objeto + </notification> + <notification name="CantDropItemTrialUser"> + No se pueden soltar objetos aquí; inténtalo en la zona de prueba gratuita. + </notification> + <notification name="CantDropMeshAttachment"> + No se pueden soltar anexos de la malla. Quítalos en el inventario y después colócalos en el mundo. + </notification> + <notification name="CantDropAttachmentNoPermission"> + Error al soltar el anexo: no tienes permiso para soltarlo allí. + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + Error al soltar el anexo: recurso de terreno disponible insuficiente. + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + Error al soltar los anexos: los recursos disponibles son insuficientes. + </notification> + <notification name="CantDropObjectFullParcel"> + No se puede soltar el objeto aquí. La parcela está llena. + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + No puedes tocar/agarrar este objeto porque tienes prohibida la entrada en la parcela de terreno. + </notification> + <notification name="PlzNarrowDeleteParams"> + Acota los parámetros de eliminación. + </notification> + <notification name="UnableToUploadAsset"> + No se puede subir el activo. + </notification> + <notification name="CantTeleportCouldNotFindUser"> + No se ha podido encontrar el usuario para teleportarlo al origen + </notification> + <notification name="GodlikeRequestFailed"> + error en la solicitud de superpoderes + </notification> + <notification name="GenericRequestFailed"> + error de solicitud genérico + </notification> + <notification name="CantUploadPostcard"> + No se puede subir la postal. Vuelve a intentarlo más tarde. + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + No se pueden obtener los datos de inventario del aviso de grupo. + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + No se puede enviar el aviso de grupo: no está permitido. + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + No se puede enviar el aviso del grupo: el inventario no se puede construir. + </notification> + <notification name="CantParceInventoryInNotice"> + No se puede analizar el inventario del aviso. + </notification> + <notification name="TerrainUploadFailed"> + Error al subir terreno. + </notification> + <notification name="TerrainFileWritten"> + Se ha registrado el archivo de terreno. + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + Archivo de terreno registrado, iniciando la descarga... + </notification> + <notification name="TerrainBaked"> + Terreno predeterminado. + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + Solamente se han desactivado los 10 primeros objetos seleccionados. Si es preciso, actualiza y selecciona otros objetos. + </notification> + <notification name="UpdateViewerBuyParcel"> + Para comprar esta parcela debes actualizar el visor. + </notification> + <notification name="CantBuyParcelNotForSale"> + Error al comprar: esta parcela no está en venta. + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + No se puede comprar: el precio de venta o la superficie del terreno han cambiado. + </notification> + <notification name="CantBuyParcelNotAuthorized"> + No eres el comprador autorizado de esta parcela. + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + No puedes comprar esta parcela porque ya está en espera de una autorización de compra + </notification> + <notification name="CantBuildOverflowParcel"> + No se pueden construir objetos aquí porque se desbordaría la parcela. + </notification> + <notification name="SelectedMultipleOwnedLand"> + Has seleccionado un terreno con propietarios diferentes. Selecciona un área más pequeña y repite la operación. + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + La selección no contiene suficientes parcelas alquiladas para unirlas. + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + No se puede dividir el terreno.\nHay varias parcelas seleccionadas.\nPrueba a seleccionar un terreno más pequeño. + </notification> + <notification name="CantDivideLandCantFindParcel"> + No se puede dividir el terreno.\nNo se encuentra la parcela.\nAvísanos con Ayuda -> Notificar fallo... + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + No se puede dividir el terreno. Está seleccionada la parcela completa.\nPrueba a seleccionar un terreno más pequeño. + </notification> + <notification name="LandHasBeenDivided"> + El terreno se ha dividido. + </notification> + <notification name="PassPurchased"> + Has comprado un pase. + </notification> + <notification name="RegionDisallowsClassifieds"> + La región no permite anuncios. + </notification> + <notification name="LandPassExpireSoon"> + Tu pase para este terreno está a punto de caducar. + </notification> + <notification name="CantSitNoSuitableSurface"> + Esta superficie no es adecuada para sentarse, prueba en otro sitio. + </notification> + <notification name="CantSitNoRoom"> + No hay sitio para sentarse aquí, prueba en otro lugar. + </notification> + <notification name="ClaimObjectFailedNoPermission"> + Error al reclamar el objeto: no tienes permiso + </notification> + <notification name="ClaimObjectFailedNoMoney"> + Error al reclamar el objeto: no tienes suficientes L$. + </notification> + <notification name="CantDeedGroupLand"> + No se puede transferir un terreno propiedad de un grupo. + </notification> + <notification name="BuyObjectFailedNoMoney"> + Error al comprar el objeto, no tienes suficientes L$. + </notification> + <notification name="BuyInventoryFailedNoMoney"> + Error al comprar el inventario: no tienes suficientes L$. + </notification> + <notification name="BuyPassFailedNoMoney"> + No tienes suficientes L$ para comprar un pase a este terreno. + </notification> + <notification name="CantBuyPassTryAgain"> + No se puede comprar el pase ahora mismo. Vuelve a intentarlo más tarde. + </notification> + <notification name="CantCreateObjectParcelFull"> + No se puede crear el objeto porque \nla parcela está llena. + </notification> + <notification name="FailedPlacingObject"> + Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo. + </notification> + <notification name="CantCreateLandmarkForEvent"> + No se puede crear un hito para el evento. + </notification> + <notification name="GodBeatsFreeze"> + ¡Tus superpoderes anulan la congelación! + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + Error en la solicitud de poderes especiales. Esta solicitud se ha registrado. + </notification> + <notification name="ExpireExplanation"> + El sistema actualmente no puede procesar tu solicitud. Ha expirado el tiempo de la solicitud. + </notification> + <notification name="DieExplanation"> + El sistema no puede procesar tu solicitud. + </notification> + <notification name="AddPrimitiveFailure"> + Dinero insuficiente para crear la primitiva. + </notification> + <notification name="RezObjectFailure"> + Dinero insuficiente para crear el objeto. + </notification> + <notification name="ResetHomePositionNotLegal"> + Se ha restaurado la posición de origen, puesto que dicha posición no era válida. + </notification> + <notification name="CantInviteRegionFull"> + Actualmente no puedes invitar a nadie a tu ubicación, puesto que la región está llena. Vuelve a intentarlo más tarde. + </notification> + <notification name="CantSetHomeAtRegion"> + Esta región no te permite configurar aquí tu lugar de origen. + </notification> + <notification name="ListValidHomeLocations"> + Tu 'Lugar de origen' solo se puede configurar en tu terreno o en un punto de información del continente. + </notification> + <notification name="SetHomePosition"> + Posición de origen ajustada. + </notification> + <notification name="CantDerezInventoryError"> + No se puede quitar el objeto por un error del inventario. + </notification> + <notification name="CantCreateRequestedInv"> + No se puede crear el inventario solicitado. + </notification> + <notification name="CantCreateRequestedInvFolder"> + No se puede crear la carpeta de inventario solicitada. + </notification> + <notification name="CantCreateInventory"> + No se puede crear el inventario. + </notification> + <notification name="CantCreateLandmark"> + No se puede crear un hito. + </notification> + <notification name="CantCreateOutfit"> + No se puede crear el vestuario en este momento. Prueba otra vez dentro de un minuto. + </notification> + <notification name="InventoryNotForSale"> + El inventario no está en venta. + </notification> + <notification name="CantFindInvItem"> + No se encuentra el objeto del inventario. + </notification> + <notification name="CantFindObject"> + No se puede encontrar el objeto. + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + En esta región actualmente no están activadas las transferencias de dinero a los objetos. + </notification> + <notification name="CantPayNoAgent"> + No se ha averiguado a quién se debe pagar. + </notification> + <notification name="CantDonateToPublicObjects"> + No se pueden dar L$ a los objetos públicos. + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + Error al crear un inventario de objeto del mundo virtual. + </notification> + <notification name="UserBalanceOrLandUsageError"> + Un error interno nos ha impedido actualizar tu visor correctamente. El saldo en L$ o las parcelas en propiedad presentadas en el visor podrían no coincidir con tu saldo real en los servidores. + </notification> + <notification name="LargePrimAgentIntersect"> + No se pueden crear prims grandes que intersectan a otros jugadores. Reinténtalo cuando se hayan movido otros jugadores. + </notification> + <notification name="PreferenceChatClearLog"> + Esto eliminará los registros de conversaciones anteriores y las copias de seguridad de ese archivo. + <usetemplate ignoretext="Confirmar antes de eliminar el registro de conversaciones anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + Esta acción eliminará las transcripciones de todas las conversaciones anteriores. La lista de conversaciones pasadas no resultará afectada. Se eliminarán de la carpeta [FOLDER] todos los archivos que tengan el sufijo .txt y txt.backup. + <usetemplate ignoretext="Confirmar antes de eliminar transcripciones." name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="PreferenceChatPathChanged"> + No se pueden mover los archivos. Ruta anterior restaurada. + <usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100644..100755 --- a/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/es/panel_active_object_row.xml b/indra/newview/skins/default/xui/es/panel_active_object_row.xml index 8d4fadb101..8d4fadb101 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/es/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml index c64a93e0e5..c64a93e0e5 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml index 5220df5d21..c73e34b299 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml @@ -26,5 +26,6 @@ <icon name="permission_edit_mine_icon" tool_tip="Este amigo puede editar, eliminar o manipular tus objetos"/> <icon name="permission_map_icon" tool_tip="Este amigo puede encontrarte en el mapa"/> <icon name="permission_online_icon" tool_tip="Este amigo puede ver cuándo estás conectado"/> + <button name="info_btn" tool_tip="Más información"/> <button name="profile_btn" tool_tip="Ver el perfil"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml index cddbad1195..a3de14ae67 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> - <text name="title_text"> - Lista de ignorados - </text> - <scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/> - <button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/> - <button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/> - <button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="Filtro" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="Acciones en la persona o el objeto seleccionado"/> + <menu_button name="view_btn" tool_tip="Opciones de clasificación"/> + <menu_button name="plus_btn" tool_tip="Elige un residente o un objeto para ignorarlo"/> + <button name="unblock_btn" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/> + </panel> + <block_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml index 8f4e0101aa..8f4e0101aa 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml index 66ae7d868b..66ae7d868b 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml index 8d1b84a5fd..8d1b84a5fd 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml index eaaa5dbe78..eaaa5dbe78 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_classified_info.xml b/indra/newview/skins/default/xui/es/panel_classified_info.xml index 3c168b9e53..3c168b9e53 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/es/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml index d3b3d31bd9..d3b3d31bd9 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml index 959b83d658..959b83d658 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml index a2994894c1..a2994894c1 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml new file mode 100644 index 0000000000..cc4a7e951d --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="(cargando)"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..2fc8cd3aff --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="La conversación incluía voz"/> + <icon name="unread_ims_icon" tool_tip="Han llegado mensajes mientras no tenías conexión"/> + <button name="delete_btn" tool_tip="Quitar esta entrada"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml index d1d7d8ec82..d1d7d8ec82 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml index bc3046978c..bc3046978c 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml index 829c206ae1..829c206ae1 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml index ffad843732..ffad843732 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml index 29a416f698..29a416f698 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml index d536a862f5..d536a862f5 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_hair.xml b/indra/newview/skins/default/xui/es/panel_edit_hair.xml index 25af1ea8cb..25af1ea8cb 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml index 22a46a2f75..22a46a2f75 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_pants.xml b/indra/newview/skins/default/xui/es/panel_edit_pants.xml index fb35e0953b..fb35e0953b 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_physics.xml b/indra/newview/skins/default/xui/es/panel_edit_physics.xml index dfb5ab330a..dfb5ab330a 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml index cda465da9c..cda465da9c 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml index 8e5e09cfec..8e5e09cfec 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_shape.xml b/indra/newview/skins/default/xui/es/panel_edit_shape.xml index 368be35ed9..368be35ed9 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml index 73b712374e..73b712374e 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml index 5e457612d5..5e457612d5 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_skin.xml b/indra/newview/skins/default/xui/es/panel_edit_skin.xml index 8d895a6152..8d895a6152 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml index 416d174298..416d174298 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_socks.xml b/indra/newview/skins/default/xui/es/panel_edit_socks.xml index ac9b2a773e..ac9b2a773e 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml index 8776dd6c10..8776dd6c10 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml index aac8af44b9..aac8af44b9 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml index c26c554c1a..c26c554c1a 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml index 799512968d..799512968d 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml index b398293175..b398293175 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml index b00c300c85..b00c300c85 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_general.xml +++ b/indra/newview/skins/default/xui/es/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml index 09c4eec4d9..09c4eec4d9 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml index 319e9d0f1b..319e9d0f1b 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml index 3afb0f5665..3afb0f5665 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml index 5c9f1c3688..4d682068d7 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Desconocido"/> + <button name="info_btn" tool_tip="Más información"/> <button name="profile_btn" tool_tip="Ver el perfil"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml index 1eaa69abff..1eaa69abff 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_notify.xml b/indra/newview/skins/default/xui/es/panel_group_notify.xml index 7bdacbd1e0..7bdacbd1e0 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/es/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml index 390b4e2e9d..390b4e2e9d 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml index f218324d50..f218324d50 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/es/panel_inventory_item.xml b/indra/newview/skins/default/xui/es/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/es/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_landmark_info.xml b/indra/newview/skins/default/xui/es/panel_landmark_info.xml index 1a0ac3ba79..1a0ac3ba79 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/es/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/es/panel_landmarks.xml b/indra/newview/skins/default/xui/es/panel_landmarks.xml index b92685f0ae..b92685f0ae 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/es/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index 1d7f077fe7..1d7f077fe7 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml index 7e318a150b..7e318a150b 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/es/panel_me.xml b/indra/newview/skins/default/xui/es/panel_me.xml index 850cd6ec71..850cd6ec71 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_me.xml +++ b/indra/newview/skins/default/xui/es/panel_me.xml diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml index afc11a4250..afc11a4250 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml index ec9edbfa15..ec9edbfa15 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml index a1a3ec86cf..a1a3ec86cf 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml index d36c6283bc..d36c6283bc 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml index 4220ab3c9f..4220ab3c9f 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml index af2b6e920b..e6ca59f912 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/> <button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml index 8d4f9eda18..8d4f9eda18 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/es/panel_notify_textbox.xml b/indra/newview/skins/default/xui/es/panel_notify_textbox.xml index dc7c873303..dc7c873303 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/es/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml index 9e2f3c3adc..9e2f3c3adc 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml index 9e669995aa..9e669995aa 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml index 1107e72b54..1107e72b54 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml index 8f805c3d18..8f805c3d18 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfits_list.xml b/indra/newview/skins/default/xui/es/panel_outfits_list.xml index 3f8057f242..3f8057f242 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml index 8cea619bd5..8cea619bd5 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml index a9d38dca25..7a7dfca0b8 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_people.xml +++ b/indra/newview/skins/default/xui/es/panel_people.xml @@ -14,81 +14,53 @@ <string name="no_filtered_friends_msg"> ¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/people/[SEARCH_TERM] Buscar]. </string> - <string name="people_filter_label" value="Filtrar a la gente"/> - <string name="groups_filter_label" value="Filtrar a los grupos"/> <string name="no_filtered_groups_msg" value="¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/groups/[SEARCH_TERM] Buscar]."/> <string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/> <string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/> <string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/> - <filter_editor label="Filtrar" name="filter_input"/> <tab_container name="tabs"> <panel label="CERCANA" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="Opciones"/> - <button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="Filtrar la gente" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/> + <menu_button name="nearby_view_btn" tool_tip="Opciones de vista/orden"/> + <button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/> + <dnd_button name="nearby_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/> </panel> </panel> - <panel label="MIS AMIGOS" name="friends_panel"> + <panel label="AMIGOS" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="Filtrar la gente" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/> + <menu_button name="friends_view_btn" tool_tip="Opciones de vista/orden"/> + <button name="friends_add_btn" tool_tip="Ofrecer amistad a un residente"/> + <dnd_button name="friends_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Conectado"/> <accordion_tab name="tab_all" title="Todos"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="Ver más opciones"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="MIS GRUPOS" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="Opciones"/> - <button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/> - <button name="activate_btn" tool_tip="Activar el grupo seleccionado"/> + <panel label="GRUPOS" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="Filtrar los grupos" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="Acciones en el grupo seleccionado"/> + <menu_button name="groups_view_btn" tool_tip="Opciones de vista/orden"/> + <menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/> + <dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/> </panel> </panel> <panel label="RECIENTE" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="Opciones"/> - <button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="Filtrar la gente" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/> + <menu_button name="recent_view_btn" tool_tip="Opciones de vista/orden"/> + <button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/> + <dnd_button name="recent_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/> </panel> </panel> + <panel label="BLOQUEADO" name="blocked_panel"> + <panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="Llamar al grupo" name="group_call_btn" tool_tip="Llama a este grupo"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_pick_info.xml b/indra/newview/skins/default/xui/es/panel_pick_info.xml index 3450279b4a..3450279b4a 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/es/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/es/panel_picks.xml b/indra/newview/skins/default/xui/es/panel_picks.xml index 904cdd12f1..904cdd12f1 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_picks.xml +++ b/indra/newview/skins/default/xui/es/panel_picks.xml diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml index e1cf1332e2..e1cf1332e2 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/es/panel_places.xml b/indra/newview/skins/default/xui/es/panel_places.xml index e9984b4512..e9984b4512 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_places.xml +++ b/indra/newview/skins/default/xui/es/panel_places.xml diff --git a/indra/newview/skins/default/xui/es/panel_postcard_message.xml b/indra/newview/skins/default/xui/es/panel_postcard_message.xml index 7316d91f5c..7316d91f5c 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/es/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/es/panel_postcard_settings.xml b/indra/newview/skins/default/xui/es/panel_postcard_settings.xml index 3931319447..3931319447 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/es/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml index 620a95de4d..620a95de4d 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml index f34edf149e..f34edf149e 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml 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 b0b6114e88..28bc98f988 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat de texto" name="chat"> - <text name="font_size"> - Tamaño de la fuente: - </text> - <radio_group name="chat_font_size"> - <radio_item label="Disminuir" name="radio" value="0"/> - <radio_item label="Medio" name="radio2" value="1"/> - <radio_item label="Aumentar" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/> - <check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/> - <check_box label="Permitir el historial de MI y chat en texto sin formato" name="plain_text_chat_history"/> - <check_box label="Bocadillos del chat" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - Mostrar los MI en: - </text> - <text name="requires_restart_label"> - (requiere reiniciar) - </text> - <radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)"> - <radio_item label="Ventanas distintas" name="radio" value="0"/> - <radio_item label="Pestañas" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - Permitir ventanas de chat emergentes: - </text> - <check_box label="Chats de grupo" name="EnableGroupChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje de un grupo de chat"/> - <check_box label="Chats de MI" name="EnableIMChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje instantáneo"/> - <spinner label="Duración de los interlocutores favoritos:" name="nearby_toasts_lifetime"/> - <spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/> + <check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/> + <check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/> + <text name="font_size"> + Tamaño de la fuente: + </text> + <combo_box name="chat_font_size"> + <item label="Pequeña" name="Small" value="0"/> + <item label="Mediana" name="Medium" value="1"/> + <item label="Grande" name="Large" value="2"/> + </combo_box> + <check_box label="Bocadillos del chat" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + Notificaciones + </text> + <text name="friend_ims"> + MI de amigos: + </text> + <combo_box name="FriendIMOptions"> + <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/> + <item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/> + <item label="Ninguno" name="None" value="ninguno"/> + </combo_box> + <text name="non_friend_ims"> + MI de no amigos: + </text> + <combo_box name="NonFriendIMOptions"> + <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/> + <item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/> + <item label="Ninguno" name="None" value="ninguno"/> + </combo_box> + <text name="conference_ims"> + MI de conferencia: + </text> + <combo_box name="ConferenceIMOptions"> + <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/> + <item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/> + <item label="Ninguno" name="None" value="ninguno"/> + </combo_box> + <text name="group_chat"> + Chat de grupo: + </text> + <combo_box name="GroupChatOptions"> + <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/> + <item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/> + <item label="Ninguno" name="None" value="ninguno"/> + </combo_box> + <text name="nearby_chat"> + Chat: + </text> + <combo_box name="NearbyChatOptions"> + <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/> + <item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/> + <item label="Ninguno" name="None" value="ninguno"/> + </combo_box> + <text name="notifications_alert"> + Para suspender provisionalmente todas las notificaciones, usa Comunicarme > No molestar. + </text> + </panel> + <panel> + <text name="play_sound"> + Reproducir sonido: + </text> + <check_box label="Nueva conversación" name="new_conversation"/> + <check_box label="Llamada de voz entrante" name="incoming_voice_call"/> + <check_box label="Oferta de teleporte" name="teleport_offer"/> + <check_box label="Oferta de inventario" name="inventory_offer"/> + </panel> + <panel> + <button label="Limpiar el registro..." name="clear_log"/> + <button label="Eliminar transcripciones..." name="delete_transcripts"/> + <button label="Examinar..." label_selected="Examinar" name="log_path_button"/> + </panel> <button label="Traducción…" name="ok_btn"/> <button label="Reemplazo automático..." name="autoreplace_showgui"/> <button label="Revisión ortográfica..." name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml index d47a6d718a..d47a6d718a 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml 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 4fc163f5b6..98b0081da9 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -69,6 +69,9 @@ <combo_box.item label="nunca" name="item4"/> </combo_box> <text name="text_box3"> - Respuesta cuando estoy en modo ocupado: + Respuesta de No molestar: </text> + <text_editor name="do_not_disturb_response"> + log_in_to_change + </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml index 281b871fed..281b871fed 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_move.xml b/indra/newview/skins/default/xui/es/panel_preferences_move.xml index b2ff6b61c2..b2ff6b61c2 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml index c162130af6..c162130af6 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml index 81a29dae5a..81a29dae5a 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml index 5cb1654c70..5cb1654c70 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml index 90b9e475e7..90b9e475e7 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml index 2beacda235..2beacda235 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml index 71bdba1a25..71bdba1a25 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml index a73f1deed4..a73f1deed4 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml index 6089dfb8db..6089dfb8db 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml index 453d1fe43c..453d1fe43c 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_region_general.xml +++ b/indra/newview/skins/default/xui/es/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml index cb6c03dbb5..cb6c03dbb5 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/es/panel_script_ed.xml b/indra/newview/skins/default/xui/es/panel_script_ed.xml index 4c4077b96f..4c4077b96f 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/es/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml index 9334d58af2..9334d58af2 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml index 37dc0a576c..37dc0a576c 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml index bafd4e5e55..bafd4e5e55 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml index 775e343dc9..775e343dc9 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml index 12c74b5cd1..12c74b5cd1 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_local.xml b/indra/newview/skins/default/xui/es/panel_snapshot_local.xml index 08c45d2e76..08c45d2e76 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/es/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml index 2b2584f66c..2b2584f66c 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml index 649d547ba0..649d547ba0 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml index 6a0bc22d68..6a0bc22d68 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/es/panel_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml index 9531b99cc8..9531b99cc8 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/es/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml index 350aec9c69..350aec9c69 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml index 7eead3bc18..7eead3bc18 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history.xml b/indra/newview/skins/default/xui/es/panel_teleport_history.xml index 364451b26b..364451b26b 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/es/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml index 10b37b6880..10b37b6880 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/es/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml index 94a0428941..94a0428941 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/es/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml index 426783aa8e..426783aa8e 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/es/panel_world_map.xml b/indra/newview/skins/default/xui/es/panel_world_map.xml index b1dea02210..b1dea02210 100644..100755 --- a/indra/newview/skins/default/xui/es/panel_world_map.xml +++ b/indra/newview/skins/default/xui/es/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml index 660293b02c..660293b02c 100644..100755 --- a/indra/newview/skins/default/xui/es/role_actions.xml +++ b/indra/newview/skins/default/xui/es/role_actions.xml diff --git a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml index bdef89c392..bdef89c392 100644..100755 --- a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml index f68dcc65e3..f68dcc65e3 100644..100755 --- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml index 176247f90e..176247f90e 100644..100755 --- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml index 9da2958953..cb061796e7 100644..100755 --- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="Comprar el objeto" name="Buyobject"/> <combo_box.item label="Pagar el objeto" name="Payobject"/> <combo_box.item label="Abrir" name="Open"/> + <combo_box.item label="Zoom" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 52bcab54e5..937433e210 100644..100755 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -128,7 +128,7 @@ Salir </string> <string name="create_account_url"> - http://join.secondlife.com/index.php?lang=es-ES&sourceid=[sourceid] + http://join.secondlife.com/?sourceid=[sourceid] </string> <string name="LoginFailedViewerNotPermitted"> Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor: @@ -610,8 +610,8 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="AvatarAway"> Ausente </string> - <string name="AvatarBusy"> - Ocupado + <string name="AvatarDoNotDisturb"> + No molestar </string> <string name="AvatarMuted"> Ignorado @@ -844,6 +844,12 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="ST_NO_JOINT"> No se puede encontrar ROOT o JOINT. </string> + <string name="NearbyChatTitle"> + Chat + </string> + <string name="NearbyChatLabel"> + (Chat) + </string> <string name="whisper"> susurra: </string> @@ -907,6 +913,9 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="ControlYourCamera"> Controlar su cámara </string> + <string name="AgentNameSubst"> + (Tú) + </string> <string name="TeleportYourAgent"> Teleportarte </string> @@ -991,18 +1000,6 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="dictionary_files"> Diccionarios </string> - <string name="AvatarSetNotAway"> - Salir del estado ausente - </string> - <string name="AvatarSetAway"> - Pasar al estado ausente - </string> - <string name="AvatarSetNotBusy"> - Salir del estado ocupado - </string> - <string name="AvatarSetBusy"> - Pasar al estado ocupado - </string> <string name="shape"> Forma </string> @@ -1959,8 +1956,8 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="PanelContentsNewScript"> 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. + <string name="DoNotDisturbModeResponseDefault"> + Este residente tiene activado 'No molestar' y verá tu mensaje más tarde. </string> <string name="MuteByName"> (Por el nombre) @@ -2073,9 +2070,6 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="GroupMoneyDate"> [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc] </string> - <string name="ViewerObjectContents"> - Contenidos - </string> <string name="AcquiredItems"> Artículos adquiridos </string> @@ -3793,7 +3787,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. Región General </string> <string name="LocationCtrlSeeAVsTooltip"> - Los avatares están visibles y está permitido el chat fuera de esta parcela + Los avatares que están en esta parcela no pueden ser vistos ni escuchados por los que están fuera de ella </string> <string name="LocationCtrlPathfindingDirtyTooltip"> Los objetos que se mueven pueden presentar un comportamiento incorrecto en la región hasta que ésta se recargue. @@ -3867,6 +3861,12 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. <string name="Saved_message"> (Guardado [LONG_TIMESTAMP]) </string> + <string name="OnlineStatus"> + Conectado/a + </string> + <string name="OfflineStatus"> + Desconectado/a + </string> <string name="answered_call"> Han respondido a tu llamada </string> @@ -3876,6 +3876,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. <string name="you_joined_call"> Has entrado en la llamada de voz </string> + <string name="you_auto_rejected_call-im"> + Rechazaste la llamada de voz automáticamente porque estaba activado 'No molestar'. + </string> <string name="name_started_call"> [NAME] inició una llamada de voz </string> @@ -3888,6 +3891,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. <string name="hang_up-im"> Se colgó la llamada de voz </string> + <string name="conference-title"> + Chat multi-persona + </string> <string name="conference-title-incoming"> Conferencia con [AGENT_NAME] </string> @@ -4766,6 +4772,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="Command_Chat_Label"> Chat </string> + <string name="Command_Conversations_Label"> + Conversaciones + </string> <string name="Command_Compass_Label"> Brújula </string> @@ -4841,6 +4850,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="Command_Chat_Tooltip"> Habla por chat de texto con las personas próximas </string> + <string name="Command_Conversations_Tooltip"> + Conversar con todos + </string> <string name="Command_Compass_Tooltip"> Brújula </string> @@ -4970,4 +4982,13 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="UserDictionary"> [Usuario] </string> + <string name="logging_calls_disabled_log_empty"> + No se están registrando las conversaciones. Para empezar a grabar un registro, elige "Guardar: Solo registro" o "Guardar: Registro y transcripciones" en Preferencias > Chat. + </string> + <string name="logging_calls_disabled_log_not_empty"> + No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige "Guardar: Solo registro" o "Guardar: Registro y transcripciones" en Preferencias > Chat. + </string> + <string name="logging_calls_enabled_log_empty"> + No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro. + </string> </strings> diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml index 94975a83f8..94975a83f8 100644..100755 --- a/indra/newview/skins/default/xui/es/teleport_strings.xml +++ b/indra/newview/skins/default/xui/es/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/es/xui_version.xml b/indra/newview/skins/default/xui/es/xui_version.xml index 0e777751d3..0e777751d3 100644..100755 --- a/indra/newview/skins/default/xui/es/xui_version.xml +++ b/indra/newview/skins/default/xui/es/xui_version.xml diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml index a659cb4245..a659cb4245 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_about.xml +++ b/indra/newview/skins/default/xui/fr/floater_about.xml 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 25c49b97b5..25c49b97b5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/fr/floater_activeim.xml b/indra/newview/skins/default/xui/fr/floater_activeim.xml index 18e3d66bb7..18e3d66bb7 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_activeim.xml +++ b/indra/newview/skins/default/xui/fr/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml index e82518ce80..e82518ce80 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml index 84c40b5987..84c40b5987 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml index 6cef2a3591..6cef2a3591 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_auction.xml +++ b/indra/newview/skins/default/xui/fr/floater_auction.xml diff --git a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml index 1d19181692..1d19181692 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/fr/floater_avatar.xml b/indra/newview/skins/default/xui/fr/floater_avatar.xml index 7cbb50a3d6..7cbb50a3d6 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_avatar.xml +++ b/indra/newview/skins/default/xui/fr/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml index 74de4ddb1c..74de4ddb1c 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml index e1786eafc7..e1786eafc7 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml index ebd4dab683..ebd4dab683 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_beacons.xml +++ b/indra/newview/skins/default/xui/fr/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml index a200ed192f..a200ed192f 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_build_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml index ab68ce166b..ab68ce166b 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml index 32714ea09c..32714ea09c 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_bumps.xml +++ b/indra/newview/skins/default/xui/fr/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml index 0436dc8a91..0436dc8a91 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml index 148a5a35d2..148a5a35d2 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml index 953fca3544..953fca3544 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml index b7f8f36f81..b7f8f36f81 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml index 519e741a25..519e741a25 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml index 893e389f69..893e389f69 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_camera.xml +++ b/indra/newview/skins/default/xui/fr/floater_camera.xml diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml index 890411d091..7dcb9a280d 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="chat_bar" title="CHAT PRÈS DE MOI"> +<floater name="nearby_chat" title="CHAT PRÈS DE MOI"> <panel name="bottom_panel"> <line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl+Entrée pour crier"/> <button name="show_nearby_chat" tool_tip="Afficher/masquer le journal de chat près de vous."/> diff --git a/indra/newview/skins/default/xui/fr/floater_choose_group.xml b/indra/newview/skins/default/xui/fr/floater_choose_group.xml index b73bedd7b5..b73bedd7b5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/fr/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml index c54e3e9ce0..c54e3e9ce0 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml new file mode 100644 index 0000000000..e9017c79b1 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="JOURNAL DES CONVERSATIONS"> + <panel name="buttons_panel"> + <filter_editor label="Filtrer les personnes" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="Options d'affichage/de tri"/> + <menu_button name="conversations_gear_btn" tool_tip="Actions sur la personne ou le groupe sélectionné"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml new file mode 100644 index 0000000000..9a486a84c6 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="CONVERSATION:"> + <floater.string name="Title"> + CONVERSATION: [NAME] + </floater.string> + <text name="page_label" value="Page"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_critical.xml b/indra/newview/skins/default/xui/fr/floater_critical.xml index 6d30d97048..6d30d97048 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_critical.xml +++ b/indra/newview/skins/default/xui/fr/floater_critical.xml diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml index 035bdbe5f3..035bdbe5f3 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/fr/floater_destinations.xml b/indra/newview/skins/default/xui/fr/floater_destinations.xml index 25e6c90a8e..25e6c90a8e 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_destinations.xml +++ b/indra/newview/skins/default/xui/fr/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/fr/floater_display_name.xml b/indra/newview/skins/default/xui/fr/floater_display_name.xml index eebe7abf2c..eebe7abf2c 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_display_name.xml +++ b/indra/newview/skins/default/xui/fr/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml index 5ec68458e1..5ec68458e1 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml index 4ec9bbb3dd..4ec9bbb3dd 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml index 81d9d34cfb..81d9d34cfb 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml index ea12749d27..ea12749d27 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml index 67d70ac003..67d70ac003 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_event.xml +++ b/indra/newview/skins/default/xui/fr/floater_event.xml diff --git a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml index 0100b10557..0100b10557 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/fr/floater_font_test.xml b/indra/newview/skins/default/xui/fr/floater_font_test.xml index 974a5ca3a2..974a5ca3a2 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_font_test.xml +++ b/indra/newview/skins/default/xui/fr/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml index 5ead1cae3a..5ead1cae3a 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml index 0d21a8af32..0d21a8af32 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml index 098f8fc713..098f8fc713 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml index 11caca640c..11caca640c 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/fr/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/fr/floater_how_to.xml b/indra/newview/skins/default/xui/fr/floater_how_to.xml index a414212ba0..a414212ba0 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_how_to.xml +++ b/indra/newview/skins/default/xui/fr/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/fr/floater_hud.xml b/indra/newview/skins/default/xui/fr/floater_hud.xml index f212f113b3..f212f113b3 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_hud.xml +++ b/indra/newview/skins/default/xui/fr/floater_hud.xml diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml index 5ea073365e..f0b17e8437 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_im_container.xml +++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="CONVERSATIONS"/> +<multi_floater name="floater_im_box" title="CONVERSATIONS"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="Options d'affichage/de tri"/> + <button name="add_btn" tool_tip="Commencer une nouvelle conversation"/> + <button name="speak_btn" tool_tip="Parler aux personnes en utilisant votre micro"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="Réduire/Développer cette liste"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="Réduire ce panneau"/> + <text name="stub_textbox"> + Cette conversation s'affiche dans une fenêtre distincte. [secondlife:/// la rattacher.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml index 516eb41362..8ab98b8e4e 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_im_session.xml +++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="À" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] a été invité à la conversation."/> + <floater.string name="multiple_participants_added" value="[NAME] ont été invités à la conversation."/> + <floater.string name="tooltip_to_separate_window" value="Déplacer cette conversation dans une fenêtre distincte"/> + <floater.string name="tooltip_to_main_window" value="Replacer cette conversation dans la fenêtre principale"/> + <floater.string name="start_call_button_tooltip" value="Ouvrir une connexion vocale"/> + <floater.string name="end_call_button_tooltip" value="Fermer la connexion vocale"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="Réduire ce panneau"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Réduire la liste des participants"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Développer la liste des participants"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="Options d'affichage/de tri"/> + <menu_button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/> + <button name="add_btn" tool_tip="Ajouter un participant à cette conversation"/> + <button name="voice_call_btn" tool_tip="Ouvrir une connexion vocale"/> + <button name="close_btn" tool_tip="Mettre fin à cette conversation"/> + <button name="expand_collapse_btn" tool_tip="Réduire/Développer ce panneau"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Traduire le chat" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="À" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml index 3d405f358d..3d405f358d 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_import_collada.xml b/indra/newview/skins/default/xui/fr/floater_import_collada.xml index 03804c4bd5..03804c4bd5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/fr/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml index 7594eec5f2..9e6946ba9e 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml @@ -10,7 +10,7 @@ anonyme </floater.string> <floater.string name="VoiceInviteP2P"> - appelle. + vous appelle. </floater.string> <floater.string name="VoiceInviteAdHoc"> a rejoint un chat vocal avec conférence. @@ -25,9 +25,9 @@ Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ? </floater.string> <text name="question"> - Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ? + Si vous répondez, vous serez déconnecté de votre conversation vocale actuelle. </text> - <button label="Accepter" label_selected="Accepter" name="Accept"/> - <button label="Refuser" label_selected="Refuser" name="Reject"/> - <button label="Lancer IM" name="Start IM"/> + <button label="Répondre" label_selected="Répondre" name="Accept"/> + <button label="Ignorer" label_selected="Ignorer" name="Reject"/> + <button label="Ouvrir IM à la place" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml index 9b1bdf106d..9b1bdf106d 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_inspect.xml +++ b/indra/newview/skins/default/xui/fr/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml index f2eb3cb6bc..f2eb3cb6bc 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml index 7567817f3a..7567817f3a 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml index 02ac21bf82..02ac21bf82 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_joystick.xml +++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml index 39a861d8bd..39a861d8bd 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml index ff728e3aaa..ff728e3aaa 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml index 7647452e91..7647452e91 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml index 71d2c42578..71d2c42578 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml index dbd3dd9406..dbd3dd9406 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_map.xml diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml index 58535eddf5..58535eddf5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/fr/floater_media_settings.xml b/indra/newview/skins/default/xui/fr/floater_media_settings.xml index 27db5ea995..27db5ea995 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml index d03c4d7544..d03c4d7544 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml index b491dd6aed..b491dd6aed 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml index bd3dae6599..bd3dae6599 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml index 853af2afdf..853af2afdf 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_moveview.xml +++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml index f4db3201a8..f4db3201a8 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/fr/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml index 53ff58e307..53ff58e307 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml index d514d08081..d514d08081 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/floater_notification.xml b/indra/newview/skins/default/xui/fr/floater_notification.xml index fe4b5f9bd6..fe4b5f9bd6 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_notification.xml +++ b/indra/newview/skins/default/xui/fr/floater_notification.xml diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml index e040e948f5..e040e948f5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/fr/floater_object_weights.xml b/indra/newview/skins/default/xui/fr/floater_object_weights.xml index 2667188308..2667188308 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/fr/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml index 4e046ff3f3..4e046ff3f3 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_openobject.xml +++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml index 72018f5de5..72018f5de5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml index 089d710f17..089d710f17 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml index 7c9109c011..7c9109c011 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml index 02d969dc08..0bcf55aba5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> Afficher : </text> - <check_box label="Monde" name="show_world"/> + <check_box label="Test" name="show_world"/> <check_box label="Mobiles uniquement" name="show_world_movables_only"/> <check_box label="Maillage de navigation" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml index 894ec6dd9c..894ec6dd9c 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml index 397436876d..397436876d 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_pay.xml +++ b/indra/newview/skins/default/xui/fr/floater_pay.xml diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml index 966fa3b8a6..966fa3b8a6 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/fr/floater_people.xml b/indra/newview/skins/default/xui/fr/floater_people.xml index 58701c06b2..58701c06b2 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_people.xml +++ b/indra/newview/skins/default/xui/fr/floater_people.xml diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml index 36bec80561..36bec80561 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/fr/floater_picks.xml b/indra/newview/skins/default/xui/fr/floater_picks.xml index f058ff668b..f058ff668b 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_picks.xml +++ b/indra/newview/skins/default/xui/fr/floater_picks.xml diff --git a/indra/newview/skins/default/xui/fr/floater_places.xml b/indra/newview/skins/default/xui/fr/floater_places.xml index 9e649aca47..9e649aca47 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_places.xml +++ b/indra/newview/skins/default/xui/fr/floater_places.xml diff --git a/indra/newview/skins/default/xui/fr/floater_post_process.xml b/indra/newview/skins/default/xui/fr/floater_post_process.xml index a22c7512e5..a22c7512e5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_post_process.xml +++ b/indra/newview/skins/default/xui/fr/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml index 0f9fb1334b..0f9fb1334b 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_preferences.xml +++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml index 020bdf928b..020bdf928b 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml index 6488089c06..6488089c06 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml 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 6287f10f3e..6287f10f3e 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml index 5646ad45eb..5646ad45eb 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml index a215f92df1..a215f92df1 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml index 9fc9d14026..9fc9d14026 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml index a6e598dd2b..a6e598dd2b 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml index d4d8652434..d4d8652434 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml index 1747155b60..1747155b60 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml index c2663174d4..c2663174d4 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_region_info.xml +++ b/indra/newview/skins/default/xui/fr/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml index 78c35dc303..78c35dc303 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug.xml b/indra/newview/skins/default/xui/fr/floater_script_debug.xml index e257aac6c4..e257aac6c4 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_limits.xml b/indra/newview/skins/default/xui/fr/floater_script_limits.xml index cc3aaa6653..cc3aaa6653 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml index 7b6bc73677..7b6bc73677 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml index b9a8165457..b9a8165457 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/fr/floater_script_search.xml b/indra/newview/skins/default/xui/fr/floater_script_search.xml index 09b903f41c..09b903f41c 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_script_search.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml index 32800182ea..32800182ea 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_search.xml +++ b/indra/newview/skins/default/xui/fr/floater_search.xml diff --git a/indra/newview/skins/default/xui/fr/floater_select_key.xml b/indra/newview/skins/default/xui/fr/floater_select_key.xml index 664bc0a723..664bc0a723 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_select_key.xml +++ b/indra/newview/skins/default/xui/fr/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml index c5fb0ea0d4..c5fb0ea0d4 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml index 995837e9ee..995837e9ee 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml index 9244051edc..9244051edc 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml index 080ade9dd4..080ade9dd4 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml index 6f0fb3421f..6f0fb3421f 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml index 635db52ffa..635db52ffa 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml index c8c76c672d..c8c76c672d 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml index d6bd187956..d6bd187956 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_stats.xml +++ b/indra/newview/skins/default/xui/fr/floater_stats.xml diff --git a/indra/newview/skins/default/xui/fr/floater_sys_well.xml b/indra/newview/skins/default/xui/fr/floater_sys_well.xml index dbdd32974c..dbdd32974c 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/fr/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml index c529ca2736..c529ca2736 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_telehub.xml +++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml index 702170ef52..702170ef52 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml index f86c1a4217..eace67026c 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml @@ -20,7 +20,7 @@ <button label="Vierge" label_selected="Vierge" name="Blank" width="60"/> <button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/> <button bottom="-240" label="" label_selected="" name="Pipette"/> - <check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/> + <check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/> <text name="preview_disabled" value="Aperçu désactivé"/> <filter_editor label="Filtrer les textures" name="inventory search editor"/> <check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml index caae15ea17..caae15ea17 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index bcc3423862..bcc3423862 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml index eb084d9184..eb084d9184 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml index 6d58cf77ca..6d58cf77ca 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_tos.xml +++ b/indra/newview/skins/default/xui/fr/floater_tos.xml diff --git a/indra/newview/skins/default/xui/fr/floater_toybox.xml b/indra/newview/skins/default/xui/fr/floater_toybox.xml index f99d3d30b5..f99d3d30b5 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_toybox.xml +++ b/indra/newview/skins/default/xui/fr/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/fr/floater_translation_settings.xml b/indra/newview/skins/default/xui/fr/floater_translation_settings.xml index c7582f110f..c7582f110f 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml index 4b2be14569..4b2be14569 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/fr/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..f4f452eea7 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="VOLUME DU CHAT VOCAL"> + <slider label="Chat vocal" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml index fc4de4a5a6..fc4de4a5a6 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml index 671fb5c14d..f9a76d127e 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX"> +<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX"> <string name="no_voice_effect"> (Aucun effet de voix) </string> diff --git a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml new file mode 100644 index 0000000000..bf91a5bb79 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="VOLUME DE LA VOIX"> + <slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_web_content.xml b/indra/newview/skins/default/xui/fr/floater_web_content.xml index 65dfafe760..65dfafe760 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_web_content.xml +++ b/indra/newview/skins/default/xui/fr/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml index 99e4954555..99e4954555 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/fr/floater_window_size.xml b/indra/newview/skins/default/xui/fr/floater_window_size.xml index 11c2e439bd..11c2e439bd 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_window_size.xml +++ b/indra/newview/skins/default/xui/fr/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml index f5dab91924..f5dab91924 100644..100755 --- a/indra/newview/skins/default/xui/fr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/fr/fonts.xml b/indra/newview/skins/default/xui/fr/fonts.xml index cccb45b973..cccb45b973 100644..100755 --- a/indra/newview/skins/default/xui/fr/fonts.xml +++ b/indra/newview/skins/default/xui/fr/fonts.xml diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml index 553646f8e9..553646f8e9 100644..100755 --- a/indra/newview/skins/default/xui/fr/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/fr/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/fr/inspect_group.xml b/indra/newview/skins/default/xui/fr/inspect_group.xml index e8c528c1ac..e8c528c1ac 100644..100755 --- a/indra/newview/skins/default/xui/fr/inspect_group.xml +++ b/indra/newview/skins/default/xui/fr/inspect_group.xml diff --git a/indra/newview/skins/default/xui/fr/inspect_object.xml b/indra/newview/skins/default/xui/fr/inspect_object.xml index b66af7a2bf..b66af7a2bf 100644..100755 --- a/indra/newview/skins/default/xui/fr/inspect_object.xml +++ b/indra/newview/skins/default/xui/fr/inspect_object.xml diff --git a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml index 6d7cfadc04..6d7cfadc04 100644..100755 --- a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/fr/language_settings.xml b/indra/newview/skins/default/xui/fr/language_settings.xml index fdac9d65a7..fdac9d65a7 100644..100755 --- a/indra/newview/skins/default/xui/fr/language_settings.xml +++ b/indra/newview/skins/default/xui/fr/language_settings.xml diff --git a/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml index 7e7993175e..7e7993175e 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml index f48513eb2b..f48513eb2b 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml index 6af2064e44..6af2064e44 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml index 3bac25c79b..3bac25c79b 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml index 08d1a20361..08d1a20361 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml index 6310a2177a..6310a2177a 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml index a4ead48b6b..a4ead48b6b 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml index 4b6907fcc6..4b6907fcc6 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml index 03cc569704..03cc569704 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml index 8276d57025..fea0486d8a 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> +<toggleable_menu name="Gear COF"> <menu label="Nouveaux habits" name="COF.Gear.New_Clothes"/> - <menu label="Nouvelles parties du corps" name="COF.Geear.New_Body_Parts"/> -</menu> + <menu label="Nouvelles parties du corps" name="COF.Gear.New_Body_Parts"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml new file mode 100644 index 0000000000..857ead603b --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="Fermer la conversation" name="close_conversation"/> + <menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/> + <menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/> + <menu_item_call label="Voir le profil" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Proposer une téléportation." name="offer_teleport"/> + <menu_item_call label="Appel" name="voice_call"/> + <menu_item_call label="Historique du chat..." name="chat_history"/> + <menu_item_call label="Devenir amis" name="add_friend"/> + <menu_item_call label="Supprimer cet ami" name="remove_friend"/> + <menu_item_call label="Supprimer ces amis" name="remove_friends"/> + <menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/> + <menu_item_call label="Zoomer en avant" name="zoom_in"/> + <menu_item_call label="Carte" name="map"/> + <menu_item_call label="Partager" name="share"/> + <menu_item_call label="Payer" name="pay"/> + <menu_item_check label="Bloquer le chat vocal" name="block_unblock"/> + <menu_item_check label="Ignorer le texte" name="MuteText"/> + <menu_item_call label="Profil du groupe" name="group_profile"/> + <menu_item_call label="Activer le groupe" name="activate_group"/> + <menu_item_call label="Quitter le groupe" name="leave_group"/> + <context_menu label="Options du modérateur" name="Moderator Options"> + <menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/> + <menu_item_call label="Ignorer ce participant" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Ne plus ignorer ce participant" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Ignorer les autres" name="ModerateVoiceMute"/> + <menu_item_call label="Ne plus ignorer les autres" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..4e7e84199d --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="IM..." name="IM"/> + <menu_item_call label="Appel..." name="Call"/> + <menu_item_call label="Ouvrir l'historique du chat..." name="Chat history"/> + <menu_item_call label="Voir le profil" name="View Profile"/> + <menu_item_call label="Téléporter" name="teleport"/> + <menu_item_call label="Devenir amis" name="add_friend"/> + <menu_item_call label="Supprimer cet ami" name="remove_friend"/> + <menu_item_call label="Inviter dans le groupe..." name="Invite"/> + <menu_item_call label="Carte" name="Map"/> + <menu_item_call label="Partager" name="Share"/> + <menu_item_call label="Payer" name="Pay"/> + <menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml new file mode 100644 index 0000000000..c515a8e8e5 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="Trier par nom" name="sort_by_name"/> + <menu_item_check label="Trier par date" name="sort_by_date"/> + <menu_item_check label="Trier avec les amis en haut" name="sort_by_friends"/> + <menu_item_call label="Afficher l'historique du Chat près de moi" name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_edit.xml b/indra/newview/skins/default/xui/fr/menu_edit.xml index 56669f31e1..56669f31e1 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_edit.xml +++ b/indra/newview/skins/default/xui/fr/menu_edit.xml diff --git a/indra/newview/skins/default/xui/fr/menu_favorites.xml b/indra/newview/skins/default/xui/fr/menu_favorites.xml index 5f1545fde7..5f1545fde7 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_favorites.xml +++ b/indra/newview/skins/default/xui/fr/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml index 062dd0f005..062dd0f005 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_group_plus.xml b/indra/newview/skins/default/xui/fr/menu_group_plus.xml index ad76f11d79..ad76f11d79 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/fr/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml index 09c9f5084a..09c9f5084a 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml new file mode 100644 index 0000000000..1ec5910c8f --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="Voir le profil" name="View Profile"/> + <menu_item_call label="Devenir amis" name="Add Friend"/> + <menu_item_call label="Supprimer cet ami" name="remove_friend"/> + <menu_item_call label="Proposer une téléportation." name="offer_teleport"/> + <menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/> + <menu_item_call label="Historique du chat..." name="chat_history"/> + <menu_item_call label="Zoomer en avant" name="zoom_in"/> + <menu_item_call label="Carte" name="map"/> + <menu_item_call label="Partager" name="Share"/> + <menu_item_call label="Payer" name="Pay"/> + <menu_item_check label="Bloquer le chat vocal" name="Block/Unblock"/> + <menu_item_check label="Ignorer le texte" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..03a091d1cc --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="Vue compacte" name="compact_view"/> + <menu_item_check label="Vue développée" name="expanded_view"/> + <menu_item_check label="Afficher l’heure" name="IMShowTime"/> + <menu_item_check label="Afficher les noms dans les conversations privées" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_im_well_button.xml b/indra/newview/skins/default/xui/fr/menu_im_well_button.xml deleted file mode 100644 index 8ef1529e6b..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Tout fermer" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml index 4d9a103058..4d9a103058 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml index 59f97d8b48..59f97d8b48 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml index ecc8cee413..ecc8cee413 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml index 53f22bb44a..53f22bb44a 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml index f3b974aba5..f3b974aba5 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml index ac70df472d..ac70df472d 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml index a9b2883cca..a9b2883cca 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml index 627d3068c3..627d3068c3 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml index 1076af44d9..1076af44d9 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml index 364872c875..364872c875 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/fr/menu_land.xml b/indra/newview/skins/default/xui/fr/menu_land.xml index b84daee3ae..b84daee3ae 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_land.xml +++ b/indra/newview/skins/default/xui/fr/menu_land.xml diff --git a/indra/newview/skins/default/xui/fr/menu_landmark.xml b/indra/newview/skins/default/xui/fr/menu_landmark.xml index 73eaa4af7e..73eaa4af7e 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_landmark.xml +++ b/indra/newview/skins/default/xui/fr/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml index dc6b2793ca..dc6b2793ca 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_login.xml +++ b/indra/newview/skins/default/xui/fr/menu_login.xml diff --git a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml index 1941ad2cbf..1941ad2cbf 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml index b9d0a70383..b9d0a70383 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/fr/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml index af6bfcd028..af6bfcd028 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/fr/menu_navbar.xml b/indra/newview/skins/default/xui/fr/menu_navbar.xml index 08d810b653..08d810b653 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_navbar.xml +++ b/indra/newview/skins/default/xui/fr/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml index 99e22aeff7..99e22aeff7 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml index 323bfdbf16..323bfdbf16 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 573b6da582..573b6da582 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml index 69f8e88a0d..7c94930160 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="Profil de l'objet..." name="Object Profile"/> <menu_item_call label="Ignorer..." name="Block"/> + <menu_item_call label="Voir sur la carte" name="show_on_map"/> + <menu_item_call label="Me téléporter à l’emplacement de l'objet" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml index b5181f4f82..21b19eded6 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="Nouveaux cheveux" name="New Hair"/> <menu_item_call label="Nouveaux yeux" name="New Eyes"/> </menu> + <menu_item_call label="Développer tous les dossiers" name="expand"/> + <menu_item_call label="Réduire tous les dossiers" name="collapse"/> <menu_item_call label="Renommer la tenue" name="rename"/> <menu_item_call label="Supprimer la tenue" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml index 2a7f618e07..2a7f618e07 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/fr/menu_participant_list.xml b/indra/newview/skins/default/xui/fr/menu_participant_list.xml index f91a30f6bb..f91a30f6bb 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/fr/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/fr/menu_participant_view.xml b/indra/newview/skins/default/xui/fr/menu_participant_view.xml new file mode 100644 index 0000000000..1811082c84 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="Trier les conversations par type" name="sort_sessions_by_type"/> + <menu_item_check label="Trier les conversations par nom" name="sort_sessions_by_name"/> + <menu_item_check label="Trier les conversations par activité récente" name="sort_sessions_by_recent"/> + <menu_item_check label="Trier les participants par nom" name="sort_participants_by_name"/> + <menu_item_check label="Trier les participants par activité récente" name="sort_participants_by_recent"/> + <menu_item_call label="Préférences pour le chat..." name="chat_preferences"/> + <menu_item_call label="Préférences pour la confidentialité" name="privacy_preferences"/> + <menu_item_check label="Journal des conversations..." name="Conversation"/> + <menu_item_check label="Traduire le Chat près de moi" name="Translate_chat"/> + <menu_item_check label="Paramètres de traduction" name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..47589572c2 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="Ne plus ignorer" name="unblock"/> + <menu_item_call label="Profil..." name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..79880dd16d --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/> + <menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml new file mode 100644 index 0000000000..13f1575090 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="Trier par nom" name="sort_by_name"/> + <menu_item_check label="Trier par type" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml new file mode 100644 index 0000000000..cc81172462 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Trier par nom" name="sort_name"/> + <menu_item_check label="Trier par statut" name="sort_status"/> + <menu_item_check label="Afficher les icônes des résidents" name="view_icons"/> + <menu_item_check label="Afficher les droits octroyés" name="view_permissions"/> + <menu_item_check label="Afficher le journal des conversations..." name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml index a6170a6c16..a6170a6c16 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml index eb51b4cf7e..8e32f065fa 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="Afficher les infos" name="View Info"/> <menu_item_call label="Chat" name="Chat"/> - <menu_item_call label="Appeler" name="Call"/> + <menu_item_call label="Appel" name="Call"/> <menu_item_call label="Activer" name="Activate"/> <menu_item_call label="Quitter" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml new file mode 100644 index 0000000000..79ede5e22d --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml index 34f949cf2c..34f949cf2c 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml index 26bd3978a9..6f7d02ef74 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="Voir le profil" name="View Profile"/> - <menu_item_call label="Devenir amis" name="Add Friend"/> - <menu_item_call label="Supprimer cet ami" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="Appeler" name="Call"/> - <menu_item_call label="Carte" name="Map"/> - <menu_item_call label="Partager" name="Share"/> - <menu_item_call label="Payer" name="Pay"/> - <menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/> - <menu_item_call label="Proposer une téléportation" name="teleport"/> + <menu_item_call label="Voir le profil" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Téléporter" name="offer_teleport"/> + <menu_item_call label="Appel" name="voice_call"/> + <menu_item_call label="Afficher l'historique du chat..." name="chat_history"/> + <menu_item_call label="Devenir amis" name="add_friend"/> + <menu_item_call label="Supprimer cet ami" name="remove_friend"/> + <menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/> + <menu_item_call label="Zoomer en avant" name="zoom_in"/> + <menu_item_call label="Carte" name="map"/> + <menu_item_call label="Partager" name="share"/> + <menu_item_call label="Payer" name="pay"/> + <menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml index 8400ec0a14..37abf831c2 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="Devenir amis" name="Add Friends"/> - <menu_item_call label="Supprimer des amis" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="Appeler" name="Call"/> - <menu_item_call label="Partager" name="Share"/> - <menu_item_call label="Payer" name="Pay"/> - <menu_item_call label="Proposer une téléportation" name="teleport"/> + <menu_item_call label="Devenir amis" name="add_friends"/> + <menu_item_call label="Supprimer des amis" name="remove_friends"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Appeler" name="call"/> + <menu_item_call label="Partager" name="share"/> + <menu_item_call label="Payer" name="pay"/> + <menu_item_call label="Téléporter" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml new file mode 100644 index 0000000000..086002dce5 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/> + <menu_item_check label="Trier par nom" name="sort_name"/> + <menu_item_check label="Trier par distance" name="sort_distance"/> + <menu_item_check label="Afficher les icônes des résidents" name="view_icons"/> + <menu_item_check label="Afficher la carte" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml index 8bb466b8d6..8bb466b8d6 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml new file mode 100644 index 0000000000..a7d698ab7c --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/> + <menu_item_check label="Trier par nom" name="sort_name"/> + <menu_item_check label="Afficher les icônes des résidents" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml index 93b90ae61c..93b90ae61c 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/fr/menu_picks.xml b/indra/newview/skins/default/xui/fr/menu_picks.xml index 7d7174d43c..7d7174d43c 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_picks.xml +++ b/indra/newview/skins/default/xui/fr/menu_picks.xml diff --git a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml index b6cde6d6e2..b6cde6d6e2 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/fr/menu_place.xml b/indra/newview/skins/default/xui/fr/menu_place.xml index 6b0f4db752..6b0f4db752 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_place.xml +++ b/indra/newview/skins/default/xui/fr/menu_place.xml diff --git a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml index 92f9e7719d..92f9e7719d 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml index 3fdf3bf3c4..3fdf3bf3c4 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml index b48f6ea693..b48f6ea693 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml index ddf898b791..ddf898b791 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml index f78db411b3..f78db411b3 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml index 46efa30bd6..46efa30bd6 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/fr/menu_slurl.xml b/indra/newview/skins/default/xui/fr/menu_slurl.xml index ddfa5c0849..ddfa5c0849 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_slurl.xml +++ b/indra/newview/skins/default/xui/fr/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml index 3dea662cc2..3dea662cc2 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml index fb4582dbce..fb4582dbce 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml index 369680985d..369680985d 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/fr/menu_text_editor.xml b/indra/newview/skins/default/xui/fr/menu_text_editor.xml index c31b0c8556..c31b0c8556 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/fr/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/fr/menu_toolbars.xml b/indra/newview/skins/default/xui/fr/menu_toolbars.xml index f74d206d56..f74d206d56 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/fr/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml index dc68f40fe7..dc68f40fe7 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml index 5ed627fbc3..d701b3a414 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Voir le profil du résident" name="show_agent"/> + <menu_item_call label="Voir le profil" name="show_agent"/> + <menu_item_call label="Envoyer IM..." name="send_im"/> + <menu_item_call label="Devenir amis..." name="add_friend"/> <menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/> <menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_url_group.xml b/indra/newview/skins/default/xui/fr/menu_url_group.xml index de90c3ff7e..de90c3ff7e 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_group.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_http.xml b/indra/newview/skins/default/xui/fr/menu_url_http.xml index 5e96352999..5e96352999 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_http.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml index 8ab88b4be7..8ab88b4be7 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_map.xml b/indra/newview/skins/default/xui/fr/menu_url_map.xml index 67e6986f5d..67e6986f5d 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_map.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml index f581c3ef9d..0a934d3e69 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Afficher les informations sur l'objet" name="show_object"/> + <menu_item_call label="Profil de l'objet…" name="show_object"/> <menu_item_call label="Voir sur la carte" name="show_on_map"/> <menu_item_call label="Me téléporter à l'emplacement de l'objet" name="teleport_to_object"/> <menu_item_call label="Copier le nom de l'objet dans le presse-papiers" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml index 07b0eeca49..07b0eeca49 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml index f4b7e212ca..f4b7e212ca 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml index e44943cf15..e44943cf15 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml index a5075a2740..a5075a2740 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 85020afe25..548f144742 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/> <menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/> </menu> - <menu label="Statut" name="Status"> - <menu_item_call label="Absent" name="Set Away"/> - <menu_item_call label="Occupé" name="Set Busy"/> - </menu> + <menu label="Statut" name="Status"/> <menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/> <menu_item_call label="Boîte d'envoi vendeur..." name="MerchantOutbox"/> <menu_item_call label="Page d'accueil du compte..." name="Manage My Account"> @@ -32,14 +29,18 @@ <menu_item_call label="Quitter [APP_NAME]" name="Quit"/> </menu> <menu label="Communiquer" name="Communicate"> - <menu_item_check label="Chat..." name="Nearby Chat"/> + <menu_item_check label="Conversations..." name="Conversations"/> + <menu_item_check label="Chat près de moi..." name="Nearby Chat"/> <menu_item_check label="Parler" name="Speak"/> - <menu_item_check label="Paramètres vocaux..." name="Nearby Voice"/> - <menu_item_check label="Effet de voix..." name="ShowVoice"/> + <menu label="Effet de voix" name="VoiceMorphing"> + <menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/> + <menu_item_check label="Aperçu..." name="Preview"/> + <menu_item_call label="S'abonner..." name="Subscribe"/> + </menu> <menu_item_check label="Gestes..." name="Gestures"/> - <menu_item_call label="Amis" name="My Friends"/> - <menu_item_call label="Groupes" name="My Groups"/> - <menu_item_call label="Personnes près de vous" name="Active Speakers"/> + <menu_item_check label="Amis" name="My Friends"/> + <menu_item_check label="Groupes" name="My Groups"/> + <menu_item_check label="Personnes près de vous" name="Active Speakers"/> <menu_item_call label="Liste des ignorés" name="Block List"/> </menu> <menu label="Monde" name="World"> @@ -115,7 +116,6 @@ <menu_item_call label="Acheter" name="Menu Object Buy"/> <menu_item_call label="Prendre" name="Menu Object Take"/> <menu_item_call label="Prendre une copie" name="Take Copy"/> - <menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/> <menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/> <menu_item_call label="Renvoi de l'objet" name="Return Object back to Owner"/> </menu> @@ -130,6 +130,7 @@ <menu_item_call label="Groupes de liens..." name="pathfinding_linksets_menu_item"/> <menu_item_call label="Personnages..." name="pathfinding_characters_menu_item"/> <menu_item_call label="Vue / test..." name="pathfinding_console_menu_item"/> + <menu_item_call label="Refiger la région" name="pathfinding_rebake_navmesh_item"/> </menu> <menu label="Options" name="Options"> <menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/> @@ -159,6 +160,13 @@ <menu label="Aide" name="Help"> <menu_item_call label="Aide rapide..." name="How To"/> <menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/> + <menu_item_call label="Guide de l'utilisateur" name="User’s guide"/> + <menu_item_call label="Base de connaissances" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Forums de la communauté" name="Community Forums"/> + <menu_item_call label="Portail d'assistance" name="Support portal"/> + <menu_item_call label="Actualités [SECOND_LIFE]" name="Second Life News"/> + <menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/> <menu_item_call label="Signaler une infraction" name="Report Abuse"/> <menu_item_call label="Signaler un bug" name="Report Bug"/> <menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/> @@ -307,7 +315,7 @@ <menu_item_call label="Base des infos de la texture sélectionnée" name="Selected Texture Info Basis"/> <menu_item_check label="Filaire" name="Wireframe"/> <menu_item_check label="Occlusion objet-objet" name="Object-Object Occlusion"/> - <menu_item_check label="Éclairage et ombres" name="Lighting and Shadows"/> + <menu_item_check label="Éclairage et ombres" name="Advanced Lighting Model"/> <menu_item_check label="Ombres du soleil/de la lune/des projecteurs" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO et lissage des ombres" name="SSAO and Shadow Smoothing"/> <menu_item_check label="Débogage GL" name="Debug GL"/> @@ -385,9 +393,14 @@ <menu_item_call label="Test femme" name="Test Female"/> <menu_item_check label="Autoriser la sélection de l'avatar" name="Allow Select Avatar"/> </menu> + <menu label="Vitesse d'animation" name="Animation Speed"> + <menu_item_call label="Toutes les animations 10 % plus rapides" name="All Animations 10 Faster"/> + <menu_item_call label="Toutes les animations 10 % plus lentes" name="All Animations 10 Slower"/> + <menu_item_call label="Réinitialiser la vitesse de toutes les animations" name="Reset All Animation Speed"/> + <menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/> + </menu> <menu_item_call label="Forcer les paramètres par défaut" name="Force Params to Default"/> <menu_item_check label="Infos sur l'animation" name="Animation Info"/> - <menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/> <menu_item_check label="Afficher la direction du regard" name="Show Look At"/> <menu_item_check label="Afficher la direction du pointeur" name="Show Point At"/> <menu_item_check label="Débogages des mises à jour" name="Debug Joint Updates"/> diff --git a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml index 187cb4bcd2..187cb4bcd2 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml index c3d9d908b0..c3d9d908b0 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml index 4d88445506..4d88445506 100644..100755 --- a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml index 322887fb76..322887fb76 100644..100755 --- a/indra/newview/skins/default/xui/fr/mime_types.xml +++ b/indra/newview/skins/default/xui/fr/mime_types.xml diff --git a/indra/newview/skins/default/xui/fr/mime_types_linux.xml b/indra/newview/skins/default/xui/fr/mime_types_linux.xml index 3a7ff979ee..3a7ff979ee 100644..100755 --- a/indra/newview/skins/default/xui/fr/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/fr/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/fr/mime_types_mac.xml b/indra/newview/skins/default/xui/fr/mime_types_mac.xml index 3a7ff979ee..3a7ff979ee 100644..100755 --- a/indra/newview/skins/default/xui/fr/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/fr/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 30154d1873..e73cc6e6e0 100644..100755 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -515,6 +515,24 @@ Consulter [_URL] pour en savoir plus ? </url> <usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/> </notification> + <notification name="AMDOldDriver"> + Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d'améliorer considérablement les performances. + + Visiter la page [_URL] pour rechercher d'éventuelles mises à jour de pilotes ? + <url name="url"> + http://support.amd.com/us/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/> + </notification> + <notification name="NVIDIAOldDriver"> + Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d'améliorer considérablement les performances. + + Visiter la page [_URL] pour rechercher d'éventuelles mises à jour de pilotes ? + <url name="url"> + http://www.nvidia.com/Download/index.aspx?lang=fr + </url> + <usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/> + </notification> <notification name="UnknownGPU"> Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas. Cela est souvent le cas avec le nouveau matériel qui n'a pas encore été testé avec [APP_NAME]. Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques. @@ -1543,10 +1561,13 @@ Quitter le groupe ? Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment. <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="BusyModeSet"> - Le mode Occupé est sélectionné. -Les chats et les messages instantanés ne s'afficheront pas. Les messages instantanés génèreront la réponse en mode occupé que vous avez créée. Toutes les offres de téléportation seront refusées. Toutes les offres d'inventaire iront dans la corbeille. - <usetemplate ignoretext="Je change mon statut en mode Occupé" name="okignore" yestext="OK"/> + <notification name="DoNotDisturbModeSet"> + Ne pas déranger est activé. Vous ne recevrez pas les notifications de communications entrantes. + +- Les autres résidents recevront votre réponse Ne pas déranger (définie dans Préférences > Général). +- Toutes les offres de téléportation seront refusées. +- Les appels vocaux seront refusés. + <usetemplate ignoretext="J'ai changé mon statut et suis désormais en mode Ne pas déranger." name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> Vous avez atteint le nombre de groupes maximum. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre. @@ -2033,6 +2054,10 @@ Déplacer les objets de l'inventaire ? Accéder à votre [http://secondlife.com/account/ Page d'accueil] pour consulter l'historique de votre compte ? <usetemplate ignoretext="Lancer mon navigateur pour consulter l'historique de mon compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + Quand vous ajoutez une personne à une conversation existante, une nouvelle conversation est créée. Tous les participants recevront les notifications de nouvelle conversation. + <usetemplate ignoretext="Confirmer l'ajout de participants au chat" name="okcancelignore" notext="Annuler" yestext="OK"/> + </notification> <notification name="ConfirmQuit"> Êtes-vous certain de vouloir quitter ? <usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/> @@ -2107,14 +2132,14 @@ Voulez-vous le remplacer par l'objet sélectionné ? <button ignore="Ne jamais remplacer" name="No" text="Annuler"/> </form> </notification> - <notification label="Réponse si occupé(e)" name="BusyModePay"> - Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement. + <notification label="Avertissement de mode Ne pas déranger" name="DoNotDisturbModePay"> + Vous avez activé Ne pas déranger. Vous ne recevrez aucun article proposé en échange de ce paiement. -Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ? +Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ? <form name="form"> - <ignore name="ignore" save_option="true" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Occupé"/> - <button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/> - <button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/> + <ignore name="ignore" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Ne pas déranger"/> + <button ignore="Toujours quitter le mode Ne pas déranger" name="Yes" text="OK"/> + <button ignore="Ne jamais quitter le mode Ne pas déranger" name="No" text="Annuler"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2249,11 +2274,8 @@ Liez-la à partir d'une page web pour permettre aux autres résidents d&apo <notification name="GroupNotice"> Sujet : [SUBJECT], Message : [MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> est en ligne - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> est hors ligne + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> est [STATUS] </notification> <notification name="AddSelfFriend"> Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même. @@ -2482,13 +2504,6 @@ Vous ne pouvez pas voler ici. <notification name="DynamicPathfindingDisabled"> La recherche de chemin dynamique n'est pas activée dans cette région. Il se peut que les objets scriptés utilisant des appels LSL de recherche de chemin ne fonctionnent pas comme prévu pour cette région. </notification> - <notification name="PathfindingRebakeNavmesh"> - La modification de certains objets de cette région risque d'entraîner un comportement incorrect des autres objets mobiles. Pour que les objets mobiles se comportent correctement, cliquez sur Refiger la région. Pour plus d'informations, choisissez Aide. - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="Aide" ignoretext="La modification de certains objets de cette région risque d'entraîner un comportement incorrect des autres objets mobiles." name="okhelpignore" yestext="OK"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> Une erreur est survenue. Un problème réseau ou serveur s'est peut-être produit ou vous ne disposez pas de droits de construction. Se déconnecter puis se reconnecter permet parfois de résoudre le problème. <usetemplate name="okbutton" yestext="OK"/> @@ -2751,7 +2766,7 @@ Acceptez-vous ? <notification name="ScriptQuestionCaution"> Avertissement : l'objet <nolink>[OBJECTNAME]</nolink> souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable. -Il est rare qu'une telle demande soit légitime. N'autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l'objet souhaite accéder à votre compte. +N'autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l'objet souhaite accéder à votre compte. <form name="form"> <button name="Grant" text="Permettre un accès total"/> <button name="Deny" text="Refuser"/> @@ -3332,4 +3347,633 @@ Désactivation des mises à jour futures de ce fichier... Vous allez supprimer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ? <usetemplate ignoretext="Voulez-vous vraiment supprimer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] vous a figé. Vous ne pouvez pas bouger ni interagir avec le monde. + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] vous a figé pour une durée de [AV_FREEZE_TIME] secondes. Vous ne pouvez pas bouger ni interagir avec le monde. + </notification> + <notification name="YouFrozeAvatar"> + Avatar figé. + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] vous a libéré. + </notification> + <notification name="AvatarUnFrozen"> + Avatar libéré. + </notification> + <notification name="AvatarFreezeFailure"> + Vous n'avez pas pu figer ce que vous vouliez car vous ne disposez pas des droits d'admin pour cette parcelle. + </notification> + <notification name="AvatarFreezeThaw"> + Vous n'êtes plus figé, vous pouvez reprendre votre vie. + </notification> + <notification name="AvatarCantFreeze"> + Impossible de figer cet utilisateur. + </notification> + <notification name="NowOwnObject"> + Vous êtes désormais le propriétaire de l'objet [OBJECT_NAME]. + </notification> + <notification name="CantRezOnLand"> + Impossible de rezzer l'objet à [OBJECT_POS] car le propriétaire de ce terrain de l'autorise pas. Utilisez l'outil Terrain pour voir à qui appartiennent les terrains. + </notification> + <notification name="RezFailTooManyRequests"> + Impossible de rezzer l'objet car il y a trop de demandes. + </notification> + <notification name="SitFailCantMove"> + Vous ne pouvez pas vous asseoir car vous ne pouvez actuellement pas bouger. + </notification> + <notification name="SitFailNotAllowedOnLand"> + Vous ne pouvez pas vous asseoir car votre présence sur ce terrain n'est pas autorisée. + </notification> + <notification name="SitFailNotSameRegion"> + Essayez de vous rapprocher. Impossible de vous asseoir sur l'objet car +il ne se trouve pas dans la même région que vous. + </notification> + <notification name="NoNewObjectRegionFull"> + Création d'un nouvel objet impossible. La région est pleine. + </notification> + <notification name="FailedToPlaceObject"> + Échec du placement de l'objet à l'emplacement spécifié. Veuillez réessayer. + </notification> + <notification name="NoOwnNoGardening"> + Vous ne pouvez pas créer d'arbres ni d'herbe sur un terrain qui ne vous appartient pas. + </notification> + <notification name="NoCopyPermsNoObject"> + Échec de la copie car vous ne disposez pas des droits requis pour copier l'objet [OBJ_NAME]. + </notification> + <notification name="NoTransPermsNoObject"> + Échec de la copie car l'objet [OBJ_NAME] ne peut pas vous être transféré. + </notification> + <notification name="AddToNavMeshNoCopy"> + Échec de la copie car l'objet [OBJ_NAME] contribue au maillage de navigation. + </notification> + <notification name="DupeWithNoRootsSelected"> + Dupliquer sans objet racine sélectionné + </notification> + <notification name="CantDupeCuzRegionIsFull"> + Impossible de dupliquer les objets car la région est pleine. + </notification> + <notification name="CantDupeCuzParcelNotFound"> + Impossible de dupliquer les objets - la parcelle sur laquelle ils sont est introuvable. + </notification> + <notification name="CantCreateCuzParcelFull"> + Création de l'objet impossible car +la parcelle est pleine. + </notification> + <notification name="RezAttemptFailed"> + Échec d'une tentative pour rezzer un objet. + </notification> + <notification name="ToxicInvRezAttemptFailed"> + Impossible de créer l'article qui a provoqué des problèmes pour cette région. + </notification> + <notification name="InvItemIsBlacklisted"> + Cet article d'inventaire a été placé sur liste noire. + </notification> + <notification name="NoCanRezObjects"> + Vous n'êtes actuellement pas autorisé à créer des objets. + </notification> + <notification name="LandSearchBlocked"> + Recherche de terrain bloquée. +Vous avez effectué trop de recherches de terrain trop rapidement. +Veuillez réessayer dans une minute. + </notification> + <notification name="NotEnoughResourcesToAttach"> + Ressources de script insuffisantes pour attacher cet objet. + </notification> + <notification name="YouDiedAndGotTPHome"> + Vous êtes mort et avez été téléporté à votre domicile. + </notification> + <notification name="EjectComingSoon"> + Votre présence ici n'est plus autorisée et vous disposez de [EJECT_TIME] secondes pour partir. + </notification> + <notification name="NoEnterServerFull"> + Vous ne pouvez pas pénétrer dans cette région car +le serveur est plein. + </notification> + <notification name="SaveBackToInvDisabled"> + Le réenregistrement dans l'inventaire a été désactivé. + </notification> + <notification name="NoExistNoSaveToContents"> + Impossible d'enregistrer [OBJ_NAME] dans le contenu des objets car l'objet à partir duquel il a été rezzé n'existe plus. + </notification> + <notification name="NoModNoSaveToContents"> + Impossible d'enregistrer [OBJ_NAME] dans le contenu des objets car vous ne disposez pas des droits requis pour modifier l'objet [DEST_NAME]. + </notification> + <notification name="NoSaveBackToInvDisabled"> + Impossible de réenregistrer [OBJ_NAME] dans l'inventaire -- cette opération a été désactivée. + </notification> + <notification name="NoCopyNoSelCopy"> + Vous ne pouvez pas copier votre sélection car vous n'avez pas le droit de copier l'objet [OBJ_NAME]. + </notification> + <notification name="NoTransNoSelCopy"> + Vous ne pouvez pas copier votre sélection car l'objet [OBJ_NAME] n'est pas transférable. + </notification> + <notification name="NoTransNoCopy"> + Vous ne pouvez pas copier votre sélection car l'objet [OBJ_NAME] n'est pas transférable. + </notification> + <notification name="NoPermsNoRemoval"> + La suppression de l'objet [OBJ_NAME] du simulateur n'est pas autorisée par le système de droits. + </notification> + <notification name="NoModNoSaveSelection"> + Vous ne pouvez pas enregistrer votre sélection car vous n'avez pas le droit de modifier l'objet [OBJ_NAME]. + </notification> + <notification name="NoCopyNoSaveSelection"> + Vous ne pouvez pas enregistrer votre sélection car l'objet [OBJ_NAME] ne peut pas être copié. + </notification> + <notification name="NoModNoTaking"> + Vous ne pouvez pas prendre votre sélection car vous n'avez pas le droit de modifier l'objet [OBJ_NAME]. + </notification> + <notification name="RezDestInternalError"> + Erreur interne : type de destination inconnue. + </notification> + <notification name="DeleteFailObjNotFound"> + Échec de la suppression car l'objet est introuvable + </notification> + <notification name="SorryCantEjectUser"> + Exclusion de cet utilisateur impossible. + </notification> + <notification name="RegionSezNotAHome"> + Cette région ne vous permet pas d'y définir votre domicile. + </notification> + <notification name="HomeLocationLimits"> + Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent. + </notification> + <notification name="HomePositionSet"> + Emplacement du domicile défini. + </notification> + <notification name="AvatarEjected"> + Avatar expulsé. + </notification> + <notification name="AvatarEjectFailed"> + Vous n'avez pas pu réaliser l'exclusion car vous ne disposez pas des droits d'admin pour cette parcelle. + </notification> + <notification name="CantMoveObjectParcelFull"> + Impossible de déplacer [OBJECT_NAME] jusqu'à +[OBJ_POSITION] dans la région [REGION_NAME] car la parcelle est pleine. + </notification> + <notification name="CantMoveObjectParcelPerms"> + Impossible de déplacer [OBJECT_NAME] jusqu'à +[OBJ_POSITION] dans la région [REGION_NAME] car vos objets ne sont pas autorisés sur cette parcelle. + </notification> + <notification name="CantMoveObjectParcelResources"> + Impossible de déplacer [OBJECT_NAME] jusqu'à +[OBJ_POSITION] dans la région [REGION_NAME] car il n'y a pas suffisamment de ressources pour cet objet sur cette parcelle. + </notification> + <notification name="CantMoveObjectRegionVersion"> + Impossible de déplacer [OBJECT_NAME] jusqu'à +[OBJ_POSITION] dans la région [REGION_NAME] car l'autre région exécute une version plus ancienne qui ne prend pas en charge la réception de cet objet via le passage à une autre région. + </notification> + <notification name="CantMoveObjectNavMesh"> + Impossible de déplacer [OBJECT_NAME] jusqu'à +[OBJ_POSITION] dans la région [REGION_NAME] car vous ne pouvez pas modifier le maillage de navigation d'une région à une autre. + </notification> + <notification name="CantMoveObjectWTF"> + Impossible de déplacer [OBJECT_NAME] jusqu'à +[OBJ_POSITION] dans la région [REGION_NAME] pour une raison inconnue. ([FAILURE_TYPE]) + </notification> + <notification name="NoPermModifyObject"> + Vous n'êtes pas autorisé à modifier cet objet. + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + Impossible d'activer les propriétés physiques pour un objet qui contribue au maillage de navigation. + </notification> + <notification name="CantEnablePhysKeyframedObj"> + Impossible d'activer les propriétés physiques pour les objets avec images-clés. + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + Impossible d'activer les propriétés physiques pour l'objet -- ressources de terrain insuffisantes. + </notification> + <notification name="CantEnablePhysCostTooGreat"> + Impossible d'activer les propriétés physiques pour les objets avec un coût de ressources physiques supérieur à [MAX_OBJECTS] + </notification> + <notification name="PhantomWithConcavePiece"> + Cet objet ne peut pas contenir de morceau concave car c'est un fantôme qui contribue au maillage de navigation. + </notification> + <notification name="UnableAddItem"> + Ajout de l'article impossible. + </notification> + <notification name="UnableEditItem"> + Modification impossible + </notification> + <notification name="NoPermToEdit"> + Modification interdite. + </notification> + <notification name="NoPermToCopyInventory"> + Pas autorisé à copier cet inventaire. + </notification> + <notification name="CantSaveItemDoesntExist"> + Impossible d'enregistrer dans le contenu des objets : L'article n'existe plus. + </notification> + <notification name="CantSaveItemAlreadyExists"> + Impossible d'enregistrer dans le contenu des objets : Un article avec ce nom existe déjà dans l'inventaire. + </notification> + <notification name="CantSaveModifyAttachment"> + Impossible d'enregistrer dans le contenu des objets : cela modifierait les droits d'attache. + </notification> + <notification name="TooManyScripts"> + Trop de scripts. + </notification> + <notification name="UnableAddScript"> + Ajout du script impossible. + </notification> + <notification name="AssetServerTimeoutObjReturn"> + Le serveur d'actifs n'a pas répondu assez vite. Objet renvoyé dans le sim. + </notification> + <notification name="RegionDisablePhysicsShapes"> + Les formes physiques ne sont pas activées pour cette région. + </notification> + <notification name="NoModNavmeshAcrossRegions"> + Vous ne pouvez pas modifier le maillage de navigation d'une région à une autre. + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + Impossible de définir les propriétés physiques pour ce type d'objet. + </notification> + <notification name="NoSetRootPrimWithNoShape"> + Vous devenez définir une forme pour la prim racine. + </notification> + <notification name="NoRegionSupportPhysMats"> + Les matériaux physiques ne sont pas activés pour cette région. + </notification> + <notification name="OnlyRootPrimPhysMats"> + Les matériaux physiques ne peuvent être ajustés que pour les prims racines. + </notification> + <notification name="NoSupportCharacterPhysMats"> + La configuration de matériaux physiques sur les personnages n'est pas prise en charge actuellement. + </notification> + <notification name="InvalidPhysMatProperty"> + Une ou plusieurs propriétés des ressources physiques spécifiées n'étaient pas valides. + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + Vous ne pouvez pas changer le type de raccord d'un objet avec maillage. + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + Vous ne pouvez pas changer la forme d'un objet avec maillage. + </notification> + <notification name="FullRegionCantEnter"> + Vous ne pouvez pas pénétrer dans cette région car \ncar la région est pleine. + </notification> + <notification name="LinkFailedOwnersDiffer"> + Échec du lien -- les propriétaires sont différents + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + Échec du lien -- vous ne pouvez pas modifier le maillage de navigation d'une région à une autre. + </notification> + <notification name="LinkFailedNoPermToEdit"> + Échec du lien car vous ne disposez pas des droits de modification. + </notification> + <notification name="LinkFailedTooManyPrims"> + Échec du lien -- trop de primitives + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + Échec du lien -- impossible de lier pas de copie et pas de transfert + </notification> + <notification name="LinkFailedNothingLinkable"> + Échec du lien - il n'y a rien qui puisse être lié. + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + Échec du lien -- trop de personnages de recherche de chemin + </notification> + <notification name="LinkFailedInsufficientLand"> + Échec du lien -- ressources de terrain insuffisantes + </notification> + <notification name="LinkFailedTooMuchPhysics"> + Cet objet utilise trop de ressources physiques - sa dynamique a été désactivée. + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + Vous avez été téléporté chez vous par l'objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME]. + </notification> + <notification name="TeleportedHomeByObject"> + Vous avez été téléporté chez vous par l'objet [OBJECT_NAME]. + </notification> + <notification name="TeleportedByAttachment"> + Vous avez été téléporté par un élément sur [ITEM_ID] + </notification> + <notification name="TeleportedByObjectOnParcel"> + Vous avez été téléporté par l'objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME]. + </notification> + <notification name="TeleportedByObjectOwnedBy"> + Vous avez été téléporté par l'objet [OBJECT_NAME] appartenant à [OWNER_ID]. + </notification> + <notification name="TeleportedByObjectUnknownUser"> + Vous avez été téléporté par l'objet [OBJECT_NAME] appartenant à un utilisateur inconnu. + </notification> + <notification name="CantCreateObjectRegionFull"> + Création de l'objet demandé impossible. La région est pleine. + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + Vous ne pouvez pas attacher plusieurs objets au même endroit. + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + Vous ne pouvez pas créer plusieurs objets ici. + </notification> + <notification name="UnableToCreateObjTimeOut"> + Création de l'objet demandé impossible. Objet absent de la base de données. + </notification> + <notification name="UnableToCreateObjUnknown"> + Création de l'objet demandé impossible. Délai d'attente dépassé. Veuillez réessayer. + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + Création de l'objet demandé impossible. Veuillez réessayer. + </notification> + <notification name="RezFailureTookTooLong"> + Échec de l'action « rezzer », le chargement de l'objet demandé a pris trop longtemps. + </notification> + <notification name="FailedToPlaceObjAtLoc"> + Échec du placement de l'objet à l'emplacement spécifié. Veuillez réessayer. + </notification> + <notification name="CantCreatePlantsOnLand"> + Vous ne pouvez pas créer de plantes sur ce terrain. + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + Impossible de restaurer l'objet. Position dans le monde introuvable. + </notification> + <notification name="CantRezObjectInvalidMeshData"> + Impossible de rezzer l'objet car ses données de maillage ne sont pas valides. + </notification> + <notification name="CantRezObjectTooManyScripts"> + Impossible de rezzer l'objet car il y a déjà trop de scripts dans cette région. + </notification> + <notification name="CantCreateObjectNoAccess"> + Vos privilèges d'accès ne vous autorisent pas à créer des objets à cet endroit. + </notification> + <notification name="CantCreateObject"> + Vous n'êtes actuellement pas autorisé à créer des objets. + </notification> + <notification name="InvalidObjectParams"> + Paramètres d'objet non valides + </notification> + <notification name="CantDuplicateObjectNoAcess"> + Vos privilèges d'accès ne vous autorisent pas à dupliquer des objets ici. + </notification> + <notification name="CantChangeShape"> + Vous n’êtes pas autorisé à modifier cette forme. + </notification> + <notification name="NoAccessToClaimObjects"> + Vos privilèges d'accès ne vous autorisent pas à revendiquer des objets ici. + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + Échec de la cession car vous de disposez pas des droits de cession des objets pour votre groupe. + </notification> + <notification name="NoPrivsToBuyObject"> + Vos privilèges d'accès ne vous autorisent pas à acheter des objets ici. + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + Impossible d'attacher l'objet car un avatar est assis dessus. + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + Les arbres et les plantes ne peuvent pas être portés sous forme d'éléments attachés. + </notification> + <notification name="CantAttachGroupOwnedObjs"> + Impossible d'attacher les objets appartenant au groupe. + </notification> + <notification name="CantAttachObjectsNotOwned"> + Vous ne pouvez pas attacher des objets qui ne vous appartiennent pas. + </notification> + <notification name="CantAttachNavmeshObjects"> + Impossible d'attacher les objets contribuant au maillage de navigation. + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + Impossible d'attacher l'objet car vous n'avez pas le droit de le déplacer. + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + Ressources de script insuffisantes pour attacher cet objet. + </notification> + <notification name="CantDropItemTrialUser"> + Vous ne pouvez pas déposer d'objets ici. Essayez la zone de période d'essai gratuite. + </notification> + <notification name="CantDropMeshAttachment"> + Vous ne pouvez pas déposer les éléments attachés avec maillage. Détachez-les dans l'inventaire puis rezzez-les dans le monde. + </notification> + <notification name="CantDropAttachmentNoPermission"> + L'élément n'a pas pu être déposé : vous n'avez pas le droit de déposer des éléments à cet endroit. + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + L'élément n'a pas pu être déposé : ressources de terrain disponibles insuffisantes. + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + Les éléments n'ont pas pu être déposés : ressources disponibles insuffisantes. + </notification> + <notification name="CantDropObjectFullParcel"> + Impossible de déposer l'objet ici. La parcelle est pleine. + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + Vous ne pouvez pas toucher/attraper cet objet car vous êtes banni de cette parcelle de terrain. + </notification> + <notification name="PlzNarrowDeleteParams"> + Veuillez affiner vos paramètres de suppression. + </notification> + <notification name="UnableToUploadAsset"> + Chargement de l'actif impossible. + </notification> + <notification name="CantTeleportCouldNotFindUser"> + Impossible de trouver l'utilisateur à téléporter chez lui + </notification> + <notification name="GodlikeRequestFailed"> + échec de la demande de type divine + </notification> + <notification name="GenericRequestFailed"> + échec de la demande générique + </notification> + <notification name="CantUploadPostcard"> + Chargement de la carte postale impossible. Réessayez ultérieurement. + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + Impossible récupérer les détails de l'inventaire pour la notice au groupe. + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + Impossible d'envoyer une notice au groupe -- ce n'est pas autorisé. + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + Impossible d'envoyer une notice au groupe - échec de la construction de l'inventaire. + </notification> + <notification name="CantParceInventoryInNotice"> + Impossible d'analyser l'inventaire dans la notice. + </notification> + <notification name="TerrainUploadFailed"> + Échec du chargement du terrain. + </notification> + <notification name="TerrainFileWritten"> + Fichier de terrain écrit + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + Fichier de terrain écrit, lancement du téléchargement... + </notification> + <notification name="TerrainBaked"> + Terrain figé. + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + Seuls les 10 premiers objets sélectionnés ont été désactivés. Actualisez et effectuez des sélections supplémentaires si nécessaire. + </notification> + <notification name="UpdateViewerBuyParcel"> + Vous devez mettre votre client à jour pour acheter cette parcelle. + </notification> + <notification name="CantBuyParcelNotForSale"> + Achat impossible, cette parcelle n'est pas à vendre. + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + Achat impossible, le prix de vente ou la zone de terrain a changé. + </notification> + <notification name="CantBuyParcelNotAuthorized"> + Vous n'êtes pas un acheteur autorisé pour cette parcelle. + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + Vous ne pouvez pas acheter cette parcelle car elle est déjà en attente d'une autorisation d'achat. + </notification> + <notification name="CantBuildOverflowParcel"> + Vous ne pouvez pas construire d'objets ici car cela saturerait la parcelle. + </notification> + <notification name="SelectedMultipleOwnedLand"> + Vous avez sélectionné des terrains avec des propriétaires différents. Sélectionnez une zone plus petite et réessayez. + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + Pas suffisamment de parcelles louées dans la sélection pour effectuer la fusion. + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + Division du terrain impossible.\nPlusieurs parcelles sont sélectionnées.\nVeuillez sélectionner un terrain plus petit. + </notification> + <notification name="CantDivideLandCantFindParcel"> + Division du terrain impossible.\nParcelle introuvable.\nSignalez-le en allant à Aide -> Signaler un bug... + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + Division du terrain impossible. Toute la parcelle est sélectionnée.\nVeuillez sélectionner un terrain plus petit. + </notification> + <notification name="LandHasBeenDivided"> + Le terrain a été divisé. + </notification> + <notification name="PassPurchased"> + Vous avez acheté un pass. + </notification> + <notification name="RegionDisallowsClassifieds"> + Cette région n'autorise pas les petites annonces. + </notification> + <notification name="LandPassExpireSoon"> + Votre pass pour ce terrain arrive à expiration. + </notification> + <notification name="CantSitNoSuitableSurface"> + Il n'y a pas de surface appropriée sur laquelle s'asseoir, essayez un autre endroit. + </notification> + <notification name="CantSitNoRoom"> + Pas de place pour s'asseoir ici, essayez un autre endroit. + </notification> + <notification name="ClaimObjectFailedNoPermission"> + Échec de la revendication de l'objet car vous ne disposez pas des droits requis. + </notification> + <notification name="ClaimObjectFailedNoMoney"> + Échec de la revendication de l'objet car vous ne disposez pas de suffisamment de L$. + </notification> + <notification name="CantDeedGroupLand"> + Impossible de céder un terrain appartenant au groupe. + </notification> + <notification name="BuyObjectFailedNoMoney"> + Échec de l'achat de l'objet car vous ne disposez pas de suffisamment de L$. + </notification> + <notification name="BuyInventoryFailedNoMoney"> + Échec de l'achat d'inventaire car vous ne disposez pas de suffisamment de L$. + </notification> + <notification name="BuyPassFailedNoMoney"> + Vous ne disposez pas de suffisamment de L$ pour acheter un pass pour ce terrain. + </notification> + <notification name="CantBuyPassTryAgain"> + Impossible d'acheter le pass actuellement. Réessayez ultérieurement. + </notification> + <notification name="CantCreateObjectParcelFull"> + Création de l'objet impossible car \nla parcelle est pleine. + </notification> + <notification name="FailedPlacingObject"> + Échec du placement de l'objet à l'emplacement spécifié. Veuillez réessayer. + </notification> + <notification name="CantCreateLandmarkForEvent"> + Impossible de créer le repère pour l'événement. + </notification> + <notification name="GodBeatsFreeze"> + Grâce à vos pouvoirs de type divin, vous n'êtes plus figé. + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + Échec de la demande de pouvoirs spéciaux. Cette demande a été archivée. + </notification> + <notification name="ExpireExplanation"> + Le système ne peut pas traiter votre demande actuellement. Délai d'attente dépassé. + </notification> + <notification name="DieExplanation"> + Le système ne peut pas traiter votre demande. + </notification> + <notification name="AddPrimitiveFailure"> + Fonds insuffisants pour créer la primitive. + </notification> + <notification name="RezObjectFailure"> + Fonds insuffisants pour créer l'objet. + </notification> + <notification name="ResetHomePositionNotLegal"> + Réinitialiser l'emplacement du domicile car il n'était pas légal. + </notification> + <notification name="CantInviteRegionFull"> + Vous ne pouvez pas inviter quiconque là où vous vous trouvez actuellement car la région est pleine. Réessayez ultérieurement. + </notification> + <notification name="CantSetHomeAtRegion"> + Cette région ne vous permet pas d'y définir votre domicile. + </notification> + <notification name="ListValidHomeLocations"> + Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent. + </notification> + <notification name="SetHomePosition"> + Emplacement du domicile défini. + </notification> + <notification name="CantDerezInventoryError"> + Impossible de dérezzer l'objet à cause d'un défaut d'inventaire. + </notification> + <notification name="CantCreateRequestedInv"> + Création de l'inventaire demandé impossible. + </notification> + <notification name="CantCreateRequestedInvFolder"> + Création du dossier d'inventaire demandé impossible. + </notification> + <notification name="CantCreateInventory"> + Création de cet inventaire impossible. + </notification> + <notification name="CantCreateLandmark"> + Création du repère impossible. + </notification> + <notification name="CantCreateOutfit"> + Création de la tenue impossible. Veuillez réessayer dans une minute. + </notification> + <notification name="InventoryNotForSale"> + L'inventaire n'est pas à vendre. + </notification> + <notification name="CantFindInvItem"> + Objet de l'inventaire introuvable. + </notification> + <notification name="CantFindObject"> + Objet introuvable. + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + Les transferts d'argent aux objets sont actuellement désactivés dans cette région. + </notification> + <notification name="CantPayNoAgent"> + Impossible de savoir qui payer. + </notification> + <notification name="CantDonateToPublicObjects"> + Vous ne pouvez pas donner de L$ à des objets publics. + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + Échec de la création d'inventaire sur l'objet Second Life. + </notification> + <notification name="UserBalanceOrLandUsageError"> + Une erreur interne nous a empêchés de mettre votre client à jour correctement. Le solde de L$ et le patrimoine affichés dans votre client peuvent ne pas correspondre à votre solde réel sur les serveurs. + </notification> + <notification name="LargePrimAgentIntersect"> + Impossible de créer de grandes prims qui coupent d'autres joueurs. Réessayez une fois que les autres joueurs se seront déplacés. + </notification> + <notification name="PreferenceChatClearLog"> + Cela supprimera les journaux des conversations précédentes, ainsi que toute copie de sauvegarde de ce fichier. + <usetemplate ignoretext="Confirmer avant de supprimer le journal des conversations précédentes" name="okcancelignore" notext="Annuler" yestext="OK"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + Cela supprimera les transcriptions de toutes les conversations précédentes. La liste des conversations passées ne sera pas affectée. Tous les fichiers avec les suffixes .txt et txt.backup dans le dossier [FOLDER] seront supprimés. + <usetemplate ignoretext="Confirmer avant la suppression des transcriptions" name="okcancelignore" notext="Annuler" yestext="OK"/> + </notification> + <notification name="PreferenceChatPathChanged"> + Impossible de déplacer les fichiers. Chemin précédent rétabli. + <usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100644..100755 --- a/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/fr/panel_active_object_row.xml b/indra/newview/skins/default/xui/fr/panel_active_object_row.xml index 0baa8353d9..0baa8353d9 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/fr/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml index 4191ba42f9..4191ba42f9 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml index 54b8f53e59..c8fa9f340f 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml @@ -27,5 +27,6 @@ <icon name="permission_edit_mine_icon" tool_tip="Cet(te) ami(e) peut modifier, supprimer ou prendre vos objets."/> <icon name="permission_map_icon" tool_tip="Cet(te) ami(e) peut vous localiser sur la carte."/> <icon name="permission_online_icon" tool_tip="Cet(te) ami(e) peut voir lorsque vous êtes en ligne."/> + <button name="info_btn" tool_tip="En savoir plus"/> <button name="profile_btn" tool_tip="Voir le profil"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml index 20a355b11d..20a355b11d 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml index 96add2a74b..0e2b5a9c93 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> - <text name="title_text"> - Liste des ignorés - </text> - <scroll_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/> - <button label="Ignorer une personne" label_selected="Ignorer le résident..." name="Block resident..." tool_tip="Choisir un résident à ignorer"/> - <button label="Ignorer un objet par son nom" label_selected="Ignorer un objet par son nom..." name="Block object by name..." tool_tip="Choisir un objet à ignorer par nom"/> - <button label="Ne plus ignorer" label_selected="Ne plus ignorer" name="Unblock" tool_tip="Enlever le résident ou l'objet de la liste des ignorés"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="Filtrer" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="Actions sur la personne ou l'objet sélectionné"/> + <menu_button name="view_btn" tool_tip="Options de tri"/> + <menu_button name="plus_btn" tool_tip="Choisir un résident ou un objet à ignorer"/> + <button name="unblock_btn" tool_tip="Enlever le résident ou l’objet de la liste des ignorés"/> + </panel> + <block_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml index 377f85368f..377f85368f 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml index 5e7442b877..5e7442b877 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml index 5b6d37ce00..5b6d37ce00 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/fr/panel_chat_header.xml b/indra/newview/skins/default/xui/fr/panel_chat_header.xml index 7916bf5155..7916bf5155 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/fr/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml index de21996404..de21996404 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_classified_info.xml b/indra/newview/skins/default/xui/fr/panel_classified_info.xml index c4265be877..c4265be877 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml index 0b58a4e40b..0b58a4e40b 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml index b23cb91c6f..b23cb91c6f 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml index c1085aa461..c1085aa461 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml new file mode 100644 index 0000000000..ebf18f6483 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="(chargement)"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..9c277842b5 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="Incluait une conversation vocale"/> + <icon name="unread_ims_icon" tool_tip="Des messages sont arrivés pendant que vous étiez déconnecté."/> + <button name="delete_btn" tool_tip="Supprimer cette entrée"/> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml index e1fa769f2f..e1fa769f2f 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml index bc0edda5b6..bc0edda5b6 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml index a8b95c66fb..a8b95c66fb 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml index 7b58f2e825..7b58f2e825 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml index 549864e237..549864e237 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml index 68a7ac54e2..68a7ac54e2 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml index 575cbabc88..575cbabc88 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml index 7e467b130c..7e467b130c 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml index 60d8e947f8..60d8e947f8 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_physics.xml b/indra/newview/skins/default/xui/fr/panel_edit_physics.xml index d79f7df90a..d79f7df90a 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml index 247e18da82..247e18da82 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml index 9e63c88221..9e63c88221 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml index 6a5f71a36b..6a5f71a36b 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml index 9a263f6148..9a263f6148 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml index 3eb70923ef..3eb70923ef 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml index f5f2738319..f5f2738319 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml index f562d67937..f562d67937 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml index f97047ae28..f97047ae28 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml index 086542dee2..086542dee2 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml index c83ce04885..c83ce04885 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml index 689b7b81f4..689b7b81f4 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml index def158cf68..def158cf68 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml index 3e66b3c72a..3e66b3c72a 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml index a2655dcd45..a2655dcd45 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml index 047cd692e8..047cd692e8 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml index d792439220..d792439220 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml index 4011d1b8c7..4011d1b8c7 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml index 5fb69d1989..b1b32af7c6 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Inconnu"/> + <button name="info_btn" tool_tip="En savoir plus"/> <button name="profile_btn" tool_tip="Voir le profil"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml index 3364dd9dbc..3364dd9dbc 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_notify.xml b/indra/newview/skins/default/xui/fr/panel_group_notify.xml index 08a49f908c..08a49f908c 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml index 0bd2e0bdab..0bd2e0bdab 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml index 1f2169e22c..1f2169e22c 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/fr/panel_instant_message.xml b/indra/newview/skins/default/xui/fr/panel_instant_message.xml index 305d2d853c..305d2d853c 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/fr/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/fr/panel_inventory_item.xml b/indra/newview/skins/default/xui/fr/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml index 60507f191d..60507f191d 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml index 7501e54f11..7501e54f11 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml index c8a1fe8751..c8a1fe8751 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_login.xml +++ b/indra/newview/skins/default/xui/fr/panel_login.xml diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml index db7d254b7a..db7d254b7a 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml index 5676986228..5676986228 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_me.xml +++ b/indra/newview/skins/default/xui/fr/panel_me.xml diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml index e048e66810..e048e66810 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml index 8f1b436ba1..8f1b436ba1 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml index 9d070b7aff..9d070b7aff 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml index ecb1e9813a..ecb1e9813a 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml index b02e53269b..b02e53269b 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml index 82cdf292ab..762dee01bb 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl-Entrée pour crier"/> <button name="show_nearby_chat" tool_tip="Affiche/Masque le journal de chats près de vous"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml index 7b7b67041a..7b7b67041a 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml index 110e017050..110e017050 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml diff --git a/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml index 6ce09cde4b..6ce09cde4b 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml index d947dbceb8..d947dbceb8 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml index 39bc7ef8af..39bc7ef8af 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml index 1bc553c8c0..1bc553c8c0 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml index 4703559111..4703559111 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml index 416353e1d4..416353e1d4 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml index 874bab2daa..874bab2daa 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml index f035853efc..227ce26df7 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_people.xml +++ b/indra/newview/skins/default/xui/fr/panel_people.xml @@ -14,81 +14,53 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife:// <string name="no_filtered_friends_msg"> Vous n'avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/people/[SEARCH_TERM] Rechercher]. </string> - <string name="people_filter_label" value="Filtrer les personnes"/> - <string name="groups_filter_label" value="Filtrer les groupes"/> <string name="no_filtered_groups_msg" value="Vous n'avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/groups/[SEARCH_TERM] Rechercher]."/> <string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/> <string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/> <string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/> - <filter_editor label="Filtre" name="filter_input"/> <tab_container name="tabs"> <panel label="PRÈS DE VOUS" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="Options"/> - <button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d'amis"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="Filtrer les personnes" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/> + <menu_button name="nearby_view_btn" tool_tip="Options d'affichage/de tri"/> + <button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/> + <dnd_button name="nearby_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/> </panel> </panel> - <panel label="MES AMIS" name="friends_panel"> + <panel label="AMIS" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="Filtrer les personnes" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/> + <menu_button name="friends_view_btn" tool_tip="Options d'affichage/de tri"/> + <button name="friends_add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/> + <dnd_button name="friends_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="En ligne"/> <accordion_tab name="tab_all" title="Tout"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="Afficher d'autres options"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d'amis."/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="MES GROUPES" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="Options"/> - <button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/> - <button name="activate_btn" tool_tip="Activer le groupe sélectionné"/> + <panel label="GROUPES" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="Filtrer les groupes" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="Actions sur le groupe sélectionné"/> + <menu_button name="groups_view_btn" tool_tip="Options d'affichage/de tri"/> + <menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/> + <dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/> </panel> </panel> <panel label="RÉCENT" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="Options"/> - <button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d'amis"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="Filtrer les personnes" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/> + <menu_button name="recent_view_btn" tool_tip="Options d'affichage/de tri"/> + <button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/> + <dnd_button name="recent_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/> </panel> </panel> + <panel label="BLOQUÉ" name="blocked_panel"> + <panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="Partager" name="share_btn" tool_tip="Partager un article de l'inventaire."/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="Profil du groupe" name="group_info_btn" tool_tip="Afficher les informations sur le groupe"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="Appel de groupe" name="group_call_btn" tool_tip="Appeler ce groupe"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_pick_info.xml b/indra/newview/skins/default/xui/fr/panel_pick_info.xml index 1de9b243f1..1de9b243f1 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/fr/panel_picks.xml b/indra/newview/skins/default/xui/fr/panel_picks.xml index fb277f653f..fb277f653f 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_picks.xml +++ b/indra/newview/skins/default/xui/fr/panel_picks.xml diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml index 30be838896..30be838896 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml index 5ec48c44c7..5ec48c44c7 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_places.xml +++ b/indra/newview/skins/default/xui/fr/panel_places.xml diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_message.xml b/indra/newview/skins/default/xui/fr/panel_postcard_message.xml index 0f8397cfb4..0f8397cfb4 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/fr/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml index 945a5e0272..945a5e0272 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml index 3f3d0f51f4..3f3d0f51f4 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml index 901a92ed1b..901a92ed1b 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml 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 550beb653e..972190dc15 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat écrit" name="chat"> - <text name="font_size"> - Taille de la police : - </text> - <radio_group name="chat_font_size"> - <radio_item label="Petite" name="radio" value="0"/> - <radio_item label="Moyenne" name="radio2" value="1"/> - <radio_item label="Grande" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="true" label="Exécuter l'animation clavier quand vous écrivez" name="play_typing_animation"/> - <check_box label="M'envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/> - <check_box label="Activer l'historique des chats et des IM en texte brut" name="plain_text_chat_history"/> - <check_box label="Bulles de chat" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - Afficher les IM dans : - </text> - <text name="requires_restart_label"> - (redémarrage requis) - </text> - <radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)"> - <radio_item label="Plusieurs fenêtres" name="radio" value="0"/> - <radio_item label="Onglets" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - Activer les popups de chat entrant : - </text> - <check_box label="Chats de groupe" name="EnableGroupChatPopups" tool_tip="Cocher cette case pour qu'un popup s'affiche à réception d'un message de chat de groupe."/> - <check_box label="Chats IM" name="EnableIMChatPopups" tool_tip="Cocher cette case pour qu'un popup s'affiche à réception d'un message instantané."/> - <spinner label="Durée de vie du popup Chat près de moi :" name="nearby_toasts_lifetime"/> - <spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="true" label="Exécuter l'animation clavier quand vous écrivez" name="play_typing_animation"/> + <check_box label="M'envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/> + <check_box label="Seuls mes amis et groupes peuvent m'appeler ou m'envoyer un IM" name="voice_call_friends_only_check"/> + <text name="font_size"> + Taille de la police : + </text> + <combo_box name="chat_font_size"> + <item label="Petite" name="Small" value="0"/> + <item label="Moyenne" name="Medium" value="1"/> + <item label="Grande" name="Large" value="2"/> + </combo_box> + <check_box label="Bulles de chat" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + Notifications + </text> + <text name="friend_ims"> + IM amis : + </text> + <combo_box name="FriendIMOptions"> + <item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/> + <item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/> + <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="clignote"/> + <item label="Aucun(e)" name="None" value="aucun(e)"/> + </combo_box> + <text name="non_friend_ims"> + IM non amis : + </text> + <combo_box name="NonFriendIMOptions"> + <item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/> + <item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/> + <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="clignote"/> + <item label="Aucun(e)" name="None" value="aucun(e)"/> + </combo_box> + <text name="conference_ims"> + IM conférence : + </text> + <combo_box name="ConferenceIMOptions"> + <item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/> + <item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/> + <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="clignote"/> + <item label="Aucun(e)" name="None" value="aucun(e)"/> + </combo_box> + <text name="group_chat"> + Chat de groupe : + </text> + <combo_box name="GroupChatOptions"> + <item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/> + <item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/> + <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="clignote"/> + <item label="Aucun(e)" name="None" value="aucun(e)"/> + </combo_box> + <text name="nearby_chat"> + Chat près de moi : + </text> + <combo_box name="NearbyChatOptions"> + <item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/> + <item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/> + <item label="Bouton de la barre d'outils Flash" name="FlashToolBarButton" value="clignote"/> + <item label="Aucun(e)" name="None" value="aucun(e)"/> + </combo_box> + <text name="notifications_alert"> + Pour suspendre temporairement toutes les notifications, utilisez Communication > Ne pas déranger. + </text> + </panel> + <panel> + <text name="play_sound"> + Écouter le son : + </text> + <check_box label="Nouvelle conversation" name="new_conversation"/> + <check_box label="Appel entrant" name="incoming_voice_call"/> + <check_box label="Offre de téléportation" name="teleport_offer"/> + <check_box label="Offre d'inventaire" name="inventory_offer"/> + </panel> + <panel> + <button label="Effacer le journal..." name="clear_log"/> + <button label="Supprimer les transcriptions..." name="delete_transcripts"/> + <button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/> + </panel> <button label="Traduction..." name="ok_btn"/> <button label="Rechercher/Remplacer..." name="autoreplace_showgui"/> <button label="Orthographe..." name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml index e50fd2b6f3..e50fd2b6f3 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml 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 66b84af3aa..533c392d6b 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -69,9 +69,9 @@ <combo_box.item label="Jamais" name="item4"/> </combo_box> <text name="text_box3"> - Réponse si occupé(e) : + Réponse Ne pas déranger </text> - <text_editor name="busy_response"> + <text_editor name="do_not_disturb_response"> log_in_to_change </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml index a738b2d43f..a738b2d43f 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml index 80aed90a2d..80aed90a2d 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml index cf1a374da6..cf1a374da6 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml index 83303950dc..83303950dc 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml index 37eb6bbeb0..37eb6bbeb0 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml index ad744b7760..ad744b7760 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml index a30306d116..a30306d116 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml index 98ae250215..98ae250215 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml index 085a308786..085a308786 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml index be89020ac7..be89020ac7 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml index 234d316069..234d316069 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml index 97f486d3a3..97f486d3a3 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/fr/panel_script_ed.xml b/indra/newview/skins/default/xui/fr/panel_script_ed.xml index 29fbe3c7e7..29fbe3c7e7 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml index e541fae31f..e541fae31f 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml index 751abd6f1d..751abd6f1d 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml index 8febdccbed..8febdccbed 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml index 45efbdc980..45efbdc980 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml index 48bcff1c09..48bcff1c09 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml index 472c4a5e8f..472c4a5e8f 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml index 97dc3e7e2b..97dc3e7e2b 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml index befe1b3bc6..befe1b3bc6 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml index 82a4815144..82a4815144 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml index 427ffe2113..427ffe2113 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml index 460b269f7c..460b269f7c 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml index ee4e8a6be6..ee4e8a6be6 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml index ba36a7d299..ba36a7d299 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml index 81db7c8989..81db7c8989 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml index cf1266a460..cf1266a460 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml index 21eb7ff62c..21eb7ff62c 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml index a134854706..a134854706 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml index e05c93a4ac..e05c93a4ac 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/fr/panel_world_map.xml b/indra/newview/skins/default/xui/fr/panel_world_map.xml index 972aae1fab..972aae1fab 100644..100755 --- a/indra/newview/skins/default/xui/fr/panel_world_map.xml +++ b/indra/newview/skins/default/xui/fr/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml index 7187de8760..7187de8760 100644..100755 --- a/indra/newview/skins/default/xui/fr/role_actions.xml +++ b/indra/newview/skins/default/xui/fr/role_actions.xml diff --git a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml index 5e1ac55a97..5e1ac55a97 100644..100755 --- a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml index 1b9c832679..1b9c832679 100644..100755 --- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml index e7fc7859c9..e7fc7859c9 100644..100755 --- a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml index 60027d41cb..896dd932e3 100644..100755 --- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="Acheter l'objet" name="Buyobject"/> <combo_box.item label="Payer l'objet" name="Payobject"/> <combo_box.item label="Ouvrir" name="Open"/> + <combo_box.item label="Zoom" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 6a2a3f559a..69ed20f376 100644..100755 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -137,7 +137,7 @@ Quitter </string> <string name="create_account_url"> - http://join.secondlife.com/index.php?lang=fr-FR&sourceid=[sourceid] + http://join.secondlife.com/?sourceid=[sourceid] </string> <string name="LoginFailedViewerNotPermitted"> Le client que vous utilisez ne permet plus d'accéder à Second Life. Téléchargez un nouveau client à la page suivante : @@ -622,8 +622,8 @@ Veuillez réessayer de vous connecter dans une minute. <string name="AvatarAway"> Absent </string> - <string name="AvatarBusy"> - Occupé + <string name="AvatarDoNotDisturb"> + Ne pas déranger </string> <string name="AvatarMuted"> Bloqué(e) @@ -859,6 +859,12 @@ Veuillez réessayer de vous connecter dans une minute. <string name="ST_NO_JOINT"> Impossible de trouver ROOT ou JOINT. </string> + <string name="NearbyChatTitle"> + Chat près de moi + </string> + <string name="NearbyChatLabel"> + (Chat près de moi) + </string> <string name="whisper"> chuchote : </string> @@ -922,12 +928,15 @@ Veuillez réessayer de vous connecter dans une minute. <string name="ControlYourCamera"> Contrôler votre caméra </string> - <string name="TeleportYourAgent"> - Vous téléporter - </string> <string name="NotConnected"> Pas connecté(e) </string> + <string name="AgentNameSubst"> + (Vous) + </string> + <string name="TeleportYourAgent"> + Vous téléporter + </string> <string name="SIM_ACCESS_PG"> Général </string> @@ -1009,18 +1018,6 @@ Veuillez réessayer de vous connecter dans une minute. <string name="dictionary_files"> Dictionnaires </string> - <string name="AvatarSetNotAway"> - Présent - </string> - <string name="AvatarSetAway"> - Absent - </string> - <string name="AvatarSetNotBusy"> - Pas occupé - </string> - <string name="AvatarSetBusy"> - Occupé - </string> <string name="shape"> Silhouette </string> @@ -1989,8 +1986,8 @@ Veuillez réessayer de vous connecter dans une minute. <string name="PanelContentsNewScript"> Nouveau script </string> - <string name="BusyModeResponseDefault"> - Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu'il a demandé à ne pas être dérangé. Votre message restera affiché dans son panneau IM afin qu'il puisse le lire ultérieurement. + <string name="DoNotDisturbModeResponseDefault"> + Ce résident a activé Ne pas déranger et verra votre message plus tard. </string> <string name="MuteByName"> (par nom) @@ -2103,9 +2100,6 @@ Veuillez réessayer de vous connecter dans une minute. <string name="GroupMoneyDate"> [weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc] </string> - <string name="ViewerObjectContents"> - Contenus - </string> <string name="AcquiredItems"> Objets acquis </string> @@ -3877,7 +3871,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Région de type Général </string> <string name="LocationCtrlSeeAVsTooltip"> - Avatars visibles et chat autorisé en dehors de cette parcelle + Les avatars à l'extérieur de cette parcelle ne peuvent pas voir ni entendre les avatars qui se trouvent à l'intérieur. </string> <string name="LocationCtrlPathfindingDirtyTooltip"> Les objets mobiles risquent de ne pas se comporter correctement dans cette région tant qu'elle n'est pas refigée. @@ -3954,6 +3948,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. <string name="IM_unblock_only_groups_friends"> Pour afficher ce message, vous devez désactiver la case Seuls mes amis et groupes peuvent m'appeler ou m'envoyer un IM, sous Préférences/Confidentialité. </string> + <string name="OnlineStatus"> + En ligne + </string> + <string name="OfflineStatus"> + Hors ligne + </string> <string name="answered_call"> Votre appel a fait l'objet d'une réponse </string> @@ -3963,6 +3963,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. <string name="you_joined_call"> Vous avez rejoint l'appel </string> + <string name="you_auto_rejected_call-im"> + Vous avez automatiquement refusé l'appel vocal quand le mode Ne pas déranger était activé. + </string> <string name="name_started_call"> [NAME] appelle. </string> @@ -3979,7 +3982,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Connexion en cours... </string> <string name="conference-title"> - Conférence ad-hoc + Chat à plusieurs </string> <string name="conference-title-incoming"> Conférence avec [AGENT_NAME] @@ -4859,6 +4862,9 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="Command_Chat_Label"> Chat </string> + <string name="Command_Conversations_Label"> + Conversations + </string> <string name="Command_Compass_Label"> Boussole </string> @@ -4934,6 +4940,9 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="Command_Chat_Tooltip"> Parler aux personnes près de vous par chat écrit </string> + <string name="Command_Conversations_Tooltip"> + Parler à quelqu'un + </string> <string name="Command_Compass_Tooltip"> Boussole </string> @@ -5063,4 +5072,13 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="UserDictionary"> [User] </string> + <string name="logging_calls_disabled_log_empty"> + Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences > Chat. + </string> + <string name="logging_calls_disabled_log_not_empty"> + Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences > Chat. + </string> + <string name="logging_calls_enabled_log_empty"> + Il n'y a aucune conversation enregistrée. Quand quelqu'un vous contacte ou quand vous contactez quelqu'un, une entrée de journal s'affiche ici. + </string> </strings> diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml index 6065fa2966..6065fa2966 100644..100755 --- a/indra/newview/skins/default/xui/fr/teleport_strings.xml +++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/fr/xui_version.xml b/indra/newview/skins/default/xui/fr/xui_version.xml index 0e777751d3..0e777751d3 100644..100755 --- a/indra/newview/skins/default/xui/fr/xui_version.xml +++ b/indra/newview/skins/default/xui/fr/xui_version.xml diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml index c672511fc5..c672511fc5 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_about.xml +++ b/indra/newview/skins/default/xui/it/floater_about.xml 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 fe3e59b0bd..fe3e59b0bd 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/it/floater_activeim.xml b/indra/newview/skins/default/xui/it/floater_activeim.xml index 0c1f0448e1..0c1f0448e1 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_activeim.xml +++ b/indra/newview/skins/default/xui/it/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml index a2bce00141..a2bce00141 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml index a4319f2e77..a4319f2e77 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_auction.xml b/indra/newview/skins/default/xui/it/floater_auction.xml index 4cad8b744d..4cad8b744d 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_auction.xml +++ b/indra/newview/skins/default/xui/it/floater_auction.xml diff --git a/indra/newview/skins/default/xui/it/floater_autoreplace.xml b/indra/newview/skins/default/xui/it/floater_autoreplace.xml index 559a42cfae..559a42cfae 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/it/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/it/floater_avatar.xml b/indra/newview/skins/default/xui/it/floater_avatar.xml index d7445cfb2b..d7445cfb2b 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_avatar.xml +++ b/indra/newview/skins/default/xui/it/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml index 5a542d6a27..5a542d6a27 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml index b6376973cd..b6376973cd 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml index b7ab265cc2..b7ab265cc2 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_beacons.xml +++ b/indra/newview/skins/default/xui/it/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml index 080e396642..080e396642 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_build_options.xml +++ b/indra/newview/skins/default/xui/it/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml index 89f4a0cb71..89f4a0cb71 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/it/floater_bumps.xml b/indra/newview/skins/default/xui/it/floater_bumps.xml index ae66148659..ae66148659 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_bumps.xml +++ b/indra/newview/skins/default/xui/it/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml index 84ed85e362..84ed85e362 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml index 743969f557..743969f557 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml index 4a1bf33403..4a1bf33403 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml index 3940c43a3d..3940c43a3d 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/it/floater_buy_object.xml b/indra/newview/skins/default/xui/it/floater_buy_object.xml index e7cbd68b38..e7cbd68b38 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml index be03857bc9..be03857bc9 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_camera.xml +++ b/indra/newview/skins/default/xui/it/floater_camera.xml diff --git a/indra/newview/skins/default/xui/it/floater_chat_bar.xml b/indra/newview/skins/default/xui/it/floater_chat_bar.xml index 94c85b50c8..b47e32ce90 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/it/floater_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="chat_bar" title="CHAT NEI DINTORNI"> +<floater name="nearby_chat" title="CHAT NEI DINTORNI"> <panel name="bottom_panel"> <line_editor label="Clicca qui per la chat." name="chat_box" tool_tip="Premi Invio per parlare, Ctrl+Invio per gridare"/> <button name="show_nearby_chat" tool_tip="Mostra/Nasconde il registro della chat nei dintorni"/> diff --git a/indra/newview/skins/default/xui/it/floater_choose_group.xml b/indra/newview/skins/default/xui/it/floater_choose_group.xml index 00f2692295..00f2692295 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/it/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/it/floater_color_picker.xml b/indra/newview/skins/default/xui/it/floater_color_picker.xml index 38d4a0a037..38d4a0a037 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/it/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/it/floater_conversation_log.xml b/indra/newview/skins/default/xui/it/floater_conversation_log.xml new file mode 100644 index 0000000000..8354824ed1 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="REGISTRO CONVERSAZIONI"> + <panel name="buttons_panel"> + <filter_editor label="Filtro persone" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="Opzioni Mostra/Ordina"/> + <menu_button name="conversations_gear_btn" tool_tip="Azioni sulla persona o gruppo selezionato"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml new file mode 100644 index 0000000000..d0e9c8ee0e --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="CONVERSAZIONE:"> + <floater.string name="Title"> + CONVERSAZIONE: [NAME] + </floater.string> + <text name="page_label" value="Pagina"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_critical.xml b/indra/newview/skins/default/xui/it/floater_critical.xml index 82850b0ada..82850b0ada 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_critical.xml +++ b/indra/newview/skins/default/xui/it/floater_critical.xml diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml index 71071825af..71071825af 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/it/floater_destinations.xml b/indra/newview/skins/default/xui/it/floater_destinations.xml index 242403e431..242403e431 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_destinations.xml +++ b/indra/newview/skins/default/xui/it/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/it/floater_display_name.xml b/indra/newview/skins/default/xui/it/floater_display_name.xml index 3e0c43e741..3e0c43e741 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_display_name.xml +++ b/indra/newview/skins/default/xui/it/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml index c922b2e4f7..c922b2e4f7 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml index 571027fd29..571027fd29 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml index 7bffc60ba2..7bffc60ba2 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/it/floater_environment_settings.xml b/indra/newview/skins/default/xui/it/floater_environment_settings.xml index f191078fad..f191078fad 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/it/floater_event.xml b/indra/newview/skins/default/xui/it/floater_event.xml index b64f429870..b64f429870 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_event.xml +++ b/indra/newview/skins/default/xui/it/floater_event.xml diff --git a/indra/newview/skins/default/xui/it/floater_fast_timers.xml b/indra/newview/skins/default/xui/it/floater_fast_timers.xml index 52ab6b0c3d..52ab6b0c3d 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/it/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/it/floater_font_test.xml b/indra/newview/skins/default/xui/it/floater_font_test.xml index 859c068b11..859c068b11 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_font_test.xml +++ b/indra/newview/skins/default/xui/it/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml index b9419ebc22..b9419ebc22 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_gesture.xml +++ b/indra/newview/skins/default/xui/it/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/it/floater_god_tools.xml b/indra/newview/skins/default/xui/it/floater_god_tools.xml index 32c79936cf..32c79936cf 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml index edbbc354cf..edbbc354cf 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/it/floater_help_browser.xml b/indra/newview/skins/default/xui/it/floater_help_browser.xml index 008643afac..008643afac 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/it/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/it/floater_how_to.xml b/indra/newview/skins/default/xui/it/floater_how_to.xml index 8f0e210571..8f0e210571 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_how_to.xml +++ b/indra/newview/skins/default/xui/it/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/it/floater_hud.xml b/indra/newview/skins/default/xui/it/floater_hud.xml index 437d2d6496..437d2d6496 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_hud.xml +++ b/indra/newview/skins/default/xui/it/floater_hud.xml diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml index fb8e77b32f..10cf1b7f7e 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_im_container.xml +++ b/indra/newview/skins/default/xui/it/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="CONVERSAZIONI"/> +<multi_floater name="floater_im_box" title="CONVERSAZIONI"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="Opzioni Mostra/Ordina"/> + <button name="add_btn" tool_tip="Avvia una nuova conversazione"/> + <button name="speak_btn" tool_tip="Parla con le persone usando il microfono"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo elenco"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="Minimizza questo pannello"/> + <text name="stub_textbox"> + Questa conversazione in una finestra separata. [secondlife:/// Ripristina conversazione.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml index 3d9d17fc81..d38ec7a5fe 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_im_session.xml +++ b/indra/newview/skins/default/xui/it/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="A" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] è stato invitato alla conversazione."/> + <floater.string name="multiple_participants_added" value="[NAME] sono stati invitati alla conversazione."/> + <floater.string name="tooltip_to_separate_window" value="Sposta questa conversazione in una finestra separata."/> + <floater.string name="tooltip_to_main_window" value="Sposta questa conversazione di nuovo nella finestra principale"/> + <floater.string name="start_call_button_tooltip" value="Apri collegamento voce"/> + <floater.string name="end_call_button_tooltip" value="Chiudi collegamento voce"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="Minimizza questo pannello"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Minimizza elenco partecipanti"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Espandi l'elenco dei partecipanti"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="Opzioni Mostra/Ordina"/> + <menu_button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/> + <button name="add_btn" tool_tip="Aggiungi qualcuno a questa conversazione"/> + <button name="voice_call_btn" tool_tip="Apri collegamento voce"/> + <button name="close_btn" tool_tip="Termina questa conversazione"/> + <button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo pannello"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Traduci chat" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="A" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_image_preview.xml b/indra/newview/skins/default/xui/it/floater_image_preview.xml index ee7be7b155..ee7be7b155 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_import_collada.xml b/indra/newview/skins/default/xui/it/floater_import_collada.xml index eb4d0c0fdb..eb4d0c0fdb 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/it/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml index a95ed44662..566920209d 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml @@ -10,7 +10,7 @@ anonimo </floater.string> <floater.string name="VoiceInviteP2P"> - sta chiamando. + ti sta chiamando. </floater.string> <floater.string name="VoiceInviteAdHoc"> ha aderito ad una chiamata in chat vocale in conferenza. @@ -25,9 +25,9 @@ Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat? </floater.string> <text name="question"> - Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat? + Se rispondi, verrà interrotto il collegamento dalla conversazione a voce corrente. </text> - <button label="Accetta" label_selected="Accetta" name="Accept"/> - <button label="Rifiuta" label_selected="Rifiuta" name="Reject"/> - <button label="Inizia IM" name="Start IM"/> + <button label="Risposta" label_selected="Risposta" name="Accept"/> + <button label="Ignora" label_selected="Ignora" name="Reject"/> + <button label="Apri invece IM" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_inspect.xml b/indra/newview/skins/default/xui/it/floater_inspect.xml index bae993d2be..bae993d2be 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_inspect.xml +++ b/indra/newview/skins/default/xui/it/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml index 7ed3486b9b..7ed3486b9b 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml index cf790ee62e..cf790ee62e 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml index 3d60ded7ab..3d60ded7ab 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_joystick.xml +++ b/indra/newview/skins/default/xui/it/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/it/floater_lagmeter.xml b/indra/newview/skins/default/xui/it/floater_lagmeter.xml index f7b2b1ab4a..f7b2b1ab4a 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/it/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/it/floater_land_holdings.xml b/indra/newview/skins/default/xui/it/floater_land_holdings.xml index 1b2f2605f7..1b2f2605f7 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/it/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml index 0bd2b02323..0bd2b02323 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml index 47fe2de051..47fe2de051 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml index 5e4e4abca4..5e4e4abca4 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_map.xml +++ b/indra/newview/skins/default/xui/it/floater_map.xml diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml index 0a8c0f1c41..0a8c0f1c41 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/it/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/it/floater_media_settings.xml b/indra/newview/skins/default/xui/it/floater_media_settings.xml index d521502a4c..d521502a4c 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/it/floater_mem_leaking.xml b/indra/newview/skins/default/xui/it/floater_mem_leaking.xml index 63074d5a4c..63074d5a4c 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/it/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml index 02f257d466..02f257d466 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml index e8df4d2d4b..e8df4d2d4b 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_moveview.xml b/indra/newview/skins/default/xui/it/floater_moveview.xml index 1237bd06a9..1237bd06a9 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_moveview.xml +++ b/indra/newview/skins/default/xui/it/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/it/floater_mute_object.xml b/indra/newview/skins/default/xui/it/floater_mute_object.xml index dd1a2b67d7..dd1a2b67d7 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/it/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/it/floater_my_appearance.xml b/indra/newview/skins/default/xui/it/floater_my_appearance.xml index 39ddd6186a..39ddd6186a 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/it/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/it/floater_my_inventory.xml b/indra/newview/skins/default/xui/it/floater_my_inventory.xml index 0efd9f1c6d..0efd9f1c6d 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/it/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/it/floater_object_weights.xml b/indra/newview/skins/default/xui/it/floater_object_weights.xml index fdcb732dee..fdcb732dee 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/it/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/it/floater_openobject.xml b/indra/newview/skins/default/xui/it/floater_openobject.xml index d8144c7cd5..d8144c7cd5 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_openobject.xml +++ b/indra/newview/skins/default/xui/it/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml index 55bb5adb1e..55bb5adb1e 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml index cdb180bacd..cdb180bacd 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml index 5122954edb..5122954edb 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml index 77be220a2a..7777444161 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> Mostra: </text> - <check_box label="Mondo" name="show_world"/> + <check_box label="Test" name="show_world"/> <check_box label="Solo elementi spostabili" name="show_world_movables_only"/> <check_box label="Navmesh" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml index 7edac3ff46..7edac3ff46 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml index 5753c8c765..5753c8c765 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_pay.xml +++ b/indra/newview/skins/default/xui/it/floater_pay.xml diff --git a/indra/newview/skins/default/xui/it/floater_pay_object.xml b/indra/newview/skins/default/xui/it/floater_pay_object.xml index 8805f3208e..8805f3208e 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/it/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/it/floater_people.xml b/indra/newview/skins/default/xui/it/floater_people.xml index 1acc3cbf19..1acc3cbf19 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_people.xml +++ b/indra/newview/skins/default/xui/it/floater_people.xml diff --git a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml index a02b3b5075..a02b3b5075 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/it/floater_picks.xml b/indra/newview/skins/default/xui/it/floater_picks.xml index dfc539da66..dfc539da66 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_picks.xml +++ b/indra/newview/skins/default/xui/it/floater_picks.xml diff --git a/indra/newview/skins/default/xui/it/floater_places.xml b/indra/newview/skins/default/xui/it/floater_places.xml index cd46cf8b59..cd46cf8b59 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_places.xml +++ b/indra/newview/skins/default/xui/it/floater_places.xml diff --git a/indra/newview/skins/default/xui/it/floater_post_process.xml b/indra/newview/skins/default/xui/it/floater_post_process.xml index 3aa8b29101..3aa8b29101 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_post_process.xml +++ b/indra/newview/skins/default/xui/it/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml index 7a1d2966ed..7a1d2966ed 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_preferences.xml +++ b/indra/newview/skins/default/xui/it/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml index 86ea8064b1..86ea8064b1 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml index ed609c70fa..ed609c70fa 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml index 2172b9848b..2172b9848b 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml index 7ec229f9d3..7ec229f9d3 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_sound.xml b/indra/newview/skins/default/xui/it/floater_preview_sound.xml index 8eb9573e54..8eb9573e54 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/it/floater_preview_texture.xml b/indra/newview/skins/default/xui/it/floater_preview_texture.xml index 5b4054514e..5b4054514e 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml index 06c838a981..06c838a981 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/it/floater_publish_classified.xml b/indra/newview/skins/default/xui/it/floater_publish_classified.xml index c371e28caa..c371e28caa 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/it/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml index 6efa10290b..6efa10290b 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/it/floater_region_info.xml b/indra/newview/skins/default/xui/it/floater_region_info.xml index dc2c24ca56..dc2c24ca56 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_region_info.xml +++ b/indra/newview/skins/default/xui/it/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml index eeba54b0ca..eeba54b0ca 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/it/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_debug.xml b/indra/newview/skins/default/xui/it/floater_script_debug.xml index 89bf80da5e..89bf80da5e 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/it/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_limits.xml b/indra/newview/skins/default/xui/it/floater_script_limits.xml index 2383b85bb7..2383b85bb7 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/it/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_preview.xml b/indra/newview/skins/default/xui/it/floater_script_preview.xml index d007774f43..d007774f43 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_queue.xml b/indra/newview/skins/default/xui/it/floater_script_queue.xml index f4117d30a2..f4117d30a2 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/it/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/it/floater_script_search.xml b/indra/newview/skins/default/xui/it/floater_script_search.xml index 3d0b02877e..3d0b02877e 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_script_search.xml +++ b/indra/newview/skins/default/xui/it/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml index ac3dc17aa3..ac3dc17aa3 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_search.xml +++ b/indra/newview/skins/default/xui/it/floater_search.xml diff --git a/indra/newview/skins/default/xui/it/floater_select_key.xml b/indra/newview/skins/default/xui/it/floater_select_key.xml index 014bc76ffb..014bc76ffb 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_select_key.xml +++ b/indra/newview/skins/default/xui/it/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml index 106ae0373c..106ae0373c 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml index 489d52d3b8..489d52d3b8 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/it/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml index bff6081bdf..bff6081bdf 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/it/floater_sound_devices.xml b/indra/newview/skins/default/xui/it/floater_sound_devices.xml index 9799b48d89..9799b48d89 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/it/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/it/floater_sound_preview.xml b/indra/newview/skins/default/xui/it/floater_sound_preview.xml index 221e5e5b53..221e5e5b53 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck.xml b/indra/newview/skins/default/xui/it/floater_spellcheck.xml index 2a8557b0fc..2a8557b0fc 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/it/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml index c04fc249a7..c04fc249a7 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml index 825b2ce57a..825b2ce57a 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_stats.xml +++ b/indra/newview/skins/default/xui/it/floater_stats.xml diff --git a/indra/newview/skins/default/xui/it/floater_sys_well.xml b/indra/newview/skins/default/xui/it/floater_sys_well.xml index e1c0b89902..e1c0b89902 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/it/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/it/floater_telehub.xml b/indra/newview/skins/default/xui/it/floater_telehub.xml index 15312a8959..15312a8959 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_telehub.xml +++ b/indra/newview/skins/default/xui/it/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml index 23da6f7588..23da6f7588 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml index c97a91bb3f..27a17868a7 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml @@ -19,7 +19,7 @@ <button label="Default" label_selected="Default" name="Default"/> <button label="Vuoto" label_selected="Vuoto" name="Blank"/> <button label="Niente" label_selected="Niente" name="None"/> - <check_box initial_value="true" label="Anteprima dal vivo" name="apply_immediate_check"/> + <check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/> <text name="preview_disabled" value="Anteprima disattivata"/> <filter_editor label="Filtro texture" name="inventory search editor"/> <check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml index 49b6453319..49b6453319 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml index dd59035dd4..dd59035dd4 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_tools.xml diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml index d8ca7f4438..d8ca7f4438 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/it/floater_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml index 28a2dfdda2..28a2dfdda2 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_tos.xml +++ b/indra/newview/skins/default/xui/it/floater_tos.xml diff --git a/indra/newview/skins/default/xui/it/floater_toybox.xml b/indra/newview/skins/default/xui/it/floater_toybox.xml index 269e2831d0..269e2831d0 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_toybox.xml +++ b/indra/newview/skins/default/xui/it/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/it/floater_translation_settings.xml b/indra/newview/skins/default/xui/it/floater_translation_settings.xml index a0a34da723..a0a34da723 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/it/floater_url_entry.xml b/indra/newview/skins/default/xui/it/floater_url_entry.xml index 9ad1a0dce5..9ad1a0dce5 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/it/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..b168d067c2 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="VOLUME CHAT VOCALE"> + <slider label="Chat vocale" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml index 77973eef1e..77973eef1e 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/it/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml index c83b11f698..f102622f5d 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE"> +<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE"> <string name="no_voice_effect"> (Nessuna manipolazione voce) </string> diff --git a/indra/newview/skins/default/xui/it/floater_voice_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_volume.xml new file mode 100644 index 0000000000..eaeda7597f --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="VOLUME VOCE"> + <slider name="volume_slider" tool_tip="Volume voce" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml index 5603e85417..5603e85417 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_web_content.xml +++ b/indra/newview/skins/default/xui/it/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml index 9abc968b94..9abc968b94 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/it/floater_window_size.xml b/indra/newview/skins/default/xui/it/floater_window_size.xml index fef423aefe..fef423aefe 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_window_size.xml +++ b/indra/newview/skins/default/xui/it/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml index 8da17a4034..8da17a4034 100644..100755 --- a/indra/newview/skins/default/xui/it/floater_world_map.xml +++ b/indra/newview/skins/default/xui/it/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/it/inspect_avatar.xml b/indra/newview/skins/default/xui/it/inspect_avatar.xml index 6f52aaef74..6f52aaef74 100644..100755 --- a/indra/newview/skins/default/xui/it/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/it/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/it/inspect_group.xml b/indra/newview/skins/default/xui/it/inspect_group.xml index 2416f4bb12..2416f4bb12 100644..100755 --- a/indra/newview/skins/default/xui/it/inspect_group.xml +++ b/indra/newview/skins/default/xui/it/inspect_group.xml diff --git a/indra/newview/skins/default/xui/it/inspect_object.xml b/indra/newview/skins/default/xui/it/inspect_object.xml index d8ab10cfda..d8ab10cfda 100644..100755 --- a/indra/newview/skins/default/xui/it/inspect_object.xml +++ b/indra/newview/skins/default/xui/it/inspect_object.xml diff --git a/indra/newview/skins/default/xui/it/inspect_remote_object.xml b/indra/newview/skins/default/xui/it/inspect_remote_object.xml index b2d96ad757..b2d96ad757 100644..100755 --- a/indra/newview/skins/default/xui/it/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/it/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/it/language_settings.xml b/indra/newview/skins/default/xui/it/language_settings.xml index 5f448fa828..5f448fa828 100644..100755 --- a/indra/newview/skins/default/xui/it/language_settings.xml +++ b/indra/newview/skins/default/xui/it/language_settings.xml diff --git a/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml index 46abd7deed..46abd7deed 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_attachment_other.xml b/indra/newview/skins/default/xui/it/menu_attachment_other.xml index d4d6fd68d0..d4d6fd68d0 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml index 0b841d591f..0b841d591f 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml index b93b695300..b93b695300 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/it/menu_avatar_other.xml b/indra/newview/skins/default/xui/it/menu_avatar_other.xml index c2edc32a49..c2edc32a49 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml index a4dafd7b5f..a4dafd7b5f 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml index 699490c8f1..699490c8f1 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml index 1e3658ef45..1e3658ef45 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml index 1e16ce8ed1..1e16ce8ed1 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml index 10524ba92d..984e4a1611 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> +<toggleable_menu name="Gear COF"> <menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/> - <menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/> -</menu> + <menu label="Nuove parti del corpo" name="COF.Gear.New_Body_Parts"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml new file mode 100644 index 0000000000..46ced93f1d --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="Chiudi la conversazione" name="close_conversation"/> + <menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/> + <menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/> + <menu_item_call label="Vedi profilo" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Offri teleport" name="offer_teleport"/> + <menu_item_call label="Chiamata a voce" name="voice_call"/> + <menu_item_call label="Cronologia chat..." name="chat_history"/> + <menu_item_call label="Aggiungi amico" name="add_friend"/> + <menu_item_call label="Rimuovi amico" name="remove_friend"/> + <menu_item_call label="Rimuovi amici" name="remove_friends"/> + <menu_item_call label="Invita al gruppo..." name="invite_to_group"/> + <menu_item_call label="Zoom avanti" name="zoom_in"/> + <menu_item_call label="Mappa" name="map"/> + <menu_item_call label="Condividi" name="share"/> + <menu_item_call label="Paga" name="pay"/> + <menu_item_check label="Blocca voce" name="block_unblock"/> + <menu_item_check label="Blocca testo" name="MuteText"/> + <menu_item_call label="Profilo del gruppo" name="group_profile"/> + <menu_item_call label="Attiva gruppo" name="activate_group"/> + <menu_item_call label="Lascia il gruppo" name="leave_group"/> + <context_menu label="Opzioni moderatore" name="Moderator Options"> + <menu_item_check label="Consenti chat di testo" name="AllowTextChat"/> + <menu_item_call label="Disattiva audio di questo partecipante" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Riattiva audio di questo partecipante" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Disattiva audio di tutti" name="ModerateVoiceMute"/> + <menu_item_call label="Riattiva audio di tutti" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..5686a902eb --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="IM..." name="IM"/> + <menu_item_call label="Chiamata a voce..." name="Call"/> + <menu_item_call label="Apro la cronologia delle chat..." name="Chat history"/> + <menu_item_call label="Vedi profilo" name="View Profile"/> + <menu_item_call label="Offri Teleport" name="teleport"/> + <menu_item_call label="Aggiungi come amico" name="add_friend"/> + <menu_item_call label="Rimuovi amico" name="remove_friend"/> + <menu_item_call label="Invita al gruppo..." name="Invite"/> + <menu_item_call label="Mappa" name="Map"/> + <menu_item_call label="Condividi" name="Share"/> + <menu_item_call label="Paga" name="Pay"/> + <menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml new file mode 100644 index 0000000000..73b05831ef --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="Ordina in base al nome" name="sort_by_name"/> + <menu_item_check label="Ordina in base alla data" name="sort_by_date"/> + <menu_item_check label="Ordina con gli amici in alto" name="sort_by_friends"/> + <menu_item_call label="Mostra la cronologia delle chat vicine..." name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_edit.xml b/indra/newview/skins/default/xui/it/menu_edit.xml index ffb20a02e9..ffb20a02e9 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_edit.xml +++ b/indra/newview/skins/default/xui/it/menu_edit.xml diff --git a/indra/newview/skins/default/xui/it/menu_favorites.xml b/indra/newview/skins/default/xui/it/menu_favorites.xml index 7813ef44b5..7813ef44b5 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_favorites.xml +++ b/indra/newview/skins/default/xui/it/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/it/menu_gesture_gear.xml b/indra/newview/skins/default/xui/it/menu_gesture_gear.xml index 7cfcc6287e..7cfcc6287e 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_group_plus.xml b/indra/newview/skins/default/xui/it/menu_group_plus.xml index 3b76fb94a9..3b76fb94a9 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/it/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml index 48f6691fd8..48f6691fd8 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/it/menu_im_conversation.xml b/indra/newview/skins/default/xui/it/menu_im_conversation.xml new file mode 100644 index 0000000000..1621d57e12 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="Vedi profilo" name="View Profile"/> + <menu_item_call label="Aggiungi come amico" name="Add Friend"/> + <menu_item_call label="Rimuovi amico" name="remove_friend"/> + <menu_item_call label="Offri teleport" name="offer_teleport"/> + <menu_item_call label="Invita al gruppo..." name="invite_to_group"/> + <menu_item_call label="Cronologia chat..." name="chat_history"/> + <menu_item_call label="Zoom avanti" name="zoom_in"/> + <menu_item_call label="Mappa" name="map"/> + <menu_item_call label="Condividi" name="Share"/> + <menu_item_call label="Paga" name="Pay"/> + <menu_item_check label="Blocca voce" name="Block/Unblock"/> + <menu_item_check label="Blocca testo" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..350fbc5c6f --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="Vista compatta" name="compact_view"/> + <menu_item_check label="Vista espansa" name="expanded_view"/> + <menu_item_check label="Mostra orario" name="IMShowTime"/> + <menu_item_check label="Mostra i nomi nelle conversazioni individuali" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_im_well_button.xml b/indra/newview/skins/default/xui/it/menu_im_well_button.xml deleted file mode 100644 index 9e471b771c..0000000000 --- a/indra/newview/skins/default/xui/it/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Chiudi tutto" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml index f78ed8489f..f78ed8489f 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml index baa4e671b0..baa4e671b0 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml index 2eacbb09ad..2eacbb09ad 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml index 1f10734c4a..1f10734c4a 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml index 4740c9bf67..4740c9bf67 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml index 4f62ccaa9c..4f62ccaa9c 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml index 471640eff5..471640eff5 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml index b31e35771d..b31e35771d 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_inventory.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml index 62da61cd6b..62da61cd6b 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml index 3d64e4da4e..3d64e4da4e 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/it/menu_land.xml b/indra/newview/skins/default/xui/it/menu_land.xml index f510078e14..f510078e14 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_land.xml +++ b/indra/newview/skins/default/xui/it/menu_land.xml diff --git a/indra/newview/skins/default/xui/it/menu_landmark.xml b/indra/newview/skins/default/xui/it/menu_landmark.xml index b3cddab783..b3cddab783 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_landmark.xml +++ b/indra/newview/skins/default/xui/it/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml index 7b060e6565..7b060e6565 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_login.xml +++ b/indra/newview/skins/default/xui/it/menu_login.xml diff --git a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml index aa9e583f8e..aa9e583f8e 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/it/menu_mini_map.xml b/indra/newview/skins/default/xui/it/menu_mini_map.xml index 561b80e046..561b80e046 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/it/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml index 5012e6450f..5012e6450f 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/it/menu_navbar.xml b/indra/newview/skins/default/xui/it/menu_navbar.xml index e42d913a6f..e42d913a6f 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_navbar.xml +++ b/indra/newview/skins/default/xui/it/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/it/menu_nearby_chat.xml b/indra/newview/skins/default/xui/it/menu_nearby_chat.xml index 719a6d3261..719a6d3261 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/it/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml index 8c82e30f0e..8c82e30f0e 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml index 7f41e8937f..7f41e8937f 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_object.xml +++ b/indra/newview/skins/default/xui/it/menu_object.xml diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml index 0f347b1a90..9623775af4 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="Profilo oggetto..." name="Object Profile"/> <menu_item_call label="Blocca..." name="Block"/> + <menu_item_call label="Mostra sulla mappa" name="show_on_map"/> + <menu_item_call label="Teleport sul luogo dell'oggetto" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml index 09fc867d7c..3ac0c5ce69 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="Nuovi capelli" name="New Hair"/> <menu_item_call label="Nuovi occhi" name="New Eyes"/> </menu> + <menu_item_call label="Apri tutte le cartelle" name="expand"/> + <menu_item_call label="Chiudi tutte le cartelle" name="collapse"/> <menu_item_call label="Cambia nome del vestiario" name="rename"/> <menu_item_call label="Elimina vestito" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml index 8166cf20ed..8166cf20ed 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/it/menu_participant_list.xml b/indra/newview/skins/default/xui/it/menu_participant_list.xml index 1b057c4077..1b057c4077 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/it/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/it/menu_participant_view.xml b/indra/newview/skins/default/xui/it/menu_participant_view.xml new file mode 100644 index 0000000000..c87cda57bf --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="Ordina le conversazioni in base al tipo" name="sort_sessions_by_type"/> + <menu_item_check label="Ordina le conversazioni in base al nome" name="sort_sessions_by_name"/> + <menu_item_check label="Ordina le conversazioni in base alle attività più recenti" name="sort_sessions_by_recent"/> + <menu_item_check label="Ordina i partecipanti in base al nome" name="sort_participants_by_name"/> + <menu_item_check label="Ordina i partecipanti in base alle attività più recenti" name="sort_participants_by_recent"/> + <menu_item_call label="Preferenze chat..." name="chat_preferences"/> + <menu_item_call label="Preferenze privacy..." name="privacy_preferences"/> + <menu_item_check label="Registro conversazioni..." name="Conversation"/> + <menu_item_check label="Traduci chat vicina" name="Translate_chat"/> + <menu_item_check label="Impostazioni traduzione..." name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..e9955923b2 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="Sblocca" name="unblock"/> + <menu_item_call label="Profilo..." name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..cbcf084b86 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="Blocca residente per nome..." name="block_resident_by_name"/> + <menu_item_call label="Blocca oggetto per nome" name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml new file mode 100644 index 0000000000..fc80c73ae3 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="Ordina in base al nome" name="sort_by_name"/> + <menu_item_check label="Ordina in base al tipo" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml new file mode 100644 index 0000000000..972e359cfe --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ordina in base al nome" name="sort_name"/> + <menu_item_check label="Ordina in base allo stato" name="sort_status"/> + <menu_item_check label="Mostra le icone delle persone" name="view_icons"/> + <menu_item_check label="Mostra le autorizzazioni concesse" name="view_permissions"/> + <menu_item_check label="Mostra il registro conversazioni..." name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml index 3a799f44eb..3a799f44eb 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml index 30a97a1c72..8ca7537ee0 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/it/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="Mostra informazioni" name="View Info"/> <menu_item_call label="Chat" name="Chat"/> - <menu_item_call label="Chiama" name="Call"/> + <menu_item_call label="Chiamata a voce" name="Call"/> <menu_item_call label="Attiva" name="Activate"/> <menu_item_call label="Chiudi" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml new file mode 100644 index 0000000000..56b9abbd3a --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Mostra le icone di gruppo" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml index d31ddaf1aa..d31ddaf1aa 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml index a974bd181d..1c09b1cfe2 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="Vedi profilo" name="View Profile"/> - <menu_item_call label="Aggiungi amico" name="Add Friend"/> - <menu_item_call label="Rimuovi amico" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="Chiama" name="Call"/> - <menu_item_call label="Mappa" name="Map"/> - <menu_item_call label="Condividi" name="Share"/> - <menu_item_call label="Paga" name="Pay"/> - <menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/> - <menu_item_call label="Offri Teleport" name="teleport"/> + <menu_item_call label="Vedi profilo" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Offri Teleport" name="offer_teleport"/> + <menu_item_call label="Chiamata a voce" name="voice_call"/> + <menu_item_call label="Mostra la cronologia delle chat..." name="chat_history"/> + <menu_item_call label="Aggiungi come amico" name="add_friend"/> + <menu_item_call label="Rimuovi amico" name="remove_friend"/> + <menu_item_call label="Invita al gruppo..." name="invite_to_group"/> + <menu_item_call label="Zoom avanti" name="zoom_in"/> + <menu_item_call label="Mappa" name="map"/> + <menu_item_call label="Condividi" name="share"/> + <menu_item_call label="Paga" name="pay"/> + <menu_item_check label="Blocca/Sblocca" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml index e0b9ceb63d..b9ce70167f 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="Aggiungi amici" name="Add Friends"/> - <menu_item_call label="Rimuovi amici" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="Chiama" name="Call"/> - <menu_item_call label="Condividi" name="Share"/> - <menu_item_call label="Paga" name="Pay"/> - <menu_item_call label="Offri Teleport" name="teleport"/> + <menu_item_call label="Aggiungi amici" name="add_friends"/> + <menu_item_call label="Rimuovi amici" name="remove_friends"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Chiama" name="call"/> + <menu_item_call label="Condividi" name="share"/> + <menu_item_call label="Paga" name="pay"/> + <menu_item_call label="Offri Teleport" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml new file mode 100644 index 0000000000..223d88fee1 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/> + <menu_item_check label="Ordina in base al nome" name="sort_name"/> + <menu_item_check label="Ordina in base alla distanza" name="sort_distance"/> + <menu_item_check label="Mostra le icone delle persone" name="view_icons"/> + <menu_item_check label="Mostra mappa" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml index 2b5c235706..2b5c235706 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml new file mode 100644 index 0000000000..fc6213bd08 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Mostra prima i più recenti" name="sort_most"/> + <menu_item_check label="Ordina in base al nome" name="sort_name"/> + <menu_item_check label="Mostra le icone delle persone" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml index 7fccd1621a..7fccd1621a 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/it/menu_picks.xml b/indra/newview/skins/default/xui/it/menu_picks.xml index 000d219ed0..000d219ed0 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_picks.xml +++ b/indra/newview/skins/default/xui/it/menu_picks.xml diff --git a/indra/newview/skins/default/xui/it/menu_picks_plus.xml b/indra/newview/skins/default/xui/it/menu_picks_plus.xml index 7fbd5abd57..7fbd5abd57 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/it/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/it/menu_place.xml b/indra/newview/skins/default/xui/it/menu_place.xml index 5381a4effa..5381a4effa 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_place.xml +++ b/indra/newview/skins/default/xui/it/menu_place.xml diff --git a/indra/newview/skins/default/xui/it/menu_place_add_button.xml b/indra/newview/skins/default/xui/it/menu_place_add_button.xml index 0e783c0000..0e783c0000 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/it/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml index 23757d47e0..23757d47e0 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml index a458b1a768..a458b1a768 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/it/menu_profile_overflow.xml b/indra/newview/skins/default/xui/it/menu_profile_overflow.xml index 56b695c597..56b695c597 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/it/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/it/menu_save_outfit.xml b/indra/newview/skins/default/xui/it/menu_save_outfit.xml index 4882a8ac64..4882a8ac64 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/it/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/it/menu_script_chiclet.xml b/indra/newview/skins/default/xui/it/menu_script_chiclet.xml index 604f754ba8..604f754ba8 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/it/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/it/menu_slurl.xml b/indra/newview/skins/default/xui/it/menu_slurl.xml index be83133efc..be83133efc 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_slurl.xml +++ b/indra/newview/skins/default/xui/it/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml index 409a62c31b..409a62c31b 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml index 81053fbd65..81053fbd65 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml index c221f141a6..c221f141a6 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/it/menu_text_editor.xml b/indra/newview/skins/default/xui/it/menu_text_editor.xml index 5b61da914e..5b61da914e 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/it/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/it/menu_toolbars.xml b/indra/newview/skins/default/xui/it/menu_toolbars.xml index 604ca763d1..604ca763d1 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/it/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/it/menu_topinfobar.xml b/indra/newview/skins/default/xui/it/menu_topinfobar.xml index 0beb9314de..0beb9314de 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/it/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml index 37755d5749..abfbab35a3 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Mostra profilo residente" name="show_agent"/> + <menu_item_call label="Vedi profilo" name="show_agent"/> + <menu_item_call label="Manda IM..." name="send_im"/> + <menu_item_call label="Aggiungi come amico..." name="add_friend"/> <menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/> <menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_url_group.xml b/indra/newview/skins/default/xui/it/menu_url_group.xml index d9a792ebdf..d9a792ebdf 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_group.xml +++ b/indra/newview/skins/default/xui/it/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_http.xml b/indra/newview/skins/default/xui/it/menu_url_http.xml index e0153d9169..e0153d9169 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_http.xml +++ b/indra/newview/skins/default/xui/it/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_inventory.xml b/indra/newview/skins/default/xui/it/menu_url_inventory.xml index a45a6bbc10..a45a6bbc10 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/it/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_map.xml b/indra/newview/skins/default/xui/it/menu_url_map.xml index cb7935b3ed..cb7935b3ed 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_map.xml +++ b/indra/newview/skins/default/xui/it/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml index 763e65f17c..8456d14b63 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Mostra informazioni oggetto" name="show_object"/> + <menu_item_call label="Profilo oggetto..." name="show_object"/> <menu_item_call label="Mostra sulla mappa" name="show_on_map"/> <menu_item_call label="Teleport sul luogo dell'oggetto" name="teleport_to_object"/> <menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/it/menu_url_parcel.xml b/indra/newview/skins/default/xui/it/menu_url_parcel.xml index a032c33585..a032c33585 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/it/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_slapp.xml b/indra/newview/skins/default/xui/it/menu_url_slapp.xml index b368aa9141..b368aa9141 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/it/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_slurl.xml b/indra/newview/skins/default/xui/it/menu_url_slurl.xml index 355c7dbed9..355c7dbed9 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/it/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/it/menu_url_teleport.xml b/indra/newview/skins/default/xui/it/menu_url_teleport.xml index c129e61f25..c129e61f25 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/it/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 547c5a9b73..2b7bc71df7 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/> <menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/> </menu> - <menu label="Stato" name="Status"> - <menu_item_call label="Assente" name="Set Away"/> - <menu_item_call label="Non disponibile" name="Set Busy"/> - </menu> + <menu label="Stato" name="Status"/> <menu_item_call label="Acquista L$..." name="Buy and Sell L$"/> <menu_item_call label="Casella venditore in uscita..." name="MerchantOutbox"/> <menu_item_call label="Dashboard dell'account..." name="Manage My Account"> @@ -32,14 +29,18 @@ <menu_item_call label="Esci da [APP_NAME]" name="Quit"/> </menu> <menu label="Comunica" name="Communicate"> - <menu_item_check label="Chat..." name="Nearby Chat"/> + <menu_item_check label="Conversazioni..." name="Conversations"/> + <menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/> <menu_item_check label="Parla" name="Speak"/> - <menu_item_check label="Impostazioni voce..." name="Nearby Voice"/> - <menu_item_check label="Manipolazione voce..." name="ShowVoice"/> + <menu label="Manipolazione voce" name="VoiceMorphing"> + <menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/> + <menu_item_check label="Anteprima..." name="Preview"/> + <menu_item_call label="Abbonati..." name="Subscribe"/> + </menu> <menu_item_check label="Gesture..." name="Gestures"/> - <menu_item_call label="Amici" name="My Friends"/> - <menu_item_call label="Gruppi" name="My Groups"/> - <menu_item_call label="Persone vicine" name="Active Speakers"/> + <menu_item_check label="Amici" name="My Friends"/> + <menu_item_check label="Gruppi" name="My Groups"/> + <menu_item_check label="Persone vicine" name="Active Speakers"/> <menu_item_call label="Blocca lista" name="Block List"/> </menu> <menu label="Mondo" name="World"> @@ -115,7 +116,6 @@ <menu_item_call label="Acquista" name="Menu Object Buy"/> <menu_item_call label="Prendi" name="Menu Object Take"/> <menu_item_call label="Prendi copia" name="Take Copy"/> - <menu_item_call label="Salva nell'inventario" name="Save Object Back to My Inventory"/> <menu_item_call label="Salva nei contenuti oggetto" name="Save Object Back to Object Contents"/> <menu_item_call label="Restituisci oggetto" name="Return Object back to Owner"/> </menu> @@ -130,6 +130,7 @@ <menu_item_call label="Set collegati..." name="pathfinding_linksets_menu_item"/> <menu_item_call label="Personaggi..." name="pathfinding_characters_menu_item"/> <menu_item_call label="Visualizza / test..." name="pathfinding_console_menu_item"/> + <menu_item_call label="Rebake regione" name="pathfinding_rebake_navmesh_item"/> </menu> <menu label="Opzioni" name="Options"> <menu_item_check label="Mostra autorizzazioni avanzate" name="DebugPermissions"/> @@ -159,6 +160,13 @@ <menu label="Aiuto" name="Help"> <menu_item_call label="Istruzioni..." name="How To"/> <menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/> + <menu_item_call label="Guida dell'utente" name="User’s guide"/> + <menu_item_call label="Base di conoscenza" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Forum della comunità" name="Community Forums"/> + <menu_item_call label="Portale assistenza" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE] Notizie" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/> <menu_item_call label="Segnala abuso" name="Report Abuse"/> <menu_item_call label="Segnala bug" name="Report Bug"/> <menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/> @@ -286,7 +294,7 @@ <menu label="Rendering" name="Rendering"> <menu_item_check label="Assi" name="Axes"/> <menu_item_check label="Wireframe" name="Wireframe"/> - <menu_item_check label="Luci e ombre" name="Lighting and Shadows"/> + <menu_item_check label="Luci e ombre" name="Advanced Lighting Model"/> <menu_item_check label="Ombra dal sole, dalla luna e dai proiettori" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO e ombre fluide" name="SSAO and Shadow Smoothing"/> <menu_item_check label="Maschera alfa automatica (differita)" name="Automatic Alpha Masks (deferred)"/> @@ -336,9 +344,14 @@ <menu_item_call label="Alterna la geometria dei personaggi" name="Toggle Character Geometry"/> <menu_item_check label="Consenti selezione avatar" name="Allow Select Avatar"/> </menu> + <menu label="Velocità animazione" name="Animation Speed"> + <menu_item_call label="Accelera tutte le animazioni del 10%" name="All Animations 10 Faster"/> + <menu_item_call label="Rallenta tutte le animazioni del 10%" name="All Animations 10 Slower"/> + <menu_item_call label="Ripristina la velocità di tutte le animazioni" name="Reset All Animation Speed"/> + <menu_item_check label="Animazioni lente" name="Slow Motion Animations"/> + </menu> <menu_item_call label="Forza i parametri sui valori predefiniti" name="Force Params to Default"/> <menu_item_check label="Informazioni sull'animazione" name="Animation Info"/> - <menu_item_check label="Animazioni lente" name="Slow Motion Animations"/> <menu_item_check label="Disabilita livello di dettaglio" name="Disable LOD"/> <menu_item_check label="Mostra schemi collisione" name="Show Collision Skeleton"/> <menu_item_check label="Mostra bersaglio" name="Display Agent Target"/> diff --git a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml index c9a02d8a86..c9a02d8a86 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml index de25f88aca..de25f88aca 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml index 4a5366091f..4a5366091f 100644..100755 --- a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/it/mime_types.xml b/indra/newview/skins/default/xui/it/mime_types.xml index 5eda7a5752..5eda7a5752 100644..100755 --- a/indra/newview/skins/default/xui/it/mime_types.xml +++ b/indra/newview/skins/default/xui/it/mime_types.xml diff --git a/indra/newview/skins/default/xui/it/mime_types_linux.xml b/indra/newview/skins/default/xui/it/mime_types_linux.xml index 3bc30b507a..3bc30b507a 100644..100755 --- a/indra/newview/skins/default/xui/it/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/it/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/it/mime_types_mac.xml b/indra/newview/skins/default/xui/it/mime_types_mac.xml index 3bc30b507a..3bc30b507a 100644..100755 --- a/indra/newview/skins/default/xui/it/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/it/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index d5fdde4e7d..8adbebb62a 100644..100755 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -513,6 +513,24 @@ Visitare [_URL] per ulteriori informazioni? </url> <usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/> </notification> + <notification name="AMDOldDriver"> + È probabile che ci sia un driver aggiornato per il processore grafico. L'aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa. + + Visitare [_URL] per cercare un aggiornamento del driver? + <url name="url"> + http://support.amd.com/it/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/> + </notification> + <notification name="NVIDIAOldDriver"> + È probabile che ci sia un driver aggiornato per il processore grafico. L'aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa. + + Visitare [_URL] per cercare un aggiornamento del driver? + <url name="url"> + http://www.nvidia.it/Download/index.aspx?lang=it + </url> + <usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/> + </notification> <notification name="UnknownGPU"> Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce. Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME]. Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche. @@ -1548,10 +1566,13 @@ Vuoi cancellare quell'elemento? Impossibile offrire l'amicizia in questo momento. Riprova fra poco. <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="BusyModeSet"> - È stata impostata la modalità Non disponibile. -La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non disponibile. Tutte le offerte di teleport verranno rifiutate. Tutte le offerte di Inventario andranno nel Cestino. - <usetemplate ignoretext="Cambio il mio stato sulla modalità Non disponibile" name="okignore" yestext="OK"/> + <notification name="DoNotDisturbModeSet"> + Non disturbare è attivo. Non riceverai la notifica delle comunicazioni in arrivo. + +- Gli altri residenti riceveranno la tua risposta Non disturbare (impostata in Preferenze > Generali). +- Le offerte di teleport verranno rifiutate. +- Le chiamate voce verranno rifiutate. + <usetemplate ignoretext="Io cambio il mio stato alla modalità Non disturbare." name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire a questo, oppure declina l'offerta. @@ -2039,6 +2060,10 @@ Trasferisci gli elementi nell'inventario? Vai al [http://secondlife.com/account/ Dashboard] per vedere la cronologia del tuo account? <usetemplate ignoretext="Lancia il browser per vedere la cronologia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + Quando aggiungi una persona a una conversazione esistente, viene creata una nuova conversazione. Tutti i partecipanti riceveranno notifiche per la nuova conversazione. + <usetemplate ignoretext="Conferma l'aggiunta dei partecipanti alla chat" name="okcancelignore" notext="Annulla" yestext="Ok"/> + </notification> <notification name="ConfirmQuit"> Confermi di voler uscire? <usetemplate ignoretext="Conferma prima di uscire" name="okcancelignore" notext="Non uscire" yestext="Esci"/> @@ -2113,14 +2138,14 @@ Vuoi sostituirlo con l'oggetto selezionato? <button ignore="Never Replace" name="No" text="Annulla"/> </form> </notification> - <notification label="Avviso di 'Occupato'" name="BusyModePay"> - Sei in modalità 'Occupato', ciò significa che non riceverai ciò che attendi per questo pagamento. + <notification label="Avviso modalità Non disturbare" name="DoNotDisturbModePay"> + Hai attivato la modalità Non disturbare. Non riceverai alcun oggetto offerto in cambio di questo pagamento. -Desideri abbandonare la modalità 'Occupato' prima di completare questa transazione? +Vuoi disattivare la modalità Non disturbare prima di completare questa transazione? <form name="form"> - <ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono in modalià Non disponibile"/> - <button ignore="Always leave Busy Mode" name="Yes" text="OK"/> - <button ignore="Never leave Busy Mode" name="No" text="Abbandona"/> + <ignore name="ignore" text="Sto per pagare una persona o un oggetto mentre sono in modalità Non disturbare"/> + <button ignore="Lascia sempre la modalità Non disturbare" name="Yes" text="OK"/> + <button ignore="Non lasciare mai la modalità Non disturbare" name="No" text="Annulla"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2255,11 +2280,8 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica <notification name="GroupNotice"> Oggetto: [SUBJECT], Messaggio: [MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> è online - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> è offline + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> è [STATUS] </notification> <notification name="AddSelfFriend"> Anche se sei molto simpatico, non puoi aggiungere te stesso all'elenco degli amici. @@ -2487,13 +2509,6 @@ Qui non puoi volare. <notification name="DynamicPathfindingDisabled"> Il pathfinding dinamico non è attivato in questa regione. Gli oggetti scriptati che usano chiamate LSL di pathfinding potrebbero non funzionare come previsto in questa regione. </notification> - <notification name="PathfindingRebakeNavmesh"> - Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento. Per fare in modo che gli oggetti in movimento si comportino correttamente, fai clic sul pulsante "Rebake regione". Per maggiori informazioni, seleziona la guida - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="Guida" ignoretext="Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento." name="okhelpignore" yestext="OK"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> Si è verificato un errore. Potrebbe trattarsi di un problema di rete o del server, oppure potresti non avere le autorizzazioni necessarie per la costruzione. A volte il problema viene risolto uscendo ed eseguendo nuovamente l'accesso. <usetemplate name="okbutton" yestext="OK"/> @@ -2754,9 +2769,9 @@ OK? </form> </notification> <notification name="ScriptQuestionCaution"> - Attenzione: L'oggetto '<nolink>[OBJECTNAME]</nolink>' ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l'accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l'account, per un periodo illimitato e senza ulteriori avvisi. + Avviso: L'oggetto '<nolink>[OBJECTNAME]</nolink>' ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l'accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l'account, per un periodo illimitato e senza ulteriori avvisi. -Raramente questo tipo di richiesta è legittima. Non consentire l'accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account. +Non consentire l'accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account. <form name="form"> <button name="Grant" text="Consenti accesso totale"/> <button name="Deny" text="Nega"/> @@ -3338,4 +3353,633 @@ Tentativo annullato. Stai per cancellare [NUM_ITEMS] elementi. Vuoi continuare? <usetemplate ignoretext="Sei sicuro di volere eliminare più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] ti ha congelato. Non ti puoi muovere o interagire con il mondo. + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] ti ha congelato per [AV_FREEZE_TIME] secondi. Non ti puoi muovere o interagire con il mondo. + </notification> + <notification name="YouFrozeAvatar"> + Avatar congelato. + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] ti ha scongelato. + </notification> + <notification name="AvatarUnFrozen"> + Avatar scongelato. + </notification> + <notification name="AvatarFreezeFailure"> + La congelazione non ha avuto successo perché non hai le autorizzazioni dell'amministratore per quel lotto. + </notification> + <notification name="AvatarFreezeThaw"> + Non sei più congelato, puoi continuare. + </notification> + <notification name="AvatarCantFreeze"> + Non puoi congelare quell'utente. + </notification> + <notification name="NowOwnObject"> + Sei ora il proprietario dell'oggetto [OBJECT_NAME] + </notification> + <notification name="CantRezOnLand"> + Non puoi rezzare l'oggetto a [OBJECT_POS] perché non è consentito dal proprietario del terreno. Usa lo strumento terreno per visualizzare a chi appartiene il terreno. + </notification> + <notification name="RezFailTooManyRequests"> + Oggetto non razzato perché ci sono troppe richieste. + </notification> + <notification name="SitFailCantMove"> + Non puoi sederti perché al momento non puoi muoverti. + </notification> + <notification name="SitFailNotAllowedOnLand"> + Non puoi sederti perché non ti è consentito entrare in quel terreno. + </notification> + <notification name="SitFailNotSameRegion"> + Proba ad avvicinarti. Non puoi sederti su un oggetto perché +non è nella stessa regione in cui ti trovi. + </notification> + <notification name="NoNewObjectRegionFull"> + Impossibile creare il nuovo oggetto. La regione è piena. + </notification> + <notification name="FailedToPlaceObject"> + Il posizionamento dell'oggetto nella posizione specificata non è riuscito. Riprova. + </notification> + <notification name="NoOwnNoGardening"> + Non puoi creare alberi ed erba su terreni che non sono di tua proprietà. + </notification> + <notification name="NoCopyPermsNoObject"> + Copia non riuscita perché non hai l'autorizzazione necessaria per copiare l'oggetto '[OBJ_NAME]'. + </notification> + <notification name="NoTransPermsNoObject"> + La copia non è riuscita perché '[OBJ_NAME]' non può essere trasferito a te. + </notification> + <notification name="AddToNavMeshNoCopy"> + La copia non è riuscita perché '[OBJ_NAME]' contribuisce al navmesh. + </notification> + <notification name="DupeWithNoRootsSelected"> + Duplicato senza oggetto principale selezionato. + </notification> + <notification name="CantDupeCuzRegionIsFull"> + Impossibile duplicare gli oggetti perché la regione è piena. + </notification> + <notification name="CantDupeCuzParcelNotFound"> + Impossibile duplicare gli oggetti - Impossibile trovare i lotti in cui si trovano. + </notification> + <notification name="CantCreateCuzParcelFull"> + Impossibile creare l'oggetto perché +il lotto è pieno. + </notification> + <notification name="RezAttemptFailed"> + Tentativo di rezzare un oggetto non riuscito. + </notification> + <notification name="ToxicInvRezAttemptFailed"> + Impossibile creare un oggetto che ha causato problemi in questa regione. + </notification> + <notification name="InvItemIsBlacklisted"> + L'oggetto dell'inventario è stato aggiunto alla blacklist. + </notification> + <notification name="NoCanRezObjects"> + Al momento non ti è consentito creare oggetti. + </notification> + <notification name="LandSearchBlocked"> + Ricerca terreno bloccata. +Hai eseguito troppe ricerche terreno in un breve tempo. +Riprova tra un minuto. + </notification> + <notification name="NotEnoughResourcesToAttach"> + Risorse di script non sufficienti per collegare l'oggetto. + </notification> + <notification name="YouDiedAndGotTPHome"> + Sei deceduto e sei stato teleportato alla tua posizione iniziale + </notification> + <notification name="EjectComingSoon"> + Non sei più benvenuto qui e hai [EJECT_TIME] secondi per andartene. + </notification> + <notification name="NoEnterServerFull"> + Non puoi entrare in questa regione perché +il server è pieno. + </notification> + <notification name="SaveBackToInvDisabled"> + Opzione Salva nell'inventario disattivata + </notification> + <notification name="NoExistNoSaveToContents"> + Impossibile salvare '[OBJ_NAME]' nei contenuti dell'oggetto perché l'oggetto da cui è stato razzato non esiste più. + </notification> + <notification name="NoModNoSaveToContents"> + Impossibile salvare '[OBJ_NAME]' nei contenuti dell'oggetto perché non hai l'autorizzazione necessaria per modificare l'oggetto '[DEST_NAME]'. + </notification> + <notification name="NoSaveBackToInvDisabled"> + Impossibile riportare '[OBJ_NAME]' nell'inventario -- questa operazione è stata disattivata. + </notification> + <notification name="NoCopyNoSelCopy"> + Non puoi copiare l'elemento selezionato perché non hai l'autorizzazione necessaria per copiare l'oggetto '[OBJ_NAME]'. + </notification> + <notification name="NoTransNoSelCopy"> + Non puoi copiare la selezione perché l'oggetto '[OBJ_NAME]' non può essere trasferito. + </notification> + <notification name="NoTransNoCopy"> + Non puoi copiare la selezione perché l'oggetto '[OBJ_NAME]' non può essere trasferito. + </notification> + <notification name="NoPermsNoRemoval"> + La rimozione dell'oggetto '[OBJ_NAME]' dal simulatore non è consentita dal sistema delle autorizzazioni. + </notification> + <notification name="NoModNoSaveSelection"> + Non puoi salvare l'elemento selezionato perché non hai l'autorizzazione necessaria per modificare l'oggetto '[OBJ_NAME]'. + </notification> + <notification name="NoCopyNoSaveSelection"> + Non puoi salvare la selezione perché l'oggetto '[OBJ_NAME]' non può essere copiato. + </notification> + <notification name="NoModNoTaking"> + Non puoi prendere l'elemento selezionato perché non hai l'autorizzazione necessaria per modificare l'oggetto '[OBJ_NAME]'. + </notification> + <notification name="RezDestInternalError"> + Errore interno: Tipo di destinazione sconosciuto. + </notification> + <notification name="DeleteFailObjNotFound"> + Cancellazione non riuscita perché l'oggetto non è stato trovato. + </notification> + <notification name="SorryCantEjectUser"> + Non puoi espellere quell'utente. + </notification> + <notification name="RegionSezNotAHome"> + Questa regione non ti consente di impostare qui la tua posizione iniziale. + </notification> + <notification name="HomeLocationLimits"> + Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma. + </notification> + <notification name="HomePositionSet"> + Posizione di base impostata. + </notification> + <notification name="AvatarEjected"> + Avatar espulso. + </notification> + <notification name="AvatarEjectFailed"> + L'espulsione non ha avuto successo perché non hai l'autorizzazione dell'amministratore del lotto. + </notification> + <notification name="CantMoveObjectParcelFull"> + Impossibile muovere l'oggetto '[OBJECT_NAME]' a +[OBJ_POSITION] nella regione [REGION_NAME] perché il lotto è pieno. + </notification> + <notification name="CantMoveObjectParcelPerms"> + Impossibile muovere l'oggetto '[OBJECT_NAME]' a +[OBJ_POSITION] nella regione [REGION_NAME] perché i tuoi oggetti non sono ammessi su questo lotto. + </notification> + <notification name="CantMoveObjectParcelResources"> + Impossibile muovere l'oggetto '[OBJECT_NAME]' a +[OBJ_POSITION] nella regione [REGION_NAME] perché non ci sono risorse sufficienti per l'oggetto su questo lotto. + </notification> + <notification name="CantMoveObjectRegionVersion"> + Impossibile muovere l'oggetto '[OBJECT_NAME]' a +[OBJ_POSITION] nella regione [REGION_NAME] perché nell'altra regione è in esecuzione una versione precedente che non consente la ricezione di questo oggetto attraverso i confini tra regioni. + </notification> + <notification name="CantMoveObjectNavMesh"> + Impossibile muovere l'oggetto '[OBJECT_NAME]' a +[OBJ_POSITION] nella regione [REGION_NAME] perché non puoi modificare il navmesh attraverso il confine tra regioni. + </notification> + <notification name="CantMoveObjectWTF"> + Impossibile muovere l'oggetto '[OBJECT_NAME]' a +[OBJ_POSITION] nella regione [REGION_NAME] per un motivo sconosciuto. ([FAILURE_TYPE]) + </notification> + <notification name="NoPermModifyObject"> + Non hai l'autorizzazione necessaria per modificare questa immagine + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + Non è possibile attivare la fisica per un oggetto che contribuisce al navmesh. + </notification> + <notification name="CantEnablePhysKeyframedObj"> + Impossibile attivare la fisica per oggetti keyframe. + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + Impossibile attivare la fisica per l'oggetto -- risorse di terreno insufficienti. + </notification> + <notification name="CantEnablePhysCostTooGreat"> + Impossibile attivare la fisica per un oggetto con un costo delle risorse della fisica maggiore di [MAX_OBJECTS] + </notification> + <notification name="PhantomWithConcavePiece"> + Questo oggetto non può avere un pezzo concavo perché è un oggetto fantasma e contribuisce al navmesh. + </notification> + <notification name="UnableAddItem"> + Aggiunta elemento non riuscita + </notification> + <notification name="UnableEditItem"> + Impossibile modificare questo elemento. + </notification> + <notification name="NoPermToEdit"> + Non sei autorizzato a modificare questo elemento. + </notification> + <notification name="NoPermToCopyInventory"> + Non ti è permesso copiare quell'inventario. + </notification> + <notification name="CantSaveItemDoesntExist"> + Impossibile salvare i contenuti dell'oggetto: L'elemento non esiste più. + </notification> + <notification name="CantSaveItemAlreadyExists"> + Impossibile salvare i contenuti dell'oggetto: Nell'inventario esiste già un elemento con quel nome. + </notification> + <notification name="CantSaveModifyAttachment"> + Impossibile salvare i contenuti dell'oggetto: Verrebbero modificate le autorizzazioni per il collegamento. + </notification> + <notification name="TooManyScripts"> + Troppi script. + </notification> + <notification name="UnableAddScript"> + Aggiunta script non riuscita. + </notification> + <notification name="AssetServerTimeoutObjReturn"> + Il server degli asset non ha inviato una risposta entro il tempo massimo. Oggetto restituito al sim. + </notification> + <notification name="RegionDisablePhysicsShapes"> + In questa regione non sono attivate le forme per la fisica. + </notification> + <notification name="NoModNavmeshAcrossRegions"> + Non puoi modificare il navmesh attraverso il confine tra le regioni. + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + Impossibile impostare le proprietà della fisica per quel tipo di oggetto. + </notification> + <notification name="NoSetRootPrimWithNoShape"> + impossibile impostare un prim principale senza forma. + </notification> + <notification name="NoRegionSupportPhysMats"> + In questa regione non sono attivati i materiali per la fisica. + </notification> + <notification name="OnlyRootPrimPhysMats"> + I materiali per la fisica possono essere modificati solo i prim principali. + </notification> + <notification name="NoSupportCharacterPhysMats"> + L'impostazione dei materiali per la fisica nei caratteri non è ancora supportata. + </notification> + <notification name="InvalidPhysMatProperty"> + Almeno una delle proprietà dei materiali per la fisica non è valida. + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + Non puoi alterare il tipo di punto di un oggetto con reticolo + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + Non puoi alterare la forma di un oggetto con reticolo + </notification> + <notification name="FullRegionCantEnter"> + Non puoi entrare in questa regione perché è piena. + </notification> + <notification name="LinkFailedOwnersDiffer"> + Collegamento non riuscito -- i proprietari non corrispondono + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + Collegamento non riuscito -- non puoi modificare il navmesh attraverso il confine tra le regioni. + </notification> + <notification name="LinkFailedNoPermToEdit"> + Collegamento non riuscito perché non hai le autorizzazioni necessarie per la modifica. + </notification> + <notification name="LinkFailedTooManyPrims"> + Collegamento non riuscito -- troppe primitive. + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + Collegamento non riuscito -- impossibile collegare elementi senza copia ed elementi senza trasferimento + </notification> + <notification name="LinkFailedNothingLinkable"> + Collegamento non riuscito -- niente di collegabile. + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + Collegamento non riuscito -- troppi personaggi con pathfinding + </notification> + <notification name="LinkFailedInsufficientLand"> + Collegamento non riuscito -- risorse terreno non sufficienti + </notification> + <notification name="LinkFailedTooMuchPhysics"> + L'oggetto usa troppe risorse per la fisica -- le sue dinamiche sono state disattivate. + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + Sei stato teleportato nella posizione iniziale dall'oggetto '[OBJECT_NAME]' del lotto '[PARCEL_NAME]' + </notification> + <notification name="TeleportedHomeByObject"> + Sei stato teleportato nella tua posizione iniziale dall'oggetto '[OBJECT_NAME]' + </notification> + <notification name="TeleportedByAttachment"> + Sei stato teletrasportato da un elemento collegato a [ITEM_ID] + </notification> + <notification name="TeleportedByObjectOnParcel"> + Sei stato teleportato dall'oggetto '[OBJECT_NAME]' sul lotto '[PARCEL_NAME]' + </notification> + <notification name="TeleportedByObjectOwnedBy"> + Sei stato teleportato dall'oggetto '[OBJECT_NAME]' di proprietà di [OWNER_ID] + </notification> + <notification name="TeleportedByObjectUnknownUser"> + Sei stato teleportato dall'oggetto '[OBJECT_NAME]' di proprietà di un utente sconosciuto. + </notification> + <notification name="CantCreateObjectRegionFull"> + Impossibile creare l'oggetto richiesto. La regione è piena. + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + Non puoi collegare più oggetti a un singolo luogo. + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + Non puoi creare oggetti multipli in questa posizione. + </notification> + <notification name="UnableToCreateObjTimeOut"> + Impossibile creare l'oggetto richiesto. L'oggetto non è presente nel database. + </notification> + <notification name="UnableToCreateObjUnknown"> + Impossibile creare l'oggetto richiesto. Tempo scaduto per la richiesta. Riprova. + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + Impossibile creare l'oggetto richiesto. Riprova. + </notification> + <notification name="RezFailureTookTooLong"> + Rezzing non riuscito. Il caricamento dell'oggetto richiesto è durato troppo a lungo. + </notification> + <notification name="FailedToPlaceObjAtLoc"> + Il posizionamento dell'oggetto nella posizione specificata non è riuscito. Riprova. + </notification> + <notification name="CantCreatePlantsOnLand"> + Non puoi creare piante su questo terreno. + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + Impossibile ripristinare l'oggetto. Nessuna posizione trovata nel mondo virtuale. + </notification> + <notification name="CantRezObjectInvalidMeshData"> + Impossibile rezzare l'oggetto perché i dati del reticolo non sono validi. + </notification> + <notification name="CantRezObjectTooManyScripts"> + Impossibile rezzare l'oggetto perché ci sono già troppi script in questa regione. + </notification> + <notification name="CantCreateObjectNoAccess"> + Le tue autorizzazioni di accesso non ti permettono di creare oggetti in quella posizione. + </notification> + <notification name="CantCreateObject"> + Al momento non ti è consentito creare oggetti. + </notification> + <notification name="InvalidObjectParams"> + Parametri oggetto non validi + </notification> + <notification name="CantDuplicateObjectNoAcess"> + Le tue autorizzazioni di accesso non ti permettono di duplicare oggetti in questa posizione. + </notification> + <notification name="CantChangeShape"> + Non ti è consentito modificare questa forma. + </notification> + <notification name="NoAccessToClaimObjects"> + Le tue autorizzazioni di accesso non ti permettono di richiedere oggetti in questa posizione. + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + Assegnazione non riuscita perché non hai l'autorizzazione necessaria per assegnare oggetti per il tuo gruppo. + </notification> + <notification name="NoPrivsToBuyObject"> + Le tue autorizzazioni di accesso non ti permettono di acquistare oggetti in questa posizione. + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + Impossibile collegare l'oggetto perché un avatar è seduto sopra. + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + Alberi ed erba non possono essere indossati come collegati. + </notification> + <notification name="CantAttachGroupOwnedObjs"> + Impossibile collegare oggetti di proprietà di un gruppo. + </notification> + <notification name="CantAttachObjectsNotOwned"> + Non puoi collegare oggetti che non sono di tua proprietà. + </notification> + <notification name="CantAttachNavmeshObjects"> + Impossibile collegare oggetti che contribuiscono a navmesh. + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + L'oggetto non può essere collegato perché non sei autorizzato a muoverlo. + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + Risorse di script non sufficienti per collegare l'oggetto. + </notification> + <notification name="CantDropItemTrialUser"> + Non puoi lasciare oggetti qui, prova la zona Prova gratuita. + </notification> + <notification name="CantDropMeshAttachment"> + Non puoi lasciare elementi collegati con reticolo. Separa nell'inventario e quindi rezza nel mondo virtuale. + </notification> + <notification name="CantDropAttachmentNoPermission"> + Impossibile rimuovere l'elemento collegato: non hai l'autorizzazione necessaria per rimuoverlo qui. + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + Impossibile rimuovere l'elemento collegato: risorse terreno disponibili non sufficienti. + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + Impossibile rimuovere gli elementi collegati: risorse disponibili non sufficienti. + </notification> + <notification name="CantDropObjectFullParcel"> + Non puoi lasciare l'oggetto qui. Il lotto è pieno. + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + Non puoi toccare/afferrare questo oggetto perché sei stato bandito dal lotto di terreno. + </notification> + <notification name="PlzNarrowDeleteParams"> + Limita i parametri per la cancellazione. + </notification> + <notification name="UnableToUploadAsset"> + Impossibile caricare l'asset. + </notification> + <notification name="CantTeleportCouldNotFindUser"> + Utente da teleportare alla posizione iniziale non trovato + </notification> + <notification name="GodlikeRequestFailed"> + richiesta superpoteri non riuscita + </notification> + <notification name="GenericRequestFailed"> + richiesta generica non riuscita + </notification> + <notification name="CantUploadPostcard"> + Impossibile caricare la cartolina. Riprova più tardi. + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + I dettagli dell'inventario per la notifica di gruppo non sono stati trovati. + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + Impossibile inviare la notifica di gruppo -- non consentita. + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + Impossibile inviare la notifica di gruppo -- impossibile costruire l'inventario. + </notification> + <notification name="CantParceInventoryInNotice"> + Impossibile analizzare l'inventario nella notifica. + </notification> + <notification name="TerrainUploadFailed"> + Caricamento terreno non riuscito. + </notification> + <notification name="TerrainFileWritten"> + File terreno scritto. + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + File terreno generato, avvio del download... + </notification> + <notification name="TerrainBaked"> + Baking terreno completata. + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + Sono stati disattivati solo i primi 10 oggetti. Se necessario, aggiorna e seleziona nuovamente. + </notification> + <notification name="UpdateViewerBuyParcel"> + Devi aggiornare il Viewer per poter acquistare questo lotto. + </notification> + <notification name="CantBuyParcelNotForSale"> + Impossibile acquistare, questo lotto non è in vendita. + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + Impossibile acquistare. Il prezzo o l'area del terreno sono stati cambiati. + </notification> + <notification name="CantBuyParcelNotAuthorized"> + Non sei l'acquirente autorizzato di questo lotto. + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + Non puoi acquistare questo lotto perché è in attesa di autorizzazione all'acquisto + </notification> + <notification name="CantBuildOverflowParcel"> + Non puoi costruire oggetti qui perché si supererebbe il limite per il lotto. + </notification> + <notification name="SelectedMultipleOwnedLand"> + hai selezionato terreni con proprietari diversi. Seleziona un'area più piccola e riprova. + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + Non sono stati selezionati abbastanza lotti affittati da collegare. + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + Terreno non divisibile.\nHai selezionato più di un lotto.\nProva a selezionare una quantità di terreno più piccola. + </notification> + <notification name="CantDivideLandCantFindParcel"> + impossibile suddividere il terreno.\nimpossibile trovare il lotto.\nInvia una segnalazione con Aiuto -> Segnala bug... + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + Impossibile suddividere il terreno. È stato selezionato l'intero lotto.\nProva a selezionare un pezzo di terreno più piccolo. + </notification> + <notification name="LandHasBeenDivided"> + Il terreno è stato diviso. + </notification> + <notification name="PassPurchased"> + Hai acquistato un pass. + </notification> + <notification name="RegionDisallowsClassifieds"> + Nella regione non sono permessi gli annunci pubblicitari. + </notification> + <notification name="LandPassExpireSoon"> + Il tuo pass per questo terreno è quasi scaduto. + </notification> + <notification name="CantSitNoSuitableSurface"> + Nessuna superficie adatta a sedersi, prova un altro luogo. + </notification> + <notification name="CantSitNoRoom"> + Non c'è posto per sedersi, prova un altro luogo. + </notification> + <notification name="ClaimObjectFailedNoPermission"> + La richiesta dell'oggetto non ha avuto successo perché non hai l'autorizzazione necessaria. + </notification> + <notification name="ClaimObjectFailedNoMoney"> + La richiesta dell'oggetto non ha avuto successo perché non hai L$ sufficienti. + </notification> + <notification name="CantDeedGroupLand"> + Non puoi assegnare terreno di proprietà di un gruppo. + </notification> + <notification name="BuyObjectFailedNoMoney"> + L'acquisto dell'oggetto non ha avuto successo perché non hai L$ sufficienti. + </notification> + <notification name="BuyInventoryFailedNoMoney"> + L'acquisto dell'inventario non ha avuto successo perché non hai L$ sufficienti. + </notification> + <notification name="BuyPassFailedNoMoney"> + Non hai abbastanza L$ per acquistare un pass per questo terreno. + </notification> + <notification name="CantBuyPassTryAgain"> + Al momento non puoi acquistare un pass. Riprova più tardi. + </notification> + <notification name="CantCreateObjectParcelFull"> + Impossibile creare l'oggetto perché il lotto è pieno. + </notification> + <notification name="FailedPlacingObject"> + Il posizionamento dell'oggetto nella posizione specificata non è riuscito. Riprova. + </notification> + <notification name="CantCreateLandmarkForEvent"> + Impossibile creare il punto di riferimento per l'evento. + </notification> + <notification name="GodBeatsFreeze"> + I tuoi superpoteri hanno interrotto la congelazione. + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + Richiesta di poteri speciali non riuscita. La richiesta è stata registrata. + </notification> + <notification name="ExpireExplanation"> + Al momento il sistema non è in grado di elaborare la tua richiesta. Tempo scaduto per la richiesta. + </notification> + <notification name="DieExplanation"> + Il sistema non è in grado di elaborare la tua richiesta. + </notification> + <notification name="AddPrimitiveFailure"> + Denaro insufficiente per creare una primitiva. + </notification> + <notification name="RezObjectFailure"> + Denaro insufficiente per creare un oggetto. + </notification> + <notification name="ResetHomePositionNotLegal"> + Posizione iniziale ripristinata perché non era valida. + </notification> + <notification name="CantInviteRegionFull"> + Al momento non puoi invitare nessuno alla tua posizione perché la regione è piena. Riprova più tardi. + </notification> + <notification name="CantSetHomeAtRegion"> + Questa regione non ti consente di impostare qui la tua posizione iniziale. + </notification> + <notification name="ListValidHomeLocations"> + Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma. + </notification> + <notification name="SetHomePosition"> + Posizione di base impostata. + </notification> + <notification name="CantDerezInventoryError"> + Impossibile derazzare l'oggetto a causa di un errore nell'inventario. + </notification> + <notification name="CantCreateRequestedInv"> + Impossibile creare l'inventario richiesto. + </notification> + <notification name="CantCreateRequestedInvFolder"> + Impossibile creare la cartella dell'inventario richiesta. + </notification> + <notification name="CantCreateInventory"> + Impossibile creare quell'inventario. + </notification> + <notification name="CantCreateLandmark"> + Impossibile creare il punto di riferimento. + </notification> + <notification name="CantCreateOutfit"> + Il vestiario non può essere creato in questo momento. Riprova tra un minuto. + </notification> + <notification name="InventoryNotForSale"> + L'inventario non è in vendita. + </notification> + <notification name="CantFindInvItem"> + Impossibile trovare l'elemento nell'inventario. + </notification> + <notification name="CantFindObject"> + Impossibile trovare l'oggetto. + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + Il trasferimento di denaro agli oggetti è attualmente disattivato in questa regione. + </notification> + <notification name="CantPayNoAgent"> + Non si capisce chi deve essere pagato. + </notification> + <notification name="CantDonateToPublicObjects"> + Non puoi dare L$ a oggetti pubblici. + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + Creazione inventario non riuscito per un oggetto nel mondo virtuale. + </notification> + <notification name="UserBalanceOrLandUsageError"> + Un errore interno ha impedito l'aggiornamento del Viewer. Il saldo in L$ o i lotti posseduti mostrati nel Viewer potrebbero non corrispondere ai valori correnti sui server. + </notification> + <notification name="LargePrimAgentIntersect"> + Non puoi creare prim grandi che intersecano altri giocatori. Riprova quando gli altri giocatori si sono spostati. + </notification> + <notification name="PreferenceChatClearLog"> + Verranno cancellati i registri delle conversazioni precedenti e tutti gli eventuali backup di quel file. + <usetemplate ignoretext="Conferma prima di cancellare il registro delle conversazioni precedenti." name="okcancelignore" notext="Annulla" yestext="OK"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + Verranno cancellate le trascrizioni di tutte le conversazioni precedenti. L'elenco delle conversazioni passate non cambierà. Tutti i file con i suffissi .txt e txt.backup nella cartella [FOLDER] verranno cancellati. + <usetemplate ignoretext="Conferma prima di cancellare le trascrizioni." name="okcancelignore" notext="Annulla" yestext="OK"/> + </notification> + <notification name="PreferenceChatPathChanged"> + Impossibile spostare i file. Il percorso precedente è stato ripristinato. + <usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100644..100755 --- a/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/it/panel_active_object_row.xml b/indra/newview/skins/default/xui/it/panel_active_object_row.xml index b8cca6f01a..b8cca6f01a 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/it/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml index be001d09f8..be001d09f8 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml index ede19b9e5a..cfceb5b982 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml @@ -26,5 +26,6 @@ <icon name="permission_edit_mine_icon" tool_tip="Questo amico può modificare, cancellare o prendere i tuoi oggetti"/> <icon name="permission_map_icon" tool_tip="Questo amico può identificarti sulla mappa"/> <icon name="permission_online_icon" tool_tip="Questo amico può vedere se sei online"/> + <button name="info_btn" tool_tip="Maggiori informazioni"/> <button name="profile_btn" tool_tip="Vedi profilo"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml index 610f561a65..7ca2d3b57b 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> - <text name="title_text"> - Blocca lista - </text> - <scroll_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/> - <button label="Blocca il residente..." label_selected="Blocca il residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/> - <button label="Blocca l'oggetto per nome..." label_selected="Blocca l'oggetto per nome..." name="Block object by name..."/> - <button label="Sblocca" label_selected="Sblocca" name="Unblock" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="Filtro" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="Azioni sulla persona o oggetto selezionato"/> + <menu_button name="view_btn" tool_tip="Opzioni Ordina"/> + <menu_button name="plus_btn" tool_tip="Seleziona un residente o un oggetto da bloccare"/> + <button name="unblock_btn" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/> + </panel> + <block_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml index b44c4c29e6..b44c4c29e6 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml index 8fc23d34f1..8fc23d34f1 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml index ff576c7dd2..ff576c7dd2 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml index 66bf3f140f..66bf3f140f 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_classified_info.xml b/indra/newview/skins/default/xui/it/panel_classified_info.xml index a7cf51c4b9..a7cf51c4b9 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/it/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml index e9d9795b3a..e9d9795b3a 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml index 7667e95663..7667e95663 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml index d914a5740f..d914a5740f 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml new file mode 100644 index 0000000000..ca6b65300a --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="(caricamento in corso)"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..624eaa639c --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="La conversazione includeva la voce"/> + <icon name="unread_ims_icon" tool_tip="Sono arrivati dei messaggi mentre eri via"/> + <button name="delete_btn" tool_tip="Elimina questo elemento"/> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml index cbcaa0689a..cbcaa0689a 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml index eb3af5f2a5..eb3af5f2a5 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml index 6daa0cf8fd..6daa0cf8fd 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_classified.xml b/indra/newview/skins/default/xui/it/panel_edit_classified.xml index ad827696ff..ad827696ff 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_eyes.xml b/indra/newview/skins/default/xui/it/panel_edit_eyes.xml index 9f31bb7dc7..9f31bb7dc7 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml index 366a82f7aa..366a82f7aa 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_hair.xml b/indra/newview/skins/default/xui/it/panel_edit_hair.xml index 50e2e7e4b3..50e2e7e4b3 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml index 337720d068..337720d068 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_pants.xml b/indra/newview/skins/default/xui/it/panel_edit_pants.xml index 21b5b7c026..21b5b7c026 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_physics.xml b/indra/newview/skins/default/xui/it/panel_edit_physics.xml index 669a2c0eab..669a2c0eab 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml index 145b8cf4e3..145b8cf4e3 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml index 545e96a8f1..545e96a8f1 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_shape.xml b/indra/newview/skins/default/xui/it/panel_edit_shape.xml index fd6a7af69c..fd6a7af69c 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml index 1777c0147f..1777c0147f 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml index c79408b94a..c79408b94a 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_skin.xml b/indra/newview/skins/default/xui/it/panel_edit_skin.xml index 466eff2708..466eff2708 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml index 87cdd16676..87cdd16676 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_socks.xml b/indra/newview/skins/default/xui/it/panel_edit_socks.xml index f61a72ed76..f61a72ed76 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml index d76fb62c53..d76fb62c53 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml index 924344e3c0..924344e3c0 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml index 2f22c03294..2f22c03294 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml index e54dc26d05..e54dc26d05 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml index 2d17e4a0cd..2d17e4a0cd 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml index 49baa73811..49baa73811 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_general.xml +++ b/indra/newview/skins/default/xui/it/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml index 34ee3c2dca..34ee3c2dca 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml index 1b57eba3f0..1b57eba3f0 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml index 27675a18f5..27675a18f5 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml index 7cdc4c7ff6..72e644008c 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Sconosciuto"/> + <button name="info_btn" tool_tip="Maggiori informazioni"/> <button name="profile_btn" tool_tip="Vedi profilo"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml index 524f7d2822..524f7d2822 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/it/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_notify.xml b/indra/newview/skins/default/xui/it/panel_group_notify.xml index 91a41353a5..91a41353a5 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/it/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml index 478b35e628..478b35e628 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml index 76b28eab24..76b28eab24 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/it/panel_inventory_item.xml b/indra/newview/skins/default/xui/it/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/it/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_landmark_info.xml b/indra/newview/skins/default/xui/it/panel_landmark_info.xml index b4c5ab01bc..b4c5ab01bc 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/it/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/it/panel_landmarks.xml b/indra/newview/skins/default/xui/it/panel_landmarks.xml index 5617105c31..5617105c31 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/it/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml index 2afde40940..2afde40940 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_login.xml +++ b/indra/newview/skins/default/xui/it/panel_login.xml diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml index 446b51ffa3..446b51ffa3 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/it/panel_me.xml b/indra/newview/skins/default/xui/it/panel_me.xml index a134f6f1de..a134f6f1de 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_me.xml +++ b/indra/newview/skins/default/xui/it/panel_me.xml diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml index f11b2415ee..f11b2415ee 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml index 0f0f1c9fe4..0f0f1c9fe4 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml index 785cd048a1..785cd048a1 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml index 0299e2a532..0299e2a532 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml index d46a15c735..d46a15c735 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml index 6317d3192e..1fef88870a 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <string name="min_width"> 192 </string> diff --git a/indra/newview/skins/default/xui/it/panel_nearby_media.xml b/indra/newview/skins/default/xui/it/panel_nearby_media.xml index 03421456f9..03421456f9 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml index ef27262010..ef27262010 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/it/panel_online_status_toast.xml b/indra/newview/skins/default/xui/it/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/it/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml index af5e05336e..af5e05336e 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml index 446c211b1c..446c211b1c 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml index c7821bc363..c7821bc363 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml index 9e1a45b129..9e1a45b129 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfits_list.xml b/indra/newview/skins/default/xui/it/panel_outfits_list.xml index d0c275e29f..d0c275e29f 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml index 3bbf2446f5..3bbf2446f5 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml index f903ae6e2c..e1468db76e 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_people.xml +++ b/indra/newview/skins/default/xui/it/panel_people.xml @@ -14,81 +14,53 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa <string name="no_filtered_friends_msg"> Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca]. </string> - <string name="people_filter_label" value="Filtro persone"/> - <string name="groups_filter_label" value="Filtro gruppi"/> <string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/> <string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/> <string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/> <string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/> - <filter_editor label="Filtro" name="filter_input"/> <tab_container name="tabs"> <panel label="NELLE VICINANZE" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="Opzioni"/> - <button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="Filtro persone" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/> + <menu_button name="nearby_view_btn" tool_tip="Opzioni Mostra/Ordina"/> + <button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/> + <dnd_button name="nearby_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/> </panel> </panel> - <panel label="I MIEI AMICI" name="friends_panel"> + <panel label="AMICI" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="Filtro persone" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/> + <menu_button name="friends_view_btn" tool_tip="Opzioni Mostra/Ordina"/> + <button name="friends_add_btn" tool_tip="Offri amicizia a un residente"/> + <dnd_button name="friends_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Online"/> <accordion_tab name="tab_all" title="Tutto"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Offri amicizia a un residente"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="I MIEI GRUPPI" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="Opzioni"/> - <button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/> - <button name="activate_btn" tool_tip="Attiva il gruppo selezionato"/> + <panel label="GRUPPI" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="Filtro gruppi" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="Azioni per il gruppo selezionato:"/> + <menu_button name="groups_view_btn" tool_tip="Opzioni Mostra/Ordina"/> + <menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/> + <dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/> </panel> </panel> <panel label="RECENTE" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="Opzioni"/> - <button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="Filtro persone" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/> + <menu_button name="recent_view_btn" tool_tip="Opzioni Mostra/Ordina"/> + <button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/> + <dnd_button name="recent_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/> </panel> </panel> + <panel label="BLOCCATO" name="blocked_panel"> + <panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell'inventario"/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="Chiamata al gruppo" name="group_call_btn" tool_tip="Chiama questo gruppo"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_pick_info.xml b/indra/newview/skins/default/xui/it/panel_pick_info.xml index ca9959a581..ca9959a581 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/it/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/it/panel_picks.xml b/indra/newview/skins/default/xui/it/panel_picks.xml index 3faf28a948..3faf28a948 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_picks.xml +++ b/indra/newview/skins/default/xui/it/panel_picks.xml diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml index 890dfc2458..890dfc2458 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/it/panel_places.xml b/indra/newview/skins/default/xui/it/panel_places.xml index 69995fb5de..69995fb5de 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_places.xml +++ b/indra/newview/skins/default/xui/it/panel_places.xml diff --git a/indra/newview/skins/default/xui/it/panel_postcard_message.xml b/indra/newview/skins/default/xui/it/panel_postcard_message.xml index c720f4822d..c720f4822d 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/it/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/it/panel_postcard_settings.xml b/indra/newview/skins/default/xui/it/panel_postcard_settings.xml index 6a586c4415..6a586c4415 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/it/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml index 224780f234..224780f234 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml index fd1fd57761..fd1fd57761 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml 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 0c9c4027e5..c2ac6e97a9 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Text Chat" name="chat"> - <text name="font_size"> - Dimensioni caratteri: - </text> - <radio_group name="chat_font_size"> - <radio_item label="Piccola" name="radio" value="0"/> - <radio_item label="Media" name="radio2" value="1"/> - <radio_item label="Grande" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/> - <check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/> - <check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/> - <check_box label="Chat a vignetta" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - Mostra gli IM in: - </text> - <text name="requires_restart_label"> - (richiede il riavvio) - </text> - <radio_group name="chat_window" tool_tip="Mostra i tuoi messaggi istantanei in diverse finestre, o in una finestra con più schede (richiede il riavvio)"> - <radio_item label="Finestre separate" name="radio" value="0"/> - <radio_item label="Schede" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - Attiva popup per chat in arrivo: - </text> - <check_box label="Chat di gruppo" name="EnableGroupChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva una chat di gruppo"/> - <check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/> - <spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/> - <spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/> + <check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/> + <check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/> + <text name="font_size"> + Dimensioni caratteri: + </text> + <combo_box name="chat_font_size"> + <item label="Piccolo" name="Small" value="0"/> + <item label="Medio" name="Medium" value="1"/> + <item label="Grande" name="Large" value="2"/> + </combo_box> + <check_box label="Chat a vignetta" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + Notifiche + </text> + <text name="friend_ims"> + IM degli amici: + </text> + <combo_box name="FriendIMOptions"> + <item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/> + <item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/> + <item label="Nessuno" name="None" value="none"/> + </combo_box> + <text name="non_friend_ims"> + IM non di amici: + </text> + <combo_box name="NonFriendIMOptions"> + <item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/> + <item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/> + <item label="Nessuno" name="None" value="none"/> + </combo_box> + <text name="conference_ims"> + IM conferenza: + </text> + <combo_box name="ConferenceIMOptions"> + <item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/> + <item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/> + <item label="Nessuno" name="None" value="none"/> + </combo_box> + <text name="group_chat"> + Chat di gruppo: + </text> + <combo_box name="GroupChatOptions"> + <item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/> + <item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/> + <item label="Nessuno" name="None" value="none"/> + </combo_box> + <text name="nearby_chat"> + Chat nei dintorni: + </text> + <combo_box name="NearbyChatOptions"> + <item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/> + <item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/> + <item label="Nessuno" name="None" value="none"/> + </combo_box> + <text name="notifications_alert"> + Per interrompere temporaneamente le notifiche, usa Comunica > Non disturbare. + </text> + </panel> + <panel> + <text name="play_sound"> + Riproduci suono: + </text> + <check_box label="Nuova conversazione" name="new_conversation"/> + <check_box label="Chiamata voce in arrivo" name="incoming_voice_call"/> + <check_box label="Offerta di Teleport" name="teleport_offer"/> + <check_box label="Offerta inventario" name="inventory_offer"/> + </panel> + <panel> + <button label="Cancella registro..." name="clear_log"/> + <button label="Cancella trascrizioni..." name="delete_transcripts"/> + <button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/> + </panel> <button label="Traduzione..." name="ok_btn"/> <button label="Sostituzione automatica..." name="autoreplace_showgui"/> <button label="Correzione ortografica..." name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml index 016970d9a3..016970d9a3 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml 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 90a833471c..45cc06c2ea 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -69,6 +69,9 @@ <combo_box.item label="mai" name="item4"/> </combo_box> <text name="text_box3"> - Risposta in modalità occupato: + Risposta Non disturbare: </text> + <text_editor name="do_not_disturb_response"> + log_in_to_change + </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml index 1f2b97af45..1f2b97af45 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml index 8d172bb8bb..8d172bb8bb 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml index 41e7a59139..41e7a59139 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml index 0189d47f45..0189d47f45 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml index d00512aaf7..d00512aaf7 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml index 4620d72977..4620d72977 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml index 0d3117ca7a..0d3117ca7a 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/it/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml index aba60d03aa..aba60d03aa 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/it/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_environment.xml b/indra/newview/skins/default/xui/it/panel_region_environment.xml index 81bc8253f4..81bc8253f4 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/it/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml index 98d9b86cfc..98d9b86cfc 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml index c550e005ae..c550e005ae 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_region_general.xml +++ b/indra/newview/skins/default/xui/it/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml index c61ac3ecce..c61ac3ecce 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/it/panel_script_ed.xml b/indra/newview/skins/default/xui/it/panel_script_ed.xml index d7ee8230b3..d7ee8230b3 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/it/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml index 98096a391a..98096a391a 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml index df7b0eae1c..df7b0eae1c 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param.xml index b5f8c8d6f0..b5f8c8d6f0 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/it/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml index 3c7874e093..3c7874e093 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml index c9245029b7..c9245029b7 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_local.xml b/indra/newview/skins/default/xui/it/panel_snapshot_local.xml index 4b725b68f9..4b725b68f9 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/it/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml index f2d42c5197..f2d42c5197 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml index 3703b97e6c..3703b97e6c 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml index 2cdbf97049..2cdbf97049 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/it/panel_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml index b1934fd515..b1934fd515 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/it/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml index e4ff7019ec..e4ff7019ec 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml index 0aaf89d8c8..0aaf89d8c8 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history.xml b/indra/newview/skins/default/xui/it/panel_teleport_history.xml index f4fa59babe..f4fa59babe 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/it/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml index 2ba4baacaf..2ba4baacaf 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/it/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml index b43f766e5e..b43f766e5e 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/it/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml index bc17fc0c89..bc17fc0c89 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/it/panel_world_map.xml b/indra/newview/skins/default/xui/it/panel_world_map.xml index 642af75028..642af75028 100644..100755 --- a/indra/newview/skins/default/xui/it/panel_world_map.xml +++ b/indra/newview/skins/default/xui/it/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml index 300e6cf721..300e6cf721 100644..100755 --- a/indra/newview/skins/default/xui/it/role_actions.xml +++ b/indra/newview/skins/default/xui/it/role_actions.xml diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml index 220a6f84af..220a6f84af 100644..100755 --- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml index 5ac0961bd7..5ac0961bd7 100644..100755 --- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml index 2b3ea0fb83..2b3ea0fb83 100644..100755 --- a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml index 8a0f93e650..5f912dd126 100644..100755 --- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="Acquista oggetto" name="Buyobject"/> <combo_box.item label="Paga oggetto" name="Payobject"/> <combo_box.item label="Apri" name="Open"/> + <combo_box.item label="Ingrandisci" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index fb1e387468..f95318542b 100644..100755 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -134,7 +134,7 @@ Esci </string> <string name="create_account_url"> - http://join.secondlife.com/index.php?lang=it-IT&sourceid=[sourceid] + http://join.secondlife.com/?sourceid=[sourceid] </string> <string name="LoginFailedViewerNotPermitted"> Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer: @@ -616,8 +616,8 @@ Prova ad accedere nuovamente tra un minuto. <string name="AvatarAway"> Assente </string> - <string name="AvatarBusy"> - Occupato + <string name="AvatarDoNotDisturb"> + Non disturbare </string> <string name="AvatarMuted"> Mutato @@ -853,6 +853,12 @@ Prova ad accedere nuovamente tra un minuto. <string name="ST_NO_JOINT"> Impossibile trovare ROOT o JOINT. </string> + <string name="NearbyChatTitle"> + Chat nei dintorni + </string> + <string name="NearbyChatLabel"> + (Chat nei dintorni) + </string> <string name="whisper"> sussurra: </string> @@ -916,6 +922,9 @@ Prova ad accedere nuovamente tra un minuto. <string name="ControlYourCamera"> Controllare la tua fotocamera </string> + <string name="AgentNameSubst"> + (Tu) + </string> <string name="TeleportYourAgent"> Teleportarti </string> @@ -1000,18 +1009,6 @@ Prova ad accedere nuovamente tra un minuto. <string name="dictionary_files"> Dizionari </string> - <string name="AvatarSetNotAway"> - Imposta come non assente - </string> - <string name="AvatarSetAway"> - Imposta come assente - </string> - <string name="AvatarSetNotBusy"> - Imposta come non occupato - </string> - <string name="AvatarSetBusy"> - Imposta come occupato - </string> <string name="shape"> Figura corporea </string> @@ -1968,8 +1965,8 @@ Prova ad accedere nuovamente tra un minuto. <string name="PanelContentsNewScript"> Nuovo script </string> - <string name="BusyModeResponseDefault"> - Il residente al quale hai inviato un messaggio è in modalità 'occupato', ovvero ha chiesto di non essere disturbato. Il tuo messaggio comparirà nel suo pannello IM, dove potrà essere letto in un secondo momento. + <string name="DoNotDisturbModeResponseDefault"> + Questo residente ha attivato la modalità 'Non disturbare' e vedrà il tuo messaggio più tardi. </string> <string name="MuteByName"> (In base al nome) @@ -2082,9 +2079,6 @@ Prova ad accedere nuovamente tra un minuto. <string name="GroupMoneyDate"> [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc] </string> - <string name="ViewerObjectContents"> - Contenuto - </string> <string name="AcquiredItems"> Oggetti acquisiti </string> @@ -3799,7 +3793,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Regione generale </string> <string name="LocationCtrlSeeAVsTooltip"> - Avatar visibili e chat consentita fuori di questo lotto + Gli avatar in questo lotto non possono essere visti o sentiti da avatar all'esterno del lotto </string> <string name="LocationCtrlPathfindingDirtyTooltip"> Gli oggetti che si muovono potrebbero non comportarsi correttamente in questa regione fino a quando non viene eseguito il rebake della regione. @@ -3876,6 +3870,12 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. <string name="IM_unblock_only_groups_friends"> Per vedere questo messaggio, devi deselezionare 'Solo amici e gruppi possono chiamarmi o mandarmi IM' in Preferenze/Privacy. </string> + <string name="OnlineStatus"> + Online + </string> + <string name="OfflineStatus"> + Offline + </string> <string name="answered_call"> Risposto alla chiamata </string> @@ -3885,6 +3885,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. <string name="you_joined_call"> Ti sei collegato alla chiamata in voce </string> + <string name="you_auto_rejected_call-im"> + Hai rifiutato automaticamente la chiamata voce mentre era attivata la modalità 'Non disturbare'. + </string> <string name="name_started_call"> [NAME] ha iniziato una chiamata vocale </string> @@ -3897,6 +3900,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. <string name="hang_up-im"> Chiusa la chiamata </string> + <string name="conference-title"> + Chat con più persone + </string> <string name="conference-title-incoming"> Chiamata in conferenza con [AGENT_NAME] </string> @@ -4769,6 +4775,9 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="Command_Chat_Label"> Chat </string> + <string name="Command_Conversations_Label"> + Conversazioni + </string> <string name="Command_Compass_Label"> Bussola </string> @@ -4844,6 +4853,9 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="Command_Chat_Tooltip"> Chatta con persone vicine usando il testo </string> + <string name="Command_Conversations_Tooltip"> + Conversa con chiunque + </string> <string name="Command_Compass_Tooltip"> Bussola </string> @@ -4973,4 +4985,13 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="UserDictionary"> [User] </string> + <string name="logging_calls_disabled_log_empty"> + Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona "Salva: Solo registro" oppure "Salva: Registri e trascrizioni" in Preferenze > Chat. + </string> + <string name="logging_calls_disabled_log_not_empty"> + Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona "Salva: Solo registro" oppure "Salva: Registri e trascrizioni" in Preferenze > Chat. + </string> + <string name="logging_calls_enabled_log_empty"> + Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui. + </string> </strings> diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml index bd967ebcc4..bd967ebcc4 100644..100755 --- a/indra/newview/skins/default/xui/it/teleport_strings.xml +++ b/indra/newview/skins/default/xui/it/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml index 6d5df75645..6d5df75645 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_about.xml +++ b/indra/newview/skins/default/xui/ja/floater_about.xml 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 3b4b5ed070..3b4b5ed070 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml index 1c743e1fd2..1c743e1fd2 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_activeim.xml +++ b/indra/newview/skins/default/xui/ja/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml index 2bada303ae..2bada303ae 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml index f74bab3598..f74bab3598 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml index e9aa287f2c..e9aa287f2c 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_auction.xml +++ b/indra/newview/skins/default/xui/ja/floater_auction.xml diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml index 21abf59160..21abf59160 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml index d289580506..d289580506 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_avatar.xml +++ b/indra/newview/skins/default/xui/ja/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml index 4bd6b4e053..4bd6b4e053 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml index 5c23b77498..5c23b77498 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml index a55698e3d0..a55698e3d0 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_beacons.xml +++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml index 6865409e7a..6865409e7a 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_build_options.xml +++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml index d8d0164618..d8d0164618 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml index fd12a9e69a..fd12a9e69a 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_bumps.xml +++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml index 7e4932c78f..7e4932c78f 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml index a472f163e3..a472f163e3 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml index 37fd6826e5..37fd6826e5 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml index 34f9d38de1..34f9d38de1 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml index ce269df6da..ce269df6da 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml index 982e5ce42b..982e5ce42b 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_camera.xml +++ b/indra/newview/skins/default/xui/ja/floater_camera.xml diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml index 11f223ade6..9f5df6fb85 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="chat_bar" title="近くのチャット"> +<floater name="nearby_chat" title="近くのチャット"> <panel name="bottom_panel"> <line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して話し、Ctrl + Enter キーで叫びます。"/> <button name="show_nearby_chat" tool_tip="近くのチャットログを表示／非表示"/> diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml index 7d91cb69ed..7d91cb69ed 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/ja/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml index dc87d27a15..dc87d27a15 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml new file mode 100644 index 0000000000..98b1a59a0d --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="会話ログ"> + <panel name="buttons_panel"> + <filter_editor label="人をフィルター" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/> + <menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml new file mode 100644 index 0000000000..ea0b23de48 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="会話:"> + <floater.string name="Title"> + 会話:[NAME] + </floater.string> + <text name="page_label" value="ページ"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml index f69c24622a..f69c24622a 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_critical.xml +++ b/indra/newview/skins/default/xui/ja/floater_critical.xml diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml index eb39d1b336..eb39d1b336 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml index b7f6ad4d4e..b7f6ad4d4e 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_destinations.xml +++ b/indra/newview/skins/default/xui/ja/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml index cc71b1cd9f..cc71b1cd9f 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_display_name.xml +++ b/indra/newview/skins/default/xui/ja/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml index fd601672b6..fd601672b6 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml index 68d0c70baa..68d0c70baa 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml index eddfbd4298..eddfbd4298 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml index 0e3803119f..0e3803119f 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml index ca50ba8ef8..ca50ba8ef8 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_event.xml +++ b/indra/newview/skins/default/xui/ja/floater_event.xml diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml index 5f538ecdb0..5f538ecdb0 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml index b853f395dd..b853f395dd 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_font_test.xml +++ b/indra/newview/skins/default/xui/ja/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml index 1ed5ad31db..1ed5ad31db 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_gesture.xml +++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml index 9e5d473db7..9e5d473db7 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml index c8b8e918e0..c8b8e918e0 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml index 15200d7ef7..15200d7ef7 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml index 4cebe27226..4cebe27226 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_how_to.xml +++ b/indra/newview/skins/default/xui/ja/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml index e3841c2cd9..e3841c2cd9 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_hud.xml +++ b/indra/newview/skins/default/xui/ja/floater_hud.xml diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml index 06b65e27f0..a155efdc1e 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_im_container.xml +++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="会話"/> +<multi_floater name="floater_im_box" title="会話"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/> + <button name="add_btn" tool_tip="新しい会話を開始"/> + <button name="speak_btn" tool_tip="マイクを使って人と話す"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="このペインを閉じる"/> + <text name="stub_textbox"> + この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml index dfa1c85ca2..a44c843df7 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_im_session.xml +++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="宛先" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] は会話に招待されました。"/> + <floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/> + <floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/> + <floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/> + <floater.string name="start_call_button_tooltip" value="会話の接続を開く"/> + <floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/> + <menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/> + <button name="add_btn" tool_tip="この会話に他の人を追加する"/> + <button name="voice_call_btn" tool_tip="会話の接続を開く"/> + <button name="close_btn" tool_tip="この会話を終了する"/> + <button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="チャットを翻訳" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="宛先" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml index 1ffc27fd70..1ffc27fd70 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml index 65edafb169..65edafb169 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml index f152fcd738..308f6f9a3d 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml @@ -10,7 +10,7 @@ 匿名ユーザー </floater.string> <floater.string name="VoiceInviteP2P"> - がコールしています。 + からコールを受けています。 </floater.string> <floater.string name="VoiceInviteAdHoc"> がコンファレンスチャットで、ボイスチャットに参加しました。 @@ -25,9 +25,9 @@ [CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？ </floater.string> <text name="question"> - [CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？ + コールに応答すると、現在のボイスチャットから切断されます。 </text> - <button label="はい" label_selected="はい" name="Accept"/> - <button label="いいえ" label_selected="いいえ" name="Reject"/> - <button label="IM" name="Start IM"/> + <button label="取る" label_selected="取る" name="Accept"/> + <button label="無視" label_selected="無視" name="Reject"/> + <button label="代わりに IM を開く" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml index b3825c0b7f..b3825c0b7f 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_inspect.xml +++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml index c01c46211e..c01c46211e 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml index af96edda79..af96edda79 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml index daa480ef5a..daa480ef5a 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_joystick.xml +++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml index e3546cd837..e3546cd837 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml index aca916f22f..aca916f22f 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml index 5a155c9f12..5a155c9f12 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml index 5773752788..5773752788 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml index 1122203446..1122203446 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_map.xml diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml index c4731b73a3..c4731b73a3 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml index 46ac1a8dfd..46ac1a8dfd 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml index f48bb94e32..f48bb94e32 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml index c59a3dc0ab..c59a3dc0ab 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml index 942cc91317..942cc91317 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml index aed3b78a14..aed3b78a14 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_moveview.xml +++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml index 04ffd5254d..04ffd5254d 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml index c9a0ecefd7..c9a0ecefd7 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml index d708fc3dec..d708fc3dec 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml index 0f37b30f52..0f37b30f52 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_notification.xml +++ b/indra/newview/skins/default/xui/ja/floater_notification.xml diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml index c9d9ea7acb..c9d9ea7acb 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml index d727a268fb..d727a268fb 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml index af02ffedda..af02ffedda 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_openobject.xml +++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml index 70555e6ded..70555e6ded 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml index f1a05e0eec..f1a05e0eec 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml index ada96b5b62..ada96b5b62 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml index ec107f3e6b..9733c61918 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> 表示： </text> - <check_box label="世界" name="show_world"/> + <check_box label="テスト" name="show_world"/> <check_box label="可動物のみ" name="show_world_movables_only"/> <check_box label="ナビメッシュ" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml index 4441d5e738..4441d5e738 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml index 17965fb60a..17965fb60a 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_pay.xml +++ b/indra/newview/skins/default/xui/ja/floater_pay.xml diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml index 637ad496ef..637ad496ef 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/ja/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml index b180658ab7..b180658ab7 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_people.xml +++ b/indra/newview/skins/default/xui/ja/floater_people.xml diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml index 98cda25a81..98cda25a81 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/ja/floater_picks.xml b/indra/newview/skins/default/xui/ja/floater_picks.xml index 359585eb86..359585eb86 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_picks.xml +++ b/indra/newview/skins/default/xui/ja/floater_picks.xml diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml index 0d167444db..0d167444db 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_places.xml +++ b/indra/newview/skins/default/xui/ja/floater_places.xml diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml index 7c4d9c78ee..7c4d9c78ee 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_post_process.xml +++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml index d48a8241ec..d48a8241ec 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_preferences.xml +++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml index 4638fd002e..4638fd002e 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml index a3042f66ea..a3042f66ea 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml index 59ce36b022..59ce36b022 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml index ae8ae9f7b5..ae8ae9f7b5 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml index 5c0f05cec6..5c0f05cec6 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml index 4617fd1d92..4617fd1d92 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml index 10a46247a7..10a46247a7 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml index f33406da51..f33406da51 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml index 4edb4972e4..4edb4972e4 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml index d08c51c61e..d08c51c61e 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_region_info.xml +++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml index dc34441535..dc34441535 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml index 0ac7a988e0..0ac7a988e0 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml index 7ccd858af7..7ccd858af7 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml index 656357aa17..656357aa17 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml index 97e79fb483..97e79fb483 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml index bc4f48c995..bc4f48c995 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_script_search.xml +++ b/indra/newview/skins/default/xui/ja/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml index 0723be0068..0723be0068 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_search.xml +++ b/indra/newview/skins/default/xui/ja/floater_search.xml diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml index d41be86873..d41be86873 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_select_key.xml +++ b/indra/newview/skins/default/xui/ja/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml index aa368eef11..aa368eef11 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml index cb7950bf53..cb7950bf53 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml index f145a2e8b8..f145a2e8b8 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml index 28d2388bed..28d2388bed 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml index 7d83309c46..7d83309c46 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml index 31fbef9bcf..31fbef9bcf 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml index febe153d25..febe153d25 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml index 1922e4841a..1922e4841a 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_stats.xml +++ b/indra/newview/skins/default/xui/ja/floater_stats.xml diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml index 45e97bdf5d..45e97bdf5d 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml index 7318083771..7318083771 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_telehub.xml +++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml index 31b5bbd3bf..31b5bbd3bf 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml index 40fd8e9f93..40fd8e9f93 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml index 3773812bb6..37233d3e68 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml @@ -20,7 +20,7 @@ <button label="ブランク" label_selected="ブランク" name="Blank"/> <button label="なし" label_selected="なし" name="None"/> <button label="" label_selected="" name="Pipette"/> - <check_box initial_value="true" label="ライブプレビュー" name="apply_immediate_check"/> + <check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/> <text name="preview_disabled" value="プレビュー無効"/> <filter_editor label="テクスチャをフィルター" name="inventory search editor"/> <check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml index adc35137b5..adc35137b5 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index 4bd6439ad2..4bd6439ad2 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml index c44f409d4e..c44f409d4e 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml index ae064724c0..ae064724c0 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_tos.xml +++ b/indra/newview/skins/default/xui/ja/floater_tos.xml diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml index 682352ec82..682352ec82 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_toybox.xml +++ b/indra/newview/skins/default/xui/ja/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml index 27143086ac..27143086ac 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml index 8e09e4748a..8e09e4748a 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..44e96c35ad --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="ボイスチャットの音量"> + <slider label="ボイスチャット" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml index f7d3fd11e0..f7d3fd11e0 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml index ee675e143b..b38ea9331a 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="場所" name="voice_effects" title="ボイスモーフィング"> +<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー"> <string name="no_voice_effect"> （ボイスモーフィングなし） </string> diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml new file mode 100644 index 0000000000..a380615d5a --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="ボイス音量"> + <slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml index 48fe8aee78..48fe8aee78 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_web_content.xml +++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml index 34aba9d485..34aba9d485 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml index 416813d6cc..416813d6cc 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_window_size.xml +++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index cc07596adc..cc07596adc 100644..100755 --- a/indra/newview/skins/default/xui/ja/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml index 42b67cd333..42b67cd333 100644..100755 --- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml index be628befdf..be628befdf 100644..100755 --- a/indra/newview/skins/default/xui/ja/inspect_group.xml +++ b/indra/newview/skins/default/xui/ja/inspect_group.xml diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml index e6999ac9b1..e6999ac9b1 100644..100755 --- a/indra/newview/skins/default/xui/ja/inspect_object.xml +++ b/indra/newview/skins/default/xui/ja/inspect_object.xml diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml index 483d3fec52..483d3fec52 100644..100755 --- a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml index 91e8f4be7c..91e8f4be7c 100644..100755 --- a/indra/newview/skins/default/xui/ja/language_settings.xml +++ b/indra/newview/skins/default/xui/ja/language_settings.xml diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml index 982a03c6a8..982a03c6a8 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml index 5adf0b3745..5adf0b3745 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml index 6036e1075e..6036e1075e 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml index b04f602134..b04f602134 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml index 54dd96f5ef..54dd96f5ef 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml index 4709522665..4709522665 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml index e786d02e40..e786d02e40 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml index eb5faa2545..eb5faa2545 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml index d984342896..d984342896 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml index a071abbd2e..07bcefd9b3 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> +<toggleable_menu name="Gear COF"> <menu label="衣類" name="COF.Gear.New_Clothes"/> - <menu label="新しい身体部位" name="COF.Geear.New_Body_Parts"/> -</menu> + <menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml new file mode 100644 index 0000000000..c7df20d252 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="会話を終える" name="close_conversation"/> + <menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/> + <menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/> + <menu_item_call label="プロフィールを表示" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="テレポートを送る" name="offer_teleport"/> + <menu_item_call label="ボイスコール" name="voice_call"/> + <menu_item_call label="チャットの履歴..." name="chat_history"/> + <menu_item_call label="フレンドを追加" name="add_friend"/> + <menu_item_call label="フレンドを削除" name="remove_friend"/> + <menu_item_call label="フレンドを削除" name="remove_friends"/> + <menu_item_call label="グループに招待..." name="invite_to_group"/> + <menu_item_call label="ズームイン" name="zoom_in"/> + <menu_item_call label="地図" name="map"/> + <menu_item_call label="共有" name="share"/> + <menu_item_call label="支払い" name="pay"/> + <menu_item_check label="ボイスをブロック" name="block_unblock"/> + <menu_item_check label="文字をブロックする" name="MuteText"/> + <menu_item_call label="グループ情報" name="group_profile"/> + <menu_item_call label="グループをアクティブにする" name="activate_group"/> + <menu_item_call label="グループから脱退する" name="leave_group"/> + <context_menu label="モデレーターのオプション" name="Moderator Options"> + <menu_item_check label="文字チャットを許可" name="AllowTextChat"/> + <menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/> + <menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..c9d4f947a4 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="IM..." name="IM"/> + <menu_item_call label="ボイスコール..." name="Call"/> + <menu_item_call label="チャットの履歴を開く..." name="Chat history"/> + <menu_item_call label="プロフィールを表示" name="View Profile"/> + <menu_item_call label="テレポートを送る" name="teleport"/> + <menu_item_call label="フレンド登録" name="add_friend"/> + <menu_item_call label="フレンドを削除" name="remove_friend"/> + <menu_item_call label="グループに招待..." name="Invite"/> + <menu_item_call label="地図" name="Map"/> + <menu_item_call label="共有" name="Share"/> + <menu_item_call label="支払い" name="Pay"/> + <menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml new file mode 100644 index 0000000000..bd4812603f --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="名前で並べ替え" name="sort_by_name"/> + <menu_item_check label="日付で並べ替え" name="sort_by_date"/> + <menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/> + <menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml index c2ef0179b2..c2ef0179b2 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_edit.xml +++ b/indra/newview/skins/default/xui/ja/menu_edit.xml diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml index 4708b1446c..4708b1446c 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_favorites.xml +++ b/indra/newview/skins/default/xui/ja/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml index abf490a247..abf490a247 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml index 3787f7d645..3787f7d645 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/ja/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml index 2e633ae1b2..2e633ae1b2 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml new file mode 100644 index 0000000000..55cd6610f7 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="プロフィールを表示" name="View Profile"/> + <menu_item_call label="フレンド登録" name="Add Friend"/> + <menu_item_call label="フレンドを削除" name="remove_friend"/> + <menu_item_call label="テレポートを送る" name="offer_teleport"/> + <menu_item_call label="グループに招待..." name="invite_to_group"/> + <menu_item_call label="チャットの履歴..." name="chat_history"/> + <menu_item_call label="ズームイン" name="zoom_in"/> + <menu_item_call label="地図" name="map"/> + <menu_item_call label="共有" name="Share"/> + <menu_item_call label="支払い" name="Pay"/> + <menu_item_check label="ボイスをブロック" name="Block/Unblock"/> + <menu_item_check label="文字をブロックする" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..222a741718 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="簡略表示" name="compact_view"/> + <menu_item_check label="詳細表示" name="expanded_view"/> + <menu_item_check label="時間を表示" name="IMShowTime"/> + <menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_im_well_button.xml b/indra/newview/skins/default/xui/ja/menu_im_well_button.xml deleted file mode 100644 index 3397004bd7..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="すべて閉じる" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml index 8cd6fa4a27..8cd6fa4a27 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml index 5bcb96f083..5bcb96f083 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml index 5453f998fa..5453f998fa 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml index 9d0d0f10a6..9d0d0f10a6 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml index 5a0519ba19..5a0519ba19 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml index e3e206f3aa..e3e206f3aa 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml index 9a4a8138f5..9a4a8138f5 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml index 106b09453a..106b09453a 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml index ae5ddbb78f..ae5ddbb78f 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml index f38dbc71a8..f38dbc71a8 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml index 89c122f14f..89c122f14f 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_land.xml +++ b/indra/newview/skins/default/xui/ja/menu_land.xml diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml index c134422955..c134422955 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_landmark.xml +++ b/indra/newview/skins/default/xui/ja/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml index ab6d9e3546..ab6d9e3546 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_login.xml +++ b/indra/newview/skins/default/xui/ja/menu_login.xml diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml index faae4ef717..faae4ef717 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml index 2e733ee24b..2e733ee24b 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml index 43f86e84bf..43f86e84bf 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml index 9ae2e58198..9ae2e58198 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_navbar.xml +++ b/indra/newview/skins/default/xui/ja/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml index c2e4a27686..c2e4a27686 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml index 913bae8958..913bae8958 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml index 01436ad12b..01436ad12b 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_object.xml +++ b/indra/newview/skins/default/xui/ja/menu_object.xml diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml index 8c4f328661..6448e9244e 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/> <menu_item_call label="ブロック..." name="Block"/> + <menu_item_call label="地図に表示" name="show_on_map"/> + <menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml index 2bcbe1915b..1969ae2a10 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="髪" name="New Hair"/> <menu_item_call label="目" name="New Eyes"/> </menu> + <menu_item_call label="フォルダをすべて開く" name="expand"/> + <menu_item_call label="フォルダをすべて閉じる" name="collapse"/> <menu_item_call label="アウトフィットの名前を変更する" name="rename"/> <menu_item_call label="アウトフィットを削除する" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml index 9491c22f31..9491c22f31 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml index 64d8ded722..64d8ded722 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml new file mode 100644 index 0000000000..5816351d9d --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/> + <menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/> + <menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/> + <menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/> + <menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/> + <menu_item_call label="チャットの環境設定..." name="chat_preferences"/> + <menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/> + <menu_item_check label="会話ログ..." name="Conversation"/> + <menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/> + <menu_item_check label="翻訳の設定..." name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..b5c9d11e02 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="ブロック解除" name="unblock"/> + <menu_item_call label="プロフィール..." name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..3e74b2ddff --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/> + <menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml new file mode 100644 index 0000000000..4b86a353f4 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="名前で並べ替え" name="sort_by_name"/> + <menu_item_check label="タイプによる並べ替え" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml new file mode 100644 index 0000000000..b95d11fdbd --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="名前で並べ替え" name="sort_name"/> + <menu_item_check label="オンライン状況で並べ替え" name="sort_status"/> + <menu_item_check label="人のアイコン表示" name="view_icons"/> + <menu_item_check label="与えられた権限を表示" name="view_permissions"/> + <menu_item_check label="会話ログを表示..." name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml index 76340e4d76..76340e4d76 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml index 842d79dc4b..2c0c85ba28 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="情報を表示" name="View Info"/> <menu_item_call label="チャット" name="Chat"/> - <menu_item_call label="コール" name="Call"/> + <menu_item_call label="ボイスコール" name="Call"/> <menu_item_call label="アクティブ" name="Activate"/> <menu_item_call label="脱退" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml new file mode 100644 index 0000000000..4a9e402fa4 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="グループアイコンを表示" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml index bfc7d15017..bfc7d15017 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml index 8d84b0e521..972ab767bf 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="プロフィールの表示" name="View Profile"/> - <menu_item_call label="フレンド登録" name="Add Friend"/> - <menu_item_call label="フレンドを削除" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="コール" name="Call"/> - <menu_item_call label="地図" name="Map"/> - <menu_item_call label="共有" name="Share"/> - <menu_item_call label="支払う" name="Pay"/> - <menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/> - <menu_item_call label="テレポートを送る" name="teleport"/> + <menu_item_call label="プロフィールを表示" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="テレポートを送る" name="offer_teleport"/> + <menu_item_call label="ボイスコール" name="voice_call"/> + <menu_item_call label="チャットの履歴を表示..." name="chat_history"/> + <menu_item_call label="フレンド登録" name="add_friend"/> + <menu_item_call label="フレンドを削除" name="remove_friend"/> + <menu_item_call label="グループに招待..." name="invite_to_group"/> + <menu_item_call label="ズームイン" name="zoom_in"/> + <menu_item_call label="地図" name="map"/> + <menu_item_call label="共有" name="share"/> + <menu_item_call label="支払い" name="pay"/> + <menu_item_check label="ブロック・ブロック解除" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml index 3f20e5d3ab..fe85e278cf 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="フレンド登録" name="Add Friends"/> - <menu_item_call label="フレンドを削除" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="コール" name="Call"/> - <menu_item_call label="共有" name="Share"/> - <menu_item_call label="支払う" name="Pay"/> - <menu_item_call label="テレポートを送る" name="teleport"/> + <menu_item_call label="フレンド登録" name="add_friends"/> + <menu_item_call label="フレンドを削除" name="remove_friends"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="コール" name="call"/> + <menu_item_call label="共有" name="share"/> + <menu_item_call label="支払い" name="pay"/> + <menu_item_call label="テレポートを送る" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml new file mode 100644 index 0000000000..b7cccc4396 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/> + <menu_item_check label="名前で並べ替え" name="sort_name"/> + <menu_item_check label="距離で並べ替え" name="sort_distance"/> + <menu_item_check label="人のアイコン表示" name="view_icons"/> + <menu_item_check label="地図を表示" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml index 44c5438509..44c5438509 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml new file mode 100644 index 0000000000..feaeba4398 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="新しい順に並べ替え" name="sort_most"/> + <menu_item_check label="名前で並べ替え" name="sort_name"/> + <menu_item_check label="人のアイコン表示" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml index b4f177a068..b4f177a068 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml index 011d3d2526..011d3d2526 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_picks.xml +++ b/indra/newview/skins/default/xui/ja/menu_picks.xml diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml index 84bf90fea0..84bf90fea0 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml index a9f05e126d..a9f05e126d 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_place.xml +++ b/indra/newview/skins/default/xui/ja/menu_place.xml diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml index d5ce88b055..d5ce88b055 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml index c455204722..c455204722 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml index 579f2c2cbd..579f2c2cbd 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml index 9d3a5dda1c..9d3a5dda1c 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml index 6513d9264a..6513d9264a 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml index a89dd0bcbe..a89dd0bcbe 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml index 61ba3085d9..61ba3085d9 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_slurl.xml +++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml index 901eab9166..901eab9166 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml index 66bc32214f..66bc32214f 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml index 4dd44d2ec8..4dd44d2ec8 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml index eda973c888..eda973c888 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml index d5363a5131..d5363a5131 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/ja/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml index 1a67a2a8f7..1a67a2a8f7 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml index 92d118a5ae..72722db7cc 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="住人のプロフィールを表示" name="show_agent"/> + <menu_item_call label="プロフィールを表示" name="show_agent"/> + <menu_item_call label="IM を送信..." name="send_im"/> + <menu_item_call label="フレンドを追加..." name="add_friend"/> <menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/> <menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml index 1dd3d79438..1dd3d79438 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_group.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml index c3da8a8686..c3da8a8686 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_http.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml index 147ab44a1b..147ab44a1b 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml index 8d41e1a571..8d41e1a571 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_map.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml index d6a048dcfc..9e340e3239 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="オブジェクトの情報を表示" name="show_object"/> + <menu_item_call label="オブジェクトのプロフィール..." name="show_object"/> <menu_item_call label="地図に表示" name="show_on_map"/> <menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/> <menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml index 8d264059d3..8d264059d3 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml index a516c5a075..a516c5a075 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml index 2c857ec915..2c857ec915 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml index c3507a9a33..c3507a9a33 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index e60e6781c6..89f58d3bac 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/> <menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/> </menu> - <menu label="ログイン" name="Status"> - <menu_item_call label="一時退席中" name="Set Away"/> - <menu_item_call label="取り込み中" name="Set Busy"/> - </menu> + <menu label="ログイン" name="Status"/> <menu_item_call label="L$ の購入..." name="Buy and Sell L$"/> <menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/> <menu_item_call label="マイアカウント..." name="Manage My Account"> @@ -32,14 +29,18 @@ <menu_item_call label="[APP_NAME] を終了" name="Quit"/> </menu> <menu label="コミュニケーション" name="Communicate"> - <menu_item_check label="チャット..." name="Nearby Chat"/> + <menu_item_check label="会話..." name="Conversations"/> + <menu_item_check label="近くのチャット..." name="Nearby Chat"/> <menu_item_check label="話す" name="Speak"/> - <menu_item_check label="ボイス設定..." name="Nearby Voice"/> - <menu_item_check label="ボイスモーフィング..." name="ShowVoice"/> + <menu label="ボイスモーフィング" name="VoiceMorphing"> + <menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/> + <menu_item_check label="プレビュー..." name="Preview"/> + <menu_item_call label="申し込む..." name="Subscribe"/> + </menu> <menu_item_check label="ジェスチャー..." name="Gestures"/> - <menu_item_call label="フレンド" name="My Friends"/> - <menu_item_call label="グループ" name="My Groups"/> - <menu_item_call label="近くにいる人" name="Active Speakers"/> + <menu_item_check label="フレンド" name="My Friends"/> + <menu_item_check label="グループ" name="My Groups"/> + <menu_item_check label="近くにいる人" name="Active Speakers"/> <menu_item_call label="リストをブロック" name="Block List"/> </menu> <menu label="世界" name="World"> @@ -115,7 +116,6 @@ <menu_item_call label="買う" name="Menu Object Buy"/> <menu_item_call label="取る" name="Menu Object Take"/> <menu_item_call label="コピーを取る" name="Take Copy"/> - <menu_item_call label="マイインベントリに保存" name="Save Object Back to My Inventory"/> <menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/> <menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/> </menu> @@ -130,6 +130,7 @@ <menu_item_call label="リンクセット..." name="pathfinding_linksets_menu_item"/> <menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/> <menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/> + <menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/> </menu> <menu label="オプション" name="Options"> <menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/> @@ -159,6 +160,13 @@ <menu label="ヘルプ" name="Help"> <menu_item_call label="ハウツー..." name="How To"/> <menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/> + <menu_item_call label="ユーザーガイド" name="User’s guide"/> + <menu_item_call label="ナレッジベース" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="コミュニティフォーラム" name="Community Forums"/> + <menu_item_call label="日本語サポートページ" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/> <menu_item_call label="嫌がらせを報告する" name="Report Abuse"/> <menu_item_call label="バグを報告する" name="Report Bug"/> <menu_item_call label="[APP_NAME] について" name="About Second Life"/> @@ -307,7 +315,7 @@ <menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/> <menu_item_check label="ワイヤーフレーム" name="Wireframe"/> <menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/> - <menu_item_check label="光と影" name="Lighting and Shadows"/> + <menu_item_check label="光と影" name="Advanced Lighting Model"/> <menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO と影の平滑化" name="SSAO and Shadow Smoothing"/> <menu_item_check label="GL デバッグ" name="Debug GL"/> @@ -385,9 +393,14 @@ <menu_item_call label="女性アバターのテスト" name="Test Female"/> <menu_item_check label="選択アバター許可" name="Allow Select Avatar"/> </menu> + <menu label="アニメーションのスピード" name="Animation Speed"> + <menu_item_call label="すべてのアニメーションのスピードを 10% アップ" name="All Animations 10 Faster"/> + <menu_item_call label="すべてのアニメーションのスピードを 10% ダウン" name="All Animations 10 Slower"/> + <menu_item_call label="すべてのアニメーションのスピードをリセット" name="Reset All Animation Speed"/> + <menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/> + </menu> <menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/> <menu_item_check label="アニメーション情報" name="Animation Info"/> - <menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/> <menu_item_check label="見ているものを表示する" name="Show Look At"/> <menu_item_check label="クリックした場所を表示する" name="Show Point At"/> <menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/> diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml index c402fa0b6d..c402fa0b6d 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml index 5334042dc9..5334042dc9 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml index 9effed1f42..9effed1f42 100644..100755 --- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml index 54663a0367..54663a0367 100644..100755 --- a/indra/newview/skins/default/xui/ja/mime_types.xml +++ b/indra/newview/skins/default/xui/ja/mime_types.xml diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml index 0ec1030113..0ec1030113 100644..100755 --- a/indra/newview/skins/default/xui/ja/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/ja/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml index 0ec1030113..0ec1030113 100644..100755 --- a/indra/newview/skins/default/xui/ja/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/ja/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index d5cff18a24..356506f191 100644..100755 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -538,6 +538,24 @@ L$ が不足しているのでこのグループに参加することができ </url> <usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/> </notification> + <notification name="AMDOldDriver"> + お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。 + +[_URL] へアクセスして、ドライバーを更新しますか。 + <url name="url"> + http://support.amd.com/us/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/> + </notification> + <notification name="NVIDIAOldDriver"> + お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。 + +[_URL] へアクセスして、ドライバーを更新しますか。 + <url name="url"> + http://www.nvidia.com/Download/index.aspx?lang=en-us + </url> + <usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/> + </notification> <notification name="UnknownGPU"> お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。 問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。 @@ -1582,10 +1600,13 @@ http://secondlife.com/download から最新バージョンをダウンロード 現在フレンドシップを送れません。数分後にもう一度お試しください。 <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="BusyModeSet"> - 取り込み中モードになりました。 -チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてごみ箱に入ります。 - <usetemplate ignoretext="ログイン状態を取り込み中モードに変更するとき" name="okignore" yestext="OK"/> + <notification name="DoNotDisturbModeSet"> + 「通知を受けない」がオンになります。着信通信はあなたには通知されません。 + +- 他の住民は「通知を受けない」の応答（「設定」>「一般」で設定）を受け取ることになります。 +- テレポートのオファーはすべて受け取り拒否となります。 +- ボイスコールは拒否されます。 + <usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> 加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。 @@ -2076,6 +2097,10 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します [http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？ <usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + 既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。 + <usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/> + </notification> <notification name="ConfirmQuit"> 終了しようとしています。続けますか？ <usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/> @@ -2153,14 +2178,14 @@ Linden Lab <button ignore="交換しない" name="No" text="キャンセル"/> </form> </notification> - <notification label="取り込み中の警告" name="BusyModePay"> - 現在、「取り込み中」モードのため、支払いと引き換えにアイテムを受け取ることができません。 + <notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay"> + 「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。 -この取引を行うために「取り込み中」の設定を解除しますか？ +このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。 <form name="form"> - <ignore name="ignore" save_option="true" text="取り込み中モード時に支払をするとき"/> - <button ignore="常に「取り込み中」の設定を解除" name="Yes" text="OK"/> - <button ignore="常に「取り込み中」の設定を継続" name="No" text="キャンセル"/> + <ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/> + <button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/> + <button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2296,11 +2321,8 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ <notification name="GroupNotice"> 件名： [SUBJECT]、メッセージ： [MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> はオンラインです - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> はオフラインです + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> は [STATUS] です </notification> <notification name="AddSelfFriend"> 残念ながら自分自身をフレンド登録することはできません。 @@ -2530,13 +2552,6 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ <notification name="DynamicPathfindingDisabled"> この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。 </notification> - <notification name="PathfindingRebakeNavmesh"> - この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。移動オブジェクトを正しく動作させるには、「地域の再構築」ボタンをクリックします。詳しい情報は見るには「ヘルプ」を選択してください。 - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="ヘルプ" ignoretext="この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。" name="okhelpignore" yestext="OK"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。 <usetemplate name="okbutton" yestext="OK"/> @@ -2797,9 +2812,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ </form> </notification> <notification name="ScriptQuestionCaution"> - 警告：オブジェクト '<nolink>[OBJECTNAME]</nolink>' はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。 + 警告:オブジェクト '<nolink>[OBJECTNAME]</nolink>' は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。 -このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。 +そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。 <form name="form"> <button name="Grant" text="トータルアクセスを許可"/> <button name="Deny" text="拒否"/> @@ -3378,4 +3393,627 @@ M キーを押して変更します。 [NUM_ITEMS] 個のアイテムを削除中です。続けますか？ <usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。 + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。 + </notification> + <notification name="YouFrozeAvatar"> + アバターがフリーズされています。 + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] によってフリーズが解除されています。 + </notification> + <notification name="AvatarUnFrozen"> + アバターのフリーズが解除されました。 + </notification> + <notification name="AvatarFreezeFailure"> + その区画の管理権限を持っていないため、フリーズに失敗しました。 + </notification> + <notification name="AvatarFreezeThaw"> + フリーズ期間が切れました。仕事に戻ってください。 + </notification> + <notification name="AvatarCantFreeze"> + 残念ながら、そのユーザーをフリーズできません。 + </notification> + <notification name="NowOwnObject"> + これで、オブジェクト [OBJECT_NAME] の所有者になりました + </notification> + <notification name="CantRezOnLand"> + この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。 + </notification> + <notification name="RezFailTooManyRequests"> + リクエストが多すぎて、オブジェクトを Rez することができません。 + </notification> + <notification name="SitFailCantMove"> + 今回移動できなかったため、座ることができません。 + </notification> + <notification name="SitFailNotAllowedOnLand"> + その土地に対して許可を受けていないため、座ることができません。 + </notification> + <notification name="SitFailNotSameRegion"> + 移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。 + </notification> + <notification name="NoNewObjectRegionFull"> + 新しいオブジェクトを作成できません。リージョンが埋まっています。 + </notification> + <notification name="FailedToPlaceObject"> + 指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。 + </notification> + <notification name="NoOwnNoGardening"> + 所有していない土地に木や草を植えることはできません。 + </notification> + <notification name="NoCopyPermsNoObject"> + オブジェクト '[OBJ_NAME]' をコピーする権限がないため、コピーに失敗しました。 + </notification> + <notification name="NoTransPermsNoObject"> + オブジェクト '[OBJ_NAME]' をあなたに転送できないため、コピーに失敗しました。 + </notification> + <notification name="AddToNavMeshNoCopy"> + オブジェクト '[OBJ_NAME]' がナビメッシュに貢献しているため、コピーに失敗しました。 + </notification> + <notification name="DupeWithNoRootsSelected"> + ルートオブジェクトを選択せずに複製します。 + </notification> + <notification name="CantDupeCuzRegionIsFull"> + リージョンが埋まっているため、オブジェクトのコピーを作成することができません。 + </notification> + <notification name="CantDupeCuzParcelNotFound"> + オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。 + </notification> + <notification name="CantCreateCuzParcelFull"> + 区画がいっぱいのため、 +オブジェクトを作成できません。 + </notification> + <notification name="RezAttemptFailed"> + オブジェクトへの Rez の試みに失敗しました。 + </notification> + <notification name="ToxicInvRezAttemptFailed"> + このリージョンで問題を引き起こすアイテムは作成できません。 + </notification> + <notification name="InvItemIsBlacklisted"> + その持ち物アイテムはブラックリストに登録されています。 + </notification> + <notification name="NoCanRezObjects"> + 現在あなたにはオブジェクトを作成するための許可がありません。 + </notification> + <notification name="LandSearchBlocked"> + 土地の検索がブロックされました。 +短期間に多くの土地を検索したためです。 +しばらくしてから再度お試しください。 + </notification> + <notification name="NotEnoughResourcesToAttach"> + オブジェクトの着用に使用できるスクリプトリソースが足りません。 + </notification> + <notification name="YouDiedAndGotTPHome"> + 死んでしまったので、ホームにテレポートされました。 + </notification> + <notification name="EjectComingSoon"> + ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。 + </notification> + <notification name="NoEnterServerFull"> + サーバーが埋まっているため、 +このリージョンに入場することはできません。 + </notification> + <notification name="SaveBackToInvDisabled"> + 「「持ち物」に保存」が無効になっています。 + </notification> + <notification name="NoExistNoSaveToContents"> + '[OBJ_NAME]' の Rez 元であるオブジェクトが存在しないため、このオブジェクトをオブジェクトコンテンツに保存できません。 + </notification> + <notification name="NoModNoSaveToContents"> + オブジェクト '[DEST_NAME]' を修正する権限がないため、オブジェクトのコンテンツに '[OBJ_NAME]' を保存できません。 + </notification> + <notification name="NoSaveBackToInvDisabled"> + インベントリに '[OBJ_NAME]' を保存することはできません - この操作が無効になっています。 + </notification> + <notification name="NoCopyNoSelCopy"> + オブジェクト '[OBJ_NAME]' を変更する権限を持っていないため、選択したものをコピーできません。 + </notification> + <notification name="NoTransNoSelCopy"> + オブジェクト '[OBJ_NAME]' を転送できないため、選択したものをコピーできません。 + </notification> + <notification name="NoTransNoCopy"> + オブジェクト '[OBJ_NAME]' を転送できないため、選択したものをコピーできません。 + </notification> + <notification name="NoPermsNoRemoval"> + シミュレータからのオブジェクト '[OBJ_NAME]' の削除は、権限システムによって無効にされています。 + </notification> + <notification name="NoModNoSaveSelection"> + オブジェクト '[OBJ_NAME]' を変更する権限を持っていないため、選択したものを保存できません。 + </notification> + <notification name="NoCopyNoSaveSelection"> + オブジェクト '[OBJ_NAME]' をコピーできないため、選択したものを保存できません。 + </notification> + <notification name="NoModNoTaking"> + オブジェクト '[OBJ_NAME]' を変更する権限を持っていないため、選択したものを取得できません。 + </notification> + <notification name="RezDestInternalError"> + 内部エラー: 不明な宛先タイプ。 + </notification> + <notification name="DeleteFailObjNotFound"> + オブジェクトが見つからないため削除できませんでした。 + </notification> + <notification name="SorryCantEjectUser"> + 残念ながら、そのユーザーを追放することはできません。 + </notification> + <notification name="RegionSezNotAHome"> + このリージョンでは、ここにホームの位置を設定できません。 + </notification> + <notification name="HomeLocationLimits"> + ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。 + </notification> + <notification name="HomePositionSet"> + 家の配置の設定。 + </notification> + <notification name="AvatarEjected"> + アバターが追放されました。 + </notification> + <notification name="AvatarEjectFailed"> + その区画の管理権限がないため、追放できませんでした。 + </notification> + <notification name="CantMoveObjectParcelFull"> + 区画が埋まっているため、オブジェクト '[OBJECT_NAME]' を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。 + </notification> + <notification name="CantMoveObjectParcelPerms"> + オブジェクト '[OBJECT_NAME]' は、この区画で許可されていないため、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。 + </notification> + <notification name="CantMoveObjectParcelResources"> + この区画でこのオブジェクトのリソースが不足しているため、オブジェクト '[OBJECT_NAME]' をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。 + </notification> + <notification name="CantMoveObjectRegionVersion"> + オブジェクト '[OBJECT_NAME]' をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動することはできません。他のリージョンでは、リージョンの境界をまたいだこのオブジェクトを受信することができない古いバージョンを実行しているためです。 + </notification> + <notification name="CantMoveObjectNavMesh"> + リージョン境界をまたぐナビメッシュを変更できないため、オブジェクト '[OBJECT_NAME]' をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。 + </notification> + <notification name="CantMoveObjectWTF"> + 不明な理由により、オブジェクト '[OBJECT_NAME]' を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。 +([FAILURE_TYPE]) + </notification> + <notification name="NoPermModifyObject"> + そのオブジェクトを変更する権限がありません + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。 + </notification> + <notification name="CantEnablePhysKeyframedObj"> + キーフレームオブジェクトのために物理を有効にできません。 + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + 土地のリソースが足りないため、オブジェクトの物理を有効にできません。 + </notification> + <notification name="CantEnablePhysCostTooGreat"> + [MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。 + </notification> + <notification name="PhantomWithConcavePiece"> + このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。 + </notification> + <notification name="UnableAddItem"> + アイテムを追加できません! + </notification> + <notification name="UnableEditItem"> + これは編集できません! + </notification> + <notification name="NoPermToEdit"> + これを編集する許可がありません。 + </notification> + <notification name="NoPermToCopyInventory"> + そのインベントリをコピーすることは許可されません。 + </notification> + <notification name="CantSaveItemDoesntExist"> + オブジェクトのコンテンツに保存できません。アイテムが存在していません。 + </notification> + <notification name="CantSaveItemAlreadyExists"> + オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。 + </notification> + <notification name="CantSaveModifyAttachment"> + オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。 + </notification> + <notification name="TooManyScripts"> + スクリプトが多すぎます。 + </notification> + <notification name="UnableAddScript"> + テキストを追加できません! + </notification> + <notification name="AssetServerTimeoutObjReturn"> + 資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。 + </notification> + <notification name="RegionDisablePhysicsShapes"> + このリージョンでは、物理的シェイプが有効にされていません。 + </notification> + <notification name="NoModNavmeshAcrossRegions"> + リージョンの境界をまたぐナビメッシュは変更できません。 + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + そのオブジェクトタイプの物理的プロパティを設定できません。 + </notification> + <notification name="NoSetRootPrimWithNoShape"> + ルートプリムを設定できないため、シェイプがありません。 + </notification> + <notification name="NoRegionSupportPhysMats"> + このリージョンでは、物理的素材が有効にされていません。 + </notification> + <notification name="OnlyRootPrimPhysMats"> + 物理的素材を調整できるのは、ルートプリムだけです。 + </notification> + <notification name="NoSupportCharacterPhysMats"> + キャラクターへの物理的素材の設定はまだサポートされていません。 + </notification> + <notification name="InvalidPhysMatProperty"> + 指定した物理的素材のプロパティが 1 つ以上無効です。 + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + メッシュオブジェクトの縫い目のタイプを変更することはできません。 + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + メッシュオブジェクトの形状を変更することはできません + </notification> + <notification name="FullRegionCantEnter"> + リージョンが埋まっているため、\nこのリージョンに入場できません。 + </notification> + <notification name="LinkFailedOwnersDiffer"> + リンクエラー -- 所有者が違います + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。 + </notification> + <notification name="LinkFailedNoPermToEdit"> + リンクエラー -- 編集権限がありません。 + </notification> + <notification name="LinkFailedTooManyPrims"> + リンクエラー -- プリミティブが多すぎます。 + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + リンクエラー -- コピーなしと転送なしをリンクできません。 + </notification> + <notification name="LinkFailedNothingLinkable"> + リンクエラー -- リンクできるものがありません。 + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + リンクエラー -- パスファインディングの文字数が多すぎます + </notification> + <notification name="LinkFailedInsufficientLand"> + リンクエラー -- 土地のリソースが足りません + </notification> + <notification name="LinkFailedTooMuchPhysics"> + オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。 + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + 区画 '[PARCEL_NAME]' のオブジェクト '[OBJECT_NAME]' によって、あなたはホームにテレポートされました。 + </notification> + <notification name="TeleportedHomeByObject"> + オブジェクト '[OBJECT_NAME]' によって、あなたはホームへテレポートされています。 + </notification> + <notification name="TeleportedByAttachment"> + [ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。 + </notification> + <notification name="TeleportedByObjectOnParcel"> + 区画 '[PARCEL_NAME]' のオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。 + </notification> + <notification name="TeleportedByObjectOwnedBy"> + [OWNER_ID] が所有しているオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。 + </notification> + <notification name="TeleportedByObjectUnknownUser"> + 不明なユーザーが所有しているオブジェクト '[OBJECT_NAME]' によって、あなたはテレポートされています。 + </notification> + <notification name="CantCreateObjectRegionFull"> + リクエストされたオブジェクトを作成できません。リージョンが埋まっています。 + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + 1 つの場所に複数のオブジェクトを着用することはできません。 + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + ここでは、複数のオブジェクトを作成することはできません。 + </notification> + <notification name="UnableToCreateObjTimeOut"> + リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。 + </notification> + <notification name="UnableToCreateObjUnknown"> + リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。 + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + 要求されたオブジェクトを作成できません。もう一度お試しください。 + </notification> + <notification name="RezFailureTookTooLong"> + リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。 + </notification> + <notification name="FailedToPlaceObjAtLoc"> + 指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。 + </notification> + <notification name="CantCreatePlantsOnLand"> + この土地に木を植えることはできません。 + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + オブジェクトをリストアできません。ワールドの位置が見つかりません。 + </notification> + <notification name="CantRezObjectInvalidMeshData"> + メッシュデータが無効なため、オブジェクトを Rez することができません。 + </notification> + <notification name="CantRezObjectTooManyScripts"> + このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。 + </notification> + <notification name="CantCreateObjectNoAccess"> + 現在のアクセス権限では、そこにオブジェクトを作成できません。 + </notification> + <notification name="CantCreateObject"> + 現在あなたにはオブジェクト作成する許可がありません。 + </notification> + <notification name="InvalidObjectParams"> + 無効なオブジェクトパラメーター + </notification> + <notification name="CantDuplicateObjectNoAcess"> + 現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。 + </notification> + <notification name="CantChangeShape"> + あなたにはこのシェイプを変更する許可がありません。 + </notification> + <notification name="NoAccessToClaimObjects"> + 現在のアクセス権限では、ここにオブジェクトを取得できません。 + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。 + </notification> + <notification name="NoPrivsToBuyObject"> + 現在のアクセス権限では、ここでオブジェクトを購入できません。 + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + アバターがオブジェクトに存在するため、オブジェクトを着用できません。 + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + 木や草をアタッチメントとして着用できません。 + </notification> + <notification name="CantAttachGroupOwnedObjs"> + グループが所有しているオブジェクトは着用できません。 + </notification> + <notification name="CantAttachObjectsNotOwned"> + 所有していないオブジェクトは着用できません。 + </notification> + <notification name="CantAttachNavmeshObjects"> + ナビメッシュに貢献しているオブジェクトは着用できません。 + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。 + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + オブジェクトの着用に使用できるスクリプトリソースが足りません。 + </notification> + <notification name="CantDropItemTrialUser"> + オブジェクトをここにドロップできません。フリートライアル領域をお試しください。 + </notification> + <notification name="CantDropMeshAttachment"> + メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。 + </notification> + <notification name="CantDropAttachmentNoPermission"> + アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。 + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。 + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + 利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。 + </notification> + <notification name="CantDropObjectFullParcel"> + ここにオブジェクトをドロップできません。区画が埋まっています。 + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + 土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。 + </notification> + <notification name="PlzNarrowDeleteParams"> + 削除パラメーターを絞ってください。 + </notification> + <notification name="UnableToUploadAsset"> + 資産をアップロードできません。 + </notification> + <notification name="CantTeleportCouldNotFindUser"> + ホームをテレポートするユーザーが見つかりませんでした。 + </notification> + <notification name="GodlikeRequestFailed"> + 過剰なリクエストが失敗しました + </notification> + <notification name="GenericRequestFailed"> + 一般的なリクエストに失敗しました + </notification> + <notification name="CantUploadPostcard"> + ポストカードをアップロードできません。後でもう一度お試しください。 + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + グループ通知のインベントリの詳細を取得できません。 + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + グループ通知の送信が許可されないため、送信できません。 + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + グループ通知を送信できません。持ち物を作成することもできません。 + </notification> + <notification name="CantParceInventoryInNotice"> + 通知内の持ち物を検出できません。 + </notification> + <notification name="TerrainUploadFailed"> + 地形のアップロードに失敗しました。 + </notification> + <notification name="TerrainFileWritten"> + 地形ファイルが書き込まれました。 + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + 地形ファイルを書き出し、ダウンロードを開始しています... + </notification> + <notification name="TerrainBaked"> + 地形がベークされました。 + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + 選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。 + </notification> + <notification name="UpdateViewerBuyParcel"> + この区画を購入するには、ビューワをアップデートする必要があります。 + </notification> + <notification name="CantBuyParcelNotForSale"> + 購入することができません。この区画は販売対象ではありません。 + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + 販売価格または土地の面積が変わったため、購入できません。 + </notification> + <notification name="CantBuyParcelNotAuthorized"> + あなたはこの区画の委任された買い手ではありません。 + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + すでに購入の認証を待機しているため、この区画を購入できません。 + </notification> + <notification name="CantBuildOverflowParcel"> + 区画をオーバーフローするため、ここでオブジェクトを構築することはできません。 + </notification> + <notification name="SelectedMultipleOwnedLand"> + 所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。 + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + 選択範囲のリース区画の数が少ないため、参加できません。 + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + 土地を分割できません。\n区画が複数選択されています。\nもっと小さい土地を選択してみてください。 + </notification> + <notification name="CantDivideLandCantFindParcel"> + 土地を分解できません。\n区画が見つかりません。\n「Help」>「Reprt Bug...」でレポートを行ってください。 + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + 土地を分割できません。区画全体を選択します。\n小さい土地を選択してみてください。 + </notification> + <notification name="LandHasBeenDivided"> + 土地が分割されています。 + </notification> + <notification name="PassPurchased"> + 入場許可を購入しました。 + </notification> + <notification name="RegionDisallowsClassifieds"> + リージョンでは、クラシファイド広告を許可しません。 + </notification> + <notification name="LandPassExpireSoon"> + この土地への入場許可はまもなく期限が切れます。 + </notification> + <notification name="CantSitNoSuitableSurface"> + 配置に適した表面がありません。別の場所を試してみたください。 + </notification> + <notification name="CantSitNoRoom"> + ここには座る余地がありません。他の場所を試してください。 + </notification> + <notification name="ClaimObjectFailedNoPermission"> + 権限がないため、オブジェクトを取得できませんでした。 + </notification> + <notification name="ClaimObjectFailedNoMoney"> + リンデンドルが足りないため、オブジェクトの取得に失敗しました。 + </notification> + <notification name="CantDeedGroupLand"> + グループ所有の土地は、譲渡できません。 + </notification> + <notification name="BuyObjectFailedNoMoney"> + リンデンドルが足りないため、オブジェクトの購入に失敗しました。 + </notification> + <notification name="BuyInventoryFailedNoMoney"> + リンデンドルが不足しているため、インベントリを購入できませんでした。 + </notification> + <notification name="BuyPassFailedNoMoney"> + リンデンドルが足りないため、この土地への入場許可を購入できません。 + </notification> + <notification name="CantBuyPassTryAgain"> + 今すぐには入場許可を購入できません。後でもう一度お試しください。 + </notification> + <notification name="CantCreateObjectParcelFull"> + 区画が埋まっているため、オブジェクトを\n作成することができません。 + </notification> + <notification name="FailedPlacingObject"> + 指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。 + </notification> + <notification name="CantCreateLandmarkForEvent"> + イベントのためのランドマークを作成することができません。 + </notification> + <notification name="GodBeatsFreeze"> + 強力な力でフリーズを解除します。 + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + 特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。 + </notification> + <notification name="ExpireExplanation"> + システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。 + </notification> + <notification name="DieExplanation"> + システムは、あなたのリクエストを処理できません。 + </notification> + <notification name="AddPrimitiveFailure"> + プリミティブ広告を出すには、資金が足りません。 + </notification> + <notification name="RezObjectFailure"> + 資金が足りないため、オブジェクトを作成できません。 + </notification> + <notification name="ResetHomePositionNotLegal"> + ホームが不正なため、ホームの位置をリセットします。 + </notification> + <notification name="CantInviteRegionFull"> + リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。 + </notification> + <notification name="CantSetHomeAtRegion"> + このリージョンでは、ここにホームの位置を設定できません。 + </notification> + <notification name="ListValidHomeLocations"> + ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。 + </notification> + <notification name="SetHomePosition"> + 家の配置の設定。 + </notification> + <notification name="CantDerezInventoryError"> + インベントリエラーのため、オブジェクトの Rez 解除ができません。 + </notification> + <notification name="CantCreateRequestedInv"> + リクエストされたインベントリを作成できません。 + </notification> + <notification name="CantCreateRequestedInvFolder"> + リクエストされた持ち物フォルダーを作成できません。 + </notification> + <notification name="CantCreateInventory"> + そのインベントリを作成できません。 + </notification> + <notification name="CantCreateLandmark"> + ランドマークを作成できません。 + </notification> + <notification name="CantCreateOutfit"> + アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。 + </notification> + <notification name="InventoryNotForSale"> + インベントリは販売対象ではありません。 + </notification> + <notification name="CantFindInvItem"> + 持ち物アイテムを見つけることができません。 + </notification> + <notification name="CantFindObject"> + オブジェクトが見つかりません。 + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + オブジェクトへの送金は、このリージョンでは現在無効にされています。 + </notification> + <notification name="CantPayNoAgent"> + 支払いの相手を把握できませんでした。 + </notification> + <notification name="CantDonateToPublicObjects"> + パブリックオブジェクトにリンデンドルを与えることはできません。 + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + インワールドオブジェクトでのインベントリ作成に失敗しました。 + </notification> + <notification name="UserBalanceOrLandUsageError"> + 内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。 + </notification> + <notification name="LargePrimAgentIntersect"> + 他のプレイヤーの関心を引く大きなプリムを作成できません。他のプレイヤーが移動したときに再試行してください。 + </notification> + <notification name="PreferenceChatClearLog"> + これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。 + <usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。 + <usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/> + </notification> + <notification name="PreferenceChatPathChanged"> + ファイルを移動できません。以前のパスがリストアされました。 + <usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100644..100755 --- a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml index 90491e84c5..90491e84c5 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml index 17e1283d24..17e1283d24 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml index 70d37c3bad..3ef8eba19f 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml @@ -27,5 +27,6 @@ <icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/> <icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/> <icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/> + <button name="info_btn" tool_tip="詳細"/> <button name="profile_btn" tool_tip="プロフィールの表示"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml index fd91ea97d1..fd91ea97d1 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml index 5d6a6065ae..9263e5f347 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> - <text name="title_text"> - ブロックリスト - </text> - <scroll_list name="blocked" tool_tip="現在ブロックされている住人一覧"/> - <button label="アバターをブロック" label_selected="住人をブロック..." name="Block resident..." tool_tip="ブロックしたい住人を選んでください"/> - <button label="名前でオブジェクトをブロック..." label_selected="名前でオブジェクトをブロック..." name="Block object by name..." tool_tip="名前でブロックしたいオブジェクトを選んでください"/> - <button label="ブロック解除" label_selected="ブロック解除" name="Unblock" tool_tip="ブロックリストから住人・オブジェクトを削除"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="フィルター" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/> + <menu_button name="view_btn" tool_tip="オプションを並べ替える"/> + <menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/> + <button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/> + </panel> + <block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml index 95a5a26d4e..95a5a26d4e 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml index 42d8a21660..42d8a21660 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml index 6eca8adfe5..6eca8adfe5 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml index 7916bf5155..7916bf5155 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml index 6717ba9ba3..6717ba9ba3 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml index 57a255afde..57a255afde 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml index 2159f17fec..2159f17fec 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml index 158b2fa6ac..158b2fa6ac 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml index b9bc10c220..b9bc10c220 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml new file mode 100644 index 0000000000..09ffb92d36 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="（ローディング）"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..e05a67e31d --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="ボイスチャット"/> + <icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/> + <button name="delete_btn" tool_tip="このエントリーを削除"/> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml index a1e30283ee..a1e30283ee 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml index 0395d4edd8..0395d4edd8 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml index 7250da69a4..7250da69a4 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml index b556b68e02..b556b68e02 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml index 94967999a1..94967999a1 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml index 72eb120c3d..72eb120c3d 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml index f73f760192..f73f760192 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml index ee39e9435c..ee39e9435c 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml index 6a1789c9f4..6a1789c9f4 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml index 6ebf0062dc..6ebf0062dc 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml index 39ea1df1e3..39ea1df1e3 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml index 4cbd7f793b..4cbd7f793b 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml index 5a3a949150..5a3a949150 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml index f33daa4eba..f33daa4eba 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml index c7626189af..c7626189af 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml index 7573132576..7573132576 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml index 6efc4ce99a..6efc4ce99a 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml index 71fc7c5682..71fc7c5682 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml index f4cfe6d83f..f4cfe6d83f 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml index f345a81922..f345a81922 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml index 66b2ffa8ba..66b2ffa8ba 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml index 000dac7b5b..000dac7b5b 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml index 49749732c9..49749732c9 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml index a1bfb67823..a1bfb67823 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml index 7aa1aec6d0..7aa1aec6d0 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml index cc9ebc405b..cc9ebc405b 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml index 82be58a0fb..82be58a0fb 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml index 4b548049c8..77d3d8f391 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="不明"/> + <button name="info_btn" tool_tip="詳細"/> <button name="profile_btn" tool_tip="プロフィールの表示"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml index ddad6c1f9b..ddad6c1f9b 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml index 7135ae780d..7135ae780d 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml index d40dedf566..d40dedf566 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml index f2429ac12a..f2429ac12a 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml index bf4cbcdc46..bf4cbcdc46 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml index 7fca66f90f..7fca66f90f 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml index 24d6ff23ae..24d6ff23ae 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml index 396d9e65b1..396d9e65b1 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_login.xml +++ b/indra/newview/skins/default/xui/ja/panel_login.xml diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml index f908262f4f..f908262f4f 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml index 3df1ae8048..3df1ae8048 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_me.xml +++ b/indra/newview/skins/default/xui/ja/panel_me.xml diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml index 6321dbb048..6321dbb048 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml index 11d9ed4c16..11d9ed4c16 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml index ea4fdb9ce5..ea4fdb9ce5 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml index 51402b2e00..51402b2e00 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml index 4048b48d3a..4048b48d3a 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml index 5998206f27..201fb0a376 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して発言し、Ctrl + Enter キーで叫びます。"/> <button name="show_nearby_chat" tool_tip="近くのチャットログを表示・非表示"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml index c29ec64304..c29ec64304 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml index aff427ed49..aff427ed49 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml index 8e0cf4bc9d..8e0cf4bc9d 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml index 1a14283113..1a14283113 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml index e89ce0c479..e89ce0c479 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml index 93df0ba2bd..93df0ba2bd 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml index e8caab0696..e8caab0696 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml index df9ef40113..df9ef40113 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml index fd03e6b89e..fd03e6b89e 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml index 88c31451b5..03ce87537a 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_people.xml +++ b/indra/newview/skins/default/xui/ja/panel_people.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- Side tray panel --> <panel label="人" name="people_panel"> <string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/> @@ -14,81 +14,53 @@ <string name="no_filtered_friends_msg"> お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。 </string> - <string name="people_filter_label" value="人をフィルター"/> - <string name="groups_filter_label" value="グループをフィルター"/> <string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/> <string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/> <string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/> <string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/> - <filter_editor label="フィルター" name="filter_input"/> <tab_container name="tabs"> <panel label="近く" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="オプション"/> - <button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="人をフィルター" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="選択した人に対するアクション"/> + <menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/> + <button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/> + <dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/> </panel> </panel> - <panel label="マイ フレンド" name="friends_panel"> + <panel label="フレンド" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="人をフィルター" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="選択した人に対するアクション"/> + <menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/> + <button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/> + <dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="オンライン"/> <accordion_tab name="tab_all" title="全員"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="オプションを表示します"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="フレンド登録を申し出る"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="マイ グループ" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="オプション"/> - <button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/> - <button name="activate_btn" tool_tip="選択したグループをアクティブにします"/> + <panel label="グループ" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="フィルターグループ" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/> + <menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/> + <menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/> + <dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/> </panel> </panel> <panel label="最新" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="オプション"/> - <button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="人をフィルター" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="選択した人に対するアクション"/> + <menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/> + <button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/> + <dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/> </panel> </panel> + <panel label="停止" name="blocked_panel"> + <panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="コール" name="call_btn" tool_tip="この住人にコールする"/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="グループプロフィール" name="group_info_btn" tool_tip="グループプロフィールを表示します"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="グループコール" name="group_call_btn" tool_tip="このグループにコールする"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_pick_info.xml b/indra/newview/skins/default/xui/ja/panel_pick_info.xml index e7b5d1929d..e7b5d1929d 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml index c6eaaeef41..c6eaaeef41 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_picks.xml +++ b/indra/newview/skins/default/xui/ja/panel_picks.xml diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml index 7235bc0f18..7235bc0f18 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml index 9d3925afdc..9d3925afdc 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_places.xml +++ b/indra/newview/skins/default/xui/ja/panel_places.xml diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml index b7c3f48557..b7c3f48557 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml index 314aaef7fd..314aaef7fd 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml index dcaa23fee5..dcaa23fee5 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml index 7fd2e31698..7fd2e31698 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml 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 b6e344ca48..ae5391c7bd 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="チャット" name="chat"> - <text name="font_size"> - 文字の大きさ： - </text> - <radio_group name="chat_font_size"> - <radio_item label="小" name="radio" value="0"/> - <radio_item label="中" name="radio2" value="1"/> - <radio_item label="大" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/> - <check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/> - <check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/> - <check_box label="吹き出しチャット" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - IM の表示方法： - </text> - <text name="requires_restart_label"> - （再起動後に反映） - </text> - <radio_group name="chat_window" tool_tip="インスタントメッセージを別フローター、または1つのフローターに複数タブで表示します（要再起動）"> - <radio_item label="別々のウィンドウ" name="radio" value="0"/> - <radio_item label="タブ" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - 受信チャットのポップアップを有効にする - </text> - <check_box label="グループチャット" name="EnableGroupChatPopups" tool_tip="これを選択すると、グループチャットメッセージを受信した際にポップアップが表示されます"/> - <check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/> - <spinner label="近くのチャットメッセージが表示される長さ：" name="nearby_toasts_lifetime"/> - <spinner label="近くのチャットメッセージが消えるまでの長さ：" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/> + <check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/> + <check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/> + <text name="font_size"> + 文字の大きさ： + </text> + <combo_box name="chat_font_size"> + <item label="小規模" name="Small" value="0"/> + <item label="中" name="Medium" value="1"/> + <item label="大規模" name="Large" value="2"/> + </combo_box> + <check_box label="吹き出しチャット" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + 通知 + </text> + <text name="friend_ims"> + フレンド IM: + </text> + <combo_box name="FriendIMOptions"> + <item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/> + <item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/> + <item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/> + <item label="フィルターなし" name="None" value="none"/> + </combo_box> + <text name="non_friend_ims"> + 非フレンド IM: + </text> + <combo_box name="NonFriendIMOptions"> + <item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/> + <item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/> + <item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/> + <item label="フィルターなし" name="None" value="none"/> + </combo_box> + <text name="conference_ims"> + コンファレンス IM: + </text> + <combo_box name="ConferenceIMOptions"> + <item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/> + <item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/> + <item label="Flashツールバーボタン" name="FlashToolbarButton" value="flash"/> + <item label="フィルターなし" name="None" value="none"/> + </combo_box> + <text name="group_chat"> + グループチャット: + </text> + <combo_box name="GroupChatOptions"> + <item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/> + <item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/> + <item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/> + <item label="なし" name="None" value="none"/> + </combo_box> + <text name="nearby_chat"> + 近くのチャット: + </text> + <combo_box name="NearbyChatOptions"> + <item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/> + <item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/> + <item label="Flash ツールバーボタン" name="FlashToolBarButton" value="flash"/> + <item label="フィルターなし" name="None" value="none"/> + </combo_box> + <text name="notifications_alert"> + すべての通知を一時的に受け付けないようにするには、「コミュニケート」>「通知を受けない」を使用します。 + </text> + </panel> + <panel> + <text name="play_sound"> + 音の再生: + </text> + <check_box label="新しい会話" name="new_conversation"/> + <check_box label="ボイスコールの着信" name="incoming_voice_call"/> + <check_box label="テレポートを渡す" name="teleport_offer"/> + <check_box label="アイテムのオファー" name="inventory_offer"/> + </panel> + <panel> + <button label="ログのクリア..." name="clear_log"/> + <button label="テキストの削除..." name="delete_transcripts"/> + <button label="参照..." label_selected="参照" name="log_path_button"/> + </panel> <button label="他の言語..." name="ok_btn"/> <button label="自動置換..." name="autoreplace_showgui"/> <button label="スペルチェック中..." name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml index 9f6abf8fcb..9f6abf8fcb 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index 91e1514e49..d70af7e099 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -69,9 +69,9 @@ <combo_box.item label="一時退席設定なし" name="item4"/> </combo_box> <text name="text_box3"> - 取り込み中モード時の返事： + 「通知を受けない」応答: </text> - <text_editor name="busy_response"> + <text_editor name="do_not_disturb_response"> log_in_to_change </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml index 1786b4befc..1786b4befc 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml index 121bebfd52..121bebfd52 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml index 420bbed572..420bbed572 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml index d90a1632ab..d90a1632ab 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml index 3a4c360ccc..3a4c360ccc 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml index 5506373eb0..5506373eb0 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml index 5214f79141..5214f79141 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml index 169da27ce5..169da27ce5 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml index f6ef3f0934..f6ef3f0934 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml index b5cc6b9765..b5cc6b9765 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml index 65148cf1ee..65148cf1ee 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml index fb853c1925..fb853c1925 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml index 14d55002a3..14d55002a3 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml index 494884c187..494884c187 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml index d91eba9699..d91eba9699 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml index b698fa762d..b698fa762d 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml index d06db8ccb1..d06db8ccb1 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml index ea17cd6526..ea17cd6526 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml index e496e6602b..e496e6602b 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml index cb658fb6c9..cb658fb6c9 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml index c3b1cd91e7..c3b1cd91e7 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml index 1ddd723840..1ddd723840 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml index b860a6afe9..b860a6afe9 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml index 0824504235..0824504235 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml index 2308aff19b..2308aff19b 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml index f09643d562..f09643d562 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml index 81db7c8989..81db7c8989 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml index 58e396877c..58e396877c 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml index c570cd5696..c570cd5696 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml index 530f0fb59d..530f0fb59d 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml index 967dedf061..967dedf061 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml index 8ff853193a..8ff853193a 100644..100755 --- a/indra/newview/skins/default/xui/ja/panel_world_map.xml +++ b/indra/newview/skins/default/xui/ja/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml index 896ed556ae..896ed556ae 100644..100755 --- a/indra/newview/skins/default/xui/ja/role_actions.xml +++ b/indra/newview/skins/default/xui/ja/role_actions.xml diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml index 30cef9ccc0..30cef9ccc0 100644..100755 --- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml index 51d6d48f90..51d6d48f90 100644..100755 --- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml index e70d91d258..e70d91d258 100644..100755 --- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml index c61c73657f..4f65c8477b 100644..100755 --- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="オブジェクトを買う" name="Buyobject"/> <combo_box.item label="オブジェクトに支払う" name="Payobject"/> <combo_box.item label="開く" name="Open"/> + <combo_box.item label="ズーム" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 50697e5500..b27904c4d7 100644..100755 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -137,7 +137,7 @@ 終了 </string> <string name="create_account_url"> - http://join.secondlife.com/index.php?lang=ja-JP&sourceid=[sourceid] + http://join.secondlife.com/?sourceid=[sourceid] </string> <string name="LoginFailedViewerNotPermitted"> お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください： @@ -622,8 +622,8 @@ support@secondlife.com にお問い合わせください。 <string name="AvatarAway"> 一時退席中 </string> - <string name="AvatarBusy"> - 取り込み中 + <string name="AvatarDoNotDisturb"> + 通知を受けない </string> <string name="AvatarMuted"> ブロック中 @@ -859,6 +859,12 @@ support@secondlife.com にお問い合わせください。 <string name="ST_NO_JOINT"> ROOT または JOINT が見つかりません </string> + <string name="NearbyChatTitle"> + 近くのチャット + </string> + <string name="NearbyChatLabel"> + (近くのチャット) + </string> <string name="whisper"> のささやき: </string> @@ -922,12 +928,15 @@ support@secondlife.com にお問い合わせください。 <string name="ControlYourCamera"> カメラのコントロール </string> - <string name="TeleportYourAgent"> - あなたをテレポート - </string> <string name="NotConnected"> 接続されていません </string> + <string name="AgentNameSubst"> + (あなた) + </string> + <string name="TeleportYourAgent"> + あなたをテレポート + </string> <string name="SIM_ACCESS_PG"> General </string> @@ -1009,18 +1018,6 @@ support@secondlife.com にお問い合わせください。 <string name="dictionary_files"> 辞書 </string> - <string name="AvatarSetNotAway"> - 一時退席中解除 - </string> - <string name="AvatarSetAway"> - 一時退席中 - </string> - <string name="AvatarSetNotBusy"> - 取り込み中解除 - </string> - <string name="AvatarSetBusy"> - 取り込み中 - </string> <string name="shape"> シェイプ </string> @@ -1989,8 +1986,8 @@ support@secondlife.com にお問い合わせください。 <string name="PanelContentsNewScript"> 新規スクリプト </string> - <string name="BusyModeResponseDefault"> - メッセージを送った住人は、誰にも邪魔をされたくないため現在「取り込み中」モードです。 あなたのメッセージは、あとで確認できるように IM パネルに表示されます。 + <string name="DoNotDisturbModeResponseDefault"> + この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。 </string> <string name="MuteByName"> （名称別） @@ -2103,9 +2100,6 @@ support@secondlife.com にお問い合わせください。 <string name="GroupMoneyDate"> [year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc] </string> - <string name="ViewerObjectContents"> - 内容 - </string> <string name="AcquiredItems"> 取得アイテム </string> @@ -3877,7 +3871,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ General リージョン </string> <string name="LocationCtrlSeeAVsTooltip"> - この区画外にアバターを見えるようにして、チャットも許可 + この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。 </string> <string name="LocationCtrlPathfindingDirtyTooltip"> 地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。 @@ -3954,6 +3948,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="IM_unblock_only_groups_friends"> このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。 </string> + <string name="OnlineStatus"> + オンライン + </string> + <string name="OfflineStatus"> + オフライン + </string> <string name="answered_call"> 相手がコールを受けました </string> @@ -3963,6 +3963,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="you_joined_call"> ボイスコールに参加しました </string> + <string name="you_auto_rejected_call-im"> + 「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。 + </string> <string name="name_started_call"> [NAME] はボイスコールを開始します </string> @@ -3979,7 +3982,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ 接続中... </string> <string name="conference-title"> - アドホックコンファレンス + 複数人チャット </string> <string name="conference-title-incoming"> [AGENT_NAME] とコンファレンスする @@ -4859,6 +4862,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Command_Chat_Label"> チャット </string> + <string name="Command_Conversations_Label"> + 会話 + </string> <string name="Command_Compass_Label"> コンパス </string> @@ -4934,6 +4940,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Command_Chat_Tooltip"> 近くの人と文字チャットする </string> + <string name="Command_Conversations_Tooltip"> + 全員との会話 + </string> <string name="Command_Compass_Tooltip"> コンパス </string> @@ -5063,4 +5072,13 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="UserDictionary"> [User] </string> + <string name="logging_calls_disabled_log_empty"> + 会話はログに記録されていません。ログの記録を開始するには、「環境設定」>「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。 + </string> + <string name="logging_calls_disabled_log_not_empty"> + これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」>「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。 + </string> + <string name="logging_calls_enabled_log_empty"> + ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。 + </string> </strings> diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml index 7868c25807..7868c25807 100644..100755 --- a/indra/newview/skins/default/xui/ja/teleport_strings.xml +++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml index 0e777751d3..0e777751d3 100644..100755 --- a/indra/newview/skins/default/xui/ja/xui_version.xml +++ b/indra/newview/skins/default/xui/ja/xui_version.xml diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml index 409429ffaa..409429ffaa 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_about.xml +++ b/indra/newview/skins/default/xui/pl/floater_about.xml 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 badff11a59..badff11a59 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_activeim.xml b/indra/newview/skins/default/xui/pl/floater_activeim.xml index 2a34409f8b..2a34409f8b 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_activeim.xml +++ b/indra/newview/skins/default/xui/pl/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml index 3402d8d31f..3402d8d31f 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml index 9399fa1115..9399fa1115 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_auction.xml +++ b/indra/newview/skins/default/xui/pl/floater_auction.xml diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml index da0e947683..da0e947683 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml index 45b9e066e9..45b9e066e9 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/pl/floater_beacons.xml b/indra/newview/skins/default/xui/pl/floater_beacons.xml index e6286a6ac1..e6286a6ac1 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_beacons.xml +++ b/indra/newview/skins/default/xui/pl/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/pl/floater_build_options.xml b/indra/newview/skins/default/xui/pl/floater_build_options.xml index 5d296aa725..5d296aa725 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_build_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml index 1c24e0b35e..1c24e0b35e 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/pl/floater_bumps.xml b/indra/newview/skins/default/xui/pl/floater_bumps.xml index c1045ece9a..c1045ece9a 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_bumps.xml +++ b/indra/newview/skins/default/xui/pl/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml index 94f2b50450..94f2b50450 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml index 3e51761b37..3e51761b37 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml index 36ac88f7f6..36ac88f7f6 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml index 7b4f459b4e..7b4f459b4e 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_object.xml b/indra/newview/skins/default/xui/pl/floater_buy_object.xml index 85861d9e76..85861d9e76 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml index 60f3cd0fff..60f3cd0fff 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_camera.xml +++ b/indra/newview/skins/default/xui/pl/floater_camera.xml diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml index 877cedc0bc..877cedc0bc 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/pl/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml index a607ca982f..a607ca982f 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/pl/floater_critical.xml b/indra/newview/skins/default/xui/pl/floater_critical.xml index 8221a4e1bd..8221a4e1bd 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_critical.xml +++ b/indra/newview/skins/default/xui/pl/floater_critical.xml diff --git a/indra/newview/skins/default/xui/pl/floater_display_name.xml b/indra/newview/skins/default/xui/pl/floater_display_name.xml index ea28e65728..ea28e65728 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_display_name.xml +++ b/indra/newview/skins/default/xui/pl/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/pl/floater_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml index d278114969..d278114969 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_event.xml +++ b/indra/newview/skins/default/xui/pl/floater_event.xml diff --git a/indra/newview/skins/default/xui/pl/floater_font_test.xml b/indra/newview/skins/default/xui/pl/floater_font_test.xml index 019cee3e1e..019cee3e1e 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_font_test.xml +++ b/indra/newview/skins/default/xui/pl/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml index 0c27e4d0bb..0c27e4d0bb 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml index 828898de54..828898de54 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml index 471d2c39ba..471d2c39ba 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_help_browser.xml b/indra/newview/skins/default/xui/pl/floater_help_browser.xml index dfd5f907e5..dfd5f907e5 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/pl/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml index a5d85aca4e..a5d85aca4e 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_hud.xml +++ b/indra/newview/skins/default/xui/pl/floater_hud.xml diff --git a/indra/newview/skins/default/xui/pl/floater_im_container.xml b/indra/newview/skins/default/xui/pl/floater_im_container.xml index ddf0790fa8..ddf0790fa8 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_im_container.xml +++ b/indra/newview/skins/default/xui/pl/floater_im_container.xml diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml index 9041ff7416..9041ff7416 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_im_session.xml +++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml index ba9724ff9a..ba9724ff9a 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml index b06b6d713d..b06b6d713d 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml index 2c66f2851d..2c66f2851d 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_inspect.xml +++ b/indra/newview/skins/default/xui/pl/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml index c42f57fb55..c42f57fb55 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_inventory.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml index 054d74b234..054d74b234 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml index bd7b221c5d..bd7b221c5d 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml index 2b1e362b98..2b1e362b98 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_joystick.xml +++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml index 8038550bcb..8038550bcb 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml index 72a078949a..72a078949a 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml index e03c5faaeb..e03c5faaeb 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml index 7b1b395f87..7b1b395f87 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/pl/floater_map.xml b/indra/newview/skins/default/xui/pl/floater_map.xml index e01c4c8a82..e01c4c8a82 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_map.xml diff --git a/indra/newview/skins/default/xui/pl/floater_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml index 9787736ad8..9787736ad8 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/pl/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/pl/floater_media_settings.xml b/indra/newview/skins/default/xui/pl/floater_media_settings.xml index 5a36331c9a..5a36331c9a 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml index 9ce99692d0..9ce99692d0 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml index 592814dbc0..592814dbc0 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pl/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_mute_object.xml b/indra/newview/skins/default/xui/pl/floater_mute_object.xml index 4af5872ef5..4af5872ef5 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/pl/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml index 214d465f1c..214d465f1c 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml index 8e94ae821c..8e94ae821c 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_openobject.xml +++ b/indra/newview/skins/default/xui/pl/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml index de0b4d08c0..de0b4d08c0 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/pl/floater_pay.xml b/indra/newview/skins/default/xui/pl/floater_pay.xml index 38fe5286a4..38fe5286a4 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_pay.xml +++ b/indra/newview/skins/default/xui/pl/floater_pay.xml diff --git a/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/indra/newview/skins/default/xui/pl/floater_pay_object.xml index bf88348c87..bf88348c87 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/pl/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml index 2128cfa3c8..2128cfa3c8 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml index e3dce84933..e3dce84933 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_post_process.xml +++ b/indra/newview/skins/default/xui/pl/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml index fe796c6fa0..fe796c6fa0 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_postcard.xml +++ b/indra/newview/skins/default/xui/pl/floater_postcard.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml index 930a5c76b0..930a5c76b0 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_preferences.xml +++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml index d276b1f63a..d276b1f63a 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml index 8171225666..8171225666 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml index b3275cb7b5..b3275cb7b5 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml index 3825fe742e..3825fe742e 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml index e58acee139..e58acee139 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml index cfdac165cd..cfdac165cd 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml index ce1f3c0ac7..ce1f3c0ac7 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/pl/floater_region_info.xml b/indra/newview/skins/default/xui/pl/floater_region_info.xml index a1f7785f48..a1f7785f48 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_region_info.xml +++ b/indra/newview/skins/default/xui/pl/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml index a5b96601b8..a5b96601b8 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug.xml b/indra/newview/skins/default/xui/pl/floater_script_debug.xml index 714a600262..714a600262 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_limits.xml b/indra/newview/skins/default/xui/pl/floater_script_limits.xml index dd13d641a0..dd13d641a0 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_preview.xml b/indra/newview/skins/default/xui/pl/floater_script_preview.xml index eb6a1df77b..eb6a1df77b 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_queue.xml b/indra/newview/skins/default/xui/pl/floater_script_queue.xml index bdfdba569e..bdfdba569e 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_search.xml b/indra/newview/skins/default/xui/pl/floater_script_search.xml index 901d61a137..901d61a137 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_script_search.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/pl/floater_search.xml b/indra/newview/skins/default/xui/pl/floater_search.xml index a0198670e4..a0198670e4 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_search.xml +++ b/indra/newview/skins/default/xui/pl/floater_search.xml diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml index 190ad61352..190ad61352 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_select_key.xml +++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml index 2201c4b0ad..2201c4b0ad 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml index 131f92d56f..131f92d56f 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml index be92ef917d..be92ef917d 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml index ac041dff6a..ac041dff6a 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml index 886a30e5d9..886a30e5d9 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_stats.xml +++ b/indra/newview/skins/default/xui/pl/floater_stats.xml diff --git a/indra/newview/skins/default/xui/pl/floater_sys_well.xml b/indra/newview/skins/default/xui/pl/floater_sys_well.xml index e6c73af4f3..e6c73af4f3 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/pl/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml index 32cc08810d..32cc08810d 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_telehub.xml +++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml index 52c0cb8a93..52c0cb8a93 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml index 9e6fed8387..9e6fed8387 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_tools.xml diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml index 2b06ae9f78..2b06ae9f78 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/pl/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml index 8cdf267f4b..8cdf267f4b 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_tos.xml +++ b/indra/newview/skins/default/xui/pl/floater_tos.xml diff --git a/indra/newview/skins/default/xui/pl/floater_url_entry.xml b/indra/newview/skins/default/xui/pl/floater_url_entry.xml index fc170d8d1b..fc170d8d1b 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/pl/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml index 2155d56f27..2155d56f27 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml index e2d1fb77e9..e2d1fb77e9 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml diff --git a/indra/newview/skins/default/xui/pl/floater_web_content.xml b/indra/newview/skins/default/xui/pl/floater_web_content.xml index 4cc8d0b27b..4cc8d0b27b 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_web_content.xml +++ b/indra/newview/skins/default/xui/pl/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml index 4081b8a37e..4081b8a37e 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/pl/floater_window_size.xml b/indra/newview/skins/default/xui/pl/floater_window_size.xml index 2a6c257e54..2a6c257e54 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_window_size.xml +++ b/indra/newview/skins/default/xui/pl/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml index 4f53337365..4f53337365 100644..100755 --- a/indra/newview/skins/default/xui/pl/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml index 5e982c0185..5e982c0185 100644..100755 --- a/indra/newview/skins/default/xui/pl/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml index 63c79acc8c..63c79acc8c 100644..100755 --- a/indra/newview/skins/default/xui/pl/inspect_group.xml +++ b/indra/newview/skins/default/xui/pl/inspect_group.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_object.xml b/indra/newview/skins/default/xui/pl/inspect_object.xml index 23d8ce7700..23d8ce7700 100644..100755 --- a/indra/newview/skins/default/xui/pl/inspect_object.xml +++ b/indra/newview/skins/default/xui/pl/inspect_object.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml index 0d570940c1..0d570940c1 100644..100755 --- a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/pl/language_settings.xml b/indra/newview/skins/default/xui/pl/language_settings.xml index 93051d1317..93051d1317 100644..100755 --- a/indra/newview/skins/default/xui/pl/language_settings.xml +++ b/indra/newview/skins/default/xui/pl/language_settings.xml diff --git a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml index 7c572b4fc9..7c572b4fc9 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml index aacdad97e3..aacdad97e3 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml index 163b3a231e..163b3a231e 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml index e8d2b14231..e8d2b14231 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml index dcf7921bad..dcf7921bad 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml index 8eb501c5b8..8eb501c5b8 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml index 1ec5883cfe..1ec5883cfe 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml diff --git a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml index 4e5407601b..4e5407601b 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml index ee60d3feb6..ee60d3feb6 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml index ad43900137..ad43900137 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml index 9fba39be1a..9fba39be1a 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_edit.xml b/indra/newview/skins/default/xui/pl/menu_edit.xml index 578e270fed..578e270fed 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_edit.xml +++ b/indra/newview/skins/default/xui/pl/menu_edit.xml diff --git a/indra/newview/skins/default/xui/pl/menu_favorites.xml b/indra/newview/skins/default/xui/pl/menu_favorites.xml index 7310ff5c27..7310ff5c27 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_favorites.xml +++ b/indra/newview/skins/default/xui/pl/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml index a72dec22fc..a72dec22fc 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_group_plus.xml b/indra/newview/skins/default/xui/pl/menu_group_plus.xml index 83be4d38c5..83be4d38c5 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/pl/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml index 19d9510cd3..19d9510cd3 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml b/indra/newview/skins/default/xui/pl/menu_im_well_button.xml deleted file mode 100644 index 207bc2211b..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Zamknij wszystkie" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml index 4ead44878a..4ead44878a 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml index 2b9a362123..2b9a362123 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml index 8924d6db3e..8924d6db3e 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml index 59560f236c..59560f236c 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml index c12bd490ff..c12bd490ff 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml index c4ef9761d9..c4ef9761d9 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml index 5ef0f2f7a4..5ef0f2f7a4 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml index 5492f78b26..5492f78b26 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml index 04f9b94f7c..04f9b94f7c 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml index 591c3a81d5..591c3a81d5 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/pl/menu_land.xml b/indra/newview/skins/default/xui/pl/menu_land.xml index cbfecaee56..cbfecaee56 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_land.xml +++ b/indra/newview/skins/default/xui/pl/menu_land.xml diff --git a/indra/newview/skins/default/xui/pl/menu_landmark.xml b/indra/newview/skins/default/xui/pl/menu_landmark.xml index aa5808390c..aa5808390c 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_landmark.xml +++ b/indra/newview/skins/default/xui/pl/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml index e50b694641..e50b694641 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_login.xml +++ b/indra/newview/skins/default/xui/pl/menu_login.xml diff --git a/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml index 60dc3673a9..60dc3673a9 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/pl/menu_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml index 8f86965416..8f86965416 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pl/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/pl/menu_navbar.xml b/indra/newview/skins/default/xui/pl/menu_navbar.xml index 1d434670ee..1d434670ee 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_navbar.xml +++ b/indra/newview/skins/default/xui/pl/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml index fe5bc6ba6f..fe5bc6ba6f 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml index bd3d42f9b1..bd3d42f9b1 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml index 3da6c5c890..3da6c5c890 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_object.xml +++ b/indra/newview/skins/default/xui/pl/menu_object.xml diff --git a/indra/newview/skins/default/xui/pl/menu_object_icon.xml b/indra/newview/skins/default/xui/pl/menu_object_icon.xml index b499bca2db..b499bca2db 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/pl/menu_object_icon.xml diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml index c093557e86..c093557e86 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml index 998e25f38e..998e25f38e 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/pl/menu_participant_list.xml b/indra/newview/skins/default/xui/pl/menu_participant_list.xml index 9e59102788..9e59102788 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/pl/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml index b62b85d30a..b62b85d30a 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups.xml b/indra/newview/skins/default/xui/pl/menu_people_groups.xml index ace5ebf888..ace5ebf888 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_groups.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml index c70ea2315f..c70ea2315f 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml index a8cc6b4a60..a8cc6b4a60 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml index dcfc48fb60..dcfc48fb60 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml index 8ec3820f84..8ec3820f84 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml index b474a556bd..b474a556bd 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/pl/menu_picks.xml b/indra/newview/skins/default/xui/pl/menu_picks.xml index 6f6e4b7fa8..6f6e4b7fa8 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_picks.xml +++ b/indra/newview/skins/default/xui/pl/menu_picks.xml diff --git a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml index e9c00f51a9..e9c00f51a9 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/pl/menu_place.xml b/indra/newview/skins/default/xui/pl/menu_place.xml index c3b72d6abb..c3b72d6abb 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_place.xml +++ b/indra/newview/skins/default/xui/pl/menu_place.xml diff --git a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml index 3d0c1c87fb..3d0c1c87fb 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml index d1f283b7aa..d1f283b7aa 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml index 0139d3a987..0139d3a987 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml index ef836c8ecf..ef836c8ecf 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml index 4bc65eca38..4bc65eca38 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml index 256500a402..256500a402 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/pl/menu_slurl.xml b/indra/newview/skins/default/xui/pl/menu_slurl.xml index 862f538aa7..862f538aa7 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_slurl.xml +++ b/indra/newview/skins/default/xui/pl/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml index 0e58592d46..0e58592d46 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml index cd36c116b0..cd36c116b0 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml index b12df08d6a..b12df08d6a 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/pl/menu_text_editor.xml b/indra/newview/skins/default/xui/pl/menu_text_editor.xml index 812f87bc1a..812f87bc1a 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/pl/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml index 53536c8f1c..53536c8f1c 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_agent.xml b/indra/newview/skins/default/xui/pl/menu_url_agent.xml index db729be725..db729be725 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_agent.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_group.xml b/indra/newview/skins/default/xui/pl/menu_url_group.xml index f340b3296a..f340b3296a 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_group.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_http.xml b/indra/newview/skins/default/xui/pl/menu_url_http.xml index e73f7b6745..e73f7b6745 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_http.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml index e36fa0dd2b..e36fa0dd2b 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_map.xml b/indra/newview/skins/default/xui/pl/menu_url_map.xml index 179ab1f676..179ab1f676 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_map.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml index 7576208a9e..7576208a9e 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml index 1b8dd62137..1b8dd62137 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml index eb83245c48..eb83245c48 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml index 4d4a5b4c4d..4d4a5b4c4d 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml index e225546930..e225546930 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index 24c961fa26..e1725fc308 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -236,7 +236,7 @@ <menu label="Renderowanie" name="Rendering"> <menu_item_check label="Osie" name="Axes"/> <menu_item_check label="Tryb obrazu szkieletowego" name="Wireframe"/> - <menu_item_check label="Oświetlenie i cienie" name="Lighting and Shadows"/> + <menu_item_check label="Oświetlenie i cienie" name="Advanced Lighting Model"/> <menu_item_check label="Cienie Słońca/Księżyca/Projektory" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO and wygładzanie cienia" name="SSAO and Shadow Smoothing"/> <menu_item_check label="Globalne oświetlenie (eksperymentalne)" name="Global Illumination"/> diff --git a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml index bf85246be8..bf85246be8 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml index 47cafdbd99..47cafdbd99 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml index 7531437043..7531437043 100644..100755 --- a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml index cbf2afa91d..cbf2afa91d 100644..100755 --- a/indra/newview/skins/default/xui/pl/mime_types.xml +++ b/indra/newview/skins/default/xui/pl/mime_types.xml diff --git a/indra/newview/skins/default/xui/pl/mime_types_linux.xml b/indra/newview/skins/default/xui/pl/mime_types_linux.xml index a2b8168b51..a2b8168b51 100644..100755 --- a/indra/newview/skins/default/xui/pl/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/pl/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml index 7213b26165..7213b26165 100644..100755 --- a/indra/newview/skins/default/xui/pl/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index f255b1b8ea..f255b1b8ea 100644..100755 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml diff --git a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml index bac885e5d8..bac885e5d8 100644..100755 --- a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml index ab1d8d7007..ab1d8d7007 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml index ba0c85e4ef..ba0c85e4ef 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml index c43a9bed81..c43a9bed81 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml index 62cb392ba7..62cb392ba7 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml diff --git a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml index cebb6e3cfe..cebb6e3cfe 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml index 560bfe78f4..560bfe78f4 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml index 8a033fc32f..8a033fc32f 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml index e32c12a8ee..e32c12a8ee 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/pl/panel_classified_info.xml b/indra/newview/skins/default/xui/pl/panel_classified_info.xml index 52f54fc7cf..52f54fc7cf 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/pl/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml index 17a6d1eb8b..17a6d1eb8b 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml index 42d1ead400..42d1ead400 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml index 970b994c20..970b994c20 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml index f9fba4d79f..f9fba4d79f 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml index 83210808f1..83210808f1 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml index 51ee3af00d..51ee3af00d 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml index 7cfd9c221c..7cfd9c221c 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml index 390a5313b5..390a5313b5 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml index d32646d1a3..d32646d1a3 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml index cbcba97eb6..cbcba97eb6 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml index 7653e84cc0..7653e84cc0 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml index 7975e55746..7975e55746 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml index a773a52a59..a773a52a59 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml index 72c162f63d..72c162f63d 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml index e6fd8b18f8..e6fd8b18f8 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml index 54f9fdc21c..54f9fdc21c 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml index 9530c781ab..9530c781ab 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml index d90a6d8726..d90a6d8726 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml index 9e0acd3cec..9e0acd3cec 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml index f74ad916cd..f74ad916cd 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml index b41069e8d7..b41069e8d7 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml index 6fd1e2277a..6fd1e2277a 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml index f2a9b10f17..f2a9b10f17 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml index 7da1341e96..7da1341e96 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml index 2027b8715b..2027b8715b 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml index 4e373cdf8f..4e373cdf8f 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml index a4d76badf0..a4d76badf0 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml index 37fb529f2b..37fb529f2b 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml index 1822551e86..1822551e86 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml index aea4e50fd5..aea4e50fd5 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml index a8b4056976..a8b4056976 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_notices.xml b/indra/newview/skins/default/xui/pl/panel_group_notices.xml index a3b0998de3..a3b0998de3 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_notify.xml b/indra/newview/skins/default/xui/pl/panel_group_notify.xml index d27a81217a..d27a81217a 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml index 9e9c79d26a..9e9c79d26a 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml index 4aadd3b93b..4aadd3b93b 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml index 3370f6f58e..3370f6f58e 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/pl/panel_landmarks.xml b/indra/newview/skins/default/xui/pl/panel_landmarks.xml index 039be3b504..039be3b504 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/pl/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml index c87a3d3bd4..c87a3d3bd4 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_login.xml +++ b/indra/newview/skins/default/xui/pl/panel_login.xml diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml index 8d6fa1173c..8d6fa1173c 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/panel_me.xml b/indra/newview/skins/default/xui/pl/panel_me.xml index 72a5f51520..72a5f51520 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_me.xml +++ b/indra/newview/skins/default/xui/pl/panel_me.xml diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml index 914a2aee73..914a2aee73 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml index a87c29d7b3..a87c29d7b3 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml index 7e95c4942f..7e95c4942f 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml index b01e686c41..b01e686c41 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml index 63cf96b571..4ed3ff669b 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <string name="min_width"> 192 </string> diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml index d77c6d7852..d77c6d7852 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml index e1668e1ef1..e1668e1ef1 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml index 50353d4fba..50353d4fba 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml index bf23ace58f..bf23ace58f 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml index 2f8c008f98..2f8c008f98 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml index ed3057399d..ed3057399d 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml index 5559c151e7..5559c151e7 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml index ef52e2148b..ef52e2148b 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_people.xml +++ b/indra/newview/skins/default/xui/pl/panel_people.xml diff --git a/indra/newview/skins/default/xui/pl/panel_pick_info.xml b/indra/newview/skins/default/xui/pl/panel_pick_info.xml index 26afded795..26afded795 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/pl/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml index 1ba4e76196..1ba4e76196 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_picks.xml +++ b/indra/newview/skins/default/xui/pl/panel_picks.xml diff --git a/indra/newview/skins/default/xui/pl/panel_place_profile.xml b/indra/newview/skins/default/xui/pl/panel_place_profile.xml index 2a4ffab36c..2a4ffab36c 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pl/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/pl/panel_places.xml b/indra/newview/skins/default/xui/pl/panel_places.xml index d69d137d23..d69d137d23 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_places.xml +++ b/indra/newview/skins/default/xui/pl/panel_places.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml index 5e61f62691..5e61f62691 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml index d53a99e8c1..d53a99e8c1 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml 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 7fd1029e6a..7fd1029e6a 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml index 3affda57bf..3affda57bf 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml 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 fff56eab6e..fff56eab6e 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml index f2beef091a..f2beef091a 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml index 4c2df2c1f3..4c2df2c1f3 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml index 5af2fed142..5af2fed142 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml index fa0a5981a8..fa0a5981a8 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml index 46f5ebb8e2..46f5ebb8e2 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml index b5763e1291..b5763e1291 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml index 932e3631ab..932e3631ab 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml index c5b08383dc..c5b08383dc 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml index 1b64827725..1b64827725 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml index 601571f62e..601571f62e 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml index f22b4a5989..f22b4a5989 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml index c6ed2457f1..c6ed2457f1 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_texture.xml diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml index b05223aa0f..b05223aa0f 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/pl/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml index a52d8aed3d..a52d8aed3d 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml index 070f025087..070f025087 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml index 70a6e39412..70a6e39412 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml index ff4ca23a4d..ff4ca23a4d 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/pl/panel_side_tray.xml diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml index 95cd7c53dc..95cd7c53dc 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml index 9f7f7f1238..9f7f7f1238 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml index 6aa0d27bb8..6aa0d27bb8 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml index b43bd96536..b43bd96536 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml index f0fe28c4ce..f0fe28c4ce 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml index f8a076424f..f8a076424f 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml index 1611900700..1611900700 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/pl/panel_world_map.xml b/indra/newview/skins/default/xui/pl/panel_world_map.xml index 69f18be767..69f18be767 100644..100755 --- a/indra/newview/skins/default/xui/pl/panel_world_map.xml +++ b/indra/newview/skins/default/xui/pl/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/pl/role_actions.xml b/indra/newview/skins/default/xui/pl/role_actions.xml index 57df2bc70f..57df2bc70f 100644..100755 --- a/indra/newview/skins/default/xui/pl/role_actions.xml +++ b/indra/newview/skins/default/xui/pl/role_actions.xml diff --git a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml index cea903769c..cea903769c 100644..100755 --- a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml index c2e50473a5..c2e50473a5 100644..100755 --- a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml index 9ec3c480b7..9ec3c480b7 100644..100755 --- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml index eb8c9cdbbb..eb8c9cdbbb 100644..100755 --- a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index f6dec8536b..f6dec8536b 100644..100755 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml index 0366c3fdbc..0366c3fdbc 100644..100755 --- a/indra/newview/skins/default/xui/pl/teleport_strings.xml +++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/pl/xui_version.xml b/indra/newview/skins/default/xui/pl/xui_version.xml index 0e777751d3..0e777751d3 100644..100755 --- a/indra/newview/skins/default/xui/pl/xui_version.xml +++ b/indra/newview/skins/default/xui/pl/xui_version.xml diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml index 299f88b22a..299f88b22a 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_about.xml +++ b/indra/newview/skins/default/xui/pt/floater_about.xml 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 f48280840c..f48280840c 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/pt/floater_activeim.xml b/indra/newview/skins/default/xui/pt/floater_activeim.xml index 892ccdf974..892ccdf974 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_activeim.xml +++ b/indra/newview/skins/default/xui/pt/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml index 05326d8594..05326d8594 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml index 5cae581045..5cae581045 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_auction.xml b/indra/newview/skins/default/xui/pt/floater_auction.xml index 074f7bf001..074f7bf001 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_auction.xml +++ b/indra/newview/skins/default/xui/pt/floater_auction.xml diff --git a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml index ca813a8540..ca813a8540 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/pt/floater_avatar.xml b/indra/newview/skins/default/xui/pt/floater_avatar.xml index 168cdacae1..168cdacae1 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_avatar.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml index 2b65952676..2b65952676 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml index 9473ee7ce9..9473ee7ce9 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml index f8ae3cd2d8..f8ae3cd2d8 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_beacons.xml +++ b/indra/newview/skins/default/xui/pt/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml index acc462ea94..acc462ea94 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_build_options.xml +++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml index 8823d04b62..8823d04b62 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml index 475d36c119..475d36c119 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_bumps.xml +++ b/indra/newview/skins/default/xui/pt/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml index b9e7a04412..b9e7a04412 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml index 2845a29e1d..2845a29e1d 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml index 24e41ac8c8..24e41ac8c8 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml index 258c95cc7d..258c95cc7d 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml index c465197c9a..c465197c9a 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml index 9cda01c187..9cda01c187 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_camera.xml +++ b/indra/newview/skins/default/xui/pt/floater_camera.xml diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml index 72016c6b40..2eb2c94940 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="chat_bar" title="BATE-PAPO LOCAL"> +<floater name="nearby_chat" title="BATE-PAPO LOCAL"> <panel name="bottom_panel"> <line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/> <button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/> diff --git a/indra/newview/skins/default/xui/pt/floater_choose_group.xml b/indra/newview/skins/default/xui/pt/floater_choose_group.xml index 60f01a3733..60f01a3733 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/pt/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml index 4ea014335f..4ea014335f 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml new file mode 100644 index 0000000000..ae7dd3c441 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="REGISTRO DE CONVERSA"> + <panel name="buttons_panel"> + <filter_editor label="Filtrar pessoas" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="Opções de exibição/ordenação"/> + <menu_button name="conversations_gear_btn" tool_tip="Ações em uma pessoa ou um grupo selecionado"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml new file mode 100644 index 0000000000..97a2e8327c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="CONVERSA:"> + <floater.string name="Title"> + CONVERSA: [NAME] + </floater.string> + <text name="page_label" value="Página"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_critical.xml b/indra/newview/skins/default/xui/pt/floater_critical.xml index 5d7fe0142b..5d7fe0142b 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_critical.xml +++ b/indra/newview/skins/default/xui/pt/floater_critical.xml diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml index a8b5d8f67d..a8b5d8f67d 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/pt/floater_destinations.xml b/indra/newview/skins/default/xui/pt/floater_destinations.xml index df18698d2f..df18698d2f 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_destinations.xml +++ b/indra/newview/skins/default/xui/pt/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/pt/floater_display_name.xml b/indra/newview/skins/default/xui/pt/floater_display_name.xml index 8daa40cc23..8daa40cc23 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_display_name.xml +++ b/indra/newview/skins/default/xui/pt/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml index 9e25938986..9e25938986 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml index 1f1fbcce7e..1f1fbcce7e 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml index 7bde22851e..7bde22851e 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml index 4055ba97ef..4055ba97ef 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml index a8dc3f96d7..a8dc3f96d7 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_event.xml +++ b/indra/newview/skins/default/xui/pt/floater_event.xml diff --git a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml index eeb39583ef..eeb39583ef 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/pt/floater_font_test.xml b/indra/newview/skins/default/xui/pt/floater_font_test.xml index c506cdb12d..c506cdb12d 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_font_test.xml +++ b/indra/newview/skins/default/xui/pt/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml index 2e5b92aaf7..2e5b92aaf7 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml index 8003a35d16..8003a35d16 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml index 1204fb93e2..1204fb93e2 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/pt/floater_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml index 9cc8a0a6b2..9cc8a0a6b2 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/pt/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/pt/floater_how_to.xml b/indra/newview/skins/default/xui/pt/floater_how_to.xml index 15c4946cb0..15c4946cb0 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_how_to.xml +++ b/indra/newview/skins/default/xui/pt/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/pt/floater_hud.xml b/indra/newview/skins/default/xui/pt/floater_hud.xml index e458913452..e458913452 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_hud.xml +++ b/indra/newview/skins/default/xui/pt/floater_hud.xml diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml index 0fbb826a96..a1cea72b1e 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_im_container.xml +++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="CONVERSAS"/> +<multi_floater name="floater_im_box" title="CONVERSAS"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="Opções de exibição/ordenação"/> + <button name="add_btn" tool_tip="Iniciar uma nova conversa"/> + <button name="speak_btn" tool_tip="Fale com pessoas usando seu microfone"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="Recolher/expandir esta lista"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="Recolher este painel"/> + <text name="stub_textbox"> + Esta conversa está em uma janela separada. [secondlife:/// Trazer de volta.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml index 5543ffa41d..9f6a7a06ad 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_im_session.xml +++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="Para" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] foi convidado para a conversa."/> + <floater.string name="multiple_participants_added" value="[NAME] foram convidados para a conversa."/> + <floater.string name="tooltip_to_separate_window" value="Mover esta conversa para uma janela separada"/> + <floater.string name="tooltip_to_main_window" value="Mover esta conversa para a janela principal"/> + <floater.string name="start_call_button_tooltip" value="Abrir conexão por voz"/> + <floater.string name="end_call_button_tooltip" value="Encerrar conexão por voz"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="Recolher este painel"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Recolher lista de participantes"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir a lista de participantes"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="Opções de exibição/ordenação"/> + <menu_button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/> + <button name="add_btn" tool_tip="Adicionar alguém a esta conversa"/> + <button name="voice_call_btn" tool_tip="Abrir conexão por voz"/> + <button name="close_btn" tool_tip="Encerrar esta conversa"/> + <button name="expand_collapse_btn" tool_tip="Recolher/expandir este painel"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="Para" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="Mostrar/ocultar painel de mensagens"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml index 362a553d64..362a553d64 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_import_collada.xml b/indra/newview/skins/default/xui/pt/floater_import_collada.xml index ad55d416c3..ad55d416c3 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/pt/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml index 6344258fa0..1e86f847ad 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml @@ -25,9 +25,9 @@ Sair do [CURRENT_CHAT] e entrar neste bate-papo de voz? </floater.string> <text name="question"> - Sair do [CURRENT_CHAT] e entrar neste bate-papo? + Se você atender, será desconectado de suas conversas de voz atuais. </text> - <button label="Aceitar" label_selected="Aceitar" name="Accept"/> - <button label="Rejeitar" label_selected="Rejeitar" name="Reject"/> - <button label="Enviar MI" name="Start IM"/> + <button label="Atender" label_selected="Atender" name="Accept"/> + <button label="Ignorar" label_selected="Ignorar" name="Reject"/> + <button label="Iniciar MI em vez disso" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml index 6a00b1a628..6a00b1a628 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_inspect.xml +++ b/indra/newview/skins/default/xui/pt/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml index 8a8f1f5b34..8a8f1f5b34 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml index 71759abdc2..71759abdc2 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml index 98d8c0e319..98d8c0e319 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_joystick.xml +++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml index 9932318293..9932318293 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml index 7475bdd5b8..7475bdd5b8 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml index 5ad116ac8a..5ad116ac8a 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml index 73f187f0e4..73f187f0e4 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml index 8233f2a43f..8233f2a43f 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_map.xml diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml index 7491218067..7491218067 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/pt/floater_media_settings.xml b/indra/newview/skins/default/xui/pt/floater_media_settings.xml index 5af002c502..5af002c502 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml index efb5da4ace..efb5da4ace 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml index bb6113671b..bb6113671b 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml index 8194278b16..8194278b16 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml index 728357a400..728357a400 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml index 97fbd35fcc..97fbd35fcc 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/pt/floater_my_appearance.xml b/indra/newview/skins/default/xui/pt/floater_my_appearance.xml index 38e06d2aed..38e06d2aed 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/pt/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/pt/floater_my_inventory.xml b/indra/newview/skins/default/xui/pt/floater_my_inventory.xml index 71d8682758..71d8682758 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/pt/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/floater_object_weights.xml b/indra/newview/skins/default/xui/pt/floater_object_weights.xml index 45bd1c7127..45bd1c7127 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/pt/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/pt/floater_openobject.xml b/indra/newview/skins/default/xui/pt/floater_openobject.xml index 0dc2852bac..0dc2852bac 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_openobject.xml +++ b/indra/newview/skins/default/xui/pt/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml index 60d4d3dc5c..60d4d3dc5c 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml index 35afde7612..35afde7612 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml index 05784115e7..05784115e7 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml index 182f2513e0..d04cf2a173 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> Exibir: </text> - <check_box label="Mundo" name="show_world"/> + <check_box label="Testar" name="show_world"/> <check_box label="Apenas móveis" name="show_world_movables_only"/> <check_box label="Navmesh" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml index e0c60679dd..e0c60679dd 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml index 8094ad376c..8094ad376c 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_pay.xml +++ b/indra/newview/skins/default/xui/pt/floater_pay.xml diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml index a5579f03bf..a5579f03bf 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/pt/floater_people.xml b/indra/newview/skins/default/xui/pt/floater_people.xml index 10a516ee36..10a516ee36 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_people.xml +++ b/indra/newview/skins/default/xui/pt/floater_people.xml diff --git a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml index 33a0d6a456..33a0d6a456 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/pt/floater_picks.xml b/indra/newview/skins/default/xui/pt/floater_picks.xml index 9766196319..9766196319 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_picks.xml +++ b/indra/newview/skins/default/xui/pt/floater_picks.xml diff --git a/indra/newview/skins/default/xui/pt/floater_places.xml b/indra/newview/skins/default/xui/pt/floater_places.xml index 12c6548205..12c6548205 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_places.xml +++ b/indra/newview/skins/default/xui/pt/floater_places.xml diff --git a/indra/newview/skins/default/xui/pt/floater_post_process.xml b/indra/newview/skins/default/xui/pt/floater_post_process.xml index d4f2e96539..d4f2e96539 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_post_process.xml +++ b/indra/newview/skins/default/xui/pt/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml index c89a61d9b1..c89a61d9b1 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_preferences.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml index 3aaee2d4a7..3aaee2d4a7 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml index 19474d8099..19474d8099 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml index 089694608b..089694608b 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml index d094c1b63a..d094c1b63a 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml index 7c5a1538f2..7c5a1538f2 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml index 6f39635240..6f39635240 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml index b078962feb..b078962feb 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml index de3417ea14..de3417ea14 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml index d3b5df2d74..d3b5df2d74 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/pt/floater_region_info.xml b/indra/newview/skins/default/xui/pt/floater_region_info.xml index cc5e0d59d4..cc5e0d59d4 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_region_info.xml +++ b/indra/newview/skins/default/xui/pt/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml index 08413a9231..08413a9231 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug.xml b/indra/newview/skins/default/xui/pt/floater_script_debug.xml index 6d1d981ca7..6d1d981ca7 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_limits.xml b/indra/newview/skins/default/xui/pt/floater_script_limits.xml index 64a8a49c85..64a8a49c85 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml index 5be866d052..5be866d052 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_queue.xml b/indra/newview/skins/default/xui/pt/floater_script_queue.xml index 5fb6dd1c35..5fb6dd1c35 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml index 8878590a4e..8878590a4e 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_script_search.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml index 3509cb786d..3509cb786d 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_search.xml +++ b/indra/newview/skins/default/xui/pt/floater_search.xml diff --git a/indra/newview/skins/default/xui/pt/floater_select_key.xml b/indra/newview/skins/default/xui/pt/floater_select_key.xml index 7264a5a713..7264a5a713 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_select_key.xml +++ b/indra/newview/skins/default/xui/pt/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml index 014ae0845e..014ae0845e 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml index 83f7b24572..83f7b24572 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml index 4110e69068..4110e69068 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml index 948d727540..948d727540 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml index e62260c2e3..e62260c2e3 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml index 02bb154d26..02bb154d26 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml index f4e95bddec..f4e95bddec 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml index be53624145..be53624145 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_stats.xml +++ b/indra/newview/skins/default/xui/pt/floater_stats.xml diff --git a/indra/newview/skins/default/xui/pt/floater_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml index 38beec022c..38beec022c 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/pt/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml index 6b35d3f919..6b35d3f919 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_telehub.xml +++ b/indra/newview/skins/default/xui/pt/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml index dd282bf1fc..dd282bf1fc 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml index a75cf34a94..ba4ef0afde 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml @@ -19,7 +19,7 @@ <button label="Padrão" label_selected="Padrão" name="Default"/> <button label="Branco" label_selected="Branco" name="Blank"/> <button label="Nenhum" label_selected="Nenhum" name="None"/> - <check_box initial_value="true" label="Visualização em tempo real" name="apply_immediate_check"/> + <check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/> <text name="preview_disabled" value="Visualização desativada"/> <filter_editor label="Filtrar texturas" name="inventory search editor"/> <check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml index 0e897aea09..0e897aea09 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml index 8c245c582e..8c245c582e 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_tools.xml diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml index ef682714c6..ef682714c6 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml index c4954cb61f..c4954cb61f 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_tos.xml +++ b/indra/newview/skins/default/xui/pt/floater_tos.xml diff --git a/indra/newview/skins/default/xui/pt/floater_toybox.xml b/indra/newview/skins/default/xui/pt/floater_toybox.xml index 3677c3b1f5..3677c3b1f5 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_toybox.xml +++ b/indra/newview/skins/default/xui/pt/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/pt/floater_translation_settings.xml b/indra/newview/skins/default/xui/pt/floater_translation_settings.xml index 1955599a81..1955599a81 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml index 48af8de363..48af8de363 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/pt/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..de7aa2df12 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="VOLUME DO BATE-PAPO DE VOZ"> + <slider label="Bate-papo de voz" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml index 745a7d0e00..745a7d0e00 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml index b29ca3d699..71d3c33ae5 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Lugares" name="voice_effects" title="EFEITOS DE VOZ"> +<floater label="Lugares" name="voice_effects" title="AMOSTRA DE DISTORÇÃO DE VOZ"> <string name="no_voice_effect"> (Não distorcer voz) </string> diff --git a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml new file mode 100644 index 0000000000..dae47a99ae --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="VOLUME DE VOZ"> + <slider name="volume_slider" tool_tip="Volume de voz" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_web_content.xml b/indra/newview/skins/default/xui/pt/floater_web_content.xml index 5101579c6f..5101579c6f 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_web_content.xml +++ b/indra/newview/skins/default/xui/pt/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml index 865d939d24..865d939d24 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml index 7deb799bd7..7deb799bd7 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_window_size.xml +++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml index 490a975e80..490a975e80 100644..100755 --- a/indra/newview/skins/default/xui/pt/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml index 19244d9b27..19244d9b27 100644..100755 --- a/indra/newview/skins/default/xui/pt/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/pt/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/pt/inspect_group.xml b/indra/newview/skins/default/xui/pt/inspect_group.xml index 889d35f269..889d35f269 100644..100755 --- a/indra/newview/skins/default/xui/pt/inspect_group.xml +++ b/indra/newview/skins/default/xui/pt/inspect_group.xml diff --git a/indra/newview/skins/default/xui/pt/inspect_object.xml b/indra/newview/skins/default/xui/pt/inspect_object.xml index b72de7038d..b72de7038d 100644..100755 --- a/indra/newview/skins/default/xui/pt/inspect_object.xml +++ b/indra/newview/skins/default/xui/pt/inspect_object.xml diff --git a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml index 789194bf2e..789194bf2e 100644..100755 --- a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/pt/language_settings.xml b/indra/newview/skins/default/xui/pt/language_settings.xml index 8799475ace..8799475ace 100644..100755 --- a/indra/newview/skins/default/xui/pt/language_settings.xml +++ b/indra/newview/skins/default/xui/pt/language_settings.xml diff --git a/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml index 4b81276ab3..4b81276ab3 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml index cfd69158bc..cfd69158bc 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml index 5b32784c32..5b32784c32 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml index beba969b7e..beba969b7e 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml index a4a26144c7..a4a26144c7 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml index e84dcb093d..e84dcb093d 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml index 527e3af3c9..527e3af3c9 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml index 704fd226eb..704fd226eb 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml index 051323ae6a..051323ae6a 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml index 8716992a5e..b59895573e 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> +<toggleable_menu name="Gear COF"> <menu label="Roupas novas" name="COF.Gear.New_Clothes"/> - <menu label="Nova parte do corpo" name="COF.Geear.New_Body_Parts"/> -</menu> + <menu label="Novas partes do corpo" name="COF.Gear.New_Body_Parts"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml new file mode 100644 index 0000000000..01316b887d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="Encerrar conversa" name="close_conversation"/> + <menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/> + <menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/> + <menu_item_call label="Exibir perfil" name="view_profile"/> + <menu_item_call label="MI" name="im"/> + <menu_item_call label="Oferecer teletransporte" name="offer_teleport"/> + <menu_item_call label="Chamada de voz" name="voice_call"/> + <menu_item_call label="Histórico de bate-papo..." name="chat_history"/> + <menu_item_call label="Adicionar amigo" name="add_friend"/> + <menu_item_call label="Remover amigo" name="remove_friend"/> + <menu_item_call label="Remover amigos" name="remove_friends"/> + <menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/> + <menu_item_call label="Mais zoom" name="zoom_in"/> + <menu_item_call label="Mapa" name="map"/> + <menu_item_call label="Compartilhar" name="share"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_check label="Bloquear voz" name="block_unblock"/> + <menu_item_check label="Bloquear texto" name="MuteText"/> + <menu_item_call label="Perfil do grupo" name="group_profile"/> + <menu_item_call label="Ativar grupo" name="activate_group"/> + <menu_item_call label="Sair do grupo" name="leave_group"/> + <context_menu label="Opções do moderador >" name="Moderator Options"> + <menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/> + <menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Silenciar todos" name="ModerateVoiceMute"/> + <menu_item_call label="Desfazer silenciar para todos" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..616e6db46e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="MI..." name="IM"/> + <menu_item_call label="Chamada de voz..." name="Call"/> + <menu_item_call label="Abrir histórico de bate-papo..." name="Chat history"/> + <menu_item_call label="Exibir perfil" name="View Profile"/> + <menu_item_call label="Oferecer teletransporte" name="teleport"/> + <menu_item_call label="Adicionar amigo" name="add_friend"/> + <menu_item_call label="Remover amigo" name="remove_friend"/> + <menu_item_call label="Convidar para entrar no grupo..." name="Invite"/> + <menu_item_call label="Mapa" name="Map"/> + <menu_item_call label="Compartilhar" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> + <menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml new file mode 100644 index 0000000000..cab81175a0 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="Ordenar por nome" name="sort_by_name"/> + <menu_item_check label="Ordenar por data" name="sort_by_date"/> + <menu_item_check label="Ordenar com amigos acima" name="sort_by_friends"/> + <menu_item_call label="Exibir histórico de Bate-papo local..." name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_edit.xml b/indra/newview/skins/default/xui/pt/menu_edit.xml index ff431c9a21..ff431c9a21 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_edit.xml +++ b/indra/newview/skins/default/xui/pt/menu_edit.xml diff --git a/indra/newview/skins/default/xui/pt/menu_favorites.xml b/indra/newview/skins/default/xui/pt/menu_favorites.xml index 062820fbca..062820fbca 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_favorites.xml +++ b/indra/newview/skins/default/xui/pt/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml index 70d8ae7a8e..70d8ae7a8e 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_group_plus.xml b/indra/newview/skins/default/xui/pt/menu_group_plus.xml index 1083845d68..1083845d68 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/pt/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml index 5f6bd096a8..5f6bd096a8 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml new file mode 100644 index 0000000000..a8434dc336 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="Exibir perfil" name="View Profile"/> + <menu_item_call label="Adicionar amigo" name="Add Friend"/> + <menu_item_call label="Remover amigo" name="remove_friend"/> + <menu_item_call label="Oferecer teletransporte" name="offer_teleport"/> + <menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/> + <menu_item_call label="Histórico de bate-papo..." name="chat_history"/> + <menu_item_call label="Mais zoom" name="zoom_in"/> + <menu_item_call label="Mapa" name="map"/> + <menu_item_call label="Compartilhar" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> + <menu_item_check label="Bloquear voz" name="Block/Unblock"/> + <menu_item_check label="Bloquear texto" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..398b890f66 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="Exibição compacta" name="compact_view"/> + <menu_item_check label="Exibição expandida" name="expanded_view"/> + <menu_item_check label="Mostrar hora" name="IMShowTime"/> + <menu_item_check label="Mostrar nomes em conversas individuais" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml deleted file mode 100644 index 2d37cefd6f..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Fechar tudo" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml index ead949ba13..ead949ba13 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml index dd177d1b8d..dd177d1b8d 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml index d821b3ded0..d821b3ded0 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml index 2b5aa7508b..2b5aa7508b 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml index 7e271904e9..7e271904e9 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml index e8fafa58a9..e8fafa58a9 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml index c404719c95..c404719c95 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml index a3a648eb34..a3a648eb34 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml index 7a7ebc50af..7a7ebc50af 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml index 6faea517fe..6faea517fe 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/pt/menu_land.xml b/indra/newview/skins/default/xui/pt/menu_land.xml index 9182ce321a..9182ce321a 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_land.xml +++ b/indra/newview/skins/default/xui/pt/menu_land.xml diff --git a/indra/newview/skins/default/xui/pt/menu_landmark.xml b/indra/newview/skins/default/xui/pt/menu_landmark.xml index 6accfebee7..6accfebee7 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_landmark.xml +++ b/indra/newview/skins/default/xui/pt/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml index be94ad49db..be94ad49db 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_login.xml +++ b/indra/newview/skins/default/xui/pt/menu_login.xml diff --git a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml index ac84b02870..ac84b02870 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/pt/menu_mini_map.xml b/indra/newview/skins/default/xui/pt/menu_mini_map.xml index 6a3fe55de5..6a3fe55de5 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pt/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml index 079f876add..079f876add 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/pt/menu_navbar.xml b/indra/newview/skins/default/xui/pt/menu_navbar.xml index 57c1471de3..57c1471de3 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_navbar.xml +++ b/indra/newview/skins/default/xui/pt/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml index f1ea83c837..f1ea83c837 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml index 43ad4134ec..43ad4134ec 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml index 28dd9febe2..28dd9febe2 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_object.xml +++ b/indra/newview/skins/default/xui/pt/menu_object.xml diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml index 7af760a6ee..df224a88fa 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="Perfil do objeto..." name="Object Profile"/> <menu_item_call label="Bloquear..." name="Block"/> + <menu_item_call label="Mostrar no mapa" name="show_on_map"/> + <menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml index 894f1d741c..3602bdaac4 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="Novo cabelo" name="New Hair"/> <menu_item_call label="Novos olhos" name="New Eyes"/> </menu> + <menu_item_call label="Expandir todas as pastas" name="expand"/> + <menu_item_call label="Recolher todas as pastas" name="collapse"/> <menu_item_call label="Renomear look" name="rename"/> <menu_item_call label="Excluir visual" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml index 8db5e405b3..8db5e405b3 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml index 01f1d4ef80..01f1d4ef80 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/pt/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/pt/menu_participant_view.xml b/indra/newview/skins/default/xui/pt/menu_participant_view.xml new file mode 100644 index 0000000000..b61108cf54 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="Ordenar conversas por tipo" name="sort_sessions_by_type"/> + <menu_item_check label="Ordenar conversas por nome" name="sort_sessions_by_name"/> + <menu_item_check label="Ordenar conversas por atividade recente" name="sort_sessions_by_recent"/> + <menu_item_check label="Ordenar participantes por nome" name="sort_participants_by_name"/> + <menu_item_check label="Ordenar participantes por atividade recente" name="sort_participants_by_recent"/> + <menu_item_call label="Preferências de bate-papo..." name="chat_preferences"/> + <menu_item_call label="Preferências de privacidade..." name="privacy_preferences"/> + <menu_item_check label="Registro de conversas..." name="Conversation"/> + <menu_item_check label="Traduzir Bate-papo local" name="Translate_chat"/> + <menu_item_check label="Configurações de tradução..." name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..8bbde9b38c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="Desbloquear" name="unblock"/> + <menu_item_call label="Perfil..." name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..e69935995c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="Bloquear residente por nome..." name="block_resident_by_name"/> + <menu_item_call label="Bloquear objeto por nome" name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml new file mode 100644 index 0000000000..b80d683c7b --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="Ordenar por nome" name="sort_by_name"/> + <menu_item_check label="Ordenar por tipo" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml new file mode 100644 index 0000000000..46caeae310 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ordenar por nome" name="sort_name"/> + <menu_item_check label="Ordenar por status" name="sort_status"/> + <menu_item_check label="Exibir ícones de pessoas" name="view_icons"/> + <menu_item_check label="Exibir permissões concedidas" name="view_permissions"/> + <menu_item_check label="Exibir registro de conversas..." name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml index e7c325010f..e7c325010f 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml index 9a924ad7b9..2ba7af17cd 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="Ver dados" name="View Info"/> <menu_item_call label="Bate-papo" name="Chat"/> - <menu_item_call label="Ligar" name="Call"/> + <menu_item_call label="Chamada de voz" name="Call"/> <menu_item_call label="Ativar" name="Activate"/> <menu_item_call label="Sair" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml new file mode 100644 index 0000000000..637e591ae1 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml index 86a9d2263f..86a9d2263f 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml index 7c720f262b..51464fed68 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="Ver perfil" name="View Profile"/> - <menu_item_call label="Adicionar amigo..." name="Add Friend"/> - <menu_item_call label="Remover amigo..." name="Remove Friend"/> - <menu_item_call label="MI" name="IM"/> - <menu_item_call label="Ligar" name="Call"/> - <menu_item_call label="Mapa" name="Map"/> - <menu_item_call label="Compartilhar" name="Share"/> - <menu_item_call label="Pagar" name="Pay"/> - <menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/> - <menu_item_call label="Teletransportar?" name="teleport"/> + <menu_item_call label="Exibir perfil" name="view_profile"/> + <menu_item_call label="MI" name="im"/> + <menu_item_call label="Oferecer teletransporte" name="offer_teleport"/> + <menu_item_call label="Chamada de voz" name="voice_call"/> + <menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/> + <menu_item_call label="Adicionar amigo" name="add_friend"/> + <menu_item_call label="Remover amigo" name="remove_friend"/> + <menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/> + <menu_item_call label="Mais zoom" name="zoom_in"/> + <menu_item_call label="Mapa" name="map"/> + <menu_item_call label="Compartilhar" name="share"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_check label="Bloquear/desbloquear" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml index 79edb96b1c..7f3c6ace27 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="Adicionar amigo..." name="Add Friends"/> - <menu_item_call label="Remover amigo..." name="Remove Friend"/> - <menu_item_call label="MI" name="IM"/> - <menu_item_call label="Ligar" name="Call"/> - <menu_item_call label="Compartilhar" name="Share"/> - <menu_item_call label="Pagar" name="Pay"/> - <menu_item_call label="Teletransportar?" name="teleport"/> + <menu_item_call label="Adicionar amigo..." name="add_friends"/> + <menu_item_call label="Remover amigo..." name="remove_friends"/> + <menu_item_call label="MI" name="im"/> + <menu_item_call label="Ligar" name="call"/> + <menu_item_call label="Compartilhar" name="share"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_call label="Oferecer teletransporte" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml new file mode 100644 index 0000000000..bce015e732 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/> + <menu_item_check label="Ordenar por nome" name="sort_name"/> + <menu_item_check label="Ordenar por distância" name="sort_distance"/> + <menu_item_check label="Exibir ícones de pessoas" name="view_icons"/> + <menu_item_check label="Exibir mapa" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml index 0d32d58de4..0d32d58de4 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml new file mode 100644 index 0000000000..e4b368fe14 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ordenar por mais recente" name="sort_most"/> + <menu_item_check label="Ordenar por nome" name="sort_name"/> + <menu_item_check label="Exibir ícones de pessoas" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml index f3b89e01cd..f3b89e01cd 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/pt/menu_picks.xml b/indra/newview/skins/default/xui/pt/menu_picks.xml index 8b9e10fc02..8b9e10fc02 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_picks.xml +++ b/indra/newview/skins/default/xui/pt/menu_picks.xml diff --git a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml index 95a7c05262..95a7c05262 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/pt/menu_place.xml b/indra/newview/skins/default/xui/pt/menu_place.xml index 282ea20a7a..282ea20a7a 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_place.xml +++ b/indra/newview/skins/default/xui/pt/menu_place.xml diff --git a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml index d099d04f8d..d099d04f8d 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml index 7cba70a110..7cba70a110 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml index fec0911fcf..fec0911fcf 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml index d41ecbd755..d41ecbd755 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml index 61c6b9202f..61c6b9202f 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml index ccf3878e14..ccf3878e14 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/pt/menu_slurl.xml b/indra/newview/skins/default/xui/pt/menu_slurl.xml index 6d4c84fc3c..6d4c84fc3c 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_slurl.xml +++ b/indra/newview/skins/default/xui/pt/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml index f034509be8..f034509be8 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml index ec1e7a0950..ec1e7a0950 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml index 6a633cf74c..6a633cf74c 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/pt/menu_text_editor.xml b/indra/newview/skins/default/xui/pt/menu_text_editor.xml index a26b50e1c2..a26b50e1c2 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/pt/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/pt/menu_toolbars.xml b/indra/newview/skins/default/xui/pt/menu_toolbars.xml index b58a1a6e4f..b58a1a6e4f 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/pt/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml index d9347950b1..d9347950b1 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml index ba5e055124..aa0a426405 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Mostrar perfil de residente" name="show_agent"/> + <menu_item_call label="Exibir perfil" name="show_agent"/> + <menu_item_call label="Enviar MI..." name="send_im"/> + <menu_item_call label="Adicionar amigo..." name="add_friend"/> <menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/> <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_group.xml b/indra/newview/skins/default/xui/pt/menu_url_group.xml index 5b67a69c9a..5b67a69c9a 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_group.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_http.xml b/indra/newview/skins/default/xui/pt/menu_url_http.xml index e53a2572b8..e53a2572b8 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_http.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml index 45c14355d0..45c14355d0 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_map.xml b/indra/newview/skins/default/xui/pt/menu_url_map.xml index ba114cccaa..ba114cccaa 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_map.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml index c197444181..247a92567a 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Mostrar informações sobre o objeto" name="show_object"/> + <menu_item_call label="Perfil do objeto..." name="show_object"/> <menu_item_call label="Mostrar no mapa" name="show_on_map"/> <menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/> <menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml index 6cc668bfd3..6cc668bfd3 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml index d0784149ac..d0784149ac 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml index 7216ccf0b3..7216ccf0b3 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml index f007425646..f007425646 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index ca378c1b58..15814fed4c 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/> <menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/> </menu> - <menu label="Status" name="Status"> - <menu_item_call label="Ausente" name="Set Away"/> - <menu_item_call label="Ocupado" name="Set Busy"/> - </menu> + <menu label="Status" name="Status"/> <menu_item_call label="Comprar L$..." name="Buy and Sell L$"/> <menu_item_call label="Caixa de saída do lojista..." name="MerchantOutbox"/> <menu_item_call label="Painel da conta..." name="Manage My Account"> @@ -32,14 +29,18 @@ <menu_item_call label="Sair do [APP_NAME]" name="Quit"/> </menu> <menu label="Comunicar" name="Communicate"> - <menu_item_check label="Bate-papo..." name="Nearby Chat"/> + <menu_item_check label="Conversas..." name="Conversations"/> + <menu_item_check label="Bate-papo local..." name="Nearby Chat"/> <menu_item_check label="Falar" name="Speak"/> - <menu_item_check label="Configurações de voz..." name="Nearby Voice"/> - <menu_item_check label="Distorção de voz..." name="ShowVoice"/> + <menu label="Distorção de voz" name="VoiceMorphing"> + <menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/> + <menu_item_check label="Visualizar..." name="Preview"/> + <menu_item_call label="Assinar..." name="Subscribe"/> + </menu> <menu_item_check label="Gestos..." name="Gestures"/> - <menu_item_call label="Amigos" name="My Friends"/> - <menu_item_call label="Grupos" name="My Groups"/> - <menu_item_call label="Pessoas próximas" name="Active Speakers"/> + <menu_item_check label="Amigos" name="My Friends"/> + <menu_item_check label="Grupos" name="My Groups"/> + <menu_item_check label="Pessoas próximas" name="Active Speakers"/> <menu_item_call label="Lista de bloqueados" name="Block List"/> </menu> <menu label="Mundo" name="World"> @@ -115,7 +116,6 @@ <menu_item_call label="Comprar" name="Menu Object Buy"/> <menu_item_call label="Pegar" name="Menu Object Take"/> <menu_item_call label="Pegar uma cópia" name="Take Copy"/> - <menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/> <menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/> <menu_item_call label="Devolver objeto" name="Return Object back to Owner"/> </menu> @@ -130,6 +130,7 @@ <menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/> <menu_item_call label="Personagens..." name="pathfinding_characters_menu_item"/> <menu_item_call label="Visualização/teste..." name="pathfinding_console_menu_item"/> + <menu_item_call label="Recarregar região" name="pathfinding_rebake_navmesh_item"/> </menu> <menu label="Opções" name="Options"> <menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/> @@ -159,6 +160,13 @@ <menu label="Ajuda" name="Help"> <menu_item_call label="Como..." name="How To"/> <menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/> + <menu_item_call label="Guia do usuário" name="User’s guide"/> + <menu_item_call label="Base de conhecimento" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Fóruns da comunidade" name="Community Forums"/> + <menu_item_call label="Portal de suporte" name="Support portal"/> + <menu_item_call label="Notícias do [SECOND_LIFE]" name="Second Life News"/> + <menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/> <menu_item_call label="Denunciar abuso" name="Report Abuse"/> <menu_item_call label="Relatar bug" name="Report Bug"/> <menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/> @@ -286,7 +294,7 @@ <menu label="Rendering" name="Rendering"> <menu_item_check label="Axes" name="Axes"/> <menu_item_check label="Wireframe" name="Wireframe"/> - <menu_item_check label="Iluminação e sombras" name="Lighting and Shadows"/> + <menu_item_check label="Iluminação e sombras" name="Advanced Lighting Model"/> <menu_item_check label="Sombras da projeção do sol/lua" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO e sombra suave" name="SSAO and Shadow Smoothing"/> <menu_item_check label="Máscaras alpha automáticas (adiadas)" name="Automatic Alpha Masks (deferred)"/> @@ -336,9 +344,14 @@ <menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/> <menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/> </menu> + <menu label="Velocidade de animação" name="Animation Speed"> + <menu_item_call label="Todas as animações 10% mais rápidas" name="All Animations 10 Faster"/> + <menu_item_call label="Todas as animações 10% mais lentas" name="All Animations 10 Slower"/> + <menu_item_call label="Redefinir todas as velocidades de animação" name="Reset All Animation Speed"/> + <menu_item_check label="Animações em câmera lenta" name="Slow Motion Animations"/> + </menu> <menu_item_call label="Force Params to Default" name="Force Params to Default"/> <menu_item_check label="Dados da animação" name="Animation Info"/> - <menu_item_check label="Mostrar animação de movimento" name="Slow Motion Animations"/> <menu_item_check label="Disable Level Of Detail" name="Disable LOD"/> <menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/> <menu_item_check label="Display Agent Target" name="Display Agent Target"/> diff --git a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml index 2487f6779f..2487f6779f 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml index 75dca703cb..75dca703cb 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml index 4e6e52ebc7..4e6e52ebc7 100644..100755 --- a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/pt/mime_types.xml b/indra/newview/skins/default/xui/pt/mime_types.xml index f9c0496eea..f9c0496eea 100644..100755 --- a/indra/newview/skins/default/xui/pt/mime_types.xml +++ b/indra/newview/skins/default/xui/pt/mime_types.xml diff --git a/indra/newview/skins/default/xui/pt/mime_types_linux.xml b/indra/newview/skins/default/xui/pt/mime_types_linux.xml index 789843cbba..789843cbba 100644..100755 --- a/indra/newview/skins/default/xui/pt/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/pt/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/pt/mime_types_mac.xml b/indra/newview/skins/default/xui/pt/mime_types_mac.xml index 34b40e94ab..34b40e94ab 100644..100755 --- a/indra/newview/skins/default/xui/pt/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/pt/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index ff7382bf80..d9f5e48745 100644..100755 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -510,6 +510,24 @@ Consultar [_URL] para mais informações? </url> <usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> + <notification name="AMDOldDriver"> + Provavelmente, há um driver mais recente para o seu chip gráfico. A atualização dos drivers gráficos pode melhorar significativamente o desempenho. + + Visitar [_URL] para verificar se há atualizações do driver? + <url name="url"> + http://support.amd.com/us/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/> + </notification> + <notification name="NVIDIAOldDriver"> + Provavelmente, há um driver mais recente para o seu chip gráfico. A atualização dos drivers gráficos pode melhorar significativamente o desempenho. + + Visitar [_URL] para verificar se há atualizações do driver? + <url name="url"> + http://www.nvidia.com.br/Download/index.aspx?lang=br + </url> + <usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/> + </notification> <notification name="UnknownGPU"> A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME]. Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME]. Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. @@ -1533,10 +1551,13 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME]. Não é possível oferecer amizade neste momento. Por favor, tente novamente em breve. <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="BusyModeSet"> - Modo ocupado ativado. -O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua resposta de modo ocupado. Todas as ofertas de teletransporte serão recusadas. Todas as ofertas de inventário serão colocadas na Lixeira. - <usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/> + <notification name="DoNotDisturbModeSet"> + Não perturbe está ativado. Você não será notificado de comunicações recebidas. + +- Outros residentes receberão a sua resposta de Não perturbe (definida em Preferências > Geral). +- As ofertas de teletransporte serão recusadas. +- Chamadas de voz serão recusadas. + <usetemplate ignoretext="Altero meu status para o modo Não perturbe" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite. @@ -2022,6 +2043,10 @@ Mover para o inventário o(s) item(s)? Deseja abrir o [http://secondlife.com/account/ Painel] para ver o histórico da sua conta? <usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + Quando você adiciona uma pessoa a uma conversa existente, uma nova conversa é criada. Todos os participantes recebem notificações sobre a nova conversa. + <usetemplate ignoretext="Confirme a inclusão de participantes no bate-papo" name="okcancelignore" notext="Cancelar" yestext="Ok"/> + </notification> <notification name="ConfirmQuit"> Tem certeza que deseja sair? <usetemplate ignoretext="Confirmar antes de sair" name="okcancelignore" notext="Não sair" yestext="Sair"/> @@ -2096,14 +2121,14 @@ Você deseja substituí-lo pelo objeto selecionado? <button ignore="Never Replace" name="No" text="Não"/> </form> </notification> - <notification label="Aviso de Modo Ocupado" name="BusyModePay"> - Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos em troca deste pagamento. + <notification label="Aviso de modo Não perturbe" name="DoNotDisturbModePay"> + Você ativou o Não perturbe. Você não receberá qualquer item oferecido em troca deste pagamento. -Você gostaria de deixar o modo Ocupado antes de completar esta transação? +Deseja desativar o Não perturbe antes de concluir esta transação? <form name="form"> - <ignore name="ignore" save_option="true" text="Estou prestes a pagar alguém ou um objeto no modo ocupado"/> - <button ignore="Always leave Busy Mode" name="Yes" text="Sim"/> - <button ignore="Never leave Busy Mode" name="No" text="Não"/> + <ignore name="ignore" text="Estou prestes a pagar alguém ou um objeto no modo Não perturbe"/> + <button ignore="Sempre manter no modo Não perturbe" name="Yes" text="OK"/> + <button ignore="Nunca sair do modo Não perturbe" name="No" text="Cancelar"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2238,11 +2263,8 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de <notification name="GroupNotice"> Assunto: [SUBJECT], Mensagem: [MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> está online - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> está offline + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> está [STATUS] </notification> <notification name="AddSelfFriend"> Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a). @@ -2467,13 +2489,6 @@ Logo, não é possível voar aqui. <notification name="DynamicPathfindingDisabled"> O pathfinding dinâmico não está habilitado nesta região. Os objetos com script usando chamadas LSL de pathfinding podem não operar como o esperado na região. </notification> - <notification name="PathfindingRebakeNavmesh"> - A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento. Para fazer com que os objetos em movimento se comportem corretamente, clique no botão “Recarregar região”. Escolha “Ajuda” para obter mais informações. - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="Ajuda" ignoretext="A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento." name="okhelpignore" yestext="OK"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> Erro. Pode haver um erro de rede ou do servidor, ou você pode não ter direitos de construção. Às vezes, fazer login e logout novamente resolve este problema. <usetemplate name="okbutton" yestext="OK"/> @@ -2736,7 +2751,7 @@ OK? <notification name="ScriptQuestionCaution"> Aviso: O objeto '<nolink>[OBJECTNAME]</nolink>' deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais. -Esse tipo de pedido raramente é legítimo. Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta. +Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta. <form name="form"> <button name="Grant" text="Permitir acesso total"/> <button name="Deny" text="Negar"/> @@ -3310,4 +3325,633 @@ Tentativa cancelada. Você está excluindo [NUM_ITEMS] itens. Tem certeza de que deseja continuar? <usetemplate ignoretext="Tem certeza de que deseja excluir múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] congelou você. Você não pode se mover ou interagir com o mundo. + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] congelou você por [AV_FREEZE_TIME] segundos. Você não pode se mover ou interagir com o mundo. + </notification> + <notification name="YouFrozeAvatar"> + Avatar congelado. + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] descongelou você. + </notification> + <notification name="AvatarUnFrozen"> + Avatar descongelado. + </notification> + <notification name="AvatarFreezeFailure"> + O congelamento falhou porque você não tem permissão de administrador para esse lote. + </notification> + <notification name="AvatarFreezeThaw"> + Seu congelamento expirou, vá cuidar da sua vida. + </notification> + <notification name="AvatarCantFreeze"> + Não é possível congelar esse usuário. + </notification> + <notification name="NowOwnObject"> + Agora você é o proprietário do objeto [OBJECT_NAME] + </notification> + <notification name="CantRezOnLand"> + Não é possível renderizar objeto em [OBJECT_POS] porque o proprietário do terreno não permite. Use a ferramenta de terrenos para ver a propriedade do terreno. + </notification> + <notification name="RezFailTooManyRequests"> + O objeto não pode ser renderizado porque há muitas solicitações. + </notification> + <notification name="SitFailCantMove"> + Você não pode sentar porque não pode se mover no momento. + </notification> + <notification name="SitFailNotAllowedOnLand"> + Você não pode sentar porque não está autorizado a sentar nesse terreno. + </notification> + <notification name="SitFailNotSameRegion"> + Tente chegar mais perto. Não é possível sentar no objeto porque +ele não está na mesma região que você. + </notification> + <notification name="NoNewObjectRegionFull"> + Não foi possível criar um novo objeto. A região está cheia. + </notification> + <notification name="FailedToPlaceObject"> + Falha ao posicionar objeto em local específico. Tente novamente. + </notification> + <notification name="NoOwnNoGardening"> + Você não pode criar árvores e grama em terrenos que não são sua propriedade. + </notification> + <notification name="NoCopyPermsNoObject"> + A cópia falhou porque você não está autorizado a copiar o objeto '[OBJ_NAME]'. + </notification> + <notification name="NoTransPermsNoObject"> + A cópia falhou porque o objeto '[OBJ_NAME]' não pode ser transferido para você. + </notification> + <notification name="AddToNavMeshNoCopy"> + A cópia falhou porque o objeto '[OBJ_NAME]' contribui para o navmesh. + </notification> + <notification name="DupeWithNoRootsSelected"> + Duplicar sem objetos raiz selecionados. + </notification> + <notification name="CantDupeCuzRegionIsFull"> + Não é possível duplicar objetos porque a região está cheia. + </notification> + <notification name="CantDupeCuzParcelNotFound"> + Não é possível duplicar os objetos - não é possível encontrar o lote em que eles estão. + </notification> + <notification name="CantCreateCuzParcelFull"> + Não é possível criar objeto porque +o lote está cheio. + </notification> + <notification name="RezAttemptFailed"> + Falha na tentativa de renderizar um objeto. + </notification> + <notification name="ToxicInvRezAttemptFailed"> + Não é possível criar um item que causou problemas a essa região. + </notification> + <notification name="InvItemIsBlacklisted"> + Esse item do inventário foi incluído na lista. + </notification> + <notification name="NoCanRezObjects"> + No momento, você não está autorizado a criar objetos. + </notification> + <notification name="LandSearchBlocked"> + Pesquisa de terreno bloqueada. +Você realizou muitas pesquisas de terreno muito rápido. +Tente novamente em instantes. + </notification> + <notification name="NotEnoughResourcesToAttach"> + Não há recursos de script disponíveis suficientes para anexar objeto! + </notification> + <notification name="YouDiedAndGotTPHome"> + Você morreu e foi teletransportado para seu início + </notification> + <notification name="EjectComingSoon"> + Você não tem mais permissão para ficar aqui e tem [EJECT_TIME] segundos para sair. + </notification> + <notification name="NoEnterServerFull"> + Você não pode entrar nesta região porque +o servidor está cheio. + </notification> + <notification name="SaveBackToInvDisabled"> + Salvar no inventário foi desativado. + </notification> + <notification name="NoExistNoSaveToContents"> + Não é possível salvar '[OBJ_NAME]' no conteúdo do objeto porque o objeto do qual ele foi renderizado não existe mais. + </notification> + <notification name="NoModNoSaveToContents"> + Não é possível salvar '[OBJ_NAME]' no conteúdo do objeto porque você não tem permissão para modificar o objeto '[DEST_NAME]'. + </notification> + <notification name="NoSaveBackToInvDisabled"> + Não é possível salvar '[OBJ_NAME]' no inventário -- essa operação foi desativada. + </notification> + <notification name="NoCopyNoSelCopy"> + Você não pode copiar sua seleção porque não está autorizado a copiar o objeto '[OBJ_NAME]'. + </notification> + <notification name="NoTransNoSelCopy"> + Você não pode copiar a seleção porque o objeto '[OBJ_NAME]' não é transferível. + </notification> + <notification name="NoTransNoCopy"> + Você não pode copiar a seleção porque o objeto '[OBJ_NAME]' não é transferível. + </notification> + <notification name="NoPermsNoRemoval"> + A remoção do objeto '[OBJ_NAME]' do simulador é proibida pelo sistema de permissões. + </notification> + <notification name="NoModNoSaveSelection"> + Você não pode salvar sua seleção porque não está autorizado a modificar o objeto '[OBJ_NAME]'. + </notification> + <notification name="NoCopyNoSaveSelection"> + Não é possível salvar sua seleção porque o objeto '[OBJ_NAME]' não é copiável. + </notification> + <notification name="NoModNoTaking"> + Você não pode levar sua seleção porque não está autorizado a modificar o objeto '[OBJ_NAME]'. + </notification> + <notification name="RezDestInternalError"> + Erro interno: tipo de destino desconhecido. + </notification> + <notification name="DeleteFailObjNotFound"> + A exclusão falhou porque o objeto não foi encontrado + </notification> + <notification name="SorryCantEjectUser"> + Não é possível expulsar esse usuário. + </notification> + <notification name="RegionSezNotAHome"> + Esta região não permite que você a defina como seu início. + </notification> + <notification name="HomeLocationLimits"> + Você só pode definir seu "Início" em seu terreno ou em um Infohub do continente. + </notification> + <notification name="HomePositionSet"> + Posição de início definida. + </notification> + <notification name="AvatarEjected"> + Avatar expulso. + </notification> + <notification name="AvatarEjectFailed"> + A expulsão falhou porque você não tem permissão de administrador para esse lote. + </notification> + <notification name="CantMoveObjectParcelFull"> + Não é possível mover '[OBJECT_NAME]' para +[OBJ_POSITION] na região [REGION_NAME] porque o lote está cheio. + </notification> + <notification name="CantMoveObjectParcelPerms"> + Não é possível mover '[OBJECT_NAME]' para +[OBJ_POSITION] na região [REGION_NAME] porque seus objetos não são permitidos neste lote. + </notification> + <notification name="CantMoveObjectParcelResources"> + Não é possível mover '[OBJECT_NAME]' para +[OBJ_POSITION] na região [REGION_NAME] porque não há recursos suficientes para este objeto neste lote. + </notification> + <notification name="CantMoveObjectRegionVersion"> + Não é possível mover '[OBJECT_NAME]' para +[OBJ_POSITION] na região [REGION_NAME] porque outra região está executando uma versão mais antiga, que não dá suporte o recebimento deste objeto por meio de passagem de regiões. + </notification> + <notification name="CantMoveObjectNavMesh"> + Não é possível mover '[OBJECT_NAME]' para +[OBJ_POSITION] na região [REGION_NAME] porque você não está autorizado a modificar o navmesh além dos limites da região. + </notification> + <notification name="CantMoveObjectWTF"> + Não é possível mover '[OBJECT_NAME]' para +[OBJ_POSITION] na região [REGION_NAME] por uma razão desconhecida. ([FAILURE_TYPE]) + </notification> + <notification name="NoPermModifyObject"> + Você não está autorizado a modificar este objeto + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + Não é possível ativar propriedades físicas para um objeto que contribui para o navmesh. + </notification> + <notification name="CantEnablePhysKeyframedObj"> + Não é possível ativar propriedades físicas para objetos keyframe. + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + Não é possível ativar propriedades físicas para o objeto -- recursos de terreno insuficientes. + </notification> + <notification name="CantEnablePhysCostTooGreat"> + Não é possível ativar propriedades físicas para objeto com custo de recursos físicos acima de [MAX_OBJECTS] + </notification> + <notification name="PhantomWithConcavePiece"> + Este objeto não pode ter uma peça côncava porque é phantom e contribui para o navmesh. + </notification> + <notification name="UnableAddItem"> + Não é possível adicionar item! + </notification> + <notification name="UnableEditItem"> + Não é possível editar isso! + </notification> + <notification name="NoPermToEdit"> + Não é permitido editar isso. + </notification> + <notification name="NoPermToCopyInventory"> + Não é permitido copiar esse inventário. + </notification> + <notification name="CantSaveItemDoesntExist"> + Não é possível salvar no conteúdo do objeto: O item não existe mais. + </notification> + <notification name="CantSaveItemAlreadyExists"> + Não é possível salvar no conteúdo do objeto: já existe um item com esse nome no inventário + </notification> + <notification name="CantSaveModifyAttachment"> + Não é possível salvar no conteúdo do objeto: isso modificaria as permissões de anexo. + </notification> + <notification name="TooManyScripts"> + Muitos scripts. + </notification> + <notification name="UnableAddScript"> + Não é possível adicionar script! + </notification> + <notification name="AssetServerTimeoutObjReturn"> + Servidor de objetos não respondeu a tempo. Objeto retornado a sim. + </notification> + <notification name="RegionDisablePhysicsShapes"> + Esta região não tem formas físicas ativadas. + </notification> + <notification name="NoModNavmeshAcrossRegions"> + Você não pode modificar o navmesh além dos limites da região. + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + Não é possível definir as propriedades físicas neste tipo de objeto. + </notification> + <notification name="NoSetRootPrimWithNoShape"> + Não é possível definir que um prim raiz não tenha forma. + </notification> + <notification name="NoRegionSupportPhysMats"> + Esta região não tem materiais físicos ativados. + </notification> + <notification name="OnlyRootPrimPhysMats"> + Apenas prims raiz podem ter seus materiais físicos ajustados. + </notification> + <notification name="NoSupportCharacterPhysMats"> + Ainda não há suporte para a configuração dos materiais físicos em personagens. + </notification> + <notification name="InvalidPhysMatProperty"> + Uma ou mais das propriedades do material físico são inválidas. + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + Você não pode alterar o tipo de acabamento de um objeto mesh. + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + Você não pode alterar a forma de um objeto mesh + </notification> + <notification name="FullRegionCantEnter"> + Você não pode entrar nesta região porque \nela está cheia. + </notification> + <notification name="LinkFailedOwnersDiffer"> + Falha na vinculação -- proprietários diferentes + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + Falha na vinculação -- não é possível modificar o navmesh além dos limites da região. + </notification> + <notification name="LinkFailedNoPermToEdit"> + Ocorreu uma falha na vinculação porque você não tem permissão de edição. + </notification> + <notification name="LinkFailedTooManyPrims"> + Falha na vinculação -- muitos prims + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + Falha na vinculação -- não é possível vincular itens com cópia proibida a itens com transferência proibida + </notification> + <notification name="LinkFailedNothingLinkable"> + Falha na vinculação -- nada é vinculável. + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + Falha na vinculação -- muitos personagens com pathfinding + </notification> + <notification name="LinkFailedInsufficientLand"> + Falha na vinculação -- recursos de terreno insuficientes + </notification> + <notification name="LinkFailedTooMuchPhysics"> + O objeto usa muitos recursos físicos – sua dinâmica foi desativada. + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + Você foi teletransportado para seu início pelo objeto '[OBJECT_NAME]' no lote '[PARCEL_NAME]' + </notification> + <notification name="TeleportedHomeByObject"> + Você foi teletransportado para seu início pelo objeto '[OBJECT_NAME]' + </notification> + <notification name="TeleportedByAttachment"> + Você foi teletransportado por um anexo em [ITEM_ID] + </notification> + <notification name="TeleportedByObjectOnParcel"> + Você foi teletransportado pelo objeto '[OBJECT_NAME]' no lote '[PARCEL_NAME]' + </notification> + <notification name="TeleportedByObjectOwnedBy"> + Você foi teletransportado pelo objeto '[OBJECT_NAME]' de propriedade de [OWNER_ID] + </notification> + <notification name="TeleportedByObjectUnknownUser"> + Você foi teletransportado pelo objeto '[OBJECT_NAME]' de propriedade de um usuário desconhecido. + </notification> + <notification name="CantCreateObjectRegionFull"> + Não foi possível criar o objeto solicitado. A região está cheia. + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + Não é possível anexar vários objetos a um local. + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + Você não pode criar vários objetos aqui. + </notification> + <notification name="UnableToCreateObjTimeOut"> + Não foi possível criar o objeto solicitado. Objeto ausente do banco de dados. + </notification> + <notification name="UnableToCreateObjUnknown"> + Não foi possível criar o objeto solicitado. A solicitação expirou. Tente novamente. + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + Não foi possível criar o objeto solicitado. Tente novamente. + </notification> + <notification name="RezFailureTookTooLong"> + Falha na renderização, objeto solicitado demorou muito a carregar. + </notification> + <notification name="FailedToPlaceObjAtLoc"> + Falha ao posicionar objeto em local específico. Tente novamente. + </notification> + <notification name="CantCreatePlantsOnLand"> + Você não pode criar plantas neste terreno. + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + Não é possível restaurar o objeto. Nenhuma posição encontrada no mundo. + </notification> + <notification name="CantRezObjectInvalidMeshData"> + Não é possível renderizar o objeto porque os dados de mesh são inválidos. + </notification> + <notification name="CantRezObjectTooManyScripts"> + Não foi possível renderizar objeto porque já há muitos scripts nesta região. + </notification> + <notification name="CantCreateObjectNoAccess"> + Seus privilégios de acesso não permitem que você crie objetos aqui. + </notification> + <notification name="CantCreateObject"> + No momento, você não está autorizado a criar objetos. + </notification> + <notification name="InvalidObjectParams"> + Parâmetros de objeto inválidos + </notification> + <notification name="CantDuplicateObjectNoAcess"> + Seus privilégios de acesso não permitem que você duplique objetos aqui. + </notification> + <notification name="CantChangeShape"> + Você não está autorizado a alterar essa forma. + </notification> + <notification name="NoAccessToClaimObjects"> + Seus privilégios de acesso não permitem que você reivindique objetos aqui. + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + A doação falhou porque você não está autorizado a doar objetos ao seu grupo. + </notification> + <notification name="NoPrivsToBuyObject"> + Seus privilégios de acesso não permitem que você compre objetos aqui. + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + Não é possível anexar objeto porque um avatar está sentado nele. + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + Árvores e grama não podem ser usadas como anexos. + </notification> + <notification name="CantAttachGroupOwnedObjs"> + Não é possível anexar objetos de propriedade de um grupo. + </notification> + <notification name="CantAttachObjectsNotOwned"> + Não é possível anexar objetos que não sua propriedade. + </notification> + <notification name="CantAttachNavmeshObjects"> + Não é possível anexar objetos que contribuem com o navmesh. + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + Não é possível vincular objeto porque você não tem permissão para movê-lo. + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + Não há recursos de script disponíveis suficientes para anexar objeto! + </notification> + <notification name="CantDropItemTrialUser"> + Não é possível largar objetos aqui. Tente a área de Avaliação grátis. + </notification> + <notification name="CantDropMeshAttachment"> + Você não pode largar anexos mesh. Separe para o inventário e depois renderize no mundo. + </notification> + <notification name="CantDropAttachmentNoPermission"> + Falha ao largar anexo: você não está autorizado a largá-lo aqui. + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + Falha ao largar anexo: recursos de terreno disponíveis insuficientes. + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + Falha ao largar anexos: recursos disponíveis insuficientes. + </notification> + <notification name="CantDropObjectFullParcel"> + Não é possível largar objeto aqui. O lote está cheio. + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + Não é possível tocar/pegar este objeto porque você foi banido do lote de terreno. + </notification> + <notification name="PlzNarrowDeleteParams"> + Detalhe seus parâmetros de exclusão. + </notification> + <notification name="UnableToUploadAsset"> + Não é possível carregar objeto. + </notification> + <notification name="CantTeleportCouldNotFindUser"> + Não foi possível encontrar usuário para teletransportar para início + </notification> + <notification name="GodlikeRequestFailed"> + solicitação de poderes de deus falhou + </notification> + <notification name="GenericRequestFailed"> + falha em solicitação genérica + </notification> + <notification name="CantUploadPostcard"> + Não foi possível carregar cartão postal. Tente novamente mais tarde. + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + Não foi possível obter detalhes de inventário para o anúncio de grupo. + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + Não é possível enviar anúncio de grupo -- não permitido. + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + Não é possível enviar anúncio de grupo -- não foi possível construir inventário. + </notification> + <notification name="CantParceInventoryInNotice"> + Não é possível processar o inventário do anúncio. + </notification> + <notification name="TerrainUploadFailed"> + Falha no envio de terreno. + </notification> + <notification name="TerrainFileWritten"> + Arquivo de terreno gravado. + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + Arquivo de terreno criado, iniciando o download... + </notification> + <notification name="TerrainBaked"> + Terreno confeccionado. + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + Apenas os 10 primeiros objetos selecionados foram desativados. Atualize e faça novas seleções, se necessário. + </notification> + <notification name="UpdateViewerBuyParcel"> + Você precisa atualizar seu visualizador para comprar este lote. + </notification> + <notification name="CantBuyParcelNotForSale"> + Não é possível comprar, este lote não está à venda. + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + Não é possível comprar, o preço de venda ou a área do terreno foram alterados. + </notification> + <notification name="CantBuyParcelNotAuthorized"> + Você não é o comprador autorizado deste lote. + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + Você não pode comprar este lote porque já está aguardando aut. de compra + </notification> + <notification name="CantBuildOverflowParcel"> + Não é possível criar objeto aqui porque isso sobrecarregaria o lote. + </notification> + <notification name="SelectedMultipleOwnedLand"> + Você selecionou terreno com proprietários diferentes. Selecione uma área menor e tente novamente. + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + Não há lotes alugados suficientes na seleção para reunir. + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + Não é possível dividir o terreno.\nHá mais de um lote selecionado.\nTente selecionar um pedaço menor de terreno. + </notification> + <notification name="CantDivideLandCantFindParcel"> + Não é possível dividir o terreno.\nNão é possível encontrar o lote.\nComunique isso em Ajuda -> Relatar bug... + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + Não é possível dividir o terreno. O lote inteiro está selecionado.\nTente selecionar um pedaço menor do terreno. + </notification> + <notification name="LandHasBeenDivided"> + O terreno foi dividido. + </notification> + <notification name="PassPurchased"> + Você comprou um passe. + </notification> + <notification name="RegionDisallowsClassifieds"> + A região não permite classificados. + </notification> + <notification name="LandPassExpireSoon"> + Seu passe para este terreno está prestes a expirar. + </notification> + <notification name="CantSitNoSuitableSurface"> + Não há uma superfície adequada para sentar, tente outro local. + </notification> + <notification name="CantSitNoRoom"> + Não há espaço para sentar aqui, tente outro local. + </notification> + <notification name="ClaimObjectFailedNoPermission"> + A reivindicação do objeto falhou porque você não tem permissão + </notification> + <notification name="ClaimObjectFailedNoMoney"> + A reivindicação do objeto falhou porque você não tem L$ suficiente. + </notification> + <notification name="CantDeedGroupLand"> + Não é possível doar terrenos de propriedade de um grupo. + </notification> + <notification name="BuyObjectFailedNoMoney"> + A compra do objeto falhou porque você não tem L$ suficientes. + </notification> + <notification name="BuyInventoryFailedNoMoney"> + A compra do inventário falhou porque você não tem L$ suficiente + </notification> + <notification name="BuyPassFailedNoMoney"> + Você não tem L $ suficientes para comprar um passe para este terreno. + </notification> + <notification name="CantBuyPassTryAgain"> + Não é possível comprar passe no momento. Tente novamente mais tarde. + </notification> + <notification name="CantCreateObjectParcelFull"> + Não é possível criar objeto porque \no lote está cheio. + </notification> + <notification name="FailedPlacingObject"> + Falha ao posicionar objeto em local específico. Tente novamente. + </notification> + <notification name="CantCreateLandmarkForEvent"> + Não é possível criar marco para o evento. + </notification> + <notification name="GodBeatsFreeze"> + Seus poderes de deus rompem o congelamento! + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + Falha na solicitação de poderes especiais. Essa solicitação foi registrada. + </notification> + <notification name="ExpireExplanation"> + O sistema não pode processar sua solicitação no momento. A solicitação expirou. + </notification> + <notification name="DieExplanation"> + O sistema não pode processar sua solicitação. + </notification> + <notification name="AddPrimitiveFailure"> + Fundos insuficientes para criar prim. + </notification> + <notification name="RezObjectFailure"> + Fundos insuficientes para criar objeto. + </notification> + <notification name="ResetHomePositionNotLegal"> + Redefinir Início pois o Início não era legal. + </notification> + <notification name="CantInviteRegionFull"> + No momento, você não pode convidar ninguém para seu local pois a região está cheia. Tente novamente mais tarde. + </notification> + <notification name="CantSetHomeAtRegion"> + Esta região não permite que você a defina como seu início. + </notification> + <notification name="ListValidHomeLocations"> + Você só pode definir seu "Início" em seu terreno ou em um Infohub do continente. + </notification> + <notification name="SetHomePosition"> + Posição de início definida. + </notification> + <notification name="CantDerezInventoryError"> + Não é possível desrenderizar objeto devido a uma falha de inventário. + </notification> + <notification name="CantCreateRequestedInv"> + Não é possível criar o inventário solicitado. + </notification> + <notification name="CantCreateRequestedInvFolder"> + Não é possível criar a pasta de inventário solicitada. + </notification> + <notification name="CantCreateInventory"> + Não é possível criar esse inventário. + </notification> + <notification name="CantCreateLandmark"> + Não é possível criar marco. + </notification> + <notification name="CantCreateOutfit"> + Não é possível criar roupa agora. Tente novamente em instantes. + </notification> + <notification name="InventoryNotForSale"> + O inventário não está à venda. + </notification> + <notification name="CantFindInvItem"> + Não é possível encontrar item do inventário. + </notification> + <notification name="CantFindObject"> + Não foi possível encontrar objeto. + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + Transferências de dinheiro para objetos estão desativadas para esta região no momento. + </notification> + <notification name="CantPayNoAgent"> + Não foi possível descobrir a quem pagar. + </notification> + <notification name="CantDonateToPublicObjects"> + Não é possível dar L$ a objetos públicos. + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + Falha na criação de inventário de objetos do mundo virtual. + </notification> + <notification name="UserBalanceOrLandUsageError"> + Um erro interno impediu que seu visualizador fosse atualizado corretamente. O saldo em L$ ou a propriedade de lotes exibidos em seu visualizador pode não refletir o saldo real nos servidores. + </notification> + <notification name="LargePrimAgentIntersect"> + Não é possível criar grandes prims que interceptam outros jogadores. Tente novamente quando os outros jogadores tiverem se movido. + </notification> + <notification name="PreferenceChatClearLog"> + Isso excluirá os registros das conversas anteriores e qualquer backup desse arquivo. + <usetemplate ignoretext="Confirmar antes de excluir o registro com conversas anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + Isso excluirá todas as transcrições de todas as conversas anteriores. A lista de conversas antigas não será afetada. Todos os arquivos com as extensões .txt e txt.backup na pasta [FOLDER] serão excluídos. + <usetemplate ignoretext="Confirmar antes de excluir transcrições." name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="PreferenceChatPathChanged"> + Não foi possível mover arquivos. Caminho anterior restaurado. + <usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml index b1ffa0d2e5..b1ffa0d2e5 100644..100755 --- a/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml diff --git a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml index 73f6b2225f..73f6b2225f 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml index bd50d4953d..bd50d4953d 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml index b444593af8..22eb23ebc5 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml @@ -26,5 +26,6 @@ <icon name="permission_edit_mine_icon" tool_tip="Este amigo pode editar, excluir ou pegar seus pertences"/> <icon name="permission_map_icon" tool_tip="Este amigo pode localizar você no mapa"/> <icon name="permission_online_icon" tool_tip="Este amigo pode saber quando você estiver online"/> + <button name="info_btn" tool_tip="Mais informações"/> <button name="profile_btn" tool_tip="Ver perfil"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml index c5f93d719a..2fcf6b9932 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> - <text name="title_text"> - Lista de bloqueados - </text> - <scroll_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/> - <button label="Bloquear residente..." label_selected="Bloquear residente..." name="Block resident..." tool_tip="Selecione o residente a bloquear"/> - <button label="Bloquear objeto por nome..." label_selected="Bloquear objeto por nome..." name="Block object by name..."/> - <button label="Desbloquear" label_selected="Desbloquear" name="Unblock" tool_tip="Remover residente ou objeto da lista dos bloqueados"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="Filtrar" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="Ações em uma pessoa ou um objeto selecionado"/> + <menu_button name="view_btn" tool_tip="Opções de ordenação"/> + <menu_button name="plus_btn" tool_tip="Escolher um residente ou um objeto a ser bloqueado"/> + <button name="unblock_btn" tool_tip="Remover residente ou objeto da lista dos bloqueados"/> + </panel> + <block_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml index 87a2e1674d..87a2e1674d 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml index 094a03553b..094a03553b 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml index 78d9826099..78d9826099 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml index 0551d9cba6..0551d9cba6 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_classified_info.xml b/indra/newview/skins/default/xui/pt/panel_classified_info.xml index 73bfe7444e..73bfe7444e 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml index bfdc7290d2..bfdc7290d2 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml index 4b45a49f74..4b45a49f74 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml index 3e4b12b001..3e4b12b001 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml new file mode 100644 index 0000000000..f56168c962 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="(carregando)"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..74daded58f --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="Uma conversa de voz foi incluída"/> + <icon name="unread_ims_icon" tool_tip="Chegaram mensagens enquanto você estava desconectado"/> + <button name="delete_btn" tool_tip="Remover esta entrada"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml index 7ca5e23981..7ca5e23981 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml index 3dfb5a0a16..3dfb5a0a16 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml index b274945dbd..b274945dbd 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml index 23e00bfc3a..23e00bfc3a 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml index f21656d526..f21656d526 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml index 281823d641..281823d641 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml index 13f1f892f9..13f1f892f9 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml index 5798325bd7..5798325bd7 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml index 18568a81a8..18568a81a8 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_physics.xml b/indra/newview/skins/default/xui/pt/panel_edit_physics.xml index 967aab8bc3..967aab8bc3 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml index 5eb9987e71..5eb9987e71 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml index 0ba7382845..0ba7382845 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml index de41ba3ad2..de41ba3ad2 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml index c7e2b1e64c..c7e2b1e64c 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml index 08465d09e7..08465d09e7 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml index d00aa2dc66..d00aa2dc66 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml index 275efba6e6..275efba6e6 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml index 6f4779d855..6f4779d855 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml index f85bb3c499..f85bb3c499 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml index c383471851..c383471851 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml index 0bf510c67f..0bf510c67f 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml index 2e3e3d6305..2e3e3d6305 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml index 502dae8d67..502dae8d67 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml index b634ec3f64..b634ec3f64 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml index 30c825723b..30c825723b 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml index de057481de..de057481de 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml index 2346fe7f4f..2346fe7f4f 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml index 19c34d2f10..0490878507 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Desconhecido"/> + <button name="info_btn" tool_tip="Mais informações"/> <button name="profile_btn" tool_tip="Ver perfil"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml index 3bff1f8fb3..3bff1f8fb3 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_notify.xml b/indra/newview/skins/default/xui/pt/panel_group_notify.xml index 5a8ea81074..5a8ea81074 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml index 11a31570d1..11a31570d1 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml index 91b7d1b7cd..91b7d1b7cd 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/pt/panel_inventory_item.xml b/indra/newview/skins/default/xui/pt/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml index 39c19a22d4..39c19a22d4 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml index 49e1203601..49e1203601 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/pt/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml index d7e9fa76ea..d7e9fa76ea 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_login.xml +++ b/indra/newview/skins/default/xui/pt/panel_login.xml diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml index dbf8e4fa52..dbf8e4fa52 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml index 281c886bd4..281c886bd4 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_me.xml +++ b/indra/newview/skins/default/xui/pt/panel_me.xml diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml index 43c0820036..43c0820036 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml index 55226db274..55226db274 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml index e38c44d8fe..e38c44d8fe 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml index 4fa5436805..4fa5436805 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml index 6828d41dee..6828d41dee 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml index 9b993488be..5628a87109 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/> <button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml index 43bf8f9661..43bf8f9661 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml index dcd9ba1815..dcd9ba1815 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml index 442622035a..442622035a 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml index eb23f5c079..eb23f5c079 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml index 816a9bc46e..816a9bc46e 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml index 736b8f1fdd..736b8f1fdd 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml index 2d74e092a4..2d74e092a4 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml index 9224ec4742..9224ec4742 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml index f3af15b991..babb48c208 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_people.xml +++ b/indra/newview/skins/default/xui/pt/panel_people.xml @@ -14,81 +14,53 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa- <string name="no_filtered_friends_msg"> Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search]. </string> - <string name="people_filter_label" value="Filtro de pessoas"/> - <string name="groups_filter_label" value="Filtro de grupos"/> <string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/> <string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/> <string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/> <string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/> - <filter_editor label="Filtro" name="filter_input"/> <tab_container name="tabs"> <panel label="PROXIMIDADE" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="Opções"/> - <button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="Filtrar pessoas" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/> + <menu_button name="nearby_view_btn" tool_tip="Opções de exibição/ordenação"/> + <button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/> + <dnd_button name="nearby_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/> </panel> </panel> - <panel label="MEUS AMIGOS" name="friends_panel"> + <panel label="AMIGOS" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="Filtrar pessoas" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/> + <menu_button name="friends_view_btn" tool_tip="Opções de exibição/ordenação"/> + <button name="friends_add_btn" tool_tip="Oferecer amizade ao residente"/> + <dnd_button name="friends_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Online"/> <accordion_tab name="tab_all" title="Todos"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="Mostrar opções adicionais"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Oferecer amizade para um residente"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="MEUS GRUPOS" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="Opções"/> - <button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/> - <button name="activate_btn" tool_tip="Ativar o grupo selecionado"/> + <panel label="GRUPOS" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="Filtrar grupos" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="Ações no grupo selecionado"/> + <menu_button name="groups_view_btn" tool_tip="Opções de exibição/ordenação"/> + <menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/> + <dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/> </panel> </panel> <panel label="RECENTE" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="Opções"/> - <button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="Filtrar pessoas" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/> + <menu_button name="recent_view_btn" tool_tip="Opções de exibição/ordenação"/> + <button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/> + <dnd_button name="recent_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/> </panel> </panel> + <panel label="BLOQUEADA" name="blocked_panel"> + <panel label="Residentes e objetos bloqueados" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir dados do grupo"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="Bate-papo de grupo" name="chat_btn" tool_tip="Nova sessão de bate-papo"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_pick_info.xml b/indra/newview/skins/default/xui/pt/panel_pick_info.xml index caa140a245..caa140a245 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/pt/panel_picks.xml b/indra/newview/skins/default/xui/pt/panel_picks.xml index 2ff1eed624..2ff1eed624 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_picks.xml +++ b/indra/newview/skins/default/xui/pt/panel_picks.xml diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml index 8abe579702..8abe579702 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml index 69f0baf65f..69f0baf65f 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_places.xml +++ b/indra/newview/skins/default/xui/pt/panel_places.xml diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_message.xml b/indra/newview/skins/default/xui/pt/panel_postcard_message.xml index 9cde810430..9cde810430 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/pt/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml b/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml index 3088b9a996..3088b9a996 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml index c72928fc35..c72928fc35 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml index 2ffe720ccf..2ffe720ccf 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml 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 350d53b81c..baf14c2c23 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat" name="chat"> - <text name="font_size"> - Tamanho da fonte: - </text> - <radio_group name="chat_font_size"> - <radio_item label="Pequeno" name="radio" value="0"/> - <radio_item label="Médio" name="radio2" value="1"/> - <radio_item label="Grande" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/> - <check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/> - <check_box label="Ativar MIs e bate-papos de texto simples" name="plain_text_chat_history"/> - <check_box label="Balão de bate-papo" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - Mostrar MIs em: - </text> - <text name="requires_restart_label"> - (Reinicie para ativar) - </text> - <radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)"> - <radio_item label="Janelas separadas" name="radio" value="0"/> - <radio_item label="Guias" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - Ativar pop-ups de novos bate-papos: - </text> - <check_box label="Bate-papo de grupo" name="EnableGroupChatPopups" tool_tip="Exibir pop-up de bate-papos novos de grupos"/> - <check_box label="Bate-papos de MI" name="EnableIMChatPopups" tool_tip="Exibir pop-up de mensagens instantâneas novas"/> - <spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_lifetime"/> - <spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/> + <check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/> + <check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/> + <text name="font_size"> + Tamanho da fonte: + </text> + <combo_box name="chat_font_size"> + <item label="Pequeno" name="Small" value="0"/> + <item label="Médio" name="Medium" value="1"/> + <item label="Grande" name="Large" value="2"/> + </combo_box> + <check_box label="Balão de bate-papo" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + Notificações + </text> + <text name="friend_ims"> + MIs de amigos: + </text> + <combo_box name="FriendIMOptions"> + <item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/> + <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/> + <item label="Nenhum" name="None" value="none"/> + </combo_box> + <text name="non_friend_ims"> + MIs de não amigos: + </text> + <combo_box name="NonFriendIMOptions"> + <item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/> + <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/> + <item label="Nenhum" name="None" value="none"/> + </combo_box> + <text name="conference_ims"> + MIs de conferências: + </text> + <combo_box name="ConferenceIMOptions"> + <item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/> + <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/> + <item label="Nenhum" name="None" value="none"/> + </combo_box> + <text name="group_chat"> + Bate-papo de grupo: + </text> + <combo_box name="GroupChatOptions"> + <item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/> + <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/> + <item label="Nenhum" name="None" value="none"/> + </combo_box> + <text name="nearby_chat"> + Bate-papo local: + </text> + <combo_box name="NearbyChatOptions"> + <item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/> + <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/> + <item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="flash"/> + <item label="Nenhum" name="None" value="none"/> + </combo_box> + <text name="notifications_alert"> + Para interromper temporariamente todas as notificações, use Comunicar > Não perturbe. + </text> + </panel> + <panel> + <text name="play_sound"> + Executar som: + </text> + <check_box label="Nova conversa" name="new_conversation"/> + <check_box label="Chamada de voz recebida" name="incoming_voice_call"/> + <check_box label="Oferta de teletransporte" name="teleport_offer"/> + <check_box label="Oferta de inventário" name="inventory_offer"/> + </panel> + <panel> + <button label="Limpar registro..." name="clear_log"/> + <button label="Excluir transcrições..." name="delete_transcripts"/> + <button label="Procurar..." label_selected="Procurar" name="log_path_button"/> + </panel> <button label="Tradução..." name="ok_btn"/> <button label="Substituição automática..." name="autoreplace_showgui"/> <button label="Verificando a ortografia..." name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml index d6c6f66e37..d6c6f66e37 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml index c53aa7d5f7..8a0495f9bb 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml @@ -69,6 +69,9 @@ <combo_box.item label="(nunca)" name="item4"/> </combo_box> <text name="text_box3"> - Mensagem do modo ocupado: + Resposta de Não perturbe: </text> + <text_editor name="do_not_disturb_response"> + log_in_to_change + </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml index 28e7184326..28e7184326 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml index fa6f5f5851..fa6f5f5851 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml index d7fb585e35..d7fb585e35 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml index ebbd63138a..ebbd63138a 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml index d910a7b812..d910a7b812 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml index 9e07b6772f..9e07b6772f 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml index 65ac89baf8..65ac89baf8 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml index be15d40d74..be15d40d74 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml index 79eedebe5f..79eedebe5f 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml index b1453c9c32..b1453c9c32 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml index 4be1cd11c0..4be1cd11c0 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml index 74330a8946..74330a8946 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/pt/panel_script_ed.xml b/indra/newview/skins/default/xui/pt/panel_script_ed.xml index de02aafe2f..de02aafe2f 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/pt/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml index daf87c4dc6..daf87c4dc6 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml index 94274b2cfe..94274b2cfe 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml index 87e6d16056..87e6d16056 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml index 0a5a2e2572..0a5a2e2572 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml index 09444a5535..09444a5535 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml index 3c4bb18687..3c4bb18687 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml index 36b5b0cbe6..36b5b0cbe6 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml index 7f1452e992..7f1452e992 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml index 12a648f600..12a648f600 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml index 095b8fc75d..095b8fc75d 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml index 66db89f48f..66db89f48f 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml index 05869cf67a..05869cf67a 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml index cb9a6eb757..cb9a6eb757 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml index b77064a1ff..b77064a1ff 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml index 65f80fddd2..65f80fddd2 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml index 1d7878408a..1d7878408a 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml index 1dfd2a69ca..1dfd2a69ca 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/pt/panel_world_map.xml b/indra/newview/skins/default/xui/pt/panel_world_map.xml index accab068fd..accab068fd 100644..100755 --- a/indra/newview/skins/default/xui/pt/panel_world_map.xml +++ b/indra/newview/skins/default/xui/pt/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml index 21b085431e..21b085431e 100644..100755 --- a/indra/newview/skins/default/xui/pt/role_actions.xml +++ b/indra/newview/skins/default/xui/pt/role_actions.xml diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml index a5048e63b2..a5048e63b2 100644..100755 --- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml index 7908ea5f3a..7908ea5f3a 100644..100755 --- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml index d3cb087108..d3cb087108 100644..100755 --- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml index 3cfe0fe4f4..f0fd438cef 100644..100755 --- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="Comprar objeto" name="Buyobject"/> <combo_box.item label="Pagar por objeto" name="Payobject"/> <combo_box.item label="Abrir" name="Open"/> + <combo_box.item label="Zoom" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index bc72b86020..4bf18aab70 100644..100755 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -128,7 +128,7 @@ Sair </string> <string name="create_account_url"> - http://join.secondlife.com/index.php?lang=pt-BR&sourceid=[sourceid] + http://join.secondlife.com/?sourceid=[sourceid] </string> <string name="LoginFailedViewerNotPermitted"> O visualizador utilizado já não é compatível com o Second Life. Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download @@ -571,8 +571,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="AvatarAway"> Distante </string> - <string name="AvatarBusy"> - Ocupado + <string name="AvatarDoNotDisturb"> + Não perturbe </string> <string name="AvatarMuted"> Mudo @@ -808,6 +808,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="ST_NO_JOINT"> Não é possível encontrar a raiz (ROOT) ou junção (JOINT). </string> + <string name="NearbyChatTitle"> + Bate-papo local + </string> + <string name="NearbyChatLabel"> + (Bate-papo local) + </string> <string name="whisper"> sussurra: </string> @@ -871,6 +877,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="ControlYourCamera"> Controle sua camera </string> + <string name="AgentNameSubst"> + (Você) + </string> <string name="TeleportYourAgent"> Teletransportá-lo </string> @@ -955,18 +964,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="dictionary_files"> Dicionários </string> - <string name="AvatarSetNotAway"> - deixar como ausente - </string> - <string name="AvatarSetAway"> - deixar como ausente - </string> - <string name="AvatarSetNotBusy"> - deixar como não ocupado - </string> - <string name="AvatarSetBusy"> - Deixar como ocupado - </string> <string name="shape"> Silhueta </string> @@ -1923,8 +1920,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="PanelContentsNewScript"> Novo Script </string> - <string name="BusyModeResponseDefault"> - O residente para o qual escreveu está no modo 'ocupado', ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde. + <string name="DoNotDisturbModeResponseDefault"> + Este residente ativou o "Não perturbe" e verá sua mensagem mais tarde. </string> <string name="MuteByName"> (por nome) @@ -2037,9 +2034,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="GroupMoneyDate"> [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc] </string> - <string name="ViewerObjectContents"> - Conteúdo - </string> <string name="AcquiredItems"> Itens adquiridos </string> @@ -3753,7 +3747,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Região em geral </string> <string name="LocationCtrlSeeAVsTooltip"> - Avatar visíveis e bate-papo permitido fora deste terreno + Os avatares neste lote não podem ser vistos ou ouvidos por avatares fora dele </string> <string name="LocationCtrlPathfindingDirtyTooltip"> Os objetos que se movem podem não se comportar corretamente nesta região até que ela seja recarregada. @@ -3830,6 +3824,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_unblock_only_groups_friends"> Para visualizar esta mensagem, você deve desmarcar "Apenas amigos e grupos podem me ligar ou enviar MIs" em Preferências/Privacidade. </string> + <string name="OnlineStatus"> + Conectado + </string> + <string name="OfflineStatus"> + Desconectado + </string> <string name="answered_call"> Ligação atendida </string> @@ -3839,6 +3839,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="you_joined_call"> Você entrou na ligação </string> + <string name="you_auto_rejected_call-im"> + Você recusou automaticamente a chamada de voz enquanto "Não perturbe" estava ativado. + </string> <string name="name_started_call"> [NAME] iniciou uma ligação de voz </string> @@ -3851,6 +3854,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="hang_up-im"> Saiu da ligação de voz </string> + <string name="conference-title"> + Bate-papo com várias pessoas + </string> <string name="conference-title-incoming"> Conversa com [AGENT_NAME] </string> @@ -4726,6 +4732,9 @@ Tente colocar o caminho do editor entre aspas. <string name="Command_Chat_Label"> Bate-papo </string> + <string name="Command_Conversations_Label"> + Conversas + </string> <string name="Command_Compass_Label"> Bússola </string> @@ -4801,6 +4810,9 @@ Tente colocar o caminho do editor entre aspas. <string name="Command_Chat_Tooltip"> Bater papo com pessoas próximas usando texto </string> + <string name="Command_Conversations_Tooltip"> + Conversar com todos + </string> <string name="Command_Compass_Tooltip"> Bússola </string> @@ -4930,4 +4942,13 @@ Tente colocar o caminho do editor entre aspas. <string name="UserDictionary"> [Usuário] </string> + <string name="logging_calls_disabled_log_empty"> + As conversas não estão sendo registradas. Para começar a manter um registro, selecione "Salvar: apenas registro" ou "Salvar: registro e transcrições" em Preferências> Bate-papo. + </string> + <string name="logging_calls_disabled_log_not_empty"> + Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione "Salvar: apenas registro" ou "Salvar: registro e transcrições" em Preferências> Bate-papo. + </string> + <string name="logging_calls_enabled_log_empty"> + Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui. + </string> </strings> diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml index 40fb4caebf..40fb4caebf 100644..100755 --- a/indra/newview/skins/default/xui/pt/teleport_strings.xml +++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/pt/xui_version.xml b/indra/newview/skins/default/xui/pt/xui_version.xml index 0e777751d3..0e777751d3 100644..100755 --- a/indra/newview/skins/default/xui/pt/xui_version.xml +++ b/indra/newview/skins/default/xui/pt/xui_version.xml diff --git a/indra/newview/skins/default/xui/ru/floater_aaa.xml b/indra/newview/skins/default/xui/ru/floater_aaa.xml index aa18a4a4a3..aa18a4a4a3 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_aaa.xml +++ b/indra/newview/skins/default/xui/ru/floater_aaa.xml diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml index bb6266ac9a..bb6266ac9a 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_about.xml +++ b/indra/newview/skins/default/xui/ru/floater_about.xml diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml index 12691df684..12691df684 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/ru/floater_activeim.xml b/indra/newview/skins/default/xui/ru/floater_activeim.xml index adfa277822..adfa277822 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_activeim.xml +++ b/indra/newview/skins/default/xui/ru/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml index 711afc2717..711afc2717 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml index 8ad9d8657a..8ad9d8657a 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_auction.xml b/indra/newview/skins/default/xui/ru/floater_auction.xml index d84dc2e941..d84dc2e941 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_auction.xml +++ b/indra/newview/skins/default/xui/ru/floater_auction.xml diff --git a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml index 6827931e5d..6827931e5d 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/ru/floater_avatar.xml b/indra/newview/skins/default/xui/ru/floater_avatar.xml index b480af9345..b480af9345 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_avatar.xml +++ b/indra/newview/skins/default/xui/ru/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml index edcc35d2b9..edcc35d2b9 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml index cb39f66247..cb39f66247 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/ru/floater_beacons.xml b/indra/newview/skins/default/xui/ru/floater_beacons.xml index 38d257ff81..38d257ff81 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_beacons.xml +++ b/indra/newview/skins/default/xui/ru/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/ru/floater_build_options.xml b/indra/newview/skins/default/xui/ru/floater_build_options.xml index 9dd01dc823..9dd01dc823 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_build_options.xml +++ b/indra/newview/skins/default/xui/ru/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml index ccf13cf02a..ccf13cf02a 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/ru/floater_bumps.xml b/indra/newview/skins/default/xui/ru/floater_bumps.xml index f81f728290..f81f728290 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_bumps.xml +++ b/indra/newview/skins/default/xui/ru/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_contents.xml b/indra/newview/skins/default/xui/ru/floater_buy_contents.xml index b1d66ae14d..b1d66ae14d 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml index 87e8bd524e..87e8bd524e 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml index ac8ad469fb..ac8ad469fb 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_land.xml b/indra/newview/skins/default/xui/ru/floater_buy_land.xml index 907a795393..907a795393 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/ru/floater_buy_object.xml b/indra/newview/skins/default/xui/ru/floater_buy_object.xml index d25f9eccc2..d25f9eccc2 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/ru/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/ru/floater_camera.xml b/indra/newview/skins/default/xui/ru/floater_camera.xml index 52e7c62e06..52e7c62e06 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_camera.xml +++ b/indra/newview/skins/default/xui/ru/floater_camera.xml diff --git a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml index 79b7b033fb..f6b2fc81e1 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="chat_bar" title="ЛОКАЛЬНЫЙ ЧАТ"> +<floater name="nearby_chat" title="ЛОКАЛЬНЫЙ ЧАТ"> <panel name="bottom_panel"> <line_editor label="Щелкните здесь для общения." name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/> <button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/> diff --git a/indra/newview/skins/default/xui/ru/floater_choose_group.xml b/indra/newview/skins/default/xui/ru/floater_choose_group.xml index ab8350f539..ab8350f539 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/ru/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/ru/floater_color_picker.xml b/indra/newview/skins/default/xui/ru/floater_color_picker.xml index b7034bef0b..b7034bef0b 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/ru/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml new file mode 100644 index 0000000000..090ac7193a --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="ЖУРНАЛ РАЗГОВОРА"> + <panel name="buttons_panel"> + <filter_editor label="Фильтр для людей" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="Параметры просмотра/сортировки"/> + <menu_button name="conversations_gear_btn" tool_tip="Действия с выбранным жителем или группой"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml new file mode 100644 index 0000000000..23225fcf56 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="РАЗГОВОР:"> + <floater.string name="Title"> + РАЗГОВОР: [NAME] + </floater.string> + <text name="page_label" value="Страница"/> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_critical.xml b/indra/newview/skins/default/xui/ru/floater_critical.xml index bc64f3a83e..bc64f3a83e 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_critical.xml +++ b/indra/newview/skins/default/xui/ru/floater_critical.xml diff --git a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml index 3303a4f4c1..3303a4f4c1 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/ru/floater_destinations.xml b/indra/newview/skins/default/xui/ru/floater_destinations.xml index 5ba0841564..5ba0841564 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_destinations.xml +++ b/indra/newview/skins/default/xui/ru/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/ru/floater_display_name.xml b/indra/newview/skins/default/xui/ru/floater_display_name.xml index feb8a2721f..feb8a2721f 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_display_name.xml +++ b/indra/newview/skins/default/xui/ru/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml index 61d708c567..61d708c567 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml index 354120ea72..354120ea72 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml index f6def86380..f6def86380 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml index d752c08cbb..d752c08cbb 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/ru/floater_event.xml b/indra/newview/skins/default/xui/ru/floater_event.xml index 5c5bcc6d09..5c5bcc6d09 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_event.xml +++ b/indra/newview/skins/default/xui/ru/floater_event.xml diff --git a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml index 20936b8494..20936b8494 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/ru/floater_font_test.xml b/indra/newview/skins/default/xui/ru/floater_font_test.xml index b51732d3f1..b51732d3f1 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_font_test.xml +++ b/indra/newview/skins/default/xui/ru/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/ru/floater_gesture.xml b/indra/newview/skins/default/xui/ru/floater_gesture.xml index 759d81b2c6..759d81b2c6 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_gesture.xml +++ b/indra/newview/skins/default/xui/ru/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/ru/floater_god_tools.xml b/indra/newview/skins/default/xui/ru/floater_god_tools.xml index 81329475aa..81329475aa 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/ru/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml index 43f8c36473..43f8c36473 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/ru/floater_help_browser.xml b/indra/newview/skins/default/xui/ru/floater_help_browser.xml index 2f560340ed..2f560340ed 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/ru/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/ru/floater_how_to.xml b/indra/newview/skins/default/xui/ru/floater_how_to.xml index 52525e5d33..52525e5d33 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_how_to.xml +++ b/indra/newview/skins/default/xui/ru/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/ru/floater_hud.xml b/indra/newview/skins/default/xui/ru/floater_hud.xml index b05113bfe0..b05113bfe0 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_hud.xml +++ b/indra/newview/skins/default/xui/ru/floater_hud.xml diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml index b147cfa2b3..eba7a19cd4 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_im_container.xml +++ b/indra/newview/skins/default/xui/ru/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="ОБЩЕНИЕ"/> +<multi_floater name="floater_im_box" title="ОБЩЕНИЕ"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="Параметры просмотра/сортировки"/> + <button name="add_btn" tool_tip="Начать разговор"/> + <button name="speak_btn" tool_tip="Разговаривать через микрофон"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="Свернуть/развернуть этот список"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="Свернуть эту панель"/> + <text name="stub_textbox"> + Разговор отображается в отдельном окне. [secondlife:/// Вернуть.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml index 604d9dc6d3..ea110ffb44 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_im_session.xml +++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="Кому" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] приглашен(а) на разговор."/> + <floater.string name="multiple_participants_added" value="[NAME] приглашены на разговор."/> + <floater.string name="tooltip_to_separate_window" value="Перенести этот разговор в отдельное окно"/> + <floater.string name="tooltip_to_main_window" value="Вернуть этот разговор в главное окно"/> + <floater.string name="start_call_button_tooltip" value="Открыть голосовое подключение"/> + <floater.string name="end_call_button_tooltip" value="Закрыть голосовое подключение"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="Свернуть эту панель"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Свернуть список участников"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Развернуть список участников"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="Параметры просмотра/сортировки"/> + <menu_button name="gear_btn" tool_tip="Действия с выбранным жителем"/> + <button name="add_btn" tool_tip="Добавить участника в этот разговор"/> + <button name="voice_call_btn" tool_tip="Открыть голосовое подключение"/> + <button name="close_btn" tool_tip="Завершить этот разговор"/> + <button name="expand_collapse_btn" tool_tip="Развернуть/свернуть эту панель"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Переводить чат" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="Кому" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="Показать/скрыть панель сообщений"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_image_preview.xml b/indra/newview/skins/default/xui/ru/floater_image_preview.xml index dbc4c32b98..dbc4c32b98 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_import_collada.xml b/indra/newview/skins/default/xui/ru/floater_import_collada.xml index 122315cb26..122315cb26 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/ru/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml index 072c20147d..3f61421d0c 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml @@ -10,7 +10,7 @@ анонимно </floater.string> <floater.string name="VoiceInviteP2P"> - вызывает. + вызывает вас. </floater.string> <floater.string name="VoiceInviteAdHoc"> теперь участвует в групповом голосовом чате. @@ -25,9 +25,9 @@ Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату? </floater.string> <text name="question"> - Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату? + Если вы ответите, вы покинете текущий голосовой чат. </text> - <button label="Принять" label_selected="Принять" name="Accept"/> - <button label="Отклонить" label_selected="Отклонить" name="Reject"/> - <button label="Начать IM" name="Start IM"/> + <button label="Ответить" label_selected="Ответить" name="Accept"/> + <button label="Игнорировать" label_selected="Игнорировать" name="Reject"/> + <button label="Открыть IM" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_inspect.xml b/indra/newview/skins/default/xui/ru/floater_inspect.xml index f7bb981575..f7bb981575 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_inspect.xml +++ b/indra/newview/skins/default/xui/ru/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml index 9021b71fe2..9021b71fe2 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml index 02068c57b8..02068c57b8 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/ru/floater_joystick.xml b/indra/newview/skins/default/xui/ru/floater_joystick.xml index 66568563da..66568563da 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_joystick.xml +++ b/indra/newview/skins/default/xui/ru/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml index c420006a03..c420006a03 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml index 17d347867d..17d347867d 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml index d8047fc045..d8047fc045 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml index 95a3b8b2a0..95a3b8b2a0 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/ru/floater_map.xml b/indra/newview/skins/default/xui/ru/floater_map.xml index 59ceb0a773..59ceb0a773 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_map.xml +++ b/indra/newview/skins/default/xui/ru/floater_map.xml diff --git a/indra/newview/skins/default/xui/ru/floater_media_browser.xml b/indra/newview/skins/default/xui/ru/floater_media_browser.xml index d1fc105046..d1fc105046 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/ru/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/ru/floater_media_settings.xml b/indra/newview/skins/default/xui/ru/floater_media_settings.xml index 1515cbb3b8..1515cbb3b8 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml index 7aa5c27cde..7aa5c27cde 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml index 332fa3b82f..332fa3b82f 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml index 0c6d41b4ef..0c6d41b4ef 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_moveview.xml b/indra/newview/skins/default/xui/ru/floater_moveview.xml index cb1fda1a1f..cb1fda1a1f 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_moveview.xml +++ b/indra/newview/skins/default/xui/ru/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_mute_object.xml b/indra/newview/skins/default/xui/ru/floater_mute_object.xml index 44177acb53..44177acb53 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/ru/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/ru/floater_my_appearance.xml b/indra/newview/skins/default/xui/ru/floater_my_appearance.xml index b90d80f3fd..b90d80f3fd 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/ru/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/ru/floater_my_inventory.xml b/indra/newview/skins/default/xui/ru/floater_my_inventory.xml index 534d2a5774..534d2a5774 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/ru/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/floater_notification.xml b/indra/newview/skins/default/xui/ru/floater_notification.xml index c3e299202c..c3e299202c 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_notification.xml +++ b/indra/newview/skins/default/xui/ru/floater_notification.xml diff --git a/indra/newview/skins/default/xui/ru/floater_notifications_console.xml b/indra/newview/skins/default/xui/ru/floater_notifications_console.xml index bd836590e1..bd836590e1 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/ru/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/ru/floater_object_weights.xml b/indra/newview/skins/default/xui/ru/floater_object_weights.xml index 41e0118732..41e0118732 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/ru/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/ru/floater_openobject.xml b/indra/newview/skins/default/xui/ru/floater_openobject.xml index 5da308eecb..5da308eecb 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_openobject.xml +++ b/indra/newview/skins/default/xui/ru/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml index 301206e473..301206e473 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml index 5e50a75b85..5e50a75b85 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml index ce7ffc3d20..ce7ffc3d20 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml index fa72df04fd..8faddb1805 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> Показать: </text> - <check_box label="Мир" name="show_world"/> + <check_box label="Тест" name="show_world"/> <check_box label="Только перемещаемые предметы" name="show_world_movables_only"/> <check_box label="Навигационная сетка" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml index db100fa415..db100fa415 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/ru/floater_pay.xml b/indra/newview/skins/default/xui/ru/floater_pay.xml index 1471a7e133..1471a7e133 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_pay.xml +++ b/indra/newview/skins/default/xui/ru/floater_pay.xml diff --git a/indra/newview/skins/default/xui/ru/floater_pay_object.xml b/indra/newview/skins/default/xui/ru/floater_pay_object.xml index 7d2da44ac1..7d2da44ac1 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/ru/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/ru/floater_people.xml b/indra/newview/skins/default/xui/ru/floater_people.xml index 7abc34986a..7abc34986a 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_people.xml +++ b/indra/newview/skins/default/xui/ru/floater_people.xml diff --git a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml index a704b87bd1..a704b87bd1 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/ru/floater_picks.xml b/indra/newview/skins/default/xui/ru/floater_picks.xml index e0ae8d6f03..e0ae8d6f03 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_picks.xml +++ b/indra/newview/skins/default/xui/ru/floater_picks.xml diff --git a/indra/newview/skins/default/xui/ru/floater_places.xml b/indra/newview/skins/default/xui/ru/floater_places.xml index 2a22a855ef..2a22a855ef 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_places.xml +++ b/indra/newview/skins/default/xui/ru/floater_places.xml diff --git a/indra/newview/skins/default/xui/ru/floater_post_process.xml b/indra/newview/skins/default/xui/ru/floater_post_process.xml index ae97670548..ae97670548 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_post_process.xml +++ b/indra/newview/skins/default/xui/ru/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preferences.xml b/indra/newview/skins/default/xui/ru/floater_preferences.xml index fc244b9d8b..fc244b9d8b 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_preferences.xml +++ b/indra/newview/skins/default/xui/ru/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml index 4eecfedf17..4eecfedf17 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml index 22c6bc5901..22c6bc5901 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml index fde2cea00e..fde2cea00e 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml index 2f39d4a4a4..2f39d4a4a4 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_sound.xml b/indra/newview/skins/default/xui/ru/floater_preview_sound.xml index 691b2f3e82..691b2f3e82 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml index c9cb87282a..c9cb87282a 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml index fd513c8cdb..fd513c8cdb 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/ru/floater_publish_classified.xml b/indra/newview/skins/default/xui/ru/floater_publish_classified.xml index b9e33d6e22..b9e33d6e22 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/ru/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml index d413a0bdcc..d413a0bdcc 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/ru/floater_region_info.xml b/indra/newview/skins/default/xui/ru/floater_region_info.xml index 011b58e385..011b58e385 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_region_info.xml +++ b/indra/newview/skins/default/xui/ru/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml index 6fdbdacadc..6fdbdacadc 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug.xml b/indra/newview/skins/default/xui/ru/floater_script_debug.xml index b91fc4e4ff..b91fc4e4ff 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_limits.xml b/indra/newview/skins/default/xui/ru/floater_script_limits.xml index 7805eac03b..7805eac03b 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_preview.xml b/indra/newview/skins/default/xui/ru/floater_script_preview.xml index 78cefb7aa7..78cefb7aa7 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_queue.xml b/indra/newview/skins/default/xui/ru/floater_script_queue.xml index 4f2e389b19..4f2e389b19 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/ru/floater_script_search.xml b/indra/newview/skins/default/xui/ru/floater_script_search.xml index fc040f6593..fc040f6593 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_script_search.xml +++ b/indra/newview/skins/default/xui/ru/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/ru/floater_search.xml b/indra/newview/skins/default/xui/ru/floater_search.xml index 405a6598ac..405a6598ac 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_search.xml +++ b/indra/newview/skins/default/xui/ru/floater_search.xml diff --git a/indra/newview/skins/default/xui/ru/floater_select_key.xml b/indra/newview/skins/default/xui/ru/floater_select_key.xml index 99c2b9a2c4..99c2b9a2c4 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_select_key.xml +++ b/indra/newview/skins/default/xui/ru/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/ru/floater_sell_land.xml b/indra/newview/skins/default/xui/ru/floater_sell_land.xml index e15f761101..e15f761101 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/ru/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/ru/floater_settings_debug.xml b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml index 7db014ef53..7db014ef53 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/ru/floater_snapshot.xml b/indra/newview/skins/default/xui/ru/floater_snapshot.xml index 7e88630b32..7e88630b32 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/ru/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml index fc8de858cd..fc8de858cd 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/ru/floater_sound_preview.xml b/indra/newview/skins/default/xui/ru/floater_sound_preview.xml index 6fdb12b76b..6fdb12b76b 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml index 691b4a89c3..691b4a89c3 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml index a01866db73..a01866db73 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml index 46426495dc..46426495dc 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_stats.xml +++ b/indra/newview/skins/default/xui/ru/floater_stats.xml diff --git a/indra/newview/skins/default/xui/ru/floater_sys_well.xml b/indra/newview/skins/default/xui/ru/floater_sys_well.xml index b6975ac9ab..b6975ac9ab 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/ru/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/ru/floater_telehub.xml b/indra/newview/skins/default/xui/ru/floater_telehub.xml index 799fd57b5b..799fd57b5b 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_telehub.xml +++ b/indra/newview/skins/default/xui/ru/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml index d0bd86160e..d0bd86160e 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml index db37089aeb..a9a21e7d4a 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml @@ -19,7 +19,7 @@ <button label="По умолчанию" label_selected="По умолчанию" name="Default"/> <button label="Очистить" label_selected="Очистить" name="Blank"/> <button label="Нет" label_selected="Нет" name="None"/> - <check_box initial_value="истина" label="Просмотр вживую" name="apply_immediate_check"/> + <check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/> <text name="preview_disabled" value="Просмотр отключен"/> <filter_editor label="Фильтровать текстуры" name="inventory search editor"/> <check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml index 628e6c5c87..628e6c5c87 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml index c312f73428..c312f73428 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_tools.xml +++ b/indra/newview/skins/default/xui/ru/floater_tools.xml diff --git a/indra/newview/skins/default/xui/ru/floater_top_objects.xml b/indra/newview/skins/default/xui/ru/floater_top_objects.xml index c7ece5c9c9..c7ece5c9c9 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/ru/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/ru/floater_tos.xml b/indra/newview/skins/default/xui/ru/floater_tos.xml index bd72f6b308..bd72f6b308 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_tos.xml +++ b/indra/newview/skins/default/xui/ru/floater_tos.xml diff --git a/indra/newview/skins/default/xui/ru/floater_toybox.xml b/indra/newview/skins/default/xui/ru/floater_toybox.xml index a4754ad7ab..a4754ad7ab 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_toybox.xml +++ b/indra/newview/skins/default/xui/ru/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/ru/floater_translation_settings.xml b/indra/newview/skins/default/xui/ru/floater_translation_settings.xml index ad280a50dd..ad280a50dd 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/ru/floater_url_entry.xml b/indra/newview/skins/default/xui/ru/floater_url_entry.xml index 59f8dd0c31..59f8dd0c31 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/ru/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..5a7e7a7061 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСОВОГО ЧАТА"> + <slider label="Голосовой чат" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml index 2b23086062..2b23086062 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml index 1eb8a94d7a..d3cef042a3 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Места" name="voice_effects" title="ИЗМЕНЕНИЕ ГОЛОСА"> +<floater label="Места" name="voice_effects" title="ПРОСМОТР ИЗМЕНЕНИЯ ГОЛОСА"> <string name="no_voice_effect"> (Нет изменения голоса) </string> diff --git a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml new file mode 100644 index 0000000000..aca6bd518a --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСА"> + <slider name="volume_slider" tool_tip="Громкость голоса" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_web_content.xml b/indra/newview/skins/default/xui/ru/floater_web_content.xml index 403ab0ef5d..403ab0ef5d 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_web_content.xml +++ b/indra/newview/skins/default/xui/ru/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml index 811a2756fa..811a2756fa 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/ru/floater_window_size.xml b/indra/newview/skins/default/xui/ru/floater_window_size.xml index fbff6a72b2..fbff6a72b2 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_window_size.xml +++ b/indra/newview/skins/default/xui/ru/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/ru/floater_world_map.xml b/indra/newview/skins/default/xui/ru/floater_world_map.xml index ef8dfe22ae..ef8dfe22ae 100644..100755 --- a/indra/newview/skins/default/xui/ru/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ru/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/ru/inspect_avatar.xml b/indra/newview/skins/default/xui/ru/inspect_avatar.xml index e38ae967cc..e38ae967cc 100644..100755 --- a/indra/newview/skins/default/xui/ru/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/ru/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/ru/inspect_group.xml b/indra/newview/skins/default/xui/ru/inspect_group.xml index ca600b0a1f..ca600b0a1f 100644..100755 --- a/indra/newview/skins/default/xui/ru/inspect_group.xml +++ b/indra/newview/skins/default/xui/ru/inspect_group.xml diff --git a/indra/newview/skins/default/xui/ru/inspect_object.xml b/indra/newview/skins/default/xui/ru/inspect_object.xml index 1a43357cd3..1a43357cd3 100644..100755 --- a/indra/newview/skins/default/xui/ru/inspect_object.xml +++ b/indra/newview/skins/default/xui/ru/inspect_object.xml diff --git a/indra/newview/skins/default/xui/ru/inspect_remote_object.xml b/indra/newview/skins/default/xui/ru/inspect_remote_object.xml index eec4817f02..eec4817f02 100644..100755 --- a/indra/newview/skins/default/xui/ru/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/ru/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml index 786e571527..786e571527 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml index fb1c24448b..fb1c24448b 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml index f241b48871..f241b48871 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml index ac2b4be003..ac2b4be003 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml index fb283c9d80..fb283c9d80 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml index b72f3dcc42..b72f3dcc42 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml index 72d1bc52b5..72d1bc52b5 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml index ee0a0c70ed..ee0a0c70ed 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml index bbdf4fd0d4..bbdf4fd0d4 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml index 0332c03a04..b7a32dfd75 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="Gear COF"> <menu label="Новая одежда" name="COF.Gear.New_Clothes"/> - <menu label="Новые части тела" name="COF.Geear.New_Body_Parts"/> + <menu label="Новые части тела" name="COF.Gear.New_Body_Parts"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml new file mode 100644 index 0000000000..530b1ea704 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="Закрыть разговор" name="close_conversation"/> + <menu_item_call label="Открыть голосовой чат" name="open_voice_conversation"/> + <menu_item_call label="Прекратить голосовой чат" name="disconnect_from_voice"/> + <menu_item_call label="Смотреть профиль" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Предложить телепортацию" name="offer_teleport"/> + <menu_item_call label="Голосовой вызов" name="voice_call"/> + <menu_item_call label="Журнал чата..." name="chat_history"/> + <menu_item_call label="Добавить друга" name="add_friend"/> + <menu_item_call label="Удалить друга" name="remove_friend"/> + <menu_item_call label="Удалить друзей" name="remove_friends"/> + <menu_item_call label="Пригласить в группу..." name="invite_to_group"/> + <menu_item_call label="Приблизить" name="zoom_in"/> + <menu_item_call label="Карта" name="map"/> + <menu_item_call label="Поделиться" name="share"/> + <menu_item_call label="Заплатить" name="pay"/> + <menu_item_check label="Блокировать голос" name="block_unblock"/> + <menu_item_check label="Блокировать текст" name="MuteText"/> + <menu_item_call label="Профиль группы" name="group_profile"/> + <menu_item_call label="Активировать группу" name="activate_group"/> + <menu_item_call label="Покинуть группу" name="leave_group"/> + <context_menu label="Параметры модератора" name="Moderator Options"> + <menu_item_check label="Разрешить текстовый чат" name="AllowTextChat"/> + <menu_item_call label="Заглушить этого участника" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Позволить говорить этому участнику" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Заглушить всех" name="ModerateVoiceMute"/> + <menu_item_call label="Позволить говорить всем" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..3fbffbe038 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="IM..." name="IM"/> + <menu_item_call label="Голосовой вызов..." name="Call"/> + <menu_item_call label="Открыть журнал чата..." name="Chat history"/> + <menu_item_call label="Смотреть профиль" name="View Profile"/> + <menu_item_call label="Предложить телепорт" name="teleport"/> + <menu_item_call label="Добавить друга" name="add_friend"/> + <menu_item_call label="Удалить из друзей" name="remove_friend"/> + <menu_item_call label="Пригласить в группу..." name="Invite"/> + <menu_item_call label="Карта" name="Map"/> + <menu_item_call label="Поделиться" name="Share"/> + <menu_item_call label="Заплатить" name="Pay"/> + <menu_item_check label="Черный список" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml new file mode 100644 index 0000000000..928146e273 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="Сортировать по имени" name="sort_by_name"/> + <menu_item_check label="Сортировать по дате" name="sort_by_date"/> + <menu_item_check label="Сначала друзья" name="sort_by_friends"/> + <menu_item_call label="Посмотреть журнал локального чата..." name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_edit.xml b/indra/newview/skins/default/xui/ru/menu_edit.xml index 0dddea9c04..0dddea9c04 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_edit.xml +++ b/indra/newview/skins/default/xui/ru/menu_edit.xml diff --git a/indra/newview/skins/default/xui/ru/menu_favorites.xml b/indra/newview/skins/default/xui/ru/menu_favorites.xml index 074be06ba9..074be06ba9 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_favorites.xml +++ b/indra/newview/skins/default/xui/ru/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml index d0b68cefbd..d0b68cefbd 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_group_plus.xml b/indra/newview/skins/default/xui/ru/menu_group_plus.xml index edd012b964..edd012b964 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/ru/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml index 34e5f4c0e4..34e5f4c0e4 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml new file mode 100644 index 0000000000..1db0b8bae3 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="Смотреть профиль" name="View Profile"/> + <menu_item_call label="Добавить друга" name="Add Friend"/> + <menu_item_call label="Удалить друга" name="remove_friend"/> + <menu_item_call label="Предложить телепортацию" name="offer_teleport"/> + <menu_item_call label="Пригласить в группу..." name="invite_to_group"/> + <menu_item_call label="Журнал чата..." name="chat_history"/> + <menu_item_call label="Приблизить" name="zoom_in"/> + <menu_item_call label="Карта" name="map"/> + <menu_item_call label="Поделиться" name="Share"/> + <menu_item_call label="Заплатить" name="Pay"/> + <menu_item_check label="Блокировать голос" name="Block/Unblock"/> + <menu_item_check label="Блокировать текст" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..35cff8e4bf --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="Компактный вид" name="compact_view"/> + <menu_item_check label="Развернутый вид" name="expanded_view"/> + <menu_item_check label="Показать время" name="IMShowTime"/> + <menu_item_check label="Показывать имена при разговорах" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_im_well_button.xml b/indra/newview/skins/default/xui/ru/menu_im_well_button.xml deleted file mode 100644 index 5a5bde61b9..0000000000 --- a/indra/newview/skins/default/xui/ru/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Закрыть все" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml index 8b60a585ab..8b60a585ab 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml index 766b3847a7..766b3847a7 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml index a33f6d5be8..a33f6d5be8 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml index 957609a7a3..957609a7a3 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml index 30953e830b..30953e830b 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml index 901bb615e0..901bb615e0 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml index 95d162d7fe..95d162d7fe 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml index 37ee19fc1d..37ee19fc1d 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml index 9a240c653e..9a240c653e 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml index 9fc0b6d44e..9fc0b6d44e 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/ru/menu_land.xml b/indra/newview/skins/default/xui/ru/menu_land.xml index 89889d7bf6..89889d7bf6 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_land.xml +++ b/indra/newview/skins/default/xui/ru/menu_land.xml diff --git a/indra/newview/skins/default/xui/ru/menu_landmark.xml b/indra/newview/skins/default/xui/ru/menu_landmark.xml index 24b60f9d86..24b60f9d86 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_landmark.xml +++ b/indra/newview/skins/default/xui/ru/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml index 93a5ffbb25..93a5ffbb25 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_login.xml +++ b/indra/newview/skins/default/xui/ru/menu_login.xml diff --git a/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml index d7485b02af..d7485b02af 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/ru/menu_mini_map.xml b/indra/newview/skins/default/xui/ru/menu_mini_map.xml index 6b3db11609..6b3db11609 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/ru/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml index 5ae5e7dfbc..5ae5e7dfbc 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/ru/menu_navbar.xml b/indra/newview/skins/default/xui/ru/menu_navbar.xml index 2dd0c0df36..2dd0c0df36 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_navbar.xml +++ b/indra/newview/skins/default/xui/ru/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml index 4b5346d083..4b5346d083 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml index 4d067e232a..4d067e232a 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml index 288df3beb9..288df3beb9 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_object.xml +++ b/indra/newview/skins/default/xui/ru/menu_object.xml diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml index 6229b2e72f..0c50abcfbd 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="Профиль объекта..." name="Object Profile"/> <menu_item_call label="Блокировать..." name="Block"/> + <menu_item_call label="Показать на карте" name="show_on_map"/> + <menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml index 93dbd7d6a7..d379a17216 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="Новые волосы" name="New Hair"/> <menu_item_call label="Новые глаза" name="New Eyes"/> </menu> + <menu_item_call label="Открыть все папки" name="expand"/> + <menu_item_call label="Закрыть все папки" name="collapse"/> <menu_item_call label="Переименовать костюм" name="rename"/> <menu_item_call label="Удалить костюм" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml index 46404195b9..46404195b9 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/ru/menu_participant_list.xml b/indra/newview/skins/default/xui/ru/menu_participant_list.xml index 932ad5bacf..932ad5bacf 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/ru/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/ru/menu_participant_view.xml b/indra/newview/skins/default/xui/ru/menu_participant_view.xml new file mode 100644 index 0000000000..851a42d428 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="Сортировать разговоры по типу" name="sort_sessions_by_type"/> + <menu_item_check label="Сортировать разговоры по имени" name="sort_sessions_by_name"/> + <menu_item_check label="Сортировать разговоры по последнему действию" name="sort_sessions_by_recent"/> + <menu_item_check label="Сортировать участников по имени" name="sort_participants_by_name"/> + <menu_item_check label="Сортировать участников по последнему действию" name="sort_participants_by_recent"/> + <menu_item_call label="Изменить настройки..." name="chat_preferences"/> + <menu_item_call label="Настройки приватности..." name="privacy_preferences"/> + <menu_item_check label="Журнал разговора..." name="Conversation"/> + <menu_item_check label="Перевести локальный чат" name="Translate_chat"/> + <menu_item_check label="Настройки перевода..." name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..157f2ad5e2 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="Разблокировать" name="unblock"/> + <menu_item_call label="Профиль…" name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..f42e8f8609 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="Блокировать жителя по имени..." name="block_resident_by_name"/> + <menu_item_call label="Блокировать объект по имени" name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml new file mode 100644 index 0000000000..8c0150e8ae --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="Сортировать по имени" name="sort_by_name"/> + <menu_item_check label="Сортировать по типу" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml new file mode 100644 index 0000000000..7b2dba0539 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Сортировать по имени" name="sort_name"/> + <menu_item_check label="Сортировать по статусу" name="sort_status"/> + <menu_item_check label="Показывать значки людей" name="view_icons"/> + <menu_item_check label="Показывать разрешенные действия" name="view_permissions"/> + <menu_item_check label="Посмотреть журнал разговора..." name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml index 0fa252aa99..0fa252aa99 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml index e734a83ef0..78d73c9d1e 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="Информация" name="View Info"/> <menu_item_call label="Чат" name="Chat"/> - <menu_item_call label="Звонок" name="Call"/> + <menu_item_call label="Голосовой вызов" name="Call"/> <menu_item_call label="Активация" name="Activate"/> <menu_item_call label="Покинуть" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml new file mode 100644 index 0000000000..cbf1c64774 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Показывать значки группы" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml index 0358068db9..0358068db9 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml index ebce959044..d05b7e7d01 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="Смотреть профиль" name="View Profile"/> - <menu_item_call label="В друзья" name="Add Friend"/> - <menu_item_call label="Удалить из друзей" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="Звонок" name="Call"/> - <menu_item_call label="Карта" name="Map"/> - <menu_item_call label="Поделиться" name="Share"/> - <menu_item_call label="Заплатить" name="Pay"/> - <menu_item_check label="Черный список" name="Block/Unblock"/> - <menu_item_call label="Предложить телепорт" name="teleport"/> + <menu_item_call label="Смотреть профиль" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Предложить телепорт" name="offer_teleport"/> + <menu_item_call label="Голосовой вызов" name="voice_call"/> + <menu_item_call label="Посмотреть журнал чата..." name="chat_history"/> + <menu_item_call label="Добавить друга" name="add_friend"/> + <menu_item_call label="Удалить из друзей" name="remove_friend"/> + <menu_item_call label="Пригласить в группу..." name="invite_to_group"/> + <menu_item_call label="Приблизить" name="zoom_in"/> + <menu_item_call label="Карта" name="map"/> + <menu_item_call label="Поделиться" name="share"/> + <menu_item_call label="Заплатить" name="pay"/> + <menu_item_check label="Черный список" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml index 0e8e0d4053..88eb56c9f5 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="Добавить в друзья" name="Add Friends"/> - <menu_item_call label="Удалить из друзей" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="Звонок" name="Call"/> - <menu_item_call label="Поделиться" name="Share"/> - <menu_item_call label="Заплатить" name="Pay"/> - <menu_item_call label="Предложить телепорт" name="teleport"/> + <menu_item_call label="Добавить в друзья" name="add_friends"/> + <menu_item_call label="Удалить из друзей" name="remove_friends"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="Звонок" name="call"/> + <menu_item_call label="Поделиться" name="share"/> + <menu_item_call label="Заплатить" name="pay"/> + <menu_item_call label="Предложить телепорт" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml new file mode 100644 index 0000000000..2bc353ad58 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Сортировать по недавно говорившим" name="sort_by_recent_speakers"/> + <menu_item_check label="Сортировать по имени" name="sort_name"/> + <menu_item_check label="Сортировать по расстоянию" name="sort_distance"/> + <menu_item_check label="Показывать значки людей" name="view_icons"/> + <menu_item_check label="Смотреть карту" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml index 4589815f6b..4589815f6b 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml new file mode 100644 index 0000000000..a009cf081f --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Сортировать по времени" name="sort_most"/> + <menu_item_check label="Сортировать по имени" name="sort_name"/> + <menu_item_check label="Показывать значки людей" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml index 2ac83ffe52..2ac83ffe52 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/ru/menu_picks.xml b/indra/newview/skins/default/xui/ru/menu_picks.xml index 839c7411a6..839c7411a6 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_picks.xml +++ b/indra/newview/skins/default/xui/ru/menu_picks.xml diff --git a/indra/newview/skins/default/xui/ru/menu_picks_plus.xml b/indra/newview/skins/default/xui/ru/menu_picks_plus.xml index 1bc4078179..1bc4078179 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/ru/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/ru/menu_place.xml b/indra/newview/skins/default/xui/ru/menu_place.xml index ee8878c131..ee8878c131 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_place.xml +++ b/indra/newview/skins/default/xui/ru/menu_place.xml diff --git a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml index b1a38fb9eb..b1a38fb9eb 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml index 25df8c5d19..25df8c5d19 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml index b1ebd4af83..b1ebd4af83 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml index 1865fead7b..1865fead7b 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/ru/menu_save_outfit.xml b/indra/newview/skins/default/xui/ru/menu_save_outfit.xml index 88947e1433..88947e1433 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/ru/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml index 6cacff3870..6cacff3870 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/ru/menu_slurl.xml b/indra/newview/skins/default/xui/ru/menu_slurl.xml index f02549055c..f02549055c 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_slurl.xml +++ b/indra/newview/skins/default/xui/ru/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml index 332f2784b9..332f2784b9 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml index 6a22fd00dc..6a22fd00dc 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml index 9b2434a310..9b2434a310 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/ru/menu_text_editor.xml b/indra/newview/skins/default/xui/ru/menu_text_editor.xml index 0c928308a1..0c928308a1 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/ru/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/ru/menu_toolbars.xml b/indra/newview/skins/default/xui/ru/menu_toolbars.xml index aa05dbc390..aa05dbc390 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/ru/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/ru/menu_topinfobar.xml b/indra/newview/skins/default/xui/ru/menu_topinfobar.xml index 76cadbe5a4..76cadbe5a4 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/ru/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml index 0ba3ee152a..230d049fad 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Показать профиль жителя" name="show_agent"/> + <menu_item_call label="Смотреть профиль" name="show_agent"/> + <menu_item_call label="Отправить сообщение..." name="send_im"/> + <menu_item_call label="Добавить в друзья..." name="add_friend"/> <menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/> <menu_item_call label="Копировать URL-адрес SL в буфер обмена" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_url_group.xml b/indra/newview/skins/default/xui/ru/menu_url_group.xml index f25e2a7eb8..f25e2a7eb8 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_group.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_http.xml b/indra/newview/skins/default/xui/ru/menu_url_http.xml index 781211b16f..781211b16f 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_http.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_inventory.xml b/indra/newview/skins/default/xui/ru/menu_url_inventory.xml index 6127bf9868..6127bf9868 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_map.xml b/indra/newview/skins/default/xui/ru/menu_url_map.xml index bbf64f20e9..bbf64f20e9 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_map.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml index 6e7800d3f5..1326db708e 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Показать информацию об объекте" name="show_object"/> + <menu_item_call label="Профиль объекта..." name="show_object"/> <menu_item_call label="Показать на карте" name="show_on_map"/> <menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/> <menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/ru/menu_url_parcel.xml b/indra/newview/skins/default/xui/ru/menu_url_parcel.xml index 84a679703a..84a679703a 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_slapp.xml b/indra/newview/skins/default/xui/ru/menu_url_slapp.xml index 3d582ea2c5..3d582ea2c5 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_slurl.xml b/indra/newview/skins/default/xui/ru/menu_url_slurl.xml index cbceafea21..cbceafea21 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/ru/menu_url_teleport.xml b/indra/newview/skins/default/xui/ru/menu_url_teleport.xml index 2ecde09383..2ecde09383 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/ru/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index d9425937c3..92a9943b93 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/> <menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/> </menu> - <menu label="Статус" name="Status"> - <menu_item_call label="Нет на месте" name="Set Away"/> - <menu_item_call label="Не беспокоить" name="Set Busy"/> - </menu> + <menu label="Статус" name="Status"/> <menu_item_call label="Купить L$..." name="Buy and Sell L$"/> <menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/> <menu_item_call label="Информационная панель аккаунта..." name="Manage My Account"/> @@ -30,14 +27,18 @@ <menu_item_call label="Выход из [APP_NAME]" name="Quit"/> </menu> <menu label="Общение" name="Communicate"> - <menu_item_check label="Чат..." name="Nearby Chat"/> + <menu_item_check label="Разговоры..." name="Conversations"/> + <menu_item_check label="Локальный чат..." name="Nearby Chat"/> <menu_item_check label="Говорить" name="Speak"/> - <menu_item_check label="Настройки голоса..." name="Nearby Voice"/> - <menu_item_check label="Изменение голоса..." name="ShowVoice"/> + <menu label="Изменение голоса" name="VoiceMorphing"> + <menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/> + <menu_item_check label="Просмотр..." name="Preview"/> + <menu_item_call label="Подписаться..." name="Subscribe"/> + </menu> <menu_item_check label="Жесты..." name="Gestures"/> - <menu_item_call label="Друзья" name="My Friends"/> - <menu_item_call label="Группы" name="My Groups"/> - <menu_item_call label="Люди неподалеку" name="Active Speakers"/> + <menu_item_check label="Друзья" name="My Friends"/> + <menu_item_check label="Группы" name="My Groups"/> + <menu_item_check label="Люди неподалеку" name="Active Speakers"/> <menu_item_call label="Черный список" name="Block List"/> </menu> <menu label="Мир" name="World"> @@ -305,7 +306,7 @@ <menu_item_call label="Выбранная текстура в основе" name="Selected Texture Info Basis"/> <menu_item_check label="Каркас" name="Wireframe"/> <menu_item_check label="Смыкание объектов" name="Object-Object Occlusion"/> - <menu_item_check label="Освещение и тени" name="Lighting and Shadows"/> + <menu_item_check label="Освещение и тени" name="Advanced Lighting Model"/> <menu_item_check label="Тени от солнца, луны и прожекторов" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO и сглаживание теней" name="SSAO and Shadow Smoothing"/> <menu_item_check label="Отладка GL" name="Debug GL"/> diff --git a/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml index 2832e17b7d..2832e17b7d 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml index c2351fbfff..c2351fbfff 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml index f178b39c77..f178b39c77 100644..100755 --- a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/ru/mime_types.xml b/indra/newview/skins/default/xui/ru/mime_types.xml index 7ed23b5d53..7ed23b5d53 100644..100755 --- a/indra/newview/skins/default/xui/ru/mime_types.xml +++ b/indra/newview/skins/default/xui/ru/mime_types.xml diff --git a/indra/newview/skins/default/xui/ru/mime_types_linux.xml b/indra/newview/skins/default/xui/ru/mime_types_linux.xml index a42b0bb9cc..a42b0bb9cc 100644..100755 --- a/indra/newview/skins/default/xui/ru/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/ru/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/ru/mime_types_mac.xml b/indra/newview/skins/default/xui/ru/mime_types_mac.xml index 7ed23b5d53..7ed23b5d53 100644..100755 --- a/indra/newview/skins/default/xui/ru/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/ru/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 85b7074253..00ab0b5763 100644..100755 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -516,6 +516,24 @@ </url> <usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/> </notification> + <notification name="AMDOldDriver"> + Возможно, для вашей видеокарты имеется более новый драйвер. Обновление драйвера может существенно повысить быстродействие. + + Проверить наличие обновления для драйвера по адресу [_URL]? + <url name="url"> + http://support.amd.com/us/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/> + </notification> + <notification name="NVIDIAOldDriver"> + Возможно, для вашей видеокарты имеется более новый драйвер. Обновление драйвера может существенно повысить быстродействие. + + Проверить наличие обновления для драйвера по адресу [_URL]? + <url name="url"> + http://www.nvidia.com/Download/index.aspx?lang=ru-ru + </url> + <usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/> + </notification> <notification name="UnknownGPU"> В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать. Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME]. Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики. @@ -1546,10 +1564,13 @@ http://secondlife.com/download. Сейчас невозможно предложить дружбу. Повторите попытку через минуту. <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="BusyModeSet"> - Установлен режим «Занят». -Сообщения чата и IM будут скрыты. На IM-сообщения будет возвращаться заданный ответ в режиме «Занят». Все предложения телепортации будут отклоняться. Все предложения инвентаря будут направлены в корзину. - <usetemplate ignoretext="Смена моего статуса на режим «Занят»" name="okignore" yestext="OK"/> + <notification name="DoNotDisturbModeSet"> + Режим «Не беспокоить» включен. Вы не будете получать уведомлений о входящих вызовах. + +- Другие жители будут получать ваш ответ, установленный для режима «Не беспокоить» (Настройки > Общие). +- Предложения телепортации будут отклоняться. +- Голосовые вызовы будут отклоняться. + <usetemplate ignoretext="Смена моего статуса на режим «Не беспокоить»" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> Достигнуто максимальное количество групп. Выйдите из другой группы, прежде чем вступать в эту, или отклоните предложение. @@ -2033,6 +2054,10 @@ http://secondlife.com/download. Перейти на [http://secondlife.com/account/ информационную панель], чтобы увидеть историю аккаунта? <usetemplate ignoretext="Запустить браузер для просмотра истории аккаунта" name="okcancelignore" notext="Отмена" yestext="Перейти на страницу"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + При добавлении участника в существующий разговор будет создан новый разговор. Все участники получат уведомления о новом разговоре. + <usetemplate ignoretext="Подтвердите добавление участников чата" name="okcancelignore" notext="Отмена" yestext="ОК"/> + </notification> <notification name="ConfirmQuit"> Выйти из программы? <usetemplate ignoretext="Подтверждать перед выходом" name="okcancelignore" notext="Не выходить" yestext="Выйти"/> @@ -2107,14 +2132,14 @@ http://secondlife.com/download. <button ignore="Не заменять" name="No" text="Отмена"/> </form> </notification> - <notification label="Предупреждение о режиме «Занят»" name="BusyModePay"> - У вас включен режим «Занят», поэтому вы не получите никаких предметов, предлагаемых в обмен на этот платеж. + <notification label="Предупреждение режима «Не беспокоить»" name="DoNotDisturbModePay"> + Включен режим «Не беспокоить». Вы не будете получать никаких предметов, предлагаемых в обмен за этот платеж. -Хотите отключить режим «Занят» до завершения этой транзакции? +Отключить режим «Не беспокоить» перед завершением этой операции? <form name="form"> - <ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Занят»"/> - <button ignore="Всегда отключать режим «Занят»" name="Yes" text="OK"/> - <button ignore="Не отключать режим «Занят»" name="No" text="Отмена"/> + <ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Не беспокоить»"/> + <button ignore="Всегда выходить из режима «Не беспокоить»" name="Yes" text="OK"/> + <button ignore="Не выходить из режима «Не беспокоить»" name="No" text="Отмена"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2249,11 +2274,8 @@ http://secondlife.com/download. <notification name="GroupNotice"> Раздел: [SUBJECT], сообщение: [MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> в сети - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> не в сети + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> [STATUS] </notification> <notification name="AddSelfFriend"> Вы лучше всех, но нельзя добавить в друзья себя самого. @@ -2482,13 +2504,6 @@ http://secondlife.com/download. <notification name="DynamicPathfindingDisabled"> В этом регионе не разрешен динамический поиск пути. Возможны нарушения работы скриптовых объектов с использованием вызовов LSL поиска пути. </notification> - <notification name="PathfindingRebakeNavmesh"> - Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов. Чтобы исправить их поведение, нажмите кнопку «Восстановить регион». Более подробная информация – по ссылке «Справка». - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="Справка" ignoretext="Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов." name="okhelpignore" yestext="OK"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> Произошла ошибка. Возможно, неполадка в сети или на сервере, или у вас нет прав на строительство. Иногда для устранения этой проблемы достаточно выйти и снова войти. <usetemplate name="okbutton" yestext="OK"/> @@ -2751,7 +2766,7 @@ http://secondlife.com/download. <notification name="ScriptQuestionCaution"> Предупреждение. Объект «<nolink>[OBJECTNAME]</nolink>» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения. -Такое требование чаще всего незаконно. Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту. +Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту. <form name="form"> <button name="Grant" text="Разрешить полный доступ"/> <button name="Deny" text="Отклонить"/> @@ -3333,4 +3348,632 @@ http://secondlife.com/download. Вы удаляете несколько предметов ([NUM_ITEMS]). Продолжить? <usetemplate ignoretext="Удалить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] заморозил вас. В это время вы не можете перемещаться и выполнять другие действия с миром. + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] заморозил вас на [AV_FREEZE_TIME] сек. В это время вы не можете перемещаться и выполнять другие действия с миром. + </notification> + <notification name="YouFrozeAvatar"> + Аватар заморожен. + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] разморозил вас. + </notification> + <notification name="AvatarUnFrozen"> + Аватар разморожен. + </notification> + <notification name="AvatarFreezeFailure"> + Не удалось заморозить: у вас нет прав администратора на этом участке. + </notification> + <notification name="AvatarFreezeThaw"> + Заморозка кончилась, занимайтесь своим делом. + </notification> + <notification name="AvatarCantFreeze"> + Невозможно заморозить этого пользователя. + </notification> + <notification name="NowOwnObject"> + Вы стали владельцем объекта [OBJECT_NAME] + </notification> + <notification name="CantRezOnLand"> + Нельзя выложить объект на [OBJECT_POS]: это не разрешено владельцем земли. Узнать, кто владелец, можно с помощью инструмента «Земля». + </notification> + <notification name="RezFailTooManyRequests"> + Невозможно выложить объект: слишком много запросов. + </notification> + <notification name="SitFailCantMove"> + Нельзя сесть: сейчас вы не можете двигаться. + </notification> + <notification name="SitFailNotAllowedOnLand"> + Вам не разрешено садиться на этой земле. + </notification> + <notification name="SitFailNotSameRegion"> + Попробуйте переместиться ближе. Нельзя сесть на объект: +он находится в другом регионе. + </notification> + <notification name="NoNewObjectRegionFull"> + Невозможно создать новый объект. Регион уже заполнен. + </notification> + <notification name="FailedToPlaceObject"> + Не удалось поместить объект в указанное место. Повторите попытку. + </notification> + <notification name="NoOwnNoGardening"> + Вы не можете создавать деревья и траву на чужой земле. + </notification> + <notification name="NoCopyPermsNoObject"> + Не удалось скопировать: вам не разрешено копировать объект «[OBJ_NAME]». + </notification> + <notification name="NoTransPermsNoObject"> + Не удалось скопировать: объект «[OBJ_NAME]» нельзя перенести к вам. + </notification> + <notification name="AddToNavMeshNoCopy"> + Не удалось скопировать: объект «[OBJ_NAME]» относится к навигационной сетке. + </notification> + <notification name="DupeWithNoRootsSelected"> + Выбран дубликат без корневых объектов. + </notification> + <notification name="CantDupeCuzRegionIsFull"> + Невозможно дублировать объекты: регион заполнен. + </notification> + <notification name="CantDupeCuzParcelNotFound"> + Невозможно дублировать объекты: не удалось найти их участок. + </notification> + <notification name="CantCreateCuzParcelFull"> + Нельзя создать объект: +участок уже заполнен. + </notification> + <notification name="RezAttemptFailed"> + Не удалось выложить объект. + </notification> + <notification name="ToxicInvRezAttemptFailed"> + Невозможно создать элемент, который вызвал проблемы в этом регионе. + </notification> + <notification name="InvItemIsBlacklisted"> + Этот предмет инвентаря находится в черном списке. + </notification> + <notification name="NoCanRezObjects"> + Сейчас вам не разрешено создавать объекты. + </notification> + <notification name="LandSearchBlocked"> + Поиск по земле заблокирован. +Вы провели слишком много операций поиска за короткое время. +Повторите попытку через минуту. + </notification> + <notification name="NotEnoughResourcesToAttach"> + Недостаточно свободных ресурсов скриптинга для присоединения объекта! + </notification> + <notification name="YouDiedAndGotTPHome"> + Вы умерли и были телепортированы в ваше домашнее местоположение + </notification> + <notification name="EjectComingSoon"> + Вам запрещено здесь присутствовать; у вас есть [EJECT_TIME] сек, чтобы покинуть это место. + </notification> + <notification name="NoEnterServerFull"> + Вам нет доступа в этот регион: +серпер переполнен. + </notification> + <notification name="SaveBackToInvDisabled"> + Сохранение в инвентаре отключено. + </notification> + <notification name="NoExistNoSaveToContents"> + Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: объект, из которого оно было выложено, уже не существует. + </notification> + <notification name="NoModNoSaveToContents"> + Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: вам не разрешено изменять объект «[DEST_NAME]». + </notification> + <notification name="NoSaveBackToInvDisabled"> + Невозможно сохранить «[OBJ_NAME]» в инвентаре: эта операция запрещена. + </notification> + <notification name="NoCopyNoSelCopy"> + Нельзя скопировать выбранное: вам не разрешено копировать объект «[OBJ_NAME]». + </notification> + <notification name="NoTransNoSelCopy"> + Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится. + </notification> + <notification name="NoTransNoCopy"> + Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится. + </notification> + <notification name="NoPermsNoRemoval"> + Удаление объекта «[OBJ_NAME]» из симулятора запрещено системой разрешений. + </notification> + <notification name="NoModNoSaveSelection"> + Нельзя сохранить выбранное: вам не разрешено изменять объект «[OBJ_NAME]». + </notification> + <notification name="NoCopyNoSaveSelection"> + Невозможно сохранить выбранный предмет: объект «[OBJ_NAME]» не копируется. + </notification> + <notification name="NoModNoTaking"> + Нельзя забрать выбранное: вам не разрешено изменять объект «[OBJ_NAME]». + </notification> + <notification name="RezDestInternalError"> + Внутренняя ошибка: неизвестный тип места назначения. + </notification> + <notification name="DeleteFailObjNotFound"> + Невозможно удалить: объект не найден + </notification> + <notification name="SorryCantEjectUser"> + Невозможно выбросить этого пользователя. + </notification> + <notification name="RegionSezNotAHome"> + Вам не разрешено устанавливать свое домашнее местоположение в этом регионе. + </notification> + <notification name="HomeLocationLimits"> + Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка. + </notification> + <notification name="HomePositionSet"> + Задано положение дома. + </notification> + <notification name="AvatarEjected"> + Аватар выброшен. + </notification> + <notification name="AvatarEjectFailed"> + Не удалось выбросить: у вас нет прав администратора на этом участке. + </notification> + <notification name="CantMoveObjectParcelFull"> + Нельзя переместить объект «[OBJECT_NAME]» в позицию «[OBJ_POSITION]» региона [REGION_NAME]: участок уже заполнен. + </notification> + <notification name="CantMoveObjectParcelPerms"> + Нельзя переместить объект «[OBJECT_NAME]» в позицию +«[OBJ_POSITION]» региона [REGION_NAME]: вашим объектам не разрешено присутствовать на этом участке. + </notification> + <notification name="CantMoveObjectParcelResources"> + Нельзя переместить объект «[OBJECT_NAME]» в позицию +«[OBJ_POSITION]» региона [REGION_NAME]: на этом участке недостаточно ресурсов для данного объекта. + </notification> + <notification name="CantMoveObjectRegionVersion"> + Нельзя переместить объект «[OBJECT_NAME]» в позицию +[OBJ_POSITION] региона [REGION_NAME]: в другом регионе работает старая версия симулятора, которая не поддерживает прием этого объекта через границу регионов. + </notification> + <notification name="CantMoveObjectNavMesh"> + Нельзя переместить объект «[OBJECT_NAME]» в позицию +«[OBJ_POSITION]» региона [REGION_NAME]: вам не разрешено изменять навигационную сетку за пределами региона. + </notification> + <notification name="CantMoveObjectWTF"> + Нельзя переместить объект «[OBJECT_NAME]» в позицию +[OBJ_POSITION] региона [REGION_NAME] по неизвестной причине. ([FAILURE_TYPE]) + </notification> + <notification name="NoPermModifyObject"> + У вас нет прав на изменение этого объекта + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + Нельзя включить физику для объекта, который относится к навигационной сетке. + </notification> + <notification name="CantEnablePhysKeyframedObj"> + Нельзя включить физику для объектов с ключевыми кадрами. + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + Нельзя включить физику для объекта -- недостаточно земельных ресурсов. + </notification> + <notification name="CantEnablePhysCostTooGreat"> + Нельзя включить физику для объекта с расходом ресурсов физики больше [MAX_OBJECTS] + </notification> + <notification name="PhantomWithConcavePiece"> + Этот объект не может содержать вогнутых элементов: это фантом, который относится к навигационной сетке. + </notification> + <notification name="UnableAddItem"> + Невозможно добавить предмет! + </notification> + <notification name="UnableEditItem"> + Редактирование невозможно! + </notification> + <notification name="NoPermToEdit"> + Редактирование не разрешено. + </notification> + <notification name="NoPermToCopyInventory"> + Не разрешено копировать этот инвентарь. + </notification> + <notification name="CantSaveItemDoesntExist"> + Нельзя сохранить в содержимом объекта: предмет уже не существует. + </notification> + <notification name="CantSaveItemAlreadyExists"> + Нельзя сохранить в содержимом объекта: предмет с таким названием уже есть в инвентаре + </notification> + <notification name="CantSaveModifyAttachment"> + Нельзя сохранить в содержимом объекта: это приведет к изменению разрешений прикрепленного объекта. + </notification> + <notification name="TooManyScripts"> + Слишком много скриптов. + </notification> + <notification name="UnableAddScript"> + Невозможно добавить скрипт! + </notification> + <notification name="AssetServerTimeoutObjReturn"> + Сервер активов не ответил в заданное время. Объект возвращен в симулятор. + </notification> + <notification name="RegionDisablePhysicsShapes"> + В этом регионе не разрешены фигуры с физическими данными. + </notification> + <notification name="NoModNavmeshAcrossRegions"> + Нельзя изменять навигационную сетку за пределами региона. + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + Нельзя задать свойства физики для объекта этого типа. + </notification> + <notification name="NoSetRootPrimWithNoShape"> + Нельзя задать корневой примитив без фигуры. + </notification> + <notification name="NoRegionSupportPhysMats"> + В этом регионе не разрешены материалы с физическими данными. + </notification> + <notification name="OnlyRootPrimPhysMats"> + Настройка материалов с физическими данными разрешена только для корневых примитивов. + </notification> + <notification name="NoSupportCharacterPhysMats"> + Присвоение персонажам материалов с физическими данными еще не поддерживается. + </notification> + <notification name="InvalidPhysMatProperty"> + Одно или несколько свойств указанного материала с физическими данными недопустимы. + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + Не разрешается изменять тип стыковки меш-объекта. + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + Не разрешается изменять форму меш-объекта + </notification> + <notification name="FullRegionCantEnter"> + Вам нет доступа в этот регион: \nрегион заполнен. + </notification> + <notification name="LinkFailedOwnersDiffer"> + Связь невозможна -- разные владельцы + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + Связь невозможна – нельзя изменять навигационную сетку за пределами региона. + </notification> + <notification name="LinkFailedNoPermToEdit"> + Связь невозможна: у вас нет разрешения на редактирование. + </notification> + <notification name="LinkFailedTooManyPrims"> + Связь невозможна -- слишком много примитивов + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + Связь невозможна -- нельзя связать некопируемый и непереносимый объекты + </notification> + <notification name="LinkFailedNothingLinkable"> + Связь невозможна -- нет связываемых объектов. + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + Связь невозможна -- слишком много персонажей с поиском пути + </notification> + <notification name="LinkFailedInsufficientLand"> + Связь невозможна -- недостаточно земельных ресурсов + </notification> + <notification name="LinkFailedTooMuchPhysics"> + Объект использует слишком много ресурсов физики -- динамическое поведение отключено. + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + Вы были телепортированы домой объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]» + </notification> + <notification name="TeleportedHomeByObject"> + Вы были телепортированы домой объектом «[OBJECT_NAME]» + </notification> + <notification name="TeleportedByAttachment"> + Вы были телепортированы прикрепленным объектом [ITEM_ID] + </notification> + <notification name="TeleportedByObjectOnParcel"> + Вы были телепортированы объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]» + </notification> + <notification name="TeleportedByObjectOwnedBy"> + Вы были телепортированы объектом «[OBJECT_NAME]», владелец – [OWNER_ID] + </notification> + <notification name="TeleportedByObjectUnknownUser"> + Вы были телепортированы объектом «[OBJECT_NAME]», владелец неизвестен. + </notification> + <notification name="CantCreateObjectRegionFull"> + Невозможно создать запрошенный объект. Регион уже заполнен. + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + Нельзя присоединить несколько объектов к одной точке. + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + Здесь нельзя создать несколько объектов. + </notification> + <notification name="UnableToCreateObjTimeOut"> + Невозможно создать запрошенный объект. Объекта нет в базе данных. + </notification> + <notification name="UnableToCreateObjUnknown"> + Невозможно создать запрошенный объект. Истекло время запроса. Повторите попытку. + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + Невозможно создать запрошенный объект. Повторите попытку. + </notification> + <notification name="RezFailureTookTooLong"> + Не удалось выложить, загрузка нужного объекта длится слишком долго. + </notification> + <notification name="FailedToPlaceObjAtLoc"> + Не удалось поместить объект в указанное место. Повторите попытку. + </notification> + <notification name="CantCreatePlantsOnLand"> + Вам нельзя создавать растения на этой земле. + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + Невозможно восстановить объект. Не найдена позиция в игровом мире. + </notification> + <notification name="CantRezObjectInvalidMeshData"> + Невозможно выложить объект: его данные сетки неверны. + </notification> + <notification name="CantRezObjectTooManyScripts"> + Невозможно выложить объект: в этом регионе уже сликом много скриптов. + </notification> + <notification name="CantCreateObjectNoAccess"> + Ваши привилегии доступа не разрешают создание объектов на этом месте. + </notification> + <notification name="CantCreateObject"> + Сейчас вам не разрешено создавать объекты. + </notification> + <notification name="InvalidObjectParams"> + Неверные параметры объекта + </notification> + <notification name="CantDuplicateObjectNoAcess"> + Ваши привилегии доступа не разрешают дублирование объектов на этом месте. + </notification> + <notification name="CantChangeShape"> + Вам не разрешено изменять эту фигуру. + </notification> + <notification name="NoAccessToClaimObjects"> + Ваши привилегии доступа не разрешают претендовать на объекты на этом месте. + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + Не удалось передать: вам не разрешено передавать объекты для этой группы. + </notification> + <notification name="NoPrivsToBuyObject"> + Ваши привилегии доступа не разрешают покупать объекты на этом месте. + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + Невозможно присоединить объект: на нем сидит аватар. + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + Деревья и траву нельзя носить как прикрепленные объекты. + </notification> + <notification name="CantAttachGroupOwnedObjs"> + Нельзя присоединять объекты, принадлежащие группе. + </notification> + <notification name="CantAttachObjectsNotOwned"> + Нельзя прикреплять объекты, которыми вы не владеете. + </notification> + <notification name="CantAttachNavmeshObjects"> + Невозможно присоединить объекты, которые относятся к навигационной сетке. + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + Нельзя присоединить объект: вам не разрешено его перемещать. + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + Недостаточно свободных ресурсов скриптинга для присоединения объекта! + </notification> + <notification name="CantDropItemTrialUser"> + Здесь нельзя сбрасывать объекты; перейдите в бесплатную область для гостей. + </notification> + <notification name="CantDropMeshAttachment"> + Нельзя сбрасывать прикрепленные меш-объекты. Отсоедините их в инвентарь, а затем выложите в игровой мир. + </notification> + <notification name="CantDropAttachmentNoPermission"> + Не удалось сбросить прикрепленный объект: вам не разрешено оставлять его здесь. + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + Не удалось сбросить прикрепленный объект: не хватает свободных земельных ресурсов. + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + Не удалось сбросить прикрепленные объекты: не хватает свободных ресурсов. + </notification> + <notification name="CantDropObjectFullParcel"> + Нельзя сбросить объект здесь. Участок уже заполнен. + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + Нельзя коснуться/взять этот объект: вы забанены на этом участке. + </notification> + <notification name="PlzNarrowDeleteParams"> + Уточните параметры удаления. + </notification> + <notification name="UnableToUploadAsset"> + Невозможно отправить актив. + </notification> + <notification name="CantTeleportCouldNotFindUser"> + Не удалось найти пользователя для телепортации домой + </notification> + <notification name="GodlikeRequestFailed"> + режим творца недоступен + </notification> + <notification name="GenericRequestFailed"> + не удалось выполнить общий запрос + </notification> + <notification name="CantUploadPostcard"> + Невозможно отправить открытку. Повторите попытку позже. + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + Невозможно получить данные инвентаря для группового уведомления. + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + Невозможно отправить групповое уведомление -- не разрешено. + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + Невозможно отправить групповое уведомление -- не удалось собрать инвентарь. + </notification> + <notification name="CantParceInventoryInNotice"> + Невозможно проанализировать инвентарь, указанный в уведомлении. + </notification> + <notification name="TerrainUploadFailed"> + Не удалось загрузить ландшафт. + </notification> + <notification name="TerrainFileWritten"> + Файл ландшафта записан. + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + Файл ландшафта записан, начинается загрузка... + </notification> + <notification name="TerrainBaked"> + Ландшафт готов. + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + Отключены только первые 10 выбранных объектов. Обновите экран и выберите объекты снова, если требуется. + </notification> + <notification name="UpdateViewerBuyParcel"> + Для покупки этого участка необходимо обновить клиент. + </notification> + <notification name="CantBuyParcelNotForSale"> + Невозможно купить, этот участок не предназначен для продажи. + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + Невозможно купить: цена или площадь земли изменились. + </notification> + <notification name="CantBuyParcelNotAuthorized"> + Вам не разрешено покупать этот участок. + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + Вы не можете приобрести этот участок: он уже ожидает подтверждения покупки + </notification> + <notification name="CantBuildOverflowParcel"> + Здесь нельзя создавать объекты – участок будет переполнен. + </notification> + <notification name="SelectedMultipleOwnedLand"> + Вы выбрали землю с разными владельцами. Выберите меньшую область и повторите попытку. + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + Выбрано недостаточно арендуемых участков для вступления. + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + Нельзя разделить землю.\nВыбрано больше одного участка.\nВыберите меньшую территорию. + </notification> + <notification name="CantDivideLandCantFindParcel"> + Нельзя разделить землю.\nНе удалось найти участок.\nСообщите об этой неполадке: Справка -> Сообщить об ошибке... + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + Невозможно разделить землю. Выбран весь участок.\nПопробуйте выбрать территорию поменьше. + </notification> + <notification name="LandHasBeenDivided"> + Земля разделена. + </notification> + <notification name="PassPurchased"> + Вы приобрели пропуск. + </notification> + <notification name="RegionDisallowsClassifieds"> + В регионе не разрешены рекламные объявления. + </notification> + <notification name="LandPassExpireSoon"> + Ваш пропуск на эту землю скоро закончится. + </notification> + <notification name="CantSitNoSuitableSurface"> + Нет подходящей поверхности, чтобы сесть. Попробуйте в другом месте. + </notification> + <notification name="CantSitNoRoom"> + Здесь нет места, чтобы сесть. Попробуйте в другом месте. + </notification> + <notification name="ClaimObjectFailedNoPermission"> + Невозможно претендовать на объект: у вас нет разрешения + </notification> + <notification name="ClaimObjectFailedNoMoney"> + Невозможно претендовать на объект: у вас не хватает L$. + </notification> + <notification name="CantDeedGroupLand"> + Нельзя передать землю, принадлежащую группе. + </notification> + <notification name="BuyObjectFailedNoMoney"> + Не удалось купить объект: у вас не хватает L$. + </notification> + <notification name="BuyInventoryFailedNoMoney"> + Не удалось купить инвентарь: у вас не хватает L$. + </notification> + <notification name="BuyPassFailedNoMoney"> + У вас недостаточно L$, чтобы заплатить за проход на эту землю. + </notification> + <notification name="CantBuyPassTryAgain"> + Сейчас нельзя купить пропуск. Повторите попытку позже. + </notification> + <notification name="CantCreateObjectParcelFull"> + Невозможно создать объект:\nучасток заполнен. + </notification> + <notification name="FailedPlacingObject"> + Не удалось поместить объект в указанное место. Повторите попытку. + </notification> + <notification name="CantCreateLandmarkForEvent"> + Невозможно создать закладку для события. + </notification> + <notification name="GodBeatsFreeze"> + Сила творца одолевает заморозку! + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + Не удалось выполнить запрос на особые способности. Запрос зарегистрирован. + </notification> + <notification name="ExpireExplanation"> + Система сейчас не может обработать ваш запрос. Истекло время запроса. + </notification> + <notification name="DieExplanation"> + Система не может обработать ваш запрос. + </notification> + <notification name="AddPrimitiveFailure"> + Недостаточно денег для создания примитива. + </notification> + <notification name="RezObjectFailure"> + Недостаточно денег для создания объекта. + </notification> + <notification name="ResetHomePositionNotLegal"> + Недопустимое домашнее местоположение; восстановлено стандартное местоположение. + </notification> + <notification name="CantInviteRegionFull"> + Сейчас вы не можете никого пригласить к себе: регион уже заполнен. Повторите попытку позже. + </notification> + <notification name="CantSetHomeAtRegion"> + Вам не разрешено устанавливать свое домашнее местоположение в этом регионе. + </notification> + <notification name="ListValidHomeLocations"> + Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка. + </notification> + <notification name="SetHomePosition"> + Домашнее местоположение задано. + </notification> + <notification name="CantDerezInventoryError"> + Невозможно забрать объект: сбой инвентаря. + </notification> + <notification name="CantCreateRequestedInv"> + Невозможно создать требуемый инвентарь. + </notification> + <notification name="CantCreateRequestedInvFolder"> + Невозможно создать требуемую папку инвентаря. + </notification> + <notification name="CantCreateInventory"> + Невозможно создать этот инвентарь. + </notification> + <notification name="CantCreateLandmark"> + Невозможно создать закладку. + </notification> + <notification name="CantCreateOutfit"> + Сейчас нельзя создать костюм. Попробуйте через минуту. + </notification> + <notification name="InventoryNotForSale"> + Инвентарь не для продажи. + </notification> + <notification name="CantFindInvItem"> + Не удалось найти предмет из инвентаря. + </notification> + <notification name="CantFindObject"> + Не удалось найти объект. + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + Сейчас в этом регионе запрещен перевод денег на объекты. + </notification> + <notification name="CantPayNoAgent"> + Непонятно, кому платить. + </notification> + <notification name="CantDonateToPublicObjects"> + Нельзя отдавать L$ за общедоступные объекты. + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + Не удалось создать инвентарь в объекте игрового мира. + </notification> + <notification name="UserBalanceOrLandUsageError"> + Не удалось обновить клиент из-за внутренней ошибки. Отображаемый в клиенте баланс L$ или владение участками могут не соответствовать действительному балансу на серверах. + </notification> + <notification name="LargePrimAgentIntersect"> + Нельзя создавать большие примитивы, которые пересекаются с другими игроками. Повторите попытку, когда другие игроки уйдут. + </notification> + <notification name="PreferenceChatClearLog"> + Будут удалены журналы предыдущих разговоров и все резервные копии этих файлов. + <usetemplate ignoretext="Подтверждать удаление журнала предыдущих разговоров." name="okcancelignore" notext="Отмена" yestext="OK"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + Будут удалены записи всех предыдущих разговоров. Список прошедших разговоров не изменится. Все файлы с расширениями .txt и txt.backup в папке [FOLDER] будут удалены. + <usetemplate ignoretext="Подтверждать удаление записей." name="okcancelignore" notext="Отмена" yestext="OK"/> + </notification> + <notification name="PreferenceChatPathChanged"> + Невозможно переместить файлы. Восстановлен прежний путь. + <usetemplate ignoretext="Невозможно переместить файлы. Восстановлен прежний путь." name="okignore" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/ru/panel_active_object_row.xml b/indra/newview/skins/default/xui/ru/panel_active_object_row.xml index 825f9a6229..825f9a6229 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/ru/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml index ae2240593d..ae2240593d 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml index 75e396222f..4866bb7ed6 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml @@ -27,5 +27,6 @@ <icon name="permission_edit_mine_icon" tool_tip="Этот друг может изменять, удалять или брать ваши объекты"/> <icon name="permission_map_icon" tool_tip="Этот друг может видеть вас на карте"/> <icon name="permission_online_icon" tool_tip="Этот друг может видеть ваш статус в сети"/> + <button name="info_btn" tool_tip="Дополнительно"/> <button name="profile_btn" tool_tip="Смотреть профиль"/> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml index 03c164affd..03c164affd 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml index 214ca8bf3a..70a1b25996 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> - <text name="title_text"> - Черный список - </text> - <scroll_list name="blocked" tool_tip="Список заблокированных жителей"/> - <button label="Заблокировать жителя" name="Block resident..." tool_tip="Выберите жителя для блокировки"/> - <button label="Блокировать объект по имени" name="Block object by name..." tool_tip="Выберите объект для блокировки по имени"/> - <button label="Разблокировать" name="Unblock" tool_tip="Удалить объект или жителя из списка заблокированных"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="Фильтр" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="Действия с выбранным жителем или объектом"/> + <menu_button name="view_btn" tool_tip="Параметры сортировки"/> + <menu_button name="plus_btn" tool_tip="Выберите жителя или объект для блокировки"/> + <button name="unblock_btn" tool_tip="Удалить объект или жителя из списка заблокированных"/> + </panel> + <block_list name="blocked" tool_tip="Список заблокированных жителей"/> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml index 20a99500b6..20a99500b6 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml index f7d31813f9..f7d31813f9 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml index bcdff112c5..bcdff112c5 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/ru/panel_chat_header.xml b/indra/newview/skins/default/xui/ru/panel_chat_header.xml index 7916bf5155..7916bf5155 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/ru/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml index f203ecde4b..f203ecde4b 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_classified_info.xml b/indra/newview/skins/default/xui/ru/panel_classified_info.xml index c7fd0ad42f..c7fd0ad42f 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/ru/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml index cc3f7feb83..cc3f7feb83 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml index 98d4fd8b47..98d4fd8b47 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml index 9e1bc4b5c4..9e1bc4b5c4 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml new file mode 100644 index 0000000000..4fdb4f9122 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="(загрузка)"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..98fe7b99be --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="Включая голосовой чат"/> + <icon name="unread_ims_icon" tool_tip="За время вашего отсутствия пришли сообщения"/> + <button name="delete_btn" tool_tip="Удалить эту запись"/> +</panel> diff --git a/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml index 762baa2052..762baa2052 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml index dc9d678edd..dc9d678edd 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml index 7cde4099ef..7cde4099ef 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml index a2f06dbadf..a2f06dbadf 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml index 84e1204b5d..84e1204b5d 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml index 561777745e..561777745e 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_hair.xml b/indra/newview/skins/default/xui/ru/panel_edit_hair.xml index d5e67ddf87..d5e67ddf87 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml index 2f5a437e69..2f5a437e69 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pants.xml b/indra/newview/skins/default/xui/ru/panel_edit_pants.xml index 4970c93801..4970c93801 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_physics.xml b/indra/newview/skins/default/xui/ru/panel_edit_physics.xml index da4ebb154d..da4ebb154d 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml index 6be1448ac5..6be1448ac5 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml index e9a6a781db..e9a6a781db 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml index 312ad593a1..312ad593a1 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml index d576a2cd2f..d576a2cd2f 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml index f6d7029108..f6d7029108 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skin.xml b/indra/newview/skins/default/xui/ru/panel_edit_skin.xml index f5a5339afe..f5a5339afe 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml index 909946e577..909946e577 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_socks.xml b/indra/newview/skins/default/xui/ru/panel_edit_socks.xml index 2827fbc028..2827fbc028 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml index 874d5f8bc4..874d5f8bc4 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml index f2f6e5e516..f2f6e5e516 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml index 6f84c6cec2..6f84c6cec2 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml index 79130a9c80..79130a9c80 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml index 2e6f3502b6..2e6f3502b6 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_general.xml b/indra/newview/skins/default/xui/ru/panel_group_general.xml index 4d7e1c9fff..4d7e1c9fff 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml index d8cf1b4756..d8cf1b4756 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_invite.xml b/indra/newview/skins/default/xui/ru/panel_group_invite.xml index 68dac5cd7e..68dac5cd7e 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_land_money.xml b/indra/newview/skins/default/xui/ru/panel_group_land_money.xml index 9235aa2f69..9235aa2f69 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml index 7f000fb5a0..b043ffbbe2 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Неизвестно"/> + <button name="info_btn" tool_tip="Дополнительно"/> <button name="profile_btn" tool_tip="Смотреть профиль"/> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_group_notices.xml b/indra/newview/skins/default/xui/ru/panel_group_notices.xml index 8d20c4a96b..8d20c4a96b 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_notify.xml b/indra/newview/skins/default/xui/ru/panel_group_notify.xml index 1aee7a7f61..1aee7a7f61 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/ru/panel_group_roles.xml b/indra/newview/skins/default/xui/ru/panel_group_roles.xml index c57f21679f..c57f21679f 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml index 2a23cdb800..2a23cdb800 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/ru/panel_instant_message.xml b/indra/newview/skins/default/xui/ru/panel_instant_message.xml index cf9bc7fccb..cf9bc7fccb 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/ru/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/ru/panel_inventory_item.xml b/indra/newview/skins/default/xui/ru/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml index f4febd49cd..f4febd49cd 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/ru/panel_landmarks.xml b/indra/newview/skins/default/xui/ru/panel_landmarks.xml index 7d684cd479..7d684cd479 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/ru/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml index f0877731c6..f0877731c6 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_login.xml +++ b/indra/newview/skins/default/xui/ru/panel_login.xml diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml index 80a67371af..80a67371af 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/panel_me.xml b/indra/newview/skins/default/xui/ru/panel_me.xml index 21a125af87..21a125af87 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_me.xml +++ b/indra/newview/skins/default/xui/ru/panel_me.xml diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml index 6dc435db20..6dc435db20 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml index 680cba9c14..680cba9c14 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml index 6b30dc799c..6b30dc799c 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml index 5e3de180f9..5e3de180f9 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml index a8fdfde1c4..a8fdfde1c4 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml index 804ba7def7..395c643b0b 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="Щелкните здесь для общения" name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/> <button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_media.xml b/indra/newview/skins/default/xui/ru/panel_nearby_media.xml index 3b23fc78f5..3b23fc78f5 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/ru/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml index 1ac88a01b3..1ac88a01b3 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml index 0095d48af9..0095d48af9 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml index 91c03342a7..91c03342a7 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml index 4d0e13fca2..4d0e13fca2 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml index 96f4b4a893..96f4b4a893 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_list.xml b/indra/newview/skins/default/xui/ru/panel_outfits_list.xml index 74551e4274..74551e4274 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml index 7ed6bf35c0..7ed6bf35c0 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml index 607921f2d6..7da7fb3191 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_people.xml +++ b/indra/newview/skins/default/xui/ru/panel_people.xml @@ -14,81 +14,53 @@ <string name="no_filtered_friends_msg"> Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/people/[SEARCH_TERM] поиском]. </string> - <string name="people_filter_label" value="Фильтр для людей"/> - <string name="groups_filter_label" value="Фильтр для групп"/> <string name="no_filtered_groups_msg" value="Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/groups/[SEARCH_TERM] поиском]."/> <string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/> <string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/> <string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/> - <filter_editor label="Фильтр" name="filter_input"/> <tab_container name="tabs"> <panel label="РЯДОМ" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="Опции"/> - <button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="Фильтр для людей" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="Действия с выбранным жителем"/> + <menu_button name="nearby_view_btn" tool_tip="Параметры просмотра/сортировки"/> + <button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/> + <dnd_button name="nearby_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/> </panel> </panel> - <panel label="МОИ ДРУЗЬЯ" name="friends_panel"> + <panel label="ДРУЗЬЯ" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="Фильтр для людей" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="Действия с выбранным жителем"/> + <menu_button name="friends_view_btn" tool_tip="Параметры просмотра/сортировки"/> + <button name="friends_add_btn" tool_tip="Предложить жителю дружбу"/> + <dnd_button name="friends_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Онлайн"/> <accordion_tab name="tab_all" title="Все"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="Показать дополнительные параметры"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Предложить жителю дружбу"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="Удалить выбранного жителя из списка друзей"/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="МОИ ГРУППЫ" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="Опции"/> - <button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/> - <button name="activate_btn" tool_tip="Активировать выбранную группу"/> + <panel label="ГРУППЫ" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="Фильтр для групп" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="Действия с выбранной группой"/> + <menu_button name="groups_view_btn" tool_tip="Параметры просмотра/сортировки"/> + <menu_button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/> + <dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/> </panel> </panel> <panel label="НЕДАВНИЕ" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="Опции"/> - <button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="Фильтр для людей" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="Действия с выбранным жителем"/> + <menu_button name="recent_view_btn" tool_tip="Параметры просмотра/сортировки"/> + <button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/> + <dnd_button name="recent_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/> </panel> </panel> + <panel label="БЛОКИРОВАН" name="blocked_panel"> + <panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="Профиль" name="view_profile_btn" tool_tip="Показать изображение, группы и прочую информацию о жителе"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="IM" name="im_btn" tool_tip="Начать сеанс IM"/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="Звонок" name="call_btn" tool_tip="Позвонить этому жителю"/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="Поделиться" name="share_btn" tool_tip="Поделиться объектом из инвентаря"/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="Телепортация" name="teleport_btn" tool_tip="Предложить телепортацию"/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="Профиль группы" name="group_info_btn" tool_tip="Показать информацию о группе"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="Групповой чат" name="chat_btn" tool_tip="Открыть сеанс чата"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="Звонок группе" name="group_call_btn" tool_tip="Позвонить этой группе"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_pick_info.xml b/indra/newview/skins/default/xui/ru/panel_pick_info.xml index 373cf211fb..373cf211fb 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/ru/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/ru/panel_picks.xml b/indra/newview/skins/default/xui/ru/panel_picks.xml index d6770e0eeb..d6770e0eeb 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_picks.xml +++ b/indra/newview/skins/default/xui/ru/panel_picks.xml diff --git a/indra/newview/skins/default/xui/ru/panel_place_profile.xml b/indra/newview/skins/default/xui/ru/panel_place_profile.xml index b486b918ed..b486b918ed 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ru/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/ru/panel_places.xml b/indra/newview/skins/default/xui/ru/panel_places.xml index 54837d3c0b..54837d3c0b 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_places.xml +++ b/indra/newview/skins/default/xui/ru/panel_places.xml diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_message.xml b/indra/newview/skins/default/xui/ru/panel_postcard_message.xml index 70587d8090..70587d8090 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/ru/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml index dc9d59008f..dc9d59008f 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml index 7d8ee96924..7d8ee96924 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml index 9d7ae546fd..9d7ae546fd 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml index 9283fc9e6e..6383fc8c2c 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Текстовый чат" name="chat"> - <text name="font_size"> - Размер шрифта: - </text> - <radio_group name="chat_font_size"> - <radio_item label="Мелкий" name="radio" value="0"/> - <radio_item label="Средний" name="radio2" value="1"/> - <radio_item label="Крупный" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/> - <check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/> - <check_box label="Вести журнал текстового IM и чата" name="plain_text_chat_history"/> - <check_box label="Чат в пузырьках" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - Показывать сообщения: - </text> - <text name="requires_restart_label"> - (требуется перезапуск) - </text> - <radio_group name="chat_window" tool_tip="Показывать IM-сообщения в отдельных окнах или же в одном окне с несколькими вкладками (требуется перезапуск)"> - <radio_item label="В отдельных окнах" name="radio" value="0"/> - <radio_item label="На вкладках" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - Включить всплывающие сообщения с новыми репликами в чате: - </text> - <check_box label="Групповой чат" name="EnableGroupChatPopups" tool_tip="Отображать всплывающие уведомления при появлении сообщений в групповом чате"/> - <check_box label="Текстовые чаты" name="EnableIMChatPopups" tool_tip="Отображать всплывающие уведомления при получении IM-сообщений"/> - <spinner label="Время отображения всплывающих реплик:" name="nearby_toasts_lifetime"/> - <spinner label="Время затухания всплывающих реплик:" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/> + <check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/> + <check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/> + <text name="font_size"> + Размер шрифта: + </text> + <combo_box name="chat_font_size"> + <item label="Мелкий" name="Small" value="0"/> + <item label="Средний" name="Medium" value="1"/> + <item label="Крупный" name="Large" value="2"/> + </combo_box> + <check_box label="Чат в пузырьках" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + Уведомления + </text> + <text name="friend_ims"> + IM друзей: + </text> + <combo_box name="FriendIMOptions"> + <item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/> + <item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/> + <item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/> + <item label="Нет" name="None" value="нет"/> + </combo_box> + <text name="non_friend_ims"> + IM чужих: + </text> + <combo_box name="NonFriendIMOptions"> + <item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/> + <item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/> + <item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/> + <item label="Нет" name="None" value="нет"/> + </combo_box> + <text name="conference_ims"> + IM конференции: + </text> + <combo_box name="ConferenceIMOptions"> + <item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/> + <item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/> + <item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/> + <item label="Нет" name="None" value="нет"/> + </combo_box> + <text name="group_chat"> + Групповой чат: + </text> + <combo_box name="GroupChatOptions"> + <item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/> + <item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/> + <item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/> + <item label="Нет" name="None" value="нет"/> + </combo_box> + <text name="nearby_chat"> + Локальный чат: + </text> + <combo_box name="NearbyChatOptions"> + <item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/> + <item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/> + <item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/> + <item label="Нет" name="None" value="нет"/> + </combo_box> + <text name="notifications_alert"> + Для временного отключения всех уведомлений вызовите меню «Общение > Не беспокоить». + </text> + </panel> + <panel> + <text name="play_sound"> + Звук: + </text> + <check_box label="Новый разговор" name="new_conversation"/> + <check_box label="Входящий голосовой вызов" name="incoming_voice_call"/> + <check_box label="Предложение телепортации" name="teleport_offer"/> + <check_box label="Предложение инвентаря" name="inventory_offer"/> + </panel> + <panel> + <button label="Очистить журнал..." name="clear_log"/> + <button label="Удалить записи..." name="delete_transcripts"/> + <button label="Обзор..." label_selected="Обзор" name="log_path_button"/> + </panel> <button label="Перевод..." name="ok_btn"/> <button label="Автозамена..." name="autoreplace_showgui"/> <button label="Проверка правописания..." name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml index 48c34fcbb2..48c34fcbb2 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml index d1bfedf2d8..c7a850f78a 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml @@ -68,9 +68,9 @@ <combo_box.item label="никогда" name="item4"/> </combo_box> <text name="text_box3"> - Ответ в режиме «Занят»: + Ответ в режиме «Не беспокоить»: </text> - <text_editor name="busy_response"> + <text_editor name="do_not_disturb_response"> log_in_to_change </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml index a7e826f5fc..a7e826f5fc 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml index a6e9b00f2a..a6e9b00f2a 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml index 20bb839eed..20bb839eed 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml index 8e7fc71f0d..8e7fc71f0d 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml index bf673750d2..bf673750d2 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml index 76bb6518e9..76bb6518e9 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_covenant.xml b/indra/newview/skins/default/xui/ru/panel_region_covenant.xml index 706a38f110..706a38f110 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_debug.xml b/indra/newview/skins/default/xui/ru/panel_region_debug.xml index 4be1e781fa..4be1e781fa 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_environment.xml b/indra/newview/skins/default/xui/ru/panel_region_environment.xml index 85be8f63bd..85be8f63bd 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml index bcfb974fcb..bcfb974fcb 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_general.xml b/indra/newview/skins/default/xui/ru/panel_region_general.xml index 8559be6c9e..8559be6c9e 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml index af25565226..af25565226 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/ru/panel_script_ed.xml b/indra/newview/skins/default/xui/ru/panel_script_ed.xml index 05ccaeb54b..05ccaeb54b 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/ru/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml index a06c465a2b..a06c465a2b 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml index 189e21fd2f..189e21fd2f 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml index c25f92cb8d..c25f92cb8d 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml index 1a260dc31f..1a260dc31f 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml index 53a150c9f9..53a150c9f9 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml index 446b9bb2fd..446b9bb2fd 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml index 250a76cd21..250a76cd21 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml index 47f4caf8e3..47f4caf8e3 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml index 79a9ef58d0..79a9ef58d0 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml index 98dab288a3..98dab288a3 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml index 81a2175fc3..81a2175fc3 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/indra/newview/skins/default/xui/ru/panel_status_bar.xml index 9c84ff1fd8..9c84ff1fd8 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history.xml index c457bc2269..c457bc2269 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/ru/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml index 90fb720068..90fb720068 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml index de0b38198f..de0b38198f 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml index fe044cd083..fe044cd083 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/ru/panel_world_map.xml b/indra/newview/skins/default/xui/ru/panel_world_map.xml index 0ab8720185..0ab8720185 100644..100755 --- a/indra/newview/skins/default/xui/ru/panel_world_map.xml +++ b/indra/newview/skins/default/xui/ru/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/ru/role_actions.xml b/indra/newview/skins/default/xui/ru/role_actions.xml index b6ba818abd..b6ba818abd 100644..100755 --- a/indra/newview/skins/default/xui/ru/role_actions.xml +++ b/indra/newview/skins/default/xui/ru/role_actions.xml diff --git a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml index a23f6134f2..a23f6134f2 100644..100755 --- a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml index c106c2de79..c106c2de79 100644..100755 --- a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml index 0106ed50ac..0106ed50ac 100644..100755 --- a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml index e9dd3760b5..5502530ca4 100644..100755 --- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="Купить объект" name="Buyobject"/> <combo_box.item label="Заплатить за объект" name="Payobject"/> <combo_box.item label="Открыть" name="Open"/> + <combo_box.item label="Приблизить" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index f9ded799bf..d7d4df4a37 100644..100755 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -137,7 +137,7 @@ Выйти </string> <string name="create_account_url"> - http://join.secondlife.com/index.php?lang=ru-RU&sourceid=[sourceid] + http://join.secondlife.com/?sourceid=[sourceid] </string> <string name="LoginFailedViewerNotPermitted"> У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу @@ -619,7 +619,7 @@ support@secondlife.com. <string name="AvatarAway"> Нет на месте </string> - <string name="AvatarBusy"> + <string name="AvatarDoNotDisturb"> Не беспокоить </string> <string name="AvatarMuted"> @@ -856,6 +856,12 @@ support@secondlife.com. <string name="ST_NO_JOINT"> Не удается найти объект ROOT или JOINT. </string> + <string name="NearbyChatTitle"> + Локальный чат + </string> + <string name="NearbyChatLabel"> + (Локальный чат) + </string> <string name="whisper"> шепчет: </string> @@ -919,12 +925,15 @@ support@secondlife.com. <string name="ControlYourCamera"> Управлять камерой </string> - <string name="TeleportYourAgent"> - Телепортировать вас - </string> <string name="NotConnected"> Нет подключения </string> + <string name="AgentNameSubst"> + (Вы) + </string> + <string name="TeleportYourAgent"> + Телепортировать вас + </string> <string name="SIM_ACCESS_PG"> Общий </string> @@ -1006,18 +1015,6 @@ support@secondlife.com. <string name="dictionary_files"> Словари </string> - <string name="AvatarSetNotAway"> - На месте - </string> - <string name="AvatarSetAway"> - Нет на месте - </string> - <string name="AvatarSetNotBusy"> - Не занят(а) - </string> - <string name="AvatarSetBusy"> - Не беспокоить - </string> <string name="shape"> Фигура </string> @@ -1986,8 +1983,8 @@ support@secondlife.com. <string name="PanelContentsNewScript"> Новый скрипт </string> - <string name="BusyModeResponseDefault"> - У адресата вашего сообщения задан статус «Не беспокоить». Ваше сообщение все равно будет отображено на панели IM для просмотра позже. + <string name="DoNotDisturbModeResponseDefault"> + Этот житель включил режим «Не беспокоить» и увидит ваше сообщение позже. </string> <string name="MuteByName"> (по имени) @@ -2100,9 +2097,6 @@ support@secondlife.com. <string name="GroupMoneyDate"> [weekday,datetime,utc], [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc] </string> - <string name="ViewerObjectContents"> - Контент - </string> <string name="AcquiredItems"> Купленные вещи </string> @@ -3871,7 +3865,7 @@ support@secondlife.com. Область общей дозволенности </string> <string name="LocationCtrlSeeAVsTooltip"> - Все жители с других участков могут видеть аватары и общаться в чате + Аватары на этом участке невидимы и неслышимы для аватаров с других участков </string> <string name="LocationCtrlPathfindingDirtyTooltip"> Возможны неполадки подвижных объектов в этом регионе, пока регион не будет восстановлен. @@ -3948,6 +3942,12 @@ support@secondlife.com. <string name="IM_unblock_only_groups_friends"> Для просмотра этого сообщения снимите флажок «Только друзья и группы могут звонить мне и отправлять IM» в окне «Настройки/Приватность». </string> + <string name="OnlineStatus"> + Онлайн + </string> + <string name="OfflineStatus"> + Оффлайн + </string> <string name="answered_call"> На ваш звонок ответили </string> @@ -3957,6 +3957,9 @@ support@secondlife.com. <string name="you_joined_call"> Вы присоединились к голосовой беседе </string> + <string name="you_auto_rejected_call-im"> + Голосовой вызов автоматически отклонен, так как включен режим «Не беспокоить». + </string> <string name="name_started_call"> Житель [NAME] начал голосовую беседу </string> @@ -3973,7 +3976,7 @@ support@secondlife.com. Соединяется... </string> <string name="conference-title"> - Спонтанная конференция + Чат с несколькими участниками </string> <string name="conference-title-incoming"> Конференция с жителем [AGENT_NAME] @@ -4865,6 +4868,9 @@ support@secondlife.com. <string name="Command_Chat_Label"> Чат </string> + <string name="Command_Conversations_Label"> + Разговоры + </string> <string name="Command_Compass_Label"> Компас </string> @@ -4940,6 +4946,9 @@ support@secondlife.com. <string name="Command_Chat_Tooltip"> Обменивайтесь текстовыми репликами с людьми вокруг вас </string> + <string name="Command_Conversations_Tooltip"> + Поговорить со всеми + </string> <string name="Command_Compass_Tooltip"> Компас </string> @@ -5069,4 +5078,13 @@ support@secondlife.com. <string name="UserDictionary"> [Пользователь] </string> + <string name="logging_calls_disabled_log_empty"> + Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки > Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи». + </string> + <string name="logging_calls_disabled_log_not_empty"> + Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки > Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи». + </string> + <string name="logging_calls_enabled_log_empty"> + Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись. + </string> </strings> diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml index 40c9267408..40c9267408 100644..100755 --- a/indra/newview/skins/default/xui/ru/teleport_strings.xml +++ b/indra/newview/skins/default/xui/ru/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_aaa.xml b/indra/newview/skins/default/xui/tr/floater_aaa.xml index d663ec1a5b..d663ec1a5b 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_aaa.xml +++ b/indra/newview/skins/default/xui/tr/floater_aaa.xml diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml index 9cc9c7a220..9cc9c7a220 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_about.xml +++ b/indra/newview/skins/default/xui/tr/floater_about.xml diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml index 481fc540d0..481fc540d0 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/tr/floater_activeim.xml b/indra/newview/skins/default/xui/tr/floater_activeim.xml index f3f66b942f..f3f66b942f 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_activeim.xml +++ b/indra/newview/skins/default/xui/tr/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml index a63e1e107e..a63e1e107e 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml index f8800c674d..f8800c674d 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_auction.xml b/indra/newview/skins/default/xui/tr/floater_auction.xml index 3c945a9c96..3c945a9c96 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_auction.xml +++ b/indra/newview/skins/default/xui/tr/floater_auction.xml diff --git a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml index e52e05dc61..e52e05dc61 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/tr/floater_avatar.xml b/indra/newview/skins/default/xui/tr/floater_avatar.xml index c6b14ba710..c6b14ba710 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_avatar.xml +++ b/indra/newview/skins/default/xui/tr/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml index 99c2aae5a3..99c2aae5a3 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml index b519cfa1a9..b519cfa1a9 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/tr/floater_beacons.xml b/indra/newview/skins/default/xui/tr/floater_beacons.xml index 08ebf36be5..08ebf36be5 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_beacons.xml +++ b/indra/newview/skins/default/xui/tr/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/tr/floater_build_options.xml b/indra/newview/skins/default/xui/tr/floater_build_options.xml index 5e77f6b168..5e77f6b168 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_build_options.xml +++ b/indra/newview/skins/default/xui/tr/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml index 1d929a2dd3..1d929a2dd3 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/tr/floater_bumps.xml b/indra/newview/skins/default/xui/tr/floater_bumps.xml index 06ae3a2ec3..06ae3a2ec3 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_bumps.xml +++ b/indra/newview/skins/default/xui/tr/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_contents.xml b/indra/newview/skins/default/xui/tr/floater_buy_contents.xml index 9012189ce5..9012189ce5 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency.xml index d90985dcff..d90985dcff 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml index 98aaf50db0..98aaf50db0 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_land.xml b/indra/newview/skins/default/xui/tr/floater_buy_land.xml index 7b43af2ea4..7b43af2ea4 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/tr/floater_buy_object.xml b/indra/newview/skins/default/xui/tr/floater_buy_object.xml index 91ef05fb29..91ef05fb29 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/tr/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/tr/floater_camera.xml b/indra/newview/skins/default/xui/tr/floater_camera.xml index 22e2aa52c6..22e2aa52c6 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_camera.xml +++ b/indra/newview/skins/default/xui/tr/floater_camera.xml diff --git a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml index 988c845982..cd999b4b7a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="chat_bar" title="YAKINDAKİ SOHBET"> +<floater name="nearby_chat" title="YAKINDAKİ SOHBET"> <panel name="bottom_panel"> <line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/> <button name="show_nearby_chat" tool_tip="Yakın sohbet günlüğünü gösterir/gizler"/> diff --git a/indra/newview/skins/default/xui/tr/floater_choose_group.xml b/indra/newview/skins/default/xui/tr/floater_choose_group.xml index 1bfc772f4a..1bfc772f4a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/tr/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/tr/floater_color_picker.xml b/indra/newview/skins/default/xui/tr/floater_color_picker.xml index c9465fff83..c9465fff83 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/tr/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml new file mode 100644 index 0000000000..5f8dac506f --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="SOHBET GÜNLÜĞÜ"> + <panel name="buttons_panel"> + <filter_editor label="Kişileri Filtrele" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/> + <menu_button name="conversations_gear_btn" tool_tip="Seçilen kişi veya grup üzerindeki eylemler"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml new file mode 100644 index 0000000000..84403dfd68 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="KONUŞMA:"> + <floater.string name="Title"> + KONUŞMA: [NAME] + </floater.string> + <text name="page_label" value="Sayfa"/> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_critical.xml b/indra/newview/skins/default/xui/tr/floater_critical.xml index 041a303bae..041a303bae 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_critical.xml +++ b/indra/newview/skins/default/xui/tr/floater_critical.xml diff --git a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml index 915770f727..915770f727 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/tr/floater_destinations.xml b/indra/newview/skins/default/xui/tr/floater_destinations.xml index 4504366d63..4504366d63 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_destinations.xml +++ b/indra/newview/skins/default/xui/tr/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/tr/floater_display_name.xml b/indra/newview/skins/default/xui/tr/floater_display_name.xml index e39be5a24b..e39be5a24b 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_display_name.xml +++ b/indra/newview/skins/default/xui/tr/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml index 4be1068dcc..4be1068dcc 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml index 0e9f86148d..0e9f86148d 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml index 2ddee32bad..2ddee32bad 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml index e702da7e1b..e702da7e1b 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_event.xml b/indra/newview/skins/default/xui/tr/floater_event.xml index 60dece124b..60dece124b 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_event.xml +++ b/indra/newview/skins/default/xui/tr/floater_event.xml diff --git a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml index 5736bda45e..5736bda45e 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/tr/floater_font_test.xml b/indra/newview/skins/default/xui/tr/floater_font_test.xml index 5371d5d2a4..5371d5d2a4 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_font_test.xml +++ b/indra/newview/skins/default/xui/tr/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/tr/floater_gesture.xml b/indra/newview/skins/default/xui/tr/floater_gesture.xml index 5f5d28ad6c..5f5d28ad6c 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_gesture.xml +++ b/indra/newview/skins/default/xui/tr/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/tr/floater_god_tools.xml b/indra/newview/skins/default/xui/tr/floater_god_tools.xml index 26e5ebd18b..26e5ebd18b 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/tr/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml index b204389083..b204389083 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_help_browser.xml b/indra/newview/skins/default/xui/tr/floater_help_browser.xml index 695f838936..695f838936 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/tr/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/tr/floater_how_to.xml b/indra/newview/skins/default/xui/tr/floater_how_to.xml index a42fe0b122..a42fe0b122 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_how_to.xml +++ b/indra/newview/skins/default/xui/tr/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/tr/floater_hud.xml b/indra/newview/skins/default/xui/tr/floater_hud.xml index 09f119bbc1..09f119bbc1 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_hud.xml +++ b/indra/newview/skins/default/xui/tr/floater_hud.xml diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml index 4451d1d309..6504430b3c 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_im_container.xml +++ b/indra/newview/skins/default/xui/tr/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="SOHBETLER"/> +<multi_floater name="floater_im_box" title="SOHBETLER"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="Gösterme/sıralama seçenekleri"/> + <button name="add_btn" tool_tip="Yeni bir sohbet başlat"/> + <button name="speak_btn" tool_tip="Mikrofonunuzu kullanarak kişilerle konuşun"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="Bu listeyi Daralt/Genişlet"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="Bu panoyu daralt"/> + <text name="stub_textbox"> + Sohbet ayrı bir pencerede. [secondlife:/// Bunu geri getir.] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml index bed08b36c6..8ce8f0fe13 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_im_session.xml +++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="Kime" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] sohbete davet edildi."/> + <floater.string name="multiple_participants_added" value="[NAME] sohbete davet edildi."/> + <floater.string name="tooltip_to_separate_window" value="Bu sohbeti ayrı bir pencereye taşı"/> + <floater.string name="tooltip_to_main_window" value="Bu sohbeti ana pencereye geri taşı"/> + <floater.string name="start_call_button_tooltip" value="Ses bağlantısını aç"/> + <floater.string name="end_call_button_tooltip" value="Ses bağlantısını kapat"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="Bu panoyu daralt"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Katılımcı listesini daralt"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Katılımcı listesini genişlet"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="Gösterme/sıralama seçenekleri"/> + <menu_button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/> + <button name="add_btn" tool_tip="Bu sohbete birini ekle"/> + <button name="voice_call_btn" tool_tip="Ses bağlantısını aç"/> + <button name="close_btn" tool_tip="Bu sohbeti bitir"/> + <button name="expand_collapse_btn" tool_tip="Bu panoyu Daralt/Genişlet"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="Kime" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="Mesaj panelini gösterir/gizler"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/tr/floater_image_preview.xml b/indra/newview/skins/default/xui/tr/floater_image_preview.xml index a5963bdf63..a5963bdf63 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_import_collada.xml b/indra/newview/skins/default/xui/tr/floater_import_collada.xml index 1e77d1b376..1e77d1b376 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/tr/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml index adb03c2dff..0f2b27241e 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml @@ -10,7 +10,7 @@ anonim </floater.string> <floater.string name="VoiceInviteP2P"> - arıyor. + sizi arıyor. </floater.string> <floater.string name="VoiceInviteAdHoc"> bir Sesli Sohbet aramasına bir konferans araması ile katıldı. @@ -25,9 +25,9 @@ [CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz? </floater.string> <text name="question"> - [CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz? + Yanıtlarsanız, mevcut sesli sohbetinizle bağlantınız kesilecek. </text> - <button label="Kabul Et" label_selected="Kabul Et" name="Accept"/> - <button label="Reddet" label_selected="Reddet" name="Reject"/> - <button label="Aİ Başlat" name="Start IM"/> + <button label="Yanıtla" label_selected="Yanıtla" name="Accept"/> + <button label="Yok say" label_selected="Yok say" name="Reject"/> + <button label="Bunun yerine Aİ aç" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/tr/floater_inspect.xml b/indra/newview/skins/default/xui/tr/floater_inspect.xml index 09130a31f3..09130a31f3 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_inspect.xml +++ b/indra/newview/skins/default/xui/tr/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml index e49fef1f46..e49fef1f46 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml index 9d1a556751..9d1a556751 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/tr/floater_joystick.xml b/indra/newview/skins/default/xui/tr/floater_joystick.xml index 4a27aac3c1..4a27aac3c1 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_joystick.xml +++ b/indra/newview/skins/default/xui/tr/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml b/indra/newview/skins/default/xui/tr/floater_lagmeter.xml index 736c50be90..736c50be90 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/tr/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/tr/floater_land_holdings.xml b/indra/newview/skins/default/xui/tr/floater_land_holdings.xml index a075a93c1e..a075a93c1e 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/tr/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml index 34c3e28a0b..34c3e28a0b 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml index 0b898d6032..0b898d6032 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/tr/floater_map.xml b/indra/newview/skins/default/xui/tr/floater_map.xml index 7d6c314f04..7d6c314f04 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_map.xml +++ b/indra/newview/skins/default/xui/tr/floater_map.xml diff --git a/indra/newview/skins/default/xui/tr/floater_media_browser.xml b/indra/newview/skins/default/xui/tr/floater_media_browser.xml index 6cce4d59b8..6cce4d59b8 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/tr/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/tr/floater_media_settings.xml b/indra/newview/skins/default/xui/tr/floater_media_settings.xml index 4205a0dbef..4205a0dbef 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml index ba87ee99a4..ba87ee99a4 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml index 325d1d9ed9..325d1d9ed9 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/tr/floater_model_preview.xml b/indra/newview/skins/default/xui/tr/floater_model_preview.xml index c00cadd3bd..c00cadd3bd 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_moveview.xml b/indra/newview/skins/default/xui/tr/floater_moveview.xml index 9226218a24..9226218a24 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_moveview.xml +++ b/indra/newview/skins/default/xui/tr/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_mute_object.xml b/indra/newview/skins/default/xui/tr/floater_mute_object.xml index becad38a8e..becad38a8e 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/tr/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/tr/floater_my_appearance.xml b/indra/newview/skins/default/xui/tr/floater_my_appearance.xml index 4d71187a1f..4d71187a1f 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/tr/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/tr/floater_my_inventory.xml b/indra/newview/skins/default/xui/tr/floater_my_inventory.xml index 8c62692a88..8c62692a88 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/tr/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/floater_notification.xml b/indra/newview/skins/default/xui/tr/floater_notification.xml index 89a56348f6..89a56348f6 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_notification.xml +++ b/indra/newview/skins/default/xui/tr/floater_notification.xml diff --git a/indra/newview/skins/default/xui/tr/floater_notifications_console.xml b/indra/newview/skins/default/xui/tr/floater_notifications_console.xml index e4eaf2cf9e..e4eaf2cf9e 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/tr/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/tr/floater_object_weights.xml b/indra/newview/skins/default/xui/tr/floater_object_weights.xml index b57943f666..b57943f666 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/tr/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/tr/floater_openobject.xml b/indra/newview/skins/default/xui/tr/floater_openobject.xml index 9980aee97f..9980aee97f 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_openobject.xml +++ b/indra/newview/skins/default/xui/tr/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml index 7a9f507c93..7a9f507c93 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml index 7ba4580f4f..7ba4580f4f 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml index f38d8c84c6..f38d8c84c6 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml index 6eecc7fb77..35f47e6dfa 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> Göster: </text> - <check_box label="Dünya" name="show_world"/> + <check_box label="Test" name="show_world"/> <check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/> <check_box label="Navigasyon örgüsü" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml index 2e416c9311..2e416c9311 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/tr/floater_pay.xml b/indra/newview/skins/default/xui/tr/floater_pay.xml index 6604e5c37a..6604e5c37a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_pay.xml +++ b/indra/newview/skins/default/xui/tr/floater_pay.xml diff --git a/indra/newview/skins/default/xui/tr/floater_pay_object.xml b/indra/newview/skins/default/xui/tr/floater_pay_object.xml index 7772d3b101..7772d3b101 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/tr/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/tr/floater_people.xml b/indra/newview/skins/default/xui/tr/floater_people.xml index 94a27bff57..94a27bff57 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_people.xml +++ b/indra/newview/skins/default/xui/tr/floater_people.xml diff --git a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml index 669b833c26..669b833c26 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/tr/floater_picks.xml b/indra/newview/skins/default/xui/tr/floater_picks.xml index 513a2e319a..513a2e319a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_picks.xml +++ b/indra/newview/skins/default/xui/tr/floater_picks.xml diff --git a/indra/newview/skins/default/xui/tr/floater_places.xml b/indra/newview/skins/default/xui/tr/floater_places.xml index 4e09a699f6..4e09a699f6 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_places.xml +++ b/indra/newview/skins/default/xui/tr/floater_places.xml diff --git a/indra/newview/skins/default/xui/tr/floater_post_process.xml b/indra/newview/skins/default/xui/tr/floater_post_process.xml index 5e419f8ffa..5e419f8ffa 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_post_process.xml +++ b/indra/newview/skins/default/xui/tr/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preferences.xml b/indra/newview/skins/default/xui/tr/floater_preferences.xml index edb3c19b81..edb3c19b81 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_preferences.xml +++ b/indra/newview/skins/default/xui/tr/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml index 1c462e6ebf..1c462e6ebf 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml index 23b4848333..23b4848333 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml index dc6f66f657..dc6f66f657 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml index 23391249d1..23391249d1 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_sound.xml b/indra/newview/skins/default/xui/tr/floater_preview_sound.xml index 50874f024a..50874f024a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml index 79e184130a..79e184130a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml index 5cdd25b64c..5cdd25b64c 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/tr/floater_publish_classified.xml b/indra/newview/skins/default/xui/tr/floater_publish_classified.xml index 572892667b..572892667b 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/tr/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml index e2a5e8e86a..e2a5e8e86a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/tr/floater_region_info.xml b/indra/newview/skins/default/xui/tr/floater_region_info.xml index 2b2e00161b..2b2e00161b 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_region_info.xml +++ b/indra/newview/skins/default/xui/tr/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml index c5765883c4..c5765883c4 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug.xml b/indra/newview/skins/default/xui/tr/floater_script_debug.xml index baf0aabd85..baf0aabd85 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_limits.xml b/indra/newview/skins/default/xui/tr/floater_script_limits.xml index 875599bde3..875599bde3 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_preview.xml b/indra/newview/skins/default/xui/tr/floater_script_preview.xml index e193f7c1af..e193f7c1af 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_queue.xml b/indra/newview/skins/default/xui/tr/floater_script_queue.xml index c1d98b717a..c1d98b717a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/tr/floater_script_search.xml b/indra/newview/skins/default/xui/tr/floater_script_search.xml index 54b1d20c8c..54b1d20c8c 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_script_search.xml +++ b/indra/newview/skins/default/xui/tr/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/tr/floater_search.xml b/indra/newview/skins/default/xui/tr/floater_search.xml index 08c1e5162c..08c1e5162c 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_search.xml +++ b/indra/newview/skins/default/xui/tr/floater_search.xml diff --git a/indra/newview/skins/default/xui/tr/floater_select_key.xml b/indra/newview/skins/default/xui/tr/floater_select_key.xml index b828672ec2..b828672ec2 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_select_key.xml +++ b/indra/newview/skins/default/xui/tr/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/tr/floater_sell_land.xml b/indra/newview/skins/default/xui/tr/floater_sell_land.xml index 9bea1e120e..9bea1e120e 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/tr/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/tr/floater_settings_debug.xml b/indra/newview/skins/default/xui/tr/floater_settings_debug.xml index 65264c57d7..65264c57d7 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/tr/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/tr/floater_snapshot.xml b/indra/newview/skins/default/xui/tr/floater_snapshot.xml index fa51f15d16..fa51f15d16 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/tr/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml index 470a222d7e..470a222d7e 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/tr/floater_sound_preview.xml b/indra/newview/skins/default/xui/tr/floater_sound_preview.xml index 1938f184b3..1938f184b3 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml index f5f0ba8fd9..f5f0ba8fd9 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml index ded71cad40..ded71cad40 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml index afce87bdaa..afce87bdaa 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_stats.xml +++ b/indra/newview/skins/default/xui/tr/floater_stats.xml diff --git a/indra/newview/skins/default/xui/tr/floater_sys_well.xml b/indra/newview/skins/default/xui/tr/floater_sys_well.xml index 301d9af063..301d9af063 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/tr/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/tr/floater_telehub.xml b/indra/newview/skins/default/xui/tr/floater_telehub.xml index 2cdb464ed0..2cdb464ed0 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_telehub.xml +++ b/indra/newview/skins/default/xui/tr/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml index b479d5f6d6..b479d5f6d6 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml index fcb7d87287..fcb7d87287 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml index 889425f23a..42483c09e1 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml @@ -19,7 +19,7 @@ <button label="Varsayılan" label_selected="Varsayılan" name="Default"/> <button label="Boş" label_selected="Boş" name="Blank"/> <button label="Hiçbiri" label_selected="Hiçbiri" name="None"/> - <check_box initial_value="true" label="Canlı Önizleme" name="apply_immediate_check"/> + <check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/> <text name="preview_disabled" value="Önizleme Devre Dışı"/> <filter_editor label="Dokuları Filtrele" name="inventory search editor"/> <check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml index 42426225c7..42426225c7 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml index 4bf0372a8a..4bf0372a8a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_tools.xml +++ b/indra/newview/skins/default/xui/tr/floater_tools.xml diff --git a/indra/newview/skins/default/xui/tr/floater_top_objects.xml b/indra/newview/skins/default/xui/tr/floater_top_objects.xml index 19420c68e3..19420c68e3 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/tr/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/tr/floater_tos.xml b/indra/newview/skins/default/xui/tr/floater_tos.xml index 7ff0001ddd..7ff0001ddd 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_tos.xml +++ b/indra/newview/skins/default/xui/tr/floater_tos.xml diff --git a/indra/newview/skins/default/xui/tr/floater_toybox.xml b/indra/newview/skins/default/xui/tr/floater_toybox.xml index e60e176643..e60e176643 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_toybox.xml +++ b/indra/newview/skins/default/xui/tr/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/tr/floater_translation_settings.xml b/indra/newview/skins/default/xui/tr/floater_translation_settings.xml index 33ce76bd9a..33ce76bd9a 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/tr/floater_url_entry.xml b/indra/newview/skins/default/xui/tr/floater_url_entry.xml index 54c5b047a8..54c5b047a8 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/tr/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..ec350bee60 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="SOHBET SES DÜZEYİ"> + <slider label="Sesli Sohbet" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml index 5ff0804f17..5ff0804f17 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml index 3534a3fe90..7a157244cd 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME"> +<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME ÖNİZLEMESİ"> <string name="no_voice_effect"> (Ses Şekillendirme Yok) </string> diff --git a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml new file mode 100644 index 0000000000..acf99d6199 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="SES DÜZEYİ"> + <slider name="volume_slider" tool_tip="Ses düzeyi" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_web_content.xml b/indra/newview/skins/default/xui/tr/floater_web_content.xml index 93491b80fb..93491b80fb 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_web_content.xml +++ b/indra/newview/skins/default/xui/tr/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml index 1a9f731af0..1a9f731af0 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/tr/floater_window_size.xml b/indra/newview/skins/default/xui/tr/floater_window_size.xml index aff20e7960..aff20e7960 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_window_size.xml +++ b/indra/newview/skins/default/xui/tr/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/tr/floater_world_map.xml b/indra/newview/skins/default/xui/tr/floater_world_map.xml index e4729c2aed..e4729c2aed 100644..100755 --- a/indra/newview/skins/default/xui/tr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/tr/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/tr/inspect_avatar.xml b/indra/newview/skins/default/xui/tr/inspect_avatar.xml index cb3c7e9282..cb3c7e9282 100644..100755 --- a/indra/newview/skins/default/xui/tr/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/tr/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/tr/inspect_group.xml b/indra/newview/skins/default/xui/tr/inspect_group.xml index 9b130c9ef6..9b130c9ef6 100644..100755 --- a/indra/newview/skins/default/xui/tr/inspect_group.xml +++ b/indra/newview/skins/default/xui/tr/inspect_group.xml diff --git a/indra/newview/skins/default/xui/tr/inspect_object.xml b/indra/newview/skins/default/xui/tr/inspect_object.xml index bd09267319..bd09267319 100644..100755 --- a/indra/newview/skins/default/xui/tr/inspect_object.xml +++ b/indra/newview/skins/default/xui/tr/inspect_object.xml diff --git a/indra/newview/skins/default/xui/tr/inspect_remote_object.xml b/indra/newview/skins/default/xui/tr/inspect_remote_object.xml index 4b696b2ae5..4b696b2ae5 100644..100755 --- a/indra/newview/skins/default/xui/tr/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/tr/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml index dcb4629259..dcb4629259 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml index 9ba214ff31..9ba214ff31 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml index 16d1e3f356..16d1e3f356 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml index d3ef490735..d3ef490735 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml index 7d691d2ac5..7d691d2ac5 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml index c520aff521..c520aff521 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml index d57c43f6c1..d57c43f6c1 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml index 31f77d834a..31f77d834a 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml index 784d809d70..784d809d70 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml index f910e1fe91..9480d30029 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="Gear COF"> <menu label="Yeni Giysiler" name="COF.Gear.New_Clothes"/> - <menu label="Yeni Vücut Bölümleri" name="COF.Geear.New_Body_Parts"/> + <menu label="Yeni Vücut Bölümleri" name="COF.Gear.New_Body_Parts"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml new file mode 100644 index 0000000000..31404f2501 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="Sohbeti kapat" name="close_conversation"/> + <menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/> + <menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/> + <menu_item_call label="Profili Göster" name="view_profile"/> + <menu_item_call label="Aİ" name="im"/> + <menu_item_call label="Işınlama teklif et" name="offer_teleport"/> + <menu_item_call label="Sesli arama" name="voice_call"/> + <menu_item_call label="Sohbet geçmişi..." name="chat_history"/> + <menu_item_call label="Arkadaş ekle" name="add_friend"/> + <menu_item_call label="Arkadaşı çıkar" name="remove_friend"/> + <menu_item_call label="Arkadaşları çıkar" name="remove_friends"/> + <menu_item_call label="Gruba davet et..." name="invite_to_group"/> + <menu_item_call label="Yakınlaştır" name="zoom_in"/> + <menu_item_call label="Harita" name="map"/> + <menu_item_call label="Paylaş" name="share"/> + <menu_item_call label="Öde" name="pay"/> + <menu_item_check label="Sesi Engelle" name="block_unblock"/> + <menu_item_check label="Metni Engelle" name="MuteText"/> + <menu_item_call label="Grup Profili" name="group_profile"/> + <menu_item_call label="Grubu Etkinleştir" name="activate_group"/> + <menu_item_call label="Gruptan Ayrıl" name="leave_group"/> + <context_menu label="Moderatör Seçenekleri" name="Moderator Options"> + <menu_item_check label="Metin sohbetine izin ver" name="AllowTextChat"/> + <menu_item_call label="Bu katılımcıyı engelle" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Bu katılımcının engellemesini kaldır" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Herkesi engelle" name="ModerateVoiceMute"/> + <menu_item_call label="Herkesin engellemesini kaldır" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..9e91780eb8 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="Aİ..." name="IM"/> + <menu_item_call label="Sesli arama..." name="Call"/> + <menu_item_call label="Sohbet geçmişini aç..." name="Chat history"/> + <menu_item_call label="Profili Göster" name="View Profile"/> + <menu_item_call label="Işınlama Teklif Et" name="teleport"/> + <menu_item_call label="Arkadaş Ekle" name="add_friend"/> + <menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/> + <menu_item_call label="Gruba davet et..." name="Invite"/> + <menu_item_call label="Harita" name="Map"/> + <menu_item_call label="Paylaş" name="Share"/> + <menu_item_call label="Öde" name="Pay"/> + <menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml new file mode 100644 index 0000000000..9a77eaadd9 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="Ada göre sırala" name="sort_by_name"/> + <menu_item_check label="Tarihe göre sırala" name="sort_by_date"/> + <menu_item_check label="Arkadaşlar üstte olacak şekilde sırala" name="sort_by_friends"/> + <menu_item_call label="Yakındaki sohbet geçmişini göster..." name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_edit.xml b/indra/newview/skins/default/xui/tr/menu_edit.xml index 81cd270af0..81cd270af0 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_edit.xml +++ b/indra/newview/skins/default/xui/tr/menu_edit.xml diff --git a/indra/newview/skins/default/xui/tr/menu_favorites.xml b/indra/newview/skins/default/xui/tr/menu_favorites.xml index 7bb2ed1ddc..7bb2ed1ddc 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_favorites.xml +++ b/indra/newview/skins/default/xui/tr/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml index cb9b678fdd..cb9b678fdd 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_group_plus.xml b/indra/newview/skins/default/xui/tr/menu_group_plus.xml index 82cf7dcf74..82cf7dcf74 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/tr/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml index d1f213516b..d1f213516b 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml new file mode 100644 index 0000000000..3b9738edce --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="Profili Göster" name="View Profile"/> + <menu_item_call label="Arkadaş Ekle" name="Add Friend"/> + <menu_item_call label="Arkadaşı çıkar" name="remove_friend"/> + <menu_item_call label="Işınlama teklif et" name="offer_teleport"/> + <menu_item_call label="Gruba davet et..." name="invite_to_group"/> + <menu_item_call label="Sohbet geçmişi..." name="chat_history"/> + <menu_item_call label="Yakınlaştır" name="zoom_in"/> + <menu_item_call label="Harita" name="map"/> + <menu_item_call label="Paylaş" name="Share"/> + <menu_item_call label="Öde" name="Pay"/> + <menu_item_check label="Sesi Engelle" name="Block/Unblock"/> + <menu_item_check label="Metni Engelle" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..c4d4357ac9 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="Daraltılmış görünüm" name="compact_view"/> + <menu_item_check label="Genişletilmiş görünüm" name="expanded_view"/> + <menu_item_check label="Zamanı göster" name="IMShowTime"/> + <menu_item_check label="Bire bir sohbetlerde adları göster" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_im_well_button.xml b/indra/newview/skins/default/xui/tr/menu_im_well_button.xml deleted file mode 100644 index c3e559a723..0000000000 --- a/indra/newview/skins/default/xui/tr/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Tümünü Kapat" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml index 0396ad8fb5..0396ad8fb5 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml index 60a50b114e..60a50b114e 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml index 0ef4471088..0ef4471088 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml index 69432e967b..69432e967b 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml index d1d3f9ac8d..d1d3f9ac8d 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml index 0655db8196..0655db8196 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml index 2e2b17491a..2e2b17491a 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inventory.xml b/indra/newview/skins/default/xui/tr/menu_inventory.xml index 51049427af..51049427af 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml index db2a9a2c8c..db2a9a2c8c 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml index 5f3e4e8789..5f3e4e8789 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/tr/menu_land.xml b/indra/newview/skins/default/xui/tr/menu_land.xml index db65f1af1e..db65f1af1e 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_land.xml +++ b/indra/newview/skins/default/xui/tr/menu_land.xml diff --git a/indra/newview/skins/default/xui/tr/menu_landmark.xml b/indra/newview/skins/default/xui/tr/menu_landmark.xml index c68a2f6a90..c68a2f6a90 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_landmark.xml +++ b/indra/newview/skins/default/xui/tr/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml index f27908bf7a..f27908bf7a 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_login.xml +++ b/indra/newview/skins/default/xui/tr/menu_login.xml diff --git a/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml index 8d04e645fd..8d04e645fd 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/tr/menu_mini_map.xml b/indra/newview/skins/default/xui/tr/menu_mini_map.xml index 9abe78931e..9abe78931e 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/tr/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml index 51cf29a4de..51cf29a4de 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/tr/menu_navbar.xml b/indra/newview/skins/default/xui/tr/menu_navbar.xml index b05b816e64..b05b816e64 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_navbar.xml +++ b/indra/newview/skins/default/xui/tr/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml index b76a736979..b76a736979 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml index 39c66268f5..39c66268f5 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/tr/menu_object.xml b/indra/newview/skins/default/xui/tr/menu_object.xml index 72f7adf016..72f7adf016 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_object.xml +++ b/indra/newview/skins/default/xui/tr/menu_object.xml diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml index 34a2661d8a..3d5c68d9d3 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="Nesne Profili..." name="Object Profile"/> <menu_item_call label="Engelle..." name="Block"/> + <menu_item_call label="Haritada Göster" name="show_on_map"/> + <menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml index d2e7e7107a..674041e9c9 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="Yeni Saç" name="New Hair"/> <menu_item_call label="Yeni Gözler" name="New Eyes"/> </menu> + <menu_item_call label="Tüm klasörleri genişlet" name="expand"/> + <menu_item_call label="Tüm klasörleri daralt" name="collapse"/> <menu_item_call label="Dış Görünümü Yeniden Adlandır" name="rename"/> <menu_item_call label="Dış Görünümü Sil" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml index a48529e462..a48529e462 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/tr/menu_participant_list.xml b/indra/newview/skins/default/xui/tr/menu_participant_list.xml index 1d56105e1e..1d56105e1e 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/tr/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/tr/menu_participant_view.xml b/indra/newview/skins/default/xui/tr/menu_participant_view.xml new file mode 100644 index 0000000000..e9411ff350 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="Sohbetleri türe göre sırala" name="sort_sessions_by_type"/> + <menu_item_check label="Sohbetleri ada göre sırala" name="sort_sessions_by_name"/> + <menu_item_check label="Sohbetleri son faaliyetlere göre sırala" name="sort_sessions_by_recent"/> + <menu_item_check label="Katılımcıları ada göre sırala" name="sort_participants_by_name"/> + <menu_item_check label="Katılımcıları son faaliyetlere göre sırala" name="sort_participants_by_recent"/> + <menu_item_call label="Sohbet tercihleri..." name="chat_preferences"/> + <menu_item_call label="Gizlilik tercihleri..." name="privacy_preferences"/> + <menu_item_check label="Sohbet günlüğü..." name="Conversation"/> + <menu_item_check label="Yakındaki sohbeti çevir" name="Translate_chat"/> + <menu_item_check label="Çeviri ayarları..." name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..2bf1101b48 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="Engellemeyi Kaldır" name="unblock"/> + <menu_item_call label="Profil..." name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..a869e2ae7d --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="Sakini ada göre engelle..." name="block_resident_by_name"/> + <menu_item_call label="Nesneyi ada göre engelle" name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml new file mode 100644 index 0000000000..14b3de3a9f --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="Ada göre sırala" name="sort_by_name"/> + <menu_item_check label="Türe göre sırala" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml new file mode 100644 index 0000000000..609584d6a6 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Ada Göre Sırala" name="sort_name"/> + <menu_item_check label="Duruma Göre Sırala" name="sort_status"/> + <menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/> + <menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/> + <menu_item_check label="Sohbet Günlüğünü Göster..." name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml index 404fab17e6..404fab17e6 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml index 9f2946e310..743b01844d 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="Bilgileri Görüntüle" name="View Info"/> <menu_item_call label="Sohbet" name="Chat"/> - <menu_item_call label="Ara" name="Call"/> + <menu_item_call label="Sesli arama" name="Call"/> <menu_item_call label="Etkinleştir" name="Activate"/> <menu_item_call label="Ayrıl" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml new file mode 100644 index 0000000000..e550b20add --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Grup Simgelerini Göster" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml index a1e5ad9a50..a1e5ad9a50 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml index ee859a9450..2d61461c91 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="Profili Göster" name="View Profile"/> - <menu_item_call label="Arkadaş Ekle" name="Add Friend"/> - <menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/> - <menu_item_call label="Aİ" name="IM"/> - <menu_item_call label="Ara" name="Call"/> - <menu_item_call label="Harita" name="Map"/> - <menu_item_call label="Paylaş" name="Share"/> - <menu_item_call label="Öde" name="Pay"/> - <menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/> - <menu_item_call label="Işınlama Teklif Et" name="teleport"/> + <menu_item_call label="Profili Göster" name="view_profile"/> + <menu_item_call label="Aİ" name="im"/> + <menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/> + <menu_item_call label="Sesli arama" name="voice_call"/> + <menu_item_call label="Sohbet geçmişini göster..." name="chat_history"/> + <menu_item_call label="Arkadaş Ekle" name="add_friend"/> + <menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/> + <menu_item_call label="Gruba davet et..." name="invite_to_group"/> + <menu_item_call label="Yakınlaştır" name="zoom_in"/> + <menu_item_call label="Harita" name="map"/> + <menu_item_call label="Paylaş" name="share"/> + <menu_item_call label="Öde" name="pay"/> + <menu_item_check label="Engelle/Engeli Kaldır" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml index 5c89f87906..20695d98e8 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="Arkadaş Ekle" name="Add Friends"/> - <menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/> - <menu_item_call label="Aİ" name="IM"/> - <menu_item_call label="Ara" name="Call"/> - <menu_item_call label="Paylaş" name="Share"/> - <menu_item_call label="Öde" name="Pay"/> - <menu_item_call label="Işınlama Teklif Et" name="teleport"/> + <menu_item_call label="Arkadaş Ekle" name="add_friends"/> + <menu_item_call label="Arkadaşı Çıkar" name="remove_friends"/> + <menu_item_call label="Aİ" name="im"/> + <menu_item_call label="Ara" name="call"/> + <menu_item_call label="Paylaş" name="share"/> + <menu_item_call label="Öde" name="pay"/> + <menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml new file mode 100644 index 0000000000..59ea7c145f --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="Son Konuşanlara Göre Sırala" name="sort_by_recent_speakers"/> + <menu_item_check label="Ada Göre Sırala" name="sort_name"/> + <menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/> + <menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/> + <menu_item_check label="Haritayı Göster" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml index 0ff2111e9e..0ff2111e9e 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml new file mode 100644 index 0000000000..02be715ed2 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="En Sonunculara Göre Sırala" name="sort_most"/> + <menu_item_check label="Ada Göre Sırala" name="sort_name"/> + <menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml index adfba50138..adfba50138 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/tr/menu_picks.xml b/indra/newview/skins/default/xui/tr/menu_picks.xml index 3e5375ecc0..3e5375ecc0 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_picks.xml +++ b/indra/newview/skins/default/xui/tr/menu_picks.xml diff --git a/indra/newview/skins/default/xui/tr/menu_picks_plus.xml b/indra/newview/skins/default/xui/tr/menu_picks_plus.xml index d9c4fefc97..d9c4fefc97 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/tr/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/tr/menu_place.xml b/indra/newview/skins/default/xui/tr/menu_place.xml index ad167a328a..ad167a328a 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_place.xml +++ b/indra/newview/skins/default/xui/tr/menu_place.xml diff --git a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml index 8e52b3f7f2..8e52b3f7f2 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml index b3a2986160..b3a2986160 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml index 939ee2c7cb..939ee2c7cb 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml index ed60dec63a..ed60dec63a 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/tr/menu_save_outfit.xml b/indra/newview/skins/default/xui/tr/menu_save_outfit.xml index b28488fe30..b28488fe30 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/tr/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml index 7c1cefc2d1..7c1cefc2d1 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/tr/menu_slurl.xml b/indra/newview/skins/default/xui/tr/menu_slurl.xml index 73ac068b26..73ac068b26 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_slurl.xml +++ b/indra/newview/skins/default/xui/tr/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml index b08423be18..b08423be18 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml index 93984162e7..93984162e7 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml index b1e801c123..b1e801c123 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/tr/menu_text_editor.xml b/indra/newview/skins/default/xui/tr/menu_text_editor.xml index 76c7b43e1e..76c7b43e1e 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/tr/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/tr/menu_toolbars.xml b/indra/newview/skins/default/xui/tr/menu_toolbars.xml index c8523a6ec9..c8523a6ec9 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/tr/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/tr/menu_topinfobar.xml b/indra/newview/skins/default/xui/tr/menu_topinfobar.xml index d9b8d50f18..d9b8d50f18 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/tr/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml index d82b52aea8..b14a0509bf 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Sakin Profilini Göster" name="show_agent"/> + <menu_item_call label="Profili Göster" name="show_agent"/> + <menu_item_call label="Aİ Gönder..." name="send_im"/> + <menu_item_call label="Arkadaş Ekle..." name="add_friend"/> <menu_item_call label="Adı panoya kopyala" name="url_copy_label"/> <menu_item_call label="SLurl'yi Panoya Kopyala" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_url_group.xml b/indra/newview/skins/default/xui/tr/menu_url_group.xml index 40fa13b4cf..40fa13b4cf 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_group.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_http.xml b/indra/newview/skins/default/xui/tr/menu_url_http.xml index fee8eba150..fee8eba150 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_http.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_inventory.xml b/indra/newview/skins/default/xui/tr/menu_url_inventory.xml index 3b22c5afec..3b22c5afec 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_map.xml b/indra/newview/skins/default/xui/tr/menu_url_map.xml index 770e330516..770e330516 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_map.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml index d55e34c11c..00fa3c27c2 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Nesne Bilgilerini Göster" name="show_object"/> + <menu_item_call label="Nesne Profili..." name="show_object"/> <menu_item_call label="Haritada Göster" name="show_on_map"/> <menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/> <menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/tr/menu_url_parcel.xml b/indra/newview/skins/default/xui/tr/menu_url_parcel.xml index eac1d743c3..eac1d743c3 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_slapp.xml b/indra/newview/skins/default/xui/tr/menu_url_slapp.xml index a2ecfc6a48..a2ecfc6a48 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_slurl.xml b/indra/newview/skins/default/xui/tr/menu_url_slurl.xml index 3f4e51b36c..3f4e51b36c 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/tr/menu_url_teleport.xml b/indra/newview/skins/default/xui/tr/menu_url_teleport.xml index b7035a4d8f..b7035a4d8f 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/tr/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index 7a7faf6ac4..35485bb292 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/> <menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/> </menu> - <menu label="Durum" name="Status"> - <menu_item_call label="Uzakta" name="Set Away"/> - <menu_item_call label="Meşgul" name="Set Busy"/> - </menu> + <menu label="Durum" name="Status"/> <menu_item_call label="L$ Satın Al..." name="Buy and Sell L$"/> <menu_item_call label="Satıcı Giden Kutusu..." name="MerchantOutbox"/> <menu_item_call label="Hesap kontrol paneli..." name="Manage My Account"/> @@ -30,14 +27,18 @@ <menu_item_call label="[APP_NAME]'den Çık" name="Quit"/> </menu> <menu label="İletişim Kur" name="Communicate"> - <menu_item_check label="Sohbet..." name="Nearby Chat"/> + <menu_item_check label="Sohbetler..." name="Conversations"/> + <menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/> <menu_item_check label="Konuş" name="Speak"/> - <menu_item_check label="Ses ayarları..." name="Nearby Voice"/> - <menu_item_check label="Ses şekillendirme..." name="ShowVoice"/> + <menu label="Ses şekillendirme" name="VoiceMorphing"> + <menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/> + <menu_item_check label="Önizleme..." name="Preview"/> + <menu_item_call label="Abone ol..." name="Subscribe"/> + </menu> <menu_item_check label="Mimikler..." name="Gestures"/> - <menu_item_call label="Arkadaşlar" name="My Friends"/> - <menu_item_call label="Gruplar" name="My Groups"/> - <menu_item_call label="Yakındaki kişiler" name="Active Speakers"/> + <menu_item_check label="Arkadaşlar" name="My Friends"/> + <menu_item_check label="Gruplar" name="My Groups"/> + <menu_item_check label="Yakındaki kişiler" name="Active Speakers"/> <menu_item_call label="Engelleme Listesi" name="Block List"/> </menu> <menu label="Dünya" name="World"> @@ -113,7 +114,6 @@ <menu_item_call label="Satın Al" name="Menu Object Buy"/> <menu_item_call label="Al" name="Menu Object Take"/> <menu_item_call label="Kopya Al" name="Take Copy"/> - <menu_item_call label="Envanterime Geri Kaydet" name="Save Object Back to My Inventory"/> <menu_item_call label="Nesne İçeriklerine Geri Kaydet" name="Save Object Back to Object Contents"/> <menu_item_call label="Nesneyi İade Et" name="Return Object back to Owner"/> </menu> @@ -128,6 +128,7 @@ <menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linksets_menu_item"/> <menu_item_call label="Karakterler..." name="pathfinding_characters_menu_item"/> <menu_item_call label="Görüntüleme / test..." name="pathfinding_console_menu_item"/> + <menu_item_call label="Bölgeyi tekrar kaydet" name="pathfinding_rebake_navmesh_item"/> </menu> <menu label="Seçenklr." name="Options"> <menu_item_check label="Gelişmiş İzinleri Göster" name="DebugPermissions"/> @@ -157,6 +158,13 @@ <menu label="Yardım" name="Help"> <menu_item_call label="Nasıl yapılır..." name="How To"/> <menu_item_call label="[SECOND_LIFE] Yardımı" name="Second Life Help"/> + <menu_item_call label="Kullanıcı kılavuzu" name="User’s guide"/> + <menu_item_call label="Bilgi Bankası" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Topluluk Forumları" name="Community Forums"/> + <menu_item_call label="Destek portalı" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE] Haberleri" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE] Blogları" name="Second Life Blogs"/> <menu_item_call label="Kötüye Kullanımı Bildir" name="Report Abuse"/> <menu_item_call label="Hata Bildir" name="Report Bug"/> <menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/> @@ -305,7 +313,7 @@ <menu_item_call label="Seçilen Doku Bilgi Temeli" name="Selected Texture Info Basis"/> <menu_item_check label="Telkafes" name="Wireframe"/> <menu_item_check label="Görünen Nesneler İçin Gölgeleme" name="Object-Object Occlusion"/> - <menu_item_check label="Işıklandırma ve Gölgeler" name="Lighting and Shadows"/> + <menu_item_check label="Işıklandırma ve Gölgeler" name="Advanced Lighting Model"/> <menu_item_check label="Güneş/Ay/Projektörlerden Gelen Gölgeler" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="SSAO ve Gölge Yumuşatma" name="SSAO and Shadow Smoothing"/> <menu_item_check label="GL Hata Ayıklama" name="Debug GL"/> @@ -383,9 +391,14 @@ <menu_item_call label="Test Dişisi" name="Test Female"/> <menu_item_check label="Avatar Seçimine İzin Ver" name="Allow Select Avatar"/> </menu> + <menu label="Animasyon Hızı" name="Animation Speed"> + <menu_item_call label="Tüm Animasyonlar %10 Daha Hızlı" name="All Animations 10 Faster"/> + <menu_item_call label="Tüm Animasyonlar %10 Daha Yavaş" name="All Animations 10 Slower"/> + <menu_item_call label="Tüm Animasyon Hızlarını Sıfırla" name="Reset All Animation Speed"/> + <menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/> + </menu> <menu_item_call label="Parametreleri Varsayılana Zorla" name="Force Params to Default"/> <menu_item_check label="Animasyon Bilgisi" name="Animation Info"/> - <menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/> <menu_item_check label="Şuraya Bak'ı Göster" name="Show Look At"/> <menu_item_check label="Şuraya İşaret Et'i Göster" name="Show Point At"/> <menu_item_check label="Eklem Güncelleştirmeleri İçin Hata Ayıklama" name="Debug Joint Updates"/> diff --git a/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml index 448202df87..448202df87 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml index 438e580cd3..438e580cd3 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml index 9796546559..9796546559 100644..100755 --- a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/tr/mime_types.xml b/indra/newview/skins/default/xui/tr/mime_types.xml index c37f872a65..c37f872a65 100644..100755 --- a/indra/newview/skins/default/xui/tr/mime_types.xml +++ b/indra/newview/skins/default/xui/tr/mime_types.xml diff --git a/indra/newview/skins/default/xui/tr/mime_types_linux.xml b/indra/newview/skins/default/xui/tr/mime_types_linux.xml index c37f872a65..c37f872a65 100644..100755 --- a/indra/newview/skins/default/xui/tr/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/tr/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/tr/mime_types_mac.xml b/indra/newview/skins/default/xui/tr/mime_types_mac.xml index c37f872a65..c37f872a65 100644..100755 --- a/indra/newview/skins/default/xui/tr/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/tr/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 488702f9ca..ad92a4b478 100644..100755 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -516,6 +516,24 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz? </url> <usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/> </notification> + <notification name="AMDOldDriver"> + Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut. Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir. + + Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz? + <url name="url"> + http://support.amd.com/us/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/> + </notification> + <notification name="NVIDIAOldDriver"> + Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut. Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir. + + Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz? + <url name="url"> + http://www.nvidia.com/Download/index.aspx?lang=en-us + </url> + <usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/> + </notification> <notification name="UnknownGPU"> Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor. Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar. Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir. @@ -1546,10 +1564,13 @@ Gruptan ayrılmak istiyor musunuz? Şu anda arkadaşlık teklif edilemiyor. Lütfen biraz sonra tekrar deneyin. <usetemplate name="okbutton" yestext="Tamam"/> </notification> - <notification name="BusyModeSet"> - Durumunuz Meşgul olarak ayarlandı. -Sohbet ve anlık iletiler gizlenecek. Anlık iletilere Meşgul durumu için belirlediğiniz yanıt gönderilecek. Tüm ışınlanma teklifleri reddedilecek. Tüm envanter teklifleri Çöp Kutunuza gidecek. - <usetemplate ignoretext="Durumumu Meşgul olarak değiştiriyorum" name="okignore" yestext="Tamam"/> + <notification name="DoNotDisturbModeSet"> + Rahatsız Etme açık. Gelen iletişimlerle ilgili size bilgi verilmeyecek. + +- Diğer sakinlere sizin Rahatsız Etmeyin yanıtı iletilecektir (Tercihler > Genel içerisinde ayarlanır). +- Işınlanma teklifleri reddedilecektir. +- Sesli aramalar reddedilecektir. + <usetemplate ignoretext="Durumumu Rahatsız Etme moduna değiştiriyorum" name="okignore" yestext="Tamam"/> </notification> <notification name="JoinedTooManyGroupsMember"> Maksimum grup sayısına eriştiniz. Lütfen bu gruba katılmadan önce başka bir gruptan ayrılın ya da bu teklifi reddedin. @@ -2033,6 +2054,10 @@ Envanter öğesi/öğeleri taşınsın mı? Hesap geçmişinizi görüntülemek için [http://secondlife.com/account/ Kontrol Paneli] adresine gitmek istiyor musunuz? <usetemplate ignoretext="Hesap geçmişimi görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Sayfaya git"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + Mevcut bir sohbete bir kişi eklediğinizde yeni bir sohbet oluşturulur. Tüm katılımcılara yeni sohbet bildirimi gönderilir. + <usetemplate ignoretext="Sohbet katılımcılarının eklenmesini doğrula" name="okcancelignore" notext="İptal" yestext="Tamam"/> + </notification> <notification name="ConfirmQuit"> Çıkmak istediğinize emin misiniz? <usetemplate ignoretext="Çıkmadan önce doğrulama iste" name="okcancelignore" notext="Çıkma" yestext="Çık"/> @@ -2107,14 +2132,14 @@ Bu nesneyi seçilen nesne ile değiştirmek istiyor musunuz? <button ignore="Hiçbir Zaman Değiştirme" name="No" text="İptal"/> </form> </notification> - <notification label="Meşgul Durumu Uyarısı" name="BusyModePay"> - Durumunuz Meşgul olarak ayarlanmış; bu da, bu ödemenin karşılığında teklif edilen hiçbir öğeyi almayacağınız anlamına gelir. + <notification label="Rahatsız Etme Modu Uyarısı" name="DoNotDisturbModePay"> + Rahatsız Etme seçeneğini devreye aldınız. Bu ödemenin karşılığında sunulan hiçbir öğeyi almayacaksınız. -Bu işlemi tamamlamadan önce Meşgul durumundan çıkmak ister misiniz? +Bu işlemi tamamlamadan önce Rahatsız Etme'yi kapatmak ister misiniz? <form name="form"> - <ignore name="ignore" text="Meşgul durumundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim."/> - <button ignore="Her zaman Meşgul durumundan çık" name="Yes" text="Tamam"/> - <button ignore="Hiçbir zaman Meşgul durumundan çıkma" name="No" text="İptal"/> + <ignore name="ignore" text="Rahatsız Etmeyin modundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim"/> + <button ignore="Rahatsız Etme Modundan daima çıkılsın" name="Yes" text="Tamam"/> + <button ignore="Rahatsız Etme Modundan asla çıkılmasın" name="No" text="İptal"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2249,11 +2274,8 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we <notification name="GroupNotice"> Konu: [SUBJECT], İleti: [MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> çevrimiçi - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> çevrimdışı + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> durumu: [STATUS] </notification> <notification name="AddSelfFriend"> Çok iyi biri olduğunuza eminiz fakat kendinizi arkadaş olarak ekleyemezsiniz. @@ -2482,13 +2504,6 @@ Burada uçamazsınız. <notification name="DynamicPathfindingDisabled"> Bu bölgede dinamik yol bulma etkin değil. Yol bulma LSL çağrılarını kullanan komut dosyalı nesneler, bu bölgede beklendiiği gibi çalışmayabilir. </notification> - <notification name="PathfindingRebakeNavmesh"> - Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir. Hareket eden başka nesnelerin doğru davranmasını sağlamak için “Bölgeyi yeniden kaydet” düğmesine tıklayın. Daha fazla bilgi edinmek için “Yardım” seçimini yapın. - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="Yardım" ignoretext="Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir." name="okhelpignore" yestext="Tamam"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> Bir hata meydana geldi. Bir ağ veya sunucu sorunu olabilir ya da oluşturma haklarına sahip olmayabilirsiniz. Bazen oturumu kapatıp, tekrar açmak bu sorunu çözer. <usetemplate name="okbutton" yestext="Tamam"/> @@ -2751,7 +2766,7 @@ Kabul ediyor musunuz? <notification name="ScriptQuestionCaution"> Uyarı: '<nolink>[OBJECTNAME]</nolink>' nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir. -Bu türden bir talebin yerinde olması nadir bir durumdur. Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin. +Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin. <form name="form"> <button name="Grant" text="Tam erişime izin ver"/> <button name="Deny" text="Reddet"/> @@ -3333,4 +3348,626 @@ Girişim iptal edildi. [NUM_ITEMS] öğeyi siliyorsunuz. Devam etmek istediğinize emin misiniz? <usetemplate ignoretext="Birden çok öğeyi silmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] sizi dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız. + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] sizi [AV_FREEZE_TIME] saniye boyunca dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız. + </notification> + <notification name="YouFrozeAvatar"> + Avatar donduruldu. + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] sizin dondurulmanızı kaldırdı. + </notification> + <notification name="AvatarUnFrozen"> + Avatar artık dondurulmuş değil. + </notification> + <notification name="AvatarFreezeFailure"> + Dondurma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz. + </notification> + <notification name="AvatarFreezeThaw"> + Dondurmanızın süresi sona erdi, istediğinizi yapabilirsiniz. + </notification> + <notification name="AvatarCantFreeze"> + Üzgünüz, bu kullanıcı dondurulamaz. + </notification> + <notification name="NowOwnObject"> + Artık [OBJECT_NAME] nesnesinin sahibisiniz + </notification> + <notification name="CantRezOnLand"> + [OBJECT_POS] konumunda nesneyi oluşturamazsınız çünkü bu arazinin sahibi buna izin vermiyor. Arazinin sahibini görmek için arazi aracını kullanın. + </notification> + <notification name="RezFailTooManyRequests"> + Çok fazla talep olduğu için nesne oluşturulamadı. + </notification> + <notification name="SitFailCantMove"> + Oturamazsınız çünkü şu anda hareket edemezsiniz. + </notification> + <notification name="SitFailNotAllowedOnLand"> + Oturamazsınız çünkü bu araziye girme izniniz yok. + </notification> + <notification name="SitFailNotSameRegion"> + Daha yakına gelmeyi deneyin. Nesne sizinle aynı bölgede olmadığı için nesnenin üzerine oturulamaz. + </notification> + <notification name="NoNewObjectRegionFull"> + Yeni nesne oluşturulamıyor. Bölge dolu. + </notification> + <notification name="FailedToPlaceObject"> + Belirtilen konuma nesne yerleştirilemedi. Lütfen tekrar deneyin. + </notification> + <notification name="NoOwnNoGardening"> + Sahibi olmadığınız arazide ağaçlar ve çimen oluşturamazsınız. + </notification> + <notification name="NoCopyPermsNoObject"> + '[OBJ_NAME]' nesnesini kopyalama izniniz olmadığı için kopyalama başarılamadı. + </notification> + <notification name="NoTransPermsNoObject"> + '[OBJ_NAME]' nesnesi size aktarılamadığı için kopyalama başarılamadı. + </notification> + <notification name="AddToNavMeshNoCopy"> + '[OBJ_NAME]' nesnesi navmesh'e katkıda bulunduğu için kopyalama başarılamadı. + </notification> + <notification name="DupeWithNoRootsSelected"> + Kök nesne seçili olmayan kopya. + </notification> + <notification name="CantDupeCuzRegionIsFull"> + Nesneler çoğaltılamıyor çünkü bölge dolu. + </notification> + <notification name="CantDupeCuzParcelNotFound"> + Nesneler çoğaltılamadı - Üzerinde oldukları parsel bulunamadı. + </notification> + <notification name="CantCreateCuzParcelFull"> + Nesne oluşturulamıyor çünkü +parsel dolu. + </notification> + <notification name="RezAttemptFailed"> + Bir nesneyi oluşturma girişimi başarısız oldu. + </notification> + <notification name="ToxicInvRezAttemptFailed"> + Bu bölgede hatalara yol açmış olan öğe oluşturulamıyor. + </notification> + <notification name="InvItemIsBlacklisted"> + Bu envanter öğesi kara listeye alınmış. + </notification> + <notification name="NoCanRezObjects"> + Şu anda nesne oluşturmanıza izin verilmiyor. + </notification> + <notification name="LandSearchBlocked"> + Arazi Arama Engellendi. +Çok fazla sayıda arazi aramasını çok hızlı gerçekleştirdiniz. +Lütfen bir dakika sonra tekrar deneyin. + </notification> + <notification name="NotEnoughResourcesToAttach"> + Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil! + </notification> + <notification name="YouDiedAndGotTPHome"> + Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız + </notification> + <notification name="EjectComingSoon"> + Daha fazla burada olma izniniz yok ve ayrılmak için [EJECT_TIME] saniyeniz var. + </notification> + <notification name="NoEnterServerFull"> + Bu bölgeye giremezsiniz çünkü +sunucu dolu. + </notification> + <notification name="SaveBackToInvDisabled"> + Envantere Geri Kaydet devre dışı bırakıldı. + </notification> + <notification name="NoExistNoSaveToContents"> + '[OBJ_NAME]' nesne içeriğine kaydedilemedi, çünkü oluşturulurken temel alınan nesne artık mevcut değil. + </notification> + <notification name="NoModNoSaveToContents"> + '[DEST_NAME]' nesnesini değiştirme izniniz olmadığı için '[OBJ_NAME]' nesne içeriğine kaydedilemedi. + </notification> + <notification name="NoSaveBackToInvDisabled"> + '[OBJ_NAME]' envantere geri kaydedilemez -- bu işlem devre dışı bırakıldı. + </notification> + <notification name="NoCopyNoSelCopy"> + '[OBJ_NAME]' nesnesini kopyalama izniniz olmadığı için seçiminizi kopyalamayazsınız. + </notification> + <notification name="NoTransNoSelCopy"> + '[OBJ_NAME]' nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız. + </notification> + <notification name="NoTransNoCopy"> + '[OBJ_NAME]' nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız. + </notification> + <notification name="NoPermsNoRemoval"> + Benzeticiden '[OBJ_NAME]' nesnesinin kaldırılmasına izinler sistemi izin vermiyor. + </notification> + <notification name="NoModNoSaveSelection"> + '[OBJ_NAME]' nesnesini değiştirme izniniz olmadığı için seçiminizi kaydedemezsiniz. + </notification> + <notification name="NoCopyNoSaveSelection"> + '[OBJ_NAME]' nesnesi kopyalanamaz olduğu için seçiminizi kaydedemezsiniz. + </notification> + <notification name="NoModNoTaking"> + '[OBJ_NAME]' nesnesini değiştirme izniniz olmadığı için seçiminizi alamazsınız. + </notification> + <notification name="RezDestInternalError"> + Dahili Hata: Bilinmeyen hedef türü. + </notification> + <notification name="DeleteFailObjNotFound"> + Nesne bulunamadığı için silme başarılamadı + </notification> + <notification name="SorryCantEjectUser"> + Üzgünüz, bu kullanıcı çıkartılamaz. + </notification> + <notification name="RegionSezNotAHome"> + Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor. + </notification> + <notification name="HomeLocationLimits"> + 'Ana Konum'unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu'nda ayarlayabilirsiniz. + </notification> + <notification name="HomePositionSet"> + Ana konum ayarlandı. + </notification> + <notification name="AvatarEjected"> + Avatar çıkartıldı. + </notification> + <notification name="AvatarEjectFailed"> + Çıkarma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz. + </notification> + <notification name="CantMoveObjectParcelFull"> + [REGION_NAME] bölgesinde '[OBJECT_NAME]' nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü parsel dolu. + </notification> + <notification name="CantMoveObjectParcelPerms"> + [REGION_NAME] bölgesinde '[OBJECT_NAME]' nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bu parselde nesnelerinize izin verilmiyor. + </notification> + <notification name="CantMoveObjectParcelResources"> + [REGION_NAME] bölgesinde '[OBJECT_NAME]' nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor, çünkü bu parselde bu nesne için yeterli kaynak yok. + </notification> + <notification name="CantMoveObjectRegionVersion"> + [REGION_NAME] bölgesinde '[OBJECT_NAME]' nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bölgede çalıştırılan eski versiyon, bölge değiştirme üzerinden bu nesnenin alınmasını desteklemiyor. + </notification> + <notification name="CantMoveObjectNavMesh"> + [REGION_NAME] bölgesinde '[OBJECT_NAME]' nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü navmesh'i bölge sınırları ötesinde değiştiremezsiniz. + </notification> + <notification name="CantMoveObjectWTF"> + Bilinmeyen bir nedenden ötürü [REGION_NAME] bölgesinde '[OBJECT_NAME]' nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor. ([FAILURE_TYPE]) + </notification> + <notification name="NoPermModifyObject"> + Bu nesneyi değiştirme izniniz yok + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + Navmesh'e katkıda bulunan bir nesne için fizik etkinleştirilemez. + </notification> + <notification name="CantEnablePhysKeyframedObj"> + Anahtar karelenmiş nesneler için fizik etkinleştirilemez. + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + Nesne için fizik etkinleştirilemedi -- arazi kaynakları yetersiz. + </notification> + <notification name="CantEnablePhysCostTooGreat"> + Fizik kaynağı maliyeti [MAX_OBJECTS]'dan büyük nesne için fizik etkinleştirilemedi + </notification> + <notification name="PhantomWithConcavePiece"> + Bu nesne fantom olduğu ve navmesh'e katkıda bulunduğu için konkav bir parçaya sahip olamaz. + </notification> + <notification name="UnableAddItem"> + Öğe eklenemedi! + </notification> + <notification name="UnableEditItem"> + Bu düzenlenemiyor! + </notification> + <notification name="NoPermToEdit"> + Bunu düzenleme izni yok. + </notification> + <notification name="NoPermToCopyInventory"> + Bu envanteri kopyalama izni yok. + </notification> + <notification name="CantSaveItemDoesntExist"> + Nesne içeriklerine kaydedilemedi: Öğe artık mevcut değil. + </notification> + <notification name="CantSaveItemAlreadyExists"> + Nesne içeriklerine kaydedilemedi: Bu ada sahip öğe envanterde zaten mevcut + </notification> + <notification name="CantSaveModifyAttachment"> + Nesne içeriklerine kaydedilemedi: Bu, aksesuar izinlerini değiştirmeyi gerektirirdi. + </notification> + <notification name="TooManyScripts"> + Çok fazla komut dosyası. + </notification> + <notification name="UnableAddScript"> + Komut dosyası eklenemedi! + </notification> + <notification name="AssetServerTimeoutObjReturn"> + Varlık sunucusu zamanında yanıt vermedi. Nesne sime iade edildi. + </notification> + <notification name="RegionDisablePhysicsShapes"> + Bu bölgede fiziksel şekiller etkin değil. + </notification> + <notification name="NoModNavmeshAcrossRegions"> + Navmesh'i bölge sınırlarının ötesinde değiştiremezsiniz. + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + Bu nesne türü üzerinde fizik özellikleri ayarlanamaz. + </notification> + <notification name="NoSetRootPrimWithNoShape"> + Kök prim şekilsiz olacak şekilde ayarlanamaz. + </notification> + <notification name="NoRegionSupportPhysMats"> + Bu bölgede fiziksel malzemeler etkin değil. + </notification> + <notification name="OnlyRootPrimPhysMats"> + Sadece kök primlerin fizik malzemeleri ayarlanabilir. + </notification> + <notification name="NoSupportCharacterPhysMats"> + Karakterler üzerinde fizik malzemelerin ayarlanması henüz desteklenmiyor. + </notification> + <notification name="InvalidPhysMatProperty"> + Belirtilen fizik malzemesi özelliklerinden biri veya daha fazlası geçersiz. + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + Bir örgü nesnesinin dikiş türünü değiştiremezsiniz. + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + Bir örgü nesnesinin şeklini değiştiremezsiniz + </notification> + <notification name="FullRegionCantEnter"> + Bu bölgeye giremezsiniz çünkü \nbölge dolu. + </notification> + <notification name="LinkFailedOwnersDiffer"> + Bağlantı başarısız oldu -- sahipler farklı + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + Bağlntı başarılamadı -- navmesh'i bölge sınırlarının ötesinde değiştiremezsiniz. + </notification> + <notification name="LinkFailedNoPermToEdit"> + Düzenleme iznine sahip olmadığınız için bağlantı başarılamadı. + </notification> + <notification name="LinkFailedTooManyPrims"> + Bağlantı başarısız oldu -- çok fazla ilkel öğe var + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + Bağlantı başarısız oldu -- aktarılamayanla kopyalanamayan arasında bağlantı kurulamaz + </notification> + <notification name="LinkFailedNothingLinkable"> + Bağlantı başarısız oldu -- bağlantı verilebilecek bir şey yok. + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + Bağlantı başarısız oldu -- çok fazla yol bulma karakteri var + </notification> + <notification name="LinkFailedInsufficientLand"> + Bağlantı başarısız oldu -- arazi kaynakları yetersiz + </notification> + <notification name="LinkFailedTooMuchPhysics"> + Nesne çok fazla fizik kaynağı kullanıyor -- dinamikleri devre dışı bırakıldı. + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + '[PARCEL_NAME]' parseli üzerindeki '[OBJECT_NAME]' nesnesi tarafından ana konuma ışınlandınız + </notification> + <notification name="TeleportedHomeByObject"> + '[OBJECT_NAME]' nesnesi tarafından ana konuma ışınlandınız + </notification> + <notification name="TeleportedByAttachment"> + You have been teleported by an attachment on [ITEM_ID] + </notification> + <notification name="TeleportedByObjectOnParcel"> + '[PARCEL_NAME]' parseli üzerindeki '[OBJECT_NAME]' nesnesi tarafından ışınlandınız + </notification> + <notification name="TeleportedByObjectOwnedBy"> + Sahibi [OWNER_ID] olan '[OBJECT_NAME]' nesnesi tarafından ışınlandınız + </notification> + <notification name="TeleportedByObjectUnknownUser"> + Bilinmeyen bir sahibi olan '[OBJECT_NAME]' nesnesi tarafından ışınlandınız. + </notification> + <notification name="CantCreateObjectRegionFull"> + Talep edilen nesne oluşturulamıyor. Bölge dolu. + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + Tek bir noktaya birden fazla nesne iliştiremezsiniz. + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + Burada birden fazla nesne oluşturamazsınız. + </notification> + <notification name="UnableToCreateObjTimeOut"> + Talep edilen nesne oluşturulamıyor. Nesne veri tabanında yok. + </notification> + <notification name="UnableToCreateObjUnknown"> + Talep edilen nesne oluşturulamıyor. Talep zaman aşımına uğradı. Lütfen tekrar deneyin. + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + Talep edilen nesne oluşturulamıyor. Lütfen tekrar deneyin. + </notification> + <notification name="RezFailureTookTooLong"> + Oluşturma başarısız oldu, talep edilen nesnenin yüklenmesi çok zaman aldı. + </notification> + <notification name="FailedToPlaceObjAtLoc"> + Belirtilen konuma nesne yerleştirilemedi. Lütfen tekrar deneyin. + </notification> + <notification name="CantCreatePlantsOnLand"> + Bu arazide bitkiler oluşturamazsınız. + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + Nesne geri yüklenemiyor. Dünya konumu bulunamadı. + </notification> + <notification name="CantRezObjectInvalidMeshData"> + Örgü verileri geçersiz olduğu için nesne oluşturulamadı. + </notification> + <notification name="CantRezObjectTooManyScripts"> + Bölgede zaten fazlasıyla komut dosyası olduğu için nesne oluşturulamadı. + </notification> + <notification name="CantCreateObjectNoAccess"> + Erişim ayrıcalıklarınız orada nesne oluşturmanıza izin vermiyor. + </notification> + <notification name="CantCreateObject"> + Şu anda nesne oluşturmanıza izin verilmiyor. + </notification> + <notification name="InvalidObjectParams"> + Geçersiz nesne parametreleri + </notification> + <notification name="CantDuplicateObjectNoAcess"> + Erişim ayrıcalıklarınız burada nesne çoğaltmanıza izin vermiyor. + </notification> + <notification name="CantChangeShape"> + Bu şekli değiştirmenize izin verilmiyor. + </notification> + <notification name="NoAccessToClaimObjects"> + Erişim ayrıcalıklarınız burada nesneler üzerinde hak talebinde bulunmanıza izin vermiyor. + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + Grubunuz adına nesne devretmek için gerekli izne sahip olmadığınız için devretme başarılamadı. + </notification> + <notification name="NoPrivsToBuyObject"> + Erişim ayrıcalıklarınız burada nesneler satın almanıza izin vermiyor. + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + Üzerinde bir avatar oturduğu için nesne iliştirilemiyor. + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + Ağaçlar ve çimen aksesuar olarak giyilemez. + </notification> + <notification name="CantAttachGroupOwnedObjs"> + Sahibi grup olan nesneler iliştirilemiyor. + </notification> + <notification name="CantAttachObjectsNotOwned"> + Sahip olmadığınız nesneleri iliştiremezsiniz. + </notification> + <notification name="CantAttachNavmeshObjects"> + Navmesh'e katkıda bulunan nesneler iliştirilemez. + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + Nesneyi hareket ettirme izniniz olmadığı için nesneyi iliştiremiyorsanız. + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil! + </notification> + <notification name="CantDropItemTrialUser"> + Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin. + </notification> + <notification name="CantDropMeshAttachment"> + Örgü aksesuarlarını düşüremezsiniz. Envantere ayırın, sonra dünyada oluşturun. + </notification> + <notification name="CantDropAttachmentNoPermission"> + Aksesuar düşürülemedi: Burada düşürme izniniz yok. + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + Aksesuar düşürülemedi: Mevcut arazi kaynakları yetersiz. + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + Aksesuarlar düşürülemedi: Mevcut kaynaklar yetersiz. + </notification> + <notification name="CantDropObjectFullParcel"> + Nesne buraya düşürülemez. Parsel dolu. + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + Bu arazi parselinde yasaklandığınız için bu nesneye dokunamıyor/tutamıyorsunuz. + </notification> + <notification name="PlzNarrowDeleteParams"> + Lütfen silme parametrelerinizi daraltın. + </notification> + <notification name="UnableToUploadAsset"> + Varlık karşıya yüklenemiyor. + </notification> + <notification name="CantTeleportCouldNotFindUser"> + Ana konuma ışınlanacak kullanıcı bulunamadı + </notification> + <notification name="GodlikeRequestFailed"> + tanrısal talep başarısız oldu + </notification> + <notification name="GenericRequestFailed"> + genel talep başarısız oldu + </notification> + <notification name="CantUploadPostcard"> + Posta kartı karşıya yüklenemiyor. Daha sonra tekrar deneyin. + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + Grup bildirimi için envanter ayrıntıları alınamadı. + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + Grup bildirimi gönderilemedi -- izin verilmiyor. + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + Grup bildirimi gönderilemedi -- envanter oluşturulamadı. + </notification> + <notification name="CantParceInventoryInNotice"> + Bildirimde envanter ayrıştırılamadı. + </notification> + <notification name="TerrainUploadFailed"> + Yüzeyin karşıya yüklemesi başarılamadı. + </notification> + <notification name="TerrainFileWritten"> + Yüzey dosyası yazıldı. + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + Yüzey dosyası yazıldı, karşıdan yükleme başlatılıyor... + </notification> + <notification name="TerrainBaked"> + Yüzey kaydedildi. + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + Sadece seçilen ilk 10 nesne devre dışı bırakıldı. Gerekiyorsa yenileyin ve ilave seçimler yapın. + </notification> + <notification name="UpdateViewerBuyParcel"> + Bu parseli satın almak için görüntüleyicinizi güncelleştirmelisiniz. + </notification> + <notification name="CantBuyParcelNotForSale"> + Satın alınamıyor, bu parsel satılık değil. + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + Satın alınamıyor, satış fiyatı veya arazi bölgesi değişmiş. + </notification> + <notification name="CantBuyParcelNotAuthorized"> + Bu parsel için yetkili alıcı değilsiniz. + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + Bu parseli satın alamazsınız çünkü zaten satın alım yetkilendirmesi bekliyor + </notification> + <notification name="CantBuildOverflowParcel"> + Burada nesneler inşa edemezsiniz, aksi halde parselin kaynak sınırları aşılır. + </notification> + <notification name="SelectedMultipleOwnedLand"> + Farklı sahiplere ait araziler seçtiniz. Lütfen daha küçük bir alan seçin ve tekrar deneyin. + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + Seçimde birleştirilecek yeterli sayıda lease edilmiş parsel yok. + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + Arazi bölünemedi.\nBirden fazla parsel seçili durumda.\nDaha küçük bir arazi parçası seçmeyi deneyin. + </notification> + <notification name="CantDivideLandCantFindParcel"> + Arazi bölünemiyor.\nParsel bulunamıyor.\nLütfen Yardım -> Hata Bildir ile bildirin... + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + Arazi bölünemiyor. Tüm parsel seçilidir.\nDaha küçük bir arazi parçası seçmeyi deneyin. + </notification> + <notification name="LandHasBeenDivided"> + Arazi bölündü. + </notification> + <notification name="PassPurchased"> + Bir geçiş hakkı satın aldınız. + </notification> + <notification name="RegionDisallowsClassifieds"> + Bölgede seri ilanlara izin verilmiyor. + </notification> + <notification name="LandPassExpireSoon"> + Bu arazi için geçiş hakkınız sona ermek üzere. + </notification> + <notification name="CantSitNoSuitableSurface"> + Üzerinde oturulabilecek uygun bir yüzey yok, başka bir noktayı deneyin. + </notification> + <notification name="CantSitNoRoom"> + Burada oturacak yer yok, başka bir yer deneyin. + </notification> + <notification name="ClaimObjectFailedNoPermission"> + İzniniz olmadığı için nesne üzerinde hak talep etme başarılamadı + </notification> + <notification name="ClaimObjectFailedNoMoney"> + Sahip olduğunuz L$ yeterli olmadığı için nesne üzerinde hak talep etme başarılamadı. + </notification> + <notification name="CantDeedGroupLand"> + Grubun sahip olduğu araziyi devredemezsiniz. + </notification> + <notification name="BuyObjectFailedNoMoney"> + Sahip olduğunuz L$ yeterli olmadığı için nesne satın alma başarılamadı. + </notification> + <notification name="BuyInventoryFailedNoMoney"> + Sahip olduğunuz L$ yeterli olmadığı için envanter satın alma başarılamadı. + </notification> + <notification name="BuyPassFailedNoMoney"> + Sahibi olduğunuz L$ bu araziye geçiş hakkı almanıza yeterli değil. + </notification> + <notification name="CantBuyPassTryAgain"> + Şu anda geçiş hakkı satın alınamıyor. Daha sonra tekrar deneyin. + </notification> + <notification name="CantCreateObjectParcelFull"> + Nesne oluşturulamıyor çünkü \nparsel dolu. + </notification> + <notification name="FailedPlacingObject"> + Belirtilen konuma nesne yerleştirilemedi. Lütfen tekrar deneyin. + </notification> + <notification name="CantCreateLandmarkForEvent"> + Etkinlik için yer imi oluşturulamıyor. + </notification> + <notification name="GodBeatsFreeze"> + Tanrısal güçleriniz dondurmayı devre dışı bıraktı! + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + Özel yetkiler talebi başarısız oldu. Bu talep günlüğe kaydedildi. + </notification> + <notification name="ExpireExplanation"> + Sistem şu anda talebinizi işleyemiyor. Talep zaman aşımına uğradı. + </notification> + <notification name="DieExplanation"> + Sistem talebinizi işleyemiyor. + </notification> + <notification name="AddPrimitiveFailure"> + İlkel öğeyi oluşturmak için yeterli fon yok. + </notification> + <notification name="RezObjectFailure"> + Nesneyi oluşturmak için yeterli fon yok. + </notification> + <notification name="ResetHomePositionNotLegal"> + Ana konum sıfırlandı çünkü Ana konum yasal değildi. + </notification> + <notification name="CantInviteRegionFull"> + Şu anda konumunuza kimseyi davet edemezsiniz çünkü bölge dolu. Daha sonra tekrar deneyin. + </notification> + <notification name="CantSetHomeAtRegion"> + Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor. + </notification> + <notification name="ListValidHomeLocations"> + 'Ana Konum'unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu'nda ayarlayabilirsiniz. + </notification> + <notification name="SetHomePosition"> + Ana konum ayarlandı. + </notification> + <notification name="CantDerezInventoryError"> + Envanter hatasından ötürü nesne oluşturulması geri alınamıyor. + </notification> + <notification name="CantCreateRequestedInv"> + Talep edilen envanter oluşturulamadı. + </notification> + <notification name="CantCreateRequestedInvFolder"> + Talep edilen envanter klasörü oluşturulamadı. + </notification> + <notification name="CantCreateInventory"> + Bu envanter oluşturulamadı. + </notification> + <notification name="CantCreateLandmark"> + Yer imi oluşturulamıyor. + </notification> + <notification name="CantCreateOutfit"> + Dış görünüm şu anda oluşturulamıyor. Bir dakika sonra tekrar deneyin. + </notification> + <notification name="InventoryNotForSale"> + Envanter satılık değil. + </notification> + <notification name="CantFindInvItem"> + Envanter öğesi bulunamıyor. + </notification> + <notification name="CantFindObject"> + Nesne bulunamıyor. + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + Nesnelere para transferleri bölgede şu anda devre dışı bırakılmış durumda. + </notification> + <notification name="CantPayNoAgent"> + Kime ödeme yapılacağı belirlenemedi. + </notification> + <notification name="CantDonateToPublicObjects"> + Kamusal nesnelere L$ veremezsiniz. + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + Dünya içerisindeki nesnede envater oluşturma başarısız oldu. + </notification> + <notification name="UserBalanceOrLandUsageError"> + Dahili bir hata nedeniyle görüntüleyicinizi gerektiği gibi güncelleyemedik. Görüntüleyicinizde gösterilen L$ bakiyesi veya parsel tutarı sunucular üzerinde gerçekteki bakiyenizi yansıtmayabilir. + </notification> + <notification name="LargePrimAgentIntersect"> + Başka oyuncularla kesişen büyük primler oluşturulamaz. Öbür oyuncular hareket ettiğinde lütfen tekrar deneyin. + </notification> + <notification name="PreferenceChatClearLog"> + Bu, geçmiş sohbetlerin günlüklerini ve bu dosyanın tüm yedeklerini silecektir. + <usetemplate ignoretext="Ben geçmiş sohbetlerin günlüğünü silmeden önce doğrula." name="okcancelignore" notext="İptal" yestext="Tamam"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + Bu, tüm geçmiş sohbetlerin dökümlerini silecektir. Geçmiş sohbetlerin listesi bundan etkilenmez. [FOLDER] klasöründe .txt ve txt.backup uzantısına sahip tüm dosyalar silinecektir. + <usetemplate ignoretext="Ben dökümleri silmeden önce doğrulama iste." name="okcancelignore" notext="İptal" yestext="Tamam"/> + </notification> + <notification name="PreferenceChatPathChanged"> + Dosyalar taşınamıyor. Önceki yol geri yüklendi. + <usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/tr/panel_active_object_row.xml b/indra/newview/skins/default/xui/tr/panel_active_object_row.xml index b03ce3ebe5..b03ce3ebe5 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/tr/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml index 602818de94..602818de94 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml index 7542778aca..f330bd85e8 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml @@ -27,5 +27,6 @@ <icon name="permission_edit_mine_icon" tool_tip="Bu arkadaşınız nesnelerinizi düzenleyebilir, silebilir veya alabilir"/> <icon name="permission_map_icon" tool_tip="Bu arkadaşınız haritada sizi bulabilir"/> <icon name="permission_online_icon" tool_tip="Bu arkadaşınız çevrimiçi olduğunuzda sizi görebilir"/> + <button name="info_btn" tool_tip="Ek bilgi"/> <button name="profile_btn" tool_tip="Profili göster"/> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml index 81e04379a1..81e04379a1 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml index 0464b7ec07..87b67e249e 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> - <text name="title_text"> - Listeyi Engelle - </text> - <scroll_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/> - <button label="Kişiyi engelle" name="Block resident..." tool_tip="Engellenecek bir Sakin seç"/> - <button label="Nesneyi ada göre engelle" name="Block object by name..." tool_tip="Ada göre engellenecek bir nesne seç"/> - <button label="Engellemeyi Kaldır" name="Unblock" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="Filtrele" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="Seçilen kişi veya nesne üzerindeki eylemler"/> + <menu_button name="view_btn" tool_tip="Sıralama seçenekleri"/> + <menu_button name="plus_btn" tool_tip="Engellenecek bir Sakin veya nesne seç"/> + <button name="unblock_btn" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/> + </panel> + <block_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml index f991c3b688..f991c3b688 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml index 6c2478cdb7..6c2478cdb7 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml index 5d7006af2f..5d7006af2f 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/tr/panel_chat_header.xml b/indra/newview/skins/default/xui/tr/panel_chat_header.xml index 7916bf5155..7916bf5155 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/tr/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml index a1e8190bbc..a1e8190bbc 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_classified_info.xml b/indra/newview/skins/default/xui/tr/panel_classified_info.xml index d412a03e32..d412a03e32 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/tr/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml index bb5930ee79..bb5930ee79 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml index e60e291ee8..e60e291ee8 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml index 7d70177553..7d70177553 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml new file mode 100644 index 0000000000..c7227f02b6 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="(yükleniyor)"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..79895f9c21 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="Sohbet ses dahil edildi"/> + <icon name="unread_ims_icon" tool_tip="Oturumunuz kapalıyken mesajlar geldi"/> + <button name="delete_btn" tool_tip="Bu girişi kaldır"/> +</panel> diff --git a/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml index 47703136b0..47703136b0 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml index 28e034a357..28e034a357 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml index e3ba806b0d..e3ba806b0d 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml index 7584b754f1..7584b754f1 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml index 42f62b6bbe..42f62b6bbe 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml index be89e94bbf..be89e94bbf 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_hair.xml b/indra/newview/skins/default/xui/tr/panel_edit_hair.xml index f33a6d6402..f33a6d6402 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml index 10bc4278db..10bc4278db 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pants.xml b/indra/newview/skins/default/xui/tr/panel_edit_pants.xml index 06e1b7b4ab..06e1b7b4ab 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_physics.xml b/indra/newview/skins/default/xui/tr/panel_edit_physics.xml index 98dbfd8e42..98dbfd8e42 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml index 98b02d27df..98b02d27df 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml index 21f4e419bc..21f4e419bc 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shape.xml b/indra/newview/skins/default/xui/tr/panel_edit_shape.xml index 57cd9aca75..57cd9aca75 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml index 2dd417afc6..2dd417afc6 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml index 34acb414b0..34acb414b0 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skin.xml b/indra/newview/skins/default/xui/tr/panel_edit_skin.xml index fdf75100ed..fdf75100ed 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml index 2099013fe1..2099013fe1 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_socks.xml b/indra/newview/skins/default/xui/tr/panel_edit_socks.xml index d386814d31..d386814d31 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml index 7f5590a485..7f5590a485 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml index ed003e1adf..ed003e1adf 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml index e0a0be8abb..e0a0be8abb 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml index 7a4a09aaed..7a4a09aaed 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml index 58bb68a5c3..58bb68a5c3 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_general.xml b/indra/newview/skins/default/xui/tr/panel_group_general.xml index 0462026249..0462026249 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml index 32f39da490..32f39da490 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_invite.xml b/indra/newview/skins/default/xui/tr/panel_group_invite.xml index 4ba5761edb..4ba5761edb 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_land_money.xml b/indra/newview/skins/default/xui/tr/panel_group_land_money.xml index e9112a862b..e9112a862b 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml index 2bc597f2fa..f44d2b5e76 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Bilinmiyor"/> + <button name="info_btn" tool_tip="Ek bilgi"/> <button name="profile_btn" tool_tip="Profili göster"/> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_group_notices.xml b/indra/newview/skins/default/xui/tr/panel_group_notices.xml index 179b5fff69..179b5fff69 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_notify.xml b/indra/newview/skins/default/xui/tr/panel_group_notify.xml index bcc5482daa..bcc5482daa 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/tr/panel_group_roles.xml b/indra/newview/skins/default/xui/tr/panel_group_roles.xml index fb03107da8..fb03107da8 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml index aebdc6b48d..aebdc6b48d 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/tr/panel_instant_message.xml b/indra/newview/skins/default/xui/tr/panel_instant_message.xml index cf9bc7fccb..cf9bc7fccb 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/tr/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/tr/panel_inventory_item.xml b/indra/newview/skins/default/xui/tr/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml index 2cad753f25..2cad753f25 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/tr/panel_landmarks.xml b/indra/newview/skins/default/xui/tr/panel_landmarks.xml index d40d0c1543..d40d0c1543 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/tr/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml index 28d316e46b..28d316e46b 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_login.xml +++ b/indra/newview/skins/default/xui/tr/panel_login.xml diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml index c69fb39130..c69fb39130 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/panel_me.xml b/indra/newview/skins/default/xui/tr/panel_me.xml index 4b911c9ce6..4b911c9ce6 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_me.xml +++ b/indra/newview/skins/default/xui/tr/panel_me.xml diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml index 89e78b75de..89e78b75de 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml index 6c0b14a889..6c0b14a889 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml index da3ca1bd29..da3ca1bd29 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml index 8d43e3fb5a..8d43e3fb5a 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml index d238388b0e..d238388b0e 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml index fd954475ac..7d191191c4 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/> <button name="show_nearby_chat" tool_tip="yakın sohbet günlüğünü gösterir/gizler"/> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_media.xml b/indra/newview/skins/default/xui/tr/panel_nearby_media.xml index a654b2ac14..a654b2ac14 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/tr/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml index b893da2a71..b893da2a71 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml index fdc489f375..fdc489f375 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml index a947eee150..a947eee150 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml index 00cd49abcd..00cd49abcd 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml index 550f7ebf10..550f7ebf10 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml index d222f1a6e3..d222f1a6e3 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_list.xml b/indra/newview/skins/default/xui/tr/panel_outfits_list.xml index 60a3576d84..60a3576d84 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml index 462926738f..462926738f 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml index 1a1e53bac2..08efd0aa61 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_people.xml +++ b/indra/newview/skins/default/xui/tr/panel_people.xml @@ -14,81 +14,53 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya <string name="no_filtered_friends_msg"> Aradığınızı bulamadınız mı? [secondlife:///app/search/people/[SEARCH_TERM] Ara] deneyin. </string> - <string name="people_filter_label" value="Kişileri Filtrele"/> - <string name="groups_filter_label" value="Grupları Filtrele"/> <string name="no_filtered_groups_msg" value="Aradığınızı bulamadınız mı? [secondlife:///app/search/groups/[SEARCH_TERM] Ara] deneyin."/> <string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/> <string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/> <string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/> - <filter_editor label="Filtrele" name="filter_input"/> <tab_container name="tabs"> <panel label="YAKIN" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="Seçenklr."/> - <button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="Kişileri Filtrele" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/> + <menu_button name="nearby_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/> + <button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/> + <dnd_button name="nearby_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/> </panel> </panel> - <panel label="ARKADAŞLARIM" name="friends_panel"> + <panel label="ARKADAŞLAR" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="Kişileri Filtrele" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/> + <menu_button name="friends_view_btn" tool_tip="Seçenekleri göster/sırala"/> + <button name="friends_add_btn" tool_tip="Bir sakine arkadaşlık öner"/> + <dnd_button name="friends_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Çevrimiçi"/> <accordion_tab name="tab_all" title="Tümü"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="İlave seçenekleri göster"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Bir Sakine arkadaşlık öner"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="Seçilen kişiyi arkadaş Listenden çıkar"/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="GRUPLARIM" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="Seçenklr."/> - <button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/> - <button name="activate_btn" tool_tip="Seçilen grubu etkinleştir"/> + <panel label="GRUPLAR" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="Grupları Filtrele" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="Seçilen grup üzerindeki eylemler"/> + <menu_button name="groups_view_btn" tool_tip="Seçenekleri göster/sırala"/> + <menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/> + <dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/> </panel> </panel> <panel label="SON" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="Seçenklr."/> - <button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="Kişileri Filtrele" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/> + <menu_button name="recent_view_btn" tool_tip="Seçenekleri göster/sırala"/> + <button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/> + <dnd_button name="recent_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/> </panel> </panel> + <panel label="ENGELLENMİŞ" name="blocked_panel"> + <panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="Profil" name="view_profile_btn" tool_tip="Resim, grup ve diğer Sakin bilgilerini göster"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="Aİ" name="im_btn" tool_tip="Anlık ileti oturumu aç"/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="Ara" name="call_btn" tool_tip="Bu Sakini ara"/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="Paylaş" name="share_btn" tool_tip="Bir envanter öğesini paylaş"/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="Işınla" name="teleport_btn" tool_tip="Işınlama teklif et"/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="Grup Profili" name="group_info_btn" tool_tip="Grup bilgilerini göster"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="Grup Sohbeti" name="chat_btn" tool_tip="Sohbet oturumu aç"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="Grup Araması" name="group_call_btn" tool_tip="Bu grubu ara"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_pick_info.xml b/indra/newview/skins/default/xui/tr/panel_pick_info.xml index f2bbfac232..f2bbfac232 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/tr/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/tr/panel_picks.xml b/indra/newview/skins/default/xui/tr/panel_picks.xml index 26beac7854..26beac7854 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_picks.xml +++ b/indra/newview/skins/default/xui/tr/panel_picks.xml diff --git a/indra/newview/skins/default/xui/tr/panel_place_profile.xml b/indra/newview/skins/default/xui/tr/panel_place_profile.xml index f42cde0ace..f42cde0ace 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/tr/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/tr/panel_places.xml b/indra/newview/skins/default/xui/tr/panel_places.xml index c2a3acf9c5..c2a3acf9c5 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_places.xml +++ b/indra/newview/skins/default/xui/tr/panel_places.xml diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_message.xml b/indra/newview/skins/default/xui/tr/panel_postcard_message.xml index 2361f4c1c3..2361f4c1c3 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/tr/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml index bce0b21b9a..bce0b21b9a 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml index 770cdc6efd..770cdc6efd 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml index 46a4793c53..46a4793c53 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml index 231e8fc5fe..aaeebdfe6e 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Metin Sohbeti" name="chat"> - <text name="font_size"> - Font büyüklüğü: - </text> - <radio_group name="chat_font_size"> - <radio_item label="Küçük" name="radio" value="0"/> - <radio_item label="Orta" name="radio2" value="1"/> - <radio_item label="Büyük" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/> - <check_box label="Çevrimdışı olduğunda Aİ'ler e-posta ile bana gönderilsin" name="send_im_to_email"/> - <check_box label="Düz metin Aİ'ler ve sohbet geçmişini etkinleştir" name="plain_text_chat_history"/> - <check_box label="Balon Sohbeti" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - Aİ'leri şurada göster: - </text> - <text name="requires_restart_label"> - (tekrar başlatma gerekir) - </text> - <radio_group name="chat_window" tool_tip="Anlık İletileri ayrı gezdiricilerde veya çoklu sekmelere sahip tek bir gezdiricide gösterin (tekrar başlatma gerekir)"> - <radio_item label="Ayrı Pencereler" name="radio" value="0"/> - <radio_item label="Sekmeler" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - Gelen sohbet için açılır pencereleri etkinleştir: - </text> - <check_box label="Grup Sohbetleri" name="EnableGroupChatPopups" tool_tip="Bir Grup Sohbet iletisi gönderildiğinde açılır pencereleri görmek için işaretle"/> - <check_box label="Aİ Sohbetleri" name="EnableIMChatPopups" tool_tip="Bir anlık ileti geldiğinde açılır pencereleri görmek için işaretle"/> - <spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/> - <spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/> + <check_box label="Çevrimdışı olduğunda Aİ'ler e-posta ile bana gönderilsin" name="send_im_to_email"/> + <check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/> + <text name="font_size"> + Font büyüklüğü: + </text> + <combo_box name="chat_font_size"> + <item label="Küçük" name="Small" value="0"/> + <item label="Orta" name="Medium" value="1"/> + <item label="Büyük" name="Large" value="2"/> + </combo_box> + <check_box label="Balon Sohbeti" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + Bildirimler + </text> + <text name="friend_ims"> + Arkadaş Aİ'leri: + </text> + <combo_box name="FriendIMOptions"> + <item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mesajı aç" name="PopUpMessage" value="toast"/> + <item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/> + <item label="Hiçbiri" name="None" value="none"/> + </combo_box> + <text name="non_friend_ims"> + Arkadaş harici Aİ'ler: + </text> + <combo_box name="NonFriendIMOptions"> + <item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/> + <item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/> + <item label="Hiçbiri" name="None" value="none"/> + </combo_box> + <text name="conference_ims"> + Konferans Aİ'leri: + </text> + <combo_box name="ConferenceIMOptions"> + <item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mesajı aç" name="PopUpMessage" value="toast"/> + <item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/> + <item label="Hiçbiri" name="None" value="none"/> + </combo_box> + <text name="group_chat"> + Grup sohbeti: + </text> + <combo_box name="GroupChatOptions"> + <item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mesajı aç" name="PopUpMessage" value="toast"/> + <item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/> + <item label="Hiçbiri" name="None" value="none"/> + </combo_box> + <text name="nearby_chat"> + Yakındaki sohbet: + </text> + <combo_box name="NearbyChatOptions"> + <item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/> + <item label="Mesajı aç" name="PopUpMessage" value="toast"/> + <item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/> + <item label="Hiçbiri" name="None" value="none"/> + </combo_box> + <text name="notifications_alert"> + Tüm bildirimleri geçici olarak durdurmak için İletişim Kur > Rahatsız Etme seçeneğini kullanın. + </text> + </panel> + <panel> + <text name="play_sound"> + Sesi çal: + </text> + <check_box label="Yeni sohbet" name="new_conversation"/> + <check_box label="Gelen sesli arama" name="incoming_voice_call"/> + <check_box label="Işınlama teklifi" name="teleport_offer"/> + <check_box label="Envanter teklifi" name="inventory_offer"/> + </panel> + <panel> + <button label="Günlüğü temizle..." name="clear_log"/> + <button label="Dökümleri sil..." name="delete_transcripts"/> + <button label="Gözat..." label_selected="Gözat" name="log_path_button"/> + </panel> <button label="Çeviri..." name="ok_btn"/> <button label="Otomatik Yerine Koy..." name="autoreplace_showgui"/> <button label="Yazım Denetimi Yapılıyor..." name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml index f6e9d0948c..f6e9d0948c 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml index 4a48b1588c..1a13cf8f71 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml @@ -68,9 +68,9 @@ <combo_box.item label="asla" name="item4"/> </combo_box> <text name="text_box3"> - Meşgul durumu cevabı: + Rahatsız Etme yanıtı: </text> - <text_editor name="busy_response"> + <text_editor name="do_not_disturb_response"> log_in_to_change </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml index ddb83ffc69..ddb83ffc69 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml index c35eaec9c3..c35eaec9c3 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml index 9111594979..9111594979 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml index 9d03d9b01d..9d03d9b01d 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml index 9256f1d324..9256f1d324 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml index 0433d03450..0433d03450 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_covenant.xml b/indra/newview/skins/default/xui/tr/panel_region_covenant.xml index 5c46365aea..5c46365aea 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_debug.xml b/indra/newview/skins/default/xui/tr/panel_region_debug.xml index 834ece563f..834ece563f 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_environment.xml b/indra/newview/skins/default/xui/tr/panel_region_environment.xml index 058ea91b70..058ea91b70 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_estate.xml b/indra/newview/skins/default/xui/tr/panel_region_estate.xml index 4a9028643f..4a9028643f 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_general.xml b/indra/newview/skins/default/xui/tr/panel_region_general.xml index 37da0f2cca..37da0f2cca 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml index 3226ee008e..3226ee008e 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/tr/panel_script_ed.xml b/indra/newview/skins/default/xui/tr/panel_script_ed.xml index 7aa1da6fb2..7aa1da6fb2 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/tr/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml index c821dc45c1..c821dc45c1 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml index 2994aba39b..2994aba39b 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml index aabdc7358b..aabdc7358b 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml index b9c39ef8cb..b9c39ef8cb 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml index e3b22c639a..e3b22c639a 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml index 87d7677d73..87d7677d73 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml index fd2e85fce5..fd2e85fce5 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml index e999678a0d..e999678a0d 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml index 334fd52a48..334fd52a48 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml index 982ef2ea3b..982ef2ea3b 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml index 91d07a3b0c..91d07a3b0c 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/indra/newview/skins/default/xui/tr/panel_status_bar.xml index 178cbda4a2..178cbda4a2 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history.xml index f5b1175029..f5b1175029 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/tr/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml index a3a5c70c7e..a3a5c70c7e 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml index b46833d7e6..b46833d7e6 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml index 0c8c7b68b5..0c8c7b68b5 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/tr/panel_world_map.xml b/indra/newview/skins/default/xui/tr/panel_world_map.xml index 5595c13a7c..5595c13a7c 100644..100755 --- a/indra/newview/skins/default/xui/tr/panel_world_map.xml +++ b/indra/newview/skins/default/xui/tr/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml index 655ac64172..655ac64172 100644..100755 --- a/indra/newview/skins/default/xui/tr/role_actions.xml +++ b/indra/newview/skins/default/xui/tr/role_actions.xml diff --git a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml index b632f21cf5..b632f21cf5 100644..100755 --- a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml index 938b5a76d8..938b5a76d8 100644..100755 --- a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml index 86b684c497..86b684c497 100644..100755 --- a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml index b0b9ab7716..9a4cf54fa7 100644..100755 --- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="Nesneyi satın al" name="Buyobject"/> <combo_box.item label="Nesneye ödeme yap" name="Payobject"/> <combo_box.item label="Aç" name="Open"/> + <combo_box.item label="Yakınlaştır" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index 1be8f5974c..155dc8749a 100644..100755 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -137,7 +137,7 @@ Çık </string> <string name="create_account_url"> - http://join.secondlife.com/index.php?lang=tr-TR&sourceid=[sourceid] + http://join.secondlife.com/?sourceid=[sourceid] </string> <string name="LoginFailedViewerNotPermitted"> Kullandığınız görüntüleyici ile artık Second Life'a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin: @@ -619,8 +619,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="AvatarAway"> Uzakta </string> - <string name="AvatarBusy"> - Meşgul + <string name="AvatarDoNotDisturb"> + Rahatsız Etme </string> <string name="AvatarMuted"> Engellenmiş @@ -856,6 +856,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="ST_NO_JOINT"> KÖK veya EKLEM bulunamıyor. </string> + <string name="NearbyChatTitle"> + Yakındaki sohbet + </string> + <string name="NearbyChatLabel"> + (Yakındaki sohbet) + </string> <string name="whisper"> fısıldar: </string> @@ -919,12 +925,15 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="ControlYourCamera"> Kameranızı kontrol etmek </string> - <string name="TeleportYourAgent"> - Sizi ışınlama - </string> <string name="NotConnected"> Bağlı Değil </string> + <string name="AgentNameSubst"> + (Siz) + </string> + <string name="TeleportYourAgent"> + Sizi ışınlama + </string> <string name="SIM_ACCESS_PG"> Genel </string> @@ -1006,18 +1015,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="dictionary_files"> Sözlükler </string> - <string name="AvatarSetNotAway"> - Uzakta Değil - </string> - <string name="AvatarSetAway"> - Uzakta - </string> - <string name="AvatarSetNotBusy"> - Meşgul Değil - </string> - <string name="AvatarSetBusy"> - Meşgul - </string> <string name="shape"> Şekil </string> @@ -1986,8 +1983,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="PanelContentsNewScript"> Yeni Komut Dosyası </string> - <string name="BusyModeResponseDefault"> - İleti gönderdiğiniz Sakin 'meşgul modu'nda, bu da rahatsız edilmek istemediği anlamına geliyor. İletiniz daha sonra incelenmesi için kendisine ait Aİ panelinde gösterilecektir. + <string name="DoNotDisturbModeResponseDefault"> + Bu sakin "Rahatsız Etme" seçeneğini devreye almış, mesajınızı sonra görecek. </string> <string name="MuteByName"> (Adına göre) @@ -2100,9 +2097,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="GroupMoneyDate"> [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc] </string> - <string name="ViewerObjectContents"> - İçerik - </string> <string name="AcquiredItems"> Alınan Öğeler </string> @@ -3874,7 +3868,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun. Genel Bölge </string> <string name="LocationCtrlSeeAVsTooltip"> - Bu parselin dışında avatarlar görünür durumda ve sohbete izin veriliyor + Bu parselin içindeki avatarlar, bu parselin dışındaki avatarlar tarafından görülemez veya işitilemez </string> <string name="LocationCtrlPathfindingDirtyTooltip"> Bölge yeniden kaydedilinceye kadar hareket eden nesneler bu bölgede doğru davranmayabilir. @@ -3951,6 +3945,12 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun. <string name="IM_unblock_only_groups_friends"> Bu mesajı görmek için Tercihler/Gizlilik'de 'Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin' seçeneğinin işaretini kaldırmalısınız. </string> + <string name="OnlineStatus"> + Çevrimiçi + </string> + <string name="OfflineStatus"> + Çevrimdışı + </string> <string name="answered_call"> Aramanız yanıtlandı </string> @@ -3960,6 +3960,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun. <string name="you_joined_call"> Sesli aramaya katıldınız </string> + <string name="you_auto_rejected_call-im"> + "Rahatsız Etme" seçeneğini devredeyken sesli aramayı otomatik olarak reddettiniz. + </string> <string name="name_started_call"> [NAME] bir sesli arama başlattı </string> @@ -3976,7 +3979,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun. Bağlanıyor... </string> <string name="conference-title"> - Özel Konferans + Çok kişili sohbet </string> <string name="conference-title-incoming"> [AGENT_NAME] ile konferans @@ -4866,6 +4869,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="Command_Chat_Label"> Sohbet </string> + <string name="Command_Conversations_Label"> + Sohbetler + </string> <string name="Command_Compass_Label"> Pusula </string> @@ -4941,6 +4947,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="Command_Chat_Tooltip"> Metin kullanarak yakındaki kişilerle sohbet etmek </string> + <string name="Command_Conversations_Tooltip"> + Herkesle sohbet et + </string> <string name="Command_Compass_Tooltip"> Pusula </string> @@ -5070,4 +5079,13 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="UserDictionary"> [User] </string> + <string name="logging_calls_disabled_log_empty"> + Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler > Sohbet altında "Kaydet: Sadece günlük" veya "Kaydet: Günlük ve dökümler" seçimini yapın. + </string> + <string name="logging_calls_disabled_log_not_empty"> + Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler > Sohbet altında "Kaydet: Sadece günlük" veya "Kaydet: Günlük ve dökümler" seçimini yapın. + </string> + <string name="logging_calls_enabled_log_empty"> + Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir. + </string> </strings> diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml index 20d09b1ee2..20d09b1ee2 100644..100755 --- a/indra/newview/skins/default/xui/tr/teleport_strings.xml +++ b/indra/newview/skins/default/xui/tr/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml index e2d6a2b004..e2d6a2b004 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_aaa.xml +++ b/indra/newview/skins/default/xui/zh/floater_aaa.xml diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml index 643881e416..643881e416 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_about.xml +++ b/indra/newview/skins/default/xui/zh/floater_about.xml diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml index 76db621951..76db621951 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_about_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/zh/floater_activeim.xml b/indra/newview/skins/default/xui/zh/floater_activeim.xml index b148ca8eb4..b148ca8eb4 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_activeim.xml +++ b/indra/newview/skins/default/xui/zh/floater_activeim.xml diff --git a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml index 76cb9079c4..76cb9079c4 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml index ffb0de8a68..ffb0de8a68 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml index 1b589a92cc..1b589a92cc 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_auction.xml +++ b/indra/newview/skins/default/xui/zh/floater_auction.xml diff --git a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml index 4ee07e6295..4ee07e6295 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml +++ b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml diff --git a/indra/newview/skins/default/xui/zh/floater_avatar.xml b/indra/newview/skins/default/xui/zh/floater_avatar.xml index 55b1a95a41..55b1a95a41 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_avatar.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml index c19369c859..c19369c859 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml index 69309c96de..69309c96de 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml index 83e10804d6..83e10804d6 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_beacons.xml +++ b/indra/newview/skins/default/xui/zh/floater_beacons.xml diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml index 29f36b461c..29f36b461c 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_build_options.xml +++ b/indra/newview/skins/default/xui/zh/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml index 59751a3a46..59751a3a46 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml index 2d76a9f831..2d76a9f831 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_bumps.xml +++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml index 5e4153de66..5e4153de66 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml index fcf2800728..fcf2800728 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml index ec700ad7af..ec700ad7af 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml index 51bbd6a561..51bbd6a561 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml index ff4a1feedb..ff4a1feedb 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml index becb7b9546..becb7b9546 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_camera.xml +++ b/indra/newview/skins/default/xui/zh/floater_camera.xml diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml index f1a69a7688..f1a69a7688 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml index 9977bfc828..9977bfc828 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml index fa7b795d4f..fa7b795d4f 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/zh/floater_color_picker.xml diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml new file mode 100644 index 0000000000..37115a0310 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_conversation_log" title="交談記錄"> + <panel name="buttons_panel"> + <filter_editor label="人員過濾器" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="檢視/排序的選項"/> + <menu_button name="conversations_gear_btn" tool_tip="對所選的人或群組採取動作"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml new file mode 100644 index 0000000000..ece263f440 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="preview_conversation" title="交談："> + <floater.string name="Title"> + 交談：[NAME] + </floater.string> + <text name="page_label" value="頁"/> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml index 7d08fe8af2..7d08fe8af2 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_critical.xml +++ b/indra/newview/skins/default/xui/zh/floater_critical.xml diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml index 4aafb31952..4aafb31952 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_destinations.xml b/indra/newview/skins/default/xui/zh/floater_destinations.xml index f50a6a631a..f50a6a631a 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_destinations.xml +++ b/indra/newview/skins/default/xui/zh/floater_destinations.xml diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml index aa71bba769..aa71bba769 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_display_name.xml +++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml diff --git a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml index b84a4027ea..b84a4027ea 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml diff --git a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml index 1ff832cdc4..1ff832cdc4 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml index 7943866e72..7943866e72 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml diff --git a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml index 1c6f2f936d..1c6f2f936d 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_event.xml b/indra/newview/skins/default/xui/zh/floater_event.xml index 7175731fef..7175731fef 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_event.xml +++ b/indra/newview/skins/default/xui/zh/floater_event.xml diff --git a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml index 871849305c..871849305c 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml diff --git a/indra/newview/skins/default/xui/zh/floater_font_test.xml b/indra/newview/skins/default/xui/zh/floater_font_test.xml index ec83c51eb3..ec83c51eb3 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_font_test.xml +++ b/indra/newview/skins/default/xui/zh/floater_font_test.xml diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml index e7b1ed1de3..e7b1ed1de3 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_gesture.xml +++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml index 69a6eadc8c..69a6eadc8c 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml index 9e3bb88ac0..9e3bb88ac0 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_help_browser.xml b/indra/newview/skins/default/xui/zh/floater_help_browser.xml index e605d5f19c..e605d5f19c 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/zh/floater_help_browser.xml diff --git a/indra/newview/skins/default/xui/zh/floater_how_to.xml b/indra/newview/skins/default/xui/zh/floater_how_to.xml index e033327165..e033327165 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_how_to.xml +++ b/indra/newview/skins/default/xui/zh/floater_how_to.xml diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml index a788961e95..a788961e95 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_hud.xml +++ b/indra/newview/skins/default/xui/zh/floater_hud.xml diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml index 2d66c659fe..84ad869100 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_im_container.xml +++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml @@ -1,2 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="交談"/> +<multi_floater name="floater_im_box" title="交談"> + <string name="collapse_icon" value="Conv_toolbar_collapse"/> + <string name="expand_icon" value="Conv_toolbar_expand"/> + <layout_stack name="conversations_stack"> + <layout_panel name="conversations_layout_panel"> + <layout_stack name="conversations_pane_buttons_stack"> + <layout_panel name="conversations_pane_buttons_expanded"> + <menu_button name="sort_btn" tool_tip="檢視/排序的選項"/> + <button name="add_btn" tool_tip="開始新的交談"/> + <button name="speak_btn" tool_tip="用麥克風和大家交談"/> + </layout_panel> + <layout_panel name="conversations_pane_buttons_collapsed"> + <button name="expand_collapse_btn" tool_tip="縮疊/展開這個清單"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="messages_layout_panel"> + <panel_container name="im_box_tab_container"> + <panel name="stub_panel"> + <button name="stub_collapse_btn" tool_tip="縮疊這一區塊"/> + <text name="stub_textbox"> + 這個交談另開了新視窗。 [secondlife:/// 把它收回來] + </text> + </panel> + </panel_container> + </layout_panel> + </layout_stack> +</multi_floater> diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml index 808a0b6720..d63c5507db 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_im_session.xml +++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml @@ -1,8 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> - <layout_stack name="im_panels"> - <layout_panel> - <line_editor label="至" name="chat_editor"/> - </layout_panel> - </layout_stack> + <floater.string name="call_btn_start"> + Conv_toolbar_open_call + </floater.string> + <floater.string name="call_btn_stop"> + Conv_toolbar_hang_up + </floater.string> + <floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/> + <floater.string name="expandline_icon" value="Conv_expand_one_line"/> + <floater.string name="collapse_icon" value="Conv_toolbar_collapse"/> + <floater.string name="expand_icon" value="Conv_toolbar_expand"/> + <floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/> + <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string name="participant_added" value="[NAME] 已受邀加入交談。"/> + <floater.string name="multiple_participants_added" value="[NAME] 已受邀加入交談。"/> + <floater.string name="tooltip_to_separate_window" value="為這個交談另開新視窗"/> + <floater.string name="tooltip_to_main_window" value="將這個交談移回到主視窗"/> + <floater.string name="start_call_button_tooltip" value="建立語音通聯"/> + <floater.string name="end_call_button_tooltip" value="切斷語音通聯"/> + <floater.string name="expcol_button_not_tearoff_tooltip" value="縮疊這一區塊"/> + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="縮疊參與者清單"/> + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單"/> + <view name="contents_view"> + <layout_stack name="main_stack"> + <layout_panel name="toolbar_panel"> + <menu_button name="view_options_btn" tool_tip="檢視/排序的選項"/> + <menu_button name="gear_btn" tool_tip="對選取的人採取動作"/> + <button name="add_btn" tool_tip="新增某人到這個交談"/> + <button name="voice_call_btn" tool_tip="建立語音通聯"/> + <button name="close_btn" tool_tip="結束這個交談"/> + <button name="expand_collapse_btn" tool_tip="縮疊/展開這個框"/> + </layout_panel> + <layout_panel name="body_panel"> + <layout_stack name="im_panels"> + <layout_panel name="right_part_holder"> + <panel name="trnsAndChat_panel"> + <layout_stack name="translate_and_chat_stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="翻譯聊天內容" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="chat_layout_panel"> + <layout_stack name="input_panels"> + <layout_panel name="input_editor_layout_panel"> + <chat_editor label="至" name="chat_editor"/> + </layout_panel> + <layout_panel name="input_button_layout_panel"> + <button name="minz_btn" tool_tip="顯示/隱藏訊息框"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> + </view> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml index d2de37fa6a..d2de37fa6a 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_import_collada.xml b/indra/newview/skins/default/xui/zh/floater_import_collada.xml index 8f6b476ccf..8f6b476ccf 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/zh/floater_import_collada.xml diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml index 45a003d3c8..4526eff21d 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml @@ -25,9 +25,9 @@ 是否離開 [CURRENT_CHAT] 並加入這個語音聊天？ </floater.string> <text name="question"> - 是否離開 [CURRENT_CHAT] 並加入這個語音聊天？ + 如果接聽，你將切斷目前的語音交談。 </text> - <button label="接受" label_selected="接受" name="Accept"/> - <button label="拒絕" label_selected="拒絕" name="Reject"/> - <button label="開始 IM" name="Start IM"/> + <button label="接聽" label_selected="接聽" name="Accept"/> + <button label="忽視" label_selected="忽視" name="Reject"/> + <button label="不接聽但開啟 IM" name="Start IM"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml index 4e1f4b24fd..4e1f4b24fd 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_inspect.xml +++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml index 6998df75f3..6998df75f3 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml index 6d1d18b67c..6d1d18b67c 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/zh/floater_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml index e0b2cf5a1c..e0b2cf5a1c 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_joystick.xml +++ b/indra/newview/skins/default/xui/zh/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml index e9a082288a..e9a082288a 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml index aae2cfb466..aae2cfb466 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml index f4a7ba5cca..f4a7ba5cca 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml diff --git a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml index b10a480b06..b10a480b06 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/zh/floater_map.xml b/indra/newview/skins/default/xui/zh/floater_map.xml index 8a030b3b3f..8a030b3b3f 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_map.xml +++ b/indra/newview/skins/default/xui/zh/floater_map.xml diff --git a/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml index 7f030924e1..7f030924e1 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/zh/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/zh/floater_media_settings.xml b/indra/newview/skins/default/xui/zh/floater_media_settings.xml index 3984095a65..3984095a65 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_media_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml index 350254e385..350254e385 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml diff --git a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml index 6b6126c8e0..6b6126c8e0 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml index 22b3d3b065..22b3d3b065 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml index 0b267e8fae..0b267e8fae 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_moveview.xml +++ b/indra/newview/skins/default/xui/zh/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml index 64998d3e28..64998d3e28 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml index 217ea5d1f9..217ea5d1f9 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml diff --git a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml index 187597f4eb..187597f4eb 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/floater_notification.xml b/indra/newview/skins/default/xui/zh/floater_notification.xml index 1e0e207fb0..1e0e207fb0 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_notification.xml +++ b/indra/newview/skins/default/xui/zh/floater_notification.xml diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml index 3478761b0b..3478761b0b 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml diff --git a/indra/newview/skins/default/xui/zh/floater_object_weights.xml b/indra/newview/skins/default/xui/zh/floater_object_weights.xml index d2875b24b4..d2875b24b4 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/zh/floater_object_weights.xml diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml index ce6869487a..ce6869487a 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_openobject.xml +++ b/indra/newview/skins/default/xui/zh/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml index 9e786edcdd..9e786edcdd 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml index e57374f4d7..e57374f4d7 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml index e6971d111f..e6971d111f 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml index be009b54d8..d0978b8b01 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml @@ -71,7 +71,7 @@ <text name="show_label"> 顯示： </text> - <check_box label="世界" name="show_world"/> + <check_box label="測試" name="show_world"/> <check_box label="僅限可移動的" name="show_world_movables_only"/> <check_box label="導航網面" name="show_navmesh"/> <text name="show_walkability_label"> diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml index 22e5d2e846..22e5d2e846 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml index 69427605a4..69427605a4 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_pay.xml +++ b/indra/newview/skins/default/xui/zh/floater_pay.xml diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml index 7d20b44bc6..7d20b44bc6 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/zh/floater_people.xml b/indra/newview/skins/default/xui/zh/floater_people.xml index f629f2f184..f629f2f184 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_people.xml +++ b/indra/newview/skins/default/xui/zh/floater_people.xml diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml index b38db59ff3..b38db59ff3 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml diff --git a/indra/newview/skins/default/xui/zh/floater_picks.xml b/indra/newview/skins/default/xui/zh/floater_picks.xml index a8bfcd99e3..a8bfcd99e3 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_picks.xml +++ b/indra/newview/skins/default/xui/zh/floater_picks.xml diff --git a/indra/newview/skins/default/xui/zh/floater_places.xml b/indra/newview/skins/default/xui/zh/floater_places.xml index f6ef1e2141..f6ef1e2141 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_places.xml +++ b/indra/newview/skins/default/xui/zh/floater_places.xml diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml index 2908f7c1d0..2908f7c1d0 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_post_process.xml +++ b/indra/newview/skins/default/xui/zh/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml index b0a27e8c1f..b0a27e8c1f 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_preferences.xml +++ b/indra/newview/skins/default/xui/zh/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml index f91d5c5cdb..f91d5c5cdb 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml index b94d67b7ef..b94d67b7ef 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml index be75038a09..be75038a09 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml index 9447939801..9447939801 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml index d04428a36d..d04428a36d 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml index c56b1c2987..c56b1c2987 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml index 078b490655..078b490655 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml +++ b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml index b810af0145..b810af0145 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml index 4ff2a3fc79..4ff2a3fc79 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml diff --git a/indra/newview/skins/default/xui/zh/floater_region_info.xml b/indra/newview/skins/default/xui/zh/floater_region_info.xml index 0e4879f555..0e4879f555 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_region_info.xml +++ b/indra/newview/skins/default/xui/zh/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml index 8dbc216ab5..8dbc216ab5 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml index 5b3500c018..5b3500c018 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml index e70a30fa24..e70a30fa24 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_limits.xml b/indra/newview/skins/default/xui/zh/floater_script_limits.xml index 7cd2c8e6c6..7cd2c8e6c6 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_limits.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml index a6c6c76181..a6c6c76181 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml index 7c253aa74c..7c253aa74c 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml index 11c23d933f..11c23d933f 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_script_search.xml +++ b/indra/newview/skins/default/xui/zh/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml index 3e85a529ae..3e85a529ae 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_search.xml +++ b/indra/newview/skins/default/xui/zh/floater_search.xml diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml index 231eb48b04..231eb48b04 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_select_key.xml +++ b/indra/newview/skins/default/xui/zh/floater_select_key.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml index 9030f7eb63..9030f7eb63 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml index 56a31bc292..56a31bc292 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml index e86e20829f..e86e20829f 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml index 0374c74f8f..0374c74f8f 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml index c942ba1cfb..c942ba1cfb 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml index f5a6665844..f5a6665844 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml +++ b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml index 6094a3bbce..6094a3bbce 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml +++ b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml index 4af5684ec1..4af5684ec1 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_stats.xml +++ b/indra/newview/skins/default/xui/zh/floater_stats.xml diff --git a/indra/newview/skins/default/xui/zh/floater_sys_well.xml b/indra/newview/skins/default/xui/zh/floater_sys_well.xml index ca0b7f146d..ca0b7f146d 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/zh/floater_sys_well.xml diff --git a/indra/newview/skins/default/xui/zh/floater_telehub.xml b/indra/newview/skins/default/xui/zh/floater_telehub.xml index ee21a78e90..ee21a78e90 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_telehub.xml +++ b/indra/newview/skins/default/xui/zh/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml index 68fcf3f7f7..68fcf3f7f7 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml diff --git a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml index 83b6df6fe5..83b6df6fe5 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml +++ b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml index e909a67e2c..02d06323d4 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml @@ -19,7 +19,7 @@ <button label="預設" label_selected="預設" name="Default"/> <button label="空白" label_selected="空白" name="Blank"/> <button label="無" label_selected="無" name="None"/> - <check_box initial_value="true" label="實時預覽" name="apply_immediate_check"/> + <check_box initial_value="true" label="立即套用" name="apply_immediate_check"/> <text name="preview_disabled" value="已停用預覽"/> <filter_editor label="材質過濾器" name="inventory search editor"/> <check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/> diff --git a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml index 0dcac17a75..0dcac17a75 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml +++ b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml index 33c9ebeaf0..33c9ebeaf0 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_tools.xml +++ b/indra/newview/skins/default/xui/zh/floater_tools.xml diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml index 6f50be0855..6f50be0855 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml index 3da9445a55..3da9445a55 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_tos.xml +++ b/indra/newview/skins/default/xui/zh/floater_tos.xml diff --git a/indra/newview/skins/default/xui/zh/floater_toybox.xml b/indra/newview/skins/default/xui/zh/floater_toybox.xml index fc6b6ea611..fc6b6ea611 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_toybox.xml +++ b/indra/newview/skins/default/xui/zh/floater_toybox.xml diff --git a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml index fe84872557..fe84872557 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml index 9e3f3cd47d..9e3f3cd47d 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml new file mode 100644 index 0000000000..96caa7d333 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_volume" title="語音聊天音量"> + <slider label="語音聊天" name="chat_voice_volume"/> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml index a3a7679957..a3a7679957 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml index 81e0204262..aab5fa6028 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="地點" name="voice_effects" title="語音變聲"> +<floater label="地點" name="voice_effects" title="語音變聲試聽"> <string name="no_voice_effect"> （無變聲效果） </string> diff --git a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml new file mode 100644 index 0000000000..4260a8d331 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="floater_voice_volume" title="音量"> + <slider name="volume_slider" tool_tip="音量" value="0.5"/> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml index be6bf8bb27..be6bf8bb27 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_web_content.xml +++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml index 967e36ead7..967e36ead7 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml index 3942f72d76..3942f72d76 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_window_size.xml +++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml index 4cd05ebaa0..4cd05ebaa0 100644..100755 --- a/indra/newview/skins/default/xui/zh/floater_world_map.xml +++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_avatar.xml b/indra/newview/skins/default/xui/zh/inspect_avatar.xml index ef10e5d2d0..ef10e5d2d0 100644..100755 --- a/indra/newview/skins/default/xui/zh/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/zh/inspect_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml index ca5ccc3349..ca5ccc3349 100644..100755 --- a/indra/newview/skins/default/xui/zh/inspect_group.xml +++ b/indra/newview/skins/default/xui/zh/inspect_group.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_object.xml b/indra/newview/skins/default/xui/zh/inspect_object.xml index 377b8b7c78..377b8b7c78 100644..100755 --- a/indra/newview/skins/default/xui/zh/inspect_object.xml +++ b/indra/newview/skins/default/xui/zh/inspect_object.xml diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml index b8418fc8a1..b8418fc8a1 100644..100755 --- a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml diff --git a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml index 3c8c3e4a31..3c8c3e4a31 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml index 885c4b9add..885c4b9add 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml index c14a98c64b..c14a98c64b 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml index ef0986a13b..ef0986a13b 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml index 1d02464748..1d02464748 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml index 32757bbff6..32757bbff6 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml index 876fef16df..876fef16df 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml index d06207b19d..d06207b19d 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml index 300ff47b12..300ff47b12 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml index cd069f9601..eb7093a23c 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="Gear COF"> <menu label="新衣服" name="COF.Gear.New_Clothes"/> - <menu label="新身體部位" name="COF.Geear.New_Body_Parts"/> + <menu label="新身體部位" name="COF.Gear.New_Body_Parts"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml new file mode 100644 index 0000000000..507255d0c0 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_conversation.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_participant"> + <menu_item_call label="關閉交談" name="close_conversation"/> + <menu_item_call label="開啟語音交談" name="open_voice_conversation"/> + <menu_item_call label="切斷語音交談" name="disconnect_from_voice"/> + <menu_item_call label="察看檔案" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/> + <menu_item_call label="語音通話" name="voice_call"/> + <menu_item_call label="聊天歷史……" name="chat_history"/> + <menu_item_call label="新增朋友" name="add_friend"/> + <menu_item_call label="移除朋友" name="remove_friend"/> + <menu_item_call label="移除朋友" name="remove_friends"/> + <menu_item_call label="邀請加入群組……" name="invite_to_group"/> + <menu_item_call label="放大" name="zoom_in"/> + <menu_item_call label="地圖" name="map"/> + <menu_item_call label="分享" name="share"/> + <menu_item_call label="支付" name="pay"/> + <menu_item_check label="禁止語音" name="block_unblock"/> + <menu_item_check label="禁止文字" name="MuteText"/> + <menu_item_call label="群組檔案" name="group_profile"/> + <menu_item_call label="啟用群組" name="activate_group"/> + <menu_item_call label="離開群組" name="leave_group"/> + <context_menu label="主持人選項" name="Moderator Options"> + <menu_item_check label="允許文字聊天" name="AllowTextChat"/> + <menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="所有人消音" name="ModerateVoiceMute"/> + <menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/> + </context_menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml new file mode 100644 index 0000000000..49e91417e8 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Context Menu"> + <menu_item_call label="IM…" name="IM"/> + <menu_item_call label="語音通話…" name="Call"/> + <menu_item_call label="開啟聊天歷史…" name="Chat history"/> + <menu_item_call label="察看檔案" name="View Profile"/> + <menu_item_call label="發給瞬間傳送請求" name="teleport"/> + <menu_item_call label="加為朋友" name="add_friend"/> + <menu_item_call label="移除朋友" name="remove_friend"/> + <menu_item_call label="邀請加入群組……" name="Invite"/> + <menu_item_call label="地圖" name="Map"/> + <menu_item_call label="分享" name="Share"/> + <menu_item_call label="支付" name="Pay"/> + <menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml new file mode 100644 index 0000000000..3fa99a5cd7 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_conversation_view"> + <menu_item_check label="依名稱排序" name="sort_by_name"/> + <menu_item_check label="依日期排序" name="sort_by_date"/> + <menu_item_check label="將朋友列在頂端" name="sort_by_friends"/> + <menu_item_call label="檢視附近聊天歷史……" name="view_nearby_chat_history"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml index bda640e5f3..bda640e5f3 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_edit.xml +++ b/indra/newview/skins/default/xui/zh/menu_edit.xml diff --git a/indra/newview/skins/default/xui/zh/menu_favorites.xml b/indra/newview/skins/default/xui/zh/menu_favorites.xml index a01412ce1c..a01412ce1c 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_favorites.xml +++ b/indra/newview/skins/default/xui/zh/menu_favorites.xml diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml index 5a38197e4c..5a38197e4c 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml index d4a5a69104..d4a5a69104 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/zh/menu_group_plus.xml diff --git a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml index 3f6820cb32..3f6820cb32 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml new file mode 100644 index 0000000000..815b0b594c --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="Conversation Gear Menu"> + <menu_item_call label="察看檔案" name="View Profile"/> + <menu_item_call label="加為朋友" name="Add Friend"/> + <menu_item_call label="移除朋友" name="remove_friend"/> + <menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/> + <menu_item_call label="邀請加入群組……" name="invite_to_group"/> + <menu_item_call label="聊天歷史……" name="chat_history"/> + <menu_item_call label="放大" name="zoom_in"/> + <menu_item_call label="地圖" name="map"/> + <menu_item_call label="分享" name="Share"/> + <menu_item_call label="支付" name="Pay"/> + <menu_item_check label="禁止語音" name="Block/Unblock"/> + <menu_item_check label="禁止文字" name="MuteText"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml new file mode 100644 index 0000000000..a7006e524a --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_modes"> + <menu_item_check label="精簡視野" name="compact_view"/> + <menu_item_check label="全展視野" name="expanded_view"/> + <menu_item_check label="顯示時間" name="IMShowTime"/> + <menu_item_check label="一對一交談時顯示名字" name="IMShowNamesForP2PConv"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_im_well_button.xml b/indra/newview/skins/default/xui/zh/menu_im_well_button.xml deleted file mode 100644 index 4b9b4b2758..0000000000 --- a/indra/newview/skins/default/xui/zh/menu_im_well_button.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="IM Well Button Context Menu"> - <menu_item_call label="全部關閉" name="Close All"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml index 85417d554e..85417d554e 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml index 4664fcb027..4664fcb027 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml index 636bdaae09..636bdaae09 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml index f4e886ff67..f4e886ff67 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml index abff0f64ac..abff0f64ac 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml index c48ee0c9be..c48ee0c9be 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml index 577e5988f8..577e5988f8 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml +++ b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml index 7f745ffaa7..7f745ffaa7 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_inventory.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml index 30bf5a7e75..30bf5a7e75 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml index 8ad0e7324f..8ad0e7324f 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/zh/menu_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml index a87ab77dd0..a87ab77dd0 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_land.xml +++ b/indra/newview/skins/default/xui/zh/menu_land.xml diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml index 7372b223cf..7372b223cf 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_landmark.xml +++ b/indra/newview/skins/default/xui/zh/menu_landmark.xml diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml index c327b132a1..c327b132a1 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_login.xml +++ b/indra/newview/skins/default/xui/zh/menu_login.xml diff --git a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml index d222d7f658..d222d7f658 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml +++ b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_mini_map.xml b/indra/newview/skins/default/xui/zh/menu_mini_map.xml index 7fd629471a..7fd629471a 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/zh/menu_mini_map.xml diff --git a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml index 5f82685632..5f82685632 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml +++ b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml diff --git a/indra/newview/skins/default/xui/zh/menu_navbar.xml b/indra/newview/skins/default/xui/zh/menu_navbar.xml index d8356e6277..d8356e6277 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_navbar.xml +++ b/indra/newview/skins/default/xui/zh/menu_navbar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml index ce5f5b6e17..ce5f5b6e17 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml index b629f73584..b629f73584 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml +++ b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml index 4282c1e131..4282c1e131 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_object.xml +++ b/indra/newview/skins/default/xui/zh/menu_object.xml diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml index f4f93b0bdc..9655732f2e 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml @@ -2,4 +2,6 @@ <menu name="Object Icon Menu"> <menu_item_call label="物件檔案..." name="Object Profile"/> <menu_item_call label="封鎖…" name="Block"/> + <menu_item_call label="顯示在地圖上" name="show_on_map"/> + <menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/> </menu> diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml index e85b4b7182..258d0d6b20 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml @@ -23,6 +23,8 @@ <menu_item_call label="新頭髮" name="New Hair"/> <menu_item_call label="新眼睛" name="New Eyes"/> </menu> + <menu_item_call label="展開全部資料夾" name="expand"/> + <menu_item_call label="摺疊全部資料夾" name="collapse"/> <menu_item_call label="裝扮更名" name="rename"/> <menu_item_call label="刪除裝扮" name="delete_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml index a4614710f4..a4614710f4 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml index 2456e9fee9..2456e9fee9 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml diff --git a/indra/newview/skins/default/xui/zh/menu_participant_view.xml b/indra/newview/skins/default/xui/zh/menu_participant_view.xml new file mode 100644 index 0000000000..8b35860eb6 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_participant_view.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="participant_manu_view"> + <menu_item_check label="將交談依類型排序" name="sort_sessions_by_type"/> + <menu_item_check label="將交談依名字排序" name="sort_sessions_by_name"/> + <menu_item_check label="將交談依最近活動排序" name="sort_sessions_by_recent"/> + <menu_item_check label="將參與者依名字排序" name="sort_participants_by_name"/> + <menu_item_check label="將參與者依最近活動排序" name="sort_participants_by_recent"/> + <menu_item_call label="聊天偏好設定……" name="chat_preferences"/> + <menu_item_call label="隱私偏好設定……" name="privacy_preferences"/> + <menu_item_check label="交談記錄……" name="Conversation"/> + <menu_item_check label="翻譯附近的聊天" name="Translate_chat"/> + <menu_item_check label="翻譯設定……" name="Translation_settings"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml new file mode 100644 index 0000000000..9a2a3c403d --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_gear"> + <menu_item_call label="解除封鎖" name="unblock"/> + <menu_item_call label="檔案..." name="profile"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml new file mode 100644 index 0000000000..a8cecb4e14 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_plus"> + <menu_item_call label="按名字封鎖居民……" name="block_resident_by_name"/> + <menu_item_call label="依名稱封鎖物件" name="block_object_by_name"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml new file mode 100644 index 0000000000..5b70cd35bf --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_blocked_view"> + <menu_item_check label="依名稱排序" name="sort_by_name"/> + <menu_item_check label="依類型排序" name="sort_by_type"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml new file mode 100644 index 0000000000..4251238fd9 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="依名稱排序" name="sort_name"/> + <menu_item_check label="依狀態排序" name="sort_status"/> + <menu_item_check label="察看人群圖示" name="view_icons"/> + <menu_item_check label="察看許可權限" name="view_permissions"/> + <menu_item_check label="檢視交談記錄……" name="view_conversation"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml index 59854faeec..59854faeec 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml index 5768c554c9..b4b566f5ca 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml @@ -2,7 +2,7 @@ <menu name="menu_group_plus"> <menu_item_call label="察看資訊" name="View Info"/> <menu_item_call label="聊天" name="Chat"/> - <menu_item_call label="通話" name="Call"/> + <menu_item_call label="語音通話" name="Call"/> <menu_item_call label="啟動" name="Activate"/> <menu_item_call label="退出" name="Leave"/> </menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml new file mode 100644 index 0000000000..05a30d938f --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="顯示群組圖示" name="Display Group Icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml index 1be5c69b94..1be5c69b94 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml index 38d5f3d324..d25adaf8fb 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> - <menu_item_call label="察看檔案" name="View Profile"/> - <menu_item_call label="加為朋友" name="Add Friend"/> - <menu_item_call label="移除朋友" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="通話" name="Call"/> - <menu_item_call label="地圖" name="Map"/> - <menu_item_call label="分享" name="Share"/> - <menu_item_call label="支付" name="Pay"/> - <menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/> - <menu_item_call label="發給瞬間傳送請求" name="teleport"/> + <menu_item_call label="察看檔案" name="view_profile"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/> + <menu_item_call label="語音通話" name="voice_call"/> + <menu_item_call label="檢視聊天歷史……" name="chat_history"/> + <menu_item_call label="加為朋友" name="add_friend"/> + <menu_item_call label="移除朋友" name="remove_friend"/> + <menu_item_call label="邀請加入群組……" name="invite_to_group"/> + <menu_item_call label="放大" name="zoom_in"/> + <menu_item_call label="地圖" name="map"/> + <menu_item_call label="分享" name="share"/> + <menu_item_call label="支付" name="pay"/> + <menu_item_check label="封鎖/不再封鎖" name="block_unblock"/> </context_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml index 1380e0b307..69f0eab7dc 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> - <menu_item_call label="加為朋友" name="Add Friends"/> - <menu_item_call label="移除朋友" name="Remove Friend"/> - <menu_item_call label="IM" name="IM"/> - <menu_item_call label="通話" name="Call"/> - <menu_item_call label="分享" name="Share"/> - <menu_item_call label="支付" name="Pay"/> - <menu_item_call label="發給瞬間傳送請求" name="teleport"/> + <menu_item_call label="加為朋友" name="add_friends"/> + <menu_item_call label="移除朋友" name="remove_friends"/> + <menu_item_call label="IM" name="im"/> + <menu_item_call label="通話" name="call"/> + <menu_item_call label="分享" name="share"/> + <menu_item_call label="支付" name="pay"/> + <menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml new file mode 100644 index 0000000000..9bc5638472 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/> + <menu_item_check label="依名稱排序" name="sort_name"/> + <menu_item_check label="依距離排序" name="sort_distance"/> + <menu_item_check label="察看人群圖示" name="view_icons"/> + <menu_item_check label="察看地圖" name="view_map"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml index 6cb0ac3c89..6cb0ac3c89 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml new file mode 100644 index 0000000000..382234c3ec --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_group_plus"> + <menu_item_check label="依最近排序" name="sort_most"/> + <menu_item_check label="依名稱排序" name="sort_name"/> + <menu_item_check label="察看人群圖示" name="view_icons"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml index 5b6e7335d6..5b6e7335d6 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml diff --git a/indra/newview/skins/default/xui/zh/menu_picks.xml b/indra/newview/skins/default/xui/zh/menu_picks.xml index 2e88ac2d39..2e88ac2d39 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_picks.xml +++ b/indra/newview/skins/default/xui/zh/menu_picks.xml diff --git a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml index 80922a757d..80922a757d 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml index 3733baf119..3733baf119 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_place.xml +++ b/indra/newview/skins/default/xui/zh/menu_place.xml diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml index 95f8917234..95f8917234 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml index 27f0c7ebdb..27f0c7ebdb 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml index f23d970b78..f23d970b78 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml index f77e7090c4..f77e7090c4 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml diff --git a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml index 53ee6ee977..53ee6ee977 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml diff --git a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml index e9817dd2bc..e9817dd2bc 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/zh/menu_slurl.xml b/indra/newview/skins/default/xui/zh/menu_slurl.xml index 2cea18105a..2cea18105a 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_slurl.xml +++ b/indra/newview/skins/default/xui/zh/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml index d188840588..d188840588 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml index c636e108ad..c636e108ad 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml index 90e8098348..90e8098348 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml diff --git a/indra/newview/skins/default/xui/zh/menu_text_editor.xml b/indra/newview/skins/default/xui/zh/menu_text_editor.xml index febc0b8b67..febc0b8b67 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/zh/menu_text_editor.xml diff --git a/indra/newview/skins/default/xui/zh/menu_toolbars.xml b/indra/newview/skins/default/xui/zh/menu_toolbars.xml index d318992dd5..d318992dd5 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/zh/menu_toolbars.xml diff --git a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml index b07e9890ff..b07e9890ff 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml +++ b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml index 592bb6561e..72629822d4 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="顯示居民檔案" name="show_agent"/> + <menu_item_call label="察看檔案" name="show_agent"/> + <menu_item_call label="送出 IM..." name="send_im"/> + <menu_item_call label="加為朋友..." name="add_friend"/> <menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/> <menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml index de97bb731f..de97bb731f 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_group.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_group.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_http.xml b/indra/newview/skins/default/xui/zh/menu_url_http.xml index 861cbfb975..861cbfb975 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_http.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_http.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml index 8eaea68c6f..8eaea68c6f 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_map.xml b/indra/newview/skins/default/xui/zh/menu_url_map.xml index fbda20fd2f..fbda20fd2f 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_map.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_map.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml index b344b21c62..9f3a9d58ff 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="顯示物件資訊" name="show_object"/> + <menu_item_call label="物件檔案..." name="show_object"/> <menu_item_call label="顯示在地圖上" name="show_on_map"/> <menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/> <menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/> diff --git a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml index 330c28238f..330c28238f 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml index 6ce9a10d3e..6ce9a10d3e 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml index 2fb247f250..2fb247f250 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml diff --git a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml index e3e4b4716d..e3e4b4716d 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index ac0e9e7e35..d4844b191b 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -16,10 +16,7 @@ <menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/> <menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/> </menu> - <menu label="狀態" name="Status"> - <menu_item_call label="離開" name="Set Away"/> - <menu_item_call label="忙碌" name="Set Busy"/> - </menu> + <menu label="狀態" name="Status"/> <menu_item_call label="購買 L$…" name="Buy and Sell L$"/> <menu_item_call label="商家發件匣…" name="MerchantOutbox"/> <menu_item_call label="帳戶主控臺…" name="Manage My Account"/> @@ -30,14 +27,18 @@ <menu_item_call label="退出 [APP_NAME]" name="Quit"/> </menu> <menu label="溝通" name="Communicate"> - <menu_item_check label="聊天…" name="Nearby Chat"/> + <menu_item_check label="交談……" name="Conversations"/> + <menu_item_check label="附近的聊天……" name="Nearby Chat"/> <menu_item_check label="說話" name="Speak"/> - <menu_item_check label="語音設定…" name="Nearby Voice"/> - <menu_item_check label="語音變聲…" name="ShowVoice"/> + <menu label="語音變聲" name="VoiceMorphing"> + <menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/> + <menu_item_check label="預覽……" name="Preview"/> + <menu_item_call label="訂閱……" name="Subscribe"/> + </menu> <menu_item_check label="姿勢…" name="Gestures"/> - <menu_item_call label="朋友" name="My Friends"/> - <menu_item_call label="群組" name="My Groups"/> - <menu_item_call label="附近的人群" name="Active Speakers"/> + <menu_item_check label="朋友" name="My Friends"/> + <menu_item_check label="群組" name="My Groups"/> + <menu_item_check label="附近的人群" name="Active Speakers"/> <menu_item_call label="封鎖清單" name="Block List"/> </menu> <menu label="世界" name="World"> @@ -113,7 +114,6 @@ <menu_item_call label="購買" name="Menu Object Buy"/> <menu_item_call label="取得" name="Menu Object Take"/> <menu_item_call label="取得副本" name="Take Copy"/> - <menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/> <menu_item_call label="回存到物件內容" name="Save Object Back to Object Contents"/> <menu_item_call label="退回物件" name="Return Object back to Owner"/> </menu> @@ -128,6 +128,7 @@ <menu_item_call label="聯結集…" name="pathfinding_linksets_menu_item"/> <menu_item_call label="角色…" name="pathfinding_characters_menu_item"/> <menu_item_call label="察看 / 測試…" name="pathfinding_console_menu_item"/> + <menu_item_call label="重新產出地區" name="pathfinding_rebake_navmesh_item"/> </menu> <menu label="選項" name="Options"> <menu_item_check label="顯示進階權限" name="DebugPermissions"/> @@ -157,6 +158,13 @@ <menu label="幫助" name="Help"> <menu_item_call label="簡易教學…" name="How To"/> <menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/> + <menu_item_call label="使用者指南" name="User’s guide"/> + <menu_item_call label="知識庫" name="Knowledge Base"/> + <menu_item_call label="維基" name="Wiki"/> + <menu_item_call label="社群論壇" name="Community Forums"/> + <menu_item_call label="支援入口" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE] 最新消息" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/> <menu_item_call label="違規舉報" name="Report Abuse"/> <menu_item_call label="回報臭蟲" name="Report Bug"/> <menu_item_call label="關於 [APP_NAME]" name="About Second Life"/> @@ -305,7 +313,7 @@ <menu_item_call label="已選取材質資訊基礎" name="Selected Texture Info Basis"/> <menu_item_check label="線框" name="Wireframe"/> <menu_item_check label="物件導向的遮蔽" name="Object-Object Occlusion"/> - <menu_item_check label="光線和陰影" name="Lighting and Shadows"/> + <menu_item_check label="光線和陰影" name="Advanced Lighting Model"/> <menu_item_check label="來自日/月/投影物的陰影" name="Shadows from Sun/Moon/Projectors"/> <menu_item_check label="屏幕空間環境光遮蔽和陰影平滑技術" name="SSAO and Shadow Smoothing"/> <menu_item_check label="GL 除錯" name="Debug GL"/> @@ -383,9 +391,14 @@ <menu_item_call label="女性測試" name="Test Female"/> <menu_item_check label="允許選擇化身" name="Allow Select Avatar"/> </menu> + <menu label="動作速度" name="Animation Speed"> + <menu_item_call label="所有動作加快 10%" name="All Animations 10 Faster"/> + <menu_item_call label="所有動作放慢 10%" name="All Animations 10 Slower"/> + <menu_item_call label="將所有動作恢復原速" name="Reset All Animation Speed"/> + <menu_item_check label="慢動作" name="Slow Motion Animations"/> + </menu> <menu_item_call label="強制參數為預設值" name="Force Params to Default"/> <menu_item_check label="動作資訊" name="Animation Info"/> - <menu_item_check label="慢動作" name="Slow Motion Animations"/> <menu_item_check label="顯示注視在" name="Show Look At"/> <menu_item_check label="顯示指向在" name="Show Point At"/> <menu_item_check label="除錯旋軸的更新" name="Debug Joint Updates"/> diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml index 576f7f3b73..576f7f3b73 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml index 6184f956d1..6184f956d1 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml index c7d2853995..c7d2853995 100644..100755 --- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml index 70af2d2f19..70af2d2f19 100644..100755 --- a/indra/newview/skins/default/xui/zh/mime_types.xml +++ b/indra/newview/skins/default/xui/zh/mime_types.xml diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml index 70af2d2f19..70af2d2f19 100644..100755 --- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml index 70af2d2f19..70af2d2f19 100644..100755 --- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 9fecf2c104..59be26d43b 100644..100755 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -516,6 +516,24 @@ </url> <usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/> </notification> + <notification name="AMDOldDriver"> + 你的顯示卡很可能有新版的驅動程式。 更新顯示驅動程式會大幅改善性能。 + + 前往 [_URL] 察看是否有新版驅動程式？ + <url name="url"> + http://support.amd.com/us/Pages/AMDSupportHub.aspx + </url> + <usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/> + </notification> + <notification name="NVIDIAOldDriver"> + 你的顯示卡很可能有新版的驅動程式。 更新顯示驅動程式會大幅改善性能。 + + 前往 [_URL] 察看是否有新版驅動程式？ + <url name="url"> + http://www.nvidia.com/Download/index.aspx?lang=tw + </url> + <usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/> + </notification> <notification name="UnknownGPU"> 你的系統含有一個 [APP_NAME] 無法辨認的顯像卡。 原因很可能是 [APP_NAME] 尚未針對新硬體完成測試。 這大概不會出問題，但你可能需要調整顯像設定。 @@ -1536,10 +1554,13 @@ SHA1 指紋：[MD5_DIGEST] 此時無法發出交友邀請。 請稍候再試。 <usetemplate name="okbutton" yestext="確定"/> </notification> - <notification name="BusyModeSet"> - 已設為忙碌模式。 -聊天和即時訊息內容將被隱藏。 即時訊息發送者將收到你的「忙碌模式」回應。 所有的瞬間傳送邀請都將被婉拒。 此時起送給你的收納區物項都將丟入垃圾桶。 - <usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/> + <notification name="DoNotDisturbModeSet"> + 「請勿打擾」模式目前是開啟狀態。 你將不會收到任何發給你的訊息通知。 + +- 其他居民將收到你的「請勿打擾」回應（回應內容設於「偏好設定 > 一般設定」）。 +- 所有瞬間傳送的邀請都將被婉拒。 +- 所有語音來電都將拒絕接聽。 + <usetemplate ignoretext="我變更我的狀態為「請勿打擾」模式" name="okignore" yestext="確定"/> </notification> <notification name="JoinedTooManyGroupsMember"> 你已達可同時加入的群組數上限。 請先離開另一個群組再加入這一個，或婉拒加入邀請。 @@ -2024,6 +2045,10 @@ SHA1 指紋：[MD5_DIGEST] 前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄？ <usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/> </notification> + <notification name="ConfirmAddingChatParticipants"> + 新增一個人到現有的交談，等於建立新的交談。 所有交談者將會收到新交談通知。 + <usetemplate ignoretext="確認新增聊天者" name="okcancelignore" notext="取消" yestext="確定"/> + </notification> <notification name="ConfirmQuit"> 你確定你要結束退出？ <usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/> @@ -2098,14 +2123,14 @@ SHA1 指紋：[MD5_DIGEST] <button ignore="絕不取代" name="No" text="取消"/> </form> </notification> - <notification label="忙碌模式警告" name="BusyModePay"> - 你現在處於忙碌模式，這意味著你付費後仍將不會收到任何物項。 + <notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay"> + 你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。 -你是否要先離開忙碌模式，再完成交易？ +是否要在完成交易之前，先關閉「請勿打擾」模式？ <form name="form"> - <ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/> - <button ignore="總是離開忙碌模式" name="Yes" text="確定"/> - <button ignore="絕不離開忙碌模式" name="No" text="取消"/> + <ignore name="ignore" text="我即將在「請勿打擾」模式下，試圖付錢給他人或給一個物件"/> + <button ignore="固定選擇離開「請勿打擾」模式" name="Yes" text="確定"/> + <button ignore="永不離開「請勿打擾」模式" name="No" text="取消"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> @@ -2240,11 +2265,8 @@ SHA1 指紋：[MD5_DIGEST] <notification name="GroupNotice"> 主旨：[SUBJECT]，訊息：[MESSAGE] </notification> - <notification name="FriendOnline"> - <nolink>[NAME]</nolink> 目前在線上 - </notification> - <notification name="FriendOffline"> - <nolink>[NAME]</nolink> 目前離線 + <notification name="FriendOnlineOffline"> + <nolink>[NAME]</nolink> 目前狀態為 [STATUS] </notification> <notification name="AddSelfFriend"> 雖然你人很好，你還是不能把自己加為朋友。 @@ -2472,13 +2494,6 @@ SHA1 指紋：[MD5_DIGEST] <notification name="DynamicPathfindingDisabled"> 這地區並未啟用動態尋徑。 使用尋徑 LSL 呼叫的帶腳本物件，在此地區可能無法正常運作。 </notification> - <notification name="PathfindingRebakeNavmesh"> - 更改本地區的某些物件將導致其他移動物件的運作發生問題。 要使移動物件正常運作，請點按「重新產出地區」按鈕。 欲獲知詳情請選擇「幫助」。 - <url name="url"> - http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer - </url> - <usetemplate helptext="幫助" ignoretext="更改本地區的某些物件將導致其他移動物件的運作發生問題。" name="okhelpignore" yestext="確定"/> - </notification> <notification name="PathfindingCannotRebakeNavmesh"> 發生錯誤。 問題可能出在網路或伺服器，也可能因為你無權建製物件。 有時，只要登出再登入即能解決這類問題。 <usetemplate name="okbutton" yestext="確定"/> @@ -2741,7 +2756,7 @@ SHA1 指紋：[MD5_DIGEST] <notification name="ScriptQuestionCaution"> 警告：物件 '<nolink>[OBJECTNAME]</nolink>' 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶，它將可在任何時候從你帳戶取走資金，或完全加以清空，或定期取走部分資金，且不會發出警告。 -這很可能是種不當的要求。 如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。 +如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。 <form name="form"> <button name="Grant" text="允許全權存取"/> <button name="Deny" text="拒絕"/> @@ -3323,4 +3338,633 @@ SHA1 指紋：[MD5_DIGEST] 你正在刪除 [NUM_ITEMS] 個物項。 你確定你要繼續？ <usetemplate ignoretext="確定要刪除多個物項？" name="okcancelignore" notext="否" yestext="是"/> </notification> + <notification name="AvatarFrozen"> + [AV_FREEZER] 凍結了你。 你此時無法移動或與周遭互動。 + </notification> + <notification name="AvatarFrozenDuration"> + [AV_FREEZER] 凍結了你 [AV_FREEZE_TIME] 秒鐘。 你此時無法移動或與周遭互動。 + </notification> + <notification name="YouFrozeAvatar"> + 化身已凍結。 + </notification> + <notification name="AvatarHasUnFrozenYou"> + [AV_FREEZER] 解除了對你的凍結。 + </notification> + <notification name="AvatarUnFrozen"> + 化身已解除凍結。 + </notification> + <notification name="AvatarFreezeFailure"> + 凍結失敗，因為你在該地段沒有管理員權限。 + </notification> + <notification name="AvatarFreezeThaw"> + 你遭凍結的時間已過，請恢復正常活動。 + </notification> + <notification name="AvatarCantFreeze"> + 抱歉，無法凍結該用戶。 + </notification> + <notification name="NowOwnObject"> + 你現在是物件 [OBJECT_NAME] 的所有人 + </notification> + <notification name="CantRezOnLand"> + 無法在 [OBJECT_POS] 產生物件，因為這土地的所有人不允許。 請用土地工具察看所有人。 + </notification> + <notification name="RezFailTooManyRequests"> + 無法產生物件，此刻要求數目過多。 + </notification> + <notification name="SitFailCantMove"> + 你無法坐下，因為此刻你不能移動。 + </notification> + <notification name="SitFailNotAllowedOnLand"> + 你不能坐下，因為該土地不允許。 + </notification> + <notification name="SitFailNotSameRegion"> + 請挨近一點。 無法坐在物件上，因為 +它和你不在同一個地區。 + </notification> + <notification name="NoNewObjectRegionFull"> + 無法建立新物件。 地區已滿載。 + </notification> + <notification name="FailedToPlaceObject"> + 無法將物件置於指定地點。 請再試一次。 + </notification> + <notification name="NoOwnNoGardening"> + 你無法在別人的土地上建立樹和草。 + </notification> + <notification name="NoCopyPermsNoObject"> + 複製失敗，你無權複製物件 '[OBJ_NAME]'。 + </notification> + <notification name="NoTransPermsNoObject"> + 複製失敗，因為物件 '[OBJ_NAME]' 無法轉移給你。 + </notification> + <notification name="AddToNavMeshNoCopy"> + 複製失敗，因為物件 '[OBJ_NAME]' 對導航網面有貢獻。 + </notification> + <notification name="DupeWithNoRootsSelected"> + 選取了沒有根的重覆物件。 + </notification> + <notification name="CantDupeCuzRegionIsFull"> + 無法複製物件，因為地區滿載。 + </notification> + <notification name="CantDupeCuzParcelNotFound"> + 無法複製物件，找不到它們所在的地段。 + </notification> + <notification name="CantCreateCuzParcelFull"> + 無法建立物件，因為 +地段滿載。 + </notification> + <notification name="RezAttemptFailed"> + 試圖產生物件失敗。 + </notification> + <notification name="ToxicInvRezAttemptFailed"> + 無法建立已在此地區造成問題的物件。 + </notification> + <notification name="InvItemIsBlacklisted"> + 該收納區物項已被列入黑名單。 + </notification> + <notification name="NoCanRezObjects"> + 你此時無權建立物件。 + </notification> + <notification name="LandSearchBlocked"> + 土地搜尋遭禁。 +你在短時間內進行了太多次土地搜尋。 +請稍候再試。 + </notification> + <notification name="NotEnoughResourcesToAttach"> + 腳本資源不足，無法附著物件！ + </notification> + <notification name="YouDiedAndGotTPHome"> + 你已經死亡並且被瞬間傳送回你的家的位置 + </notification> + <notification name="EjectComingSoon"> + 你不再允許待在這裡，必須在 [EJECT_TIME] 秒內離開。 + </notification> + <notification name="NoEnterServerFull"> + 你無法進入這地區，因為 +伺服器滿載。 + </notification> + <notification name="SaveBackToInvDisabled"> + 「儲存回收納區」功能已被停用。 + </notification> + <notification name="NoExistNoSaveToContents"> + 無法將 '[OBJ_NAME]' 儲存到物件內容，因為產生它的來源物件已不存在。 + </notification> + <notification name="NoModNoSaveToContents"> + 無法儲存 [OBJ_NAME] 到物件內容，你無權修改 '[DEST_NAME]' 物件。 + </notification> + <notification name="NoSaveBackToInvDisabled"> + 無法將 '[OBJ_NAME]' 儲存回收納區，此動作已被停用。 + </notification> + <notification name="NoCopyNoSelCopy"> + 無法複製你所選的，因為你無權複製物件 '[OBJ_NAME]'。 + </notification> + <notification name="NoTransNoSelCopy"> + 無法選取複製，因為物件 '[OBJ_NAME]' 不可轉移。 + </notification> + <notification name="NoTransNoCopy"> + 無法選取複製，因為物件 '[OBJ_NAME]' 不可轉移。 + </notification> + <notification name="NoPermsNoRemoval"> + 權限系統不允許從模擬器移除物件 '[OBJ_NAME]'。 + </notification> + <notification name="NoModNoSaveSelection"> + 無法儲存你所選的，因為你無權修改 '[OBJ_NAME]' 物件。 + </notification> + <notification name="NoCopyNoSaveSelection"> + 無法儲存你所選的，因為物件 '[OBJ_NAME]' 不可複製。 + </notification> + <notification name="NoModNoTaking"> + 無法拿取你所選的，因為你無權修改 '[OBJ_NAME]' 物件。 + </notification> + <notification name="RezDestInternalError"> + 內部錯誤：未知的目的地類型。 + </notification> + <notification name="DeleteFailObjNotFound"> + 刪除失敗，因為找不到物件 + </notification> + <notification name="SorryCantEjectUser"> + 抱歉，無法踢出該用戶。 + </notification> + <notification name="RegionSezNotAHome"> + 此地區不許你在此設定「我的家」。 + </notification> + <notification name="HomeLocationLimits"> + 你只能在自己的土地或大陸資訊中心上設定「我的家」。 + </notification> + <notification name="HomePositionSet"> + 我的家位置已定。 + </notification> + <notification name="AvatarEjected"> + 化身已被踢出。 + </notification> + <notification name="AvatarEjectFailed"> + 踢出失敗，因為你在該地段沒有管理員權限。 + </notification> + <notification name="CantMoveObjectParcelFull"> + 無法移動 '[OBJECT_NAME]' 物件到 +地區 [REGION_NAME] 的 [OBJ_POSITION]，因為該目標地段已滿載。 + </notification> + <notification name="CantMoveObjectParcelPerms"> + 無法移動 '[OBJECT_NAME]' 物件到 +地區 [REGION_NAME] 的 [OBJ_POSITION]，因為此地段不允許你的物件。 + </notification> + <notification name="CantMoveObjectParcelResources"> + 無法移動 '[OBJECT_NAME]' 物件到 + [REGION_NAME] 地區的 [OBJ_POSITION]，因為此地段資源不足容納此物件。 + </notification> + <notification name="CantMoveObjectRegionVersion"> + 無法移動 '[OBJECT_NAME]' 物件到 + [REGION_NAME] 地區的 [OBJ_POSITION]，因為該地區所執行的軟體版本過舊，不支援跨地區接受這個物件。 + </notification> + <notification name="CantMoveObjectNavMesh"> + 無法移動 '[OBJECT_NAME]' 物件到 +地區 [REGION_NAME] 的 [OBJ_POSITION]，因為你不得修改跨越地區界限的導航網面。 + </notification> + <notification name="CantMoveObjectWTF"> + 無法移動 '[OBJECT_NAME]' 物件到 +地區 [REGION_NAME] 的 [OBJ_POSITION]，原因不明。 （[FAILURE_TYPE]） + </notification> + <notification name="NoPermModifyObject"> + 你無權變更該物件 + </notification> + <notification name="CantEnablePhysObjContributesToNav"> + 對導航網面有貢獻的物件，無法啟用物理。 + </notification> + <notification name="CantEnablePhysKeyframedObj"> + 鍵格動畫物件無法啟用物理。 + </notification> + <notification name="CantEnablePhysNotEnoughLandResources"> + 無法啟用物件的物理——土地資源不足。 + </notification> + <notification name="CantEnablePhysCostTooGreat"> + 物件的物理資源成本超過 [MAX_OBJECTS]，無法啟用物理 + </notification> + <notification name="PhantomWithConcavePiece"> + 此物件不得有凹面部件，因為物件是幻影物件，對導航網面有貢獻。 + </notification> + <notification name="UnableAddItem"> + 無法新增項目！ + </notification> + <notification name="UnableEditItem"> + 無法編輯這項目！ + </notification> + <notification name="NoPermToEdit"> + 無權編輯這項目。 + </notification> + <notification name="NoPermToCopyInventory"> + 無權複製該收納區。 + </notification> + <notification name="CantSaveItemDoesntExist"> + 無法儲存到物件內容：該項目已不存在。 + </notification> + <notification name="CantSaveItemAlreadyExists"> + 無法儲存到物件內容：收納區已存在同名稱的項目 + </notification> + <notification name="CantSaveModifyAttachment"> + 無法儲存到物件內容：這麼做將修改附件的權限。 + </notification> + <notification name="TooManyScripts"> + 腳本太多。 + </notification> + <notification name="UnableAddScript"> + 無法新增腳本！ + </notification> + <notification name="AssetServerTimeoutObjReturn"> + 資產伺服器未在正常時間內反應。 物件已返交模擬器。 + </notification> + <notification name="RegionDisablePhysicsShapes"> + 本地區未啟用物理形狀。 + </notification> + <notification name="NoModNavmeshAcrossRegions"> + 你無法變更跨越地區界限的導航網面。 + </notification> + <notification name="NoSetPhysicsPropertiesOnObjectType"> + 該物件類型不得設定物理性質。 + </notification> + <notification name="NoSetRootPrimWithNoShape"> + 根幾何元件無法設成無形狀。 + </notification> + <notification name="NoRegionSupportPhysMats"> + 本地區未啟用物理材料。 + </notification> + <notification name="OnlyRootPrimPhysMats"> + 只能調整根幾何元件的物理材料。 + </notification> + <notification name="NoSupportCharacterPhysMats"> + 尚不支援角色設定物理材料。 + </notification> + <notification name="InvalidPhysMatProperty"> + 指定的物理材料屬性中，至少有一個無效。 + </notification> + <notification name="NoPermsAlterStitchingMeshObj"> + 網面物件的縫合類型不得變更。 + </notification> + <notification name="NoPermsAlterShapeMeshObj"> + 網面物件的形狀不得變更。 + </notification> + <notification name="FullRegionCantEnter"> + 你無法進入這地區，\n因為地區滿載。 + </notification> + <notification name="LinkFailedOwnersDiffer"> + 聯結失敗——所有人不同 + </notification> + <notification name="LinkFailedNoModNavmeshAcrossRegions"> + 聯結失敗——無法修改跨越地區界限的導航網面。 + </notification> + <notification name="LinkFailedNoPermToEdit"> + 聯結失敗，你無權編輯。 + </notification> + <notification name="LinkFailedTooManyPrims"> + 聯結失敗——幾何元件太多 + </notification> + <notification name="LinkFailedCantLinkNoCopyNoTrans"> + 聯結失敗——無法將「禁止複製」和「禁止轉移」物件聯結起來 + </notification> + <notification name="LinkFailedNothingLinkable"> + 聯結失敗——沒有可聯結的東西。 + </notification> + <notification name="LinkFailedTooManyPathfindingChars"> + 聯結失敗——尋徑角色太多 + </notification> + <notification name="LinkFailedInsufficientLand"> + 聯結失敗——土地資源不足 + </notification> + <notification name="LinkFailedTooMuchPhysics"> + 物件使用了過多物理資源，其動態特性已被停用。 + </notification> + <notification name="TeleportedHomeByObjectOnParcel"> + 你已被 '[PARCEL_NAME]' 地段的物件 '[OBJECT_NAME]' 成功瞬間傳送回家 + </notification> + <notification name="TeleportedHomeByObject"> + 你已成功被物件 '[OBJECT_NAME]' 瞬間傳送回家 + </notification> + <notification name="TeleportedByAttachment"> + 你已成功被 [ITEM_ID] 上的一個附件瞬間傳送 + </notification> + <notification name="TeleportedByObjectOnParcel"> + 你已成功被 '[PARCEL_NAME]' 地段的物件 '[OBJECT_NAME]' 瞬間傳送 + </notification> + <notification name="TeleportedByObjectOwnedBy"> + 你已成功被 [OWNER_ID] 擁有的物件 '[OBJECT_NAME]' 瞬間傳送 + </notification> + <notification name="TeleportedByObjectUnknownUser"> + 你已成功被某未知用戶擁有的物件 '[OBJECT_NAME]' 瞬間傳送。 + </notification> + <notification name="CantCreateObjectRegionFull"> + 無法建立要求的物件。 地區已滿載。 + </notification> + <notification name="CantAttackMultipleObjOneSpot"> + 你不能將多個物件附著到同一個點。 + </notification> + <notification name="CantCreateMultipleObjAtLoc"> + 你不能在此建立多個物件。 + </notification> + <notification name="UnableToCreateObjTimeOut"> + 無法建立要求的物件。 物件在資料庫中找不到。 + </notification> + <notification name="UnableToCreateObjUnknown"> + 無法建立要求的物件。 要求逾時，無法完成。 請再試一次。 + </notification> + <notification name="UnableToCreateObjMissingFromDB"> + 無法建立要求的物件。 請再試一次。 + </notification> + <notification name="RezFailureTookTooLong"> + 物件產生失敗，要求的物件載入時間太久。 + </notification> + <notification name="FailedToPlaceObjAtLoc"> + 無法將物件置於指定地點。 請再試一次。 + </notification> + <notification name="CantCreatePlantsOnLand"> + 你不得在這土地上建立植物。 + </notification> + <notification name="CantRestoreObjectNoWorldPos"> + 無法恢復物件。 找不到虛擬世界的位置。 + </notification> + <notification name="CantRezObjectInvalidMeshData"> + 無法產生物件，它的網面資料無效。 + </notification> + <notification name="CantRezObjectTooManyScripts"> + 無法產生物件，因為這地區已有太多的腳本。 + </notification> + <notification name="CantCreateObjectNoAccess"> + 你無權在此建立物件。 + </notification> + <notification name="CantCreateObject"> + 你此時無權建立物件。 + </notification> + <notification name="InvalidObjectParams"> + 無效的物件參數 + </notification> + <notification name="CantDuplicateObjectNoAcess"> + 你權限不夠，無法在此複製物件。 + </notification> + <notification name="CantChangeShape"> + 你無權變更這個形狀。 + </notification> + <notification name="NoAccessToClaimObjects"> + 你權限不夠，無法在此收取物件。 + </notification> + <notification name="DeedFailedNoPermToDeedForGroup"> + 讓渡失敗，你無權為你的群組讓渡物件。 + </notification> + <notification name="NoPrivsToBuyObject"> + 你權限不夠，無法在此購買物件。 + </notification> + <notification name="CantAttachObjectAvatarSittingOnIt"> + 無法附著物件，有個化身正坐在物件上。 + </notification> + <notification name="WhyAreYouTryingToWearShrubbery"> + 樹和草不能當附件穿戴。 + </notification> + <notification name="CantAttachGroupOwnedObjs"> + 無法附著群組所擁有的物件。 + </notification> + <notification name="CantAttachObjectsNotOwned"> + 無法附著不是你擁有的物件。 + </notification> + <notification name="CantAttachNavmeshObjects"> + 無法附著對導航網面有貢獻的物件。 + </notification> + <notification name="CantAttachObjectNoMovePermissions"> + 無法附著物件，你無權移動該物件。 + </notification> + <notification name="CantAttachNotEnoughScriptResources"> + 腳本資源不足，無法附著物件！ + </notification> + <notification name="CantDropItemTrialUser"> + 你無法在此卸除物件，請到「自由嘗試」區域再試。 + </notification> + <notification name="CantDropMeshAttachment"> + 你無法在此卸除附件。 請選擇把卸除附件送回收納區，再重新成形。 + </notification> + <notification name="CantDropAttachmentNoPermission"> + 卸除附件失敗：你無權在此處卸除。 + </notification> + <notification name="CantDropAttachmentInsufficientLandResources"> + 卸除附件失敗：可用土地資源不足。 + </notification> + <notification name="CantDropAttachmentInsufficientResources"> + 卸除附件失敗：可用資源不足。 + </notification> + <notification name="CantDropObjectFullParcel"> + 無法在此卸除物件。 地段滿載。 + </notification> + <notification name="CantTouchObjectBannedFromParcel"> + 無法觸摸/抓取此物件，因為你在該土地地段遭禁。 + </notification> + <notification name="PlzNarrowDeleteParams"> + 請將刪除參數範圍調小一點。 + </notification> + <notification name="UnableToUploadAsset"> + 無法上傳資產。 + </notification> + <notification name="CantTeleportCouldNotFindUser"> + 找不到要瞬間傳送到家的用戶 + </notification> + <notification name="GodlikeRequestFailed"> + 要求神的權力失敗 + </notification> + <notification name="GenericRequestFailed"> + 普通請求失敗 + </notification> + <notification name="CantUploadPostcard"> + 無法上傳明信片。 請稍候再試一次。 + </notification> + <notification name="CantFetchInventoryForGroupNotice"> + 無法取得群組通知的收納區細節。 + </notification> + <notification name="CantSendGroupNoticeNotPermitted"> + 無法送出群組通知——未准許。 + </notification> + <notification name="CantSendGroupNoticeCantConstructInventory"> + 無法送出群組通知——收納區建立失敗。 + </notification> + <notification name="CantParceInventoryInNotice"> + 無法剖析通知裡的收納品項。 + </notification> + <notification name="TerrainUploadFailed"> + 地形上傳失敗。 + </notification> + <notification name="TerrainFileWritten"> + 地形檔案已寫入。 + </notification> + <notification name="TerrainFileWrittenStartingDownload"> + 地形檔案已寫入，開始下載…… + </notification> + <notification name="TerrainBaked"> + 地形已定貌。 + </notification> + <notification name="TenObjectsDisabledPlzRefresh"> + 只成功停用前 10 個所選物件。 若有需要，請刷新之後再選取更多的項目。 + </notification> + <notification name="UpdateViewerBuyParcel"> + 你必須先更新瀏覽器後，才可購買這個地段。 + </notification> + <notification name="CantBuyParcelNotForSale"> + 無法購買，此地段不供出售。 + </notification> + <notification name="CantBuySalePriceOrLandAreaChanged"> + 無法購買，售價或土地面積已變。 + </notification> + <notification name="CantBuyParcelNotAuthorized"> + 你不是此地段的獲授權的買主。 + </notification> + <notification name="CantBuyParcelAwaitingPurchaseAuth"> + 你無法購買此地段，該地段已在等候批准購買 + </notification> + <notification name="CantBuildOverflowParcel"> + 你不得在此建立物件，這麼做將導致地段超載。 + </notification> + <notification name="SelectedMultipleOwnedLand"> + 你選擇的土地範圍，為不同人所擁有。 請縮小選擇範圍，再試一次。 + </notification> + <notification name="CantJoinTooFewLeasedParcels"> + 未選取足夠租用地段，無法合併。 + </notification> + <notification name="CantDivideLandMultipleParcelsSelected"> + 無法分割土地，\n因為你選取了多個地段，\n請縮小所選土地。 + </notification> + <notification name="CantDivideLandCantFindParcel"> + 無法分割土地。\n找不到地段。\n請到「幫助 > 回報錯誤……」回報問題 + </notification> + <notification name="CantDivideLandWholeParcelSelected"> + 無法分割土地。 選取了整個地段。\n請試著縮小所選的土地。 + </notification> + <notification name="LandHasBeenDivided"> + 土地分割成功。 + </notification> + <notification name="PassPurchased"> + 你購買了通行權。 + </notification> + <notification name="RegionDisallowsClassifieds"> + 地區不允許分類廣告。 + </notification> + <notification name="LandPassExpireSoon"> + 你在此土地的通行權即將到期失效。 + </notification> + <notification name="CantSitNoSuitableSurface"> + 沒有合適的表面讓你坐下，請試一試別處。 + </notification> + <notification name="CantSitNoRoom"> + 這裡沒有空間讓你坐下，請試試另一處。 + </notification> + <notification name="ClaimObjectFailedNoPermission"> + 收取物件失敗，因為你權限不足。 + </notification> + <notification name="ClaimObjectFailedNoMoney"> + 收取物件失敗，因為你 L$ 金額不足。 + </notification> + <notification name="CantDeedGroupLand"> + 無法讓渡群組所擁有的土地。 + </notification> + <notification name="BuyObjectFailedNoMoney"> + 購買物件失敗，你 L$ 金額不足。 + </notification> + <notification name="BuyInventoryFailedNoMoney"> + 購買收納區失敗，你 L$ 金額不足。 + </notification> + <notification name="BuyPassFailedNoMoney"> + 你的 L$ 不足，無法購買此土地的通行權。 + </notification> + <notification name="CantBuyPassTryAgain"> + 此時無法購買通行權。 請稍候再試一次。 + </notification> + <notification name="CantCreateObjectParcelFull"> + 無法建立物件，\n地段滿載。 + </notification> + <notification name="FailedPlacingObject"> + 無法將物件置於指定地點。 請再試一次。 + </notification> + <notification name="CantCreateLandmarkForEvent"> + 無法為活動建立地標。 + </notification> + <notification name="GodBeatsFreeze"> + 你擁有的神力解除了凍結！ + </notification> + <notification name="SpecialPowersRequestFailedLogged"> + 要求特殊能力失敗。 該要求已載入記錄。 + </notification> + <notification name="ExpireExplanation"> + 系統此時無法處理你的要求。 要求逾時，無法完成。 + </notification> + <notification name="DieExplanation"> + 系統無法處理你的要求。 + </notification> + <notification name="AddPrimitiveFailure"> + 金額不足，無法建立幾何元件。 + </notification> + <notification name="RezObjectFailure"> + 金額不足，無法建立物件。 + </notification> + <notification name="ResetHomePositionNotLegal"> + 已重設「我的家」位置，因為前一個位置不合法。 + </notification> + <notification name="CantInviteRegionFull"> + 此刻你無法邀請任何人到你的位置，因為地區滿載。 請稍候再試一次。 + </notification> + <notification name="CantSetHomeAtRegion"> + 此地區不許你在此設定「我的家」。 + </notification> + <notification name="ListValidHomeLocations"> + 你只能在自己的土地或大陸資訊中心上設定「我的家」。 + </notification> + <notification name="SetHomePosition"> + 我的家位置已定。 + </notification> + <notification name="CantDerezInventoryError"> + 收納區出錯，無法收納物件。 + </notification> + <notification name="CantCreateRequestedInv"> + 無法建立要求的收納區。 + </notification> + <notification name="CantCreateRequestedInvFolder"> + 無法建立要求的收納區資料夾。 + </notification> + <notification name="CantCreateInventory"> + 無法建立該收納區。 + </notification> + <notification name="CantCreateLandmark"> + 無法建立地標。 + </notification> + <notification name="CantCreateOutfit"> + 此時無法建立裝扮。 請過一分鐘後再試。 + </notification> + <notification name="InventoryNotForSale"> + 收納區沒有待售。 + </notification> + <notification name="CantFindInvItem"> + 找不到收納區物項。 + </notification> + <notification name="CantFindObject"> + 找不到物件。 + </notification> + <notification name="CantTransfterMoneyRegionDisabled"> + 此地區目前未啟用轉移金錢給物件的功能。 + </notification> + <notification name="CantPayNoAgent"> + 無法決定付款給誰。 + </notification> + <notification name="CantDonateToPublicObjects"> + 你無法將 L$ 送給公共物件。 + </notification> + <notification name="InventoryCreationInWorldObjectFailed"> + 針對虛擬世界物件建立收納區失敗。 + </notification> + <notification name="UserBalanceOrLandUsageError"> + 發生內部錯誤，我們無法如常更新你的瀏覽器。 你瀏覽器顯示的 L$ 餘額或擁有地段，可能和伺服器上的正確數額不一致。 + </notification> + <notification name="LargePrimAgentIntersect"> + 無法建立和其他參與者發生交截的大型幾何元件。 請等其他參與者移開後再試。 + </notification> + <notification name="PreferenceChatClearLog"> + 這動作將刪除先前交談的記錄，和所有記錄備份。 + <usetemplate ignoretext="刪除先前交談記錄前，先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/> + </notification> + <notification name="PreferenceChatDeleteTranscripts"> + 這將刪除所有先前交談的內容記錄。 過去交談歷史清單不受影響。 資料夾 [FOLDER] 所有副檔名 .txt 和 txt.backup 的檔案都將刪除。 + <usetemplate ignoretext="刪除交談內容記錄前先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/> + </notification> + <notification name="PreferenceChatPathChanged"> + 無法移動檔案。 已恢復前一個路徑。 + <usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml index 42a4aa9e85..42a4aa9e85 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml index 7d16ac4129..7d16ac4129 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml index 1c8b56b3d6..e0a49a0add 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml @@ -27,5 +27,6 @@ <icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/> <icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/> <icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/> + <button name="info_btn" tool_tip="詳情"/> <button name="profile_btn" tool_tip="察看檔案"/> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml index fd91ea97d1..fd91ea97d1 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml index 1dfa024138..9f59bb32f8 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> - <text name="title_text"> - 封鎖清單 - </text> - <scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/> - <button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/> - <button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/> - <button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/> + <panel label="bottom_panel" name="blocked_buttons_panel"> + <filter_editor label="過濾器" name="blocked_filter_input"/> + <menu_button name="blocked_gear_btn" tool_tip="對所選的人或物件採取動作"/> + <menu_button name="view_btn" tool_tip="排序選項"/> + <menu_button name="plus_btn" tool_tip="挑選一位居民或物件，加以封鎖"/> + <button name="unblock_btn" tool_tip="將居民或物件由封鎖清單中移除"/> + </panel> + <block_list name="blocked" tool_tip="目前封鎖的居民清單"/> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml index fef692c1c5..fef692c1c5 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml index e4e7a661a7..e4e7a661a7 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml index 9833e9ef8b..9833e9ef8b 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml diff --git a/indra/newview/skins/default/xui/zh/panel_chat_header.xml b/indra/newview/skins/default/xui/zh/panel_chat_header.xml index 7916bf5155..7916bf5155 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/zh/panel_chat_header.xml diff --git a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml index 69340349bc..69340349bc 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml index 6f2dd89318..6f2dd89318 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml index ba63dada76..ba63dada76 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml index 55e72f5347..55e72f5347 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml index c074abb568..c074abb568 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml new file mode 100644 index 0000000000..6524d41645 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_list_item"> + <layout_stack name="conversation_item_stack"> + <layout_panel name="conversation_title_panel"> + <text name="conversation_title" value="（載入中）"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml new file mode 100644 index 0000000000..8446ce2130 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="conversation_log_list_item"> + <icon name="voice_session_icon" tool_tip="包含語音交談"/> + <icon name="unread_ims_icon" tool_tip="訊息在你登出期間傳來"/> + <button name="delete_btn" tool_tip="移除此項目"/> +</panel> diff --git a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml index a9e65419c2..a9e65419c2 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml index 6377bf4135..6377bf4135 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml index 32765a3e16..32765a3e16 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml index b06ece02ad..b06ece02ad 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml index f44d411908..f44d411908 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml index d107eea553..d107eea553 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml index 65f78f9273..65f78f9273 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml index 61e45f911e..61e45f911e 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml index 846ed72961..846ed72961 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml index 26fedb59be..26fedb59be 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml index faee42fd0e..faee42fd0e 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml index 849b82c71a..849b82c71a 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml index f249100786..f249100786 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml index bc69f2ffc4..bc69f2ffc4 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml index e190bb5bd8..e190bb5bd8 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml index d8552f52f0..d8552f52f0 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml index 34319fcc01..34319fcc01 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml index 8e19fb5692..8e19fb5692 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml index f5111d629a..f5111d629a 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml index 5ead7c9004..5ead7c9004 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml index e497e285c9..e497e285c9 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml index 4dd7ea6d93..4dd7ea6d93 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml index f468aba514..f468aba514 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml index 2b16b61dd1..2b16b61dd1 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml index f979a4c53e..f979a4c53e 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml index 8921978b20..8921978b20 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml index 81d5573e1c..81d5573e1c 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml index 175293cdf7..fec4bb572a 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="未知"/> + <button name="info_btn" tool_tip="詳情"/> <button name="profile_btn" tool_tip="察看檔案"/> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml index ba5f4f1bba..ba5f4f1bba 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml index 08a8c94876..08a8c94876 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_notify.xml diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml index 59086c3de2..59086c3de2 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml index e937368a2b..e937368a2b 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml diff --git a/indra/newview/skins/default/xui/zh/panel_instant_message.xml b/indra/newview/skins/default/xui/zh/panel_instant_message.xml index cf9bc7fccb..cf9bc7fccb 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/zh/panel_instant_message.xml diff --git a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml index d18047fbcf..d18047fbcf 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml index b50aa24d3f..b50aa24d3f 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml index eea406170a..eea406170a 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml index 672d9bb1a2..672d9bb1a2 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_login.xml +++ b/indra/newview/skins/default/xui/zh/panel_login.xml diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml index 0ad3d8506d..0ad3d8506d 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml index aad1348e46..aad1348e46 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_me.xml +++ b/indra/newview/skins/default/xui/zh/panel_me.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml index 0c11befcf5..0c11befcf5 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml index 4a1eaef3a1..4a1eaef3a1 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml index da84d6fe02..da84d6fe02 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml index 7a11aa961b..7a11aa961b 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml index bb52c13a11..bb52c13a11 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml +++ b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml index fc52168bb7..fc52168bb7 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml index 4361b588d8..9489113d09 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="chat_bar"> +<panel name="nearby_chat"> <line_editor label="點按此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/> <button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近的聊天紀錄"/> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml index c11a7a088b..c11a7a088b 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml diff --git a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml index 01a8210338..01a8210338 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml diff --git a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml index a5d3afccb9..a5d3afccb9 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml +++ b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml index 8de0bb0e4d..8de0bb0e4d 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml index a698da0ab1..a698da0ab1 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml index 8dd93543c0..8dd93543c0 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml index 92ec774f9b..92ec774f9b 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml index cfb0180f9c..cfb0180f9c 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml index 693cdcdeca..693cdcdeca 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml +++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml index 59ea7b70e2..5f7aca387a 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_people.xml +++ b/indra/newview/skins/default/xui/zh/panel_people.xml @@ -14,81 +14,53 @@ <string name="no_filtered_friends_msg"> 找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。 </string> - <string name="people_filter_label" value="人員過濾器"/> - <string name="groups_filter_label" value="群組過濾器"/> <string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/> <string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/> <string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/> <string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/> - <filter_editor label="過濾器" name="filter_input"/> <tab_container name="tabs"> <panel label="附近" name="nearby_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="nearby_view_sort_btn" tool_tip="選項"/> - <button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/> + <panel label="bottom_panel" name="nearby_buttons_panel"> + <filter_editor label="人員過濾器" name="nearby_filter_input"/> + <button name="gear_btn" tool_tip="對選取的人採取動作"/> + <menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/> + <button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/> + <dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/> </panel> </panel> - <panel label="我的朋友" name="friends_panel"> + <panel label="朋友" name="friends_panel"> + <panel label="bottom_panel" name="friends_buttons_panel"> + <filter_editor label="人員過濾器" name="friends_filter_input"/> + <button name="gear_btn" tool_tip="對選取的人採取動作"/> + <menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/> + <button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/> + <dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/> + </panel> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="上線"/> <accordion_tab name="tab_all" title="全部"/> </accordion> - <panel label="bottom_panel" name="bottom_panel"> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="向居民發出交友邀請"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/> - </layout_panel> - </layout_stack> - </panel> </panel> - <panel label="我的群組" name="groups_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="groups_viewsort_btn" tool_tip="選項"/> - <button name="plus_btn" tool_tip="加入群組/創立新群組"/> - <button name="activate_btn" tool_tip="啟用所選擇的群組"/> + <panel label="群組" name="groups_panel"> + <panel label="bottom_panel" name="groups_buttons_panel"> + <filter_editor label="群組過濾器" name="groups_filter_input"/> + <menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/> + <menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/> + <menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/> + <dnd_button name="minus_btn" tool_tip="離開所選群組"/> </panel> </panel> <panel label="最近" name="recent_panel"> - <panel label="bottom_panel" name="bottom_panel"> - <menu_button name="recent_viewsort_btn" tool_tip="選項"/> - <button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/> + <panel label="bottom_panel" name="recent_buttons_panel"> + <filter_editor label="人員過濾器" name="recent_filter_input"/> + <button name="gear_btn" tool_tip="對選取的人採取動作"/> + <menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/> + <button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/> + <dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/> </panel> </panel> + <panel label="已封鎖的" name="blocked_panel"> + <panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/> + </panel> </tab_container> - <panel name="button_bar"> - <layout_stack name="bottom_bar_ls"> - <layout_panel name="view_profile_btn_lp"> - <button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/> - </layout_panel> - <layout_panel name="im_btn_lp"> - <button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/> - </layout_panel> - <layout_panel name="call_btn_lp"> - <button label="通話" name="call_btn" tool_tip="和這位居民通話"/> - </layout_panel> - <layout_panel name="share_btn_lp"> - <button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/> - </layout_panel> - <layout_panel name="teleport_btn_lp"> - <button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/> - </layout_panel> - </layout_stack> - <layout_stack name="bottom_bar_ls1"> - <layout_panel name="group_info_btn_lp"> - <button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/> - </layout_panel> - <layout_panel name="chat_btn_lp"> - <button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/> - </layout_panel> - <layout_panel name="group_call_btn_lp"> - <button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/> - </layout_panel> - </layout_stack> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml index cd4cdbf999..cd4cdbf999 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/zh/panel_pick_info.xml diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml index 98d36eaea0..98d36eaea0 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_picks.xml +++ b/indra/newview/skins/default/xui/zh/panel_picks.xml diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml index a364f732d8..a364f732d8 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml index 08cae610f6..08cae610f6 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_places.xml +++ b/indra/newview/skins/default/xui/zh/panel_places.xml diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml index 563c4fca3c..563c4fca3c 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml +++ b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml index 900ab3a54e..900ab3a54e 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml index 3a7d79e04b..3a7d79e04b 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml index 94eb3c1389..94eb3c1389 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml index cf2f81d313..e700e35516 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml @@ -1,34 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="文字聊天" name="chat"> - <text name="font_size"> - 字型尺寸： - </text> - <radio_group name="chat_font_size"> - <radio_item label="小" name="radio" value="0"/> - <radio_item label="中" name="radio2" value="1"/> - <radio_item label="大" name="radio3" value="2"/> - </radio_group> - <check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/> - <check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/> - <check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/> - <check_box label="聊天泡泡" name="bubble_text_chat"/> - <text name="show_ims_in_label"> - 顯示 IMs 於： - </text> - <text name="requires_restart_label"> - （須重新啟動） - </text> - <radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗，或是使用很多頁籤的單一浮動視窗（須重新啟動）"> - <radio_item label="分開視窗" name="radio" value="0"/> - <radio_item label="頁籤" name="radio2" value="1"/> - </radio_group> - <text name="disable_toast_label"> - 啟用傳入聊天的突顯示視窗： - </text> - <check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/> - <check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/> - <spinner label="附近聊天內容提示框停駐時間：" name="nearby_toasts_lifetime"/> - <spinner label="附近聊天內容提示框消退時間：" name="nearby_toasts_fadingtime"/> + <panel> + <check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/> + <check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/> + <check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/> + <text name="font_size"> + 字型尺寸： + </text> + <combo_box name="chat_font_size"> + <item label="小" name="Small" value="0"/> + <item label="中" name="Medium" value="1"/> + <item label="大" name="Large" value="2"/> + </combo_box> + <check_box label="聊天泡泡" name="bubble_text_chat"/> + </panel> + <panel> + <text name="notifications"> + 通知 + </text> + <text name="friend_ims"> + 朋友 IM： + </text> + <combo_box name="FriendIMOptions"> + <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/> + <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/> + <item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/> + <item label="無" name="None" value="無"/> + </combo_box> + <text name="non_friend_ims"> + 非朋友 IM： + </text> + <combo_box name="NonFriendIMOptions"> + <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/> + <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/> + <item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/> + <item label="無" name="None" value="無"/> + </combo_box> + <text name="conference_ims"> + 多方交談 IM： + </text> + <combo_box name="ConferenceIMOptions"> + <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/> + <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/> + <item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/> + <item label="無" name="None" value="無"/> + </combo_box> + <text name="group_chat"> + 群組聊天： + </text> + <combo_box name="GroupChatOptions"> + <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/> + <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/> + <item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/> + <item label="無" name="None" value="無"/> + </combo_box> + <text name="nearby_chat"> + 附近的聊天： + </text> + <combo_box name="NearbyChatOptions"> + <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/> + <item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/> + <item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/> + <item label="無" name="None" value="無"/> + </combo_box> + <text name="notifications_alert"> + 若要暫時停止所有通知，請設定「溝通 > 請勿打擾」。 + </text> + </panel> + <panel> + <text name="play_sound"> + 播放聲音： + </text> + <check_box label="新交談" name="new_conversation"/> + <check_box label="語音通話來電" name="incoming_voice_call"/> + <check_box label="瞬間傳送邀請" name="teleport_offer"/> + <check_box label="收納物品贈送" name="inventory_offer"/> + </panel> + <panel> + <button label="清空記錄……" name="clear_log"/> + <button label="刪除交談內容記錄……" name="delete_transcripts"/> + <button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/> + </panel> <button label="翻譯…" name="ok_btn"/> <button label="自動取代…" name="autoreplace_showgui"/> <button label="拼字檢查…" name="spellcheck_showgui"/> diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml index 6af4bb8970..6af4bb8970 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml index 7e67a0d02d..044edbed70 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml @@ -68,9 +68,9 @@ <combo_box.item label="絕不" name="item4"/> </combo_box> <text name="text_box3"> - 忙碌模式回應： + 「請勿打擾」預設回應： </text> - <text_editor name="busy_response"> + <text_editor name="do_not_disturb_response"> log_in_to_change </text_editor> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml index 3948a48992..3948a48992 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml index 3a27477885..3a27477885 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml index 07fdfd87e3..07fdfd87e3 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml index a607a7c33b..a607a7c33b 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml index e57f08fd74..e57f08fd74 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml index 09043311da..09043311da 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml index d5dd337795..d5dd337795 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml index e5d5e6eaf7..e5d5e6eaf7 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_environment.xml b/indra/newview/skins/default/xui/zh/panel_region_environment.xml index 8f466af39e..8f466af39e 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_environment.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml index f3c1c85379..f3c1c85379 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml index f6b2c46354..f6b2c46354 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_region_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml index 85e759e445..85e759e445 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml index 29e9a35869..29e9a35869 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml index eb32d39f78..eb32d39f78 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml index 40a2dd6926..40a2dd6926 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml index a2d0237da0..a2d0237da0 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml +++ b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml index bc29058f77..bc29058f77 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml index fa659040ea..fa659040ea 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml +++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml index cdd79da30c..cdd79da30c 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml index 20fb9b494a..20fb9b494a 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml index a929c9a3fb..a929c9a3fb 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml index 82c2b10d8d..82c2b10d8d 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml index 853a856104..853a856104 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml index 6f64a4e83c..6f64a4e83c 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml diff --git a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml index fa4e24a605..fa4e24a605 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml diff --git a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml index 4586d4eca1..4586d4eca1 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml index b4cdff9d6b..b4cdff9d6b 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml index 44d545a86d..44d545a86d 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml index c251994906..c251994906 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml diff --git a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml index 6c8a452014..6c8a452014 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml diff --git a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml index 70ec028176..70ec028176 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml index 84018768a1..84018768a1 100644..100755 --- a/indra/newview/skins/default/xui/zh/panel_world_map.xml +++ b/indra/newview/skins/default/xui/zh/panel_world_map.xml diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml index 767bcecde7..767bcecde7 100644..100755 --- a/indra/newview/skins/default/xui/zh/role_actions.xml +++ b/indra/newview/skins/default/xui/zh/role_actions.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml index 83a9bdf6a5..83a9bdf6a5 100644..100755 --- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml index c8aae15011..c8aae15011 100644..100755 --- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml index 1b093e0ecd..1b093e0ecd 100644..100755 --- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml index 982dde4010..60f44a3d88 100644..100755 --- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml @@ -72,6 +72,7 @@ <combo_box.item label="購買物件" name="Buyobject"/> <combo_box.item label="支付物件" name="Payobject"/> <combo_box.item label="打開" name="Open"/> + <combo_box.item label="縮放" name="Zoom"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index 3f17324006..31713ac281 100644..100755 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -614,8 +614,8 @@ http://secondlife.com/viewer-access-faq <string name="AvatarAway"> 離開 </string> - <string name="AvatarBusy"> - 忙碌 + <string name="AvatarDoNotDisturb"> + 請勿打擾 </string> <string name="AvatarMuted"> 封鎖的 @@ -851,6 +851,12 @@ http://secondlife.com/viewer-access-faq <string name="ST_NO_JOINT"> 找不到 ROOT 或旋軸。 </string> + <string name="NearbyChatTitle"> + 附近的聊天中 + </string> + <string name="NearbyChatLabel"> + （附近的聊天） + </string> <string name="whisper"> 低語： </string> @@ -914,12 +920,15 @@ http://secondlife.com/viewer-access-faq <string name="ControlYourCamera"> 控制你的攝影機 </string> - <string name="TeleportYourAgent"> - 瞬間傳送你本人 - </string> <string name="NotConnected"> 未聯接 </string> + <string name="AgentNameSubst"> + （你） + </string> + <string name="TeleportYourAgent"> + 瞬間傳送你本人 + </string> <string name="SIM_ACCESS_PG"> 一般普級 </string> @@ -1001,18 +1010,6 @@ http://secondlife.com/viewer-access-faq <string name="dictionary_files"> 字典 </string> - <string name="AvatarSetNotAway"> - 非離開 - </string> - <string name="AvatarSetAway"> - 離開 - </string> - <string name="AvatarSetNotBusy"> - 非忙碌 - </string> - <string name="AvatarSetBusy"> - 忙碌 - </string> <string name="shape"> 體形 </string> @@ -1981,8 +1978,8 @@ http://secondlife.com/viewer-access-faq <string name="PanelContentsNewScript"> 新腳本 </string> - <string name="BusyModeResponseDefault"> - 你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。 你的訊息仍將留存並顯示於對���的 IM 面板上供稍後查閱。 + <string name="DoNotDisturbModeResponseDefault"> + 這居民處於「請勿打擾」狀態，不會立即看到你的訊息。 </string> <string name="MuteByName"> （按名稱） @@ -2095,9 +2092,6 @@ http://secondlife.com/viewer-access-faq <string name="GroupMoneyDate"> [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc] </string> - <string name="ViewerObjectContents"> - 內容 - </string> <string name="AcquiredItems"> 取得物品 </string> @@ -3869,7 +3863,7 @@ http://secondlife.com/viewer-access-faq 一般普級地區 </string> <string name="LocationCtrlSeeAVsTooltip"> - 可看到本地段外的化身，並與之交談 + 這地段外的其他化身，看不見也聽不到位於地段裡的化身 </string> <string name="LocationCtrlPathfindingDirtyTooltip"> 地區重新產出之前，可移動物件可能無法正常運作。 @@ -3946,6 +3940,12 @@ http://secondlife.com/viewer-access-faq <string name="IM_unblock_only_groups_friends"> 要察看這訊息，你必須到「偏好設定 / 隱私」，取消勾選「只有我的朋友和群組可以 IM 或與我通話」。 </string> + <string name="OnlineStatus"> + 上線 + </string> + <string name="OfflineStatus"> + 離線 + </string> <string name="answered_call"> 你的通話已經接通 </string> @@ -3955,6 +3955,9 @@ http://secondlife.com/viewer-access-faq <string name="you_joined_call"> 你發起了語音通話 </string> + <string name="you_auto_rejected_call-im"> + 因為處於「請勿打擾」模式，你已自動拒聽這通語音來電。 + </string> <string name="name_started_call"> [NAME] 發起了語音通話 </string> @@ -3971,7 +3974,7 @@ http://secondlife.com/viewer-access-faq 聯接中... </string> <string name="conference-title"> - 臨時多方通話 + 多人聊天 </string> <string name="conference-title-incoming"> 和 [AGENT_NAME] 多方通話 @@ -4863,6 +4866,9 @@ http://secondlife.com/viewer-access-faq <string name="Command_Chat_Label"> 聊天 </string> + <string name="Command_Conversations_Label"> + 交談 + </string> <string name="Command_Compass_Label"> 羅盤 </string> @@ -4938,6 +4944,9 @@ http://secondlife.com/viewer-access-faq <string name="Command_Chat_Tooltip"> 透過文字和附近人們聊天 </string> + <string name="Command_Conversations_Tooltip"> + 和所有人交談 + </string> <string name="Command_Compass_Tooltip"> 指南針 </string> @@ -5067,4 +5076,13 @@ http://secondlife.com/viewer-access-faq <string name="UserDictionary"> [User] </string> + <string name="logging_calls_disabled_log_empty"> + 交談未留記錄。 若想開始留記錄，請到「偏好設定 > 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。 + </string> + <string name="logging_calls_disabled_log_not_empty"> + 將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 > 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。 + </string> + <string name="logging_calls_enabled_log_empty"> + 目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。 + </string> </strings> diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml index 37080a8d0c..37080a8d0c 100644..100755 --- a/indra/newview/skins/default/xui/zh/teleport_strings.xml +++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml |
