diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-21 18:12:44 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-21 18:12:44 -0400 |
| commit | 0f9dc968cfb702eba595213bbecd34375bd048c5 (patch) | |
| tree | ae43ee8a8912c215ce0948369a3b4f545c10e524 | |
| parent | 4dd15ae27d1216044da57455eaa2a4832f86915f (diff) | |
| parent | 255eebf11615a1a8c47003ee24b1696b8ae63e23 (diff) | |
merge
61 files changed, 745 insertions, 415 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 66b3237e63..988410701b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -576,9 +576,13 @@ Jonathan Yap STORM-1572 STORM-1574 STORM-1579 + STORM-1638 + STORM-976 STORM-1639 + STORM-910 + STORM-1642 Kadah Coba - STORM-1060 + STORM-1060 Jondan Lundquist Josef Munster Josette Windlow @@ -1136,6 +1140,7 @@ Vector Hastings VWR-8726 Veritas Raymaker Vex Streeter + STORM-1642 Viaticus Speculaas Vick Forcella Villain Baroque diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 9fa4046fdf..b5f105439c 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -10,7 +10,7 @@ state Keyword to indicate state block or state transition integer Integer type float Floating-point type string String type -key Key type. Use NULL_KEY to test for empty keys. +key Key type. Use NULL_KEY to test for empty keys vector Vector type of 3 floats. Used to represent 3D motion, Euler angles, and color.:Access components by .x, .y. or .z rotation Rotation type of 4 floats. Used to represent rotation.:Access components by .x, .y., .z, or .w list List of various data types @@ -28,7 +28,7 @@ collision_end collision_end(integer num_detected):Triggered when task stops coll land_collision_start land_collision_start(vector pos):Triggered when task starts colliding with land land_collision land_collision(vector pos):Triggered when task is colliding with land land_collision_end land_collision_end(vector pos):Triggered when task stops colliding with land -timer timer():Result of the llSetTimerEvent library function call. +timer timer():Result of the llSetTimerEvent library function call listen listen(integer channel, string name, key id, string message):Result of the llListen library function call sensor sensor(integer num_detected):Result of the llSensor library function call no_sensor no_sensor():Result of the llSensor library function call @@ -44,8 +44,8 @@ attach attach(key id):Triggered when task attaches or detaches from agent dataserver dataserver(key queryid, string data):Triggered when task receives asynchronous data moving_start moving_start():Triggered when task begins moving moving_end moving_end():Triggered when task stops moving -on_rez on_rez(integer start_param):Triggered when task is rezed in from inventory or another task -object_rez object_rez(key id):Triggered when task rezes in another task +on_rez on_rez(integer start_param):Triggered when task is rezzed in from inventory or another task +object_rez object_rez(key id):Triggered when task rezzes in another task link_message link_message(integer sender_num, integer num, string str, key id):Triggered when task receives a link message via LLMessageLinked library function call changed changed( integer change ):Triggered various event change the task:(test change with CHANGED_INVENTORY, CHANGED_COLOR, CHANGED_SHAPE, CHANGED_SCALE, CHANGED_TEXTURE, CHANGED_LINK, CHANGED_ALLOWED_DROP, CHANGED_OWNER, CHANGED_REGION, CHANGED_TELEPORT, CHANGED_REGION_START, CHANGED_MEDIA) remote_data remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY) @@ -151,15 +151,15 @@ PSYS_SRC_PATTERN_ANGLE PSYS_SRC_PATTERN_ANGLE_CONE PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY -OBJECT_UNKNOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type. -OBJECT_NAME Used with llGetObjectDetails to get an object's name. -OBJECT_DESC Used with llGetObjectDetails to get an object's description. -OBJECT_POS Used with llGetObjectDetails to get an object's position. -OBJECT_ROT Used with llGetObjectDetails to get an object's rotation. -OBJECT_VELOCITY Used with llGetObjectDetails to get an object's velocity. -OBJECT_OWNER Used with llGetObjectDetails to get an object's owner's key. Will be NULL_KEY if group owned. -OBJECT_GROUP Used with llGetObjectDetails to get an object's group's key. -OBJECT_CREATOR Used with llGetObjectDetails to get an object's creator's key. +OBJECT_UNKNOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type +OBJECT_NAME Used with llGetObjectDetails to get an object's name +OBJECT_DESC Used with llGetObjectDetails to get an object's description +OBJECT_POS Used with llGetObjectDetails to get an object's position +OBJECT_ROT Used with llGetObjectDetails to get an object's rotation +OBJECT_VELOCITY Used with llGetObjectDetails to get an object's velocity +OBJECT_OWNER Used with llGetObjectDetails to get an object's owner's key. Will be NULL_KEY if group owned +OBJECT_GROUP Used with llGetObjectDetails to get an object's group's key +OBJECT_CREATOR Used with llGetObjectDetails to get an object's creator's key # some vehicle params VEHICLE_TYPE_NONE @@ -198,7 +198,7 @@ VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY A slider between 0 (bouncy) and 1 (critic VEHICLE_VERTICAL_ATTRACTION_TIMESCALE The exponential timescale for the vehicle to align its z-axis to the world z-axis (vertical) VEHICLE_BANKING_EFFICIENCY A slider between -1 (leans out of turns), 0 (no banking), and +1 (leans into turns) -VEHICLE_BANKING_MIX A slider betwen 0 (static banking) and 1 (dynamic banking) +VEHICLE_BANKING_MIX A slider between 0 (static banking) and 1 (dynamic banking) VEHICLE_BANKING_TIMESCALE The exponential timescale for the banking behavior to take full effect VEHICLE_FLAG_NO_DEFLECTION_UP Prevents linear deflection along world-z axis @@ -208,9 +208,9 @@ VEHICLE_FLAG_HOVER_TERRAIN_ONLY Hover only pays attention to terrain height VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT Hover only pays attention to global height VEHICLE_FLAG_HOVER_UP_ONLY Hover only pushes up VEHICLE_FLAG_LIMIT_MOTOR_UP Prevents ground vehicles from motoring into the sky -VEHICLE_FLAG_MOUSELOOK_STEER Makes vehicle try to turn toward mouselook direction. -VEHICLE_FLAG_MOUSELOOK_BANK Makes vehicle try to turn toward mouselook direction assuming banking is enabled. -VEHICLE_FLAG_CAMERA_DECOUPLED Causes the camera look-at axis to NOT move when the vehicle rotates. +VEHICLE_FLAG_MOUSELOOK_STEER Makes vehicle try to turn toward mouselook direction +VEHICLE_FLAG_MOUSELOOK_BANK Makes vehicle try to turn toward mouselook direction assuming banking is enabled +VEHICLE_FLAG_CAMERA_DECOUPLED Causes the camera look-at axis to NOT move when the vehicle rotates CAMERA_PITCH (-45 to 80) (Adjusts the angular amount that the camera aims straight ahead vs. straight down, maintaining the same distance. Analogous to 'incidence'.") CAMERA_FOCUS_OFFSET (-10 to 10) A vector that adjusts the position of the camera focus position relative to the subject @@ -238,7 +238,7 @@ INVENTORY_BODYPART Passed to task inventory library functions to reference body INVENTORY_ANIMATION Passed to task inventory library functions to reference animations INVENTORY_GESTURE Passed to task inventory library functions to reference gestures INVENTORY_ALL Passed to task inventory library functions to reference all inventory items -INVENTORY_NONE Returned by llGetInventoryType when no item is found. +INVENTORY_NONE Returned by llGetInventoryType when no item is found ATTACH_CHEST Passed to llAttachToAvatar to attach task to chest ATTACH_HEAD Passed to llAttachToAvatar to attach task to head @@ -256,7 +256,7 @@ ATTACH_LEAR Passed to llAttachToAvatar to attach task to left ear ATTACH_REAR Passed to llAttachToAvatar to attach task to right ear ATTACH_LEYE Passed to llAttachToAvatar to attach task to left eye ATTACH_REYE Passed to llAttachToAvatar to attach task to right eye -ATTACH_NOSE Passed to llAttachToAvatar to attach task to noce +ATTACH_NOSE Passed to llAttachToAvatar to attach task to nose ATTACH_RUARM Passed to llAttachToAvatar to attach task to right upper arm ATTACH_RLARM Passed to llAttachToAvatar to attach task to right lower arm ATTACH_LUARM Passed to llAttachToAvatar to attach task to left upper arm @@ -296,7 +296,7 @@ PAYMENT_INFO_USED Used with llRequestAgentData to tell if Agent is of "Payment I ANIM_ON Enable texture animation LOOP Loop when animating textures REVERSE Animate in the reverse direction -PING_PONG Animate forward, then reverse. +PING_PONG Animate forward, then reverse SMOOTH Textures slides, instead of stepping ROTATE Rotates the texture, instead of using frames SCALE Scales the texture, instead of using frames @@ -343,7 +343,7 @@ PRIM_FLEXIBLE Followed by TRUE or FALSE, integer softness, float gravity, float PRIM_POINT_LIGHT Followed by TRUE or FALSE, vector color, float intensity, float radius, float falloff PRIM_TEMP_ON_REZ Sets temporay on rez to TRUE or FALSE PRIM_PHANTOM Sets phantom to TRUE or FALSE -PRIM_CAST_SHADOWS DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams. +PRIM_CAST_SHADOWS DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams PRIM_POSITION Sets primitive position to a vector position PRIM_SIZE Sets primitive size to a vector size PRIM_ROTATION Sets primitive rotation @@ -363,10 +363,10 @@ PRIM_TYPE_TUBE Followed by integer hole shape, vector cut, float hollow, vector PRIM_TYPE_RING Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew PRIM_TYPE_SCULPT Followed by a key/string texture uuid, and one of PRIM_SCULPT_TYPE_SPHERE, PRIM_SCULPT_TYPE_TORUS, PRIM_SCULPT_TYPE_PLANE, or PRIM_SCULPT_TYPE_CYLINDER -PRIM_HOLE_DEFAULT Sets hole type to match the prim type. -PRIM_HOLE_SQUARE Sets hole type to square. -PRIM_HOLE_CIRCLE Sets hole type to circle. -PRIM_HOLE_TRIANGLE Sets hole type to triangle. +PRIM_HOLE_DEFAULT Sets hole type to match the prim type +PRIM_HOLE_SQUARE Sets hole type to square +PRIM_HOLE_CIRCLE Sets hole type to circle +PRIM_HOLE_TRIANGLE Sets hole type to triangle PRIM_MATERIAL_STONE Sets material to stone PRIM_MATERIAL_METAL Sets material to metal @@ -436,7 +436,7 @@ PARCEL_MEDIA_COMMAND_TIME Set media stream to specific time PARCEL_MEDIA_COMMAND_SIZE Get or set the parcel's media pixel resolution PARCEL_MEDIA_COMMAND_AGENT Allows media stream commands to apply to only one agent PARCEL_MEDIA_COMMAND_UNLOAD Unloads the media stream -PARCEL_MEDIA_COMMAND_AUTO_ALIGN Auto aligns the media stream to the texture size. May cause a performance hit and loss of some visual quality. +PARCEL_MEDIA_COMMAND_AUTO_ALIGN Auto aligns the media stream to the texture size. May cause a performance hit and loss of some visual quality PAY_HIDE Used with llSetPayPrice to hide a button PAY_DEFAULT Used with llSetPayPrice to use the default price for a button @@ -481,7 +481,7 @@ REGION_FLAG_RESTRICT_PUSHOBJECT Used with llGetRegionFlags to find if a region HTTP_METHOD Used with llHTTPRequest to specify the method, such as "GET" or "POST" HTTP_MIMETYPE Used with llHTTPRequest to specify the MIME type, defaults to "text/plain" -HTTP_BODY_MAXLENGTH Used with llHTTPRequest to specify the maxium reponse body to return +HTTP_BODY_MAXLENGTH Used with llHTTPRequest to specify the maximum response body to return HTTP_VERIFY_CERT Used with llHTTPRequest to specify SSL certificate verification HTTP_BODY_TRUNCATED Used with http_response to indicate truncation point in bytes @@ -492,17 +492,17 @@ PARCEL_COUNT_OTHER Used with llGetParcelPrimCount to get the number of prims on PARCEL_COUNT_SELECTED Used with llGetParcelPrimCount to get the number of prims on the parcel currently selected or sat upon PARCEL_COUNT_TEMP Used with llGetParcelPrimCount to get the number of prims on the parcel that are temp on rez -PARCEL_DETAILS_NAME Used with llGetParcelDetails to get the parcel name. -PARCEL_DETAILS_DESC Used with llGetParcelDetails to get the parcel description. -PARCEL_DETAILS_OWNER Used with llGetParcelDetails to get the parcel owner id. -PARCEL_DETAILS_GROUP Used with llGetParcelDetails to get the parcel group id. -PARCEL_DETAILS_AREA Used with llGetParcelDetails to get the parcel area in square meters. -PARCEL_DETAILS_ID Used with llGetParcelDetails to get the parcel id. -PARCEL_DETAILS_SEE_AVATARS Used with llGetParcelDetails to get the avatars visibility setting. +PARCEL_DETAILS_NAME Used with llGetParcelDetails to get the parcel name +PARCEL_DETAILS_DESC Used with llGetParcelDetails to get the parcel description +PARCEL_DETAILS_OWNER Used with llGetParcelDetails to get the parcel owner id +PARCEL_DETAILS_GROUP Used with llGetParcelDetails to get the parcel group id +PARCEL_DETAILS_AREA Used with llGetParcelDetails to get the parcel area in square meters +PARCEL_DETAILS_ID Used with llGetParcelDetails to get the parcel id +PARCEL_DETAILS_SEE_AVATARS Used with llGetParcelDetails to get the avatars visibility setting -STRING_TRIM_HEAD Used with llStringTrim to trim leading spaces from a string. -STRING_TRIM_TAIL Used with llStringTrim to trim trailing spaces from a string. -STRING_TRIM Used with llStringTrim to trim both leading and trailing spaces from a string. +STRING_TRIM_HEAD Used with llStringTrim to trim leading spaces from a string +STRING_TRIM_TAIL Used with llStringTrim to trim trailing spaces from a string +STRING_TRIM Used with llStringTrim to trim both leading and trailing spaces from a string CLICK_ACTION_NONE Used with llSetClickAction to disable the click action CLICK_ACTION_TOUCH Used with llSetClickAction to set touch as the default action when object is clicked @@ -514,9 +514,9 @@ CLICK_ACTION_PLAY Used with llSetClickAction to set play as the default ac CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the default action when object is clicked CLICK_ACTION_ZOOM Used with llSetClickAction to set zoom in as the default action when object is clicked -TOUCH_INVALID_TEXCOORD Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid. -TOUCH_INVALID_VECTOR Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid. -TOUCH_INVALID_FACE Value returned by llDetectedTouchFace() when the touch position is not valid. +TOUCH_INVALID_TEXCOORD Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid +TOUCH_INVALID_VECTOR Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid +TOUCH_INVALID_FACE Value returned by llDetectedTouchFace() when the touch position is not valid PRIM_MEDIA_ALT_IMAGE_ENABLE Used with ll{Get,Set}PrimMediaParams to enable the default alt image for media PRIM_MEDIA_CONTROLS Used with ll{Get,Set}PrimMediaParams to determine the controls shown for media @@ -608,4 +608,4 @@ return Leave current function or event handler [two_sided_delimiter 0, .2, 0] " String literal -#functions are supplied by the program now. +#functions are supplied by the program now diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 52aa2a3be3..7396209e27 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4589,21 +4589,21 @@ <key>Value</key> <integer>1</integer> </map> - <key>LastGPUClass</key> + <key>LastGPUString</key> <map> <key>Comment</key> - <string>[DO NOT MODIFY] previous GPU class for tracking hardware changes</string> + <string>[DO NOT MODIFY] previous GPU id string for tracking hardware changes</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>S32</string> + <string>String</string> <key>Value</key> - <integer>-1</integer> + <string></string> </map> <key>LastFeatureVersion</key> <map> <key>Comment</key> - <string>[DO NOT MODIFY] Version number for tracking hardware changes</string> + <string>[DO NOT MODIFY] Feature Table Version number for tracking rendering system changes</string> <key>Persist</key> <integer>1</integer> <key>Type</key> diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index e12c2f7853..9ad313a9a7 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,4 +1,8 @@ version 32 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 6e962f3c56..2dbdf3a76e 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -1,4 +1,8 @@ version 27 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 2690e8ec70..996e574350 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,8 @@ version 30 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt index 7df75687f2..e7cae1abdc 100644 --- a/indra/newview/featuretable_solaris.txt +++ b/indra/newview/featuretable_solaris.txt @@ -1,4 +1,8 @@ version 15 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt index a0245f5369..a53be10be1 100644 --- a/indra/newview/featuretable_xp.txt +++ b/indra/newview/featuretable_xp.txt @@ -1,4 +1,8 @@ version 31 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi Binary files differindex af288c0bfb..23a0252200 100644 --- a/indra/newview/installers/windows/lang_ru.nsi +++ b/indra/newview/installers/windows/lang_ru.nsi diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi Binary files differindex a4efc95475..e5468c6e9d 100644 --- a/indra/newview/installers/windows/lang_tr.nsi +++ b/indra/newview/installers/windows/lang_tr.nsi diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi Binary files differindex cb84ceaf77..f4fb70a726 100644 --- a/indra/newview/installers/windows/lang_zh.nsi +++ b/indra/newview/installers/windows/lang_zh.nsi diff --git a/indra/newview/installers/windows/language_menu.nsi b/indra/newview/installers/windows/language_menu.nsi Binary files differindex 6a0cd43162..08ad42532f 100644 --- a/indra/newview/installers/windows/language_menu.nsi +++ b/indra/newview/installers/windows/language_menu.nsi diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index eddd6e554d..8477219f87 100644 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -1435,6 +1435,7 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, LLStringUtil::format (time_str, substitution); text.append(time_str); + text.append(". "); if (current_interval == 0) { @@ -1445,8 +1446,8 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, LLStringUtil::format (time_str, substitution); text.append(time_str); - text.append("\n\n"); - text.append(llformat("%-24sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance )); + text.append(".\n\n"); + text.append(llformat("%-23sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance )); text.append(1, '\n'); } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e03ad2db94..e62227fa3c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -366,7 +366,9 @@ bool idle_startup() // // Initialize stuff that doesn't need data from simulators // - + std::string lastGPU = gSavedSettings.getString("LastGPUString"); + std::string thisGPU = LLFeatureManager::getInstance()->getGPUString(); + if (LLFeatureManager::getInstance()->isSafe()) { LLNotificationsUtil::add("DisplaySetToSafe"); @@ -374,12 +376,14 @@ bool idle_startup() else if ((gSavedSettings.getS32("LastFeatureVersion") < LLFeatureManager::getInstance()->getVersion()) && (gSavedSettings.getS32("LastFeatureVersion") != 0)) { - LLNotificationsUtil::add("DisplaySetToRecommended"); + LLNotificationsUtil::add("DisplaySetToRecommendedFeatureChange"); } - else if ((gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) && - (gSavedSettings.getS32("LastGPUClass") != -1)) + else if ( ! lastGPU.empty() && (lastGPU != thisGPU)) { - LLNotificationsUtil::add("DisplaySetToRecommended"); + LLSD subs; + subs["LAST_GPU"] = lastGPU; + subs["THIS_GPU"] = thisGPU; + LLNotificationsUtil::add("DisplaySetToRecommendedGPUChange", subs); } else if (!gViewerWindow->getInitAlert().empty()) { @@ -395,7 +399,7 @@ bool idle_startup() LLStartUp::startLLProxy(); gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion()); - gSavedSettings.setS32("LastGPUClass", LLFeatureManager::getInstance()->getGPUClass()); + gSavedSettings.setString("LastGPUString", thisGPU); // load dynamic GPU/feature tables from website (S3) LLFeatureManager::getInstance()->fetchHTTPTables(); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 369d2d757d..f0d53668d4 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1807,8 +1807,11 @@ void LLOfferInfo::initRespondFunctionMap() void inventory_offer_handler(LLOfferInfo* info) { - //If muted, don't even go through the messaging stuff. Just curtail the offer here. - if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName)) + // If muted, don't even go through the messaging stuff. Just curtail the offer here. + // Passing in a null UUID handles the case of where you have muted one of your own objects by_name. + // The solution for STORM-1297 seems to handle the cases where the object is owned by someone else. + if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName) || + LLMuteList::getInstance()->isMuted(LLUUID::null, info->mFromName)) { info->forceResponse(IOR_MUTE); return; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index b84db6b1c0..8576d81196 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1657,7 +1657,7 @@ LLViewerWindow::LLViewerWindow( if (LLFeatureManager::getInstance()->isSafe() || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) - || (gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) + || (gSavedSettings.getString("LastGPUString") != LLFeatureManager::getInstance()->getGPUString()) || (gSavedSettings.getBOOL("ProbeHardwareOnStartup"))) { LLFeatureManager::getInstance()->applyRecommendedSettings(); diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml index b5a5ff5342..9c0af7d9ba 100644 --- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml @@ -199,7 +199,7 @@ height="10" layout="topleft" left="10" - name="Cache location" + name="Model types" width="320"> Second Life supports COLLADA (.dae) files </text> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f510b3c5ba..6720d8131e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2665,9 +2665,18 @@ Display settings have been set to safe levels because you have specified the -sa <notification icon="alertmodal.tga" - name="DisplaySetToRecommended" + name="DisplaySetToRecommendedGPUChange" type="alertmodal"> -Display settings have been set to recommended levels based on your system configuration. +Display settings have been set to recommended levels because your graphics card changed +from '[LAST_GPU]' +to '[THIS_GPU]' + </notification> + + <notification + icon="alertmodal.tga" + name="DisplaySetToRecommendedFeatureChange" + type="alertmodal"> +Display settings have been set to recommended levels because of a change to the rendering subsystem. </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index eff674c628..d4da55e32e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -272,6 +272,7 @@ top="0" width="313"> <text_editor + font="Monospace" enabled="false" type="string" follows="all" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 78e10d207c..db7c07f2f8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2269,7 +2269,7 @@ Returns a string with the requested data about the region <string name="NextStipendDay" value="The next stipend day is " /> <string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string> <string name="GroupIndividualShare" value=" Group Individual Share" /> - <string name="GroupColumn" value=" Group" /> + <string name="GroupColumn" value=" Group" /> <string name="Balance">Balance</string> <string name="Credits">Credits</string> <string name="Debits">Debits</string> diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml index d088cb3244..4d02513a53 100644 --- a/indra/newview/skins/default/xui/fr/floater_about.xml +++ b/indra/newview/skins/default/xui/fr/floater_about.xml @@ -8,9 +8,9 @@ Compilé avec [COMPILER] version [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> - Vous êtes à [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] dans [REGION] se trouvant à <nolink>[HOSTNAME]</nolink> ([HOSTIP]) + Vous êtes à [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] dans [REGION], se trouvant à <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] -[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] +[SERVER_RELEASE_NOTES_URL] </floater.string> <floater.string name="AboutSystem"> CPU : [CPU] @@ -37,6 +37,9 @@ Version serveur vocal : [VOICE_VERSION] <floater.string name="AboutTraffic"> Paquets perdus : [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) </floater.string> + <floater.string name="ErrorFetchingServerReleaseNotesURL"> + Erreur lors de la récupération de l'URL des notes de version du serveur. + </floater.string> <tab_container name="about_tab"> <panel label="Infos" name="support_panel"> <button label="Copier dans le presse-papiers" name="copy_btn"/> diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index 55dd913a22..9771c3f7fd 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -217,19 +217,19 @@ ou divisé. Facteur Bonus objets : [BONUS] </text> <text name="Simulator primitive usage:"> - Utilisation des primitives : + Capacité de la région : </text> <text name="objects_available"> [COUNT] sur [MAX] ([AVAILABLE] disponibles) </text> <text name="Primitives parcel supports:"> - Prims max. sur la parcelle : + Capacité de la parcelle : </text> <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> - Prims sur la parcelle : + Impact sur la parcelle : </text> <text name="total_objects_text"> [COUNT] diff --git a/indra/newview/skins/default/xui/fr/floater_avatar.xml b/indra/newview/skins/default/xui/fr/floater_avatar.xml new file mode 100644 index 0000000000..cfbac66c0e --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_avatar.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Avatar" title="CHOIX D'AVATAR"/> diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml index 1d62a89ff2..97ff246c4d 100644 --- a/indra/newview/skins/default/xui/fr/floater_camera.xml +++ b/indra/newview/skins/default/xui/fr/floater_camera.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="camera_floater"> +<floater name="camera_floater" title="AFFICHER"> <floater.string name="rotate_tooltip"> Faire tourner la caméra autour du point central </floater.string> diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml new file mode 100644 index 0000000000..88a2fb669b --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="chat_bar" title="CHAT PRÈS DE MOI"> + <panel> + <line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl-Entrée pour crier"/> + <button name="show_nearby_chat" tool_tip="Affiche/Masque le journal de chats près de vous"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_destinations.xml b/indra/newview/skins/default/xui/fr/floater_destinations.xml new file mode 100644 index 0000000000..25e6c90a8e --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_destinations.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Destinations" title="DESTINATIONS"/> diff --git a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml new file mode 100644 index 0000000000..0100b10557 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="fast_timers"> + <string name="pause"> + Pauser + </string> + <string name="run"> + Courir + </string> + <button label="Pauser" name="pause_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_how_to.xml b/indra/newview/skins/default/xui/fr/floater_how_to.xml new file mode 100644 index 0000000000..a414212ba0 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_how_to.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_how_to" title="AIDE RAPIDE"/> diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml index 8675fb8ef9..dbd3dd9406 100644 --- a/indra/newview/skins/default/xui/fr/floater_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title=""> +<floater name="Map" title="Mini-carte"> <floater.string name="ToolTipMsg"> [REGION](Carte : double-clic ; Panoramique : Maj + faire glisser) </floater.string> @@ -7,7 +7,7 @@ [REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser) </floater.string> <floater.string name="mini_map_caption"> - MINI-CARTE + Mini-carte </floater.string> <text label="N" name="floater_map_north" text="N"> N diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml index 2b8e441ef0..a26deb1aef 100644 --- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml @@ -1,10 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Preview" title="Chargement du modèle"> - <string name="status_idle"> - Inactif - </string> +<floater name="Model Preview" title="CHARGEMENT DU MODELE"> + <string name="status_idle"/> <string name="status_parse_error"> - Problème d'analyse de fichier .dae ; reportez-vous au journal pour plus de détails. + Erreur : Problème d'analyse de fichier .dae ; reportez-vous au journal pour plus de détails. </string> <string name="status_reading_file"> Chargement... @@ -51,6 +49,9 @@ <string name="mesh_status_missing_lod"> Niveau de détail requis manquant. </string> + <string name="mesh_status_invalid_material_list"> + Les options du niveau de détail ne sont pas une sous-ensemble d'un modèle de référence. + </string> <string name="layer_all"> Tout </string> @@ -63,188 +64,211 @@ <string name="tbd"> TBD </string> - <text name="name_label"> - Nom : - </text> - <text name="lod_label"> - Aperçu : - </text> - <combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d'aperçu."> - <combo_item name="high"> - Niveau de détail : Élevé - </combo_item> - <combo_item name="medium"> - Niveau de détail : Moyen - </combo_item> - <combo_item name="low"> - Niveau de détail : Faible - </combo_item> - <combo_item name="lowest"> - Niveau de détail : Le plus faible - </combo_item> - </combo_box> - <text name="warning_title"> - AVERTISSEMENT : - </text> - <text name="warning_message"> - Vous ne pourrez pas effectuer le chargement final du modèle sur les serveurs Second Life. [[VURL] Découvrez comment] activer le chargement des modèles de maillage. - </text> - <text name="weights_text"> - Téléchargement : -Propriétés physiques : -Serveur : - -Équiv. en prims : - </text> - <text name="weights"> - [ST] -[PH] -[SIM] - -[EQ] - </text> - <tab_container name="import_tab"> - <panel label="Niveau de détail" name="lod_panel"> - <text name="lod_table_header"> - Sélectionner le niveau de détail : - </text> - <text name="high_label" value="Élevé"/> - <text name="high_triangles" value="0"/> - <text name="high_vertices" value="0"/> - <text name="medium_label" value="Moyen"/> - <text name="medium_triangles" value="0"/> - <text name="medium_vertices" value="0"/> - <text name="low_label" value="Faible"/> - <text name="low_triangles" value="0"/> - <text name="low_vertices" value="0"/> - <text name="lowest_label" value="Le plus faible"/> - <text name="lowest_triangles" value="0"/> - <text name="lowest_vertices" value="0"/> - <text name="lod_table_footer"> - Niveau de détail : [DETAIL] - </text> - <radio_group name="lod_file_or_limit" value="lod_from_file"> - <radio_item label="Charger depuis un fichier" name="lod_from_file"/> - <radio_item label="Générer automatiquement" name="lod_auto_generate"/> - <radio_item label="Aucun" name="lod_none"/> - </radio_group> - <button label="Parcourir..." name="lod_browse"/> - <combo_box name="lod_mode"> - <combo_item name="triangle_limit"> - Triangles max. - </combo_item> - <combo_item name="error_threshold"> - Seuil d'erreur - </combo_item> - </combo_box> - <text name="build_operator_text"> - Opér. construction : + <panel name="left_panel"> + <panel name="model_name_representation_panel"> + <text name="name_label"> + Nom du modèle : </text> - <text name="queue_mode_text"> - Mode file d'attente : + <text name="model_category_label"> + Ce modèle représente... </text> - <combo_box name="build_operator"> - <combo_item name="edge_collapse"> - Fusion (nouveau sommet) - </combo_item> - <combo_item name="half_edge_collapse"> - Fusion (un des sommets) - </combo_item> - </combo_box> - <combo_box name="queue_mode"> - <combo_item name="greedy"> - Glouton - </combo_item> - <combo_item name="lazy"> - Paresseux - </combo_item> - <combo_item name="independent"> - Indépendant - </combo_item> + <combo_box name="model_category_combo"> + <combo_item label="Choisir une option..." name="Choose one"/> + <combo_item label="Silhouette de l'avatar" name="Avatar shape"/> + <combo_item label="Éléments attachés aux avatars" name="Avatar attachment"/> + <combo_item label="Objet mobile (véhicule, animal)" name="Moving object (vehicle, animal)"/> + <combo_item label="Éléments pour la construction" name="Building Component"/> + <combo_item label="Important, immobile etc." name="Large, non moving etc"/> + <combo_item label="Plus petit, immobile etc." name="Smaller, non-moving etc"/> + <combo_item label="Aucun" name="Not really any of these"/> </combo_box> - <text name="border_mode_text"> - Mode bord : - </text> - <text name="share_tolderance_text"> - Tolérance partage : - </text> - <combo_box name="border_mode"> - <combo_item name="border_unlock"> - Déverrouiller - </combo_item> - <combo_item name="border_lock"> - Verrouiller - </combo_item> - </combo_box> - <text name="crease_label"> - Angle pli : - </text> - <spinner name="crease_angle" value="75"/> </panel> - <panel label="Propriétés physiques" name="physics_panel"> - <panel name="physics geometry"> - <radio_group name="physics_load_radio" value="physics_load_from_file"> - <radio_item label="Fichier :" name="physics_load_from_file"/> - <radio_item label="Utiliser le niveau de détail :" name="physics_use_lod"/> - </radio_group> - <combo_box name="physics_lod_combo" tool_tip="Niveau de détail à utiliser pour la forme physique."> - <combo_item name="physics_lowest"> - Le plus faible - </combo_item> - <combo_item name="physics_low"> - Faible - </combo_item> - <combo_item name="physics_medium"> - Moyen - </combo_item> - <combo_item name="physics_high"> - Élevé - </combo_item> - </combo_box> - <button label="Parcourir..." name="physics_browse"/> + <tab_container name="import_tab"> + <panel label="Niveau de détail" name="lod_panel" title="Niveau de détail"> + <text initial_value="Source" name="source" value="Source"/> + <text initial_value="Triangles" name="triangles" value="Triangles"/> + <text initial_value="Sommets" name="vertices" value="Sommets"/> + <text initial_value="Élevé" name="high_label" value="Élevé"/> + <button label="Parcourir..." name="lod_browse_high"/> + <text initial_value="0" name="high_triangles" value="0"/> + <text initial_value="0" name="high_vertices" value="0"/> + <text initial_value="Moyen" name="medium_label" value="Moyen"/> + <button label="Parcourir..." name="lod_browse_medium"/> + <text initial_value="0" name="medium_triangles" value="0"/> + <text initial_value="0" name="medium_vertices" value="0"/> + <text initial_value="Faible" name="low_label" value="Faible"/> + <button label="Parcourir..." name="lod_browse_low"/> + <text initial_value="0" name="low_triangles" value="0"/> + <text initial_value="0" name="low_vertices" value="0"/> + <text initial_value="Le plus faible" name="lowest_label" value="Le plus faible"/> + <button label="Parcourir..." name="lod_browse_lowest"/> + <text initial_value="0" name="lowest_triangles" value="0"/> + <text initial_value="0" name="lowest_vertices" value="0"/> + <check_box label="Génération de normales" name="gen_normals"/> + <text initial_value="Angle pli :" name="crease_label" value="Angle pli :"/> + <spinner name="crease_angle" value="75"/> </panel> - <panel name="physics analysis"> - <slider label="Lissage :" name="Smooth"/> - <check_box label="Fermer les trous (lent)" name="Close Holes (Slow)"/> - <button label="Analyser" name="Decompose"/> - <button label="Annuler" name="decompose_cancel"/> + <panel label="Propriétés physiques" name="physics_panel"> + <panel name="physics geometry"> + <text name="first_step_name"> + Étape 1 : Niveau de détail + </text> + <combo_box name="physics_lod_combo" tool_tip="Niveau de détail à utiliser pour la forme des propriétés physiques."> + <combo_item name="choose_one"> + Choisir une option... + </combo_item> + <combo_item name="physics_high"> + Élevé + </combo_item> + <combo_item name="physics_medium"> + Moyen + </combo_item> + <combo_item name="physics_low"> + Faible + </combo_item> + <combo_item name="physics_lowest"> + Le plus faible + </combo_item> + <combo_item name="load_from_file"> + Du fichier + </combo_item> + </combo_box> + <button label="Parcourir..." name="physics_browse"/> + </panel> + <panel name="physics analysis"> + <text name="method_label"> + Étape 2 : Analyse + </text> + <text name="analysis_method_label"> + Moyen : + </text> + <text name="quality_label"> + Qualité : + </text> + <text name="smooth_method_label"> + Lissage : + </text> + <check_box label="Fermer les trous" name="Close Holes (Slow)"/> + <button label="Analyser" name="Decompose"/> + <button label="Annuler" name="decompose_cancel"/> + </panel> + <panel name="physics simplification"> + <text name="second_step_label"> + Étape 3 : Simplifier + </text> + <text name="simp_method_header"> + Moyen : + </text> + <text name="pass_method_header"> + Passes : + </text> + <text name="Detail Scale label"> + Échelle de détail : + </text> + <text name="Retain%_label"> + Retenue : + </text> + <combo_box name="Combine Quality" value="1"/> + <button label="Simplifier" name="Simplify"/> + <button label="Annuler" name="simplify_cancel"/> + </panel> + <panel name="physics info"> + <text name="results_text"> + Résultats : + </text> + <text name="physics_triangles"> + Triangles : [TRIANGLES], + </text> + <text name="physics_points"> + Sommets : [POINTS] + </text> + <text name="physics_hulls"> + Enveloppes : [HULLS] + </text> + </panel> </panel> - <panel name="physics simplification"> - <slider label="Passes :" name="Combine Quality"/> - <slider label="Échelle de détail :" name="Detail Scale"/> - <slider label="Retenue :" name="Retain%"/> - <button label="Simplifier" name="Simplify"/> - <button label="Annuler" name="simplify_cancel"/> - </panel> - <panel name="physics info"> - <slider label="Décomposition de l'aperçu :" name="physics_explode"/> - <text name="physics_triangles"> - Triangles : [TRIANGLES] + <panel label="Option de chargement" name="modifiers_panel"> + <text name="scale_label"> + Echelle (1 = pas d'échelle) : + </text> + <spinner name="import_scale" value="1.0"/> + <text name="dimensions_label"> + Dimensions : </text> - <text name="physics_points"> - Sommets : [POINTS] + <text name="import_dimensions"> + [X] X [Y] X [Z] </text> - <text name="physics_hulls"> - Enveloppes : [HULLS] + <check_box label="Inclure les textures" name="upload_textures"/> + <text name="include_label"> + Pour les modèles d'avatar uniquement : </text> + <check_box label="Inclure la pondération de la peau :" name="upload_skin"/> + <check_box label="Inclure la position des articulations :" name="upload_joints"/> + <text name="pelvis_offset_label"> + Décalage Z (élever ou abaisser l'avatar) : + </text> + <spinner name="pelvis_offset" value="0.0"/> </panel> - </panel> - <panel label="Modificateurs" name="modifiers_panel"> - <spinner name="import_scale" value="1.0"/> - <text name="import_dimensions"> - [X] x [Y] x [Z] m + </tab_container> + <panel name="weights_and_warning_panel"> + <button label="Calculer les poids et les frais." name="calculate_btn" tool_tip="Calculer les poids et les frais."/> + <button label="Annuler" name="cancel_btn"/> + <button label="Charger le modèle" name="ok_btn" tool_tip="Charger dans le simulateur"/> + <button label="Effacer les paramètres et réinitialiser le formulaire" name="reset_btn"/> + <text name="upload_fee"> + Frais de chargement : [FEE] L$ + </text> + <text name="prim_weight"> + Impact sur le terrain : [EQ] + </text> + <text name="download_weight"> + Téléchargement : [ST] + </text> + <text name="physics_weight"> + Propriétés physiques : [PH] + </text> + <text name="server_weight"> + Serveur : [SIM] + </text> + <text name="warning_title"> + Remarque : + </text> + <text name="warning_message"> + Vous n'avez pas la permission de charger des modèles de maillage. [[VURL] Savoir comment] obtenir la permission. + </text> + <text name="status"> + [STATUS] </text> - <check_box label="Textures" name="upload_textures"/> - <check_box label="Pondération de la peau" name="upload_skin"/> - <check_box label="Position des articulations" name="upload_joints"/> - <spinner name="pelvis_offset" value="0.0"/> </panel> - </tab_container> - <text name="upload_fee"> - Frais de chargement : [FEE] L$ + </panel> + <text name="lod_label"> + Aperçu : </text> - <button label="Réinitialiser" name="reset_btn" tool_tip="Rétablir les paramètres par défaut."/> - <button label="Calculer poids et frais" name="calculate_btn" tool_tip="Calculer les poids et les frais."/> - <button label="Charger" name="ok_btn" tool_tip="Charger dans le simulateur."/> - <button label="Annuler" name="cancel_btn"/> + <panel name="right_panel"> + <combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d'aperçu."> + <combo_item name="high"> + Élevé + </combo_item> + <combo_item name="medium"> + Moyen + </combo_item> + <combo_item name="low"> + Faible + </combo_item> + <combo_item name="lowest"> + Le plus faible + </combo_item> + </combo_box> + <text name="label_display"> + Afficher... + </text> + <check_box label="Coins" name="show_edges"/> + <check_box label="Propriétés physiques" name="show_physics"/> + <check_box label="Textures" name="show_textures"/> + <check_box label="Pondération de la peau" name="show_skin_weight"/> + <check_box label="Articulations" name="show_joint_positions"/> + <text name="physics_explode_label"> + Décomposition de l'aperçu : + </text> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml index f564b6f71a..cd2eb761ec 100644 --- a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml @@ -6,26 +6,20 @@ <button label="2. Optimisation" name="optimize_btn"/> <button label="1. Sélection du fichier" name="choose_file_btn"/> <panel name="choose_file_panel"> - <panel name="choose_file_header_panel"> - <text name="choose_file_header_text"> + <panel name="header_panel"> + <text name="header_text"> Choisir un fichier de modèle </text> </panel> - <panel name="choose_file_content_panel"> + <panel name="content"> <text name="advanced_users_text"> Utilisateurs expérimentés : si vous êtes habitué à utiliser des outils de création de contenu en 3D, l'outil de chargement avancé est mis à votre disposition. </text> <button label="Passer à Avancé" name="switch_to_advanced"/> - <text name="choose_model_file_label"> + <text name="Cache location"> Choisir un fichier de modèle à charger </text> <button label="Parcourir..." label_selected="Parcourir..." name="browse"/> - <text name="support_collada_text"> - Second Life prend en charge les fichiers COLLADA (.dae). - </text> - <text name="dimensions_label"> - Dimensions (mètres) : - </text> <text name="dimensions"> X Y Z </text> @@ -38,18 +32,15 @@ </panel> </panel> <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> + <panel name="header_panel"> + <text name="header_text"> Optimiser le modèle </text> </panel> - <text name="optimize_hint"> + <text name="description"> Le modèle a été optimisé en termes de performances. Vous pouvez l'ajuster si vous le souhaitez. </text> - <panel name="optimize_content_panel"> - <text name="generating_lod_label"> - Génération du niveau de détail - </text> + <panel name="content"> <text name="high_detail_text"> Générer le niveau de détail : Élevé </text> @@ -64,123 +55,64 @@ </text> </panel> <panel name="content2"> - <text name="optimize_performance_text"> - Performances - </text> - <text name="optimize_faster_rendering_text"> - Rendu plus rapide -Moins de détail -Poids en prims inférieur - </text> - <text name="optimize_accuracy_text"> - Précision - </text> - <text name="optimize_slower_rendering_text"> - Rendu plus lent -Plus de détail -Poids en prims supérieur - </text> - <text name="accuracy_slider_mark1"> - ' - </text> - <text name="accuracy_slider_mark2"> - ' - </text> - <text name="accuracy_slider_mark3"> - ' - </text> <button label="Recalcul géométrique" name="recalculate_geometry_btn"/> - <text name="geometry_preview_label"> + <text name="lod_label"> Aperçu de la géométrie </text> <combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d'aperçu."> - <combo_item name="preview_lod_high"> + <combo_item name="high"> Niveau de détail élevé </combo_item> - <combo_item name="preview_lod_medium"> + <combo_item name="medium"> Niveau de détail moyen </combo_item> - <combo_item name="preview_lod_low"> + <combo_item name="low"> Niveau de détail faible </combo_item> - <combo_item name="preview_lod_lowest"> + <combo_item name="lowest"> Niveau de détail le plus faible </combo_item> </combo_box> </panel> </panel> <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> + <panel name="header_panel"> + <text name="header_text"> Ajuster les propriétés physiques </text> </panel> - <text name="physics_hint"> + <text name="description"> Une forme va être créée pour l'enveloppe externe du modèle. Ajustez le niveau de détail de la forme en fonction de l'objectif souhaité pour votre modèle. </text> - <panel name="physics_content_panel"> - <text name="physics_performance_text"> - Performances - </text> - <text name="physics_faster_rendering_text"> - Rendu plus rapide -Moins de détail -Poids en prims inférieur - </text> - <text name="physics_accuracy_text"> - Précision - </text> - <text name="physics_slower_dendering_text"> - Rendu plus lent -Plus de détail -Poids en prims supérieur - </text> - <text name="physics_example_1"> - Exemples : -Objets mobiles -Objets volants -Véhicules - </text> - <text name="physics_example_2"> - Exemples : -Petits objets statiques -Objets moins détaillés -Mobilier simple - </text> - <text name="physics_example_3"> - Exemples : -Objets statiques -Objets détaillés -Bâtiments - </text> + <panel name="content"> <button label="Recalcul physique" name="recalculate_physics_btn"/> <button label="Recalcul en cours..." name="recalculating_physics_btn"/> - <text name="physics_preview_label"> + <text name="lod_label"> Aperçu des propriétés physiques </text> <combo_box name="preview_lod_combo2" tool_tip="Niveau de détail à afficher en rendu d'aperçu."> - <combo_item name="preview_lod2_high"> + <combo_item name="high"> Niveau de détail élevé </combo_item> - <combo_item name="preview_lod2_medium"> + <combo_item name="medium"> Niveau de détail moyen </combo_item> - <combo_item name="preview_lod2_low"> + <combo_item name="low"> Niveau de détail faible </combo_item> - <combo_item name="preview_lod2_lowest"> + <combo_item name="lowest"> Niveau de détail le plus faible </combo_item> </combo_box> </panel> </panel> <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> + <panel name="header_panel"> + <text name="header_text"> Vérification </text> </panel> - <panel name="review_content_panel"> + <panel name="content"> <text name="review_prim_equiv"> Impact sur la parcelle/région : équivalent à [EQUIV] prims </text> @@ -193,8 +125,8 @@ Bâtiments </panel> </panel> <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> + <panel name="header_panel"> + <text name="header_text"> Chargement terminé </text> </panel> diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml index c0f3864b81..0b0ec51846 100644 --- a/indra/newview/skins/default/xui/fr/floater_moveview.xml +++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="move_floater"> +<floater name="move_floater" title="BOUGER"> <string name="walk_forward_tooltip"> Marcher en avant (appuyer sur la flèche vers le haut ou W) </string> @@ -58,14 +58,14 @@ Voler </string> <panel name="panel_actions"> - <button label="" label_selected="" name="move up btn" tool_tip="Voler vers le haut (touche E)"/> <button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche (appuyer sur la flèche de gauche ou sur A)"/> <joystick_slide name="move left btn" tool_tip="Marcher vers la gauche (Maj+Flèche gauche ou touche A)"/> - <button label="" label_selected="" name="move down btn" tool_tip="Voler vers le bas (touche C)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite (appuyer sur la flèche de droite ou sur D)"/> <joystick_slide name="move right btn" tool_tip="Marcher vers la droite (Maj+Flèche droite ou touche D)"/> <joystick_turn name="forward btn" tool_tip="Marcher en avant (appuyer sur la flèche vers le haut ou W)"/> <joystick_turn name="backward btn" tool_tip="Marcher en arrière (appuyer sur la flèche vers le bas ou S)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Voler vers le haut (touche E)"/> + <button label="" label_selected="" name="move down btn" tool_tip="Voler vers le bas (touche C)"/> </panel> <panel name="panel_modes"> <button label="" name="mode_walk_btn" tool_tip="Mode marche"/> diff --git a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml new file mode 100644 index 0000000000..53ff58e307 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_my_appearance" title="APPARENCE"> + <panel label="Changer d'apparence" name="main_panel"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml new file mode 100644 index 0000000000..d514d08081 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_my_inventory" title="INVENTAIRE"/> diff --git a/indra/newview/skins/default/xui/fr/floater_object_weights.xml b/indra/newview/skins/default/xui/fr/floater_object_weights.xml new file mode 100644 index 0000000000..f1b063a3da --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_object_weights.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="object_weights" title="AVANCÉ"> + <floater.string name="nothing_selected" value="--"/> + <text name="selected_text" value="SELECTIONNÉ"/> + <text name="objects" value="--"/> + <text name="objects_label" value="Objets"/> + <text name="prims" value="--"/> + <text name="prims_label" value="Prims"/> + <text name="weights_of_selected_text" value="POIDS DES OBJETS SELECTIONNÉS"/> + <text name="download" value="--"/> + <text name="download_label" value="Télécharger"/> + <text name="physics" value="--"/> + <text name="physics_label" value="Propriétés physiques"/> + <text name="server" value="--"/> + <text name="server_label" value="Serveur"/> + <text name="display" value="--"/> + <text name="display_label" value="Afficher"/> + <text name="land_impacts_text" value="IMPACTS SUR LE TERRAIN"/> + <text name="selected" value="--"/> + <text name="selected_label" value="Sélection"/> + <text name="rezzed_on_land" value="--"/> + <text name="rezzed_on_land_label" value="Rezzé sur le terrain"/> + <text name="remaining_capacity" value="--"/> + <text name="remaining_capacity_label" value="Capacité restante"/> + <text name="total_capacity" value="--"/> + <text name="total_capacity_label" value="Capacité totale"/> + <text name="help_SLURL" value="[secondlife:///app/help/object_weights What is all this?...]"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml index d77dfbdf82..72018f5de5 100644 --- a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="modal container" title="Enregistrer la tenue"> +<floater name="modal container" title="SAUVEGARDER LA TENUE"> <button label="Enregistrer" label_selected="Enregistrer" name="Save"/> <button label="Annuler" label_selected="Annuler" name="Cancel"/> <text name="Save item as:"> diff --git a/indra/newview/skins/default/xui/fr/floater_people.xml b/indra/newview/skins/default/xui/fr/floater_people.xml new file mode 100644 index 0000000000..58701c06b2 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_people.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_people" title="PERSONNES"> + <panel_container name="main_panel"> + <panel label="Profil du groupe" name="panel_group_info_sidetray"/> + <panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/> + </panel_container> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_picks.xml b/indra/newview/skins/default/xui/fr/floater_picks.xml new file mode 100644 index 0000000000..f058ff668b --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_picks.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_picks" title="Favoris"/> diff --git a/indra/newview/skins/default/xui/fr/floater_places.xml b/indra/newview/skins/default/xui/fr/floater_places.xml new file mode 100644 index 0000000000..9e649aca47 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_places.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_places" title="LIEUX"> + <panel label="Lieux" name="main_panel"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml index 9e2e4333aa..080ade9dd4 100644 --- a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_sound_devices" title="Périphériques audio"> +<floater name="floater_sound_devices" title="PERIPHERIQUES AUDIO"> <text name="voice_label"> Chat vocal </text> diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml index 3c19bb2608..a74a338bd7 100644 --- a/indra/newview/skins/default/xui/fr/floater_stats.xml +++ b/indra/newview/skins/default/xui/fr/floater_stats.xml @@ -10,8 +10,8 @@ </stat_view> <stat_view label="Avancées" name="advanced"> <stat_view label="Rendu" name="render"> - <stat_bar label="KTris Drawn" name="ktrisframe"/> - <stat_bar label="KTris Drawn" name="ktrissec"/> + <stat_bar label="KTris par image" name="ktrisframe"/> + <stat_bar label="KTris par s" name="ktrissec"/> <stat_bar label="Objets totaux" name="objs"/> <stat_bar label="Nouveaux objets" name="newobjs"/> </stat_view> @@ -32,7 +32,7 @@ <stat_bar label="Couches" name="layerskbitstat"/> <stat_bar label="Arrivés" name="actualinkbitstat"/> <stat_bar label="Sortis" name="actualoutkbitstat"/> - <stat_bar label="Ops VFS en attente" name="vfspendingoperations"/> + <stat_bar label="Opérations VFS en attente" name="vfspendingoperations"/> </stat_view> </stat_view> <stat_view label="Simulateur" name="sim"> @@ -64,6 +64,14 @@ <stat_bar label="Durée de l'avatar" name="simagentmsec"/> <stat_bar label="Durée des images" name="simimagesmsec"/> <stat_bar label="Durée du script" name="simscriptmsec"/> + <stat_bar label="Temps d'inactivité" name="simsparemsec"/> + <stat_view label="Détails Temps (ms)" name="timedetails"> + <stat_bar label="Etape propr. physiques" name="simsimphysicsstepmsec"/> + <stat_bar label="Mettre à jour les formes phys" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="Propriétés physiques Autre" name="simsimphysicsothermsec"/> + <stat_bar label="Temps de sommeil" name="simsleepmsec"/> + <stat_bar label="Pump IO" name="simpumpiomsec"/> + </stat_view> </stat_view> </stat_view> </container_view> diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index bf687c412b..1ecf47f2e5 100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml @@ -25,10 +25,10 @@ Cliquez et faites glisser pour sélectionner le terrain. </floater.string> <floater.string name="status_selectcount"> - [OBJ_COUNT] objets ( [PRIM_COUNT] prims[PE_STRING] ) sélectionnés + [OBJ_COUNT] objets sélectionnés, impact sur le terrain [LAND_IMPACT] </floater.string> - <floater.string name="status_selectprimequiv"> - , équiv. prims de [SEL_WEIGHT] + <floater.string name="status_remaining_capacity"> + Capacité restante [LAND_CAPACITY]. </floater.string> <button label="" label_selected="" name="button focus" tool_tip="Mise au point"/> <button label="" label_selected="" name="button move" tool_tip="Déplacer"/> @@ -105,8 +105,8 @@ <text name="selection_empty"> Aucune sélection effectuée. </text> - <text name="selection_weight"> - Poids physique [PHYS_WEIGHT], Coût de rendu [DISP_WEIGHT]. + <text name="remaining_capacity"> + [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights More info] </text> <tab_container name="Object Info Tabs"> <panel label="Général" name="General"> @@ -319,7 +319,6 @@ Type de raccord </text> <combo_box name="sculpt type control"> - <combo_box.item label="(aucun)" name="None"/> <combo_box.item label="Sphère" name="Sphere"/> <combo_box.item label="Tore" name="Torus"/> <combo_box.item label="Plan" name="Plane"/> diff --git a/indra/newview/skins/default/xui/fr/floater_toybox.xml b/indra/newview/skins/default/xui/fr/floater_toybox.xml new file mode 100644 index 0000000000..e6fa212c65 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_toybox.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Toybox" title="PERSONNALISER LA BARRE D'OUTILS"> + <text name="toybox label 1"> + Ajouter ou supprimer des boutons en les faisant glisser vers les barres d'outils ou à partir de ces dernières. + </text> + <text name="toybox label 2"> + Les boutons s'afficheront comme indiqué ou comme des icônes, en fonction des paramètres de chaque barre d'outils. + </text> + <button label="Restaurer les choix par défaut" label_selected="Restaurer les choix par défaut" name="btn_restore_defaults"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml index d4f07a0a25..2b2bb8bbe3 100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_voice_controls" title="Contrôles vocaux"> +<floater name="floater_voice_controls" title="CONTROLES DE LA VOIX"> <string name="title_nearby"> - CHAT VOCAL PRÈS DE VOUS + Chat près de vous </string> <string name="title_group"> Appel de groupe avec [GROUP] diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml index 20af901ddc..09c9f5084a 100644 --- a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="hide_navbar_menu"> - <menu_item_check label="Afficher la barre de navigation" name="ShowNavbarNavigationPanel"/> + <menu_item_check label="Afficher la barre de navigation & favoris" name="ShowNavbarNavigationPanel"/> <menu_item_check label="Afficher la barre des favoris" name="ShowNavbarFavoritesPanel"/> <menu_item_check label="Afficher la mini-barre d'emplacement" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml index 6b96a16e75..8210c1be51 100644 --- a/indra/newview/skins/default/xui/fr/menu_login.xml +++ b/indra/newview/skins/default/xui/fr/menu_login.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu_bar name="Login Menu"> <menu label="Moi" name="File"> - <menu_item_call label="Préférences" name="Preferences..."/> + <menu_item_call label="Préférences..." name="Preferences..."/> <menu_item_call label="Quitter [APP_NAME]" name="Quit"/> </menu> <menu label="Aide" name="Help"> diff --git a/indra/newview/skins/default/xui/fr/menu_toolbars.xml b/indra/newview/skins/default/xui/fr/menu_toolbars.xml new file mode 100644 index 0000000000..bbfbe4b9ed --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_toolbars.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Toolbars Popup"> + <menu_item_call label="Choisir les boutons..." name="Chose Buttons"/> + <menu_item_check label="Icônes et étiquettes" name="icons_with_text"/> + <menu_item_check label="Icônes uniquement" name="icons_only"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index cf1dac2f3a..64cd463070 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -1,29 +1,30 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu_bar name="Main Menu"> <menu label="Moi" name="Me"> - <menu_item_call label="Préférences" name="Preferences"/> - <menu_item_call label="Ma Page d'accueil" name="Manage My Account"> + <menu_item_call label="Page d'accueil..." name="Manage My Account"> <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/> </menu_item_call> - <menu_item_call label="Acheter des L$" name="Buy and Sell L$"/> - <menu_item_call label="Mon profil" name="Profile"/> - <menu_item_call label="Mon apparence" name="ChangeOutfit"/> - <menu_item_check label="Mon inventaire" name="Inventory"/> - <menu_item_check label="Mon inventaire" name="ShowSidetrayInventory"/> - <menu_item_check label="Mes gestes" name="Gestures"/> - <menu_item_check label="Ma voix" name="ShowVoice"/> + <menu_item_call label="Profil..." name="Profile"/> + <menu_item_call label="Apparence..." name="ChangeOutfit"/> + <menu_item_check label="Inventaire..." name="Inventory"/> + <menu_item_check label="Gestes..." name="Gestures"/> + <menu_item_check label="Chat vocal..." name="ShowVoice"/> <menu label="Déplacement" name="Movement"> <menu_item_call label="M'asseoir" name="Sit Down Here"/> <menu_item_check label="Voler" name="Fly"/> <menu_item_check label="Toujours courir" name="Always Run"/> <menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/> </menu> - <menu label="Mon statut" name="Status"> + <menu label="Statut" name="Status"> <menu_item_call label="Absent" name="Set Away"/> <menu_item_call label="Occupé" name="Set Busy"/> </menu> <menu_item_call label="Demander le statut Admin" name="Request Admin Options"/> <menu_item_call label="Quitter le statut Admin" name="Leave Admin Options"/> + <menu_item_call label="Acheter des L$" name="Buy and Sell L$"/> + <menu_item_call label="Préférences..." name="Preferences"/> + <menu_item_call label="Barres d'outils..." name="Toolbars"/> + <menu_item_call label="Cacher tous les contrôles" name="Hide UI"/> <menu_item_call label="Quitter [APP_NAME]" name="Quit"/> </menu> <menu label="Communiquer" name="Communicate"> @@ -145,7 +146,6 @@ </menu> <menu label="Aide" name="Help"> <menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/> - <menu_item_check label="Activer les astuces" name="Enable Hints"/> <menu_item_call label="Signaler une infraction" name="Report Abuse"/> <menu_item_call label="Signaler un bug" name="Report Bug"/> <menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/> @@ -161,7 +161,7 @@ <menu label="Outils de performance" name="Performance Tools"> <menu_item_call label="Mesure du lag" name="Lag Meter"/> <menu_item_check label="Barre de statistiques" name="Statistics Bar"/> - <menu_item_check label="Afficher le coût de rendu de l'avatar" name="Avatar Rendering Cost"/> + <menu_item_check label="Afficher le poids de dessin pour les avatars" name="Avatar Rendering Cost"/> </menu> <menu label="Surbrillance et visibilité" name="Highlighting and Visibility"> <menu_item_check label="Balise animée" name="Cheesy Beacon"/> @@ -289,6 +289,7 @@ <menu_item_check label="Lumières" name="Lights"/> <menu_item_check label="Squelette de collision" name="Collision Skeleton"/> <menu_item_check label="Rayons" name="Raycast"/> + <menu_item_check label="Complexité du rendu" name="rendercomplexity"/> <menu_item_check label="Sculpture" name="Sculpt"/> </menu> <menu label="Rendu" name="Rendering"> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 1389c49f5b..31c29029b5 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -1909,6 +1909,12 @@ Déplacer les objets de l'inventaire ? Êtes-vous certain de vouloir quitter ? <usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/> </notification> + <notification name="ConfirmRestoreToybox"> + Etes-vous certain de vouloir restaurer vos boutons et barres d'outils par défaut ? + +Vous ne pouvez pas annuler cette action. + <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> + </notification> <notification name="DeleteItems"> [QUESTION] <usetemplate ignoretext="Confirmer avant de supprimer des articles" name="okcancelignore" notext="Annuler" yestext="OK"/> @@ -2995,10 +3001,6 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou <button name="cancel" text="Annuler"/> </form> </notification> - <notification label="" name="ModeChange"> - Vous devez quitter et redémarrer l'application afin de changer de mode. - <usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/> - </notification> <notification label="" name="NoClassifieds"> Pour créer et modifier des petites annonces, vous devez utiliser le mode Avancé. Voulez-vous quitter l'application afin de changer de mode ? Le sélecteur de mode se trouve sur l'écran de connexion. <usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/> @@ -3043,6 +3045,10 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou La recherche est uniquement disponible en mode Avancé. Voulez-vous quitter l'application afin de changer de mode ? <usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/> </notification> + <notification label="" name="ConfirmHideUI"> + Cette action cachera tous les objets des menus et boutons. Pour les récupérer, cliquez de nouveau sur [SHORTCUT]. + <usetemplate ignoretext="Confimer avant de cacher l'interface" name="okcancelignore" notext="Annuler" yestext="OK"/> + </notification> <global name="UnsupportedGLRequirements"> Vous semblez ne pas avoir le matériel requis pour utiliser [APP_NAME]. [APP_NAME] requiert une carte graphique OpenGL avec une prise en charge du multitexturing. Si vous avez une telle carte, assurez-vous que vous avez aussi les pilotes les plus récents pour la carte, ainsi que les service packs et les patchs pour votre système d'exploitation. diff --git a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml new file mode 100644 index 0000000000..de21996404 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="chiclet_bar"> + <layout_stack name="toolbar_stack"> + <layout_panel name="im_well_panel"> + <chiclet_im_well name="im_well"> + <button name="Unread IM messages" tool_tip="Conversations"/> + </chiclet_im_well> + </layout_panel> + <layout_panel name="notification_well_panel"> + <chiclet_notification name="notification_well"> + <button name="Unread" tool_tip="Notifications"/> + </chiclet_notification> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml index 219e5801f2..5676986228 100644 --- a/indra/newview/skins/default/xui/fr/panel_me.xml +++ b/indra/newview/skins/default/xui/fr/panel_me.xml @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Mon profil" name="panel_me"> - <tab_container name="tabs"> - <panel label="MON PROFIL" name="panel_profile"/> - <panel label="MES FAVORIS" name="panel_picks"/> - </tab_container> + <panel label="MES FAVORIS" name="panel_picks"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml index 45caf2323d..ecb1e9813a 100644 --- a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml @@ -1,18 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="navigation_bar"> - <panel name="navigation_panel"> - <pull_button name="back_btn" tool_tip="Revenir à l'emplacement précédent"/> - <pull_button name="forward_btn" tool_tip="Avancer d'un emplacement"/> - <button name="home_btn" tool_tip="Me téléporter jusqu'à mon domicile"/> - <location_input label="Emplacement" name="location_combo"/> - <search_combo_box label="Rechercher" name="search_combo_box" tool_tip="Rechercher"> - <combo_editor label="Rechercher dans [SECOND_LIFE]" name="search_combo_editor"/> - </search_combo_box> - </panel> - <favorites_bar name="favorite" tool_tip="Faites glisser des repères ici pour un accès rapide à vos lieux favoris dans Second Life."> - <label name="favorites_bar_label" tool_tip="Faites glisser des repères ici pour un accès rapide à vos lieux favoris dans Second Life."> - Favoris - </label> - <chevron_button name=">>" tool_tip="Afficher d'avantage de Favoris"/> - </favorites_bar> + <layout_stack name="nvp_stack"> + <layout_panel name="navigation_layout_panel"> + <panel name="navigation_panel"> + <pull_button name="back_btn" tool_tip="Revenir à l’emplacement précédent"/> + <pull_button name="forward_btn" tool_tip="Avancer d’un emplacement"/> + <button name="home_btn" tool_tip="Me téléporter jusqu’à mon domicile"/> + <location_input label="Endroit" name="location_combo"/> + </panel> + </layout_panel> + <layout_panel name="favorites_layout_panel"> + <favorites_bar name="favorite" tool_tip="Faites glisser des repères ici pour un accès rapide à vos lieux favoris dans Second Life."> + <label name="favorites_bar_label" tool_tip="Faites glisser des repères ici pour un accès rapide à vos endroits favoris dans Second Life."> + Barre des Favoris + </label> + <more_button name=">>" tool_tip="Afficher d'avantage de Favoris"> + Plus ▼ + </more_button> + </favorites_bar> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml new file mode 100644 index 0000000000..98eddf196b --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_chat"> + <check_box label="Traduction du chat (fournie par Google)" name="translate_chat_checkbox"/> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index 5ccf07f7b4..dd4c1c9f63 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -13,7 +13,10 @@ <combo_box.item label="Italiano (Italien) - Bêta" name="Italian"/> <combo_box.item label="Polski (Polonais) - Bêta" name="Polish"/> <combo_box.item label="Português (Portugais) - Bêta" name="Portugese"/> + <combo_box.item label="Русский (Russe) - Bêta" name="Russian"/> + <combo_box.item label="Türkçe (Turc) - Bêta" name="Turkish"/> <combo_box.item label="日本語 (Japonais) - Bêta" name="(Japanese)"/> + <combo_box.item label="正體 (Chinois traditionnel) - Bêta" name="Traditional Chinese"/> </combo_box> <text name="language_textbox2"> (redémarrage requis) @@ -48,7 +51,6 @@ <check_box label="Titres de groupe" name="show_all_title_checkbox1" tool_tip="Afficher les titres de groupe, comme Officier ou Membre."/> <check_box label="Mettre mes amis en surbrillance" name="show_friends" tool_tip="Mettre en surbrillance l'affichage des noms de vos amis."/> <check_box label="Voir les noms d'affichage" name="display_names_check" tool_tip="Cocher pour utiliser les noms d'affichage dans les chats, les IM, l'affichage des noms, etc."/> - <check_box label="Activer les astuces de l'interface" name="viewer_hints_check"/> <text name="inworld_typing_rg_label"> Appuyer sur les touches lettre : </text> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml index 5f1b206a39..efb520bfd3 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml @@ -7,18 +7,33 @@ </text> <check_box label="Construire/Modifier" name="edit_camera_movement" tool_tip="Utiliser le positionnement automatique de la caméra lorsque vous entrez en mode de modification et le quittez."/> <check_box label="Apparence" name="appearance_camera_movement" tool_tip="Utiliser le positionnement automatique de la caméra en mode de modification."/> - <check_box initial_value="true" label="Panneau latéral" name="appearance_sidebar_positioning" tool_tip="Utiliser le positionnement automatique de la caméra pour le panneau latéral."/> + <text name="keyboard_lbl"> + Clavier : + </text> + <check_box label="Les touches de direction me font toujours me déplacer" name="arrow_keys_move_avatar_check"/> + <check_box label="Appuyer deux fois et maintenir enfoncé pour courir" name="tap_tap_hold_to_run"/> + <text name="mouse_lbl"> + Souris : + </text> <check_box label="Afficher en vue subjective" name="first_person_avatar_visible"/> <text name=" Mouse Sensitivity"> Sensibilité de la souris en vue subjective : </text> <check_box label="Inverser" name="invert_mouse"/> - <check_box label="Les touches de direction me font toujours me déplacer" name="arrow_keys_move_avatar_check"/> - <check_box label="Appuyer deux fois et maintenir enfoncé pour courir" name="tap_tap_hold_to_run"/> - <check_box label="Double-cliquer pour :" name="double_click_chkbox"/> - <radio_group name="double_click_action"> - <radio_item label="Téléportation" name="radio_teleport"/> - <radio_item label="Pilotage auto" name="radio_autopilot"/> - </radio_group> + <text name="single_click_action_lbl"> + Clic simple sur le terrain : + </text> + <combo_box name="single_click_action_combo"> + <combo_box.item label="Pas d'action" name="0"/> + <combo_box.item label="Bouger vers le point cliqué" name="1"/> + </combo_box> + <text name="double_click_action_lbl"> + Double-clic sur le terrain : + </text> + <combo_box name="double_click_action_combo"> + <combo_box.item label="Pas d'action" name="0"/> + <combo_box.item label="Bouger vers le point cliqué" name="1"/> + <combo_box.item label="Téléporter vers le point cliqué" name="2"/> + </combo_box> <button label="Autres accessoires" name="joystick_setup_button"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml index 2dd5c06e4d..e836c24a94 100644 --- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml @@ -17,12 +17,9 @@ </panel.string> <panel name="balance_bg"> <text name="balance" tool_tip="Cliquer sur ce bouton pour actualiser votre solde en L$." value="20 L$"/> - <button label="ACHETER L$" name="buyL" tool_tip="Cliquer pour acheter plus de L$"/> + <button label="Achat de L$" name="buyL" tool_tip="Cliquer pour acheter plus de L$"/> + <button label="Achats" name="goShop" tool_tip="Ouvrir la Place du marché Second Life"/> </panel> - <combo_box name="mode_combo" tool_tip="Sélectionnez un mode. Pour une exploration facile et rapide avec chat, choisissez Basique. Pour accéder à plus de fonctionnalités, choisissez Avancé."> - <combo_box.item label="Mode basique" name="Basic"/> - <combo_box.item label="Mode avancé" name="Advanced"/> - </combo_box> <text name="TimeText" tool_tip="Heure actuelle (Pacifique)"> 00h00 PST </text> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 3a0553461a..daa31c980a 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -1276,6 +1276,9 @@ Veuillez réessayer de vous connecter dans une minute. <string name="Marketplace Error Internal Import"> Erreur : un problème est survenu concernant cet article. Veuillez réessayer ultérieurement. </string> + <string name="Open landmarks"> + Ouvrir les repères + </string> <string name="no_transfer" value=" (pas de transfert)"/> <string name="no_modify" value=" (pas de modification)"/> <string name="no_copy" value=" (pas de copie)"/> @@ -4254,7 +4257,7 @@ de l'infraction signalée <string name="Female - Wow"> Femme - Ouah ! </string> - <string name="/bow1"> + <string name="/bow"> /s'incliner </string> <string name="/clap"> @@ -4767,4 +4770,172 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="ParticleHiding"> Masquage des particules </string> + <string name="Command_AboutLand_Label"> + À propos du terrain + </string> + <string name="Command_Appearance_Label"> + Apparence + </string> + <string name="Command_Avatar_Label"> + Avatar + </string> + <string name="Command_Build_Label"> + Construire + </string> + <string name="Command_Chat_Label"> + Chat + </string> + <string name="Command_Compass_Label"> + Boussole + </string> + <string name="Command_Destinations_Label"> + Destinations + </string> + <string name="Command_Gestures_Label"> + Gestes + </string> + <string name="Command_HowTo_Label"> + Aide rapide + </string> + <string name="Command_Inventory_Label"> + Inventaire + </string> + <string name="Command_Map_Label"> + Carte + </string> + <string name="Command_Marketplace_Label"> + Place du marché + </string> + <string name="Command_MiniMap_Label"> + Mini-carte + </string> + <string name="Command_Move_Label"> + Bouger + </string> + <string name="Command_People_Label"> + Personnes + </string> + <string name="Command_Picks_Label"> + Favoris + </string> + <string name="Command_Places_Label"> + Lieux + </string> + <string name="Command_Preferences_Label"> + Préférences + </string> + <string name="Command_Profile_Label"> + Profil + </string> + <string name="Command_Search_Label"> + Recherche + </string> + <string name="Command_Snapshot_Label"> + Photo + </string> + <string name="Command_Speak_Label"> + Parler + </string> + <string name="Command_View_Label"> + Vue + </string> + <string name="Command_Voice_Label"> + Chat près de vous + </string> + <string name="Command_AboutLand_Tooltip"> + Information sur le terrain que vous visitez + </string> + <string name="Command_Appearance_Tooltip"> + Modifier votre avatar + </string> + <string name="Command_Avatar_Tooltip"> + Choisir un avatar complet + </string> + <string name="Command_Build_Tooltip"> + Construction d'objets et remodelage du terrain + </string> + <string name="Command_Chat_Tooltip"> + Parler aux personnes près de vous par chat écrit + </string> + <string name="Command_Compass_Tooltip"> + Boussole + </string> + <string name="Command_Destinations_Tooltip"> + Destinations intéressantes + </string> + <string name="Command_Gestures_Tooltip"> + Gestes de votre avatar + </string> + <string name="Command_HowTo_Tooltip"> + Comment effectuer les opérations courantes + </string> + <string name="Command_Inventory_Tooltip"> + Afficher et utiliser vos possessions + </string> + <string name="Command_Map_Tooltip"> + Carte du monde + </string> + <string name="Command_Marketplace_Tooltip"> + Faire du shopping + </string> + <string name="Command_MiniMap_Tooltip"> + Afficher les personnes près de vous + </string> + <string name="Command_Move_Tooltip"> + Faire bouger votre avatar + </string> + <string name="Command_People_Tooltip"> + Amis, groupes et personnes près de vous + </string> + <string name="Command_Picks_Tooltip"> + Lieux à afficher comme favoris dans votre profil + </string> + <string name="Command_Places_Tooltip"> + Lieux enregistrés + </string> + <string name="Command_Preferences_Tooltip"> + Préférences + </string> + <string name="Command_Profile_Tooltip"> + Modifier ou afficher votre profil + </string> + <string name="Command_Search_Tooltip"> + Trouver des lieux, personnes, événements + </string> + <string name="Command_Snapshot_Tooltip"> + Prendre une photo + </string> + <string name="Command_Speak_Tooltip"> + Parler aux personnes près de vous en utilisant votre micro + </string> + <string name="Command_View_Tooltip"> + Changer l'angle de la caméra + </string> + <string name="Command_Voice_Tooltip"> + Personnes près de vous avec le chat vocal + </string> + <string name="Retain%"> + Garder% + </string> + <string name="Detail"> + Détail + </string> + <string name="Better Detail"> + Meilleur détail + </string> + <string name="Surface"> + Surface + </string> + <string name="Solid"> + Solide + </string> + <string name="Wrap"> + Wrap + </string> + <string name="Preview"> + Aperçu + </string> + <string name="Normal"> + Normal + </string> </strings> diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml new file mode 100644 index 0000000000..4e0d81cb54 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_login.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_login"> + <layout_stack name="login_widgets"> + <layout_panel name="login"> + <text name="username_text"> + имя пользователя: + </text> + <text name="password_text"> + пароль: + </text> + <button label="войти" name="connect_btn"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml new file mode 100644 index 0000000000..c211b67dea --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_login.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_login"> + <layout_stack name="login_widgets"> + <layout_panel name="login"> + <text name="username_text"> + Kullanıcı adı: + </text> + <text name="password_text"> + Parola: + </text> + <button label="Giriş" name="connect_btn"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml deleted file mode 100644 index 21953aec08..0000000000 --- a/indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_currency_html" title="BUY CURRENCY (TODO: Translate to Simplified Chinese)"/> diff --git a/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml b/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml deleted file mode 100644 index 371086c374..0000000000 --- a/indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="ScriptChiclet Menu"> - <menu_item_call label="Close (TODO: translate to Simplified Chinese)" name="Close"/> -</menu> |