diff options
Diffstat (limited to 'indra/newview/skins/default')
45 files changed, 287 insertions, 153 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index af9ee0bd06..bd8ecb92e9 100644 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml @@ -8,7 +8,9 @@ </floater.string> <button label="Fortsæt" label_selected="Fortsæt" name="Continue"/> <button label="Annullér" label_selected="Annullér" name="Cancel"/> - <check_box label="Jeg er enig med "Terms of Service and Privacy Policy"" name="agree_chk"/> + <text name="agree_list"> + Jeg er enig med "Terms of Service and Privacy Policy" + </text> <text name="tos_heading"> Læs venligst følgende "Terms of Service and Privacy Policy" grundigt. For at fortsætte med at logge på [SECOND_LIFE], skal du acceptere aftale. </text> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index b64d7c8d49..8ff3ac770b 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -2368,7 +2368,7 @@ Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion a <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] Objekte werden dauerhaft gelöscht. Möchten Sie den Inhalt Ihres Papierkorbs wirklich dauerhaft löschen? + [COUNT] Bestellungen und Ordner werden dauerhaft gelöscht. Sind Sie sicher, dass Sie den Inhalt Ihres Papierkorbs dauerhaft löschen möchten? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3374,12 +3374,18 @@ Bitte überprüfen Sie Ihre Netzwerk- und Firewalleinstellungen. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Verbindung mit Voice-Server ist leider nicht möglich: + Wir können uns nicht mit dem Voice-Server verbinden: [HOSTID] -Voice-Kommunikation ist leider nicht verfügbar. -Bitte überprüfen Sie Ihr Netzwerk- und Firewall-Setup. +Ports, die für Sprache erlaubt sein müssen, sind: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Bitte überprüfen Sie Ihre Netzwerk- und Firewall-Einstellungen. +Deaktivieren Sie alle SIP-ALG-Funktionen in Ihrem Router. + +Sprachkommunikation ist nicht möglich. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 d265f040ab..a3adea9fa2 100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sonstiges" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Inventar ([ITEM_COUNT] Artikel werden abgerufen... [FILTER] + Holen von [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordnern... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] Objekte [FILTER] + [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordner [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Abgerufen: [ITEM_COUNT] Artikel [FILTER] + Geholte [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordner [FILTER] </panel.string> <text name="ItemcountText"> Objekte: diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 0344dff94f..3e66007627 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -277,9 +277,8 @@ Wenn Sie der Ansicht sind, dass Sie diese Meldung fälschlicherweise erhalten ha Abmeldeanforderung führte zu einem Simulatorfehler. </string> <string name="LoginFailedPendingLogout"> - Das System meldet Sie gerade ab. -Ihr Konto ist erst ab -[TIME] Pacific Time wieder verfügbar. + Das System meldet Sie gerade ab. +Bitte warten Sie eine Minute, bevor Sie sich erneut einloggen. </string> <string name="LoginFailedUnableToCreateSession"> Es kann keine gültige Sitzung erstellt werden. @@ -1514,6 +1513,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich unter http://suppo <string name="InventoryMarketplaceListingsNoItems"> Ziehen Sie Ordner in diesen Bereich, um sie im [[MARKETPLACE_DASHBOARD_URL] Marktplatz] zum Verkauf anzubieten. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Artikel ) + </string> <string name="Marketplace Validation Warning Stock"> Bestandsordner müssen in einem Versionsordner gespeichert sein </string> 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..9fe56e447e 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -702,16 +702,6 @@ This parcel is 512 m² of land. right="400"> You have L$ 2,100. </text> - <check_box - follows="bottom|left" - height="20" - label="Remove [AMOUNT] m² of contribution from group." - layout="topleft" - left_delta="3" - name="remove_contribution" - top_delta="14" - visible="false" - width="275" /> <button follows="bottom|left" height="20" @@ -721,6 +711,15 @@ This parcel is 512 m² of land. name="buy_btn" top="460" width="100" /> + <check_box + follows="bottom|left" + height="20" + label="Remove [AMOUNT] m² of contribution from group." + layout="topleft" + left_pad="3" + name="remove_contribution" + visible="false" + width="275" /> <button follows="bottom|right" height="20" diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index c6b91a8b2f..1425d16cf1 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -509,6 +509,7 @@ label_width="185" layout="topleft" left="420" + min_val="1" max_val="2" name="ObjectMeshDetail" show_text="false" 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 225266af86..8fa5b49573 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -188,6 +188,7 @@ tool_tip="Category -- select the category that best describes this report" top_pad="5" width="313"> + <!-- Values can be populated from capability --> <combo_box.item label="Select category" name="Select_category" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 76adaad57c..e50747cb5f 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -127,7 +127,7 @@ top_delta="0" width="31" /> <panel - height="154" + height="159" layout="topleft" follows="top|left" left="0" @@ -250,7 +250,7 @@ left="0" name="panel_container" default_panel_name="panel_snapshot_options" - top_pad="10" + top_pad="5" width="215"> <panel class="llpanelsnapshotoptions" diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 550af03683..82027d9e7c 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -4,6 +4,7 @@ <font name="default" comment="default font files (global fallbacks)"> <file>DejaVuSans.ttf</file> <os name="Windows"> + <file>meiryo.TTC</file> <file>MSGOTHIC.TTC</file> <file>gulim.ttc</file> <file>simhei.ttf</file> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 5b45364127..3ea9e77a03 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -88,14 +88,6 @@ function="Inventory.Share" /> </menu_item_call> <menu_item_call - label="Buy" - layout="topleft" - name="Task Buy"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="task_buy" /> - </menu_item_call> - <menu_item_call label="Open" layout="topleft" name="Task Open"> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 81bb83f133..dcd8f0b495 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2373,16 +2373,6 @@ function="ToggleControl" parameter="DebugShowMemory" /> </menu_item_check> - <menu_item_check - label="Show Private Mem Info" - name="Show Private Mem Info"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugShowPrivateMem" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DebugShowPrivateMem" /> - </menu_item_check> <menu_item_separator/> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6aa6653f42..73b7671824 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -11031,7 +11031,7 @@ An internal error prevented us from properly updating your viewer. The L$ balan name="LargePrimAgentIntersect" type="notify"> <tag>fail</tag> -Cannot create large prims that intersect other players. Please re-try when other players have moved. +Cannot create large prims that intersect other residents. Please re-try when other residents have moved. </notification> <notification 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 574e5f3cbc..c324e24a86 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -109,6 +109,7 @@ layout="topleft" left="3" name="blocked" + keep_one_selected="false" tool_tip="List of currently blocked Residents" top_pad="4" right="-1"/> 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 c8ce5cdebf..47aceb2c2e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -180,13 +180,20 @@ Maximum 200 per group daily <line_editor follows="left|top|right" enabled="false" - height="19" + height="20" layout="topleft" max_length_bytes="90" mouse_opaque="false" name="create_inventory_name" top_pad="2" width="285" /> + <icon + height="16" + layout="topleft" + left_delta="5" + name="create_inv_icon" + top_delta="2" + width="16" /> <text text_color="EmphasisColor" follows="left|top" @@ -350,6 +357,13 @@ Maximum 200 per group daily name="view_inventory_name" top_pad="8" width="250"/> + <icon + height="16" + layout="topleft" + left_delta="5" + name="view_inv_icon" + top_delta="2" + width="16" /> <button follows="left|top" height="23" 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 dac4371a38..714d4166c0 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - height="680" + height="750" label="Members & Roles" layout="topleft" left="0" @@ -284,8 +284,7 @@ clicking on their names. width="20" /> <scroll_list.columns label="" - name="action" - width="270" /> + name="action" /> </scroll_list> </panel> <panel @@ -451,7 +450,39 @@ clicking on their names. </scroll_list> </panel> <panel - height="550" + height="90" + background_visible="false" + bg_alpha_color="FloaterUnfocusBorderColor" + layout="topleft" + follows="top|left|right" + left="0" + right="-1" + width="313" + mouse_opaque="false" + name="members_header" + top_pad="3" + visible="false"> + <text_editor + bg_readonly_color="Transparent" + text_readonly_color="EmphasisColor" + font="SansSerifSmall" + type="string" + enabled="false" + halign="left" + layout="topleft" + top_pad="0" + follows="left|top|right" + left="0" + right="-1" + height="90" + max_length="512" + name="member_action_description" + word_wrap="true"> + This Ability is 'Eject Members from this Group'. Only an Owner can eject another Owner. + </text_editor> + </panel> + <panel + height="460" background_visible="false" bg_alpha_color="FloaterUnfocusBorderColor" layout="topleft" @@ -599,11 +630,42 @@ clicking on their names. width="20" /> <scroll_list.columns label="" - name="action" - width="270" /> + name="action" /> </scroll_list> </panel> <panel + height="90" + background_visible="false" + bg_alpha_color="FloaterUnfocusBorderColor" + layout="topleft" + follows="top|left|right" + left="0" + right="-1" + width="313" + mouse_opaque="false" + name="roles_header" + top_pad="3" + visible="false"> + <text_editor + bg_readonly_color="Transparent" + text_readonly_color="EmphasisColor" + font="SansSerifSmall" + type="string" + enabled="false" + halign="left" + layout="topleft" + top_pad="0" + follows="left|top|right" + left="0" + right="-1" + height="90" + max_length="512" + name="role_action_description" + word_wrap="true"> + This Ability is 'Eject Members from this Group'. Only an Owner can eject another Owner. + </text_editor> + </panel> + <panel height="424" background_visible="false" bg_alpha_color="FloaterUnfocusBorderColor" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 2cb06d6877..8fc0f6f642 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -345,6 +345,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M left="0" multi_select="true" name="avatars_online" + keep_one_selected="false" show_permissions_granted="true" top="0" width="307" /> @@ -362,6 +363,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M left="0" multi_select="true" name="avatars_all" + keep_one_selected="false" show_permissions_granted="true" top="0" width="307" /> @@ -517,6 +519,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M height="388" layout="topleft" left="3" + keep_one_selected="false" name="group_list" right="-2" top_pad="4" /> @@ -631,6 +634,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M multi_select="true" name="avatar_list" show_last_interaction_time="true" + keep_one_selected="false" right="-2" top_pad="4" /> </panel> 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..2034409111 100644 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -29,7 +29,7 @@ top="10" volume="true"> <slider.commit_callback - function="Pref.setControlFalse" + function="Vol.setControlFalse" parameter="MuteAudio" /> </slider> <button @@ -61,7 +61,7 @@ top_pad="4" volume="true"> <slider.commit_callback - function="Pref.setControlFalse" + function="Vol.setControlFalse" parameter="MuteUI" /> </slider> <button @@ -94,7 +94,7 @@ top_pad="4" volume="true"> <slider.commit_callback - function="Pref.setControlFalse" + function="Vol.setControlFalse" parameter="MuteAmbient" /> </slider> <button @@ -127,7 +127,7 @@ top_pad="4" volume="true"> <slider.commit_callback - function="Pref.setControlFalse" + function="Vol.setControlFalse" parameter="MuteSounds" /> </slider> <button @@ -144,7 +144,7 @@ tab_stop="false" width="16"> <button.commit_callback - function="Pref.SetSounds"/> + function="Vol.SetSounds"/> </button> <check_box name="gesture_audio_play_btn" @@ -173,7 +173,7 @@ top_pad="4" volume="true"> <slider.commit_callback - function="Pref.setControlFalse" + function="Vol.setControlFalse" parameter="MuteMusic" /> </slider> <button @@ -199,7 +199,7 @@ top_delta="2" width="350"> <check_box.commit_callback - function="Pref.updateMediaAutoPlayCheckbox"/> + function="Vol.updateMediaAutoPlayCheckbox"/> </check_box> <slider control_name="AudioLevelMedia" @@ -218,7 +218,7 @@ top_pad="4" volume="true"> <slider.commit_callback - function="Pref.setControlFalse" + function="Vol.setControlFalse" parameter="MuteMedia" /> </slider> <button @@ -246,7 +246,7 @@ name="enable_media" width="110"> <check_box.commit_callback - function="Pref.updateMediaAutoPlayCheckbox"/> + function="Vol.updateMediaAutoPlayCheckbox"/> </check_box> <slider control_name="AudioLevelVoice" @@ -265,7 +265,7 @@ show_text="false" volume="true"> <slider.commit_callback - function="Pref.setControlFalse" + function="Vol.setControlFalse" parameter="MuteVoice" /> </slider> <button diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml index 8d058b0b53..f79d752fdb 100644 --- a/indra/newview/skins/default/xui/en/role_actions.xml +++ b/indra/newview/skins/default/xui/en/role_actions.xml @@ -4,10 +4,10 @@ description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation." name="Membership"> <action description="Invite People to this Group" - longdescription="Invite People to this Group using the 'Invite' button in the Roles section > Members tab." + longdescription="Invite People to this Group using the 'Invite' button in the Roles & Members section > Members tab." name="member invite" value="1" /> - <action description="Eject Members from this Group" - longdescription="Eject Members from this Group using the 'Eject' button in the Roles section > Members tab. An Owner can eject anyone except another Owner. If you're not an Owner, a Member can be ejected from a group if, and only if, they're only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the 'Remove Members from Roles' Ability." + <action description="Eject Members belonging to the 'Everyone' role from this Group" + longdescription="Eject Members from this Group using the 'Eject' button in the Roles & Members section > Members tab. An Owner can eject anyone except another Owner. If you're not an Owner, a Member can be ejected from a group if, and only if, they're only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the 'Remove Members from Roles' Ability." name="member eject" value="2" /> <action description="Manage ban list" longdescription="Allows the group member to ban / un-ban Residents from this group." @@ -21,25 +21,25 @@ description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles." name="Roles"> <action description="Create new Roles" - longdescription="Create new Roles in the Roles section > Roles tab." + longdescription="Create new Roles in the Roles & Members section > Roles tab." name="role create" value="4" /> <action description="Delete Roles" - longdescription="Delete Roles in the Roles section > Roles tab." + longdescription="Delete Roles in the Roles & Members section > Roles tab." name="role delete" value="5" /> <action description="Change Role names, titles, descriptions, and whether Role members are publicly revealed" - longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles section > Roles tab after selecting a Role." + longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles & Members section > Roles tab after selecting a Role." name="role properties" value="6" /> <action description="Assign Members to Assigner's Roles" - longdescription="Assign Members to Roles in the list of Assigned Roles (Roles section > Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in." + longdescription="Assign Members to Roles in the list of Assigned Roles (Roles & Members section > Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in." name="role assign member limited" value="7" /> <action description="Assign Members to Any Role" - longdescription="Assign Members to Any Role in the list of Assigned Roles (Roles section > Members tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." + longdescription="Assign Members to Any Role in the list of Assigned Roles (Roles & Members section > Members tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." name="role assign member" value="8" /> <action description="Remove Members from Roles" - longdescription="Remove Members from Roles in the list of Assigned Roles (Roles section > Members tab). Owners can't be removed." + longdescription="Remove Members from Roles in the list of Assigned Roles (Roles & Members section > Members tab). Owners can't be removed." name="role remove member" value="9" /> <action description="Assign and Remove Abilities in Roles" - longdescription="Assign and Remove Abilities for each Role in the list of Allowed Abilities (Roles section > Roles tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." + longdescription="Assign and Remove Abilities for each Role in the list of Allowed Abilities (Roles & Members section > Roles tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." name="role change actions" value="10" /> </action_set> <action_set diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 1d98a84e25..2a1eb425ed 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -131,15 +131,6 @@ width="333"> tab_group="1" top_pad="6" follows="all" /> - <!-- <button - follows="bottom|left" - height="23" - label="New outfit" - layout="topleft" - left_pad="5" - right="-10" - name="newlook_btn" - width="100" />--> <panel class="panel_outfit_edit" filename="panel_outfit_edit.xml" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 5f30a7e87d..0a220e68fd 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -159,8 +159,7 @@ Your account is not accessible until If you feel this is an error, please contact support@secondlife.com.</string> <string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string> <string name="LoginFailedPendingLogout">The system is logging you out right now. -Your Account will not be available until -[TIME] Pacific Time.</string> +Please wait a minute before you try logging in again.</string> <string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string> <string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string> <string name="LoginFailedRestrictedHours">Your account can only access Second Life diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 7756f15576..fdf9003321 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -2359,7 +2359,7 @@ Linden Lab <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] elementos serán borrados de forma permanente. ¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera? + [COUNT] los objetos y las carpetas se borrarán de forma permanente. ¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/> </notification> <notification name="TrashIsFull"> @@ -3357,12 +3357,18 @@ Comprueba la configuración de la red y del servidor de seguridad. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Tenemos problemas de conexión con tu servidor de voz: + No se pudo establecer una conexión con el servidor de voz: -[HOSTID] +[HOSTID] + +Los puertos que deben estar activos para el servicio de voz son: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Comprueba la configuración de la red y del servidor de seguridad. +Desactiva las funciones SIP ALG de tu router. No podrás establecer comunicaciones de voz. -Comprueba la configuración de la red y del servidor de seguridad. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 5924dc7b9a..1252c7ce0d 100644 --- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Cosas" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Obtenidos [ITEM_COUNT] ítems... [FILTER] + Obteniendo [ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] ítems [FILTER] + [ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Obtenidos [ITEM_COUNT] ítems [FILTER] + [ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas Obtenidos [FILTER] </panel.string> <text name="ItemcountText"> Ítems: diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index e99bbd4aba..341c6d2fe8 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -269,9 +269,8 @@ Si crees que se trata de un error, ponte en contacto con support@secondlife.com. La solicitud de cierre de sesión ha obtenido como resultado un error del simulador. </string> <string name="LoginFailedPendingLogout"> - El sistema está cerrando tu sesión en estos momentos. -Tu cuenta no estará disponible hasta las -[HORA] (horario de la costa del Pacífico). + El sistema te desconectará. +Por favor, aguarda un momento antes de intentar conectarte nuevamente. </string> <string name="LoginFailedUnableToCreateSession"> No se ha podido crear una sesión válida. @@ -1497,6 +1496,9 @@ Si sigues recibiendo el mismo mensaje, solicita ayuda al personal de asistencia <string name="InventoryMarketplaceListingsNoItems"> Arrastra carpetas a esta sección para incluirlas en la lista de venta del [[MARKETPLACE_DASHBOARD_URL] Mercado]. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Objetos) + </string> <string name="Marketplace Validation Warning Stock"> La carpeta de stock debe estar contenida en una carpeta de versión </string> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 051692b7b5..6225eba119 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -2352,7 +2352,7 @@ Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] objets seront supprimés définitivement. Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ? + [COUNT] les objets et les dossiers seront supprimés définitivement. Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3358,12 +3358,18 @@ Veuillez vérifier la configuration de votre réseau et de votre pare-feu. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Problèmes de connexion à votre serveur vocal : + La connexion au serveur vocal est impossible : [HOSTID] +Les ports autorisés pour la voix sont : +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Veuillez vérifier la configuration de votre réseau et de votre pare-feu. +Veuillez désactiver toute fonctionnalité SIP ALG dans votre routeur. + Aucune communication vocale n'est disponible. -Veuillez vérifier la configuration de votre réseau et de votre pare-feu. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 11488af119..5bcee89752 100644 --- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Choses" name="main inventory panel"> <panel.string name="ItemcountFetching"> - [ITEM_COUNT] articles récupérés... [FILTER] + Recherche [ITEM_COUNT] d'articles et [CATEGORY_COUNT] de dossiers... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] articles [FILTER] + [ITEM_COUNT] Articles et [CATEGORY_COUNT] dossiers [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - [ITEM_COUNT] articles [FILTER] récupérés + Recherche effectuée [ITEM_COUNT] d'articles et [CATEGORY_COUNT] de dossiers [FILTER] </panel.string> <text name="ItemcountText"> Articles : diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 2414dd2e2c..d76beee93d 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -278,9 +278,8 @@ Si vous pensez qu'il s'agit d'une erreur, contactez l'Assist Le simulateur a renvoyé une erreur en réponse à la demande de déconnexion. </string> <string name="LoginFailedPendingLogout"> - Le système est en train de vous déconnecter. -Votre compte sera indisponible jusqu'à -[TIME], heure du Pacifique. + Le système est en train de vous déconnecter. +Veuillez réessayer de vous connecter dans une minute. </string> <string name="LoginFailedUnableToCreateSession"> Impossible de créer de session valide. @@ -1515,6 +1514,9 @@ Si vous continuez de recevoir ce message, contactez l’assistance Second Life <string name="InventoryMarketplaceListingsNoItems"> Pour mettre des dossiers en vente sur la [[MARKETPLACE_DASHBOARD_URL] Place du marché], faites-les glisser vers cette zone. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Articles ) + </string> <string name="Marketplace Validation Warning Stock"> le dossier de stock doit être contenu dans un dossier de version </string> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index be9b60a7cf..cf354b8f4f 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -2356,7 +2356,7 @@ Vuoi disattivare la modalità Non disturbare prima di completare questa transazi <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] oggetti verranno eliminati definitivamente. Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino? + [COUNT] oggetti e cartelle verranno eliminati definitivamente. Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino? <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3361,12 +3361,18 @@ Ti consigliamo di controllare le tue impostazioni di rete e della firewall. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - A causa di problemi di connessione al server vocale + Non riusciamo a collegarci al server voce: [HOSTID] -le comunicazioni tramite voce non saranno disponibili. -Ti consigliamo di controllare le tue impostazioni di rete e della firewall. +porte che devono avere il permesso voce sono: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Controlla le tue impostazione di rete e della firewall. +Disabilita la funzione SIP ALG del router. + +La comunicazione voce non sará possibile. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 6121651ea8..5d11967cee 100644 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Cose" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Recupero di [ITEM_COUNT] oggetti... [FILTER] + Recupero di [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] oggetti [FILTER] + [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Recuperati [ITEM_COUNT] elementi [FILTER] + Recuperati [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER] </panel.string> <text name="ItemcountText"> Oggetti: diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 855498dee1..ad74e16170 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -274,9 +274,8 @@ Se ritieni che si tratta di un errore, contatta support@secondlife.com. Errore del simulatore in seguito alla richiesta di logout. </string> <string name="LoginFailedPendingLogout"> - Il sistema sta eseguendo il logout in questo momento. -Il tuo account non sarà disponibile fino alle -[TIME] fuso orario del Pacifico. + Il sistema sta eseguendo il logout in questo momento. +Prova ad accedere nuovamente tra un minuto. </string> <string name="LoginFailedUnableToCreateSession"> Non è possibile creare una sessione valida. @@ -1505,6 +1504,9 @@ Se continui a ricevere questo messaggio, contatta l'assistenza Second Life <string name="InventoryMarketplaceListingsNoItems"> Trascina le cartelle in questa area per metterle in vendita su [[MARKETPLACE_DASHBOARD_URL] Marketplace]. </string> + <string name="InventoryItemsCount"> + ( [ITEM_COUNT] oggetti ) + </string> <string name="Marketplace Validation Warning Stock"> la cartella di magazzino deve essere inclusa in una cartella di versione </string> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index d46ab94733..67586efc9e 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -2394,7 +2394,7 @@ Linden Lab <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] アイテムが完全に削除されます。ごみ箱の項目をすべて削除しますか？ + [COUNT] 個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除しますか？ <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3399,12 +3399,18 @@ M キーを押して変更します。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - ボイスサーバーに接続できません： + ボイスサーバーに接続できません： 音声に許可される必要のある [HOSTID] -ボイスチャットによるコミュニケーションが利用できません。 +ポート: +:TCP:80, 443 +:UDP:3478, 3479, 5060, 5062, 6250, 12000-32000 + お使いのネットワークやファイアウォールの設定を確認してください。 +お使いのルーターの SIP ALG 機能をすべて無効にしてください。 + +ボイスチャットによるコミュニケーションが利用できません。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 dce3475585..5751154163 100644 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="もの" name="main inventory panel"> <panel.string name="ItemcountFetching"> - [ITEM_COUNT] 個のアイテムを取得中です... [FILTER] + [ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得中です... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] 個のアイテム [FILTER] + [ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダー [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - [ITEM_COUNT] 個の取得アイテム [FILTER] + [ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得しました [FILTER] </panel.string> <text name="ItemcountText"> アイテム： diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 263494bdcf..5ca7ddd92c 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -278,8 +278,7 @@ support@secondlife.com にお問い合わせください。 </string> <string name="LoginFailedPendingLogout"> システムによるログアウトが実行されました。 -あなたのアカウントは -太平洋時間の [TIME] までご利用いただけません。 +しばらくしてから再度お試しください。 </string> <string name="LoginFailedUnableToCreateSession"> 有効なセッションを生成できません。 @@ -1513,6 +1512,9 @@ support@secondlife.com にお問い合わせください。 <string name="InventoryMarketplaceListingsNoItems"> [[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。 </string> + <string name="InventoryItemsCount"> + （[ITEMS_COUNT] 個のアイテム） + </string> <string name="Marketplace Validation Warning Stock"> バージョンフォルダに在庫フォルダが含まれなければなりません </string> diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml index c3bc528d17..789c65a16e 100644 --- a/indra/newview/skins/default/xui/pl/floater_tos.xml +++ b/indra/newview/skins/default/xui/pl/floater_tos.xml @@ -5,7 +5,9 @@ </floater.string> <button label="Kontynuuj" label_selected="Kontynuuj" name="Continue" /> <button label="Anuluj" label_selected="Anuluj" name="Cancel" /> - <check_box label="Zgadzam się na Warunki korzystania z Usług (Terms of Service) i Politykę Prywatności (Privacy Policy)" name="agree_chk" /> + <text name="agree_list"> + Zgadzam się na Warunki korzystania z Usług (Terms of Service) i Politykę Prywatności (Privacy Policy) + </text> <text name="tos_heading"> Proszę dokładnie przeczytać Warunki korzystania z Usług (Terms of Service) i Politykę Prywatności (Privacy Policy). Musisz je zaakceptować, aby kontynuować logowanie. </text> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 25192952af..b66f65c682 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -2344,7 +2344,7 @@ Deseja desativar o Não perturbe antes de concluir esta transação? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] itens serão excluídos permanentemente. Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre? + [COUNT] itens e pastas serão excluídas permanentemente. Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3346,12 +3346,18 @@ Verifique a configuração da sua rede e firewall. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Estamos tendo problemas de conexão com o seu servidor de voz: + Não conseguimos conectar ao servidor de voz: [HOSTID] +As portas que devem ter permissão para voz são: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Verifique a configuração da sua rede e firewall. +Desativar qualquer configuração SIP ALG em seu router. + Talvez não seja possível se comunicar via voz. -Verifique a configuração da sua rede e firewall. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 cde53518d0..009b5b3193 100644 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Coisas" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Reunindo [ITEM_COUNT] itens ... [FILTER] + Reunir [ITEM_COUNT] Itens e [CATEGORY_COUNT] Pastas... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] itens [FILTER] + [ITEM_COUNT] Itens e [CATEGORY_COUNT] Pastas [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Recuperados [ITEM_COUNT] itens [FILTER] + Itens [ITEM_COUNT] e Pastas [CATEGORY_COUNT] Reunidos [FILTER] </panel.string> <text name="ItemcountText"> Itens: diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 48f4876d88..ee048e28e3 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -248,7 +248,8 @@ Entre em contato com o suporte do Second Life para obter ajuda em http://support Reação à solicitação de saída foi uma falha do simulador. </string> <string name="LoginFailedPendingLogout"> - O sistema está passando para o modo offline. Sua conta não está disponível para acesso até [TIME], horário do Pacífico nos EUA (GMT-08). + O sistema o está desconectando no momento. +Aguarde um minuto antes que tentar logar-se novamente. </string> <string name="LoginFailedUnableToCreateSession"> Impossível criar sessão válida. @@ -1463,6 +1464,9 @@ Se você continuar a receber essa mensagem, entre em contato com o suporte do Se <string name="InventoryMarketplaceListingsNoItems"> Arraste pastas para esta área para listá-las para venda no [Marketplace [MARKETPLACE_DASHBOARD_URL]]. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Items ) + </string> <string name="Marketplace Validation Warning Stock"> a pasta de estoque deve estar em uma pasta de versões </string> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index fe7f72a02b..483cebaac5 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -2351,7 +2351,7 @@ <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - Предметы [COUNT] будут удалены навсегда. Вы действительно хотите удалить содержимое корзины без возможности восстановления? + [COUNT] предметов(а) и папки будут окончательно удалены. Вы действительно хотите удалить содержимое корзины без возможности восстановления? <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3357,12 +3357,18 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Возникли проблемы соединения с голосовым сервером: + Нет связи с речевым сервером: порты -[HOSTID] +[HOSTID], -Голосовая связь будет недоступна. -Проверьте настройки сети и брандмауэра. +выделенные для голосового соединения: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Проверьте настройки сети и брандмауэра. +Отключите любую функцию SIP ALG в маршрутизаторе. + +Голосовое общение будет недоступно. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 d83bb9b569..f2502bf6d3 100644 --- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Вещи" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Обнаружено [ITEM_COUNT] вещей... [FILTER] + Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок ... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] вещей [FILTER] + [ITEM_COUNT] предметов(а) и [CATEGORY_COUNT] папки(ок) [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Извлечено [ITEM_COUNT] вещей [FILTER] + Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок [FILTER] </panel.string> <text name="ItemcountText"> Вещи: diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 7adac4ef28..95225da7d0 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -278,9 +278,8 @@ support@secondlife.com. В ответ на запрос выхода симулятор возвратил сообщение о сбое. </string> <string name="LoginFailedPendingLogout"> - В системе выполняется выход для вашего аккаунта. -Она будет недоступна до -[TIME] по тихоокеанскому времени. + В системе выполняется выход для вашего аккаунта. +Подождите минуту перед повторным входом в систему. </string> <string name="LoginFailedUnableToCreateSession"> Не удается создать допустимый сеанс. @@ -1512,6 +1511,9 @@ support@secondlife.com. <string name="InventoryMarketplaceListingsNoItems"> Перетащите папки в эту область, чтобы выставить их на продажу в [[MARKETPLACE_DASHBOARD_URL] Торговом центре]. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] предметов(а)) + </string> <string name="Marketplace Validation Warning Stock"> В папке версии должна быть папка запасов </string> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index e37fcf7fb3..d218eb1957 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -2351,7 +2351,7 @@ Bu işlemi tamamlamadan önce Rahatsız Etme'yi kapatmak ister misiniz? <usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tamam"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] öğe kalıcı olarak silinecektir. Çöp kutunuzun içeriğini kalıcı olarak silmek istediğinize emin misiniz? + [COUNT] öğe ve klasör kalıcı olarak silinecektir. Çöp kutunuzun içeriğini kalıcı olarak silmek istediğinizden emin misiniz? <usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tamam"/> </notification> <notification name="TrashIsFull"> @@ -3357,12 +3357,18 @@ Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin. <usetemplate name="okbutton" yestext="Tamam"/> </notification> <notification name="NoVoiceConnect"> - Ses sunucunuz ile bağlantı kurma konusunda sorun yaşıyoruz. + Ses sunucusuna bağlanamıyoruz: Ses için izin verilmesi gereken [HOSTID] -Ses bağlantıları kullanılamayacak. -Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin. +Portları: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin. +Yönlendiricinizdeki her SIP ALG özelliğini devre dışı bırakın. + +Sesli iletişim kullanılamayacak. <usetemplate name="okbutton" yestext="Tamam"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 01252ff454..a11fd98b9a 100644 --- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Eşyalar" name="main inventory panel"> <panel.string name="ItemcountFetching"> - [ITEM_COUNT] Öge Alınıyor... [FILTER] + [ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alınıyor... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] Öge [FILTER] + [ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Alınan [ITEM_COUNT] Öğe [FILTER] + [ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alındı [FILTER] </panel.string> <text name="ItemcountText"> Ögeler: diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index fb9e1b03d1..6850c67df3 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -278,9 +278,8 @@ Bunun bir hata olduğunu düşünüyorsanız, lütfen şu adrese başvurun: supp Oturum kapatma talebi simülatörden bir hata yanıtı gelmesine neden oldu. </string> <string name="LoginFailedPendingLogout"> - Sistem şu anda oturumunuzu sonlandırıyor. -Hesabınıza şu zamana kadar erişemeyeceksiniz: -Pasifik Saati ile [TIME]. + Sistem şu anda oturumunuzu kapatıyor. +Lütfen yeniden oturum açmayı denemeden önce bir dakika bekleyin. </string> <string name="LoginFailedUnableToCreateSession"> Geçerli bir oturum oluşturulamadı. @@ -1512,6 +1511,9 @@ Bu mesaj size gelmeye devam ederse lütfen http://support.secondlife.com adresin <string name="InventoryMarketplaceListingsNoItems"> Klasörleri [[MARKETPLACE_DASHBOARD_URL] Pazaryerinde] satılık olarak listelemek için bu alana sürükleyin. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Öğe ) + </string> <string name="Marketplace Validation Warning Stock"> stok klasörü bir sürüm klasöründe bulunmalıdır </string> diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index e2a96e8efb..5949d068c3 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -2348,7 +2348,7 @@ SHA1 指紋：[MD5_DIGEST] <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT]個物項將會永久刪除。 你確定你要永久刪除垃圾筒中的內容？ + [COUNT]個物項與資料夾將會永久刪除。 你確定你要永久刪除垃圾筒中的內容？ <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> </notification> <notification name="TrashIsFull"> @@ -3353,12 +3353,18 @@ SHA1 指紋：[MD5_DIGEST] <usetemplate name="okbutton" yestext="確定"/> </notification> <notification name="NoVoiceConnect"> - 試圖連接語音伺服器時出了問題： + 無法連通語音伺服器： [HOSTID] -將無法用語音溝通。 +必須允許語音的資料埠如下： +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + 請檢查你的網路和防火牆設定。 +關閉路由器中的SIP ALG(應用層閘道)功能。 + +將無法用語音溝通。 <usetemplate name="okbutton" yestext="確定"/> </notification> <notification name="NoVoiceConnect-GIAB"> 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 49553ecd18..1a28f4c3b5 100644 --- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="事物" name="main inventory panel"> <panel.string name="ItemcountFetching"> - 正在擷取 [ITEM_COUNT] 個物項… [FILTER] + 正在擷取[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾… [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] 物品 [FILTER] + [ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - 已取得 [ITEM_COUNT] 物品 [FILTER] + 擷取了[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER] </panel.string> <text name="ItemcountText"> 物品： diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index bc9f02a5cf..e4f9c5d433 100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -276,7 +276,7 @@ http://secondlife.com/viewer-access-faq </string> <string name="LoginFailedPendingLogout"> 系統正在處理你的登出。 -你的帳號要等到 [TIME] （太平洋時間）才可使用。 +請稍待一分鐘再試圖重新登入。 </string> <string name="LoginFailedUnableToCreateSession"> 無法建立有效的時域。 @@ -1507,6 +1507,9 @@ http://secondlife.com/support 求助解決問題。 <string name="InventoryMarketplaceListingsNoItems"> 將資料夾拖曳到這個區域，即可在[[MARKETPLACE_DASHBOARD_URL] Marketplace]刊登出售。 </string> + <string name="InventoryItemsCount"> + （[ITEMS_COUNT]個物項） + </string> <string name="Marketplace Validation Warning Stock"> 限量資料夾必須放在版本資料夾裡 </string> |