livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep

master
Ansariel 2020-05-18 20:26:27 +02:00
parent 831c49e2da d6147f3d16
commit 5ef74599a7
108 changed files with 2025 additions and 699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/llui/llbutton.cpp
View File

@ -99,6 +99,7 @@ LLButton::Params::Params()
mouse_down_callback("mouse_down_callback"),
mouse_up_callback("mouse_up_callback"),
mouse_held_callback("mouse_held_callback"),
is_toggled_callback("is_toggled_callback"), // <FS:Ansariel> Toggle callback check
is_toggle("is_toggle", false),
scale_image("scale_image", true),
hover_glow_amount("hover_glow_amount"),
@ -183,8 +184,9 @@ LLButton::LLButton(const LLButton::Params& p)
//mFlashingTimer(NULL)
mFlashingTimer(NULL),
mCheckboxControl(p.checkbox_control),
mCheckboxControlPanel(NULL)
mCheckboxControlPanel(NULL),
// </FS:Zi>
mIsToggledSignal(NULL) // <FS:Ansariel> Toggle callback check
{
if (p.button_flash_enable)
{
@ -283,6 +285,12 @@ LLButton::LLButton(const LLButton::Params& p)
{
setHeldDownCallback(initCommitCallback(p.mouse_held_callback));
}
// <FS:Ansariel> Toggle callback check
if (p.is_toggled_callback.isProvided())
{
setIsToggledCallback(initEnableCallback(p.is_toggled_callback));
}
// <FS:Ansariel>
if (p.badge.isProvided())
{
@ -295,6 +303,7 @@ LLButton::~LLButton()
delete mMouseDownSignal;
delete mMouseUpSignal;
delete mHeldDownSignal;
delete mIsToggledSignal; // <FS:Ansariel> Toggle callback check
if (mFlashingTimer)
{
@ -372,6 +381,18 @@ boost::signals2::connection LLButton::setHeldDownCallback( const commit_signal_t
return mHeldDownSignal->connect(cb);
}
// <FS:Ansariel> Toggle callback check
boost::signals2::connection LLButton::setIsToggledCallback(const EnableCallbackParam& cb)
{
return setIsToggledCallback(initEnableCallback(cb));
}
boost::signals2::connection LLButton::setIsToggledCallback(const enable_signal_t::slot_type& cb)
{
if (!mIsToggledSignal) mIsToggledSignal = new enable_signal_t();
return mIsToggledSignal->connect(cb);
}
// <FS:Ansariel>
// *TODO: Deprecate (for backwards compatibility only)
boost::signals2::connection LLButton::setClickedCallback( button_callback_t cb, void* data )
@ -781,6 +802,13 @@ void LLButton::draw()
// Figure out appropriate color for the text
LLColor4 label_color;
// <FS:Ansariel> Toggle callback check
if (mIsToggledSignal)
{
setToggleState((*mIsToggledSignal)(this, LLSD()));
}
// </FS:Ansariel>
// label changes when button state changes, not when pressed
if ( enabled )
{

8
indra/llui/llbutton.h
View File

@ -141,6 +141,8 @@ public:
Optional<std::string> checkbox_control; // <FS:Zi> Add checkbox control toggle
Optional<EnableCallbackParam> is_toggled_callback; // <FS:Ansariel> Toggle callback check
Params();
};
@ -188,6 +190,10 @@ public:
// Passes a 'count' parameter in the commit param payload, i.e. param["count"])
boost::signals2::connection setHeldDownCallback( const commit_signal_t::slot_type& cb ); // Mouse button held down and in button
// <FS:Ansariel> Toggle callback check
boost::signals2::connection setIsToggledCallback(const EnableCallbackParam& cb);
boost::signals2::connection setIsToggledCallback(const enable_signal_t::slot_type& cb);
// *TODO: Deprecate (for backwards compatability only)
boost::signals2::connection setClickedCallback( button_callback_t cb, void* data );
@ -307,6 +313,8 @@ protected:
commit_signal_t* mMouseDownSignal;
commit_signal_t* mMouseUpSignal;
commit_signal_t* mHeldDownSignal;
enable_signal_t* mIsToggledSignal; // <FS:Ansariel> Toggle callback check
const LLFontGL* mGLFont;

3
indra/llui/lltextbase.cpp
View File

@ -1112,6 +1112,9 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
line_start = it->mDocIndexStart;
}
line_end = it->mDocIndexEnd;
// <FS:Ansariel> FIRE-29545: Backspace not working after triple-click selecting last line
line_end = llclamp(line_end, 0, getLength());
}
if (line_start == -1)

44
indra/newview/installers/darwin/firestorm-nightly-dmg/VivoxAUP.txt
View File

@ -1,23 +1,23 @@
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
10. CHANGES TO THIS POLICY. Vivox may revise its Acceptable Use Policy from time to time without prior notice. Any changes will be presented in the latest version at the Vivox web site. All revised copies of the Policy are effective immediately upon a user's first use of the Service after the change has been posted.

44
indra/newview/installers/darwin/firestorm-private-dmg/VivoxAUP.txt
View File

@ -1,23 +1,23 @@
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
10. CHANGES TO THIS POLICY. Vivox may revise its Acceptable Use Policy from time to time without prior notice. Any changes will be presented in the latest version at the Vivox web site. All revised copies of the Policy are effective immediately upon a user's first use of the Service after the change has been posted.

44
indra/newview/installers/darwin/firestorm-release-dmg/VivoxAUP.txt
View File

@ -1,23 +1,23 @@
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
10. CHANGES TO THIS POLICY. Vivox may revise its Acceptable Use Policy from time to time without prior notice. Any changes will be presented in the latest version at the Vivox web site. All revised copies of the Policy are effective immediately upon a user's first use of the Service after the change has been posted.

44
indra/newview/installers/darwin/firestormos-beta-dmg/VivoxAUP.txt
View File

@ -1,23 +1,23 @@
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
10. CHANGES TO THIS POLICY. Vivox may revise its Acceptable Use Policy from time to time without prior notice. Any changes will be presented in the latest version at the Vivox web site. All revised copies of the Policy are effective immediately upon a user's first use of the Service after the change has been posted.

44
indra/newview/installers/darwin/firestormos-nightly-dmg/VivoxAUP.txt
View File

@ -1,23 +1,23 @@
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
10. CHANGES TO THIS POLICY. Vivox may revise its Acceptable Use Policy from time to time without prior notice. Any changes will be presented in the latest version at the Vivox web site. All revised copies of the Policy are effective immediately upon a user's first use of the Service after the change has been posted.

44
indra/newview/installers/darwin/firestormos-private-dmg/VivoxAUP.txt
View File

@ -1,23 +1,23 @@
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
10. CHANGES TO THIS POLICY. Vivox may revise its Acceptable Use Policy from time to time without prior notice. Any changes will be presented in the latest version at the Vivox web site. All revised copies of the Policy are effective immediately upon a user's first use of the Service after the change has been posted.

44
indra/newview/installers/darwin/firestormos-release-dmg/VivoxAUP.txt
View File

@ -1,23 +1,23 @@
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
Acceptable Use Policy (AUP)
1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.
2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.
3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.
4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.
5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.
THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.
6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.
7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .
8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.
9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.
10. CHANGES TO THIS POLICY. Vivox may revise its Acceptable Use Policy from time to time without prior notice. Any changes will be presented in the latest version at the Vivox web site. All revised copies of the Policy are effective immediately upon a user's first use of the Service after the change has been posted.

12
indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
View File

@ -1,6 +1,6 @@
The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE.
This is the format required for NSIS Unicode. See http://www.scratchpaper.com/ for details.
James Cook
September 2008
The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE.
This is the format required for NSIS Unicode. See http://www.scratchpaper.com/ for details.
James Cook
September 2008

11
indra/newview/llappviewer.cpp
View File

@ -4131,20 +4131,13 @@ void LLAppViewer::writeSystemInfo()
if (! gDebugInfo.has("Dynamic") )
gDebugInfo["Dynamic"] = LLSD::emptyMap();
// <FS:ND> set filename to Firestorm.log
// <FS:ND> we don't want this (otherwise set filename to Firestorm.old/log
// #if LL_WINDOWS
// gDebugInfo["SLLog"] = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,"SecondLife.log");
// #else
// //Not ideal but sufficient for good reporting.
// gDebugInfo["SLLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.old"); //LLError::logFileName();
// #endif
#if LL_WINDOWS
gDebugInfo["SLLog"] = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, APP_NAME + ".log");
#else
//Not ideal but sufficient for good reporting.
gDebugInfo["SLLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, APP_NAME + ".old"); //LLError::logFileName();
#endif
// </FS:ND>
gDebugInfo["ClientInfo"]["Name"] = LLVersionInfo::getChannel();
@ -4226,7 +4219,7 @@ void LLAppViewer::writeSystemInfo()
LL_INFOS("SystemInfo") << "OS: " << LLOSInfo::instance().getOSStringSimple() << LL_ENDL;
LL_INFOS("SystemInfo") << "OS info: " << LLOSInfo::instance() << LL_ENDL;
// <FS:ND> Breakpad merge. Only include SettingsFile if the user selected this in prefs. Path from Catznip
// <FS:ND> Breakpad merge. Only include SettingsFile if the user selected this in prefs. Patch from Catznip
// gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
if (gCrashSettings.getBOOL("CrashSubmitSettings"))
gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");

3
indra/newview/llappviewerwin32.cpp
View File

@ -157,6 +157,9 @@ namespace
sBugSplatSender->setDefaultUserEmail( WCSTR(STRINGIZE(LLOSInfo::instance().getOSStringSimple() << " (" << ADDRESS_SIZE << "-bit, flavor " << flavor <<")")));
// </FS:ND>
//<FS:ND/> Clear out username first, as we get some crashes that has the OS set as username, let's see if this fixes it.
sBugSplatSender->setDefaultUserName( WCSTR("<unset>") );
// <FS:ND> Only send avatar name if enabled via prefs
if (gCrashSettings.getBOOL("CrashSubmitName"))
{

14
indra/newview/lldrawpoolalpha.cpp
View File

@ -616,8 +616,12 @@ void LLDrawPoolAlpha::renderEmissives(U32 mask, std::vector<LLDrawInfo*>& emissi
void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass)
{
BOOL batch_fullbrights = gSavedSettings.getBOOL("RenderAlphaBatchFullbrights");
BOOL batch_emissives = gSavedSettings.getBOOL("RenderAlphaBatchEmissives");
// <FS:Ansariel> Tweak performance
//BOOL batch_fullbrights = gSavedSettings.getBOOL("RenderAlphaBatchFullbrights");
//BOOL batch_emissives = gSavedSettings.getBOOL("RenderAlphaBatchEmissives");
static LLCachedControl<bool> batch_fullbrights(gSavedSettings, "RenderAlphaBatchFullbrights");
static LLCachedControl<bool> batch_emissives(gSavedSettings, "RenderAlphaBatchEmissives");
// </FS:Ansariel>
BOOL initialized_lighting = FALSE;
BOOL light_enabled = TRUE;
@ -821,7 +825,11 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass)
// If this alpha mesh has glow, then draw it a second time to add the destination-alpha (=glow). Interleaving these state-changing calls is expensive, but glow must be drawn Z-sorted with alpha.
if (current_shader &&
draw_glow_for_this_partition &&
params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE))
// <FS:Ansariel> Re-add particle rendering optimization
//params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE))
params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE) &&
(!params.mParticle || params.mHasGlow))
// </FS:Ansariel>
{
LL_RECORD_BLOCK_TIME(FTM_RENDER_ALPHA_EMISSIVE);

11
indra/newview/lldrawpoolavatar.cpp
View File

@ -1956,17 +1956,6 @@ bool LLDrawPoolAvatar::getRiggedGeometry(
face->setPoolType(LLDrawPool::POOL_AVATAR);
}
//let getGeometryVolume know if a texture matrix is in play
if (face->mTextureMatrix)
{
face->setState(LLFace::TEXTURE_ANIM);
}
else
{
face->clearState(LLFace::TEXTURE_ANIM);
}
//LL_INFOS() << "Rebuilt face " << face->getTEOffset() << " of " << face->getDrawable() << " at " << gFrameTimeSeconds << LL_ENDL;
// Let getGeometryVolume know if a texture matrix is in play

4
indra/newview/lldrawpoolwater.cpp
View File

@ -832,11 +832,11 @@ LLColor3 LLDrawPoolWater::getDebugColor() const
// <FS:Zi> Render speedup for water parameters
void LLDrawPoolWater::onRenderTransparentWaterChanged()
{
mRenderTransparentWater=gSavedSettings.getBOOL("RenderTransparentWater");
mRenderTransparentWater = gSavedSettings.getBOOL("RenderTransparentWater");
}
void LLDrawPoolWater::onRenderWaterMipNormalChanged()
{
mRenderWaterMipNormal=gSavedSettings.getBOOL("RenderWaterMipNormal");
mRenderWaterMipNormal = gSavedSettings.getBOOL("RenderWaterMipNormal");
}
// </FS:Zi>

13
indra/newview/llmeshrepository.cpp
View File

@ -4822,7 +4822,13 @@ bool LLMeshRepository::getCostData(LLUUID mesh_id, LLMeshCostData& data)
LLMeshRepoThread::mesh_header_map::iterator iter = mThread->mMeshHeader.find(mesh_id);
if (iter != mThread->mMeshHeader.end() && mThread->mMeshHeaderSize[mesh_id] > 0)
{
LLSD& header = iter->second;
// <FS:ND> Make a copy of the header rather than holding on to the referece.
// Assumption: mMeshHeader gets modified in another thread, invalidating iter and thus causing a lot of crashed down the line
// LLSD& header = iter->second;
LLSD header = iter->second;
// </FS:ND>
bool header_invalid = (header.has("404")
|| !header.has("lowest_lod")
@ -4838,7 +4844,10 @@ bool LLMeshRepository::getCostData(LLUUID mesh_id, LLMeshCostData& data)
return false;
}
bool LLMeshRepository::getCostData(LLSD& header, LLMeshCostData& data)
// <FS:ND> Use a const ref, just to make sure no one modifies header and we can pass a copy.
// bool LLMeshRepository::getCostData(LLSD& header, LLMeshCostData& data)
bool LLMeshRepository::getCostData(LLSD const& header, LLMeshCostData& data)
// </FS:ND>
{
data = LLMeshCostData();

6
indra/newview/llmeshrepository.h
View File

@ -584,7 +584,11 @@ public:
F32 getStreamingCostLegacy(LLUUID mesh_id, F32 radius, S32* bytes = NULL, S32* visible_bytes = NULL, S32 detail = -1, F32 *unscaled_value = NULL);
static F32 getStreamingCostLegacy(LLSD& header, F32 radius, S32* bytes = NULL, S32* visible_bytes = NULL, S32 detail = -1, F32 *unscaled_value = NULL);
bool getCostData(LLUUID mesh_id, LLMeshCostData& data);
bool getCostData(LLSD& header, LLMeshCostData& data);
// <FS:ND> Use a const ref, just to make sure no one modifies header and we can pass a copy.
// bool getCostData(LLSD& header, LLMeshCostData& data);
bool getCostData(LLSD const& header, LLMeshCostData& data);
// </FS:ND>
LLMeshRepository();

1
indra/newview/llpreviewnotecard.cpp
View File

@ -345,6 +345,7 @@ void LLPreviewNotecard::loadAsset()
if((allow_modify || is_owner) && !source_library)
{
getChildView("Delete")->setEnabled(TRUE);
getChildView("Edit")->setEnabled(FALSE); // <FS:LO> Don't enable external editor button on no mod notecards.
}
}
else

15
indra/newview/quickprefs.cpp
View File

@ -61,7 +61,7 @@ std::string unescape_name(const std::string& name);
class FSSettingsCollector : public LLInventoryCollectFunctor
{
public:
FSSettingsCollector() { LL_INFOS() << "EEP: Inventory read: " << (gInventory.isInventoryUsable() ? "yes" : "no") << LL_ENDL;}
FSSettingsCollector() {}
virtual ~FSSettingsCollector() {}
bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
@ -69,7 +69,6 @@ public:
if (item && item->getType() == LLAssetType::AT_SETTINGS &&
mSeen.find(item->getAssetUUID()) == mSeen.end())
{
LL_INFOS() << "EEP: Found " << item->getName() << LL_ENDL;
mSeen.insert(item->getAssetUUID());
return true;
}
@ -334,19 +333,13 @@ void FloaterQuickPrefs::loadWaterPresets(const std::multimap<std::string, LLUUID
void FloaterQuickPrefs::loadPresets()
{
LLInventoryModel::cat_array_t cats;
LLInventoryModel::item_array_t items, libitems;
LLInventoryModel::item_array_t items;
FSSettingsCollector collector;
gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
gInventory.collectDescendentsIf(LLUUID::null,
cats,
items,
LLInventoryModel::EXCLUDE_TRASH,
collector);
gInventory.collectDescendentsIf(gInventory.getLibraryRootFolderID(),
cats,
libitems,
LLInventoryModel::EXCLUDE_TRASH,
collector);
items.insert(items.end(), libitems.begin(), libitems.end());
std::multimap<std::string, LLUUID> sky_map;
std::multimap<std::string, LLUUID> water_map;
@ -474,7 +467,6 @@ BOOL FloaterQuickPrefs::postBuild()
mDayCyclePresetsCombo = getChild<LLComboBox>("DCPresetsCombo");
initCallbacks();
loadPresets();
if (gRlvHandler.isEnabled())
{
@ -984,6 +976,7 @@ void FloaterQuickPrefs::enableWindlightButtons(BOOL enable)
childSetEnabled("edit_sky_preset", enable);
childSetEnabled("new_water_preset", enable);
childSetEnabled("edit_water_preset", enable);
childSetEnabled("PauseClouds", enable);
}
}

1
indra/newview/skins/default/xui/de/floater_phototools.xml
View File

@ -25,6 +25,7 @@
</text>
<button name="btn_personal_lighting" label="Persönliche Beleuchtung..."/>
<button name="ResetToRegionDefault" tool_tip="Setzt die Umgebungseinstellungen auf die gemeinsame Umgebung zurück."/>
<button name="PauseClouds" label="Wolken pausieren" tool_tip="Pausiert die Wolken-Animation."/>
</panel>
<panel name="P_Q_Windlights">

3
indra/newview/skins/default/xui/de/strings.xml
View File

@ -1373,6 +1373,9 @@ http://www.firestormviewer.org/support für Hilfe zum Lösen des Problems.
<string name="Mainland / Full Region">
Mainland / Vollständige Region
</string>
<string name="Linden Homes / Full Region">
Linden Homes / Vollständige Region
</string>
<string name="all_files">
Alle Dateien
</string>

45
indra/newview/skins/default/xui/en/floater_phototools.xml
View File

@ -68,7 +68,7 @@
top_pad="5"
left="4"
width="275"
height="61"
height="27"
border_visible="true"
background_visible="true">
<check_box
@ -92,7 +92,7 @@
top_pad="5"
left="4"
width="275"
height="115"
height="135"
border_visible="true"
background_visible="true">
<text
@ -239,9 +239,6 @@
<button.commit_callback
function="Floater.ToggleOrBringToFront"
parameter="env_adjust_snapshot" />
<button.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</button>
<button
name="ResetToRegionDefault"
@ -257,6 +254,30 @@
label_selected=""
scale_image="true"
/>
<button
follows="top|left|right"
height="20"
label="Pause Clouds"
image_selected="PushButton_Selected_Press"
image_disabled_selected="PushButton_Selected_Disabled"
image_disabled="PushButton_Disabled"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
layout="topleft"
name="PauseClouds"
tool_tip="Pauses cloud animations"
top_pad="3"
left="5"
right="-5">
<button.commit_callback
function="World.EnvSettings"
parameter="pause_clouds" />
<button.is_toggled_callback
function="World.EnableEnvSettings"
parameter="pause_clouds" />
</button>
</panel>
<panel
@ -266,7 +287,7 @@
layout="topleft"
top_pad="5"
left="4"
width="165"
width="275"
height="135"
border_visible="true"
background_visible="true">
@ -289,7 +310,7 @@
left="10"
name="horiz_separator1"
top_pad="-7"
width="145"/>
width="255"/>
<button
follows="left|top"
name="Sunrise"
@ -298,7 +319,7 @@
layout="topleft"
left="10"
top_pad="5"
width="145">
width="255">
<button.commit_callback
function="World.EnvSettings"
parameter="sunrise"/>
@ -311,7 +332,7 @@
layout="topleft"
left="10"
top_pad="2"
width="145">
width="255">
<button.commit_callback
function="World.EnvSettings"
parameter="noon"/>
@ -324,7 +345,7 @@
layout="topleft"
left="10"
top_pad="2"
width="145">
width="255">
<button.commit_callback
function="World.EnvSettings"
parameter="sunset"/>
@ -337,7 +358,7 @@
layout="topleft"
left="10"
top_pad="2"
width="145">
width="255">
<button.commit_callback
function="World.EnvSettings"
parameter="midnight"/>
@ -350,7 +371,7 @@
layout="topleft"
left="10"
top_pad="2"
width="145">
width="255">
<button.commit_callback
function="World.EnvSettings"
parameter="default"/>

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -630,6 +630,7 @@ http://www.firestormviewer.org/support for help fixing this problem.
<string name="Estate / Homestead">Estate / Homestead</string>
<string name="Mainland / Homestead">Mainland / Homestead</string>
<string name="Mainland / Full Region">Mainland / Full Region</string>
<string name="Linden Homes / Full Region">Linden Homes / Full Region</string>
<!-- File load/save dialogs -->
<string name="all_files">All Files</string>

1
indra/newview/skins/default/xui/ja/floater_NACL_explore_sounds.xml
View File

@ -33,6 +33,7 @@
<columns label="サウンド" name="sound" />
</scroll_list>
<button label="ローカルで再生" name="play_locally_btn" />
<button label="ローカルで停止" name="stop_locally_btn" />
<button label="カメラを近づける" name="look_at_btn" />
<button label="停止" name="stop_btn" />
<button label="非表示リスト" name="bl_btn" />

15
indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
View File

@ -18,10 +18,12 @@
<texture_picker label="髪" name="hair-baked"/>
<texture_picker label="髪" name="hair_grain"/>
<texture_picker label="髪のアルファ" name="hair_alpha"/>
<texture_picker label="髪のタトゥー" name="hair_tattoo" />
<texture_picker label="頭" name="head-baked"/>
<texture_picker label="メイクアップ" name="head_bodypaint"/>
<texture_picker label="頭部のアルファ" name="head_alpha"/>
<texture_picker label="頭部のタトゥー" name="head_tattoo"/>
<texture_picker label="頭部全体のタトゥー" name="head_universal_tattoo" />
<texture_picker label="目" name="eyes-baked"/>
<texture_picker label="目" name="eyes_iris"/>
<texture_picker label="目のアルファ" name="eyes_alpha"/>
@ -33,6 +35,7 @@
<texture_picker label="上着" name="upper_jacket"/>
<texture_picker label="アルファ（上）" name="upper_alpha"/>
<texture_picker label="上部のタトゥー" name="upper_tattoo"/>
<texture_picker label="上部全体のタトゥー" name="upper_universal_tattoo" />
<texture_picker label="下半身" name="lower-baked"/>
<texture_picker label="ボディペイント（下）" name="lower_bodypaint"/>
<texture_picker label="下着パンツ" name="lower_underpants"/>
@ -42,8 +45,20 @@
<texture_picker label="ジャケット" name="lower_jacket"/>
<texture_picker label="アルファ（下）" name="lower_alpha"/>
<texture_picker label="下部のタトゥー" name="lower_tattoo"/>
<texture_picker label="下部全体のタトゥー" name="lower_universal_tattoo" />
<texture_picker label="スカート" name="skirt-baked"/>
<texture_picker label="スカート" name="skirt"/>
<texture_picker label="スカートのタトゥー" name="skirt_tattoo" />
<texture_picker label="左腕" name="leftarm-baked" />
<texture_picker label="左腕のタトゥー" name="leftarm_tattoo" />
<texture_picker label="左脚" name="leftleg-baked" />
<texture_picker label="左脚のタトゥー" name="leftleg_tattoo" />
<texture_picker label="補助 1" name="aux1-baked" />
<texture_picker label="補助 1 のタトゥー" name="aux1_tattoo" />
<texture_picker label="補助 2" name="aux2-baked" />
<texture_picker label="補助 2 のタトゥー" name="aux2_tattoo" />
<texture_picker label="補助 3" name="aux3-baked" />
<texture_picker label="補助 3 のタトゥー" name="aux3_tattoo" />
</panel>
</panel>
</scroll_container>

42
indra/newview/skins/default/xui/ja/floater_export_collada.xml Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_export_collada" title="Collada 形式で保存...">
<floater.string name="texture_progress">
[OBJECT] Collada を保存：テクスチャ保存中 (あと [COUNT])
</floater.string>
<floater.string name="floater_title">
[OBJECT] を Collada 形式で保存...
</floater.string>
<layout_stack name="resizing_stack">
<layout_panel name="control_panel">
<text name="ObjectInfoText">
オブジェクト情報
</text>
<text name="NameText">
名前：[NAME]
</text>
<text name="exportable_prims">
エクスポート可能なプリム数：[COUNT]/[TOTAL]
</text>
<text name="exportable_textures">
エクスポート可能なテクスチャ数：[COUNT]/[TOTAL]
</text>
<text name="OptionsText">
オプション：
</text>
<check_box label="テクスチャを保存" name="export_textures_check" />
<check_box label="テクスチャを統合" name="consolidate_check" />
<check_box label="透明なものはスキップ" name="skip_transparent_check" />
<check_box label="テクスチャのパラメータを摘要" name="texture_params_check" />
<check_box label="単一の UV マップ" name="single_uv_map_check" />
<text name="TextureFormatText">
テクスチャの形式：
</text>
<combo_box name="texture_type_combo">
<combo_box.item label="TARGA" name="tga" />
<combo_box.item label="PNG" name="png" />
<combo_box.item label="JPEG2000" name="j2c" />
</combo_box>
<button label="別名で保存..." name="export_btn" />
</layout_panel>
</layout_stack>
</floater>

1
indra/newview/skins/default/xui/ja/floater_fs_area_search.xml
View File

@ -124,6 +124,7 @@
<panel label="詳細" name="area_search_advanced_panel">
<check_box name="double_click_touch" label="ダブルクリックでオブジェクトに触る" />
<check_box name="double_click_buy" label="ダブルクリックでオブジェクトを買う" />
<check_box name="double_click_sit" label="ダブルクリックでオブジェクトに座る" />
</panel>
</tab_container>
</floater>

32
indra/newview/skins/default/xui/ja/floater_fs_discord.xml Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<floater name="floater_discord" title="Discord">
<string name="discord_connected">次のアカウント名で Discord に接続：</string>
<string name="discord_disconnected">Discord に接続していません</string>
<string name="SocialDiscordConnecting">Discord に接続中...</string>
<string name="SocialDiscordErrorConnecting">Discord 接続中に問題が発生しました</string>
<string name="SocialDiscordDisconnecting">Discord を切断中...</string>
<text name="account_caption_label">
Discord に接続していません。
</text>
<text name="account_name_label" />
<check_box label="ログイン時に自動接続する" name="startup_check" />
<check_box label="ユーザー名を共有" name="name_check" />
<button label="接続..." name="connect_btn" />
<button label="切断" name="disconnect_btn" />
<text name="rating_label">
次のコンテンツ・レーティングで地域名を Discord に共有：
</text>
<combo_box name="maturity_desired_combobox">
<combo_box.item label="General, Moderate, Adult" name="Desired_Adult" />
<combo_box.item label="General, Moderate" name="Desired_Mature" />
<combo_box.item label="General" name="Desired_PG" />
<combo_box.item label="共有しない" name="Desired_None" />
</combo_box>
<text name="dont_names_label">
以下のリストにある地域名は Discord に共有しない：
</text>
<text name="connection_status_text">
ロード中...
</text>
</floater>

14
indra/newview/skins/default/xui/ja/floater_fs_im_session.xml
View File

@ -59,12 +59,20 @@
<layout_panel name="lp_options_btn">
<menu_button tool_tip="チャット・オプション" name="chat_options_btn" />
</layout_panel>
<layout_panel name="lp_chat_search_btn">
<button name="chat_search_btn" tool_tip="チャットを検索します" />
</layout_panel>
<layout_panel name="support_panel" width="130">
<layout_panel name="support_panel" width="130">
<icon name="dummy_icon_support_group" width="128"/>
<check_box label="ビューワタイプを特定" name="FSSupportGroupChatPrefix_toggle" width="125" tool_tip="あなたが現在使用しているビューワのバージョンとスキンの情報をこのグループ宛のメッセージの先頭に追加します。そうすることで、サポートスタッフがあなたに生じている問題を正確に診断し、あなたの質問に対してより正確な回答ができるようになります。" />
</layout_panel>
</layout_panel>
<layout_panel name="testing_panel">
<check_box label="ビルドを指定" name="FSSupportGroupChatPrefixTesting_toggle" tool_tip="現在のビューワ・バージョン、ビューワ・スキン、OS、RLVa のステータスをあなたがこのグループに送るメッセージの先頭に追加し、サポートスタッフが事象を正確に診断し、お問い合わせに正確に回答できるよう支援します。（このメッセージはサポート・グループに直接送られるわけではありません。）" />
</layout_panel>
<layout_panel name="lp_bar">
<icon name="dummy_icon" />
</layout_panel>
</layout_stack>
<layout_stack orientation="horizontal" name="chat_stack">
<layout_panel name="im_control_panel_holder">

3
indra/newview/skins/default/xui/ja/floater_fs_nearby_chat.xml
View File

@ -17,6 +17,9 @@
<layout_panel name="lp_options_btn">
<menu_button tool_tip="チャット・オプション" name="chat_options_btn"/>
</layout_panel>
<layout_panel name="lp_chat_search_btn">
<button name="chat_search_btn" tool_tip="周辺チャットを検索" />
</layout_panel>
</layout_stack>

16
indra/newview/skins/default/xui/ja/floater_fs_protectedfolders.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_fs_protected_folders" title="保護フォルダ">
<floater.string name="UnknownFolder">
(不明なフォルダ)
</floater.string>
<panel name="buttons_panel">
<filter_editor label="保護されたフォルダを検索" name="filter_input" />
<button name="remove_btn" tool_tip="フォルダを保護されたフォルダのリストから削除します" />
</panel>
<panel name="panel_fs_protected_folders">
<scroll_list name="folder_list">
<scroll_list.columns label="名前" name="name" />
</scroll_list>
</panel>
</floater>

1
indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
View File

@ -15,6 +15,7 @@
<text_editor name="Notecard Editor">
ローディング．．．
</text_editor>
<button name="Search" tool_tip="検索と置換" />
<button label="編集..." label_selected="編集" name="Edit"/>
<button label="保存" label_selected="保存" name="Save"/>
<button label="削除" label_selected="削除" name="Delete"/>

28
indra/newview/skins/default/xui/ja/floater_settings_debug.xml
View File

@ -1,13 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="デバッグ設定">
<combo_box name="boolean_combo">
<combo_box.item label="TRUE" name="TRUE"/>
<combo_box.item label="FALSE" name="FALSE"/>
</combo_box>
<color_swatch label="色" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>
<spinner label="x" name="val_spinner_2"/>
<spinner label="x" name="val_spinner_3"/>
<spinner label="x" name="val_spinner_4"/>
<button label="デフォルトにリセット" name="default_btn"/>
<panel name="debug_settings_search_panel">
<search_editor label="ここで検索" name="search_settings_input" tool_tip="興味のある言葉をここに入力して下さい。設定の名称やコメント内の文字に部分的に一致するものがあれば表示されます。" />
</panel>
<panel name="debug_settings_values_panel">
<text_editor name="comment_text" tool_tip="デバッグ設定のコメントです。選択した設定に関する有益な情報が得られます。" />
<radio_group name="boolean_combo">
<radio_item label="TRUE" name="TRUE" />
<radio_item label="FALSE" name="FALSE" />
</radio_group>
<color_swatch label="色" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>
<spinner label="x" name="val_spinner_2"/>
<spinner label="x" name="val_spinner_3"/>
<spinner label="x" name="val_spinner_4"/>
<button name="sanity_warning_btn" tool_tip="このデバッグ設定はサニティ・チェックに失敗しました。設定した値が推奨値の範囲を越えています。" />
<button label="コピー" name="copy_btn" tool_tip="この設定の名前をクリップボードにコピーします。" />
<button label="デフォルトにリセット" name="default_btn" tool_tip="このデバッグ設定をリセットしてデフォルト値に戻します。"/>
</panel>
</floater>

31
indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
View File

@ -31,21 +31,24 @@
<column label="名前" name="unit_name"/>
<column label="ID" name="unit_id_HIDDEN"/>
</scroll_list>
<combo_box name="l_bake_use_texture_combo_box" tool_tip="構築（ベーク）するテクスチャを選択">
<combo_box.item label="なし" name="None"/>
<combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/>
<combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/>
<combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/>
<combo_box.item label="BAKED_EYES" name="BAKED_EYES"/>
<combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/>
<combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/>
<combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/>
<combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/>
<combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/>
<combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/>
<combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/>
<combo_box name="l_bake_use_texture_combo_box" tool_tip="ベークするテクスチャを選択">
<combo_box.item label="なし" name="None" />
<combo_box.item label="BAKED_HEAD" name="BAKED_HEAD" />
<combo_box.item label="BAKED_UPPER" name="BAKED_UPPER" />
<combo_box.item label="BAKED_LOWER" name="BAKED_LOWER" />
<combo_box.item label="BAKED_EYES" name="BAKED_EYES" />
<combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT" />
<combo_box.item label="BAKED_HAIR" name="BAKED_HAIR" />
<combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM" />
<combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG" />
<combo_box.item label="BAKED_AUX1" name="BAKED_AUX1" />
<combo_box.item label="BAKED_AUX2" name="BAKED_AUX2" />
<combo_box.item label="BAKED_AUX3" name="BAKED_AUX3" />
</combo_box>
<check_box initial_value="false" label="基本となるメッシュリージョンを隠す" name="hide_base_mesh_region"/>
<check_box label="ベース・メッシュの部分を隠す" name="hide_base_mesh_region" />
<!-- bottom static -->
<line_editor name="TextureKey" label="00000000-0000-0000-0000-000000000000" tool_tip="テクスチャの UUID" />
<button name="TextureKeyApply" label="UUID を摘要" tool_tip="この UUID を摘要します" />
<button label="OK" label_selected="OK" name="Select"/>
<button label="取り消し" label_selected="取り消し" name="Cancel"/>
<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>

4
indra/newview/skins/default/xui/ja/menu_fs_area_search.xml
View File

@ -2,6 +2,7 @@
<context_menu name="Object List popup">
<menu_item_call label="スクリプト情報" name="script_info" />
<menu_item_call label="触る" name="touch_object" />
<menu_item_call label="座る" name="sit_on_object" />
<menu_item_call label="オブジェクトにテレポート" name="teleport_to_object" />
<menu_item_call label="ズーム" name="look_at_object" />
<menu_item_call label="検査" name="inspect_object" />
@ -10,4 +11,7 @@
<menu_item_call label="削除" name="delete_object" />
<menu_item_call label="ブラックリスト登録" name="blacklist_object" />
<menu_item_call label="オブジェクト購入" name="object_buy" />
<menu_item_call label="自分のオブジェクトを検索" name="filter_my_objects" />
<menu_item_call label="すべて選択" name="select_all" />
<menu_item_call label="選択をクリア" name="clear_selection" />
</context_menu>

1
indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="menu_gesture_gear">
<menu_item_call label="選択したジェスチャーのアクティベートの有無" name="activate"/>
<menu_item_call label="名前を変更する" name="rename" />
<menu_item_call label="コピー" name="copy_gesture"/>
<menu_item_call label="貼り付け" name="paste"/>
<menu_item_call label="UUID をコピー" name="copy_uuid"/>

1
indra/newview/skins/default/xui/ja/menu_inventory.xml
View File

@ -111,6 +111,7 @@
<menu label="HUD 装着先" name="Attach To HUD"/>
<menu_item_call label="編集" name="Wearable Edit"/>
<menu_item_call label="触る" name="Touch Attachment" />
<menu_item_call label="テクスチャの更新" name="Texture Refresh Attachment" />
<menu_item_call label="取り外す" name="Take Off"/>
<menu_item_call label="自分から取り外す" name="Detach From Yourself" />
<menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy"/>

3
indra/newview/skins/default/xui/ja/menu_viewer.xml
View File

@ -12,6 +12,7 @@
<menu_item_check label="持ち物" name="Inventory"/>
<menu_item_check label="持ち物" name="ShowSidetrayInventory"/>
<menu_item_check label="保護フォルダ" name="Protected Folders" />
<menu_item_check label="お気に入りの服やHUD" name="WearableFavorites" />
<menu_item_call label="ピック..." name="Picks"/>
<menu_item_call label="体験..." name="Experiences"/>
@ -44,6 +45,7 @@
<menu_item_call label="アバターを男性のデフォルトにリセット" name="ResetDefaultAvM"/>
<menu_item_call label="アバターを女性のデフォルトにリセット" name="ResetDefaultAvF"/>
<menu_item_check label="アバター表示の複雑さ情報を表示" name="Avatar Draw Info" />
<menu_item_call label="スクリプト" name="MyScripts" />
<menu_item_call label="ラグメーター" name="Lag Meter" />
<menu_item_call label="ブリッジを再作成" name="Recreate LSL Bridge"/>
</menu>
@ -85,6 +87,7 @@
<menu_item_call label="Facebook..." name="Facebook" />
<menu_item_call label="Twitter..." name="Twitter" />
<menu_item_call label="Flickr..." name="Flickr" />
<menu_item_call label="Discord..." name="Discord"/>
<menu_item_separator/>
<menu label="ボイスモーフィング" name="VoiceMorphing">
<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing" />

93
indra/newview/skins/default/xui/ja/notifications.xml
View File

@ -138,6 +138,10 @@
&apos;[ERROR_CODE]&apos;
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="MyOutfitsPasteFailed">
１つ以上のアイテムが「アウトフィット」として利用できません
<usetemplate name="okbutton" yestext="OK" />
</notification>
<notification name="MerchantPasteFailed">
マーケットプレイスのリストへのコピーまたは移動がエラーにより失敗しました:
@ -267,6 +271,10 @@
選択した住人から変更権限を取り下げますか？
<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
</notification>
<notification name="GroupNameLengthWarning">
グループ名の文字数は [MIN_LEN] 以上 [MAX_LEN] 以下でなければなりません。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="UnableToCreateGroup">
グループを作成できません。
[MESSAGE]
@ -526,6 +534,9 @@ L$ が不足しているのでこのグループに参加することができ
<notification name="ErrorPhotoCannotAfford">
インベントリに写真を保存するには L$[COST] が必要です。L$ を購入するか、代わりに写真をっコンピュータに保存できます。
</notification>
<notification name="ErrorCannotAffordUpload">
このアイテムをアップロードするには L$[COST] 必要です。
</notification>
<notification name="ErrorTextureCannotAfford">
インベントリにテクスチャを保存するには L$[COST] が必要です。L$ を購入するか、代わりに写真をコンピュータに保存できます。
</notification>
@ -1333,6 +1344,13 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
<button name="Cancel" text="取り消し"/>
</form>
</notification>
<notification label="ジェスチャーの名前を変更する" name="RenameGesture">
新しいジェスチャーの名前：
<form name="form">
<button name="OK" text="OK" />
<button name="Cancel" text="取り消し" />
</form>
</notification>
<notification name="RemoveFromFriends">
フレンドリストから &lt;nolink&gt;[NAME]&lt;/nolink&gt; を削除しますか？
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
@ -1533,6 +1551,24 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
<button name="Teleport" text="テレポート"/>
</form>
</notification>
<notification name="LoginPacketNeverReceivedNoTP">
接続がなかなかできません。 お使いのインターネット接続か、[SECOND_LIFE_GRID] の問題と考えられます。
インターネット接続を確認してから数分後に再接続するか、ヘルプをクリックして [SUPPORT_SITE] をご覧ください。
<url name="url">
http://secondlife.com/support/
</url>
<form name="form">
<button name="OK" text="OK" />
<button name="Help" text="ヘルプ" />
</form>
</notification>
<notification name="LoginRemoveMultiGridUserData">
削除しようとしているローカル・データは複数のグリッドで共有されています。本当に削除してよろしいですか？
<usetemplate name="okcancelbuttons" notext="取り消しl" yestext="確認" />
</notification>
<notification name="WelcomeChooseSex">
まもなくあなたのアバターが表示されます。
@ -1865,11 +1901,13 @@ https://secondlife.com/support/downloads/ からダウンロードしてくだ
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="GroupLimitInfo">
参加できるグループの上限は、ベーシック・アカウントが [MAX_BASIC] で、[https://secondlife.com/premium/index.php?lang=ja-JP プレミアム]
アカウントは [MAX_PREMIUM] です。
アカウントをダウングレードすると、参加しているグループを [MAX_BASIC] 以下に下げないと他のグループには参加できなくなります。
[https://secondlife.com/my/account/membership.php 今すぐアップグレート！]
ベーシック会員の住人が参加できるグループの上限は最大 [MAX_BASIC] グループです。
プレミアム会員は [MAX_PREMIUM] まで参加可能です。[次のページを参考にして、必要であればアップグレードして下さい。 https://secondlife.com/premium/index.php?lang=ja-JP]
<usetemplate name="okbutton" yestext="閉じる"/>
</notification>
<notification name="GroupLimitInfoPlus">
ベーシック会員の住人が参加できるグループの上限は最大 [MAX_BASIC] グループです。
プレミアム会員は [MAX_PREMIUM] まで、プレミアム・プラス会員の場合 [MAX_PREMIUM_PLUS] まで参加可能です。[次のページを参考にして、必要であればアップグレードして下さい。 https://secondlife.com/premium/index.php?lang=ja-JP]
<usetemplate name="okbutton" yestext="閉じる"/>
</notification>
<notification name="KickUser">
@ -3694,6 +3732,22 @@ M キーを押して変更します。
モデレーターがあなたのボイスをミュートしました。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="FailedToGetBenefits">
申し訳ありませんが、このセッションで利益情報を取得することができませんでした。通常の本番環境では起こるはずのない事象ですので、サポートに連絡してみて下さい。このセッションは通常通りに機能していないと思われ、再起動することをお勧めします。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="BulkUploadCostConfirmation">
[COUNT] 個のアイテムをアップロードすることにより、合計 L$[COST] のコストがかかります。アップロードを続けますか？
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="アップロード"/>
</notification>
<notification name="BulkUploadNoCompatibleFiles">
選択されたファイルの一括アップロードはできません。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="BulkUploadIncompatibleFiles">
選択されたファイルの中に、一括アップロードできないものがあります。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="UploadCostConfirmation">
このアップロードは L$[PRICE] のコストがかかります。アップロードを続けますか？
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="アップロード"/>
@ -4298,6 +4352,8 @@ AO セット "[AO_SET_NAME]" の名前を変更できません。
現在の設定：[CURRENT_VALUE]
<form name="form">
<button name="OK" text="修正する"/>
<button name="Cancel" text="そのままにする"/>
<ignore name="ignore" text="設定の変更が整合性確認検査で不合格となった場合"/>
</form>
</notification>
@ -5122,6 +5178,12 @@ Phoenix/Firestorm ビューワのサポート・グループへようこそ！
<notification name="BackupPathDoesNotExist">
バックアップ・パスが見つかりませんでした。
</notification>
<notification name="SettingsConfirmBackup">
本当にこのディレクトリにバックアップを作成してよろしいですか？
[DIRECTORY]
この場所にあるバックアップは全て上書きされます！
<usetemplate name="okcancelbuttons" notext="取り消しl" yestext="バックアップを保存" />
</notification>
<notification name="SettingsRestoreNeedsLogout">
設定をリストアするにはビューワの再起動が必要です。設定をリストアして今すぐビューワを終了しますか？
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="リストアして終了"/>
@ -5321,4 +5383,25 @@ Flickrの認証に失敗しました。もう一度試してみて下さい。
サーバ負荷のため、多数のオンラインステータス切替が有効になるまでにはしばらく時間がかかります。このままお待ち下さい。
<usetemplate ignoretext="オンラインステータスの切り替えに時間がかかる時は通知する" name="okignore" yestext="OK"/>
</notification>
<notification name="RenderVolumeLODFactorWarning">
警告：詳細レベル（LOD）要素が高く設定されています。
通常のご利用では、LOD 要素の値はは1〜3で十分です。
こうした値で形が崩れて見えるオブジェクトを他のものに置き換えることをご検討下さい。
LOD 要素 --> 3: タグに追加します。写真撮影の時のみご利用下さい。
LOD 要素 --> 4: 特殊な状況にのみご利用下さい。リログすると基の値に戻ります。
LOD 要素 --> 8: 具体的な効果は得られません。種々のエラーが発生する可能性があります。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="CurrencyURIOverrideReceived">
この地域は、サードパーティーの通貨購入を指定することを選択しています。
Firestorm ビューワを利用して行った通貨の購入は、ユーザーであるあなたと当該通貨のプロバイダーまたは販売者との間の取引であることをご認識下さい。
即ち、Firestorm ビューワ、Phoenix Firestorm ビューワ・プロジェクト、及びそのチームは当該取引によって直接間接に生じる費用や損害に関し、一切責任を追うものではありません。
もしこの利用規約に同意できない場合は、このビューワを利用していかなる金融取引もすべきではありません。
<usetemplate ignoretext="地域が新しい通貨ヘルパーを設定している場合" name="okignore" yestext="OK"/>
</notification>
<notification name="EnableHiDPI">
HiDPI 表示機能を有効にすると、何らかの影響が生じたり、性能が損なわれる可能性があります。
</notification>
</notifications>

10
indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="cof_wearables">
<accordion name="cof_wearables_accordion">
<accordion_tab name="tab_attachments" title="アタッチメント"/>
<accordion_tab name="tab_clothing" title="衣類"/>
<accordion_tab name="tab_body_parts" title="身体部位"/>
</accordion>
<tab_container name="wearable_accordion">
<panel name="tab_clothing" title="衣類" />
<panel name="tab_attachments" title="アタッチメント" />
<panel name="tab_body_parts" title="身体部位" />
</tab_container>
</panel>

5
indra/newview/skins/default/xui/ja/panel_edit_shape.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_shape_panel">
<string name="meters">
メートル
@ -9,7 +9,8 @@
<string name="height">
身長：
</string>
<panel name="accordion_panel">
<text name="avatar_height"/>
<panel label="シャツ" name="accordion_panel">
<accordion name="wearable_accordion">
<accordion_tab name="shape_body_tab" title="身体" />
<accordion_tab name="shape_head_tab" title="頭" />

35
indra/newview/skins/default/xui/ja/panel_edit_universal.xml
View File

@ -1,19 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_universal_panel">
<scroll_container name="avatar_universal_scroll">
<panel name="avatar_universal_color_panel">
<texture_picker label="頭部のタトゥー" name="Head Universal Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="上部のタトゥー" name="Upper Universal Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="下部のタトゥー" name="Lower Universal Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="スカートのタトゥー" name="Skirt Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="髪の毛のタトゥー" name="Hair Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="目のタトゥー" name="Eyes Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="左腕のタトゥー" name="Left Arm Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="左脚のタトゥー" name="Left Leg Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="Aux1 のタトゥー" name="Aux1 Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="Aux2 のタトゥー" name="Aux2 Tattoo" tool_tip="クリックして写真を選択する"/>
<texture_picker label="Aux3 のタトゥー" name="Aux3 Tattoo" tool_tip="クリックして写真を選択する"/>
<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
</panel>
</scroll_container>
<scroll_container name="avatar_universal_scroll">
<panel name="avatar_universal_color_panel">
<texture_picker label="頭部のタトゥー" name="Head Universal Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="上部のタトゥー" name="Upper Universal Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="下部のタトゥー" name="Lower Universal Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="スカートのタトゥー" name="Skirt Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="髪のタトゥー" name="Hair Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="目のタトゥー" name="Eyes Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="左腕のタトゥー" name="Left Arm Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="左脚のタトゥー" name="Left Leg Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="補助 1 のタトゥー" name="Aux1 Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="補助 2 のタトゥー" name="Aux2 Tattoo" tool_tip="クリックして写真を選択" />
<texture_picker label="補助 3 のタトゥー" name="Aux3 Tattoo" tool_tip="クリックして写真を選択" />
<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます" />
</panel>
</scroll_container>
</panel>

3
indra/newview/skins/default/xui/ja/panel_fs_login.xml
View File

@ -3,6 +3,9 @@
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php?lang=ja
</panel.string>
<string name="ServerComboTooltip">
既存のグリッドまたは URI
</string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">

3
indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml
View File

@ -3,6 +3,9 @@
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php?lang=ja
</panel.string>
<string name="ServerComboTooltip">
既存のグリッドまたは URI
</string>
<layout_stack name="ui_stack">
<layout_panel name="ui_elastic_pad_left" />
<layout_panel name="ui_container">

64
indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="グループ作成" name="GroupCreation">
<panel.string name="current_membership">
(自分の会費)
</panel.string>
<panel name="group_info_top">
<text name="group_name_label">
グループ名：
</text>
<line_editor label="ここに新しいグループの名前を入力して下さい" name="group_name_editor" />
</panel>
<scroll_container name="content_scroll_container">
<panel name="content_panel">
<layout_stack name="layout">
<layout_panel name="group_info">
<panel name="group_info_top2">
<texture_picker name="insignia" label="" />
<text_editor name="charter">
グループの理念、指針
</text_editor>
</panel>
<panel name="preferences_container">
<check_box label="誰でも入会できます" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。" />
<check_box label="入会費がかかります" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。" />
<spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。" />
<combo_box name="group_mature_check" tool_tip="レーティング区分は、グループ内でどのようなコンテンツや行動が許されるかを指定するものです">
<combo_item name="select_mature" value="Select">
- レーティング区分を指定 -
</combo_item>
<combo_box.item label="「Moderate」コンテンツ" name="mature" value="Mature" />
<combo_box.item label="「General」コンテンツ" name="pg" value="Not Mature" />
</combo_box>
</panel>
</layout_panel>
<layout_panel name="create_info">
<text name="fee_information">
グループを作成する費用は会員レベルによって異なります。[詳しくは https://secondlife.com/my/account/membership.php?lang=ja-JP]
</text>
<scroll_list name="membership_list">
<scroll_list.columns name="clmn_name" />
<scroll_list.columns name="clmn_price"/>
<scroll_list.rows name="basic" value="ベーシック (placeholder)"/>
<scroll_list.rows name="plc2" value="" />
<scroll_list.rows name="premium" value="プレミアム (placeholder)" />
</scroll_list>
</layout_panel>
<layout_panel name="create_actions">
<layout_stack name="button_row_ls">
<layout_panel name="layout_crt">
<button label="L$ [COST] でグループを作成" name="btn_create" tool_tip="新しいグループを作成します" />
<button name="back" label="取り消しl" />
</layout_panel>
</layout_stack>
<text name="info_deletion">
注意：グループを作成して７日間、創立者以外にメンバーが１人もいないう場合、そのグループは削除されます。
</text>
</layout_panel>
</layout_stack>
</panel>
</scroll_container>
</panel>

1
indra/newview/skins/default/xui/ja/panel_group_roles.xml
View File

@ -74,6 +74,7 @@ Ctrl キーを押しながらメンバー名をクリックすると
<scroll_list.columns label="#" name="members"/>
</scroll_list>
<button label="新しい役割" name="role_create"/>
<button label="役割をコピー" name="role_copy" />
<button label="役割を削除" name="role_delete"/>
</panel>

8
indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
View File

@ -20,7 +20,7 @@
<panel label="bottom_panel" name="header_panel">
<panel label="bottom_panel" name="outfit_name_and_status">
<text name="status" value="編集しています..."/>
<text name="curr_outfit_name" value="[Current Outfit]"/>
<text name="curr_outfit_name" value="[現在のアウトフィット]"/>
</panel>
</panel>
<layout_stack name="im_panels">
@ -39,9 +39,15 @@
</layout_panel>
</layout_stack>
<panel name="no_add_wearables_button_bar">
<text name="avatar_complexity_label">
複雑さ：[WEIGHT]
</text>
<button name="shop_btn_1" tool_tip="「SL マーケットプレイス」ページをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。"/>
</panel>
<panel name="add_wearables_button_bar">
<text name="avatar_complexity_adding_label">
複雑さ：[WEIGHT]
</text>
<button name="shop_btn_2" tool_tip="「SL マーケットプレイス」ページをご覧ください。また、いま着用しているアイテムを選択してここをクリックすると、それに似たアイテムが表示されます。"/>
</panel>
<panel name="save_revert_button_bar">

21
indra/newview/skins/default/xui/ja/panel_preferences_UI.xml
View File

@ -43,10 +43,12 @@
<panel label="2D オーバーレイ" name="ui-2d-overlay" >
<text name="UI Size:" >
UIサイズ（副作用の可能性あり）：
</text>
<slider name="ui_scale_slider" />
<text name="UI Size:" width="95">
UI サイズ：
</text>
<text name="HUD Size:" width="95">
HUD サイズ：
</text>
<text name="ScriptDialogsPerObjectLabel" width="200">
オブジェクトあたりのスクリプト情報表示：
</text>
@ -72,7 +74,16 @@
<check_box label="パイメニューを使用" name="UsePieMenu" tool_tip="土地や中バー、オブジェクト、装着物を右クリックした時に、諜報兼のコンテキストメニューでなく、１系の丸いメニューを使用します。" />
<check_box label="テキストに動きを付ける" name="PieMenuPopupFontEffect" tool_tip="パイメニューが開く時のアニメーションに合わせて、パイメニューの中のテキストも動くようにします。" />
<check_box label="外側に丸い影を付ける" name="PieMenuOuterRingShade" tool_tip="パイメニューの縁に丸い影をつけてサブメニューを見やすくします。" />
<check_box label="グループ通知や支払い通知を右上に表示" name="ShowGroupNoticesTopRight" tool_tip="ここにチェックを入れると、グループ通知や支払い通知などを画面の右上に表示します。（旧式の１系スタイル）" />
<text name="ShowGroupNoticesTopRightLabel">
グループ通知とミニアイコンの位置：
</text>
<radio_group name="ShowGroupNoticesTopRight" tool_tip="グループ通知やミニアイコンの画面上の位置を選択します">
<radio_item label="右下" name="radio" />
<radio_item label="右上" name="radio1" />
</radio_group>
<!--
<check_box label="グループ通知や支払い通知を右上に表示" name="ShowGroupNoticesTopRight" tool_tip="ここにチェックを入れると、グループ通知や支払い通知などを画面の右上に表示します。（旧式の１系スタイル）" />
-->
<text name="GroupTopRightRequiresRestart">
（再起動が必要）
</text>

2
indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
View File

@ -407,7 +407,7 @@
<line_editor name="FSCmdLineTeleportHome"/>
<!-- 指定SIMに移動 -->
<text name="FSCmdLineMapTo_txt">
指定したSIMに移動（使用法：cmd SIM名）
指定したSIMに移動（使用法：cmd SIM名 | x y z）
</text>
<line_editor name="FSCmdLineMapTo"/>
<check_box label="目標SIMの同じ座標に移動" name="toggle"/>

13
indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
View File

@ -171,10 +171,13 @@
<panel label="ミニマップ" name="tab-minimap">
<slider label="背景の不透明度:" name="FSMiniMapOpacity" />
<text name="netmap_pickradius_textbox">
ピックする半径:
<text name="netmap_pickradius_color_textbox">
選択する半径:
</text>
<color_swatch name="MapPickRadiusColor" tool_tip="ミニマップ上で選択する範囲の色を制御します。選択する範囲の大きさは「選択範囲」の設定で調整できます。" />
<text name="netmap_pickradius_opacity_textbox">
不透明度：
</text>
<color_swatch name="MapPickRadiusColor" />
<slider name="MapPickRadiusTransparency" />
<text name="netmap_dots_textbox">
ミニマップの点:
@ -235,6 +238,10 @@
検索結果の強調色:
</text>
<color_swatch name="preferences_search_color" tool_tip="検索結果を強調する色を選択します" />
<text name="area_search_beacon_color_label">
エリアサーチ・ビーコンの色
</text>
<color_swatch name="area_search_beacon_color" tool_tip="エリアサーチ・ビーコンの色を選択します" />
<check_box name="FSScriptDialogNoTransparency" label="スクリプトからの通知の背景は常に不透明にする" />
<check_box name="FSGroupNotifyNoTransparency" label="グループ通知の背景は常に不透明にする" />

7
indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml
View File

@ -62,6 +62,9 @@
<spinner name="RenderVolumeSAFrameMax" />
<check_box label="スパムからの保護" name="UseAntiSpam" />
<!-- FS:TS FIRE-23138: Enable spam protection for user's objects -->
<check_box label="自分が所有するオブジェクトからのスパムからも保護する" name="FSUseAntiSpamMine" tool_tip="ここにチェックを入れると、自分が所有するオブジェクトからのスパムに対しても保護されるようになります" />
<!-- /FS:TS FIRE-23138 -->
<text name="AntiSpamText1">
１メッセージあたりの最大受信行数：
</text>
@ -253,6 +256,10 @@
</text>
<line_editor name="preprocinclude_location" />
<button label="参照" name="SetPreprocInclude" />
<text name="externaleditor_textbox">
外部エディタ：
</text>
<button label="参照" label_selected="参照" name="SetExternalEditor" />
</panel>

13
indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
View File

@ -133,10 +133,11 @@
<panel label="ハードウェア設定" name="Hardware Settings" >
<check_box label="異方性フィルタリング（有効にすると速度が低下します）" name="ani" />
<check_box label="異方性フィルタリング（有効にすると速度が低下します）" name="ani" tool_tip="ここにチェックを入れると、異方性フィルタリングが有効になります。これは、自分のカメラの位置に対して、正面ではない角度で見えているテクスチャの品質を向上させるものです。通常、より遠くにある部分がぼやけて見えるのを防ぎます。" />
<check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。しかし、旧型のハードウェアではVBOの実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。" />
<check_box label="VBOのストリームを有効にする" name="vbo_stream" tool_tip="VBOを有効にしている時に、このオプションをオフにするとパフォーマンスが向上する可能性があります。多くのAMDのGPUにおいて、このオプションをオフにしたことで顕著なパフォーマンスの向上が見られました。" />
<check_box label="テクスチャの不可逆圧縮（再起動が必要）" name="texture compression" tool_tip="ビデオメモリ内のテクスチャを圧縮することで、色の品質が低下する代わりに、より高解像度のテクスチャやより多くのテクスチャを読み込むことを可能にします。" />
<check_box label="HiDPI 表示対応を有効にする（Mac OSX のみ。再起動が必要。）" name="use HiDPI" tool_tip="高解像度描画のための OpenGL を有効にします" />
<text name="Antialiasing:" tool_tip="ハードウェアによってはこの設定の変更を適用するには再起動が必要な場合があります。" >
アンチエイリアス：
</text>
@ -180,11 +181,11 @@
<text name="TextureDetailLabel">
テクスチャの読み込み精度
</text>
<combo_box name="TextureDetail"
width="150">
<combo_box.item label="標準品質" name="0"/>
<combo_box.item label="低品質" name="3"/>
<combo_box.item label="テクスチャなし" name="5"/>
<combo_box name="TextureDetail">
<combo_box.item label="標準 (0) 品質" name="0" />
<combo_box.item label= "中(3) 品質" name="3" />
<combo_box.item label="低 (4) 品質" name="4" />
<combo_box.item label="テクスチャなし (5)" name="5" />
</combo_box>
<text name="Alpha Mask Rendering">

4
indra/newview/skins/default/xui/ja/panel_preferences_move.xml
View File

@ -6,7 +6,7 @@
<!--View-->
<panel label="表示" name="tab-view">
<slider label="視界角" name="camera_fov"/>
<slider label="視界角" name="camera_fov" tool_tip="RLで言う「ズーム」をするのがこの機能です。これを使うとビューワの画角（FOV）が変わります。「Ctrl + 0」または「Ctrl + 8」を押しても同様の動きをします。※注意！　フライカム（3D Space Navigator）を有効にしているとこの機能は使えません。" />
<slider label="距離" name="camera_offset_scale"/>
<slider label="ズーム移動時間" name="camera_transition_time" />
<slider label="スムージング" name="camera_position_smoothing" />
@ -131,7 +131,7 @@
<combo_box.item label="世界地図を開く" name="1"/>
<combo_box.item label="その場所にテレポート" name="2"/>
</combo_box>
<slider label="選択範囲:" name="FSMinimapPickScale" tool_tip="ミニマップ上で選択する範囲の半径を設定します" />
<slider label="選択範囲：" name="FSMinimapPickScale" tool_tip="ミニマップ上で選択する範囲の半径を設定します。選択する範囲の不透明度と色は、「選択する半径」の色と「不透明度」の設定で調整できます。" />
<text name="world_map_options_label">
世界地図のオプション:

6
indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
View File

@ -84,6 +84,7 @@
<check_box label="自分のカメラの焦点がどこにあるか他人には知らせない" name="privatelookat" tool_tip="他人があなたのカメラの焦点がどこにあるか知るのを防ぎます。" />
<check_box label="自分の画面上でもカメラの焦点がどこにあるかわからないようにする" name="privateLocalLookat" tool_tip="通常、カメラの焦点が当たっている方向にアバターの頭が向くように自分の画面では表示されています。この頭の動きは、このオプションのオン／オフに関わりなく、必ずしも他人に見えるものではありません。" />
<check_box label="自分が選択しているものを他人には知らせない" name="privatepointat" tool_tip="他人があなたが選択しているものが何かを知るのを防ぎます。" />
<check_box label="頭部からの距離を制限" name="LimitLookAt" tool_tip="視線の先を自分の頭部の周りだけに固定するようにします" />
</panel>
@ -91,7 +92,10 @@
<!--Autoresponse1-->
<panel label="自動応答 1" name="tab-autoresponse-1" >
<text name="autorespond_toggle_location_tip">
注意：自動応答メッセージを有効にするには、「コミュニケーション」メニューの「ログイン状態」で適切なログイン状態を選択して下さい。
</text>
<text name="text_box3">
取り込みモード時の自動応答メッセージ：
</text>

33
indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
View File

@ -3,6 +3,12 @@
<panel.string name="middle_mouse">
マウスの中央
</panel.string>
<panel.string name="button4_mouse">
マウスボタン 4
</panel.string>
<panel.string name="button5_mouse">
マウスボタン 5
</panel.string>
<tab_container label="Firestorm環境設定" name="tabs">
@ -32,13 +38,40 @@
L$入出金通知音の閾値：
</text>
<spinner name="money_change_threshold" />
<panel name="output_device_settings_panel">
<panel.string name="output_default_text">
デフォルト
</panel.string>
<panel.string name="output_no_device">
機器がありません
</panel.string>
<panel.string name="output_name_no_device">
名称未設定の機器
</panel.string>
<panel.string name="output_device_unavailable">
使用できない機器
</panel.string>
<text name="output_label">
出力機器
</text>
</panel>
</panel>
<!-- Media -->
<panel label="メディア" name="Media Media Panel" >
<text name="media_autoplay_label">
メディアの自動再生
</text>
<combo_box name="media_auto_play_combo">
<item label="無効" name="autoplay_disabled" />
<item label="有効" name="autoplay_enabled" />
</combo_box>
<!--
<check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します"/>
-->
<check_box label="他の住人のスクリプトがメディアを再生することを許可" name="media_allowscript_btn" tool_tip="他の住人がスクリプトの入ったオブジェクトを使って土地のメディアをコントロールすることを許可／禁止します"/>
<check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします"/>
<check_box label="メディアフィルターを有効にする（セキュリティレベルが上がります）" name="media_filter" tool_tip="このチェックを入れることで、特定のサイトのメディアを再生するかどうかフィルターをかけることができるようになります"/>

3
indra/newview/skins/default/xui/ja/panel_script_ed.xml
View File

@ -15,9 +15,6 @@
<panel.string name="Title">
スクリプト： [NAME]
</panel.string>
<panel.string name="external_editor_not_set">
環境変数 LL_SCRIPT_EDITOR または ExternalEditor を設定してエディターを選択します。
</panel.string>
<menu_bar name="script_menu">
<menu label="ファイル" name="File">
<menu_item_call label="保存" name="Save"/>

74
indra/newview/skins/default/xui/ja/panel_script_ed_preproc.xml Normal file
View File

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="script panel">
<panel.string name="loading">
ロード中...
</panel.string>
<panel.string name="can_not_view">
このスクリプトの内容を見たり、編集することはできません。権限に制限がかけられているためです。オブジェクト内のスクリプトを見たり編集したりするには、フル・パーミッションが与えられている必要があります。
</panel.string>
<panel.string name="public_objects_can_not_run">
パブリックのオブジェクトでスクリプトを実行することはできません。
</panel.string>
<panel.string name="script_running">
実行中
</panel.string>
<panel.string name="Title">
スクリプト：[NAME]
</panel.string>
<menu_bar name="script_menu">
<menu label="ファイル" name="File">
<menu_item_call label="保存" name="Save" />
<menu_item_call label="全ての変更を戻す" name="Revert All Changes" />
<menu_item_call label="ファイルから読み込む..." name="LoadFromFile" />
<menu_item_call label="ファイルに保存..." name="SaveToFile" />
<menu_item_call label="スクリプトエディタの環境設定..." name="ScriptPrefs" />
</menu>
<menu label="編集" name="Edit">
<menu_item_call label="元に戻す" name="Undo" />
<menu_item_call label="やり直す" name="Redo" />
<menu_item_call label="切り取り" name="Cut" />
<menu_item_call label="コピー" name="Copy" />
<menu_item_call label="貼り付け" name="Paste" />
<menu_item_call label="すべて選択" name="Select All" />
<menu_item_call label="選択解除" name="Deselect" />
<menu_item_call label="検索／置換..." name="Search / Replace..." />
<menu_item_call label="指定行に移動..." name="Go to line..." />
</menu>
<menu label="ヘルプ" name="Help">
<menu_item_call label="ヘルプ..." name="Help..." />
<menu_item_call label="キーワードヘルプ..." name="Keyword Help..." />
<menu_item_call label="スクリプトライブラリ..." name="Script Library" />
</menu>
</menu_bar>
<layout_stack name="script_editor_button_bar">
<layout_panel name="script_editor_buttons_panel">
<button tool_tip="スクリプトを保存します" label="" name="save_btn" />
<button tool_tip="外部スクリプトエディタ" label="" name="Edit_btn" />
<button tool_tip="スクリプトをハードディスクから読み込みます" label="" name="load_disk_btn" />
<button tool_tip="スクリプトをハードディスクに保存します" label="" name="save_disk_btn" />
<button tool_tip="切り取り" label="" name="cut_btn" />
<button tool_tip="コピー" label="" name="copy_btn" />
<button tool_tip="貼り付け" label="" name="paste_btn" />
<button tool_tip="元に戻す" label="" name="undo_btn" />
<button tool_tip="やり直す" label="" name="redo_btn" />
<button tool_tip="検索／置換" label="" name="search_btn" />
<button tool_tip="スクリプトエディタの環境設定" label="" name="prefs_btn" />
</layout_panel>
</layout_stack>
<tab_container name="Tabset">
<panel name="Script" label="スクリプト">
<script_editor name="Script Editor">
ロード中...
</script_editor>
</panel>
<panel name="Preprocessed" label="プリプロセス">
<fs_lsl_preproc_viewer name="Post Editor">
ロード中...
</fs_lsl_preproc_viewer>
</panel>
</tab_container>
<scroll_list name="lsl errors" />
<combo_box label="挿入..." name="Insert..." />
<button label="編集..." name="edit_btn_2" />
<button label="保存" label_selected="保存" name="save_btn_2" />
</panel>

5
indra/newview/skins/default/xui/ja/panel_tools_texture.xml
View File

@ -107,5 +107,8 @@
<spinner label="水平オフセット" name="shinyOffsetU"/>
<spinner label="垂直オフセット" name="shinyOffsetV"/>
<check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。"/>
<button label="揃える" label_selected="現在のテクスチャレイヤーを揃える" name="button align textures" tool_tip="現在のテクスチャレイヤーを揃える"/>
<check_box label="素材を同期" name="checkbox_sync_settings" tool_tip="テクスチャ・マップのパラメータを同期します" />
<button label="揃える" name="button align textures" tool_tip="現在のテクスチャ・レイヤーを揃えます" />
<button label="コピー" name="copytextures" />
<button label="貼り付け" name="pastetextures" />
</panel>

18
indra/newview/skins/default/xui/ja/strings.xml
View File

@ -455,6 +455,12 @@ support@secondlife.com にお問い合わせください。
<string name="TooltipOutboxMixedStock">
在庫フォルダ内のアイテムはすべて同じ種類と権限でなければなりません
</string>
<string name="TooltipOutfitNotInInventory">
「アウトフィット」に入れることが出来るのは、ご自分の持ち物にあるアイテムやアウトフィットに限られます
</string>
<string name="TooltipCantCreateOutfit">
１つ以上のアイテムが「アウトフィット」として利用することができません
</string>
<string name="TooltipDragOntoOwnChild">
フォルダをその子フォルダに移動することはできません
</string>
@ -2173,6 +2179,9 @@ http://www.firestormviewer.org/support
<string name="NoGroupDataFound">
グループのデータが見つかりませんでした
</string>
<string name="AlreadyInGroup">
既にこのグループに所属しています
</string>
<string name="IMParentEstate">
parent estate
</string>
@ -5044,7 +5053,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
このアウトフィットにはアイテムがありません
</string>
<string name="ExternalEditorNotSet">
ExternalEditor 設定を使ってエディターを選択します。
環境変数 LL_SCRIPT_EDITOR を設定するか、ExternalEditor 設定を使ってエディターを選択します。
</string>
<string name="ExternalEditorNotFound">
指定された外部エディターが見つかりません。
@ -5732,6 +5741,13 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
自分のアニメーションを停止する
</string>
<string name="Command_Discord_Label">
Discord
</string>
<string name="Command_Discord_Tooltip">
Discord
</string>
<!-- Mesh UI terms -->
<string name="Retain%">
維持率

5
indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<bodyparts_list_item name="wearable_item">
<lock_panel name="btn_lock" tool_tip="編集権限がありません"/>
<edit_btn name="btn_edit" tool_tip="このシェイプを編集します"/>
</bodyparts_list_item>

5
indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<clothing_list_item name="wearable_item">
<lock_panel name="btn_lock" tool_tip="編集権限がありません"/>
<edit_btn name="btn_edit" tool_tip="この装着物を編集します"/>
</clothing_list_item>

4
indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<deletable_wearable_list_item name="deletable_wearable_item">
<delete_btn name="btn_delete" tool_tip="アウトフィットから取り除く"/>
</deletable_wearable_list_item>

4
indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<dummy_clothing_list_item name="dummy_clothing_item">
<add_btn name="btn_add" tool_tip="この種類のアイテムを更に追加します" />
</dummy_clothing_list_item>

4
indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<flat_list_view>
<flat_list_view.no_items_text name="no_items_msg" value="該当がありません" />
</flat_list_view>

4
indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<inbox_folder_view_folder>
<new_badge label="新規"/>
</inbox_folder_view_folder>

4
indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<inbox_folder_view_item>
<new_badge label="新規"/>
</inbox_folder_view_item>

2
indra/newview/skins/default/xui/ja/widgets/name_editor.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<name_editor default_text="(取得中)"/>

6
indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel_camera_item>
<panel_camera_item.text name="picture_name">
テキスト
</panel_camera_item.text>
</panel_camera_item>

9
indra/newview/skins/default/xui/ja/widgets/person_view.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<person_view>
<permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトは編集できません"/>
<permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="このフレンドはあなたのオブジェクトを編集、削除または取ることができます"/>
<permission_map_icon tool_tip="このフレンドはマップ上であなたのいる場所を探すことができます" name="permission_map_icon"/>
<permission_online_icon name="permission_online_icon" tool_tip="このフレンドにはあなたがオンラインになったことがわかります"/>
<info_btn name="info_btn" tool_tip="詳細"/>
<profile_btn name="profile_btn" tool_tip="プロファイルを見る"/>
</person_view>

3
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -1257,6 +1257,9 @@ http://www.firestormviewer.org/support aby uzyskać pomoc.
<string name="Mainland / Full Region">
Mainland / Pełny Region
</string>
<string name="Linden Homes / Full Region">
Domy Lindenów / Pełny Region
</string>
<string name="all_files">
Wszystkie pliki
</string>

134
indra/newview/skins/default/xui/ru/floater_about_land.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floaterland" title="О земле">
<floater.string name="Hours">
[HOURS] ч
</floater.string>
<floater.string name="Hour">
ч
</floater.string>
<floater.string name="Hours">
[HOURS] ч
</floater.string>
<floater.string name="Hour">
ч
</floater.string>
<floater.string name="Minutes">
[MINUTES] мин.
</floater.string>
@ -18,9 +18,9 @@
<floater.string name="Remaining">
осталось
</floater.string>
<floater.string name="Always">
Всегда
</floater.string>
<floater.string name="Always">
Всегда
</floater.string>
<tab_container name="landtab">
<panel label="Общее" name="land_general_panel">
<panel.string name="new users only">
@ -62,9 +62,12 @@
<panel.string name="no_selection_text">
Участок не выбран.
</panel.string>
<panel.string name="error_resolving_uuid">
UUID участка не может быть исправлен.
</panel.string>
<panel.string name="time_stamp_template">
[wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
</panel.string>
<panel.string name="error_resolving_uuid">
UUID участка не может быть исправлен.
</panel.string>
<text name="Name:">
Название:
</text>
@ -96,8 +99,8 @@
Группа:
</text>
<text name="GroupText">
Загрузка...
</text>
Загрузка...
</text>
<button label="Задать" name="Set..."/>
<check_box label="Разрешить передачу земли группе" name="check deed" tool_tip="Должностное лицо группы может передать эту землю группе с учетом существующего взноса." />
<button label="Передать" name="Deed..." tool_tip="Вы можете передать землю только если вы являетесь должностным лицом выбранной группы."/>
@ -139,7 +142,7 @@
Загрузка...
</text>
<button label="Купить землю" name="Buy Land..."/>
<button label="Продажа Linden" name="Linden Sale..." tool_tip="Земля должна быть в собственности, иметь заданное содержимое и не быть выставленной на аукцион." />
<button label="Продажа Linden" name="Linden Sale..." tool_tip="Земля должна быть в собственности, иметь заданное содержимое и не быть выставленной на аукцион." />
<button label="Информация о скриптах" name="Scripts..."/>
<button label="Купить для группы" name="Buy For Group..." />
<button label="Купить пропуск" name="Buy Pass..." tool_tip="Пропуск дает вам временный доступ на эту землю." />
@ -254,9 +257,9 @@
<text name="Object Owners:">
Владельцы объектов:
</text>
<button name="Refresh List" tool_tip="Обновить список объектов"/>
<button name="Refresh List" tool_tip="Обновить список объектов"/>
<button label="Вернуть объекты" name="Return objects..."/>
<name_list name="owner list">
<name_list name="owner list">
<name_list.columns label="Тип" name="type" />
<name_list.columns label="Имя" name="name" />
<name_list.columns label="Штук" name="count"/>
@ -304,33 +307,33 @@
<text name="allow_label">
Разрешить другим жителям:
</text>
<text name="allow_label1" width="150">
Редактировать ландшафт:
</text>
<check_box label="Все" name="edit land check" tool_tip="Если галочка установлена, любой может изменить ландшафт вашей земли. Лучше всего оставить это без изменений."/>
<text name="caution_text">
(Использовать с осторожностью!)
</text>
<text name="allow_label0">
Летать:
</text>
<check_box label="Все" name="check fly" tool_tip="Если галочка установлена, жители могут летать на вашей земле. Если галочка не установлена, они могут летать только за пределами вашего участка"/>
<text name="allow_label1" width="150">
Редактировать ландшафт:
</text>
<check_box label="Все" name="edit land check" tool_tip="Если галочка установлена, любой может изменить ландшафт вашей земли. Лучше всего оставить это без изменений."/>
<text name="caution_text">
(Использовать с осторожностью!)
</text>
<text name="allow_label0">
Летать:
</text>
<check_box label="Все" name="check fly" tool_tip="Если галочка установлена, жители могут летать на вашей земле. Если галочка не установлена, они могут летать только за пределами вашего участка"/>
<text name="allow_label2">
Строить:
</text>
<check_box label="Все" name="edit objects check" tool_tip="Если установлен флажок, жители могут создавать и выкладывать объекты на вашей земле."/>
<check_box label="Группа" name="edit group objects check" tool_tip="Если установлен флажок, то жители могут создавать и выкладывать объекты на вашей земле."/>
<check_box label="Все" name="edit objects check" tool_tip="Если установлен флажок, жители могут создавать и выкладывать объекты на вашей земле."/>
<check_box label="Группа" name="edit group objects check" tool_tip="Если установлен флажок, то жители могут создавать и выкладывать объекты на вашей земле."/>
<text name="allow_label3">
Выкладывать объекты:
</text>
<check_box label="Все" name="all object entry check" tool_tip="Если установлен флажок, то жители могут перемещать существующие объекты из других участков на этот участок."/>
<check_box label="Группа" name="group object entry check" tool_tip="Если установлен флажок, то члены группы участка могут перемещать существующие объекты из других участков на этот участок."/>
<check_box label="Все" name="all object entry check" tool_tip="Если установлен флажок, то жители могут перемещать существующие объекты из других участков на этот участок."/>
<check_box label="Группа" name="group object entry check" tool_tip="Если установлен флажок, то члены группы участка могут перемещать существующие объекты из других участков на этот участок."/>
<text name="allow_label4">
Запускать скрипты:
</text>
<check_box label="Все" name="check other scripts" tool_tip="Если установлен флажок, то жители могут выполнять скрипты на вашем участке, включая приложения."/>
<check_box label="Группа" name="check group scripts" tool_tip="Если установлен флажок, то члены группы могут выполнять скрипты на вашем участке, включая приложения."/>
<check_box label="Безопасно (нет повреждений)" name="check safe" tool_tip="Если флажок установлен, то земля считается безопасной, отключены боевые повреждения. Если флажок не стоит, то боевые повреждения включены." />
<check_box label="Все" name="check other scripts" tool_tip="Если установлен флажок, то жители могут выполнять скрипты на вашем участке, включая приложения."/>
<check_box label="Группа" name="check group scripts" tool_tip="Если установлен флажок, то члены группы могут выполнять скрипты на вашем участке, включая приложения."/>
<check_box label="Безопасно (нет повреждений)" name="check safe" tool_tip="Если флажок установлен, то земля считается безопасной, отключены боевые повреждения. Если флажок не стоит, то боевые повреждения включены." />
<check_box label="Не толкать" name="PushRestrictCheck" tool_tip="Запрещает скриптам функцию толкания. Этот параметр может оказаться полезным для предотвращения нежелательного поведения на вашей земле." />
<check_box label="Показать это место в поиске (L$30/неделя)" name="ShowDirectoryCheck" tool_tip="Позволить людям видеть участок в результатах поиска" />
<combo_box name="land category">
@ -380,7 +383,7 @@
<text name="at URL:">
URL:
</text>
<button label="Задать" name="set_media_url"/>
<button label="Задать" name="set_media_url"/>
<text name="Description:">
Описание:
</text>
@ -416,13 +419,12 @@
<text name="Sound:">
Звук:
</text>
<check_box label="Ограничить жесты и звуки объектов границами участка" name="check sound local" width="292"
tool_tip="Если выбрана данная функция, то жесты и звуки от объектов будут слышны только на данном участке, но не будут слышны за его пределами."/>
<text name="Avatar Sounds:">
Звуки аватара:
</text>
<check_box label="Все" name="all av sound check"/>
<check_box label="Группа" name="group av sound check"/>
<check_box label="Ограничить жесты и звуки объектов границами участка" name="check sound local" width="292" tool_tip="Если выбрана данная функция, то жесты и звуки от объектов будут слышны только на данном участке, но не будут слышны за его пределами."/>
<text name="Avatar Sounds:">
Звуки аватара:
</text>
<check_box label="Все" name="all av sound check"/>
<check_box label="Группа" name="group av sound check"/>
<text name="Voice settings:">
Голос:
</text>
@ -431,10 +433,10 @@
<check_box label="Ограничить голос границами данного участка" name="parcel_enable_voice_channel_local"/>
</panel>
<panel label="Доступ" name="land_access_panel">
<panel.string name="access_estate_defined">
(Определено на острове)
</panel.string>
<panel.string name="estate_override">
<panel.string name="access_estate_defined">
(Определено на острове)
</panel.string>
<panel.string name="estate_override">
Один или несколько параметров предопределены настройками острова
</panel.string>
<check_box name="public_access" label="Разрешить общественный доступ (Отключение создаст линии запрета)" />
@ -454,26 +456,26 @@
<text name="OwnerLimited">
(Владелец недвижимости, возможно, ограничил эти выборы)
</text>
<panel name="Allowed_layout_panel">
<text name="AllowedText">
Разрешенные жители ([COUNT]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] в списке, [MAX] максимум)" />
<button label="Добавить" name="add_allowed" />
<button label="Удалить" label_selected="Удалить" name="remove_allowed" />
</panel>
<panel name="Allowed_layout_panel">
<text name="AllowedText">
Разрешенные жители ([COUNT]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] в списке, [MAX] максимум)" />
<button label="Добавить" name="add_allowed" />
<button label="Удалить" label_selected="Удалить" name="remove_allowed" />
</panel>
<panel name="Banned_layout_panel">
<text name="BanCheck">
Заблокировано ([COUNT], макс. [MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] в списке, [MAX] максимум)">
<columns label="Имя" name="name"/>
<columns label="Время" name="duration"/>
</name_list>
<button label="Добавить" name="add_banned"/>
<button label="Удалить" label_selected="Удалить" name="remove_banned" />
</panel>
<text name="BanCheck">
Заблокировано ([COUNT], макс. [MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] в списке, [MAX] максимум)">
<columns label="Имя" name="name"/>
<columns label="Время" name="duration"/>
</name_list>
<button label="Добавить" name="add_banned"/>
<button label="Удалить" label_selected="Удалить" name="remove_banned" />
</panel>
</panel>
<panel label="Приключения" name="land_experiences_panel"/>
<panel label="Приключения" name="land_experiences_panel"/>
</tab_container>
</floater>

3
indra/newview/skins/default/xui/ru/floater_fs_asset_blacklist.xml
View File

@ -21,6 +21,9 @@
<floater.string name="unknown_region">
Неизвестный регион
</floater.string>
<floater.string name="DateFormatString">
[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
</floater.string>
<filter_editor label="Фильтр черного списка" name="filter_input"/>
<fs_scroll_list name="result_list">
<columns name="name" label="Имя" />

9
indra/newview/skins/default/xui/ru/floater_fs_im_session.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="panel_im">
<floater.string name="participant_added" value="[NAME] был приглашен на разговор."/>
<floater.string name="multiple_participants_added" value="[NAME] были приглашены на разговор."/>
<layout_stack name="ls_control_panel">
<layout_panel name="gprofile_panel">
<button name="group_info_btn" tool_tip="Показать профиль данной группы"/>
@ -63,6 +65,13 @@
Непрочитанных сообщений: [NUM]
</text>
</layout_panel>
<layout_panel name="chat_layout_panel">
<layout_stack name="input_panels">
<layout_panel name="input_button_layout_panel">
<button name="send_chat" label="Отправить" tool_tip="Отправляет сообщение" />
</layout_panel>
</layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
</layout_stack>

4
indra/newview/skins/default/xui/ru/floater_inspect.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="inspect" title="Инспектирование объектов">
<floater.string name="timeStamp">
[wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
</floater.string>
<floater.string name="Group">
(Группа)
</floater.string>
@ -17,6 +20,7 @@
TMem: [TEXTURE_MEMORY] KB
VRAM: [VRAM_USAGE] KB
</floater.string>
<text_editor name="linksetstats_text" value="(загрузка...)"/>
<scroll_list name="object_list" tool_tip="Выбор объекта из этого списка приведет к его подсветке">
<scroll_list.columns label="Имя Объекта" name="object_name" />

2
indra/newview/skins/default/xui/ru/floater_preferences.xml
View File

@ -6,7 +6,7 @@
<button label="Применить" label_selected="Применить" name="Apply"/>
<button label="Отменить" label_selected="Отменить" name="Cancel"/>
<panel name="search_panel">
<search_editor label="Настройки поиска" name="search_prefs_edit" tool_tip="Введите интересующий вас термин для поиска здесь. Результаты будут отображены для частичного совпадения полного текста в названии параметра или комментариях."/>
<search_editor label="Поиск настроек" name="search_prefs_edit" tool_tip="Введите интересующий вас термин для поиска здесь. Результаты будут отображены для частичного совпадения полного текста в названии параметра или комментариях."/>
</panel>
<tab_container name="pref core">
<panel label="Общие" name="general"/>

3
indra/newview/skins/default/xui/ru/floater_preview_texture.xml
View File

@ -6,6 +6,9 @@
<floater.string name="Copy">
Копировать в инвентарь
</floater.string>
<floater.string name="DateTime">
[weekday,datetime,slt], [day,datetime,slt] [month,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
</floater.string>
<floater.string name="UploaderDateTime">
Загрузил: [UPLOADER] в [DATE_TIME]
</floater.string>

67
indra/newview/skins/default/xui/ru/language_settings.xml Normal file
View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- This file contains strings that used to be hardcoded in the source.-->
<strings>
<!-- Locale Information -->
<string name="MicrosoftLocale">russian</string>
<string name="MacLocale">ru_RU.UTF-8</string>
<string name="DarwinLocale">ru_RU.UTF-8</string>
<string name="LinuxLocale">ru_RU.UTF-8</string>
<!-- Note: for plural nouns, see strings.xml. For example:
AgeYearsA = singular,
AgeYearsB = plural,
AgeYearsC = plural for non-English languages like Russian
For example, LLTrans::getCountString("AgeYears", 3) is plural form B
in English and form C in Russian -->
<!--
datetimeToCodes["wkday"] = "%a"; // Thu
datetimeToCodes["weekday"] = "%A"; // Thursday
datetimeToCodes["year4"] = "%Y"; // 2009
datetimeToCodes["year"] = "%Y"; // 2009
datetimeToCodes["year2"] = "%y"; // 09
datetimeToCodes["mth"] = "%b"; // Aug
datetimeToCodes["month"] = "%B"; // August
datetimeToCodes["mthnum"] = "%m"; // 08
datetimeToCodes["day"] = "%d"; // 31
datetimeToCodes["sday"] = "%-d"; // 9
datetimeToCodes["hour24"] = "%H"; // 14
datetimeToCodes["hour"] = "%H"; // 14
datetimeToCodes["hour12"] = "%I"; // 02
datetimeToCodes["min"] = "%M"; // 59
datetimeToCodes["ampm"] = "%p"; // AM
datetimeToCodes["second"] = "%S"; // 59
datetimeToCodes["timezone"] = "%Z"; // PST
-->
<string name="TimeHour">hour,datetime,slt</string>
<string name="TimeMin">min,datetime,slt</string>
<string name="TimeSec">second,datetime,slt</string>
<string name="TimeYear">year,datetime,slt</string>
<string name="TimeDay">day,datetime,slt</string>
<string name="TimeMonth">mthnum,datetime,slt</string>
<string name="TimeMth">mth,datetime,slt</string>
<string name="TimeWeek">wkday,datetime,slt</string>
<string name="TimeAMPM">ampm,datetime,slt</string>
<string name="TimeHour12">hour12,datetime,slt</string>
<string name="TimeSec">second,datetime,slt</string>
<string name="TimeTimezone">timezone,datetime,slt</string>
<string name="LTimeMthNum">mthnum,datetime,local</string>
<string name="LTimeWeek">wkday,datetime,local</string>
<string name="LTimeMonth">mth,datetime,local</string>
<string name="LTimeDay">day,datetime,local</string>
<string name="LTimeSec">second,datetime,local</string>
<string name="LTimeHour">hour,datetime,local</string>
<string name="LTimeMin">min,datetime,local</string>
<string name="LTimeYear">year,datetime,local</string>
<string name="UTCTimeWeek">weekday,datetime,utc</string>
<string name="UTCTimeDay">day,datetime,utc</string>
<string name="UTCTimeMth">mth,datetime,utc</string>
<string name="UTCTimeYr">year,datetime,utc</string>
<string name="UTCTimeHr">hour,datetime,utc</string>
<string name="UTCTimeMin">min,datetime,utc</string>
<string name="UTCTimeSec">second,datetime,utc</string>
<string name="UTCTimeTimezone">timezone,datetime,utc</string>
</strings>

2
indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
View File

@ -12,6 +12,6 @@
<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_call label="Заплатить" name="Pay" />
<menu_item_check label="Заблокировать/Разблокировать" name="Block/Unblock" />
</toggleable_menu>

10
indra/newview/skins/default/xui/ru/menu_fs_bump_list.xml.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Bump List Context Menu">
<menu_item_call label="Смотреть Профиль" name="show_agent" />
<menu_item_call label="Послать сообщение..." name="send_im" />
<menu_item_call label="Приблизить к Аватару" name="zoom_agent" />
<menu_item_call label="Телепорт к Аватару" name="teleportto_agent" />
<menu_item_check label="Блокировать" name="Block" />
<menu_item_call label="Пожаловаться" name="report" />
<menu_item_call label="Копировать" name="Copy" />
</context_menu>

2
indra/newview/skins/default/xui/ru/menu_viewer.xml
View File

@ -2,7 +2,7 @@
<menu_bar name="Main Menu">
<menu label="Аватар" name="Me">
<menu_item_call label="Ваш аккаунт" name="Manage Account"/>
<menu_item_call label="Торговый списки..." name="MarketplaceListings"/>
<menu_item_call label="Торговые списки..." name="MarketplaceListings"/>
<menu_item_call label="Купить L$" name="Buy and Sell L$"/>
<menu_item_check label="Инвентарь" name="Inventory"/>

56
indra/newview/skins/default/xui/ru/notifications.xml
View File

@ -131,19 +131,19 @@
</notification>
<notification name="StockPasteFailed">
Не удалось скопировать или переместить в папку запасов, ошибка:
&quot;[ERROR_CODE]&quot;
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="MerchantPasteFailed">
Не удалось скопировать или переместить в списки товаров торгового центра, ошибка:
&quot;[ERROR_CODE]&quot;
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="MerchantTransactionFailed">
Не удалось выполнить транзакцию с торговым центром, ошибка:
Причина: &quot;[ERROR_REASON]&quot;
[ERROR_DESCRIPTION]
<usetemplate name="okbutton" yestext="OK"/>
@ -154,7 +154,7 @@
</notification>
<notification name="MerchantListingFailed">
Не удалось опубликовать в торговом центре, ошибка:
&quot;[ERROR_CODE]&quot;
<usetemplate name="okbutton" yestext="OK"/>
</notification>
@ -314,7 +314,7 @@
*ПРЕДУПРЕЖДЕНИЕ*
При удалении этой способности НЕ БУДУТ удалены способности &quot;[ACTION_NAME_2]&quot; и &quot;[ACTION_NAME_3]&quot;.
Если вам больше не нужны эти способности для данной роли, немедленно отключите их!
<usetemplate name="okbutton" yestext="OK"/>
</notification>
@ -684,8 +684,8 @@
Вам не разрешено изменять ландшафт участока [PARCEL].
</notification>
<notification name="CannotCopyWarning">
У вас нет разрешения на копирование следующих предметов:
&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
У вас нет разрешения на копирование следующих предметов:
&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
и они пропадут из вашего инвентаря, если вы их отдадите. Вы действительно хотите предложить эти предметы?
<usetemplate name="okcancelbuttons" notext="Нет" yestext="Да"/>
</notification>
@ -721,9 +721,9 @@
</notification>
<notification name="FreezeAvatarMultiple">
Заморозить следующие аватары?
[RESIDENTS]
У них временно исчезнет способность перемещаться, говорить и взаимодействовать с миром.
<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Разморозить" yestext="Заморозить"/>
</notification>
@ -1608,22 +1608,22 @@
[DOWNLOAD_PATH].
</notification>
<notification name="RequiredUpdate">
Для входа необходима версия \[VERSION].
Для входа необходима версия \[VERSION].
Скачайте обновление с веб-сайта https://secondlife.com/support/downloads/
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="PauseForUpdate">
Для входа необходима версия \[VERSION].
Для входа необходима версия \[VERSION].
Нажмите OK для загрузки и установки.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="OptionalUpdateReady">
Версия \[VERSION] загружена и готова к установке.
Версия \[VERSION] загружена и готова к установке.
Нажмите OK для установки.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="PromptOptionalUpdate">
Версия \[VERSION] загружена и готова к установке.
Версия \[VERSION] загружена и готова к установке.
Продолжить?
<usetemplate canceltext="Не сейчас" name="yesnocancelbuttons" notext="Пропустить" yestext="Установить"/>
</notification>
@ -1818,7 +1818,7 @@
</notification>
<notification name="AgentDisplayNameSetBlocked">
Нельзя задать указанное вами имя. Оно содержит запрещенное слово.
Попробуйте указать другое имя.
</notification>
<notification name="AgentDisplayNameSetInvalidUnicode">
@ -2311,7 +2311,7 @@
</notification>
<notification name="ConfirmClearAllToybox">
Это действие возвращает все кнопки в инструментарий, а панели инструментов становятся пустыми.
Это действие нельзя отменить.
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
@ -2325,7 +2325,7 @@
Все нарушения, о которых поступили такие уведомления, расследуются и устраняются.
</notification>
<notification name="HelpReportAbuseConfirm">
Спасибо за информирование об этой проблеме.
Спасибо за информирование об этой проблеме.
Мы проверим возможные нарушения согласно вашему отчету и примем
соответствующие меры.
<usetemplate name="okbutton" yestext="OK"/>
@ -3245,7 +3245,7 @@ URL: [AUDIOURL]
После получения разрешения это сообщение больше не будет отображаться для данного приключения, пока оно не будет отозвано из профиля приключения.
Скрипты, связанные с данным приключением, смогут выполнять следующие действия в регионах, где активно приключение:
Скрипты, связанные с данным приключением, смогут выполнять следующие действия в регионах, где активно приключение:
[QUESTIONS]Это правильно?
<form name="form">
@ -3257,7 +3257,7 @@ URL: [AUDIOURL]
</notification>
<notification name="ScriptQuestionCaution">
Предупреждение. Объект &quot;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&quot; требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения.
Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
<form name="form">
<button name="Grant" text="Разрешить доступ"/>
@ -3368,20 +3368,20 @@ URL: [AUDIOURL]
Не удалось подключиться к [VOICE_CHANNEL_NAME], повторите попытку позже. Будет установлено подключение к общему голосовому чату.
</notification>
<notification name="VoiceEffectsExpired">
Истек срок действия подписки на один или несколько типов анимационного изменения голоса.
[[URL] Щелкните здесь], чтобы обновить подписку.
Истек срок действия подписки на один или несколько типов анимационного изменения голоса.
[[URL] Щелкните здесь], чтобы обновить подписку.
Если вы - владелец премиум-аккаунта, [[PREMIUM_URL] щелкните здесь], чтобы получить право на анимационное изменение голоса.
</notification>
<notification name="VoiceEffectsExpiredInUse">
Истек срок действия анимационного изменения голоса, действуют настройки вашего обычного голоса.
[[URL] Щелкните здесь], чтобы обновить подписку.
Истек срок действия анимационного изменения голоса, действуют настройки вашего обычного голоса.
[[URL] Щелкните здесь], чтобы обновить подписку.
Если вы - владелец премиум-аккаунта, [[PREMIUM_URL] щелкните здесь], чтобы получить право на анимационное изменение голоса.
</notification>
<notification name="VoiceEffectsWillExpire">
Срок действия одного или нескольких ваших типов анимационного изменения голоса истекает через [INTERVAL] дней или раньше.
[[URL] Щелкните здесь], чтобы обновить подписку.
Срок действия одного или нескольких ваших типов анимационного изменения голоса истекает через [INTERVAL] дней или раньше.
[[URL] Щелкните здесь], чтобы обновить подписку.
Если вы - владелец премиум-аккаунта, [[PREMIUM_URL] щелкните здесь], чтобы получить право на анимационное изменение голоса.
</notification>
@ -3476,7 +3476,7 @@ URL: [AUDIOURL]
Выберите жителей, чтобы поделиться с ними.
</notification>
<notification name="MeshUploadError">
Не удалось передать [LABEL]: [MESSAGE] [IDENTIFIER]
Не удалось передать [LABEL]: [MESSAGE] [IDENTIFIER]
Подробности смотрите в файле журнала.
</notification>
@ -3566,7 +3566,7 @@ URL: [AUDIOURL]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="NoVoiceConnect">
Нет связи с речевым сервером: порты
Нет связи с речевым сервером: порты
&lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
@ -3943,7 +3943,7 @@ URL: [AUDIOURL]
</notification>
<notification name="FireStormReqInfo">
[NAME] просит, чтобы вы отправили информацию о ваших настройках Firestorm.
(Это та же информация, которую можно найти, перейдя в Помощь->О Firestorm)
(Это та же информация, которую можно найти, перейдя в Помощь->О Firestorm)
[REASON]
Хотите отправить данную информацию?
<form name="form">
@ -4150,7 +4150,7 @@ URL: [AUDIOURL]
Невозможно дублировать объекты: не удалось найти их участок.
</notification>
<notification name="CantCreateCuzParcelFull">
Нельзя создать объект:
Нельзя создать объект:
участок уже заполнен.
</notification>
<notification name="RezAttemptFailed">

7
indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
View File

@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="avatar_list_item">
<string name="FormatSeconds">[COUNT]с</string>
<string name="FormatMinutes">[COUNT]м</string>
<string name="FormatHours">[COUNT]ч</string>
<string name="FormatDays">[COUNT]д</string>
<string name="FormatWeeks">[COUNT]н</string>
<string name="FormatMonths">[COUNT]мес</string>
<string name="FormatYears">[COUNT]г</string>
<text name="avatar_name" value="(загрузка)" />
<icon name="permission_edit_theirs_icon" tool_tip="Вы можете редактировать объекты этого друга." />
<button name="permission_edit_mine_btn" tool_tip="Этот друг может редактировать, удалять или брать ваши объекты" />

2
indra/newview/skins/default/xui/ru/panel_fs_profile_secondlife.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Профиль" name="panel_profile">
<string name="status_online">В сети</string>
<string name="status_offline">Не в сети</string>
<string name="no_partner_text" value="Нет" />
<string name="no_group_text" value="Нет" />
<string name="FSDev" value=" Developer" />

2
indra/newview/skins/default/xui/ru/panel_group_general.xml
View File

@ -55,7 +55,7 @@
<check_box label="Показать в поиске" name="show_in_group_list" tool_tip="Позволить людям видеть эту группу в результатах поиска"/>
<check_box label="Любой может вступить" name="open_enrollement" tool_tip="Группа предлагает бесплатное вступление для всех, и не требует приглашения."/>
<check_box label="Стоимость вступления" name="check_enrollment_fee" tool_tip="Установите плату за вступление в группу."/>
<spinner name="spin_enrollment_fee" tool_tip="Новые участники должны заплптить эту сумму, чтобы вступить в группу, если выбрано 'Стоимость втупления'."/>
<spinner name="spin_enrollment_fee" tool_tip="Новые участники должны заплатить эту сумму, чтобы вступить в группу, если выбрано 'Стоимость втупления'."/>
<combo_box name="group_mature_check" tool_tip="Рейтинги зрелости определяют тип контента и поведение, разрешенное в группе">
<combo_item name="select_mature">
- Выберите классификацию возраста -

8
indra/newview/skins/default/xui/ru/panel_status_bar.xml
View File

@ -13,11 +13,14 @@
<panel.string name="time">
[hour, datetime, slt]:[min, datetime, slt]:[second, datetime, slt] [timezone,datetime, slt]
</panel.string>
<panel.string name="timeTooltip">
[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
</panel.string>
<panel.string name="buycurrencylabel">
[AMT] L$
</panel.string>
<panel name="menu_search_panel">
<search_editor label="Меню поиска" name="search_menu_edit" tool_tip="Введите интересующий вас термин для поиска здесь. Результаты будут отображены для частичного совпадения полного текста в меню."/>
<search_editor label="Поиск в Меню" name="search_menu_edit" tool_tip="Введите интересующий вас термин для поиска здесь. Результаты будут отображены для частичного совпадения полного текста в меню."/>
</panel>
<panel name="parcel_info_panel">
<button name="buy_land_btn" tool_tip="Участок для продажи"/>
@ -27,11 +30,12 @@
</panel>
<panel name="balance_bg">
<text name="balance" tool_tip="Нажмите, для обновления баланса"/>
<button label="Купить" name="buyL" tool_tip="Нажмите, чтобы купить L$"/>
<button label="Купить L$" name="buyL" tool_tip="Нажмите, чтобы купить L$"/>
</panel>
<panel name="time_and_media_bg">
<text name="TimeText" tool_tip="Текущее время (Тихоокеанское)"/>
<button name="stream_toggle_btn" tool_tip="Включить/Выключить воспроизведение потокового аудио"/>
<button name="media_toggle_btn" tool_tip="Включить/Выключить воспроизведение всего медиа (Музыка, Видео, Web)"/>
<text name="FPSText" tool_tip="Кадров в секунду"/>
</panel>
</panel>

2
indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="teleport_history_item">
<panel.string name="DateFmt">
[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc], [hour,datetime,utc]:[min,datetime,utc]
[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc]
</panel.string>
<layout_stack name="ls_item">
<layout_panel name="lp_date">

229
indra/newview/skins/default/xui/ru/rlva_strings.xml Normal file
View File

@ -0,0 +1,229 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<llsd>
<map>
<key>strings</key>
<map>
<!-- Primarily used when @showloc restricted -->
<key>hidden_generic</key>
<map>
<key>value</key>
<string>(Cкрытый)</string>
</map>
<key>hidden_parcel</key>
<map>
<key>value</key>
<string>(Cкрытый участок)</string>
</map>
<key>hidden_region</key>
<map>
<key>value</key>
<string>(Cкрытый регион)</string>
</map>
<!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
<key>blocked_recvim</key>
<map>
<key>value</key>
<string>*** ЛС заблокировано вашим клиентом</string>
<key>description</key>
<string>Отображается вместо оригинального сообщения, когда входящий чат заблокирован</string>
<key>label</key>
<string>Заблокированное входящее ЛС-сообщение (локальное)</string>
<key>customizable</key>
<boolean>1</boolean>
</map>
<key>blocked_sendim</key>
<map>
<key>value</key>
<string>*** ЛС заблокировано клиентом отправителя</string>
<key>description</key>
<string>Отображается (и отправляется принимающей стороне) когда исходящий чат заблокирован</string>
<key>label</key>
<string>Заблокировано исходящее ЛС-сообщение (локальное + удаленное)</string>
<key>customizable</key>
<boolean>1</boolean>
</map>
<!-- Sent to the remote party when they issue @list or @except as an IM query (if enabled) -->
<key>imquery_list_deny</key>
<map>
<key>value</key>
<string>*** Другая сторона с уважением просит вас заняться своими делами (зайчики заставили меня это сделать!)</string>
<key>description</key>
<string>Отправляется удаленной стороне, когда вы отклоняете их запрос на перечисление ваших активных ограничений RLV)</string>
<key>label</key>
<string>@list и @except команда (удаленно)</string>
<key>customizable</key>
<boolean>1</boolean>
</map>
<!-- Sent to the remote party as a suffix to @list to inform them there might be more information -->
<key>imquery_list_suffix</key>
<map>
<key>value</key>
<string>(Используйте @except, чтобы увидеть список активных исключений)</string>
<key>description</key>
<string>Отправлено удаленной стороне в качестве суффикса к @list, чтобы сообщить им, как запросить ваши исключения</string>
<key>label</key>
<string>@list суффикс команды (удаленно)</string>
<key>customizable</key>
<boolean>0</boolean>
</map>
<!-- Sent to the remote party when they issue @stopim as an IM query (if enabled) -->
<key>stopim_nosession</key>
<map>
<key>value</key>
<string>*** Другая сторона не находится под ограничением @startim</string>
<key>description</key>
<string>Отправляется удаленной стороне, когда они пытаются принудительно закрыть ваш чат с ними (и такой сеанс не существует)</string>
<key>label</key>
<string>@stopim команда без сеанса (удаленно)</string>
<key>customizable</key>
<boolean>1</boolean>
</map>
<key>stopim_endsession_remote</key>
<map>
<key>value</key>
<string>*** Сессия была закончена для другой стороны</string>
<key>description</key>
<string>Отправляется удаленной стороне, когда они пытаются принудительно закрыть чат (и он существует)</string>
<key>label</key>
<string>@stopim команда с активным сеансом (удаленно)</string>
<key>customizable</key>
<boolean>1</boolean>
</map>
<key>stopim_endsession_local</key>
<map>
<key>value</key>
<string>[NAME] удаленно закрыл разговор с @stopim</string>
</map>
<!-- Shown as notifications -->
<key>blocked_autopilot</key>
<map>
<key>value</key>
<string>Невозможно использовать автопилот из-за ограничений RLV</string>
</map>
<key>blocked_generic</key>
<map>
<key>value</key>
<string>Невозможно выполнить действие из-за ограничений RLV</string>
</map>
<key>blocked_groupchange</key>
<map>
<key>value</key>
<string>Невозможно изменить активную группу из-за ограничения RLV; переключено обратно на "[GROUP_SLURL]"</string>
</map>
<key>blocked_invfolder</key>
<map>
<key>value</key>
<string>Невозможно выполнить запрошенное действие инвентаризации из-за заблокированной папки RLV.</string>
</map>
<key>blocked_nearby</key>
<map>
<key>value</key>
<string>Невозможно увидеть присутствие ближайших аватаров из-за ограничений RLV</string>
</map>
<key>blocked_permattach</key>
<map>
<key>value</key>
<string>Попытка присоединить '[OBJECT]' была отклонена из-за ограничений RLV</string>
</map>
<key>blocked_permteleport</key>
<map>
<key>value</key>
<string>'[OBJECT]' было отказано в разрешении телепортировать вас из-за ограничений RLV</string>
</map>
<key>blocked_startim</key>
<map>
<key>value</key>
<string>Невозможно начать сеанс обмена мгновенными сообщениями с [RECIPIENT] из-за ограничений RLV</string>
</map>
<key>blocked_startconf</key>
<map>
<key>value</key>
<string>Невозможно начать конференцию с [RECIPIENT] из-за ограничений RLV</string>
</map>
<key>blocked_teleport</key>
<map>
<key>value</key>
<string>Невозможно инициировать телепорт из-за ограничений RLV</string>
</map>
<key>blocked_teleport_offer</key>
<map>
<key>value</key>
<string>Невозможно предложить телепорт из-за ограничений RLV</string>
</map>
<key>blocked_viewxxx</key>
<map>
<key>value</key>
<string>Невозможно открыть [TYPE] из-за ограничений RLV</string>
</map>
<key>blocked_wireframe</key>
<map>
<key>value</key>
<string>Невозможно включить каркасный режим из-за ограничений RLV</string>
</map>
<!-- Sent as "Busy" messages to the remote party -->
<key>blocked_recvim_remote</key>
<map>
<key>value</key>
<string>Житель, которому вы отправили сообщение, в данный момент не может читать ваши мгновенные сообщения, повторите попытку позже.</string>
<key>description</key>
<string>Отправляется удаленной стороне, когда их ЛС был заблокирован</string>
<key>label</key>
<string>Заблокировано входящее сообщение (удаленно)</string>
<key>customizable</key>
<boolean>1</boolean>
</map>
<key>blocked_tplurerequest_remote</key>
<map>
<key>value</key>
<string>Резиденту в настоящее время запрещено принимать. Пожалуйста, попробуйте позже.</string>
<key>description</key>
<string>Отправляется удаленной стороне, когда их предложение телепортации или запрос был заблокирован</string>
<key>label</key>
<string>Заблокированный телепорт предложение/запрос (удаленный)</string>
<key>customizable</key>
<boolean>1</boolean>
</map>
</map>
<!-- Generic names used to replace resident names when @shownames restricted -->
<key>anonyms</key>
<array>
<string>Житель</string>
<string>Этот житель</string>
<string>Тот житель</string>
<string>Индивидум</string>
<string>Этот индивидум</string>
<string>Тот индивидум</string>
<string>Персона</string>
<string>Эта персона</string>
<string>Та персона</string>
<string>Незнакомец</string>
<string>Этот незнакомец</string>
<string>Тот незнакомец</string>
<string>Существо</string>
<string>Это существо</string>
<string>То существо</string>
<string>Деятель</string>
<string>Этот деятель</string>
<string>Тот деятель</string>
<string>Человек</string>
<string>Этот человек</string>
<string>Тот человек</string>
<string>Кто-то</string>
<string>Некоторые люди</string>
<string>Некто</string>
<string>Таинственный</string>
<string>Неизвестное существо</string>
<string>Неопознанный</string>
<string>Неизвестный человек</string>
</array>
</map>
</llsd>

760
indra/newview/skins/default/xui/ru/strings.xml
View File

File diff suppressed because it is too large Load Diff

5
indra/newview/skins/default/xui/ru/widgets/bodyparts_list_item.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<bodyparts_list_item name="wearable_item">
<lock_panel name="btn_lock" tool_tip="У вас нет разрешения на редактирование"/>
<edit_btn name="btn_edit" tool_tip="Редактировать эту фигуру"/>
</bodyparts_list_item>

4
indra/newview/skins/default/xui/ru/widgets/dummy_clothing_list_item.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<dummy_clothing_list_item name="dummy_clothing_item">
<add_btn name="btn_add" tool_tip="Добавить больше предметов этого типа"/>
</dummy_clothing_list_item>

4
indra/newview/skins/default/xui/ru/widgets/flat_list_view.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<flat_list_view>
<flat_list_view.no_items_text name="no_items_msg" value="Ничего не найдено" />
</flat_list_view>

2
indra/newview/skins/default/xui/ru/widgets/name_editor.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<name_editor default_text="(получение)"/>

11
indra/newview/skins/firestorm/xui/ja/panel_edit_eyes.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_eyes_panel">
<panel name="avatar_eye_color_panel">
<texture_picker label="瞳" name="Iris" tool_tip="クリックして写真を選択します"/>
</panel>
<panel name="eyes_main_tab_holder">
<accordion name="eyes_main_accordion">
<accordion_tab name="eyes_main_tab" title="目"/>
</accordion>
</panel>
</panel>

12
indra/newview/skins/firestorm/xui/ja/panel_edit_gloves.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_gloves_panel">
<panel name="avatar_gloves_color_panel">
<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
</panel>
<panel name="gloves_main_tab_holder">
<accordion name="gloves_main_accordion">
<accordion_tab name="gloves_main_tab" title="手袋"/>
</accordion>
</panel>
</panel>

28
indra/newview/skins/firestorm/xui/ja/panel_edit_hair.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_hair_panel">
<panel name="avatar_hair_color_panel">
<texture_picker label="テクスチャ" name="Texture" tool_tip="クリックして写真を選択"/>
</panel>
<accordion name="wearable_accordion">
<panel name="hair_color_tab_holder" title="色">
<accordion name="hair_color_accordion">
<accordion_tab name="hair_color_tab" title="色"/>
</accordion>
</panel>
<panel name="hair_style_tab_holder" title="スタイル">
<accordion name="hair_style_accordion">
<accordion_tab name="hair_style_tab" title="スタイル"/>
</accordion>
</panel>
<panel name="hair_eyebrows_tab_holder" title="眉毛">
<accordion name="hair_eyebrows_accordion">
<accordion_tab name="hair_eyebrows_tab" title="眉毛"/>
</accordion>
</panel>
<panel name="hair_facial_tab_holder" title="フェイシャル">
<accordion name="hair_facial_accordion">
<accordion_tab name="hair_facial_tab" title="フェイシャル"/>
</accordion>
</panel>
</accordion>
</panel>

13
indra/newview/skins/firestorm/xui/ja/panel_edit_jacket.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_jacket_panel">
<panel name="avatar_jacket_color_panel">
<texture_picker label="上半身のテクスチャ" name="Upper Fabric" tool_tip="クリックして写真を選択します"/>
<texture_picker label="下半身のテクスチャ" name="Lower Fabric" tool_tip="クリックして写真を選択します"/>
<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
</panel>
<panel name="jacket_main_tab_holder">
<accordion name="jacket_main_accordion">
<accordion_tab name="jacket_main_tab" title="ジャケット"/>
</accordion>
</panel>
</panel>

12
indra/newview/skins/firestorm/xui/ja/panel_edit_pants.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_pants_panel">
<panel name="avatar_pants_color_panel">
<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
</panel>
<panel name="pants_main_tab_holder">
<accordion name="pants_main_accordion">
<accordion_tab name="pants_main_tab" title="パンツ"/>
</accordion>
</panel>
</panel>

61
indra/newview/skins/firestorm/xui/ja/panel_edit_shape.xml Normal file
View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_shape_panel">
<string name="meters">
メートル
</string>
<string name="feet">
フィート
</string>
<string name="height">
身長：
</string>
<text name="avatar_height"/>
<tab_container name="wearable_accordion">
<panel name="shape_body_tab_holder" title="身体">
<accordion name="shape_body_accordion">
<accordion_tab name="shape_body_tab" title="身体"/>
</accordion>
</panel>
<panel name="shape_head_tab_holder" title="頭">
<accordion name="shape_head_accordion">
<accordion_tab name="shape_head_tab" title="頭"/>
</accordion>
</panel>
<panel name="shape_eyes_tab_holder" title="目">
<accordion name="shape_eyes_accordion">
<accordion_tab name="shape_eyes_tab" title="目"/>
</accordion>
</panel>
<panel name="shape_ears_tab_holder" title="耳">
<accordion name="shape_ears_accordion">
<accordion_tab name="shape_ears_tab" title="耳"/>
</accordion>
</panel>
<panel name="shape_nose_tab_holder" title="鼻">
<accordion name="shape_nose_accordion">
<accordion_tab name="shape_nose_tab" title="鼻"/>
</accordion>
</panel>
<panel name="shape_mouth_tab_holder" title="口">
<accordion name="shape_mouth_accordion">
<accordion_tab name="shape_mouth_tab" title="口"/>
</accordion>
</panel>
<panel name="shape_chin_tab_holder" title="あご">
<accordion name="shape_chin_accordion">
<accordion_tab name="shape_chin_tab" title="あご"/>
</accordion>
</panel>
<panel name="shape_torso_tab_holder" title="上半身">
<accordion name="shape_torso_accordion">
<accordion_tab name="shape_torso_tab" title="上半身"/>
</accordion>
</panel>
<panel name="shape_legs_tab_holder" title="脚">
<accordion name="shape_legs_accordion">
<accordion_tab name="shape_legs_tab" title="脚"/>
</accordion>
</panel>
</tab_container>
</panel>

12
indra/newview/skins/firestorm/xui/ja/panel_edit_shirt.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="edit_shirt_panel">
<panel name="avatar_shirt_color_panel">
<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択"/>
<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
</panel>
<panel name="shirt_main_tab_holder">
<accordion name="shirt_main_accordion">
<accordion_tab name="shirt_main_tab" title="シャツ"/>
</accordion>
</panel>
</panel>

Some files were not shown because too many files have changed in this diff Show More