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

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

master
Ansariel 2020-07-13 20:17:27 +02:00
parent c5a661df67 2b0c668b89
commit 0242215384
25 changed files with 554 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llinventory/llsettingssky.cpp
View File

@ -171,8 +171,12 @@ LLSettingsSky::validation_list_t legacyHazeValidationList()
boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(5.0f)))));
legacyHazeValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_HAZE_HORIZON, false, LLSD::TypeReal,
boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(5.0f)))));
// <FS:Beq> FIRE-29682 Allow full range density multipliers
// legacyHazeValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_DENSITY_MULTIPLIER, false, LLSD::TypeReal,
// boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0001f)(2.0f)))));
legacyHazeValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_DENSITY_MULTIPLIER, false, LLSD::TypeReal,
boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0001f)(2.0f)))));
boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0000001f)(2.0f)))));
// </FS:Beq>
legacyHazeValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_DISTANCE_MULTIPLIER, false, LLSD::TypeReal,
boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0001f)(1000.0f)))));
}

15
indra/newview/app_settings/settings.xml
View File

@ -11841,7 +11841,20 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Backup</key>
<integer>0</integer>
</map>
<key>RenderCubeMap</key>
<key>OnlyShowSelectedNormals</key>
<map>
<key>Comment</key>
<string>Only render the normals for selected objects. in conjunction with render debug normals</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<key>Backup</key>
<integer>0</integer>
</map>
<key>RenderCubeMap</key>
<map>
<key>Comment</key>
<string>Whether we can render the cube map or not</string>

5
indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl
View File

@ -46,7 +46,10 @@ void main()
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
vec3 n = normalize(normal_matrix * normal);
vec3 t = normalize(normal_matrix * tangent.xyz);
// <FS:Beq> tangents should not use the inv_transpose matrix
// vec3 t = normalize(normal_matrix * tangent.xyz);
vec3 t = normalize((modelview_projection_matrix * vec4(tangent.xyz,0)).xyz);
// </FS:Beq>
vec3 b = cross(n, t) * tangent.w;
vary_mat0 = vec3(t.x, b.x, n.x);

5
indra/newview/app_settings/shaders/class1/deferred/materialV.glsl
View File

@ -122,7 +122,10 @@ vary_normal = n;
#else //HAS_SKIN
vec3 n = normalize(normal_matrix * normal);
#ifdef HAS_NORMAL_MAP
vec3 t = normalize(normal_matrix * tangent.xyz);
// <FS:Beq> tangents should not use the inv_transpose matrix
// vec3 t = normalize(normal_matrix * tangent.xyz);
vec3 t = normalize((modelview_projection_matrix * vec4(tangent.xyz,0)).xyz);
// </FS:Beq>
vec3 b = cross(n,t)*tangent.w;
//vec3 t = cross(b,n) * binormal.w;

17
indra/newview/llface.cpp
View File

@ -1566,6 +1566,10 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
LLMatrix4a mat_normal;
mat_normal.loadu(mat_norm_in);
// <FS:Beq> FIX incorrect transformation
LLMatrix4a mat_tan;
mat_tan.loadu(mat_vert_in);
// </FS:Beq>
F32 r = 0, os = 0, ot = 0, ms = 0, mt = 0, cos_ang = 0, sin_ang = 0;
bool do_xform = false;
@ -2125,8 +2129,10 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
LLVector4a t;
tangent_to_object.rotate(binormal_dir, t);
LLVector4a binormal;
mat_normal.rotate(t, binormal);
// <FS:Beq> FIX incorrect transformation
// mat_normal.rotate(t, binormal);
mat_tan.rotate(t, binormal);
// </FS:Beq>
//VECTORIZE THIS
if (mDrawablep->isActive())
{
@ -2256,7 +2262,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
if (rebuild_normal)
{
//LL_RECORD_TIME_BLOCK(FTM_FACE_GEOM_NORMAL);
//LL_RECORD_BLOCK_TIME(FTM_FACE_GEOM_NORMAL);
mVertexBuffer->getNormalStrider(norm, mGeomIndex, mGeomCount, map_range);
F32* normals = (F32*) norm.get();
LLVector4a* src = vf.mNormals;
@ -2294,7 +2300,10 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
while (src < end)
{
LLVector4a tangent_out;
mat_normal.rotate(*src, tangent_out);
// <FS:Beq> FIX incorrect transformation
// mat_normal.rotate(*src, tangent_out);
mat_tan.rotate(*src, tangent_out);
// </FS:Beq>
tangent_out.normalize3fast();
tangent_out.setSelectWithMask(mask, *src, tangent_out);
tangent_out.store4a(tangents);

120
indra/newview/llspatialpartition.cpp
View File

@ -56,6 +56,10 @@
#include "llcontrolavatar.h"
#include "llvotree.h"
// <FS:Beq> improved normals debug
#include "llformat.h"
#include "llselectmgr.h"
// </FS:Beq>
static LLTrace::BlockTimerStatHandle FTM_FRUSTUM_CULL("Frustum Culling");
static LLTrace::BlockTimerStatHandle FTM_CULL_REBOUND("Cull Rebound Partition");
@ -2269,45 +2273,131 @@ void renderBoundingBox(LLDrawable* drawable, BOOL set_color = TRUE)
void renderNormals(LLDrawable* drawablep)
{
LLVertexBuffer::unbind();
// <FS:Beq> FIX and improve renderNormals debug
static LLCachedControl<bool> showSelectedOnly(*LLUI::getInstance()->mSettingGroups["config"], "OnlyShowSelectedNormals");
// </FS:Beq>
LLVOVolume* vol = drawablep->getVOVolume();
if (vol)
{
// <FS:Beq> FIX and improve renderNormals debug
if(showSelectedOnly && !drawablep->getVObj()->isSelected())
{
drawablep->getVObj()->setDebugText("");
return;
}
// </FS:Beq>
LLVolume* volume = vol->getVolume();
gGL.pushMatrix();
gGL.multMatrix((F32*) vol->getRelativeXform().mMatrix);
// <FS:Beq> FIX and improve renderNormals debug
// LLMatrix3 mat_norm {vol->getRelativeXformInvTrans()};
LLMatrix3 scale_inverse;
auto scale = drawablep->getScale();
// We need something like an inverse transpose, however
// we do not use the object rotation as it will be applied in the world transform
// but we do need to apply the inverse scale^2(1) as the world transform does a scale too.
// transpose of a scale only matrix is a lot of nothing, so skip it.
scale_inverse.setRows(LLVector3(1.0, 0.0, 0.0) / scale.mV[VX],
LLVector3(0.0, 1.0, 0.0) / scale.mV[VY],
LLVector3(0.0, 0.0, 1.0) / scale.mV[VZ]);
LLMatrix4a inv_scale_mat;
inv_scale_mat.loadu(scale_inverse);
LLMatrix3 mat_norm = scale_inverse * scale_inverse;
LLMatrix4a invtranspose;
invtranspose.loadu(mat_norm);
// </FS:Beq>
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
LLVector4a scale(gSavedSettings.getF32("RenderDebugNormalScale"));
// <FS:Beq> FIX and improve renderNormals debug
// LLVector4a scale(gSavedSettings.getF32("RenderDebugNormalScale"));
static LLCachedControl<F32> hairlen(*LLUI::getInstance()->mSettingGroups["config"], "RenderDebugNormalScale");
LLSelectNode* selectionNode = nullptr;
auto face_select = LLSelectMgr::getInstance()->getTEMode();
if(showSelectedOnly)
{
auto objp = drawablep->getVObj();
if(!objp)
{
return;
}
objp->setDebugText(
llformat(
"obj scale = <%.3f,%.3f,%.3f>",
scale.mV[VX],scale.mV[VY],scale.mV[VZ]));
if(face_select)
{
LLObjectSelectionHandle sel = LLSelectMgr::getInstance()->getSelection();
selectionNode = sel.get()->findNode(objp);
}
}
// </FS:Beq>
for (S32 i = 0; i < volume->getNumVolumeFaces(); ++i)
{
// <FS:Beq> FIX and improve renderNormals debug
if(face_select && !selectionNode->isTESelected(i))
{
continue;
}
// </FS:Beq>
const LLVolumeFace& face = volume->getVolumeFace(i);
// <FS:Beq> FIX and improve renderNormals debug
gGL.begin(LLRender::LINES);
gGL.diffuseColor4f(1,1,0,1); // Yellow normals
// </FS:Beq>
for (S32 j = 0; j < face.mNumVertices; ++j)
{
gGL.begin(LLRender::LINES);
LLVector4a n,p;
// <FS:Beq> FIX and improve renderNormals debug
// gGL.begin(LLRender::LINES);
// LLVector4a n,p;
n.setMul(face.mNormals[j], scale);
p.setAdd(face.mPositions[j], n);
// n.setMul(face.mNormals[j], scale);
// p.setAdd(face.mPositions[j], n);
gGL.diffuseColor4f(1,1,1,1);
// gGL.diffuseColor4f(1,1,1,1);
// gGL.vertex3fv(face.mPositions[j].getF32ptr());
// gGL.vertex3fv(p.getF32ptr());
//
// if (face.mTangents)
// {
// n.setMul(face.mTangents[j], scale);
// p.setAdd(face.mPositions[j], n);
// gGL.vertex3fv(face.mPositions[j].getF32ptr());
// gGL.vertex3fv(p.getF32ptr());
// }
LLVector4a n,ni,p;
n = face.mNormals[j];
invtranspose.affineTransform(n, ni);
ni.normalize3fast();
n.setMul(ni, (F32)hairlen);
inv_scale_mat.affineTransform(n, ni); // overcompensate for the fact we draw "through" the model transform
p.setAdd(face.mPositions[j], ni);
gGL.vertex3fv(face.mPositions[j].getF32ptr());
gGL.vertex3fv(p.getF32ptr());
if (face.mTangents)
}
gGL.flush();
if (face.mTangents)
{
// gGL.begin(LLRender::LINES);
gGL.diffuseColor4f(0,0,1,1); // blue tangents.
for (S32 j = 0; j < face.mNumVertices; ++j)
{
n.setMul(face.mTangents[j], scale);
p.setAdd(face.mPositions[j], n);
gGL.diffuseColor4f(0,1,1,1);
LLVector4a t,ti,p;
t = face.mTangents[j];
// invtranspose.affineTransform(t, ti);
t.mul((F32)hairlen);
inv_scale_mat.affineTransform(t, ti); // overcompensate for the fact we draw "through" the model transform
p.setAdd(face.mPositions[j], ti);
gGL.vertex3fv(face.mPositions[j].getF32ptr());
gGL.vertex3fv(p.getF32ptr());
}
gGL.end();
}
}
gGL.end();
// </FS:Beq>
}
gGL.popMatrix();

8
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -7000,14 +7000,6 @@ URL: [AUDIOURL]
[MESSAGE]
</notification>
<notification
icon="notifytip.tga"
name="ChatSystemMessageTip"
type="notifytip"
log_to_chat="true">
[MESSAGE]
</notification>
<notification
icon="notifytip.tga"
name="Cancelled"

214
indra/newview/skins/default/xui/fr/menu_viewer.xml
View File

@ -1,75 +1,101 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
<menu label="Moi" name="Me">
<menu_item_call label="Profil..." name="Profile"/>
<menu_item_call label="Apparence..." name="ChangeOutfit"/>
<menu_item_call label="Choisir un avatar..." name="Avatar Picker"/>
<menu_item_check label="Inventaire..." name="Inventory"/>
<menu_item_call label="Nouvelle fenêtre d&apos;inventaire" name="NewInventoryWindow"/>
<menu_item_call label="Endroits..." name="Places"/>
<menu_item_call label="Compte" name="Manage Account"/>
<menu_item_call label="Annonces de Place du marché..." name="MarketplaceListings"/>
<menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/>
<menu_item_check label="Inventaire" name="Inventory"/>
<menu_item_check label="Inventaire" name="ShowSidetrayInventory"/>
<menu_item_check label="Dossiers protégés" name="Protected Folders"/>
<menu_item_check label="Éléments portés favoris" name="WearableFavorites"/>
<menu_item_call label="Favoris..." name="Picks"/>
<menu_item_call label="Expériences..." name="Experiences"/>
<menu_item_call label="Mes scripts..." name="MyScripts"/>
<menu_item_call label="Contrôles de la caméra..." name="Camera Controls"/>
<menu label="Déplacement" name="Movement">
<menu_item_call label="Profil..." name="Profile"/>
<menu_item_check label="Apparence..." name="ChangeOutfit"/>
<menu_item_call label="Choisir un avatar..." name="Avatar Picker"/>
<menu label="Déplacements" name="Movement">
<menu_item_call label="M&apos;asseoir" name="Sit Down Here"/>
<menu_item_call label="Se lever" name="Stand up"/>
<menu_item_call label="Me lever" name="Stand up"/>
<menu_item_check label="Voler" name="Fly"/>
<menu_item_call label="Arrêter de voler" name="Stop flying"/>
<menu_item_check label="Toujours courir" name="Always Run"/>
<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
<menu_item_call label="Marcher / Courir / Voler..." name="WalkRunFly"/>
<menu_item_check label="Forcer à s'asseoir" name="Force Toggle Sitting"/>
<menu_item_check label="Figer" name="Move Lock"/>
<menu_item_check label="Saut rapide" name="Avatar Ignore Prejump"/>
</menu>
<menu label="Statut" name="Status">
<menu_item_check label="Absent" name="Away"/>
<menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
<menu_item_check label="Contrôles des mouvements" name="Movement Controls"/>
<menu_item_check label="Contrôles de la caméra..." name="Camera Controls"/>
<menu label="Santé de l'avatar" name="avhealth">
<menu_item_call label="Arrêter les animations de l'avatar" name="Stop Animating My Avatar"/>
<menu_item_call label="Arrêter les animations de l'avatar &amp; révoquer les permissions" name="Stop Animating My Avatar With Revoke"/>
<menu_item_call label="Remettre en forme l'avatar" name="undeform_avatar"/>
<menu_item_call label="Forcer l'actualisation de l'apparence (Rebake)" name="Rebake Texture"/>
<menu_item_call label="Actualiser les attachements" name="Refresh Attachments"/>
<menu_item_call label="Utiliser l'avatar masculin de base (Character Test)" name="ResetDefaultAvM"/>
<menu_item_call label="Utiliser l'avatar féminin de base (Character Test)" name="ResetDefaultAvF"/>
<menu_item_check label="Afficher la complexité de l'avatar" name="Avatar Draw Info"/>
<menu_item_call label="Scripts" name="MyScripts"/>
<menu_item_call label="Indicateur de lag" name="Lag Meter"/>
<menu_item_call label="Recréer le Bridge LSL" name="Recreate LSL Bridge"/>
</menu>
<menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/>
<menu_item_call label="Annonces de Place du marché..." name="MarketplaceListings"/>
<menu_item_call label="Page d&apos;accueil du compte..." 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="Photo" name="Take Snapshot"/>
<menu_item_call label="Suivi des transactions" name="money_tracker"/>
<menu_item_call label="Pose Stand..." name="pose_stand"/>
<menu_item_call label="Préférences..." name="Preferences"/>
<menu_item_call label="Boutons des barres d&apos;outils..." name="Toolbars"/>
<menu_item_call label="Masquer tous les contrôles" name="Hide UI"/>
<menu_item_call label="Boutons de la barre d'outils" name="Toolbar Buttons"/>
<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
<menu_item_check label="Afficher l'interface utilisateur" name="Show User Interface"/>
<menu_item_call label="Demander le statut Administrateur" name="Request Admin Options"/>
<menu_item_call label="Quitter le statut Administrateur" name="Leave Admin Options"/>
<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
</menu>
<menu label="Communiquer" name="Communicate">
<menu_item_check label="Conversations..." name="Conversations"/>
<menu label="Statut de connexion" name="Status">
<menu_item_check label="Indisponible" name="Away"/>
<menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
<menu_item_check label="Réponse automatique" name="Set Autorespond"/>
<menu_item_check label="Réponse automatique aux non-amis" name="Set Autorespond to non-friends"/>
<menu_item_check label="Rejeter les offres et les demandes de téléportation" name="Automatically reject teleport offers"/>
<menu_item_check label="Rejeter toutes les invitations pour un groupe" name="Reject all group invites"/>
<menu_item_check label="Rejeter toutes les demandes d'amitié" name="Reject all friendship requests"/>
</menu>
<menu_item_call label="Amis" name="My Friends"/>
<menu_item_check label="Contacts" name="Contacts"/>
<menu_item_call label="Groupes de contacts" name="Contact Sets"/>
<menu_item_call label="Groupes" name="My Groups"/>
<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
<menu_item_check label="Parler" name="Speak"/>
<menu_item_check label="Journal des conversations..." name="Conversation Log..."/>
<menu_item_call label="Facebook..." name="Facebook"/>
<menu_item_call label="Twitter..." name="Twitter"/>
<menu_item_check label="Personnes" name="People"/>
<menu_item_check label="Conversations..." name="Conversations"/>
<menu_item_check label="Gestes..." name="Gestures"/>
<menu_item_call label="Flickr..." name="Flickr"/>
<menu label="Effet de voix" name="VoiceMorphing">
<menu_item_call label="Discord..." name="Discord"/>
<menu label="Effets de voix" name="VoiceMorphing">
<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
<menu_item_check label="Aperçu..." name="Preview"/>
<menu_item_call label="S&apos;abonner..." name="Subscribe"/>
<menu_item_call label="Avantage Premium..." name="PremiumPerk"/>
</menu>
<menu_item_check label="Gestes..." name="Gestures"/>
<menu_item_check label="Amis" name="My Friends"/>
<menu_item_check label="Groupes" name="My Groups"/>
<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
<menu_item_check label="Liste des ignorés" name="Block List"/>
<menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
<menu_item_check label="Journal des conversations..." name="Conversation Log..."/>
<menu_item_check label="Chat vocal à proximité" name="Nearby Voice"/>
<menu_item_call label="Liste des ignorés" name="Block List"/>
</menu>
<menu label="Monde" name="World">
<menu_item_call label="Créer un repère pour ce lieu" name="Create Landmark Here"/>
<menu_item_call label="Resynchroniser les animations" name="Resync Animations"/>
<menu_item_call label="Personnes à proximité" name="Active Speakers"/>
<menu_item_check label="Radar" name="Radar"/>
<menu_item_call label="Historique de téléportation" name="Teleport History"/>
<menu_item_check label="Lieux" name="Places"/>
<menu_item_call label="Destinations..." name="Destinations"/>
<menu_item_check label="Carte du monde" name="World Map"/>
<menu_item_check label="Mini-carte" name="Mini-Map"/>
<menu_item_call label="Événements" name="Events"/>
<menu_item_check label="Recherche..." name="Search"/>
<menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
<menu_item_call label="Définir le domicile ici" name="Set Home to Here"/>
<menu_item_call label="Photo" name="Take Snapshot"/>
<menu_item_check label="Mini-carte" name="Mini-Map"/>
<menu_item_check label="Carte du monde" name="World Map"/>
<menu_item_call label="Créer un repère pour ce lieu" name="Create Landmark Here"/>
<menu_item_call label="Profil du lieu" name="Place Profile"/>
<menu_item_call label="À propos du terrain" name="About Land"/>
<menu_item_call label="Région/Domaine" name="RegionEstate"/>
<menu_item_call label="Mes terrains..." name="My Land"/>
<menu_item_call label="Définir le domicile ici" name="Set Home to Here"/>
<menu_item_call label="Acheter ce terrain" name="Buy Land"/>
<menu_item_call label="Mes terrains..." name="My Land"/>
<menu label="Afficher" name="LandShow">
<menu_item_check label="Lignes d&apos;interdiction" name="Ban Lines"/>
<menu_item_check label="Balises" name="beacons"/>
@ -79,16 +105,15 @@
<menu_item_check label="Propriétés de la parcelle" name="Parcel Properties"/>
<menu_item_check label="Menu Avancé" name="Show Advanced Menu"/>
</menu>
<menu label="Environnement" name="Environment">
<menu_item_check label="Aube" name="Sunrise"/>
<menu_item_check label="Midi" name="Noon"/>
<menu_item_check label="Coucher de soleil" name="Sunset"/>
<menu_item_check label="Minuit" name="Midnight"/>
<menu_item_check label="Utiliser l&apos;environnement partagé" name="Use Shared Environment"/>
<menu_item_call label="Mes environnements..." name="my_environs"/>
<menu_item_call label="Éclairage personnel..." name="adjustment_tool"/>
<menu_item_check label="Pause des nuages" name="pause_clouds"/>
</menu>
<menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
<menu label="Photo et vidéo" name="photo_and_video"/>
<menu_item_call label="Recherche dans la région" name="area_search"/>
<menu_item_call label="Explorateur de sons" name="Sound Explorer"/>
<menu_item_call label="Explorateur d'animations" name="Animation Explorer"/>
<menu_item_call label="Liste noire d'éléments" name="asset_blacklist"/>
<menu_item_call label="Paramètres d'affichage de l'avatar" name="Avatar Render Settings"/>
<menu_item_check label="Toujours afficher complètement les amis" name="Always show Friends normally"/>
<menu_item_check label="N'afficher que les amis" name="Render Friends Only"/>
</menu>
<menu label="Construire" name="BuildTools">
<menu_item_check label="Construire" name="Show Build Tools"/>
@ -115,17 +140,23 @@
<menu_item_call label="Acheter" name="Menu Object Buy"/>
<menu_item_call label="Prendre" name="Menu Object Take"/>
<menu_item_call label="Prendre une copie" name="Take Copy"/>
<menu_item_call label="Dupliquer" name="Duplicate"/>
<menu_item_call label="Modifier les particles" name="Menu Object Edit Particles"/>
<menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/>
<menu_item_call label="Renvoi de l&apos;objet" name="Return Object back to Owner"/>
<menu_item_call label="Dupliquer" name="DuplicateObject"/>
<menu label="Enregistrer sous" name="Export Menu">
<menu_item_call label="Sauvegarde" name="Backup"/>
</menu>
</menu>
<menu label="Scripts" name="Scripts">
<menu_item_check label="Avertissements/Erreurs de scripts..." name="Script debug"/>
<menu_item_call label="Avertissements/erreurs de script" name="Script Debug"/>
<menu_item_call label="Informations sur le script (Compteur)" name="Script Info"/>
<menu_item_call label="Recompiler les scripts (Mono)" name="Mono"/>
<menu_item_call label="Recompiler les scripts (LSL)" name="LSL"/>
<menu_item_call label="Réinitialiser les scripts" name="Reset Scripts"/>
<menu_item_call label="Définir les scripts sur Exécution" name="Set Scripts to Running"/>
<menu_item_call label="Définir les scripts sur Pas d&apos;exécution" name="Set Scripts to Not Running"/>
<menu_item_call label="Supprimer les scripts de la sélection" name="Remove Scripts From Selection"/>
</menu>
<menu label="Recherche de chemin" name="Pathfinding">
<menu_item_call label="Objets des régions" name="pathfinding_linksets_menu_item"/>
@ -137,7 +168,11 @@
<menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/>
<menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
<menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
<menu_item_check label="Ne sélectionner que les objets verrouillés" name="Select Only Locked Objects"/>
<menu_item_check label="Ne sélectionner que les objets copiables" name="Select Only Copyable Objects"/>
<menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
<menu_item_check label="Inclure les objets appartenant à un groupe" name="Include Group-Owned Objects"/>
<menu_item_check label="Afficher la forme physique lors d'une modification" name="Show Physics Shape"/>
<menu_item_check label="Afficher les contours de la sélection" name="Show Selection Outlines"/>
<menu_item_check label="Afficher la sélection masquée" name="Show Hidden Selection"/>
<menu_item_check label="Afficher le rayon lumineux pour la sélection" name="Show Light Radius for Selection"/>
@ -154,26 +189,42 @@
<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
<menu_item_call label="Modèle..." name="Upload Model"/>
<menu_item_call label="Lot..." name="Bulk Upload"/>
<menu_item_call label="Importer un groupe d'objets" name="import linkset"/>
</menu>
<menu_item_call label="Annuler" name="Undo"/>
<menu_item_call label="Refaire" name="Redo"/>
</menu>
<menu label="Contenu" name="Content">
<menu_item_check label="Recherche" name="Search"/>
<menu_item_call label="Marketplace SL" name="SL Marketplace"/>
<menu_item_call label="Taux de change du L$" name="LindenXchange"/>
<menu_item_call label="Bibliothèque de scripts" name="Script Library"/>
<menu_item_call label="Blog Firestorm" name="Firestorm Blog"/>
<menu_item_call label="Flickr Firestorm" name="Firestorm Flickr"/>
<menu_item_call label="YouTube Firestorm" name="Firestorm YouTube"/>
<menu_item_call label="Twitter Firestorm" name="Firestorm Twitter"/>
<menu_item_call label="Plurk Firestorm" name="Firestorm Plurk"/>
<menu_item_call label="Message du jour" name="Firestorm MoTD"/>
</menu>
<menu label="Aide" name="Help">
<menu_item_call label="Aide rapide..." name="How To"/>
<menu_item_call label="Démarrage rapide" name="Quickstart"/>
<menu_item_call label="Base de connaissances" name="Knowledge Base"/>
<menu_item_call label="Wiki" name="Wiki"/>
<menu_item_call label="Forums de la communauté" name="Community Forums"/>
<menu_item_call label="Portail d&apos;assistance" name="Support portal"/>
<menu_item_call label="Actualités [SECOND_LIFE]" name="Second Life News"/>
<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_check label="Affficher les conseils" name="Enable Hints"/>
<menu_item_call label="Wiki Firestorm" name="Firestorm Wiki"/>
<menu_item_call label="Dépannage" name="Troubleshooting"/>
<menu_item_call label="Rejoindre un groupe d'aide Firestorm" name="firestorm_support_group"/>
<menu_item_call label="Horaires des classes Firestorm" name="Firestorm Classes Schedule"/>
<menu_item_call label="Calendrier des évènements Firestorm" name="Firestorm Events Calendar"/>
<menu_item_call label="Aide [CURRENT_GRID]" name="current_grid_help"/>
<menu_item_call label="À propos de [CURRENT_GRID]" name="current_grid_about"/>
<menu_item_check label="Consulter l'état de la grille" name="Grid Status"/>
<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
<menu_item_call label="Signaler un bug" name="Report Bug"/>
<menu_item_call label="Collisions, coups et bousculades" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_check label="Activer le bouton Sysinfo" name="Enable Sysinfo Button"/>
<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
</menu>
<menu label="Avancé" name="Advanced">
<menu_item_call label="Refixer les textures" name="Rebake Texture"/>
<menu_item_call label="Actualiser les attachements" name="Refresh Attachments"/>
<menu_item_call label="Taille de l&apos;interface par défaut" name="Set UI Size to Default"/>
<menu_item_call label="Définir la taille de la fenêtre…" name="Set Window Size..."/>
<menu_item_check label="Limiter la distance de sélection" name="Limit Select Distance"/>
@ -183,7 +234,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_call label="Statistiques de chargement de scène" name="Scene Load Statistics"/>
<menu_item_check label="Statistiques de chargement de scène" name="Scene Load Statistics"/>
<menu_item_check label="Afficher les informations de complexité de l’avatar" name="Avatar Draw Info"/>
</menu>
<menu label="Surbrillance et visibilité" name="Highlighting and Visibility">
@ -192,6 +243,11 @@
<menu_item_check label="Masquer la sélection" name="Hide Selected"/>
<menu_item_check label="Mettre la transparence en surbrillance" name="Highlight Transparent"/>
<menu_item_check label="Afficher le réticule de la vue subjective" name="ShowCrosshairs"/>
<menu label="Conseils" name="Hover Tips">
<menu_item_check label="Afficher les conseils" name="Show Tips"/>
<menu_item_check label="Afficher les conseils à propose des terrains" name="Land Tips"/>
<menu_item_check label="Afficher les conseils sur tous les objets" name="Tips On All Objects"/>
</menu>
</menu>
<menu label="Types de rendu" name="Rendering Types">
<menu_item_check label="Simple" name="Rendering Type Simple"/>
@ -218,23 +274,34 @@
<menu_item_check label="Tester FRInfo" name="Test FRInfo"/>
<menu_item_check label="Objets flexibles" name="Flexible Objects"/>
</menu>
<menu label="Sauvegarde des flux de médias" name="media_stream_import_export">
<menu_item_call label="Importer une liste XML de flux..." name="media_stream_import"/>
<menu_item_call label="Exporter une liste XML de flux..." name="media_stream_export"/>
</menu>
<menu_item_check label="Utiliser le thread de lecture de plug-in" name="Use Plugin Read Thread"/>
<menu_item_call label="Effacer le cache du groupe" name="ClearGroupCache"/>
<menu_item_check label="Effet de lissage de la souris" name="Mouse Smoothing"/>
<menu_item_call label="Libérer les touches" name="Release Keys"/>
<menu label="Raccourcis" name="Shortcuts">
<menu_item_check label="Recherche" name="Search"/>
<menu_item_check label="Afficher le menu Avancé - raccourci existant" name="Show Advanced Menu - legacy shortcut"/>
<menu_item_check label="Téléportation par double clic" name="DoubleClick Teleport"/>
<menu_item_check label="Toujours courir" name="Always Run"/>
<menu_item_check label="Voler" name="Fly"/>
<menu_item_call label="Fermer la fenêtre" name="Close Window"/>
<menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
<menu_item_call label="Photo sur disque" name="Snapshot to Disk"/>
<menu_item_call label="Vue subjective" name="Mouselook"/>
<menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
<menu_item_call label="Réinitialiser la vue" name="Reset View"/>
<menu_item_call label="Réinitialiser les angles de la caméra" name="Reset Camera Angles"/>
<menu_item_call label="Regarder la dernière conversation" name="Look at Last Chatter"/>
<menu_item_call label="Zoomer en avant" name="Zoom In"/>
<menu_item_call label="Zoom par défaut" name="Zoom Default"/>
<menu_item_call label="Zoomer en arrière" name="Zoom Out"/>
</menu>
<menu_item_check label="Ignorer l'interdiction de voler" name="Fly Override"/>
<menu_item_check label="API RestrainedLove" name="RLV API"/>
<menu_item_call label="Afficher les paramètres de débogage" name="Debug Settings"/>
<menu_item_check label="Afficher le menu Développeurs" name="Debug Mode"/>
</menu>
@ -259,9 +326,11 @@
</menu>
<menu label="Afficher les infos" name="Display Info">
<menu_item_check label="Afficher l&apos;heure" name="Show Time"/>
<menu_item_check label="Afficher le coût du chargement" name="Show Upload Cost"/>
<menu_item_check label="Afficher les infos de rendu" name="Show Render Info"/>
<menu_item_check label="Afficher la transaction d'upload" name="Show Upload Transaction"/>
<menu_item_check label="Afficher les infos de texture" name="Show Texture Info"/>
<menu_item_call label="Utilisation de VRAM par objet" name="VRAM usage per object"/>
<menu_item_check label="Afficher les infos de rendu de l'avatar" name="Show Avatar Render Info"/>
<menu_item_check label="Afficher les infos de rendu" name="Show Render Info"/>
<menu_item_check label="Afficher les matrices" name="Show Matrices"/>
<menu_item_check label="Afficher la couleur sous le curseur" name="Show Color Under Cursor"/>
<menu_item_check label="Afficher la mémoire" name="Show Memory"/>
@ -331,6 +400,8 @@
<menu_item_check label="Masques alpha automatiques (non différés)" name="Automatic Alpha Masks (non-deferred)"/>
<menu_item_check label="Textures d&apos;animation" name="Animation Textures"/>
<menu_item_check label="Désactiver les textures" name="Disable Textures"/>
<menu_item_call label="Ne pas afficher les animesh" name="Derender Animesh"/>
<menu_item_check label="Textures pleine résolution (dangereux)" name="Full Res Textures"/>
<menu_item_check label="Désactiver l&apos;ambiance" name="Disable Ambient"/>
<menu_item_check label="Désactiver la lumière du soleil" name="Disable Sunlight"/>
<menu_item_check label="Désactiver les lumières locales" name="Disable Local Lights"/>
@ -360,6 +431,7 @@
<menu_item_check label="Ignorer les paramètres du soleil de la sim" name="Sim Sun Override"/>
<menu_item_check label="Météo fixe" name="Fixed Weather"/>
<menu_item_call label="Vidage de cache d&apos;objet de la région" name="Dump Region Object Cache"/>
<menu_item_call label="Envoie les fonctionnalités du simulateur dans le chat local" name="DumpSimFeaturesToChat"/>
</menu>
<menu label="Interface" name="UI">
<menu_item_call label="Navigateur de médias" name="Media Browser"/>
@ -380,7 +452,11 @@
<menu label="XUI" name="XUI">
<menu_item_call label="Recharger les paramètres de couleurs" name="Reload Color Settings"/>
<menu_item_call label="Afficher le test de police" name="Show Font Test"/>
<menu_item_call label="Charge à partir d'XML" name="Load from XML"/>
<menu_item_call label="Enregistre en XML" name="Save to XML"/>
<menu_item_check label="Afficher les noms XUI" name="Show XUI Names"/>
<menu_item_check label="Affiche les info de débogage pour les vues" name="DebugViews"/>
<menu_item_call label="Outil de prévisualisation de XUI" name="UI Preview Tool"/>
<menu_item_call label="Envoyer des IM tests" name="Send Test IMs"/>
<menu_item_call label="Vider les caches de noms" name="Flush Names Caches"/>
</menu>
@ -416,15 +492,15 @@
<menu_item_check label="Voir les os" name="Show Bones"/>
<menu_item_check label="Afficher la cible de l&apos;avatar" name="Display Agent Target"/>
<menu_item_check label="Afficher les étendues d&apos;imposteur" name="Show Impostor Extents"/>
<menu_item_call label="Dump Attachments" name="Dump Attachments"/>
<menu_item_call label="Enregistre les données sur les attachements" name="Dump Attachments"/>
<menu_item_call label="Débogage des textures des avatars" name="Debug Avatar Textures"/>
<menu_item_call label="Dump Local Textures" name="Dump Local Textures"/>
<menu_item_call label="Enregistre les données sur les textures" name="Dump Local Textures"/>
</menu>
<menu_item_check label="Textures HTTP" name="HTTP Textures"/>
<menu_item_call label="Compresser les images" name="Compress Images"/>
<menu_item_call label="Activer Visual Leak Detector" name="Enable Visual Leak Detector"/>
<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
<menu_item_check label="Console Window on next Run" name="Console Window"/>
<menu_item_check label="Ouvrir la console de débogage au prochain lancement" name="Console Window"/>
<menu label="Définir le niveau de connexion" name="Set Logging Level">
<menu_item_check label="Débogage" name="Debug"/>
<menu_item_check label="Infos" name="Info"/>
@ -451,7 +527,7 @@
<menu_item_call label="Réclamer un terrain public" name="Claim Public Land"/>
</menu>
<menu label="Région" name="Region">
<menu_item_call label="Dump Temp Asset Data" name="Dump Temp Asset Data"/>
<menu_item_call label="Enregistre les données sur les éléments temporaires" name="Dump Temp Asset Data"/>
<menu_item_call label="Enregistrer l&apos;état de la région" name="Save Region State"/>
</menu>
<menu_item_call label="Outils divins" name="God Tools"/>

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

@ -2841,9 +2841,6 @@ URL: [AUDIOURL]
<notification name="IMSystemMessageTip">
[MESSAGE]
</notification>
<notification name="ChatSystemMessageTip">
[MESSAGE]
</notification>
<notification name="Cancelled">
取り消されました。
</notification>

7
indra/newview/skins/default/xui/pl/menu_viewer.xml
View File

@ -174,7 +174,6 @@
<menu_item_call label="Zwróć obiekt" name="Return Object back to Owner"/>
<menu label="Zapisz jako" name="Export Menu">
<menu_item_call label="Kopia zapasowa" name="Backup"/>
<menu_item_call label="Collada" name="Collada"/>
</menu>
</menu>
<menu label="Skrypty" name="Scripts">
@ -351,7 +350,7 @@
<menu_item_call label="Zamknij wszystkie okna" name="Close All Windows"/>
<menu_item_call label="Zapisz zdjęcie na dysk twardy" name="Snapshot to Disk"/>
<menu_item_call label="Widok pierwszoosobowy" name="Mouselook"/>
<menu_item_call label="Wolna kamera" name="Joystick Flycam"/>
<menu_item_check label="Wolna kamera" name="Joystick Flycam"/>
<menu_item_call label="Reset widoku" name="Reset View"/>
<menu_item_call label="Zresetuj kąty patrzenia kamery" name="Reset Camera Angles"/>
<menu_item_call label="Zobacz ostatniego rozmówcę" name="Look at Last Chatter"/>
@ -449,7 +448,7 @@
<menu label="Renderowanie" name="Rendering">
<menu_item_check label="Osie" name="Axes"/>
<menu_item_check label="Podstawy stycznych" name="Tangent Basis"/>
<menu_item_check label="Bazowe informacje wybranych tekstur" name="Selected Texture Info Basis"/>
<menu_item_call label="Bazowe informacje wybranych tekstur" name="Selected Texture Info Basis"/>
<menu_item_call label="Informacje o zaznaczonym materiale" name="Selected Material Info"/>
<menu_item_check label="Tryb obrazu szkieletowego" name="Wireframe"/>
<menu_item_check label="Okluzja obiektu do obiektu" name="Object-Object Occlusion"/>
@ -486,7 +485,7 @@
<menu_item_call label="Odtwarzanie nagranych zdarzeń" name="Playback event recording"/>
<menu_item_call label="Rozpocznij odtwarzanie" name="Start Playback"/>
<menu_item_call label="Zatrzymaj odtwarzanie" name="Stop Playback"/>
<menu_item_call label="Odtwarzanie w pętli" name="Loop Playback"/>
<menu_item_check label="Odtwarzanie w pętli" name="Loop Playback"/>
<menu_item_call label="Rozpocznij nagrywanie" name="Start Record"/>
<menu_item_call label="Zatrzymaj nagrywanie" name="Stop Record"/>
</menu>

2
indra/newview/skins/default/xui/pl/panel_preferences_backup.xml
View File

@ -73,7 +73,7 @@
<row name="restore_per_account_row_groupmutes">
<column name="restore_per_account_files_label">Wyłączone czaty grup</column>
</row>
<row name="restore_per_account_row_avatar_render_settings" value="avatar_render_settings">
<row name="restore_per_account_row_avatar_render_settings">
<column name="restore_per_account_files_label">Renderowanie awatarów</column>
</row>
</scroll_list>

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

@ -130,7 +130,7 @@
Сила
</text>
<button label="Применить" label_selected="Применить" name="button apply to selection" tool_tip="Изменить выбранную землю"/>
<text name="link_num_obj_count" tool_tip="Неверное количество объединений">
<text name="link_num_obj_count" tool_tip="Номер объединения может быть неточным." width="160">
[DESC] [NUM]
</text>
<text name="selection_empty" width="120">

4
indra/newview/skins/default/xui/ru/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/ru/menu_inventory.xml
View File

@ -35,6 +35,7 @@
<menu_item_call label="Новые трусы" name="New Underpants"/>
<menu_item_call label="Новая альфа" name="New Alpha Mask"/>
<menu_item_call label="Новая татуировка" name="New Tattoo"/>
<menu_item_call label="Новый универсальный" name="New Universal"/>
<menu_item_call label="Новая физика" name="New Physics"/>
</menu>
<menu label="Новая часть тела" name="New Body Parts">

1
indra/newview/skins/default/xui/ru/menu_inventory_add.xml
View File

@ -24,6 +24,7 @@
<menu_item_call label="Новые трусы" name="New Underpants"/>
<menu_item_call label="Новая альфа" name="New Alpha"/>
<menu_item_call label="Новая татуировка" name="New Tattoo"/>
<menu_item_call label="Новый универсальный" name="New Universal"/>
<menu_item_call label="Новая физика" name="New Physics"/>
</menu>
<menu label="Новая часть тела" name="New Body Parts">

1
indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
View File

@ -20,6 +20,7 @@
<menu_item_call label="Новая альфа" name="New Alpha"/>
<menu_item_call label="Новая физика" name="New Physics"/>
<menu_item_call label="Новая татуировка" name="New Tattoo"/>
<menu_item_call label="Новый универсальный" name="New Universal"/>
</context_menu>
<context_menu label="Новые части тела" name="New Body Parts">
<menu_item_call label="Новая фигура" name="New Shape"/>

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

@ -3,8 +3,8 @@
<menu_item_call label="Показать профиль" name="profile" />
<menu_item_call label="Отправить ЛС" name="im" />
<menu_item_call label="Предложить телепорт" name="teleport" />
<menu_item_call label="Установить алиас..." name="set_pseudonym" />
<menu_item_call label="Удалить алиас..." name="remove_pseudonym" />
<menu_item_call label="Установить псевдоним..." name="set_pseudonym" />
<menu_item_call label="Удалить псевдоним..." name="remove_pseudonym" />
<menu_item_call label="Удалить отображаемое имя..." name="remove_displayname" />
<menu_item_call label="Настройки Набора контактов" name="set_config" />
</toggleable_menu>

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

@ -2,6 +2,6 @@
<toggleable_menu name="menu_people_contact_sets_remove">
<menu_item_call label="Удалить набор..." name="remove_set" />
<menu_item_call label="Удалить контакт..." name="remove_contact" />
<menu_item_call label="Удалить алиас..." name="remove_alias" />
<menu_item_call label="Удалить псевдоним..." name="remove_alias" />
<menu_item_call label="Удалить отображаемое имя..." name="remove_display_name" />
</toggleable_menu>

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

File diff suppressed because it is too large Load Diff

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

@ -23,8 +23,8 @@
<button label="Профиль..." name="profile_btn" tool_tip="Открыть профиль аватара" />
<button label="ЛС..." name="start_im_btn" tool_tip="Отправить личное сообщение (ЛС)" />
<button label="Телепорт..." name="offer_teleport_btn" tool_tip="Предложить пользователю телепортироваться к вам" />
<button label="Алиас +" name="set_pseudonym_btn" tool_tip="Задать псевдоним данному аватару" />
<button label="Алиас -" name="remove_pseudonym_btn" tool_tip="Удалить псевдоним данного аватара" />
<button label="Прозвище +" name="set_pseudonym_btn" tool_tip="Задать псевдоним данному аватару" />
<button label="Прозвище -" name="remove_pseudonym_btn" tool_tip="Удалить псевдоним данного аватара" />
<button label="Удалить ОИ" name="remove_displayname_btn" tool_tip="Удалить отображаемое имя данного аватара" />
<text name="member_count">
Членов: [COUNT]

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

@ -27,7 +27,7 @@
Все наборы
</panel.string>
<panel.string name="pseudonyms">
Алиасы
Псевдонимы
</panel.string>
<string name="AllFriendsTitle">
Все ([ALL])

6
indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml
View File

@ -78,11 +78,11 @@
</text>
<slider label="Вертикальный диапазон движения головы:" tool_tip="Вертикальный диапазон движения головы в градусах" name="PitchFromMousePositionSlider" />
<text name="PitchFromMousePositionText">
градусов
град.
</text>
<slider label="Горизонтальный диапазон движения головы:" tool_tip="Горизонтальный диапазон движения головы в градусах" name="YawFromMousePositionSlider" />
<text name="YawFromMousePositionText">
градусов
град.
</text>
<text name="note_lookat">
(Настройки фокуса камеры во вкладке Приватность → Фокус камеры)
@ -212,7 +212,7 @@
<check_box label="Сохранять скрипты редактируемые в инвенторе как Моно" tool_tip="Сохранять скрипты редактируемые в инвенторе как Моно" name="FSSaveInventoryScriptsAsMono_toggle" />
<check_box label="Сохранить текстуры из инвентаря на диск в виде PNG вместо TGA" tool_tip="Сохранить текстуры из инвентаря на диск в виде PNG вместо TGA" name="FSTextureDefaultSaveAsFormat" />
<check_box label="Используйте Ctrl + мышь, чтобы захватить и манипулировать объектами" tool_tip="Используйте Ctrl + мышь, чтобы захватить и манипулировать объектами" name="FSEnableGrab" />
<check_box label="Разрешить масштабирование при нажатии (вместе с caps lock) для текстур при строительстве" tool_tip="При включении, позволяет тянуть при нажатии или масштаб при нажатии (вместе с caps lock) для текстур в режиме строительства. Эта функция эксперементальная и ее следует использовать с осторожностью." name="FSExperimentalDragTexture" />
<check_box label="Масштабирование при нажатии (вместе с caps lock) для текстур при строительстве" tool_tip="При включении, позволяет тянуть при нажатии или масштаб при нажатии (вместе с caps lock) для текстур в режиме строительства. Эта функция эксперементальная и ее следует использовать с осторожностью." name="FSExperimentalDragTexture" />
<check_box label="Предварительный просмотр анимации на собственном аватара во время загрузки" tool_tip="Предварительный просмотр анимации на собственном аватара во время загрузки" name="FSUploadAnimationOnOwnAvatar" />
<check_box label="Включить расширенную информацию скрипта" name="FSScriptInfoExtended" tool_tip="Если включено, расширяет базовую функцию информации скрипта с различными деталями, полезными для строителей"/>
</panel>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Opensim" name="opensim_panel">
<tab_container label="Opensim" name="tabs">
<panel label="Оправление сеткой" name="grid_management_panel">
<panel label="Управление сеткой" name="grid_management_panel">
<text name="add_grid_text">
Добавить новую сетку
</text>

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

@ -1472,6 +1472,15 @@ http://www.firestormviewer.org/support за помощь в решении эт
<string name="none">
нет
</string>
<string name="sky">
Небо
</string>
<string name="water">
Вода
</string>
<string name="day">
Цикл дня
</string>
<string name="shirt_not_worn">
Рубашка не надета
</string>
@ -5177,6 +5186,9 @@ http://www.firestormviewer.org/support за помощь в решении эт
<string name="New Sky">
Новое небо
</string>
<string name="New Settings">
Новые Настройки
</string>
<string name="/bow">
/поклониться
</string>

2
indra/newview/skins/vintage/xui/ru/panel_people.xml
View File

@ -30,7 +30,7 @@
Все наборы
</panel.string>
<panel.string name="pseudonyms">
Алиасы
Псевдонимы
</panel.string>
<tab_container name="tabs">
<panel label="Рядом" name="nearby_panel">