diff options
Diffstat (limited to 'indra/newview/skins')
196 files changed, 4027 insertions, 3320 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index eabcc68916..7ca6820318 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -54,6 +54,8 @@ with the same filename but different name <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png" preload="true" /> <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" /> + <texture name="Arrow_Left" file_name="widgets/Arrow_Left.png" preload="true" /> + <texture name="Arrow_Right" file_name="widgets/Arrow_Right.png" preload="true" /> <texture name="AudioMute_Off" file_name="icons/AudioMute_Off.png" preload="false" /> <texture name="AudioMute_Over" file_name="icons/AudioMute_Over.png" preload="false" /> diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Left.png Binary files differnew file mode 100644 index 0000000000..a424282839 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Arrow_Left.png diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Right.png Binary files differnew file mode 100644 index 0000000000..e32bee8f34 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Arrow_Right.png diff --git a/indra/newview/skins/default/xui/da/floater_model_wizard.xml b/indra/newview/skins/default/xui/da/floater_model_wizard.xml deleted file mode 100644 index 8ad443581a..0000000000 --- a/indra/newview/skins/default/xui/da/floater_model_wizard.xml +++ /dev/null @@ -1,241 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="UPLOAD MODEL WIZARD"> - <button label="5. Upload" name="upload_btn"/> - <button label="4. Review" name="review_btn"/> - <button label="3. Physics" name="physics2_btn"/> - <button label="3. Physics" name="physics_btn"/> - <button label="2. Optimize" name="optimize_btn"/> - <button label="1. Choose File" name="choose_file_btn"/> - <panel name="choose_file_panel"> - <panel name="header_panel"> - <text name="header_text"> - Upload Model - </text> - </panel> - <text name="description"> - This wizard will help you import mesh models to Second Life. First specify a file containing the model you wish to import. Second Life supports COLLADA (.dae) files. - </text> - <panel name="content"> - <text name="Cache location"> - Filename: - </text> - <button label="Browse..." label_selected="Browse..." name="browse"/> - <text name="dimensions"> - X: Y: Z: - </text> - <text name="dimension_dividers"> - | | - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="header_panel"> - <text name="header_text"> - Optimize - </text> - </panel> - <text name="description"> - This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue. - </text> - <panel name="content"> - <text name="high_detail_text"> - Generate Level of Detail: High - </text> - <text name="medium_detail_text"> - Generate Level of Detail: Medium - </text> - <text name="low_detail_text"> - Generate Level of Detail: Low - </text> - <text name="lowest_detail_text"> - Generate Level of Detail: Lowest - </text> - </panel> - <panel name="content2"> - <text name="lod_label"> - Model Preview: - </text> - <combo_box name="preview_lod_combo2" tool_tip="LOD to view in preview render"> - <combo_item name="high"> - High - </combo_item> - <combo_item name="medium"> - Medium - </combo_item> - <combo_item name="low"> - Low - </combo_item> - <combo_item name="lowest"> - Lowest - </combo_item> - </combo_box> - <text name="streaming cost"> - Resource Cost: [COST] - </text> - <text name="dimensions"> - X: Y: Z: - </text> - <text name="dimension_dividers"> - | | - </text> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="header_panel"> - <text name="header_text"> - Physics - </text> - </panel> - <text name="description"> - The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used: - </text> - <panel name="content"> - <text name="streaming cost"> - Resource Cost: [COST] - </text> - </panel> - </panel> - <panel name="physics2_panel"> - <panel name="header_panel"> - <text name="header_text"> - Physics - </text> - </panel> - <text name="description"> - Preview the physics shape below then click Next to continue. To modify the physics shape, click the Back button. - </text> - <panel name="content"> - <text name="lod_label"> - Model Preview: - </text> - <combo_box name="preview_lod_combo3" tool_tip="LOD to view in preview render"> - <combo_item name="high"> - High - </combo_item> - <combo_item name="medium"> - Medium - </combo_item> - <combo_item name="low"> - Low - </combo_item> - <combo_item name="lowest"> - Lowest - </combo_item> - </combo_box> - <text name="dimensions"> - X: Y: Z: - </text> - <text name="dimension_dividers"> - | | - </text> - <text name="streaming cost"> - Resource Cost: [COST] - </text> - </panel> - </panel> - <panel name="review_panel"> - <panel name="header_panel"> - <text name="header_text"> - Review - </text> - </panel> - <text name="description"> - Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload. - </text> - <panel name="content"> - <text name="lod_label"> - Model Preview: - </text> - <combo_box name="preview_lod_combo" tool_tip="LOD to view in preview render"> - <combo_item name="high"> - High - </combo_item> - <combo_item name="medium"> - Medium - </combo_item> - <combo_item name="low"> - Low - </combo_item> - <combo_item name="lowest"> - Lowest - </combo_item> - </combo_box> - <text name="dimensions"> - X: Y: Z: - </text> - <text name="dimension_dividers"> - | | - </text> - </panel> - <text name="streaming cost"> - Resource Cost: [COST] - </text> - <text name="physics cost"> - Physics Cost: [COST] - </text> - </panel> - <panel name="upload_panel"> - <panel name="header_panel"> - <text name="header_text"> - Upload Complete! - </text> - </panel> - <text name="description"> - Congratulations! Your model has been sucessfully uploaded. You will find the model in the Objects folder in your inventory. - </text> - </panel> - <button label="<< Back" name="back"/> - <button label="Next >>" name="next"/> - <button label="Upload" name="upload" tool_tip="Upload to simulator"/> - <button label="Cancel" name="cancel"/> - <button label="Close" name="close"/> - <spinner name="import_scale" value="1.0"/> - <string name="status_idle"> - Idle - </string> - <string name="status_reading_file"> - Loading... - </string> - <string name="status_generating_meshes"> - Generating Meshes... - </string> - <string name="status_vertex_number_overflow"> - Error: Vertex number is more than 65534, aborted! - </string> - <string name="high"> - High - </string> - <string name="medium"> - Medium - </string> - <string name="low"> - Low - </string> - <string name="lowest"> - Lowest - </string> - <string name="mesh_status_good"> - Ship it! - </string> - <string name="mesh_status_na"> - N/A - </string> - <string name="mesh_status_none"> - None - </string> - <string name="mesh_status_submesh_mismatch"> - Levels of detail have a different number of textureable faces. - </string> - <string name="mesh_status_mesh_mismatch"> - Levels of detail have a different number of mesh instances. - </string> - <string name="mesh_status_too_many_vertices"> - Level of detail has too many vertices. - </string> - <string name="mesh_status_missing_lod"> - Missing required level of detail. - </string> - <string name="layer_all"> - All - </string> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml new file mode 100644 index 0000000000..3dc554b120 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Anim Preview" title="ANIMATION.ANIM"> + <text name="name_label"> + Name: + </text> + <text name="description_label"> + Beschreibung: + </text> + <button label="Hochladen (L$ [AMOUNT])" name="ok_btn"/> + <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml new file mode 100644 index 0000000000..9a6f5e0166 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Animation Preview"> + <floater.string name="failed_to_initialize"> + Bewegung konnte nicht initialisiert werden + </floater.string> + <floater.string name="anim_too_long"> + Animationsdatei ist [LENGTH] Sekunden lang. + +Maximal erlaubt sind [MAX_LENGTH] Sekunden. + </floater.string> + <floater.string name="failed_file_read"> + Animationsdatei kann nicht gelesen werden. + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + OK + </floater.string> + <floater.string name="E_ST_EOF"> + Vorzeitiges Dateiende. + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + Constraint-Definition kann nicht gelesen werden. + </floater.string> + <floater.string name="E_ST_NO_FILE"> + BVH-Datei kann nicht geöffnet werden. + </floater.string> + <floater.string name="E_ST_NO_HIER"> + Ungültige HIERARCHY-Kopfzeile. + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + ROOT oder JOINT nicht gefunden. + </floater.string> + <floater.string name="E_ST_NO_NAME"> + JOINT-Name nicht erfasst. + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + OFFSET nicht gefunden. + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + CHANNELS nicht gefunden. + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + Rotationsreihenfolge kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + Rotationsachse kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + MOTION nicht gefunden. + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + Anzahl der Bilder kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + Bildzeit kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_POS"> + Positionswerte können nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_ROT"> + Rotationswerte können nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + Transformationsdatei kann nicht geöffnet werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + Transformationskopfzeile kann nicht gelesen werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + Transformationsnamen können nicht gelesen werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + Ignorieren-Transformationswert kann nicht gelesen werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + Relativer Transformationswert kann nicht gelesen werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + Outname-Transformationswert kann nicht gelesen werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + Transformationsmatrix kann nicht gelesen werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + Mergechild-Name kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + Mergeparent-Name kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + Priority-Wert kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + Loop-Wert kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + EaseIn-Werte können nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + EaseOut-Werte können nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + Hand-Morph-Wert kann nicht erfasst werden. + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + Emote-Name kann nicht gelesen werden. + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Falscher Root-Joint-Name, „hip“ verwenden. + </floater.string> + <text name="name_label"> + Name: + </text> + <text name="description_label"> + Beschreibung: + </text> + <spinner label="Priorität" name="priority" tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können"/> + <check_box label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife"/> + <spinner label="Ein (%)" name="loop_in_point" tool_tip="Anfang einer Animationsschleife festlegen"/> + <spinner label="Aus (%)" name="loop_out_point" tool_tip="Ende einer Animationsschleife festlegen"/> + <text name="hand_label"> + Handhaltung + </text> + <combo_box name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände"> + <combo_box.item label="Dehnen" name="Spread"/> + <combo_box.item label="Entspannt" name="Relaxed"/> + <combo_box.item label="Beide zeigen" name="PointBoth"/> + <combo_box.item label="Faust" name="Fist"/> + <combo_box.item label="Links entspannt" name="RelaxedLeft"/> + <combo_box.item label="Nach links zeigen" name="PointLeft"/> + <combo_box.item label="Linke Faust" name="FistLeft"/> + <combo_box.item label="Rechts entspannt" name="RelaxedRight"/> + <combo_box.item label="Nach rechts zeigen" name="PointRight"/> + <combo_box.item label="Rechte Faust" name="FistRight"/> + <combo_box.item label="Rechts salutieren" name="SaluteRight"/> + <combo_box.item label="Tippen" name="Typing"/> + <combo_box.item label="Friedensgeste rechts" name="PeaceRight"/> + </combo_box> + <text name="emote_label"> + Ausdruck + </text> + <combo_box name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation"> + <item label="(Keine)" name="[None]" value=""/> + <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> + <item label="Ängstlich" name="Afraid" value="Ängstlich"/> + <item label="Verärgert" name="Angry" value="Verärgert"/> + <item label="Grinst" name="BigSmile" value="Grinst"/> + <item label="Gelangweilt" name="Bored" value="Gelangweilt"/> + <item label="Weinen" name="Cry" value="Weinen"/> + <item label="Verachtung" name="Disdain" value="Verachtung"/> + <item label="Verlegen" name="Embarrassed" value="Verlegen"/> + <item label="Stirnrunzeln" name="Frown" value="Stirnrunzeln"/> + <item label="Küssen" name="Kiss" value="Küssen"/> + <item label="Lachen" name="Laugh" value="Lachen"/> + <item label="Bäääh" name="Plllppt" value="Bäääh"/> + <item label="Angewidert" name="Repulsed" value="Angewidert"/> + <item label="Traurig" name="Sad" value="Traurig"/> + <item label="Achselzucken" name="Shrug" value="Achselzucken"/> + <item label="Lächeln" name="Smile" value="Lächeln"/> + <item label="Überraschung" name="Surprise" value="Überraschung"/> + <item label="Zwinkern" name="Wink" value="Zwinkern"/> + <item label="Sorgenvoll" name="Worry" value="Sorgenvoll"/> + </combo_box> + <text name="preview_label"> + Vorschau während: + </text> + <combo_box name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt."> + <item label="Stehen" name="Standing" value="Stehen"/> + <item label="Gehen" name="Walking" value="Gehen"/> + <item label="Sitzen" name="Sitting" value="Sitzen"/> + <item label="Fliegen" name="Flying" value="Fliegen"/> + </combo_box> + <spinner label="Einblenden (s)" name="ease_in_time" tool_tip="Einblendungszeit für Animationen (in Sekunden)"/> + <spinner label="Ausblenden (s)" name="ease_out_time" tool_tip="Ausblendungszeit für Animationen (in Sekunden)"/> + <button name="play_btn" tool_tip="Animation abspielen"/> + <button name="pause_btn" tool_tip="Animation unterbrechen"/> + <button name="stop_btn" tool_tip="Animation anhalten"/> + <text name="bad_animation_text"> + Animationsdatei kann nicht gelesen werden. + +Wir empfehlen exportierte BVH-Dateien aus Poser 4. + </text> + <button label="Hochladen (L$ [AMOUNT])" name="ok_btn"/> + <button label="Abbrechen" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_model_wizard.xml b/indra/newview/skins/default/xui/de/floater_model_wizard.xml deleted file mode 100644 index ee26d51d32..0000000000 --- a/indra/newview/skins/default/xui/de/floater_model_wizard.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="ASSISTENT ZUM HOCHLADEN VON MODELLEN"> - <button label="5. Hochladen" name="upload_btn"/> - <button label="4. Überprüfen" name="review_btn"/> - <button label="3. Physik" name="physics_btn"/> - <button label="2. Optimieren" name="optimize_btn"/> - <button label="1. Datei auswählen" name="choose_file_btn"/> - <panel name="choose_file_panel"> - <panel name="choose_file_header_panel"> - <text name="choose_file_header_text"> - Modelldatei auswählen - </text> - </panel> - <panel name="choose_file_content"> - <text name="advanced_users_text"> - Fortgeschrittene Benutzer: Wenn Sie bereits mit Tools zur Erstellung von 3D-Inhalten vertraut sind, können Sie den erweiterten Uploader verwenden. - </text> - <button label="Auf Erweitert wechseln" name="switch_to_advanced"/> - <text name="Cache location"> - Hochzuladende Modelldatei auswählen - </text> - <button label="Durchsuchen..." label_selected="Durchsuchen..." name="browse"/> - <text name="Model types"> - Second Life unterstützt COLLADA-Dateien (.dae). - </text> - <text name="dimensions"> - X Y Z - </text> - <text name="warning_label"> - ACHTUNG: - </text> - <text name="warning_text"> - Sie können den letzten Schritt nicht abschließen (Modell auf Second Life-Server hochladen). [secondlife:///app/floater/learn_more Weitere Infos], wie Sie Ihr Konto zum Hochladen von Netzmodellen einrichten. - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> - Modell optimieren - </text> - </panel> - <text name="optimize_description"> - Wir haben das Modell auf Leistung optimiert. Sie können es bei Bedarf weiter anpassen. - </text> - <panel name="optimize_content"> - <text name="high_detail_text"> - Detailstufe generieren: hoch - </text> - <text name="medium_detail_text"> - Detailstufe generieren: mittel - </text> - <text name="low_detail_text"> - Detailstufe generieren: niedrig - </text> - <text name="lowest_detail_text"> - Detailstufe generieren: niedrigste - </text> - </panel> - <panel name="content2"> - <button label="Geometrie neu berechnen" name="recalculate_geometry_btn"/> - <text name="lod_label"> - Geometrievorschau - </text> - <combo_box name="preview_lod_combo" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung"> - <combo_item name="high"> - Viel Details - </combo_item> - <combo_item name="medium"> - Mittlere Details - </combo_item> - <combo_item name="low"> - Wenig Details - </combo_item> - <combo_item name="lowest"> - Wenigste Details - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> - Physik anpassen - </text> - </panel> - <text name="physics_description"> - Wir erstellen eine Form für die Außenhülle des Modells. Passen Sie die Detailstufe der Form wie für den beabsichtigten Zweck erforderlich an. - </text> - <panel name="physics_content"> - <button label="Physik neu berechnen" name="recalculate_physics_btn"/> - <button label="Neu berechnen..." name="recalculating_physics_btn"/> - <text name="lod_label"> - Physikvorschau - </text> - <combo_box name="preview_lod_combo2" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung"> - <combo_item name="high"> - Viel Details - </combo_item> - <combo_item name="medium"> - Mittlere Details - </combo_item> - <combo_item name="low"> - Wenig Details - </combo_item> - <combo_item name="lowest"> - Wenigste Details - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> - Überprüfen - </text> - </panel> - <panel name="review_content"> - <text name="review_prim_equiv"> - Auswirkung auf Parzelle/Region: Prim-Äquivalenzwert [EQUIV] - </text> - <text name="review_fee"> - Die für das Hochladen anfallende Gebühr in Höhe von L$ [FEE] wird von Ihrem Konto abgebucht. - </text> - <text name="review_confirmation"> - Durch Klicken auf „Hochladen“ bestätigen Sie, dass Sie die erforderlichen Rechte für das im Modell enthaltene Material besitzen. - </text> - </panel> - </panel> - <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> - Upload abgeschlossen - </text> - </panel> - <text name="model_uploaded_text"> - Ihr Modell wurde hochgeladen. - </text> - <text name="inventory_text"> - Sie finden das Modell im Objektordner Ihres Inventars. - </text> - <text name="charged_fee"> - Von Ihrem Konto wurden [FEE] L$ abgebucht. - </text> - </panel> - <button label="<< Zurück" name="back"/> - <button label="Weiter >>" name="next"/> - <button label="Gewichte und Gebühr berechnen >>" name="calculate"/> - <button label="Berechnen..." name="calculating"/> - <button label="Hochladen" name="upload" tool_tip="An Simulator hochladen"/> - <button label="Abbrechen" name="cancel"/> - <button label="Schließen" name="close"/> - <spinner name="import_scale" value="1,0"/> - <string name="status_idle"> - Inaktiv - </string> - <string name="status_parse_error"> - DAE-Parsing-Fehler. Details siehe Protokoll. - </string> - <string name="status_reading_file"> - Laden... - </string> - <string name="status_generating_meshes"> - Netze werden generiert... - </string> - <string name="status_vertex_number_overflow"> - Fehler: Anzahl von Vertices überschreitet 65534. Operation abgebrochen. - </string> - <string name="bad_element"> - Fehler: ungültiges Element. - </string> - <string name="high"> - Hoch - </string> - <string name="medium"> - Mittel - </string> - <string name="low"> - Niedrig - </string> - <string name="lowest"> - Niedrigste - </string> - <string name="mesh_status_good"> - Ausliefern - </string> - <string name="mesh_status_na"> - -- - </string> - <string name="mesh_status_none"> - Keine - </string> - <string name="mesh_status_submesh_mismatch"> - Detailstufen haben unterschiedliche Anzahl texturfähiger Flächen. - </string> - <string name="mesh_status_mesh_mismatch"> - Detailstufen haben unterschiedliche Anzahl von Netzinstanzen. - </string> - <string name="mesh_status_too_many_vertices"> - Detailstufe hat zu viele Vertices. - </string> - <string name="mesh_status_missing_lod"> - Erforderliche Detailstufe fehlt. - </string> - <string name="layer_all"> - Alle - </string> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml index 3dcdb52555..2dd47a27ad 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml @@ -7,6 +7,6 @@ Beschreibung: </text> <line_editor left="108" name="desc" width="160"/> - <button label="Inworld abspielen" label_selected="Stopp" name="Anim play btn" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können." width="116"/> - <button label="Lokal abspielen" label_selected="Stopp" left="171" name="Anim audition btn" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen." width="116"/> + <button label="Inworld abspielen" label_selected="Stopp" name="Inworld" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können."/> + <button label="Lokal wiedergeben" label_selected="Stopp" name="Locally" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen."/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml new file mode 100644 index 0000000000..506d2b013a --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Test Floater" title="TEST-FENSTER"/> diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index cf1d03f32d..dee89b28e5 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="toolbox floater" short_title="BAU-WERKZEUGE" title=""> + <floater.string name="grid_screen_text"> + Bildschirm + </floater.string> + <floater.string name="grid_local_text"> + Lokal + </floater.string> + <floater.string name="grid_world_text"> + Welt + </floater.string> + <floater.string name="grid_reference_text"> + Referenz + </floater.string> + <floater.string name="grid_attachment_text"> + Anhang + </floater.string> <floater.string name="status_rotate"> An den farbigen Bändern ziehen, um das Objekt zu drehen </floater.string> @@ -63,7 +78,12 @@ </text> <check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures" top_pad="-5"/> <check_box initial_value="true" label="Einrasten" name="checkbox snap to grid" top_pad="15"/> - <button label="Optionen..." label_selected="Optionen..." name="Options..." tool_tip="Mehr Raster-Optionen anzeigen"/> + <combo_box name="combobox grid mode" tool_tip="Wählen Sie das gewünschte Rasterlineal zum Positionieren des Objekts aus."> + <combo_box.item label="Welt" name="World"/> + <combo_box.item label="Lokal" name="Local"/> + <combo_box.item label="Referenz" name="Reference"/> + </combo_box> + <button label="" label_selected="Optionen..." name="Options..." tool_tip="Mehr Raster-Optionen anzeigen"/> <button label="" label_selected="" name="ToolCube" tool_tip="Würfel"/> <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/> diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml index 3dc0fc2322..413a46525c 100644 --- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml @@ -42,13 +42,16 @@ <string name="effect_Demon"> Dämon </string> + <string name="effect_Female Elf"> + Weibliche Elfe + </string> <string name="effect_Flirty"> Kokett </string> <string name="effect_Foxy"> Attraktiv </string> - <string name="effect_Halloween_2010_Bonus"> + <string name="effect_Halloween 2010 Bonus"> Bonus_Halloween_2010 </string> <string name="effect_Helium"> @@ -57,9 +60,18 @@ <string name="effect_Husky"> Rauchig </string> + <string name="effect_Husky Whisper"> + Rauchiges Flüstern + </string> <string name="effect_Intercom"> Intercom </string> + <string name="effect_Julia"> + Julia + </string> + <string name="effect_Lo Lilt"> + Leises Trällern + </string> <string name="effect_Macho"> Macho </string> @@ -69,6 +81,9 @@ <string name="effect_Mini"> Mini </string> + <string name="effect_Model"> + Modell + </string> <string name="effect_Nano"> Nano </string> @@ -90,6 +105,9 @@ <string name="effect_Roxanne"> Roxanne </string> + <string name="effect_Rumble"> + Rumpeln + </string> <string name="effect_Sabrina"> Sabrina </string> @@ -102,6 +120,9 @@ <string name="effect_Shorty"> Shorty </string> + <string name="effect_Smaller"> + Kleiner + </string> <string name="effect_Sneaky"> Hinterhältig </string> diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml index a82982f986..39b3099336 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory.xml @@ -59,6 +59,7 @@ <menu_item_call label="Eigenschaften" name="Properties"/> <menu_item_call label="Umbenennen" name="Rename"/> <menu_item_call label="Asset-UUID kopieren" name="Copy Asset UUID"/> + <menu_item_call label="Ausschneiden" name="Cut"/> <menu_item_call label="Kopieren" name="Copy"/> <menu_item_call label="Einfügen" name="Paste"/> <menu_item_call label="Als Link einfügen" name="Paste As Link"/> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index a870a4c84d..d011c7295c 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -21,6 +21,7 @@ <menu_item_call label="Beschäftigt" name="Set Busy"/> </menu> <menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/> + <menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/> <menu_item_call label="Kontoübersicht..." name="Manage My Account"> <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de"/> </menu_item_call> @@ -393,9 +394,16 @@ <menu_item_check label="HTTP-Texturen" name="HTTP Textures"/> <menu_item_check label="HTTP-Inventar" name="HTTP Inventory"/> <menu_item_call label="Bilder komprimieren" name="Compress Images"/> + <menu_item_call label="Visual Leak Detector aktivieren" name="Enable Visual Leak Detector"/> <menu_item_check label="Ausgabe Fehlerbeseitigung ausgeben" name="Output Debug Minidump"/> <menu_item_check label="Bei nächster Ausführung Fenster öffnen" name="Console Window"/> - <menu label="Protokollierungsstufe festlegen" name="Set Logging Level"/> + <menu label="Protokollierungsstufe festlegen" name="Set Logging Level"> + <menu_item_check label="Debug" name="Debug"/> + <menu_item_check label="Info" name="Info"/> + <menu_item_check label="Warnung" name="Warning"/> + <menu_item_check label="Fehler" name="Error"/> + <menu_item_check label="Keine" name="None"/> + </menu> <menu_item_call label="Admin-Status anfordern" name="Request Admin Options"/> <menu_item_call label="Admin-Status verlassen" name="Leave Admin Options"/> <menu_item_check label="Admin-Menü anzeigen" name="View Admin Options"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index b69bb197c8..ac068fcd4e 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -677,7 +677,7 @@ Erwartet wurde [VALIDS] Ausgabedatei konnte nicht erstellt werden: [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - Der Mehrfach-Upload von Animationsdateien wird zurzeit von [APP_NAME] nicht unterstützt. + Der Bulk-Upload von BVH-Animationsdateien wird zurzeit von [APP_NAME] nicht unterstützt. </notification> <notification name="CannotUploadReason"> Datei [FILE] kann aus folgendem Grund nicht hochgeladen werden: [REASON] @@ -2644,16 +2644,16 @@ Anfrage gestatten? „<nolink>[TITLE]</nolink>“ von [NAME] [MESSAGE] <form name="form"> - <button name="Mute" text="Blockieren"/> - <button name="Ignore" text="Ignorieren"/> + <button name="Client_Side_Mute" text="Blockieren"/> + <button name="Client_Side_Ignore" text="Ignorieren"/> </form> </notification> <notification name="ScriptDialogGroup"> „<nolink>[TITLE]</nolink>“ von [GROUPNAME] [MESSAGE] <form name="form"> - <button name="Mute" text="Blockieren"/> - <button name="Ignore" text="Ignorieren"/> + <button name="Client_Side_Mute" text="Blockieren"/> + <button name="Client_Side_Ignore" text="Ignorieren"/> </form> </notification> <notification name="BuyLindenDollarSuccess"> diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml index 2068c39024..07ad761791 100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="nearby_chat"> - <check_box label="Chat übersetzen" name="translate_chat_checkbox"/> + <layout_stack name="stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Chat übersetzen" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml index 2493d60df6..14ace0ac3a 100644 --- a/indra/newview/skins/default/xui/de/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml @@ -15,7 +15,7 @@ <panel.string name="buycurrencylabel"> [AMT] L$ </panel.string> - <panel name="balance_bg"> + <panel left="-415" name="balance_bg" width="205"> <text name="balance" tool_tip="Klicken, um L$-Guthaben zu aktualisieren" value="20 L$"/> <button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/> <button label="Einkaufen" name="goShop" tool_tip="Second Life-Marktplatz öffnen" width="85"/> diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml index 4fc397e7d2..18aad64f96 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml @@ -14,9 +14,9 @@ <text name="inbox_fresh_new_count"> [NUM] neu </text> - <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <panel name="inbox_inventory_placeholder_panel" tool_tip="Artikel zur Verwendung in Ihr Inventar ziehen"> <text name="inbox_inventory_placeholder"> - Einkäufe auf dem Marktplatz werden hierher geliefert. + Einkäufe aus dem Marktplatz werden hierher geliefert. </text> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 44296f2619..d917d33d12 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -835,6 +835,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="anim_yes_head"> Ja </string> + <string name="multiple_textures"> + Mehrfach + </string> <string name="texture_loading"> Wird geladen... </string> @@ -1235,7 +1238,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. Sie haben keine Kopie dieser Textur in Ihrem Inventar. </string> <string name="InventoryInboxNoItems"> - Hier erscheinen bestimmte Artikel, die Sie erhalten, wie z. B. Premium-Geschenke. Sie können diese dann in Ihr Inventar ziehen. + Einkäufe aus dem Marktplatz erscheinen hier. Sie können diese dann zur Verwendung in Ihr Inventar ziehen. </string> <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ @@ -3921,6 +3924,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ <string name="Saved_message"> (Gespeichert am [LONG_TIMESTAMP]) </string> + <string name="IM_unblock_only_groups_friends"> + Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ > „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren. + </string> <string name="answered_call"> Ihr Anruf wurde entgegengenommen </string> diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index c7e9ec781d..63eb87f27a 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="centered" + positioning="centered" legacy_header_height="18" height="440" layout="topleft" @@ -196,27 +196,26 @@ Dummy Name replaced at run time top="5" width="435" word_wrap="true"> - 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion - APR Copyright (C) 2000-2004 The Apache Software Foundation - Collada DOM Copyright 2005 Sony Computer Entertainment Inc. - cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) + 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion + APR Copyright (C) 2011 The Apache Software Foundation + Collada DOM Copyright 2006 Sony Computer Entertainment Inc. + cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. - FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). + FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg. GL Copyright (C) 1999-2004 Brian Paul. GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. google-perftools Copyright (c) 2005, Google Inc. Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) jpeglib Copyright (C) 1991-1998, Thomas G. Lane. - ogg/vorbis Copyright (C) 2001, Xiphophorus - OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. - PCRE Copyright (c) 1997-2008 University of Cambridge + ogg/vorbis Copyright (C) 2002, Xiphophorus + OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. + PCRE Copyright (c) 1997-2012 University of Cambridge SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) xmlrpc-epi Copyright (C) 2000 Epinions, Inc. - zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. - google-perftools Copyright (c) 2005, Google Inc. + zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler. Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details. diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 3a6c2678c1..793a6e6fa1 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" can_tear_off="false" height="420" layout="topleft" @@ -1354,79 +1354,13 @@ Only large parcels can be listed in search. top="150" width="430" /> <combo_box - enabled="false" - height="23" - layout="topleft" - left="20" - top="194" - name="land category with adult" - visible="false" - width="140"> - <combo_box.item - label="Any Category" - name="item0" - value="any" /> - <combo_box.item - label="Linden Location" - name="item1" - value="linden" /> - <combo_box.item - label="Adult" - name="item2" - value="adult" /> - <combo_box.item - label="Arts & Culture" - name="item3" - value="arts" /> - <combo_box.item - label="Business" - name="item4" - value="store" /> - <combo_box.item - label="Educational" - name="item5" - value="educational" /> - <combo_box.item - label="Gaming" - name="item6" - value="game" /> - <combo_box.item - label="Hangout" - name="item7" - value="gather" /> - <combo_box.item - label="Newcomer Friendly" - name="item8" - value="newcomer" /> - <combo_box.item - label="Parks & Nature" - name="item9" - value="park" /> - <combo_box.item - label="Residential" - name="item10" - value="home" /> - <combo_box.item - label="Shopping" - name="item11" - value="shopping" /> - <combo_box.item - label="Rental" - name="item13" - value="rental" /> - <combo_box.item - label="Other" - name="item12" - value="other" /> - </combo_box> - <combo_box - enabled="false" + enabled="true" height="23" layout="topleft" left="20" top="194" name="land category" - visible="false" + visible="true" width="140"> <combo_box.item label="Any Category" @@ -1989,11 +1923,11 @@ Only large parcels can be listed in search. <check_box follows="top|left" height="16" - label="Have been age-verified [ESTATE_AGE_LIMIT]" + label="Are age 18 or older [ESTATE_AGE_LIMIT]" layout="topleft" left_delta="0" name="limit_age_verified" - tool_tip="Residents must be age verified to access this parcel. See the [SUPPORT_SITE] for more information." + tool_tip="Residents must be age 18 or older to access this parcel. See the [SUPPORT_SITE] for more information." top_pad="4" width="278" /> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml new file mode 100644 index 0000000000..0bfefc8abe --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_autoreplace.xml @@ -0,0 +1,289 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + border="true" + can_close="true" + can_minimize="true" + can_resize="false" + help_topic="autoreplace_settings" + save_rect="true" + height="455" + width="490" + name="autoreplace_floater" + title="Auto-Replace Settings"> + <check_box + bottom_delta="30" + left_delta="15" + height="16" + width="100" + follows="left|top" + label="Enable Auto-Replace" + name="autoreplace_enable" + tool_tip="As you enter chat text, replace any of the keywords entered with the corresponding replacement"/> + <view_border + top_pad="15" + left="2" + height="0" + width="491" + follows="left|top" + bevel_style="none" + border_thickness="1" + mouse_opaque="false" + name="divisor1"/> + <button + top_pad="10" + left="10" + height="22" + width="110" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_import_list" + label="Import List..." + tool_tip="Load a previously exported list from a file."/> + <button + top_delta="0" + left_pad="10" + height="22" + width="110" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_export_list" + label="Export List..." + tool_tip="Save the selected list to a file so you can share it."/> + <button + top_delta="0" + left_pad="10" + height="22" + width="110" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_new_list" + label="New List..." + tool_tip="Create a new list."/> + <button + top_delta="0" + left_pad="10" + height="22" + width="110" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_delete_list" + label="Delete List" + tool_tip="Delete the selected list."/> + <scroll_list + top_pad="10" + left="10" + height="100" + width="370" + follows="left|top" + column_padding="0" + draw_heading="false" + multi_select="false" + name="autoreplace_list_name" + search_column="0"> + </scroll_list> + <button + top_delta="23" + left_pad="10" + height="22" + width="90" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_list_up" + image_overlay="Arrow_Up" + tool_tip="Move this list up in priority."/> + <button + top_pad="10" + left_delta="0" + height="22" + width="90" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_list_down" + image_overlay="Arrow_Down" + tool_tip="Move this list down in priority."/> + <view_border + top_pad="36" + left="2" + height="0" + width="491" + follows="left|top" + bevel_style="none" + border_thickness="1" + mouse_opaque="false" + name="divisor2"/> + <scroll_list + top_pad="10" + left="10" + height="120" + width="370" + follows="left|top" + column_padding="0" + draw_heading="true" + multi_select="true" + name="autoreplace_list_replacements" + search_column="0"> + <scroll_list.columns + label="Keyword" + name="keyword" + relative_width="0.30" /> + <scroll_list.columns + label="Replacement" + name="replacement" + relative_width="0.70" /> + </scroll_list> + <button + top_delta="41" + left_pad="10" + height="22" + width="90" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_add_entry" + label="Add..."/> + <button + top_pad="10" + left_delta="0" + height="22" + width="90" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_delete_entry" + label="Remove"/> + <view_border + top_pad="38" + left="2" + height="0" + width="491" + follows="left|top" + bevel_style="none" + border_thickness="1" + mouse_opaque="false" + name="divisor3"/> + <text + type="string" + follows="left|top" + height="16" + layout="topleft" + left="10" + top_pad="13" + width="50"> + Keyword: + </text> + <line_editor + name="autoreplace_keyword" + follows="left|top" + height="23" + layout="topleft" + left="100" + max_length_bytes="255" + top_delta="-5" + width="150" + /> + <text + type="string" + follows="left|top" + height="16" + layout="topleft" + left="10" + right="90" + top_pad="10" + > + Replacement: + </text> + <line_editor + name="autoreplace_replacement" + follows="left|top" + height="23" + layout="topleft" + left="100" + max_length_bytes="255" + top_delta="-5" + width="280" + /> + <button + top_delta="0" + right="-10" + height="22" + width="90" + enabled="false" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_save_entry" + label="Save Entry" + tool_tip="Save this entry."/> + <view_border + top_pad="10" + left="2" + height="0" + width="491" + follows="left|top" + bevel_style="none" + border_thickness="1" + mouse_opaque="false" + name="divisor4"/> + <button + top_pad="10" + right="380" + height="22" + width="90" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_save_changes" + label="Save Changes" + tool_tip="Save all changes."/> + <button + top_delta="0" + right="480" + height="22" + width="90" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="autoreplace_cancel" + label="Cancel" + tool_tip="Discard all changes."/> +</floater> +<!-- + <text + top_pad="10" + left="10" + height="16" + width="260" + follows="left|top" + halign="center" + mouse_opaque="true" + name="autoreplace_text2"> + Entries + </text> +--> diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml index 82c3403008..cd5cca02bd 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" ignore_ui_scale="false" legacy_header_height="225" can_minimize="true" can_close="true" can_resize="true" min_height="230" - min_width="450" + min_width="515" height="230" layout="topleft" name="Avatar" diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index cbbbeb6094..1a55dc2e2c 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" legacy_header_height="18" can_resize="true" height="350" diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 4673c6def5..22bc488a92 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="specified" - specified_left="458" - specified_bottom="80" + positioning="specified" + left="458" + bottom="-80" + follows="left|bottom" legacy_header_height="18" can_minimize="true" can_close="true" diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml index 63992462b3..405557242f 100644 --- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="specified" - specified_left="10" - specified_bottom="10" + positioning="specified" + left="10" + bottom="-10" height="60" layout="topleft" legacy_header_height="25" @@ -46,6 +46,7 @@ left="0" max_length_bytes="1023" name="chat_box" + spellcheck="true" text_pad_left="5" text_pad_right="25" tool_tip="Press Enter to say, Ctrl+Enter to shout" diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 13b15bf724..143bcb4430 100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml @@ -6,7 +6,7 @@ height="500" layout="topleft" name="modal container" - open_positioning="centered" + positioning="centered" width="600"> <button height="20" diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml index 373114a1eb..39aa8e07bb 100644 --- a/indra/newview/skins/default/xui/en/floater_destinations.xml +++ b/indra/newview/skins/default/xui/en/floater_destinations.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" ignore_ui_scale="false" legacy_header_height="225" can_minimize="true" diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index b96a94a849..200e9b9537 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" save_rect="true" legacy_header_height="18" can_resize="true" diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index cd075abc41..c06cb63f8a 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" legacy_header_height="18" can_resize="true" height="600" diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index ca73883e53..040b66623e 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -46,7 +46,7 @@ tab_group="2" top="0" height="200" - width="254" + width="244" user_resize="true"> <button height="20" @@ -73,18 +73,20 @@ parse_highlights="true" parse_urls="true" left="1" - width="249"> + width="238"> </chat_history> <line_editor bottom="0" + left="3" follows="left|right|bottom" font="SansSerifSmall" height="20" label="To" layout="bottomleft" name="chat_editor" + spellcheck="true" tab_group="3" - width="249"> + width="236"> </line_editor> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml index 86232de1a4..44d2c14cc8 100644 --- a/indra/newview/skins/default/xui/en/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_minimize="false" - height="440" + height="460" layout="topleft" name="Image Preview" help_topic="image_preview" @@ -108,7 +108,7 @@ <text type="string" length="1" - bottom="225" + bottom="250" height="45" word_wrap="true" follows="top|left" @@ -137,7 +137,7 @@ Try saving image as 24 bit Targa (.tga). layout="topleft" left="165" name="cancel_btn" - top="410" + top="430" width="125" /> <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml index 6e1bb8fcd0..59f6a9434c 100644 --- a/indra/newview/skins/default/xui/en/floater_joystick.xml +++ b/indra/newview/skins/default/xui/en/floater_joystick.xml @@ -13,6 +13,7 @@ </floater.string> <check_box bottom="38" + height="10" control_name="JoystickEnabled" halign="left" label="Enable Joystick:" @@ -28,6 +29,7 @@ width="380" /> <spinner bottom="48" + height="10" control_name="JoystickAxis1" decimal_digits="0" increment="1" @@ -41,6 +43,7 @@ width="140" /> <spinner bottom="48" + height="10" control_name="JoystickAxis2" decimal_digits="0" increment="1" @@ -54,6 +57,7 @@ width="140" /> <spinner bottom="48" + height="10" control_name="JoystickAxis0" decimal_digits="0" increment="1" @@ -67,6 +71,7 @@ width="140" /> <spinner bottom="68" + height="10" control_name="JoystickAxis4" decimal_digits="0" increment="1" @@ -80,6 +85,7 @@ width="140" /> <spinner bottom="68" + height="10" control_name="JoystickAxis5" decimal_digits="0" increment="1" @@ -93,6 +99,7 @@ width="140" /> <spinner bottom="68" + height="10" control_name="JoystickAxis3" decimal_digits="0" increment="1" @@ -106,6 +113,7 @@ width="140" /> <spinner bottom="88" + height="10" control_name="JoystickAxis6" decimal_digits="0" increment="1" @@ -119,6 +127,7 @@ width="140" /> <check_box bottom_delta="18" + height="10" control_name="ZoomDirect" label="Direct Zoom" layout="topleft" @@ -127,6 +136,7 @@ width="60" /> <check_box bottom_delta="0" + height="10" control_name="Cursor3D" label="3D Cursor" layout="topleft" @@ -135,6 +145,7 @@ width="60" /> <check_box bottom_delta="0" + height="10" control_name="AutoLeveling" label="Auto Level" layout="topleft" @@ -157,6 +168,7 @@ </text> <check_box bottom="127" + height="10" control_name="JoystickAvatarEnabled" halign="center" label="Avatar" @@ -166,6 +178,7 @@ width="60" /> <check_box bottom="127" + height="10" control_name="JoystickBuildEnabled" halign="center" label="Build" @@ -175,6 +188,7 @@ width="60" /> <check_box bottom="127" + height="10" control_name="JoystickFlycamEnabled" halign="center" label="Flycam" @@ -257,6 +271,7 @@ </text> <spinner bottom="144" + height="10" control_name="AvatarAxisScale1" decimal_digits="2" label_width="0" @@ -268,6 +283,7 @@ width="56" /> <spinner bottom="144" + height="10" control_name="BuildAxisScale1" decimal_digits="2" label_width="0" @@ -279,6 +295,7 @@ width="56" /> <spinner bottom="144" + height="10" control_name="FlycamAxisScale1" decimal_digits="2" label_width="0" @@ -301,6 +318,7 @@ </text> <spinner bottom="164" + height="10" control_name="AvatarAxisScale2" decimal_digits="2" label_width="0" @@ -312,6 +330,7 @@ width="56" /> <spinner bottom="164" + height="10" control_name="BuildAxisScale2" decimal_digits="2" label_width="0" @@ -323,6 +342,7 @@ width="56" /> <spinner bottom="164" + height="10" control_name="FlycamAxisScale2" decimal_digits="2" label_width="0" @@ -345,6 +365,7 @@ </text> <spinner bottom="184" + height="10" control_name="AvatarAxisScale0" decimal_digits="2" label_width="0" @@ -356,6 +377,7 @@ width="56" /> <spinner bottom="184" + height="10" control_name="BuildAxisScale0" decimal_digits="2" label_width="0" @@ -367,6 +389,7 @@ width="56" /> <spinner bottom="184" + height="10" control_name="FlycamAxisScale0" decimal_digits="2" label_width="0" @@ -389,6 +412,7 @@ </text> <spinner bottom="204" + height="10" control_name="AvatarAxisScale4" decimal_digits="2" label_width="0" @@ -400,6 +424,7 @@ width="56" /> <spinner bottom="204" + height="10" control_name="BuildAxisScale4" decimal_digits="2" label_width="0" @@ -411,6 +436,7 @@ width="56" /> <spinner bottom="204" + height="10" control_name="FlycamAxisScale4" decimal_digits="2" label_width="0" @@ -433,6 +459,7 @@ </text> <spinner bottom="224" + height="10" control_name="AvatarAxisScale5" decimal_digits="2" label_width="0" @@ -444,6 +471,7 @@ width="56" /> <spinner bottom="224" + height="10" control_name="BuildAxisScale5" decimal_digits="2" label_width="0" @@ -455,6 +483,7 @@ width="56" /> <spinner bottom="224" + height="10" control_name="FlycamAxisScale5" decimal_digits="2" label_width="0" @@ -477,6 +506,7 @@ </text> <spinner bottom="244" + height="10" control_name="BuildAxisScale3" decimal_digits="2" label_width="0" @@ -488,6 +518,7 @@ width="56" /> <spinner bottom="244" + height="10" control_name="FlycamAxisScale3" decimal_digits="2" label_width="0" @@ -510,6 +541,7 @@ </text> <spinner bottom="274" + height="10" control_name="AvatarAxisDeadZone1" decimal_digits="2" increment="0.01" @@ -520,6 +552,7 @@ width="56" /> <spinner bottom="274" + height="10" control_name="BuildAxisDeadZone1" decimal_digits="2" increment="0.01" @@ -530,6 +563,7 @@ width="56" /> <spinner bottom="274" + height="10" control_name="FlycamAxisDeadZone1" decimal_digits="2" increment="0.01" @@ -551,6 +585,7 @@ </text> <spinner bottom="294" + height="10" control_name="AvatarAxisDeadZone2" decimal_digits="2" increment="0.01" @@ -561,6 +596,7 @@ width="56" /> <spinner bottom="294" + height="10" control_name="BuildAxisDeadZone2" decimal_digits="2" increment="0.01" @@ -571,6 +607,7 @@ width="56" /> <spinner bottom="294" + height="10" control_name="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" @@ -592,6 +629,7 @@ </text> <spinner bottom="314" + height="10" control_name="AvatarAxisDeadZone0" decimal_digits="2" increment="0.01" @@ -602,6 +640,7 @@ width="56" /> <spinner bottom="314" + height="10" control_name="BuildAxisDeadZone0" decimal_digits="2" increment="0.01" @@ -612,6 +651,7 @@ width="56" /> <spinner bottom="314" + height="10" control_name="FlycamAxisDeadZone0" decimal_digits="2" increment="0.01" @@ -633,6 +673,7 @@ </text> <spinner bottom="334" + height="10" control_name="AvatarAxisDeadZone4" decimal_digits="2" increment="0.01" @@ -643,6 +684,7 @@ width="56" /> <spinner bottom="334" + height="10" control_name="BuildAxisDeadZone4" decimal_digits="2" increment="0.01" @@ -653,6 +695,7 @@ width="56" /> <spinner bottom="334" + height="10" control_name="FlycamAxisDeadZone4" decimal_digits="2" increment="0.01" @@ -674,6 +717,7 @@ </text> <spinner bottom="354" + height="10" control_name="AvatarAxisDeadZone5" decimal_digits="2" increment="0.01" @@ -684,6 +728,7 @@ width="56" /> <spinner bottom="354" + height="10" control_name="BuildAxisDeadZone5" decimal_digits="2" increment="0.01" @@ -694,6 +739,7 @@ width="56" /> <spinner bottom="354" + height="10" control_name="FlycamAxisDeadZone5" decimal_digits="2" increment="0.01" @@ -715,6 +761,7 @@ </text> <spinner bottom="374" + height="10" control_name="BuildAxisDeadZone3" decimal_digits="2" increment="0.01" @@ -725,6 +772,7 @@ width="56" /> <spinner bottom="374" + height="10" control_name="FlycamAxisDeadZone3" decimal_digits="2" increment="0.01" @@ -802,6 +850,7 @@ </text> <spinner bottom="430" + height="10" control_name="FlycamAxisScale6" decimal_digits="2" label_width="0" @@ -824,6 +873,7 @@ </text> <spinner bottom="450" + height="10" control_name="FlycamAxisDeadZone6" decimal_digits="2" increment="0.01" diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 3737294ebe..390ec9ab7d 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="centered" + positioning="centered" legacy_header_height="18" height="430" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index 3eeebcf120..b8893e11d9 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" can_minimize="true" can_resize="true" chrome="true" diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml index 3d33d19de5..b98f280b56 100644 --- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <floater - open_positioning="cascading" + positioning="cascading" can_close="true" can_resize="true" height="440" diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 0e211551e6..5e92a12251 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1,8 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater can_close="true" can_drag_on_left="false" can_minimize="false" - can_resize="false" height="480" min_height="480" min_width="940" - name="Model Preview" title="UPLOAD MODEL" width="940" - help_topic="upload_model" > +<floater + can_close="true" + can_drag_on_left="false" + can_minimize="false" + can_resize="false" + height="480" + min_height="480" + width="980" + min_width="980" + name="Model Preview" + title="UPLOAD MODEL" + help_topic="upload_model" > <string name="status_idle"></string> <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string> @@ -98,7 +106,7 @@ top_pad="15" left="0" height="300" - width="625" + width="635" name="import_tab" tab_position="top"> <!-- LOD PANEL --> @@ -116,13 +124,13 @@ left="3" name="lod_tab_border" top_pad="0" - width="619" /> + width="629" /> <text follows="left|top" height="18" initial_value="Source" layout="topleft" - left="75" + left="85" name="source" text_color="ModelUploaderLabels" top="15" @@ -165,7 +173,7 @@ top_pad="10" valign="top" value="High" - width="65" /> + width="75" /> <combo_box follows="top|left" height="20" @@ -175,10 +183,10 @@ top_delta="-3" width="135"> <item - id="Load from file" + name="Load from file" value="Load from file" /> <item - id="Generate" + name="Generate" value="Generate" /> </combo_box> <line_editor @@ -210,10 +218,10 @@ visible="false" width="135"> <item - id="Triangle Limit" + name="Triangle Limit" value="Triangle Limit" /> <item - id="Error Threshold" + name="Error Threshold" value="Error Threshold" /> </combo_box> <spinner @@ -290,7 +298,7 @@ top_pad="15" valign="top" value="Medium" - width="65" /> + width="75" /> <combo_box follows="top|left" height="20" @@ -300,13 +308,13 @@ top_delta="-3" width="135"> <item - id="Load from file" + name="Load from file" value="Load from file" /> <item - id="Generate" + name="Generate" value="Generate" /> <item - id="Use LoD above" + name="Use LoD above" value="Use LoD above" /> </combo_box> <line_editor @@ -339,10 +347,10 @@ top_delta="0" width="135"> <item - id="Triangle Limit" + name="Triangle Limit" value="Triangle Limit" /> <item - id="Error Threshold" + name="Error Threshold" value="Error Threshold" /> </combo_box> <spinner @@ -418,7 +426,7 @@ top_pad="15" valign="top" value="Low" - width="65" /> + width="75" /> <combo_box follows="top|left" height="20" @@ -428,13 +436,13 @@ top_delta="-3" width="135"> <item - id="Load from file" + name="Load from file" value="Load from file" /> <item - id="Generate" + name="Generate" value="Generate" /> <item - id="Use LoD above" + name="Use LoD above" value="Use LoD above" /> </combo_box> <line_editor @@ -467,10 +475,10 @@ top_delta="0" width="135"> <item - id="Triangle Limit" + name="Triangle Limit" value="Triangle Limit" /> <item - id="Error Threshold" + name="Error Threshold" value="Error Threshold" /> </combo_box> <spinner @@ -546,7 +554,7 @@ top_pad="15" valign="top" value="Lowest" - width="65" /> + width="75" /> <combo_box follows="top|left" height="20" @@ -556,13 +564,13 @@ top_delta="-3" width="135"> <item - id="Load from file" + name="Load from file" value="Load from file" /> <item - id="Generate" + name="Generate" value="Generate" /> <item - id="Use LoD above" + name="Use LoD above" value="Use LoD above" /> </combo_box> <line_editor @@ -595,10 +603,10 @@ top_delta="0" width="135"> <item - id="Triangle Limit" + name="Triangle Limit" value="Triangle Limit" /> <item - id="Error Threshold" + name="Error Threshold" value="Error Threshold" /> </combo_box> <spinner @@ -1201,7 +1209,7 @@ name="calculate_btn" top="3" height="20" - width="150" + width="165" tool_tip="Calculate weights &fee"/> <button follows="top|left" @@ -1234,7 +1242,7 @@ right="-2" top="3" height="20" - width="155"/> + width="275"/> <!-- ========== WEIGHTS ==========--> <text follows="top|left" @@ -1343,7 +1351,7 @@ layout="topleft" name="right_panel" top_pad="5" - width="290"> + width="340"> <combo_box top_pad="3" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml deleted file mode 100644 index 62b8c5f96e..0000000000 --- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml +++ /dev/null @@ -1,841 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - layout="topleft" - name="Model Wizard" - help_topic="model_wizard" - bg_opaque_image_overlay="0.5 0.5 0.5 1" - height="480" - save_rect="true" - title="UPLOAD MODEL WIZARD" - width="535"> - <button - top="32" - tab_stop="false" - left="410" - height="32" - name="upload_btn" - enabled="false" - label="5. Upload" - border="false" - image_unselected="BreadCrumbBtn_Right_Off" - image_selected="BreadCrumbBtn_Right_Press" - image_hover_unselected="BreadCrumbBtn_Right_Over" - image_disabled="BreadCrumbBtn_Right_Disabled" - image_disabled_selected="BreadCrumbBtn_Right_Disabled" - width="110"> - <button.commit_callback - function="Wizard.Upload"/> - </button> - <button - top="32" - left="310" - height="32" - tab_stop="false" - name="review_btn" - label="4. Review" - enabled="false" - border="false" - image_unselected="BreadCrumbBtn_Middle_Off" - image_selected="BreadCrumbBtn_Middle_Press" - image_hover_unselected="BreadCrumbBtn_Middle_Over" - image_disabled="BreadCrumbBtn_Middle_Disabled" - image_disabled_selected="BreadCrumbBtn_Middle_Disabled" - width="110"> - <button.commit_callback - function="Wizard.Review"/> - </button> - <button - top="32" - left="210" - height="32" - name="physics_btn" - label="3. Physics" - tab_stop="false" - enabled="false" - border="false" - image_unselected="BreadCrumbBtn_Middle_Off" - image_selected="BreadCrumbBtn_Middle_Press" - image_hover_unselected="BreadCrumbBtn_Middle_Over" - image_disabled="BreadCrumbBtn_Middle_Disabled" - image_disabled_selected="BreadCrumbBtn_Middle_Disabled" - width="110"> - <button.commit_callback - function="Wizard.Physics"/> - </button> - <button - top="32" - left="115" - name="optimize_btn" - label="2. Optimize" - tab_stop="false" - height="32" - border="false" - image_unselected="BreadCrumbBtn_Middle_Off" - image_selected="BreadCrumbBtn_Middle_Press" - image_hover_unselected="BreadCrumbBtn_Middle_Over" - image_disabled="BreadCrumbBtn_Middle_Disabled" - image_disabled_selected="BreadCrumbBtn_Middle_Disabled" - width="110"> - <button.commit_callback - function="Wizard.Optimize"/> - </button> - <button - top="32" - left="15" - name="choose_file_btn" - tab_stop="false" - enabled="false" - label="1. Choose File" - height="32" - image_unselected="BreadCrumbBtn_Left_Off" - image_selected="BreadCrumbBtn_Left_Press" - image_hover_unselected="BreadCrumbBtn_Left_Over" - image_disabled="BreadCrumbBtn_Left_Disabled" - image_disabled_selected="BreadCrumbBtn_Left_Disabled" - width="110"> - <button.commit_callback - function="Wizard.Choose"/> - </button> - <panel - height="388" - top_pad="0" - name="choose_file_panel" - visible="false" - width="535" - left="0"> - <panel - height="22" - top_pad="15" - width="505" - name="choose_file_header_panel" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" - left="15"> - <text - width="200" - left="10" - top="3" - name="choose_file_header_text" - text_color="White" - height="10" - font="SansSerifBig" - layout="topleft"> - Choose model file - </text> - </panel> - <panel - top_pad="14" - left="15" - height="310" - width="505" - name="choose_file_content" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true"> - <text - height="32" - left="10" - name="advanced_users_text" - text_color="White" - top="15" - width="320" - word_wrap="true"> - Advanced users: If you are familiar with 3D content creation tools you may wish to use the Advanced Uploader. - </text> - <button - follows="left|top" - height="20" - label="Switch to Advanced" - layout="topleft" - left_delta="0" - name="switch_to_advanced" - top_pad="5" - width="130"> - </button> - <text - type="string" - length="1" - text_color="White" - follows="left|top" - top_pad="30" - height="10" - layout="topleft" - left_delta="0" - name="Cache location" - width="320"> - Choose model file to upload - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top" - font="SansSerifSmall" - height="20" - layout="topleft" - left_delta="0" - max_length="4096" - name="lod_file" - top_pad="5" - width="230" /> - <button - follows="left|top" - height="23" - label="Browse..." - label_selected="Browse..." - layout="topleft" - left_pad="5" - name="browse" - top_delta="-1" - width="85"> - </button> - <text - type="string" - length="1" - text_color="White" - follows="left|top" - top_pad="5" - height="10" - layout="topleft" - left="10" - name="Model types" - width="320"> - Second Life supports COLLADA (.dae) files - </text> - <!-- Placeholder panel for 3D preview render --> - <panel - top="30" - right="-10" - name="choose_file_preview_panel" - bevel_style="none" - highlight_light_color="0.09 0.09 0.09 1" - border="true" - border_style="line" - height="150" - follows="all" - width="150"> - </panel> - <text - top_pad="10" - width="130" - height="14" - left_delta="0" - text_color="White" - word_wrap="true"> - Dimensions (meters): - </text> - <text - top_pad="0" - width="160" - height="15" - font="SansSerifSmallBold" - text_color="White" - name="dimensions" - left_delta="0"> - X Y Z - </text> - <text - top_delta="0" - width="160" - height="15" - name="dimension_x" - left="356"/> - <text - top_delta="0" - width="160" - height="15" - name="dimension_y" - left="403"/> - <text - top_delta="0" - width="160" - height="15" - name="dimension_z" - left="450"/> - <text - height="16" - left="10" - name="warning_label" - text_color="Yellow" - top="200" - visible="false" - width="320"> - WARNING: - </text> - <text - height="50" - left="10" - name="warning_text" - top_pad="0" - visible="false" - width="320" - word_wrap="true"> - You will not be able to complete the final step of uploading this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to set up your account for mesh model uploads. - </text> - </panel> - </panel> - - - <panel - height="388" - top_delta="0" - name="optimize_panel" - visible="true" - width="535" - left="0"> - <panel - height="22" - top_pad="15" - name="optimize_header_panel" - width="505" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" - left="15"> - <text - width="200" - left="10" - name="optimize_header_text" - top="3" - text_color="White" - height="10" - font="SansSerifBig" - layout="topleft"> - Optimize model - </text> - </panel> - <text - top_pad="14" - width="460" - height="20" - font="SansSerifSmall" - layout="topleft" - name="optimize_description" - word_wrap="true" - left_delta="5"> - We have optimized the model for performance. Adjust it further if you wish. - </text> - <panel - top_delta="40" - visible="false" - left="15" - height="270" - width="505" - name="optimize_content" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true"> - <text - top="20" - width="300" - height="12" - font="SansSerifBold" - left="112">Generating Level of Detail</text> - <progress_bar - name="optimize_progress_bar" - image_fill="model_wizard\progress_light.png" - color_bg="1 1 1 1" - color_bar="1 1 1 0.96" - follows="left|right|top" - width="260" - height="16" - image_bar="model_wizard\progress_bar_bg.png" - top_pad="14" - left="110"/> - <icon - top_pad="10" - left_delta="0" - width="13" - height="12" - image_name="model_wizard\check_mark.png"/> - <text - top_delta="0" - left_delta="18" - name="high_detail_text" - width="200" - height="14">Generate Level of Detail: High</text> - <icon - top_pad="10" - left_delta="-18" - width="13" - height="12" - image_name="model_wizard\check_mark.png"/> - <text - top_delta="0" - left_delta="18" - name="medium_detail_text" - width="200" - height="14">Generate Level of Detail: Medium</text> - <icon - top_pad="10" - left_delta="-18" - width="13" - height="12" - image_name="model_wizard\check_mark.png"/> - <text - top_delta="0" - left_delta="18" - name="low_detail_text" - width="200" - height="14">Generate Level of Detail: Low</text> - <icon - top_pad="10" - left_delta="-18" - width="13" - height="12" - image_name="model_wizard\check_mark.png"/> - <text - top_delta="0" - left_delta="18" - name="lowest_detail_text" - width="200" - height="14">Generate Level of Detail: Lowest</text> - </panel> - <panel - top_delta="0" - left_delta="0" - height="270" - width="505" - name="content2" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true"> - <text top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text> - <text top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering -Less detail -Lower prim weight</text> - <text top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text> - <text top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering -More detail -Higher prim weight</text> - - <slider - follows="left|top" - height="20" - increment="1" - layout="topleft" - left="10" - max_val="2" - initial_value="1" - min_val="0" - name="accuracy_slider" - show_text="false" - top="130" - width="290" /> - <text - font="SansSerifSmall" - top_pad="0" - width="5" - left_delta="6" - height="4">' - </text> - <text - font="SansSerifSmall" - top_delta="0" - width="5" - left_delta="137" - height="4">' - </text> - <text - font="SansSerifSmall" - top_delta="0" - width="5" - left_delta="137" - height="4">' - </text> - <button - follows="left|top" - height="20" - label="Recalculate Geometry" - layout="topleft" - left="80" - name="recalculate_geometry_btn" - top_pad="15" - width="150"> - </button> - <text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label"> - Geometry preview - </text> - <panel - right="-10" - top="32" - name="optimize_preview_panel" - bevel_style="none" - highlight_light_color="0.09 0.09 0.09 1" - border_style="line" - border="true" - height="185" - follows="all" - width="185"> - </panel> - <combo_box left_delta="75" top_pad="10" follows="left|top" list_position="below" height="22" - name="preview_lod_combo" width="110" tool_tip="LOD to view in preview render"> - <combo_item name="high"> - High detail - </combo_item> - <combo_item name="medium"> - Medium detail - </combo_item> - <combo_item name="low"> - Low detail - </combo_item> - <combo_item name="lowest"> - Lowest detail - </combo_item> - </combo_box> - </panel> - </panel> - - <panel - height="388" - top_delta="0" - name="physics_panel" - visible="false" - width="535" - left="0"> - <panel - height="22" - top_pad="15" - name="physics_header_panel" - width="505" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" - left="15"> - <text - width="200" - left="10" - name="physics_header_text" - top="3" - height="10" - font="SansSerifBig" - text_color="White" - layout="topleft"> - Adjust physics - </text> - </panel> - <text - top_pad="10" - width="474" - height="50" - font="SansSerifSmall" - layout="topleft" - name="physics_description" - word_wrap="true" - left_delta="5"> - We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model. - </text> - <panel - top_delta="44" - left="15" - height="270" - width="505" - name="physics_content" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true"> - <text top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text> - <text top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering -Less detail -Lower prim weight</text> - <text top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text> - <text top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering -More detail -Higher prim weight</text> - - <slider - follows="left|top" - height="190" - increment=".1" - layout="topleft" - left="140" - max_val="1" - initial_value="0.5" - min_val="0" - name="physics_slider" - orientation="vertical" - show_text="false" - top="25" - width="22" /> - <text top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples: -Moving objects -Flying objects -Vehicles</text> - <text top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples: -Small static objects -Less detailed objects -Simple furniture</text> - <text top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples: -Static objects -Detailed objects -Buildings</text> - <button - follows="left|top" - height="20" - label="Recalculate physics" - layout="topleft" - left="80" - name="recalculate_physics_btn" - top_pad="10" - width="150"> - </button> - <button - enabled="false" - follows="left|top" - height="20" - label="Recalculating..." - layout="topleft" - left_delta="0" - name="recalculating_physics_btn" - top_delta="0" - visible="false" - width="150"> - </button> - <text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label"> - Physics preview - </text> - <panel - right="-10" - top="32" - name="physics_preview_panel" - bevel_style="none" - highlight_light_color="0.09 0.09 0.09 1" - border_style="line" - border="true" - height="185" - follows="all" - width="185"> - </panel> - <combo_box left_delta="75" top_pad="10" follows="left|top" list_position="below" height="22" - name="preview_lod_combo2" width="110" tool_tip="LOD to view in preview render"> - <combo_item name="high"> - High detail - </combo_item> - <combo_item name="medium"> - Medium detail - </combo_item> - <combo_item name="low"> - Low detail - </combo_item> - <combo_item name="lowest"> - Lowest detail - </combo_item> - </combo_box> - </panel> - </panel> - - <panel - height="388" - top_delta="0" - name="review_panel" - visible="false" - width="535" - left="0"> - <panel - height="22" - top_pad="15" - name="review_header_panel" - width="505" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" - left="15"> - <text - width="200" - left="10" - name="review_header_text" - text_color="White" - top="3" - height="10" - font="SansSerifBig" - layout="topleft"> - Review - </text> - </panel> - <panel - top_pad="14" - left="15" - height="310" - width="505" - name="review_content" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true"> - <text - top="20" - width="485" - font="SansSerifMedium" - text_color="White" - left="10" - name="review_prim_equiv" - height="16">Impact to parcel/region: [EQUIV] prim equivalents - </text> - <text - top_pad="20" - width="485" - font="SansSerifMedium" - text_color="White" - left="10" - name="review_fee" - height="16">Your account will be charged an upload fee of L$ [FEE]. - </text> - <text - top_pad="20" - width="485" - font="SansSerifMedium" - text_color="White" - left="10" - name="review_confirmation" - height="32" - word_wrap="true">By clicking the upload button, you confirm that you have the appropriate rights to the material contained in the model. - </text> - </panel> - </panel> - - - - - <panel - height="388" - top_delta="0" - name="upload_panel" - visible="false" - width="535" - left="0"> - <panel - height="22" - top_pad="15" - name="upload_header_panel" - width="505" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" - left="15"> - <text - width="200" - left="10" - name="upload_header_text" - top="3" - text_color="White" - height="10" - font="SansSerifBig" - layout="topleft"> - Upload complete - </text> - </panel> - <text - top_pad="14" - width="495" - height="16" - font="SansSerifMedium" - layout="topleft" - name="model_uploaded_text" - text_color="White" - word_wrap="true" - left="25"> - Your model has been uploaded. - </text> - <text - top_pad="5" - width="495" - height="16" - font="SansSerifMedium" - layout="topleft" - name="inventory_text" - text_color="White" - word_wrap="true" - left="25"> - You will find it in the Objects folder in your inventory. - </text> - <text - top_pad="20" - width="495" - font="SansSerifMedium" - text_color="White" - left="25" - name="charged_fee" - height="16">Your account has been charged L$ [FEE]. - </text> - </panel> - - - - <button - top="440" - right="-285" - width="90" - height="22" - name="back" - label="<< Back" /> - <button - top_delta="0" - right="-190" - width="90" - height="22" - name="next" - label="Next >> " /> - <button - top_delta="0" - left_delta="0" - width="160" - height="22" - name="calculate" - label="Calculate weights & fee >> " /> - <button - enabled="false" - visible="false" - top_delta="0" - left_delta="0" - width="160" - height="22" - name="calculating" - label="Calculating... " /> - <button - enabled="false" - top_delta="0" - right="-150" - width="90" - height="22" - visible="false" - name="upload" - tool_tip="Upload to simulator" - label="Upload" /> - <button - top_delta="0" - right="-15" - width="90" - height="22" - name="cancel" - label="Cancel" /> - <button - top_delta="0" - right="-15" - width="90" - height="22" - name="close" - visible="false" - label="Close" /> - <spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/> - - <string name="status_idle">Idle</string> - <string name="status_parse_error">Dae parsing issue - see log for details.</string> - <string name="status_reading_file">Loading...</string> - <string name="status_generating_meshes">Generating Meshes...</string> - <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string> - <string name="bad_element">Error: element is invalid</string> - <string name="high">High</string> - <string name="medium">Medium</string> - <string name="low">Low</string> - <string name="lowest">Lowest</string> - <string name="mesh_status_good">Ship it!</string> - <string name="mesh_status_na">N/A</string> - <string name="mesh_status_none">None</string> - <string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string> - <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string> - <string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string> - <string name="mesh_status_missing_lod">Missing required level of detail.</string> - <string name="layer_all">All</string> - <!-- Text to display in physics layer combo box for "all layers" --> - -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 065dab0413..4e7ee7913f 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="specified" - specified_left="320" - specified_bottom="80" + positioning="specified" + left="320" + bottom="-80" legacy_header_height="18" can_dock="false" can_minimize="true" diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml index 1c4b25a7b0..fdea7a821a 100644 --- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <floater - open_positioning="cascading" + positioning="cascading" legacy_header_height="18" can_resize="true" height="588" diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml index 13dde679dd..ea44fd493e 100644 --- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <floater - open_positioning="cascading" + positioning="cascading" can_close="true" can_resize="true" height="570" diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml index d6d8431150..08d0b00a83 100644 --- a/indra/newview/skins/default/xui/en/floater_people.xml +++ b/indra/newview/skins/default/xui/en/floater_people.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" can_close="true" can_resize="true" height="570" diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml index 7882116662..984894b016 100644 --- a/indra/newview/skins/default/xui/en/floater_picks.xml +++ b/indra/newview/skins/default/xui/en/floater_picks.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <floater - open_positioning="cascading" + positioning="cascading" can_close="true" can_resize="true" height="572" diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml index ccceac0a7b..b241e265a9 100644 --- a/indra/newview/skins/default/xui/en/floater_places.xml +++ b/indra/newview/skins/default/xui/en/floater_places.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <floater - open_positioning="cascading" + positioning="cascading" legacy_header_height="18" can_resize="true" height="588" diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index b2662331b0..bd6faf4ed8 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - open_positioning="centered" + positioning="centered" default_tab_group="1" height="460" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index be3b2d179d..2e1c8ce670 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -70,6 +70,7 @@ max_length="65536" name="Notecard Editor" parse_urls="false" + spellcheck="true" tab_group="1" top="46" width="392" diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index dd818e2e06..c3e7028dc5 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" legacy_header_height="18" can_resize="true" height="775" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 0c38283d59..49d64767cc 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" legacy_header_height="18" can_minimize="true" can_close="true" diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck.xml b/indra/newview/skins/default/xui/en/floater_spellcheck.xml new file mode 100644 index 0000000000..76a350dd29 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_spellcheck.xml @@ -0,0 +1,160 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + border="true" + can_close="true" + can_minimize="true" + save_rect="true" + help_topic="spelling_settings" + can_resize="false" + height="315" + width="490" + name="spellcheck_floater" + title="Spell Checker Settings"> + <check_box + bottom_delta="30" + control_name="SpellCheck" + left_delta="15" + height="16" + width="100" + follows="left|top" + label="Enable spell checker" + name="spellcheck_enable" /> + <view_border + top_pad="10" + left="2" + height="0" + width="491" + follows="left|top" + bevel_style="none" + border_thickness="1" + mouse_opaque="false" + name="divisor1"/> + <text + enabled_control="SpellCheck" + follows="top|left" + height="10" + layout="topleft" + left="38" + mouse_opaque="false" + name="spellcheck_main" + top_pad="15" + type="string" + width="90" + > + Main dictionary : + </text> + <combo_box + enabled_control="SpellCheck" + follows="top|left" + height="23" + layout="topleft" + left_pad="10" + name="spellcheck_main_combo" + top_pad="-15" + width="175" + /> + <text + enabled_control="SpellCheck" + follows="top|left" + height="10" + label="Logs:" + layout="topleft" + left="38" + mouse_opaque="false" + name="spellcheck_additional" + top_pad="15" + type="string" + width="190" + > + Additional dictionaries : + </text> + <text + follows="top|left" + height="12" + layout="topleft" + left="55" + length="1" + name="spellcheck_available" + top_pad="10" + type="string" + width="175"> + Available + </text> + <text + follows="top|left" + height="12" + type="string" + left_pad="45" + length="1" + layout="topleft" + name="spellcheck_active" + width="175"> + Active + </text> + <scroll_list + enabled_control="SpellCheck" + follows="top|left" + height="155" + layout="topleft" + left="55" + multi_select="true" + name="spellcheck_available_list" + sort_column="0" + sort_ascending="true" + width="175" /> + <button + enabled_control="SpellCheck" + follows="top|left" + height="26" + image_overlay="Arrow_Right" + hover_glow_amount="0.15" + layout="topleft" + left_pad="10" + name="spellcheck_moveright_btn" + top_delta="50" + width="25"> + </button> + <button + enabled_control="SpellCheck" + follows="top|left" + height="26" + image_overlay="Arrow_Left" + hover_glow_amount="0.15" + layout="topleft" + name="spellcheck_moveleft_btn" + top_delta="30" + width="25"> + </button> + <scroll_list + enabled_control="SpellCheck" + follows="top|left" + height="155" + layout="topleft" + left_pad="10" + multi_select="true" + name="spellcheck_active_list" + sort_column="0" + sort_ascending="true" + top_pad="-105" + width="175" + /> + <button + enabled="false" + follows="left|top" + height="23" + label="Remove" + layout="topleft" + left="55" + name="spellcheck_remove_btn" + top_pad="5" + width="80" /> + <button + follows="left|top" + height="23" + label="Import..." + layout="topleft" + left_pad="15" + name="spellcheck_import_btn" + top_delta="0" + width="80" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml new file mode 100644 index 0000000000..b54090015d --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + border="true" + can_close="true" + can_minimize="true" + bottom="275" + left="300" + can_resize="false" + height="140" + width="400" + name="spellcheck_import" + title="Import Dictionary"> + <text + follows="top|left" + height="16" + layout="topleft" + left="25" + top="15" + type="string" + width="65"> + Dictionary: + </text> + <line_editor + enabled="false" + follows="left|top" + height="23" + layout="topleft" + left_pad="10" + max_length_bytes="255" + name="dictionary_path" + top_delta="-5" + width="200" /> + <button + follows="left|top" + height="23" + label="Browse" + label_selected="Browse" + layout="topleft" + left_pad="5" + name="dictionary_path_browse" + top_delta="0" + width="75" /> + <text + follows="top|left" + height="16" + layout="topleft" + left="25" + top_pad="8" + type="string" + width="65"> + Name: + </text> + <line_editor + enabled="false" + follows="left|top" + height="23" + layout="topleft" + left_pad="10" + max_length_bytes="255" + name="dictionary_name" + top_delta="-5" + width="200" /> + <text + follows="top|left" + height="16" + layout="topleft" + left="25" + top_pad="8" + type="string" + width="65"> + Language: + </text> + <line_editor + follows="left|top" + height="23" + layout="topleft" + left_pad="10" + max_length_bytes="255" + name="dictionary_language" + top_delta="-5" + width="200" /> + <view_border + top_pad="10" + left="2" + height="0" + width="396" + follows="left|top" + bevel_style="none" + border_thickness="1" + mouse_opaque="false" + name="divisor"/> + <button + top_pad="10" + right="280" + height="22" + width="90" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="ok_btn" + label="Import" /> + <button + top_delta="0" + right="380" + height="22" + width="90" + enabled="true" + follows="left|top" + mouse_opaque="true" + halign="center" + scale_image="true" + name="cancel_btn" + label="Cancel" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index 2fd932786b..9400f7b94f 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -149,13 +149,52 @@ show_per_sec="true" show_bar="false"> </stat_bar> + <stat_bar + name="object_cache_hits" + label="Object Cache Hit Rate" + stat="object_cache_hits" + bar_min="0" + bar_max="100" + unit_label="%" + tick_spacing="20" + label_spacing="20" + show_history="true" + show_per_sec="false" + show_bar="false"> + </stat_bar> </stat_view> <!--Texture Stats--> <stat_view name="texture" label="Texture" show_label="true"> - <stat_bar + <stat_bar + name="texture_cache_hits" + label="Cache Hit Rate" + stat="texture_cache_hits" + bar_min="0.f" + bar_max="100.f" + unit_label="%" + tick_spacing="20" + label_spacing="20" + show_history="true" + show_per_sec="false" + show_bar="false"> + </stat_bar> + <stat_bar + name="texture_cache_read_latency" + label="Cache Read Latency" + unit_label="msec" + stat="texture_cache_read_latency" + bar_min="0.f" + bar_max="1000.f" + tick_spacing="100" + label_spacing="200" + show_history="true" + show_per_sec="false" + show_bar="false"> + </stat_bar> + <stat_bar name="numimagesstat" label="Count" stat="numimagesstat" diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml index 548e24efba..e1fefc3631 100644 --- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml @@ -3,6 +3,7 @@ legacy_header_height="18" can_resize="true" height="600" + single_instance="false" layout="topleft" name="floater_test_text_editor" translate="false" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 13c850c86c..10854f5a49 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -115,6 +115,7 @@ </flyout_button> <check_box bottom_delta="35" + height="10" label="Checkbox" layout="topleft" tool_tip="checkbox" @@ -275,6 +276,7 @@ <!-- "spinner" is a numerical input widget with an up and down arrow to change the value. --> <spinner + height="10" bottom_delta="35" follows="top|left" label="Spinner" diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index b0e6d36446..2e29c61cb2 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -3,15 +3,17 @@ legacy_header_height="18" can_minimize="false" can_resize="true" - height="290" + height="330" layout="topleft" - min_height="290" + min_height="330" min_width="410" name="texture picker" help_topic="texture_picker" title="PICK: TEXTURE" width="410"> - <floater.string + +<!-- top static --> + <floater.string name="choose_picture"> Click to choose a picture </floater.string> @@ -19,6 +21,16 @@ name="pick title"> Pick: </floater.string> + + <view + left="4" + top="20" + name="preview_widget" + height="165" + width="165" + follows="left|top" + /> + <text type="string" length="1" @@ -34,58 +46,92 @@ width="163"> Multiple textures </text> + + <!-- mode selector --> + <radio_group + control_name="mode_selection" + height="20" + layout="topleft" + left="18" + top_pad="80" + name="mode_selection" + follows="left|top"> + <radio_item + label="Inventory" + name="inventory" + top_delta="20" + layout="topleft" + height="16" + left="0" + value="0" + width="80" /> + <radio_item + label="Local" + left_pad="0" + layout="topleft" + top_delta="0" + height="16" + name="local" + value="1" + width="75" /> + </radio_group> + <!-- --> + <text type="string" length="1" follows="left|top" height="14" layout="topleft" - left_delta="0" + left_delta="-12" name="unknown" - top_pad="80" - width="163"> + top_pad="4" + width=""> Size: [DIMENSIONS] </text> + +<!-- middle: inventory mode --> + <button enabled="false" - follows="left|bottom" - height="20" + follows="left|top" + height="18" label="Default" label_selected="Default" layout="topleft" - left_delta="0" name="Default" - top_pad="4" - width="80" /> + width="73" + left="94" + top="215"/> <button + follows="left|top" + height="20" + label="Blank" + label_selected="Blank" + layout="topleft" + left_delta="0" + name="Blank" + top_pad="5" + width="73" /> + <button enabled="false" - follows="left|bottom" + follows="left|top" height="20" label="None" label_selected="None" layout="topleft" - left_pad="4" + left_delta="0" name="None" - top_delta="0" - width="80" /> - <button - follows="left|bottom" - height="20" - label="Blank" - label_selected="Blank" - layout="topleft" - left="4" - name="Blank" top_pad="5" - width="80" /> - <button - follows="left|bottom" + width="73" /> + <button + follows="left|top" height="28" image_selected="eye_button_active.tga" image_unselected="eye_button_inactive.tga" layout="topleft" - left_pad="50" - top_delta="3" + left_delta="-80" + top_delta="-25" name="Pipette" width="28" /> <check_box @@ -123,7 +169,7 @@ bg_alpha_color="DkGray2" border="false" follows="all" - height="200" + height="233" layout="topleft" left_delta="0" name="inventory panel" @@ -138,23 +184,89 @@ top_pad="0" left_delta="-3" width="200" /> - <button - follows="right|bottom" + +<!-- middle: local mode --> + <button + follows="left|top" + height="18" + label="Add" + label_selected="Add" + layout="topleft" + left="94" + top="215" + name="l_add_btn" + width="73" + visible="false"/> + <button + enabled="false" + follows="left|top" + height="20" + label="Remove" + label_selected="Remove" + layout="topleft" + left_delta="0" + name="l_rem_btn" + top_pad="5" + width="73" + visible="false"/> + <button + enabled="false" + follows="left|top" + height="20" + label="Upload" + label_selected="Upload" + layout="topleft" + left_delta="0" + name="l_upl_btn" + top_pad="5" + width="73" + visible="false"/> + <scroll_list + name="l_name_list" + left="170" + top="22" + width="235" + height="260" + follows="left|top|right|bottom" + column_padding="0" + can_resize="false" + draw_heading="true" + multi_select="true" + search_column="1" + visible="false"> + <column name="unit_name" label="Name" dynamicwidth="true" /> + <column name="unit_id_HIDDEN" label="ID" width="0" /> + </scroll_list> + +<!-- bottom static --> + <button + follows="bottom" height="20" label="OK" label_selected="OK" layout="topleft" - right="-120" + left="95" + top="-30" name="Select" width="100" /> <button - follows="right|bottom" + follows="bottom" height="20" label="Cancel" label_selected="Cancel" layout="topleft" - right="-10" - left_pad="5" + left_delta="120" + top_delta="0" name="Cancel" width="100" /> + <check_box + follows="left|bottom" + height="20" + initial_value="true" + label="Apply now" + layout="topleft" + left="6" + name="apply_immediate_check" + top_delta="0" + width="120" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..f3f8d4ddca --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml @@ -0,0 +1,341 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_minimize="false" + height="550" + layout="topleft" + name="TexFetchDebugger" + help_topic="texfetchdebugger" + title="Texture Fetching Debugger" + width="540"> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left="10" + name="total_num_fetched_label" + top="30" + width="400"> + 1, Total number of fetched textures: [NUM] + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_num_fetching_requests_label" + top_delta="25" + width="400"> + 2, Total number of fetching requests: [NUM] + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_num_cache_hits_label" + top_delta="25" + width="400"> + 3, Total number of cache hits: [NUM] + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_num_visible_tex_label" + top_delta="25" + width="400"> + 4, Total number of visible textures: [NUM] + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_num_visible_tex_fetch_req_label" + top_delta="25" + width="450"> + 5, Total number of visible texture fetching requests: [NUM] + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_fetched_data_label" + top_delta="25" + width="530"> + 6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_fetched_vis_data_label" + top_delta="25" + width="480"> + 7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_fetched_rendered_data_label" + top_delta="25" + width="530"> + 8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_time_cache_read_label" + top_delta="25" + width="400"> + 9, Total time on cache readings: [TIME] seconds + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_time_cache_write_label" + top_delta="25" + width="400"> + 10, Total time on cache writings: [TIME] seconds + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_time_decode_label" + top_delta="25" + width="400"> + 11, Total time on decodings: [TIME] seconds + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_time_gl_label" + top_delta="25" + width="400"> + 12, Total time on gl texture creation: [TIME] seconds + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_time_http_label" + top_delta="25" + width="400"> + 13, Total time on HTTP fetching: [TIME] seconds + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_time_fetch_label" + top_delta="25" + width="400"> + 14, Total time on entire fetching: [TIME] seconds + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_time_refetch_vis_cache_label" + top_delta="25" + width="540"> + 15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels + </text> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left_delta="0" + name="total_time_refetch_vis_http_label" + top_delta="25" + width="540"> + 16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels + </text> + <spinner + decimal_digits="2" + follows="left|top" + height="20" + increment="0.01" + initial_value="1.0" + label="17, Ratio of Texel/Pixel:" + label_width="130" + layout="topleft" + left_delta="0" + max_val="10.0" + min_val="0.01" + name="texel_pixel_ratio" + top_delta="30" + width="200"> + <spinner.commit_callback + function="TexFetchDebugger.ChangeTexelPixelRatio" /> + </spinner> + <button + follows="left|top" + height="20" + label="Start" + layout="topleft" + left_delta="0" + name="start_btn" + top_delta="30" + width="70"> + <button.commit_callback + function="TexFetchDebugger.Start" /> + </button> + <button + follows="left|top" + height="20" + label="Reset" + layout="topleft" + left_pad="7" + name="clear_btn" + top_delta="0" + width="70"> + <button.commit_callback + function="TexFetchDebugger.Clear" /> + </button> + <button + follows="left|top" + height="20" + label="Close" + layout="topleft" + left_pad="7" + name="close_btn" + top_delta="0" + width="70"> + <button.commit_callback + function="TexFetchDebugger.Close" /> + </button> + <button + follows="left|top" + height="20" + label="Cache Read" + layout="topleft" + left="10" + name="cacheread_btn" + top_delta="30" + width="80"> + <button.commit_callback + function="TexFetchDebugger.CacheRead" /> + </button> + <button + follows="left|top" + height="20" + label="Cache Write" + layout="topleft" + left_pad="7" + name="cachewrite_btn" + top_delta="0" + width="80"> + <button.commit_callback + function="TexFetchDebugger.CacheWrite" /> + </button> + <button + follows="left|top" + height="20" + label="HTTP" + layout="topleft" + left_pad="7" + name="http_btn" + top_delta="0" + width="70"> + <button.commit_callback + function="TexFetchDebugger.HTTPLoad" /> + </button> + <button + follows="left|top" + height="20" + label="Decode" + layout="topleft" + left_pad="7" + name="decode_btn" + top_delta="0" + width="70"> + <button.commit_callback + function="TexFetchDebugger.Decode" /> + </button> + <button + follows="left|top" + height="20" + label="GL Texture" + layout="topleft" + left_pad="7" + name="gl_btn" + top_delta="0" + width="70"> + <button.commit_callback + function="TexFetchDebugger.GLTexture" /> + </button> + <button + follows="left|top" + height="20" + label="Refetch Vis Cache" + layout="topleft" + left="10" + name="refetchviscache_btn" + top_delta="30" + width="120"> + <button.commit_callback + function="TexFetchDebugger.RefetchVisCache" /> + </button> + <button + follows="left|top" + height="20" + label="Refetch Vis HTTP" + layout="topleft" + left_pad="7" + name="refetchvishttp_btn" + top_delta="0" + width="120"> + <button.commit_callback + function="TexFetchDebugger.RefetchVisHTTP" /> + </button> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 2d63c94fe1..e37740d20c 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" legacy_header_height="18" height="580" layout="topleft" @@ -1206,6 +1206,7 @@ even though the user gets a free copy. label="Modify" layout="topleft" left="10" + height="10" name="checkbox next owner can modify" width="85" /> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml index fcaae9d172..d8211c24a7 100644 --- a/indra/newview/skins/default/xui/en/floater_toybox.xml +++ b/indra/newview/skins/default/xui/en/floater_toybox.xml @@ -10,7 +10,7 @@ layout="topleft" legacy_header_height="18" name="Toybox" - open_positioning="centered" + positioning="centered" save_rect="true" single_instance="true" title="TOOLBAR BUTTONS" diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index d99b29f324..dce2720cf8 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - open_positioning="cascading" + positioning="cascading" can_resize="true" can_minimize="true" can_close="true" diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml index 77fb21e27c..35cb2670d0 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -36,15 +36,20 @@ <string name="effect_Cyber">Cyber</string> <string name="effect_DeepBot">DeepBot</string> <string name="effect_Demon">Demon</string> + <string name="effect_Female Elf">Female Elf</string> <string name="effect_Flirty">Flirty</string> <string name="effect_Foxy">Foxy</string> - <string name="effect_Halloween_2010_Bonus">Halloween_2010_Bonus</string> + <string name="effect_Halloween 2010 Bonus">Halloween_2010_Bonus</string> <string name="effect_Helium">Helium</string> <string name="effect_Husky">Husky</string> + <string name="effect_Husky Whisper">Husky Whisper</string> <string name="effect_Intercom">Intercom</string> + <string name="effect_Julia">Julia</string> + <string name="effect_Lo Lilt">Lo Lilt</string> <string name="effect_Macho">Macho</string> <string name="effect_Micro">Micro</string> <string name="effect_Mini">Mini</string> + <string name="effect_Model">Model</string> <string name="effect_Nano">Nano</string> <string name="effect_Nightmare">Nightmare</string> <string name="effect_PopBot">PopBot</string> @@ -52,10 +57,12 @@ <string name="effect_Radio">Radio</string> <string name="effect_Robot">Robot</string> <string name="effect_Roxanne">Roxanne</string> + <string name="effect_Rumble">Rumble</string> <string name="effect_Sabrina">Sabrina</string> <string name="effect_Samantha">Samantha</string> <string name="effect_Sexy">Sexy</string> <string name="effect_Shorty">Shorty</string> + <string name="effect_Smaller">Smaller</string> <string name="effect_Sneaky">Sneaky</string> <string name="effect_Stallion">Stallion</string> <string name="effect_Sultry">Sultry</string> diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml index 355d257785..115fe413f3 100644 --- a/indra/newview/skins/default/xui/en/floater_window_size.xml +++ b/indra/newview/skins/default/xui/en/floater_window_size.xml @@ -28,22 +28,50 @@ tool_tip="width x height" top_pad="5" width="179"> - <combo_box.item - label="1000 x 700 (default)" - name="item0" - value="1000 x 700" /> - <combo_box.item - label="1024 x 768" - name="item1" - value="1024 x 768" /> - <combo_box.item - label="1280 x 720 (720p)" - name="item2" - value="1280 x 720" /> - <combo_box.item - label="1920 x 1080 (1080p)" - name="item3" - value="1920 x 1080" /> + <combo_box.item + label="1000 x 700 (default)" + name="item1" + value="1000 x 700" /> + <combo_box.item + label="1024 x 768 (4:3 XGA)" + name="item2" + value="1024 x 768" /> + <combo_box.item + label="1280 x 720 (16:9 HDTV)" + name="item3" + value="1280 x 720" /> + <combo_box.item + label="1280 x 800 (5:8 WXGA)" + name="item4" + value="1280 x 800" /> + <combo_box.item + label="1280 x 1024 (5:4 SXGA)" + name="item5" + value="1280 x 1024" /> + <combo_box.item + label="1440 x 900 (8:5 WSXGA)" + name="item7" + value="1440 x 900" /> + <combo_box.item + label="1600 x 900 (16:9 HD+)" + name="item8" + value="1600 x 900" /> + <combo_box.item + label="1600 x 1200 (4:3 UXGA)" + name="item9" + value="1600 x 1200" /> + <combo_box.item + label="1680 x 1050 (8:5 WSXGA+)" + name="item10" + value="1680 x 1050" /> + <combo_box.item + label="1920 x 1080 (16:9 HDTV)" + name="item11" + value="1920 x 1080" /> + <combo_box.item + label="1920 x 1200 (8:5 WUXGA)" + name="item12" + value="1920 x 1200" /> </combo_box> <button follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 56d79f62c7..83407069d2 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_resize="true" - open_positioning="centered" + positioning="centered" height="600" layout="topleft" min_height="520" diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index ef4a1bc061..b13bf5b508 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -453,6 +453,14 @@ layout="topleft" name="Copy Separator" /> <menu_item_call + label="Cut" + layout="topleft" + name="Cut"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="cut" /> + </menu_item_call> + <menu_item_call label="Copy" layout="topleft" name="Copy"> diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml index fe8489166b..70b40dd89b 100644 --- a/indra/newview/skins/default/xui/en/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml @@ -2,6 +2,85 @@ <context_menu name="Text editor context menu"> <menu_item_call + label="(unknown)" + layout="topleft" + name="Suggestion 1"> + <menu_item_call.on_click + function="SpellCheck.ReplaceWithSuggestion" + parameter="0" /> + <menu_item_call.on_visible + function="SpellCheck.VisibleSuggestion" + parameter="0" /> + </menu_item_call> + <menu_item_call + label="(unknown)" + layout="topleft" + name="Suggestion 2"> + <menu_item_call.on_click + function="SpellCheck.ReplaceWithSuggestion" + parameter="1" /> + <menu_item_call.on_visible + function="SpellCheck.VisibleSuggestion" + parameter="1" /> + </menu_item_call> + <menu_item_call + label="(unknown)" + layout="topleft" + name="Suggestion 3"> + <menu_item_call.on_click + function="SpellCheck.ReplaceWithSuggestion" + parameter="2" /> + <menu_item_call.on_visible + function="SpellCheck.VisibleSuggestion" + parameter="2" /> + </menu_item_call> + <menu_item_call + label="(unknown)" + layout="topleft" + name="Suggestion 4"> + <menu_item_call.on_click + function="SpellCheck.ReplaceWithSuggestion" + parameter="3" /> + <menu_item_call.on_visible + function="SpellCheck.VisibleSuggestion" + parameter="3" /> + </menu_item_call> + <menu_item_call + label="(unknown)" + layout="topleft" + name="Suggestion 5"> + <menu_item_call.on_click + function="SpellCheck.ReplaceWithSuggestion" + parameter="4" /> + <menu_item_call.on_visible + function="SpellCheck.VisibleSuggestion" + parameter="4" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="Suggestion Separator" /> + <menu_item_call + label="Add to Dictionary" + layout="topleft" + name="Add to Dictionary"> + <menu_item_call.on_click + function="SpellCheck.AddToDictionary" /> + <menu_item_call.on_enable + function="SpellCheck.EnableAddToDictionary" /> + </menu_item_call> + <menu_item_call + label="Add to Ignore" + layout="topleft" + name="Add to Ignore"> + <menu_item_call.on_click + function="SpellCheck.AddToIgnore" /> + <menu_item_call.on_enable + function="SpellCheck.EnableAddToIgnore" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="Spellcheck Separator" /> + <menu_item_call label="Cut" layout="topleft" name="Cut"> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1d11abcf73..6bcdc615c3 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -193,6 +193,15 @@ <menu_item_call.on_click function="View.ToggleUI" /> </menu_item_call> + <menu_item_check + label="Show HUD Attachments" + name="Show HUD Attachments" + shortcut="alt|shift|H"> + <menu_item_check.on_check + function="View.CheckHUDAttachments" /> + <menu_item_check.on_click + function="View.ShowHUDAttachments" /> + </menu_item_check> <menu_item_separator/> @@ -291,6 +300,12 @@ function="SideTray.PanelPeopleTab" parameter="nearby_panel" /> </menu_item_call> + <menu_item_call + label="Block List" + name="Block List"> + <menu_item_call.on_click + function="Communicate.BlockList" /> + </menu_item_call> </menu> <menu create_jump_keys="true" @@ -1374,15 +1389,6 @@ function="View.HighlightTransparent" /> </menu_item_check> <menu_item_check - label="Show HUD Attachments" - name="Show HUD Attachments" - shortcut="alt|shift|H"> - <menu_item_check.on_check - function="View.CheckHUDAttachments" /> - <menu_item_check.on_click - function="View.ShowHUDAttachments" /> - </menu_item_check> - <menu_item_check label="Show Mouselook Crosshairs" name="ShowCrosshairs"> <menu_item_check.on_check @@ -1876,7 +1882,7 @@ <menu_item_check.on_click function="Advanced.ToggleConsole" parameter="texture" /> - </menu_item_check> + </menu_item_check> <menu_item_check label="Debug Console" name="Debug Console" @@ -1898,28 +1904,6 @@ parameter="notifications_console" /> </menu_item_call> <menu_item_check - label="Texture Size Console" - name="Texture Size" - shortcut="control|shift|6"> - <menu_item_check.on_check - function="Advanced.CheckConsole" - parameter="texture size" /> - <menu_item_check.on_click - function="Advanced.ToggleConsole" - parameter="texture size" /> - </menu_item_check> - <menu_item_check - label="Texture Category Console" - name="Texture Category" - shortcut="control|shift|7"> - <menu_item_check.on_check - function="Advanced.CheckConsole" - parameter="texture category" /> - <menu_item_check.on_click - function="Advanced.ToggleConsole" - parameter="texture category" /> - </menu_item_check> - <menu_item_check label="Fast Timers" name="Fast Timers" shortcut="control|shift|9" @@ -1953,7 +1937,20 @@ function="Advanced.ToggleConsole" parameter="scene view" /> </menu_item_check> - + <menu_item_call + enabled="false" + visible="false" + label="Texture Fetch Debug Console" + name="Texture Fetch Debug Console"> + <menu_item_call.on_click + function="Floater.Show" + parameter="tex_fetch_debugger" /> + <on_enable + function="Develop.SetTexFetchDebugger" /> + <on_visible + function="Develop.SetTexFetchDebugger" /> + </menu_item_call> + <menu_item_separator/> <menu_item_call @@ -2439,6 +2436,52 @@ function="Advanced.ToggleInfoDisplay" parameter="sculpt" /> </menu_item_check> + <menu + create_jump_keys="true" + label="Texture Density" + name="Texture Density" + tear_off="true"> + <menu_item_check + label="None" + name="None"> + <menu_item_check.on_check + function="Advanced.CheckDisplayTextureDensity" + parameter="none" /> + <menu_item_check.on_click + function="Advanced.SetDisplayTextureDensity" + parameter="none" /> + </menu_item_check> + <menu_item_check + label="Current" + name="Current"> + <menu_item_check.on_check + function="Advanced.CheckDisplayTextureDensity" + parameter="current" /> + <menu_item_check.on_click + function="Advanced.SetDisplayTextureDensity" + parameter="current" /> + </menu_item_check> + <menu_item_check + label="Desired" + name="Desired"> + <menu_item_check.on_check + function="Advanced.CheckDisplayTextureDensity" + parameter="desired" /> + <menu_item_check.on_click + function="Advanced.SetDisplayTextureDensity" + parameter="desired" /> + </menu_item_check> + <menu_item_check + label="Full" + name="Full"> + <menu_item_check.on_check + function="Advanced.CheckDisplayTextureDensity" + parameter="full" /> + <menu_item_check.on_click + function="Advanced.SetDisplayTextureDensity" + parameter="full" /> + </menu_item_check> + </menu> </menu> <menu create_jump_keys="true" @@ -2606,16 +2649,6 @@ parameter="TextureLoadFullRes" /> </menu_item_check> <menu_item_check - label="Audit Textures" - name="Audit Textures"> - <menu_item_check.on_check - function="CheckControl" - parameter="AuditTexture" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="AuditTexture" /> - </menu_item_check> - <menu_item_check label="Texture Atlas (experimental)" name="Texture Atlas"> <menu_item_check.on_check @@ -3098,12 +3131,6 @@ <menu_item_call.on_click function="Advanced.TestFemale" /> </menu_item_call> - <menu_item_call - label="Toggle PG" - name="Toggle PG"> - <menu_item_call.on_click - function="Advanced.TogglePG" /> - </menu_item_call> <menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"> @@ -3268,6 +3295,14 @@ <menu_item_call.on_click function="Advanced.CompressImage" /> </menu_item_call> + + <menu_item_call + label="Enable Visual Leak Detector" + name="Enable Visual Leak Detector"> + <menu_item_call.on_click + function="Advanced.ToggleVisualLeakDetector" /> + </menu_item_call> + <menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"> @@ -3294,6 +3329,7 @@ name="Set Logging Level" tear_off="true"> <menu_item_check + name="Debug" label="Debug"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" @@ -3303,6 +3339,7 @@ parameter="0" /> </menu_item_check> <menu_item_check + name="Info" label="Info"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" @@ -3312,6 +3349,7 @@ parameter="1" /> </menu_item_check> <menu_item_check + name="Warning" label="Warning"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" @@ -3321,6 +3359,7 @@ parameter="2" /> </menu_item_check> <menu_item_check + name="Error" label="Error"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" @@ -3330,6 +3369,7 @@ parameter="3" /> </menu_item_check> <menu_item_check + name="None" label="None"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6c295f0344..91b4d38e97 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2359,6 +2359,93 @@ Would you be my friend? </notification> <notification + icon="alertmodal.tga" + label="Add Auto-Replace List" + name="AddAutoReplaceList" + type="alertmodal"> + <tag>addlist</tag> + Name for the new list: + <tag>confirm</tag> + <form name="form"> + <input name="listname" type="text"/> + <button + default="true" + index="0" + name="SetName" + text="OK"/> + </form> + </notification> + + <notification + icon="alertmodal.tga" + label="Rename Auto-Replace List" + name="RenameAutoReplaceList" + type="alertmodal"> + The name '[DUPNAME]' is in use + Enter a new unique name: + <tag>confirm</tag> + <form name="form"> + <input name="listname" type="text"/> + <button + default="false" + index="0" + name="ReplaceList" + text="Replace Current List"/> + <button + default="true" + index="1" + name="SetName" + text="Use New Name"/> + </form> + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidAutoReplaceEntry" + type="alertmodal"> + The keyword must be a single word, and the replacement may not be empty. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidAutoReplaceList" + type="alertmodal"> + That replacement list is not valid. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="SpellingDictImportRequired" + type="alertmodal"> + You must specify a file, a name, and a language. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="SpellingDictIsSecondary" + type="alertmodal"> +The dictionary [DIC_NAME] does not appear to have an "aff" file; this means that it is a "secondary" dictionary. +It can be used as an additional dictionary, but not as your Main dictionary. + +See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries + <tag>confirm</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="SpellingDictImportFailed" + type="alertmodal"> + Unable to copy + [FROM_NAME] + to + [TO_NAME] + <tag>fail</tag> + </notification> + + <notification icon="alertmodal.tga" label="Save Outfit" name="SaveOutfitAs" @@ -4089,9 +4176,7 @@ Are you sure you want to change the Estate Covenant? name="RegionEntryAccessBlocked" type="alertmodal"> <tag>fail</tag> -You are not allowed in that Region due to your maturity Rating. This may be a result of a lack of information validating your age. - -Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating. + The region you're trying to visit contains content exceeding your current preferences. You can change your preferences using Me > Preferences > General. <usetemplate name="okbutton" yestext="OK"/> @@ -4099,13 +4184,11 @@ Please verify you have the latest Viewer installed, and go to the Knowledge Base <notification icon="alertmodal.tga" - name="RegionEntryAccessBlocked_KB" + name="RegionEntryAccessBlocked_AdultsOnlyContent" type="alertmodal"> <tag>fail</tag> <tag>confirm</tag> -You are not allowed in that region due to your maturity Rating. - -Go to the Knowledge Base for more information about maturity Ratings? + The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only. <url option="0" name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview </url> @@ -4113,7 +4196,7 @@ Go to the Knowledge Base for more information about maturity Ratings? name="okcancelignore" yestext="Go to Knowledge Base" notext="Close" - ignoretext="I can't enter this Region, due to restrictions of the maturity Rating"/> + ignoretext="Region crossing: The region you're trying to visit contains content which is accessible to adults only."/> </notification> <notification @@ -4121,47 +4204,156 @@ Go to the Knowledge Base for more information about maturity Ratings? name="RegionEntryAccessBlocked_Notify" type="notifytip"> <tag>fail</tag> -You are not allowed in that region due to your maturity Rating. +The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. + </notification> + + <notification + icon="notifytip.tga" + name="RegionEntryAccessBlocked_NotifyAdultsOnly" + type="notifytip"> + <tag>fail</tag> + The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only. </notification> <notification icon="alertmodal.tga" name="RegionEntryAccessBlocked_Change" type="alertmodal"> - <tag>fail</tag> + <tag>fail</tag> <tag>confirm</tag> -You are not allowed in that Region due to your maturity Rating preference. - -To enter the desired region, please change your maturity Rating preference. This will allow you to search for and access [REGIONMATURITY] content. To undo any changes, go to Me > Preferences > General. - <form name="form"> +The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, or you can cancel. After your preferences are changed, you may attempt to enter the region again. + <form name="form"> <button index="0" name="OK" - text="Change Preference"/> - <button + text="Change preferences"/> + <button default="true" index="1" name="Cancel" - text="Close"/> - <ignore name="ignore" text="My chosen Rating preference prevents me from entering a Region"/> + text="Cancel"/> + <ignore name="ignore" text="Region crossing: The region you're trying to visit contains content excluded by your preferences."/> </form> </notification> <notification + icon="alertmodal.tga" + name="RegionEntryAccessBlocked_PreferencesOutOfSync" + type="alertmodal"> + <tag>fail</tag> + We are having technical difficulties with your teleport because your preferences are out of sync with the server. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportEntryAccessBlocked" + type="alertmodal"> + <tag>fail</tag> + The region you're trying to visit contains content exceeding your current preferences. You can change your preferences using Me > Preferences > General. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportEntryAccessBlocked_AdultsOnlyContent" + type="alertmodal"> + <unique> + <context>REGIONMATURITY</context> + </unique> + <tag>fail</tag> + <tag>confirm</tag> + The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only. + <url option="0" name="url"> + http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview + </url> + <usetemplate + name="okcancelignore" + yestext="Go to Knowledge Base" + notext="Close" + ignoretext="Teleport: The region you're trying to visit contains content which is accessible to adults only."/> + </notification> + + <notification icon="notifytip.tga" - name="PreferredMaturityChanged" + name="TeleportEntryAccessBlocked_Notify" type="notifytip"> -Your maturity Rating preference is now [RATING]. + <unique> + <context>REGIONMATURITY</context> + </unique> + <tag>fail</tag> + The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. + </notification> + + <notification + icon="notifytip.tga" + name="TeleportEntryAccessBlocked_NotifyAdultsOnly" + type="notifytip"> + <unique> + <context>REGIONMATURITY</context> + </unique> + <tag>fail</tag> + The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only. </notification> <notification icon="alertmodal.tga" - name="LandClaimAccessBlocked" + name="TeleportEntryAccessBlocked_ChangeAndReTeleport" type="alertmodal"> -You cannot claim this land due to your maturity Rating. This may be a result of a lack of information validating your age. + <unique> + <context>REGIONMATURITY</context> + </unique> + <tag>fail</tag> + <tag>confirm</tag> + The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences and continue with the teleport, or you can cancel this teleport. + <form name="form"> + <button + index="0" + name="OK" + text="Change and continue"/> + <button + default="true" + index="1" + name="Cancel" + text="Cancel"/> + <ignore name="ignore" text="Teleport (restartable): The region you're trying to visit contains content excluded by your preferences."/> + </form> + </notification> -Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating. - <tag>fail</tag> + <notification + icon="alertmodal.tga" + name="TeleportEntryAccessBlocked_Change" + type="alertmodal"> + <unique> + <context>REGIONMATURITY</context> + </unique> + <tag>fail</tag> + <tag>confirm</tag> + The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, or you can cancel the teleport. After your preferences are changed, you will need to attempt the teleport again. + <form name="form"> + <button + index="0" + name="OK" + text="Change preferences"/> + <button + default="true" + index="1" + name="Cancel" + text="Cancel"/> + <ignore name="ignore" text="Teleport (non-restartable): The region you're trying to visit contains content excluded by your preferences."/> + </form> + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportEntryAccessBlocked_PreferencesOutOfSync" + type="alertmodal"> + <tag>fail</tag> + We are having technical difficulties with your teleport because your preferences are out of sync with the server. <usetemplate name="okbutton" yestext="OK"/> @@ -4169,12 +4361,43 @@ Please verify you have the latest Viewer installed, and go to the Knowledge Base <notification icon="alertmodal.tga" - name="LandClaimAccessBlocked_KB" + name="PreferredMaturityChanged" type="alertmodal"> -You cannot claim this land due to your maturity Rating. +You won't receive any more notifications that you're about to visit a region with [RATING] content. You may change your content preferences in the future by using Me > Preferences > General from the menu bar. + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> -Go to the Knowledge Base for more information about maturity Ratings? - <tag>fail</tag> + <notification + icon="alertmodal.tga" + name="MaturityChangeError" + type="alertmodal"> + We were unable to change your preferences to view [PREFERRED_MATURITY] content at this time. Your preferences have been reset to view [ACTUAL_MATURITY] content. You may attempt to change your preferences again by using Me > Preferences > General from the menu bar. + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="LandClaimAccessBlocked" + type="alertmodal"> + The land you're trying to claim has a maturity rating exceeding your current preferences. You can change your preferences using Me > Preferences > General. + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="LandClaimAccessBlocked_AdultsOnlyContent" + type="alertmodal"> + Only adults can claim this land. + <tag>fail</tag> <tag>confirm</tag> <url option="0" name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview @@ -4183,41 +4406,52 @@ Go to the Knowledge Base for more information about maturity Ratings? name="okcancelignore" yestext="Go to Knowledge Base" notext="Close" - ignoretext="I can't claim this Land, due to restrictions of the maturity Rating"/> + ignoretext="Only adults can claim this land."/> </notification> <notification icon="notifytip.tga" name="LandClaimAccessBlocked_Notify" type="notifytip"> -You cannot claim this land due to your maturity Rating. - <tag>fail</tag> + The land you're trying to claim contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. + <tag>fail</tag> + </notification> + + <notification + icon="notifytip.tga" + name="LandClaimAccessBlocked_NotifyAdultsOnly" + type="notifytip"> + <tag>fail</tag> + The land you're trying to claim contains [REGIONMATURITY] content, which is accessible to adults only. </notification> <notification icon="alertmodal.tga" name="LandClaimAccessBlocked_Change" type="alertmodal"> -You cannot claim this land due to your maturity Rating preference. - -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. + The land you're trying to claim contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, then you can try claiming the land again. <tag>fail</tag> <tag>confirm</tag> - <usetemplate - name="okcancelignore" - yestext="Change Preference" - notext="Close" - ignoretext="My chosen Rating preference prevents me from claiming Land"/> + <form name="form"> + <button + index="0" + name="OK" + text="Change preferences"/> + <button + default="true" + index="1" + name="Cancel" + text="Cancel"/> + <ignore name="ignore" text="The land you're trying to claim contains content excluded by your preferences."/> + </form> </notification> <notification icon="alertmodal.tga" name="LandBuyAccessBlocked" type="alertmodal"> -You cannot buy this land due to your maturity Rating. This may be a result of a lack of information validating your age. - -Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating. - <tag>fail</tag> + The land you're trying to buy has a maturity rating exceeding your current preferences. You can change your preferences using Me > Preferences > General. + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -4225,11 +4459,9 @@ Please verify you have the latest Viewer installed, and go to the Knowledge Base <notification icon="alertmodal.tga" - name="LandBuyAccessBlocked_KB" + name="LandBuyAccessBlocked_AdultsOnlyContent" type="alertmodal"> -You cannot buy this land due to your maturity Rating. - -Go to the Knowledge Base for more information about maturity Ratings? + Only adults can buy this land. <tag>confirm</tag> <tag>fail</tag> <url option="0" name="url"> @@ -4239,31 +4471,44 @@ Go to the Knowledge Base for more information about maturity Ratings? name="okcancelignore" yestext="Go to Knowledge Base" notext="Close" - ignoretext="I can't buy this Land, due to restrictions of the maturity Rating"/> + ignoretext="Only adults can buy this land."/> </notification> <notification icon="notifytip.tga" name="LandBuyAccessBlocked_Notify" type="notifytip"> -You cannot buy this land due to your maturity Rating. - <tag>fail</tag> + The land you're trying to buy contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. + <tag>fail</tag> + </notification> + + <notification + icon="notifytip.tga" + name="LandBuyAccessBlocked_NotifyAdultsOnly" + type="notifytip"> + <tag>fail</tag> + The land you're trying to buy contains [REGIONMATURITY] content, which is accessible to adults only. </notification> <notification icon="alertmodal.tga" name="LandBuyAccessBlocked_Change" type="alertmodal"> -You cannot buy this land due to your maturity Rating preference. - -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. + The land you're trying to buy contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, then you can try buying the land again. <tag>confirm</tag> <tag>fail</tag> - <usetemplate - name="okcancelignore" - yestext="Change Preference" - notext="Close" - ignoretext="My chosen Rating preference prevents me from buying Land"/> + <form name="form"> + <button + index="0" + name="OK" + text="Change preferences"/> + <button + default="true" + index="1" + name="Cancel" + text="Cancel"/> + <ignore name="ignore" text="The land you're trying to buy contains content excluded by your preferences."/> + </form> </notification> <notification @@ -4418,10 +4663,11 @@ Type a short announcement which will be sent to everyone in this region. label="Changed Region Maturity" name="RegionMaturityChange" type="alertmodal"> -The maturity rating for this region has been updated. -It may take some time for the change to be reflected on the map. - -To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification. +The maturity rating for this region has been changed. +It may take some time for this change to be reflected on the map. + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification @@ -5127,20 +5373,20 @@ Would you like to automatically wear the clothing you are about to create? icon="alertmodal.tga" name="NotAgeVerified" type="alertmodal"> - <tag>fail</tag> -To access adult content and areas in Second Life you must be at least 18 years old. Please visit our age verification page to confirm you are over 18. -Note this will launch your web browser. - -[_URL] - <tag>confirm</tag> - <url option="0" name="url"> - https://secondlife.com/my/account/verification.php - </url> + The location you're trying to visit is restricted to residents age 18 and over. + <tag>fail</tag> <usetemplate - ignoretext="I have not verified my age" - name="okcancelignore" - notext="Cancel" - yestext="Go to Age Verification"/> + ignoretext="I am not old enough to visit age restricted areas." + name="okignore" + yestext="OK"/> + </notification> + + <notification + icon="notifytip.tga" + name="NotAgeVerified_Notify" + type="notifytip"> + Location restricted to age 18 and over. + <tag>fail</tag> </notification> <notification @@ -5287,7 +5533,7 @@ Terrain.raw downloaded icon="notifytip.tga" name="GestureMissing" type="notifytip"> -Hmm. Gesture [NAME] is missing from the database. +Gesture [NAME] is missing from the database. <tag>fail</tag> </notification> @@ -5825,9 +6071,7 @@ You can only claim public land in the Region you're in. persist="true" type="notify"> <tag>fail</tag> -You aren't allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. - -Please go to the Knowledge Base for details on accessing areas with this maturity Rating. + The region you're trying to visit contains content exceeding your current preferences. You can change your preferences using Me > Preferences > General. </notification> <notification @@ -5859,11 +6103,11 @@ You do not have proper payment status to enter this region. <notification icon="notify.tga" - name="MustGetAgeRgion" + name="MustGetAgeRegion" persist="true" type="notify"> <tag>fail</tag> -You must be age-verified to enter this region. +You must be age 18 or over to enter this region. </notification> <notification @@ -5872,7 +6116,7 @@ You must be age-verified to enter this region. persist="true" type="notify"> <tag>fail</tag> -You must be age-verified to enter this parcel. + You must be age 18 or over to enter this parcel. </notification> <notification @@ -6147,7 +6391,8 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th type="offer"> [NAME_SLURL] has offered to teleport you to their location: -[MESSAGE] - [MATURITY_STR] <icon>[MATURITY_ICON]</icon> +“[MESSAGE]” +<icon>[MATURITY_ICON]</icon> - [MATURITY_STR] <tag>confirm</tag> <form name="form"> <button @@ -6163,6 +6408,42 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th <notification icon="notify.tga" + name="TeleportOffered_MaturityExceeded" + type="offer"> +[NAME_SLURL] has offered to teleport you to their location: + +“[MESSAGE]” +<icon>[MATURITY_ICON]</icon> - [MATURITY_STR] + +This region contains [REGION_CONTENT_MATURITY] content, but your current preferences are set to exclude [REGION_CONTENT_MATURITY] content. We can change your preferences and continue with the teleport, or you can cancel this teleport. + <tag>confirm</tag> + <form name="form"> + <button + index="0" + name="Teleport" + text="Change and Continue"/> + <button + index="1" + name="Cancel" + text="Cancel"/> + </form> + </notification> + + <notification + icon="notify.tga" + name="TeleportOffered_MaturityBlocked" + type="notifytip"> +[NAME_SLURL] has offered to teleport you to their location: + +“[MESSAGE]” +<icon>[MATURITY_ICON]</icon> - [MATURITY_STR] + +However, this region contains content accessible to adults only. + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" name="TeleportOfferSent" type="offer"> Teleport offer sent to [TO_NAME] @@ -6392,31 +6673,28 @@ Is this OK? <notification icon="notify.tga" name="ScriptQuestionCaution" - priority="high" + priority="critical" persist="true" type="notify"> -An object named '<nolink>[OBJECTNAME]</nolink>', owned by '[NAME]' would like to: - -[QUESTIONS] -If you do not trust this object and its creator, you should deny the request. +Warning: The object '<nolink>[OBJECTNAME]</nolink>' wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings. + +It is rare that such a request is legitimate. Do not allow access if you do not fully understand why it wants access to your account. -Grant this request? <tag>confirm</tag> <form name="form"> <button index="0" name="Grant" - text="Grant"/> + text="Allow total access"/> <button default="true" index="1" name="Deny" text="Deny"/> - <button - index="2" - name="Details" - text="Details..."/> </form> + <footer> +[FOOTERTEXT] + </footer> </notification> <notification @@ -7727,4 +8005,31 @@ Otherwise, you can look at the Map and find places marked "Infohub". You died and have been teleported to your home location. </global> + <notification + icon="alertmodal.tga" + name="LocalBitmapsUpdateFileNotFound" + persist="true" + type="notify"> +[FNAME] could not be updated because the file could no longer be found. +Disabling future updates for this file. + </notification> + + <notification + icon="alertmodal.tga" + name="LocalBitmapsUpdateFailedFinal" + persist="true" + type="notify"> +[FNAME] could not be opened or decoded for [NRETRIES] attempts, and is now considered broken. +Disabling future updates for this file. + </notification> + + <notification + icon="alertmodal.tga" + name="LocalBitmapsVerifyFail" + persist="true" + type="notify"> +Attempted to add an invalid or unreadable image file [FNAME] which could not be opened or decoded. +Attempt cancelled. + </notification> + </notifications> diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml index 1b97de2b05..1ef99649e6 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -18,6 +18,7 @@ <text_chat top="3" left="30" + right="-10" height="120" text_color="white" word_wrap="true" diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 0faa1598b1..553c112e6f 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -134,6 +134,7 @@ top_pad="2" max_length="1023" name="pick_desc" + spellcheck="true" text_color="black" word_wrap="true" /> <text diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 607e1bb213..6d5fb51e85 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -141,6 +141,7 @@ Maximum 200 per group daily max_length_bytes="63" name="create_subject" prevalidate_callback="ascii" + spellcheck="true" width="218" /> <text follows="left|top" @@ -161,6 +162,7 @@ Maximum 200 per group daily left_pad="3" max_length="511" name="create_message" + spellcheck="true" top_delta="0" width="218" word_wrap="true" /> @@ -309,6 +311,7 @@ Maximum 200 per group daily left_pad="3" max_length_bytes="63" name="view_subject" + spellcheck="true" top_delta="-1" visible="false" width="200" /> @@ -333,6 +336,7 @@ Maximum 200 per group daily right="-1" max_length="511" name="view_message" + spellcheck="true" top_delta="-40" width="313" word_wrap="true" /> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 21c627cdfb..6bc9c48729 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -19,6 +19,7 @@ left="0" max_length_bytes="1023" name="chat_box" + spellcheck="true" text_pad_left="5" text_pad_right="25" tool_tip="Press Enter to say, Ctrl+Enter to shout" diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml index e9427a2388..3f67a48b14 100644 --- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml +++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml @@ -85,6 +85,7 @@ top_delta="0" width="95" /> <check_box + height="10" bottom_delta="20" follows="left|top" label="Constrain proportions" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index caf7fc85f5..27193a984f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -207,13 +207,36 @@ <button follows="left|top" height="23" - label="Chat Translation Settings" + label="Translation..." layout="topleft" left="30" name="ok_btn" - top="-40" + top="-50" width="170"> <button.commit_callback function="Pref.TranslationSettings" /> </button> -</panel>
\ No newline at end of file + <button + follows="top|left" + height="23" + layout="topleft" + top_pad="-23" + left_pad="5" + name="autoreplace_showgui" + commit_callback.function="Pref.AutoReplace" + label="Auto-Replace..." + width="150"> + </button> + <button + follows="top|left" + height="23" + layout="topleft" + top_pad="-23" + left_pad="5" + name="spellcheck_showgui" + commit_callback.function="Pref.SpellChecker" + label="Spell Checking..." + width="150"> + </button> + +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index bfd796a62b..76a82212ae 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -149,11 +149,11 @@ <check_box follows="top|left" height="16" - label="Have been age-verified" + label="Are age 18 or older" layout="topleft" left_delta="0" name="limit_age_verified" - tool_tip="Residents must be age verified to access this estate. See the [SUPPORT_SITE] for more information." + tool_tip="Residents must be age 18 or older to access this estate. See the [SUPPORT_SITE] for more information." top_pad="2" width="278" /> diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml new file mode 100644 index 0000000000..b0436bb6dc --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<panel + background_opaque="false" + border_visible="false" + background_visible="true" + bg_alpha_color="PanelNotificationBackground" + bg_opaque_color="PanelNotificationBackground" + chrome="true" + height="270" + label="script_question_panel" + layout="topleft" + left="0" + name="panel_script_question_toast" + top="0" + width="305"> + <text + follows="left|right|top" + font="SansSerifBold" + height="160" + layout="topleft" + left="10" + mouse_opaque="false" + name="top_info_message" + parse_highlights="true" + parse_urls="true" + text_color="NotifyCautionBoxColor" + top="10" + value="" + width="285" + wrap="true"/> + <panel + background_visible="false" + follows="left|right|top" + height="30" + label="buttons_panel" + layout="topleft" + name="buttons_panel" + top_pad="10" + width="285"> + </panel> + <text + follows="all" + font="SansSerifBold" + height="55" + layout="topleft" + mouse_opaque="false" + name="bottom_info_message" + parse_highlights="true" + parse_urls="true" + text_color="NotifyCautionBoxColor" + top_pad="5" + value="" + width="285" + wrap="true"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml index 9057ebb65e..71d808fa4b 100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml @@ -114,6 +114,7 @@ width="95" /> <check_box bottom_delta="20" + height="10" follows="left|top" label="Constrain proportions" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml index b966358f18..781ab17403 100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml @@ -132,6 +132,7 @@ width="95" /> <check_box bottom_delta="20" + height="10" follows="left|top" label="Constrain proportions" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml index 5bd383b81e..0dd357aa1a 100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml @@ -119,6 +119,7 @@ top_delta="0" width="95" /> <check_box + height="10" bottom_delta="20" label="Constrain proportions" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 22c1139cdb..3aa34439f1 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -35,8 +35,8 @@ </panel.string> <panel height="18" - left="-370" - width="160" + left="-395" + width="185" top="1" follows="right|top" name="balance_bg"> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index 0b5aff54ca..37a904bca8 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -10,7 +10,6 @@ --> <floater - open_positioning="none" legacy_header_height="0" header_height="0" name="toast" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index ee790e8dd4..14bd349480 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -51,7 +51,7 @@ <layout_panel width="330" layout="topleft" - auto_resize="true" + auto_resize="false" user_resize="true" follows="left|right|top" name="inbox_layout_panel" @@ -105,6 +105,7 @@ [NUM] new </text> <panel + name="inbox_inventory_placeholder_panel" follows="all" left="10" bottom="235" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4ccec4838a..6dd80dc11a 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -393,6 +393,7 @@ Please try logging in again in a minute.</string> <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string> <string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string> <string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string> + <string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string> <string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string> <string name="ActOnControlInputs">Act on your control inputs</string> <string name="RemapControlInputs">Remap your control inputs</string> @@ -440,6 +441,7 @@ Please try logging in again in a minute.</string> <string name="load_files">Load Files</string> <string name="choose_the_directory">Choose Directory</string> <string name="script_files">Scripts</string> + <string name="dictionary_files">Dictionaries</string> <!-- LSL Usage Hover Tips --> <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window). @@ -3757,4 +3759,9 @@ Try enclosing path to the editor with double quotes. <string name="snapshot_quality_high">High</string> <string name="snapshot_quality_very_high">Very High</string> + <string name="TeleportMaturityExceeded">The Resident cannot visit this region.</string> + + <!-- Spell check settings floater --> + <string name="UserDictionary">[User]</string> + </strings> diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml index dce6b8dd6d..fdf41991cd 100644 --- a/indra/newview/skins/default/xui/en/teleport_strings.xml +++ b/indra/newview/skins/default/xui/en/teleport_strings.xml @@ -45,6 +45,9 @@ Go to 'Welcome Island Public' to repeat the tutorial. <message name="no_inventory_host"> The inventory system is currently unavailable. </message> + <message name="MustGetAgeRegion"> + You must be age 18 or over to enter this region. + </message> </message_set> <message_set name="progress"> <message name="sending_dest"> @@ -80,5 +83,8 @@ Go to 'Welcome Island Public' to repeat the tutorial. <message name="requesting"> Requesting Teleport... </message> - </message_set> + <message name="pending"> + Pending Teleport... + </message> + </message_set> </teleport_messages> diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index adbb183317..97a5ae7d4e 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -2,7 +2,7 @@ <!-- See also settings.xml UIFloater* settings for configuration --> <floater name="floater" - open_positioning="none" + positioning="none" layout="topleft" bg_opaque_color="FloaterFocusBackgroundColor" bg_alpha_color="FloaterDefaultBackgroundColor" diff --git a/indra/newview/skins/default/xui/es/floater_model_wizard.xml b/indra/newview/skins/default/xui/es/floater_model_wizard.xml deleted file mode 100644 index 5bd6b5e0e5..0000000000 --- a/indra/newview/skins/default/xui/es/floater_model_wizard.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="CARGAR ASISTENTE DE MODELO"> - <button label="5. Subir" name="upload_btn"/> - <button label="4. Revisar" name="review_btn"/> - <button label="3. Física" name="physics_btn"/> - <button label="2. Optimizar" name="optimize_btn"/> - <button label="1. Seleccionar archivo" name="choose_file_btn"/> - <panel name="choose_file_panel"> - <panel name="choose_file_header_panel"> - <text name="choose_file_header_text"> - Elige el archivo de modelo - </text> - </panel> - <panel name="choose_file_content"> - <text name="advanced_users_text"> - Usuarios avanzados: si tienes experiencia con las herramientas de creación de contenidos 3D, quizá te interese utilizar la función de subida avanzada. - </text> - <button label="Cambiar al modo Avanzado" name="switch_to_advanced"/> - <text name="Cache location"> - Elige el archivo de modelo que deseas subir - </text> - <button label="Examinar..." label_selected="Examinar..." name="browse"/> - <text name="Model types"> - Second Life admite los archivos COLLADA (.dae) - </text> - <text name="dimensions"> - X Y Z - </text> - <text name="warning_label"> - ATENCIÓN: - </text> - <text name="warning_text"> - No podrás completar el paso final de la subida de este modelo a los servidores de Second Life. [secondlife:///app/floater/learn_more Averigua cómo] configurar tu cuenta para subir modelos de malla. - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> - Optimizar el modelo - </text> - </panel> - <text name="optimize_description"> - Hemos optimizado el rendimiento del modelo, pero puedes ajustarlo más si lo deseas. - </text> - <panel name="optimize_content"> - <text name="high_detail_text"> - Generar el nivel de detalle: Alto - </text> - <text name="medium_detail_text"> - Generar el nivel de detalle: Medio - </text> - <text name="low_detail_text"> - Generar el nivel de detalle: Bajo - </text> - <text name="lowest_detail_text"> - Generar el nivel de detalle: Mínimo - </text> - </panel> - <panel name="content2"> - <button label="Recalcular la geometría" name="recalculate_geometry_btn"/> - <text name="lod_label"> - Vista previa de geometría - </text> - <combo_box name="preview_lod_combo" tool_tip="LOD para ver en renderizado de prueba"> - <combo_item name="high"> - Detalle alto - </combo_item> - <combo_item name="medium"> - Detalles medios - </combo_item> - <combo_item name="low"> - Detalle bajo - </combo_item> - <combo_item name="lowest"> - Detalles mínimos - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> - Ajustar la física - </text> - </panel> - <text name="physics_description"> - Crearemos una forma para la apariencia exterior del modelo. Ajusta el nivel de detalle de la forma según se necesite para el propósito proyectado del modelo. - </text> - <panel name="physics_content"> - <button label="Recalcular física" name="recalculate_physics_btn"/> - <button label="Recalculando..." name="recalculating_physics_btn"/> - <text name="lod_label"> - Prueba de física - </text> - <combo_box name="preview_lod_combo2" tool_tip="LOD para ver en renderizado de prueba"> - <combo_item name="high"> - Detalle alto - </combo_item> - <combo_item name="medium"> - Detalles medios - </combo_item> - <combo_item name="low"> - Detalle bajo - </combo_item> - <combo_item name="lowest"> - Detalles mínimos - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> - Revisar - </text> - </panel> - <panel name="review_content"> - <text name="review_prim_equiv"> - Impacto en la parcela/región: [EQUIV] equivalentes en prim - </text> - <text name="review_fee"> - Cargaremos en tu cuenta el precio de subida de L$ [FEE]. - </text> - <text name="review_confirmation"> - Al pulsar en el botón de subida, confirmas que posees los derechos necesarios sobre el material que contiene el modelo. - </text> - </panel> - </panel> - <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> - Subida finalizada - </text> - </panel> - <text name="model_uploaded_text"> - Se ha subido tu modelo. - </text> - <text name="inventory_text"> - Puedes buscar la carpeta Objetos en tu inventario. - </text> - <text name="charged_fee"> - Se han cargado [FEE] L$ en tu cuenta. - </text> - </panel> - <button label="<< Atrás" name="back"/> - <button label="Siguiente >>" name="next"/> - <button label="Calcular pesos y precio >>" name="calculate"/> - <button label="Calculando..." name="calculating"/> - <button label="Subir" name="upload" tool_tip="Cargar al simulador"/> - <button label="Cancelar" name="cancel"/> - <button label="Cerrar" name="close"/> - <spinner name="import_scale" value="1.0"/> - <string name="status_idle"> - Inactivo - </string> - <string name="status_parse_error"> - Problema de análisis de DAE - consulta los datos en el registro. - </string> - <string name="status_reading_file"> - Cargando... - </string> - <string name="status_generating_meshes"> - Generando redes... - </string> - <string name="status_vertex_number_overflow"> - Error: El número de intersección es superior a 65534. Cancelado. - </string> - <string name="bad_element"> - Error: el elemento no es válido - </string> - <string name="high"> - Alto - </string> - <string name="medium"> - Media - </string> - <string name="low"> - Bajo - </string> - <string name="lowest"> - Mínimo - </string> - <string name="mesh_status_good"> - Factúralo. - </string> - <string name="mesh_status_na"> - N/A - </string> - <string name="mesh_status_none"> - Ninguno - </string> - <string name="mesh_status_submesh_mismatch"> - Los niveles de detalle poseen un número distinto de caras a las que se pueden aplicar texturas. - </string> - <string name="mesh_status_mesh_mismatch"> - Los niveles de detalle poseen un número distinto de ejemplos de red. - </string> - <string name="mesh_status_too_many_vertices"> - El nivel de detalle posee demasiadas intersecciones. - </string> - <string name="mesh_status_missing_lod"> - Falta un nivel de detalle requerido. - </string> - <string name="layer_all"> - Todo - </string> -</floater> diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml index 79b2c32b23..7eead3bc18 100644 --- a/indra/newview/skins/default/xui/es/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml @@ -15,7 +15,7 @@ <panel.string name="buycurrencylabel"> [AMT] L$ </panel.string> - <panel name="balance_bg"> + <panel left="-410" name="balance_bg" width="200"> <text name="balance" tool_tip="Haz clic para actualizar tu saldo en L$" value="20 L$"/> <button label="Comprar L$" name="buyL" tool_tip="Pulsa para comprar más L$"/> <button label="Comprar" name="goShop" tool_tip="Abrir el mercado de Second Life" width="80"/> 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 6f8885487a..49af1a87e1 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -439,7 +439,7 @@ musique : <text name="Sound:"> Son : </text> - <check_box label="Limiter les gestes et sons d'objet à cette parcelle" name="check sound local"/> + <check_box label="Limiter les sons des gestes et des objets à cette parcelle" name="check sound local"/> <text name="Avatar Sounds:"> Sons d'avatar : </text> diff --git a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml new file mode 100644 index 0000000000..e82518ce80 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Anim Preview" title="ANIMATION.ANIM"> + <text name="name_label"> + Nom : + </text> + <text name="description_label"> + Description : + </text> + <button label="Charger ([AMOUNT] L$)" name="ok_btn"/> + <button label="Annuler" label_selected="Annuler" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml new file mode 100644 index 0000000000..84c40b5987 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Animation Preview"> + <floater.string name="failed_to_initialize"> + Échec de l'initialisation du mouvement + </floater.string> + <floater.string name="anim_too_long"> + La durée du fichier d'animation est de [LENGTH] secondes. + +La limite maximale est de [MAX_LENGTH] secondes. + </floater.string> + <floater.string name="failed_file_read"> + Impossible de lire le fichier d'animation. + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + Ok + </floater.string> + <floater.string name="E_ST_EOF"> + Fin prématurée du fichier. + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + Impossible de lire la définition des contraintes. + </floater.string> + <floater.string name="E_ST_NO_FILE"> + Impossible d'ouvrir le fichier BVH. + </floater.string> + <floater.string name="E_ST_NO_HIER"> + En-tête HIERARCHY non valide. + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + Impossible de trouver ROOT ou JOINT. + </floater.string> + <floater.string name="E_ST_NO_NAME"> + Impossible d'obtenir le nom JOINT. + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + Impossible de trouver OFFSET. + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + CHANNELS introuvables. + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + Impossible d'obtenir l'ordre de rotation. + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + Impossible d'obtenir l'axe de rotation. + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + Impossible de trouver MOTION. + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + Impossible d'obtenir le nombre d'images. + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + Impossible d'obtenir la durée des images. + </floater.string> + <floater.string name="E_ST_NO_POS"> + Impossible d'obtenir les valeurs de position. + </floater.string> + <floater.string name="E_ST_NO_ROT"> + Impossible d'obtenir les valeurs de rotation. + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + Impossible d'ouvrir le fichier de traduction. + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + Impossible de lire l'en-tête de traduction. + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + Impossible de lire les noms de traduction. + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + Impossible de lire la valeur ignorant la traduction. + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + Impossible de lire la valeur relative de la traduction. + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + Impossible de lire la valeur outname de la traduction. + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + Impossible de lire la matrice de traduction. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + Impossible d'obtenir le nom mergechild. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + Impossible d'obtenir le nom mergeparent. + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + Impossible d'obtenir la valeur priority. + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + Impossible d'obtenir la valeur loop. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + Impossible d'obtenir les valeurs easeIn. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + Impossible d'obtenir les valeurs easeOut. + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + Impossible d'obtenir la valeur hand morph. + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + Impossible de lire le nom emote. + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Nom root joint incorrect ; utiliser "hip". + </floater.string> + <text name="name_label"> + Nom : + </text> + <text name="description_label"> + Description : + </text> + <spinner label="Priorité" name="priority" tool_tip="Contrôle quelles autres animations peuvent être remplacées par cette animation."/> + <check_box label="Boucle" name="loop_check" tool_tip="Entraîne la lecture en boucle de cette animation."/> + <spinner label="Début (%)" name="loop_in_point" tool_tip="Définit le point de l'animation auquel retourne la boucle."/> + <spinner label="Fin (%)" name="loop_out_point" tool_tip="Définit le point de l'animation auquel se termine la boucle."/> + <text name="hand_label"> + Pose des mains + </text> + <combo_box name="hand_pose_combo" tool_tip="Contrôle ce que font les mains pendant l'animation."> + <combo_box.item label="Écartées" name="Spread"/> + <combo_box.item label="Détendues" name="Relaxed"/> + <combo_box.item label="Montrer du doigt (les deux)" name="PointBoth"/> + <combo_box.item label="Poing" name="Fist"/> + <combo_box.item label="Détendue (gauche)" name="RelaxedLeft"/> + <combo_box.item label="Montrer du doigt (gauche)" name="PointLeft"/> + <combo_box.item label="Poing (gauche)" name="FistLeft"/> + <combo_box.item label="Détendue (droite)" name="RelaxedRight"/> + <combo_box.item label="Montrer du doigt (droite)" name="PointRight"/> + <combo_box.item label="Poing (droite)" name="FistRight"/> + <combo_box.item label="Salut (droite)" name="SaluteRight"/> + <combo_box.item label="Clavier" name="Typing"/> + <combo_box.item label="Paix (droite)" name="PeaceRight"/> + </combo_box> + <text name="emote_label"> + Expression + </text> + <combo_box name="emote_combo" tool_tip="Contrôle ce que fait le visage pendant l'animation."> + <item label="(Aucune)" name="[None]" value=""/> + <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> + <item label="Effrayé" name="Afraid" value="Effrayé"/> + <item label="En colère" name="Angry" value="En colère"/> + <item label="Grand sourire" name="BigSmile" value="Grand sourire"/> + <item label="Ennui" name="Bored" value="Ennui"/> + <item label="Pleurer" name="Cry" value="Pleurer"/> + <item label="Mépris" name="Disdain" value="Mépris"/> + <item label="Gêne" name="Embarrassed" value="Gêne"/> + <item label="Froncer les sourcils" name="Frown" value="Froncer les sourcils"/> + <item label="Embrasser" name="Kiss" value="Embrasser"/> + <item label="Rire" name="Laugh" value="Rire"/> + <item label="Tirer la langue" name="Plllppt" value="Tirer la langue"/> + <item label="Dégoût" name="Repulsed" value="Dégoût"/> + <item label="Triste" name="Sad" value="Triste"/> + <item label="Hausser les épaules" name="Shrug" value="Hausser les épaules"/> + <item label="Sourire" name="Smile" value="Sourire"/> + <item label="Surprise" name="Surprise" value="Surprise"/> + <item label="Clin d'œil" name="Wink" value="Clin d'œil"/> + <item label="Inquiétude" name="Worry" value="Inquiétude"/> + </combo_box> + <text name="preview_label"> + Aperçu + </text> + <combo_box name="preview_base_anim" tool_tip="Permet de tester le comportement de l'animation lorsque votre avatar effectue certaines actions courantes."> + <item label="Debout" name="Standing" value="Debout"/> + <item label="En marche" name="Walking" value="En marche"/> + <item label="Assis" name="Sitting" value="Assis"/> + <item label="En vol" name="Flying" value="En vol"/> + </combo_box> + <spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) de l'entrée en fondu de l'animation."/> + <spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) de la sortie en fondu de l'animation."/> + <button name="play_btn" tool_tip="Lire l'animation."/> + <button name="pause_btn" tool_tip="Suspendre l'animation."/> + <button name="stop_btn" tool_tip="Arrêter la lecture de l'animation."/> + <text name="bad_animation_text"> + Impossible de lire le fichier d'animation. + +Les fichiers BVH exportés depuis Poser 4 sont recommandés. + </text> + <button label="Charger ([AMOUNT] L$)" name="ok_btn"/> + <button label="Annuler" name="cancel_btn"/> +</floater> 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 a3b50351ae..0f272891c7 100644 --- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml @@ -214,7 +214,7 @@ </panel> </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="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"/> diff --git a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml deleted file mode 100644 index 128b9d6fa4..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="ASSISTANT DE CHARGEMENT DE MODÈLE"> - <button label="5. Chargement" name="upload_btn"/> - <button label="4. Vérification" name="review_btn"/> - <button label="3. Propriétés physiques" name="physics_btn"/> - <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"> - Choisir un fichier de modèle - </text> - </panel> - <panel name="choose_file_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="Cache location"> - Choisir un fichier de modèle à charger - </text> - <button label="Parcourir..." label_selected="Parcourir..." name="browse"/> - <text name="Model types"> - Second Life prend en charge les fichiers COLLADA (.dae). - </text> - <text name="dimensions"> - X Y Z - </text> - <text name="warning_label"> - AVERTISSEMENT : - </text> - <text name="warning_text"> - Vous ne pourrez pas effectuer l'étape de chargement finale du modèle sur les serveurs Second Life. [secondlife:///app/floater/learn_more Découvrez comment] configurer votre compte pour le chargement de modèles de maillage. - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> - Optimiser le modèle - </text> - </panel> - <text name="optimize_description"> - Le modèle a été optimisé en termes de performances. Vous pouvez l'ajuster si vous le souhaitez. - </text> - <panel name="optimize_content"> - <text name="high_detail_text"> - Générer le niveau de détail : Élevé - </text> - <text name="medium_detail_text"> - Générer le niveau de détail : Moyen - </text> - <text name="low_detail_text"> - Générer le niveau de détail : Faible - </text> - <text name="lowest_detail_text"> - Générer le niveau de détail : Le plus faible - </text> - </panel> - <panel name="content2"> - <button label="Recalcul géométrique" name="recalculate_geometry_btn"/> - <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="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> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> - Ajuster les propriétés physiques - </text> - </panel> - <text name="physics_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"> - <button label="Recalcul physique" name="recalculate_physics_btn"/> - <button label="Recalcul en cours..." name="recalculating_physics_btn"/> - <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="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> - </panel> - </panel> - <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> - Vérification - </text> - </panel> - <panel name="review_content"> - <text name="review_prim_equiv"> - Impact sur la parcelle/région : équivalent à [EQUIV] prims - </text> - <text name="review_fee"> - Votre compte sera débité de [FEE] L$ de frais de chargement. - </text> - <text name="review_confirmation"> - En cliquant sur le bouton de chargement, vous confirmez que vous disposez des droits appropriés sur le contenu du modèle. - </text> - </panel> - </panel> - <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> - Chargement terminé - </text> - </panel> - <text name="model_uploaded_text"> - Votre modèle a été chargé. - </text> - <text name="inventory_text"> - Vous le trouverez dans le dossier Objets de votre inventaire. - </text> - <text name="charged_fee"> - Votre compte a été débité de [FEE] L$. - </text> - </panel> - <button label="<< Préc." name="back"/> - <button label="Suiv. >>" name="next"/> - <button label="Calculer les poids et les frais >>" name="calculate"/> - <button label="Calcul en cours..." name="calculating"/> - <button label="Charger" name="upload" tool_tip="Charger dans le simulateur."/> - <button label="Annuler" name="cancel"/> - <button label="Fermer" name="close"/> - <spinner name="import_scale" value="1.0"/> - <string name="status_idle"> - Inactif - </string> - <string name="status_parse_error"> - Problème d'analyse de fichier .dae ; reportez-vous au journal pour plus de détails. - </string> - <string name="status_reading_file"> - Chargement... - </string> - <string name="status_generating_meshes"> - Génération des maillages... - </string> - <string name="status_vertex_number_overflow"> - Erreur : valeur de sommet supérieure à 65534. Opération abandonnée. - </string> - <string name="bad_element"> - Erreur : élément non valide - </string> - <string name="high"> - Élevé - </string> - <string name="medium"> - Moyen - </string> - <string name="low"> - Faible - </string> - <string name="lowest"> - Le plus faible - </string> - <string name="mesh_status_good"> - Bon à publier ! - </string> - <string name="mesh_status_na"> - N/A - </string> - <string name="mesh_status_none"> - Aucun - </string> - <string name="mesh_status_submesh_mismatch"> - Un nombre différent de faces d'application de texture est associé aux niveaux de détail. - </string> - <string name="mesh_status_mesh_mismatch"> - Un nombre différent d'instances de maillage est associé aux niveaux de détail. - </string> - <string name="mesh_status_too_many_vertices"> - Trop de sommets pour le niveau de détail. - </string> - <string name="mesh_status_missing_lod"> - Niveau de détail requis manquant. - </string> - <string name="layer_all"> - Tout - </string> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml index fdd2ac8beb..f2cb1d5e70 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Description : </text> - <button label="Exécuter dans Second Life" label_selected="Stop" name="Anim play btn" tool_tip="Lire cette animation de façon à ce que les autres puissent la voir" width="131"/> - <button label="Exécuter localement" label_selected="Stop" left="160" name="Anim audition btn" tool_tip="Lire cette animation de façon à ce que vous soyez la seule personne à pouvoir la voir" width="120"/> + <button label="Exécuter dans Second Life" label_selected="Arrêter" name="Inworld" tool_tip="Lire cette animation de façon à ce que les autres la voient."/> + <button label="Exécuter localement" label_selected="Arrêter" name="Locally" tool_tip="Lire cette animation de façon à ce que vous soyez la seule personne à la voir."/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml new file mode 100644 index 0000000000..702170ef52 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Test Floater" title="FLOATER TEST"/> diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index af5678ff0e..e21c6f4c08 100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="toolbox floater" short_title="OUTILS POUR LA CONSTRUCTION" title=""> + <floater.string name="grid_screen_text"> + Écran + </floater.string> + <floater.string name="grid_local_text"> + Local + </floater.string> + <floater.string name="grid_world_text"> + Monde + </floater.string> + <floater.string name="grid_reference_text"> + Référence + </floater.string> + <floater.string name="grid_attachment_text"> + Élément attaché + </floater.string> <floater.string name="status_rotate"> Pour faire tourner l'objet, faites glisser les bandes de couleur. </floater.string> @@ -63,7 +78,12 @@ </text> <check_box initial_value="true" label="Étirer les textures" name="checkbox stretch textures"/> <check_box initial_value="true" label="Fixer" name="checkbox snap to grid"/> - <button label="Options..." label_selected="Options..." name="Options..." tool_tip="Afficher d'autres options de grille"/> + <combo_box name="combobox grid mode" tool_tip="Choisir le type d'axe de grille pour le positionnement de l'objet."> + <combo_box.item label="Monde" name="World"/> + <combo_box.item label="Local" name="Local"/> + <combo_box.item label="Référence" name="Reference"/> + </combo_box> + <button label="" label_selected="Options..." name="Options..." tool_tip="Afficher d'autres options de grille"/> <button label="" label_selected="" name="ToolCube" tool_tip="Cube"/> <button label="" label_selected="" name="ToolPrism" tool_tip="Prisme droit"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/> @@ -106,7 +126,7 @@ Aucune sélection effectuée. </text> <text name="remaining_capacity"> - [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights Plus d'infos] + [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights Plus d'infos] </text> <tab_container name="Object Info Tabs"> <panel label="Général" name="General"> diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml index 92ee6ecf24..671fb5c14d 100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml @@ -42,13 +42,16 @@ <string name="effect_Demon"> Démon </string> + <string name="effect_Female Elf"> + Femme elfe + </string> <string name="effect_Flirty"> Flirt </string> <string name="effect_Foxy"> Séduction </string> - <string name="effect_Halloween_2010_Bonus"> + <string name="effect_Halloween 2010 Bonus"> Halloween_2010_Bonus </string> <string name="effect_Helium"> @@ -57,9 +60,18 @@ <string name="effect_Husky"> Rauque </string> + <string name="effect_Husky Whisper"> + Murmure rauque + </string> <string name="effect_Intercom"> Interphone </string> + <string name="effect_Julia"> + Julia + </string> + <string name="effect_Lo Lilt"> + Mélodieux + </string> <string name="effect_Macho"> Macho </string> @@ -69,6 +81,9 @@ <string name="effect_Mini"> Mini </string> + <string name="effect_Model"> + Modèle + </string> <string name="effect_Nano"> Nano </string> @@ -90,6 +105,9 @@ <string name="effect_Roxanne"> Roxanne </string> + <string name="effect_Rumble"> + Grondement + </string> <string name="effect_Sabrina"> Sabrina </string> @@ -102,6 +120,9 @@ <string name="effect_Shorty"> Petite voix </string> + <string name="effect_Smaller"> + Plus faible + </string> <string name="effect_Sneaky"> Sournois </string> diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml index 4abc74880f..59dcff9075 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml @@ -59,6 +59,7 @@ <menu_item_call label="Propriétés" name="Properties"/> <menu_item_call label="Renommer" name="Rename"/> <menu_item_call label="Copier l'UUID (identifiant universel unique)" name="Copy Asset UUID"/> + <menu_item_call label="Couper" name="Cut"/> <menu_item_call label="Copier" name="Copy"/> <menu_item_call label="Coller" name="Paste"/> <menu_item_call label="Coller comme lien" name="Paste As Link"/> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 3ea863131a..3c3d4f5f69 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -21,6 +21,7 @@ <menu_item_call label="Occupé" name="Set Busy"/> </menu> <menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/> + <menu_item_call label="Boîte d'envoi vendeur..." name="MerchantOutbox"/> <menu_item_call label="Page d'accueil du compte..." name="Manage My Account"> <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/> </menu_item_call> @@ -393,9 +394,16 @@ <menu_item_check label="Textures HTTP" name="HTTP Textures"/> <menu_item_check label="Inventaire HTTP" name="HTTP Inventory"/> <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 label="Définir le niveau de connexion" name="Set Logging Level"/> + <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"/> + <menu_item_check label="Avertissement" name="Warning"/> + <menu_item_check label="Erreur" name="Error"/> + <menu_item_check label="Aucun" name="None"/> + </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_check label="Afficher le menu Admin" name="View Admin Options"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index f2dd02a495..746a4b1d55 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -669,7 +669,7 @@ Assurez-vous que le fichier a l'extension correcte. Impossible de créer le fichier de sortie : [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - Actuellement, [APP_NAME] ne prend pas en charge le chargement de lots de fichiers d'animation. + Actuellement, [APP_NAME] ne prend pas en charge le chargement par lot de fichiers d'animation au format BVH. </notification> <notification name="CannotUploadReason"> Impossible de charger [FILE] suite au problème suivant : [REASON] @@ -2630,16 +2630,16 @@ Accepter cette requête ? <nolink>[TITLE]</nolink> de [NAME] [MESSAGE] <form name="form"> - <button name="Mute" text="Ignorer"/> - <button name="Ignore" text="Ignorer"/> + <button name="Client_Side_Mute" text="Bloquer"/> + <button name="Client_Side_Ignore" text="Ignorer"/> </form> </notification> <notification name="ScriptDialogGroup"> <nolink>[TITLE]</nolink> de [GROUPNAME] [MESSAGE] <form name="form"> - <button name="Mute" text="Ignorer"/> - <button name="Ignore" text="Ignorer"/> + <button name="Client_Side_Mute" text="Bloquer"/> + <button name="Client_Side_Ignore" text="Ignorer"/> </form> </notification> <notification name="BuyLindenDollarSuccess"> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml index 00bd6e81ae..b02e53269b 100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="nearby_chat"> - <check_box label="Traduire le chat" name="translate_chat_checkbox"/> + <layout_stack name="stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Traduire le chat" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> </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 c0d59a3182..ba36a7d299 100644 --- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml @@ -15,7 +15,7 @@ <panel.string name="buycurrencylabel"> [AMT] L$ </panel.string> - <panel name="balance_bg"> + <panel left="-405" name="balance_bg" width="195"> <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="Achats" name="goShop" tool_tip="Ouvrir la Place du marché Second Life." width="75"/> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml index cdb15a632d..1b9c832679 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml @@ -14,7 +14,7 @@ <text name="inbox_fresh_new_count"> [NUM] nouv. </text> - <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <panel name="inbox_inventory_placeholder_panel" tool_tip="Glisser-déposer des articles dans votre inventaire pour les utiliser."> <text name="inbox_inventory_placeholder"> Ici seront livrés les achats effectués sur la Place du marché. </text> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index a0c542d524..8b410128da 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -835,6 +835,9 @@ Veuillez réessayer de vous connecter dans une minute. <string name="anim_yes_head"> Oui </string> + <string name="multiple_textures"> + Multiples + </string> <string name="texture_loading"> Chargement... </string> @@ -1235,7 +1238,7 @@ Veuillez réessayer de vous connecter dans une minute. Vous n'avez pas de copie de cette texture dans votre inventaire </string> <string name="InventoryInboxNoItems"> - Certains articles reçus, tels que les cadeaux Premium, s'afficheront ici. Vous pourrez alors les faire glisser vers votre inventaire. + Les achats que vous avez effectués sur la Place du marché s'affichent ici. Vous pouvez alors les faire glisser vers votre inventaire afin de les utiliser. </string> <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ @@ -3921,6 +3924,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. <string name="Saved_message"> (Enregistrement : [LONG_TIMESTAMP]) </string> + <string name="IM_unblock_only_groups_friends"> + Pour afficher ce message, vous devez désactiver la case Seuls mes amis et groupes peuvent m'appeler ou m'envoyer un IM, sous Préférences/Confidentialité. + </string> <string name="answered_call"> Votre appel a fait l'objet d'une réponse </string> @@ -4503,7 +4509,7 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles Backsp </string> <string name="Shift"> - Shift + Maj </string> <string name="Ctrl"> Ctrl diff --git a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml new file mode 100644 index 0000000000..a2bce00141 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Anim Preview" title="ANIMATION.ANIM"> + <text name="name_label"> + Nome: + </text> + <text name="description_label"> + Descrizione: + </text> + <button label="Carica ([AMOUNT] L$)" name="ok_btn"/> + <button label="Annulla" label_selected="Annulla" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml new file mode 100644 index 0000000000..a4319f2e77 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Animation Preview"> + <floater.string name="failed_to_initialize"> + Movimento non inizializzato + </floater.string> + <floater.string name="anim_too_long"> + La lunghezza del file di animazione è di [LENGTH] secondi. + +La lunghezza massima dell'animazione è [MAX_LENGTH] secondi. + </floater.string> + <floater.string name="failed_file_read"> + Impossibile leggere il file di animazione. + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + Ok + </floater.string> + <floater.string name="E_ST_EOF"> + Fine prematura del file. + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + Impossibile leggere la definizione del vincolo. + </floater.string> + <floater.string name="E_ST_NO_FILE"> + Impossibile aprire il file BVH. + </floater.string> + <floater.string name="E_ST_NO_HIER"> + Intestazione HIERARCHY non valida. + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + Impossibile trovare la ROOT o JOINT. + </floater.string> + <floater.string name="E_ST_NO_NAME"> + Impossibile trovare il nome JOINT. + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + Impossibile trovare OFFSET. + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + Impossibile trovare CHANNELS. + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + Impossibile ottenere un ordine di rotazione. + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + Rotazione dell'asse non disponibile. + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + Impossibile trovare MOTION. + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + Impossibile ottenere il numero dei frame. + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + Impossibile ottenere il tempo del frame. + </floater.string> + <floater.string name="E_ST_NO_POS"> + Impossibile ottenere i valori della posizione. + </floater.string> + <floater.string name="E_ST_NO_ROT"> + Impossibile ottenere i valori di rotazione. + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + Impossibile aprire il file di traduzione. + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + Impossibile leggere l'intestazione della traduzione. + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + Impossibile leggere i nomi della traduzione. + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + Impossibile leggere la traduzione, ignora il valore. + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + Impossibile leggere la traduzione del valore relativo. + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + Valore non trovato. + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + Impossibile leggere la matrice di traduzione. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + Impossibile trovare il nome mergechild. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + Impossibile ottenere il nome mergeparent. + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + Impossibile ottenere il valore di priorità. + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + Impossibile ottenere il valore di ripetizione. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + Impossibile ottenere i valori easeIn. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + Cannot get ease Out values. + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + Impossibile ottenere il valore morph della mano. + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + Impossibile leggere il nome emote. + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Nome non corretto del root joint, usa "hip". + </floater.string> + <text name="name_label"> + Nome: + </text> + <text name="description_label"> + Descrizione: + </text> + <spinner label="Priorità" name="priority" tool_tip="Definisce quali altre animazioni possono essere sostituite da questa animazione"/> + <check_box label="Ripetizione" name="loop_check" tool_tip="Riproduce questa animazione in ripetizione"/> + <spinner label="Dentro(%)" name="loop_in_point" tool_tip="Imposta il punto sul quale ritorna l'animazione"/> + <spinner label="Fuori(%)" name="loop_out_point" tool_tip="Imposta il punto sul quale termina l'animazione"/> + <text name="hand_label"> + Posa delle mani + </text> + <combo_box name="hand_pose_combo" tool_tip="Definisce ciò che fanno le mani durante l'animazione"> + <combo_box.item label="Estese" name="Spread"/> + <combo_box.item label="Rilassate" name="Relaxed"/> + <combo_box.item label="Indicano entrambe" name="PointBoth"/> + <combo_box.item label="Pugno" name="Fist"/> + <combo_box.item label="Sinistra rilassata" name="RelaxedLeft"/> + <combo_box.item label="Indica sinistra" name="PointLeft"/> + <combo_box.item label="Pugno con la sinistra" name="FistLeft"/> + <combo_box.item label="Destra rilassata" name="RelaxedRight"/> + <combo_box.item label="Indica destra" name="PointRight"/> + <combo_box.item label="Pugno destro" name="FistRight"/> + <combo_box.item label="Saluta a destra" name="SaluteRight"/> + <combo_box.item label="Battitura" name="Typing"/> + <combo_box.item label="Pace a destra" name="PeaceRight"/> + </combo_box> + <text name="emote_label"> + Espressione + </text> + <combo_box name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l'animazione"> + <item label="(Nulla)" name="[None]" value=""/> + <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> + <item label="Spavento" name="Afraid" value="Spavento"/> + <item label="Arrabbiato" name="Angry" value="Arrabbiato"/> + <item label="Grande sorriso" name="BigSmile" value="Grande sorriso"/> + <item label="Annoiato" name="Bored" value="Annoiato"/> + <item label="Pianto" name="Cry" value="Pianto"/> + <item label="Disdegno" name="Disdain" value="Disdegno"/> + <item label="Imbarazzato" name="Embarrassed" value="Imbarazzato"/> + <item label="Accigliato" name="Frown" value="Accigliato"/> + <item label="Bacio" name="Kiss" value="Bacio"/> + <item label="Risata" name="Laugh" value="Risata"/> + <item label="Linguaccia" name="Plllppt" value="Linguaccia"/> + <item label="Repulsione" name="Repulsed" value="Repulsione"/> + <item label="Triste" name="Sad" value="Triste"/> + <item label="Scrollata di spalle" name="Shrug" value="Scrollata di spalle"/> + <item label="Sorriso" name="Smile" value="Sorriso"/> + <item label="Stupore" name="Surprise" value="Stupore"/> + <item label="Occhiolino" name="Wink" value="Occhiolino"/> + <item label="Preoccupato" name="Worry" value="Preoccupato"/> + </combo_box> + <text name="preview_label"> + Anteprima mentre + </text> + <combo_box name="preview_base_anim" tool_tip="Prova il comportamento dell'animazione mentre l'avatar esegue attività comuni."> + <item label="In piedi" name="Standing" value="In piedi"/> + <item label="Camminare" name="Walking" value="Camminare"/> + <item label="Seduto" name="Sitting" value="Seduto"/> + <item label="Volare" name="Flying" value="Volare"/> + </combo_box> + <spinner label="Transizione in ingresso (sec)" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni"/> + <spinner label="Transizione in uscita (sec)" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni"/> + <button name="play_btn" tool_tip="Riproduci la tua animazione"/> + <button name="pause_btn" tool_tip="Metti in pausa la tua animazione"/> + <button name="stop_btn" tool_tip="Interrompi la riproduzione dell'animazione"/> + <text name="bad_animation_text"> + Impossibile leggere il file di animazione. + +Consigliamo file BVH esportati da Poser 4. + </text> + <button label="Carica ([AMOUNT] L$)" name="ok_btn"/> + <button label="Annulla" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_model_wizard.xml b/indra/newview/skins/default/xui/it/floater_model_wizard.xml deleted file mode 100644 index ab5fdb29e4..0000000000 --- a/indra/newview/skins/default/xui/it/floater_model_wizard.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="PROCEDURA GUIDATA CARICA MODELLO"> - <button label="5. Carica sul server" name="upload_btn"/> - <button label="4. Rivedi" name="review_btn"/> - <button label="3. Fisica" name="physics_btn"/> - <button label="2. Ottimizza" name="optimize_btn"/> - <button label="1. Seleziona file" name="choose_file_btn"/> - <panel name="choose_file_panel"> - <panel name="choose_file_header_panel"> - <text name="choose_file_header_text"> - Seleziona file modello - </text> - </panel> - <panel name="choose_file_content"> - <text name="advanced_users_text"> - Utenti avanzati: Gli utenti che hanno dimestichezza con gli strumenti di creazione 3D possono usare le opzioni di caricamento avanzate. - </text> - <button label="Passa a modalità avanzata" name="switch_to_advanced"/> - <text name="Cache location"> - Scegli il file del modello da caricare - </text> - <button label="Sfoglia..." label_selected="Sfoglia..." name="browse"/> - <text name="Model types"> - Second Life supporta file COLLADA (.dae) - </text> - <text name="dimensions"> - X Y Z - </text> - <text name="warning_label"> - ATTENZIONE: - </text> - <text name="warning_text"> - Non sarà possibile completare il passaggio finale per il caricamento finale di questo modello sui server di Second Life. [secondlife:///app/floater/learn_more Scopri come] impostare l'account per il caricamento di modelli con reticolo. - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> - Ottimizza modello - </text> - </panel> - <text name="optimize_description"> - Abbiamo ottimizzato il modello per migliorare le prestazioni. Se necessario, può essere regolato ulteriormente. - </text> - <panel name="optimize_content"> - <text name="high_detail_text"> - Genera livello di dettaglio: Alto - </text> - <text name="medium_detail_text"> - Genera livello di dettaglio: Medio - </text> - <text name="low_detail_text"> - Genera livello di dettaglio: Basso - </text> - <text name="lowest_detail_text"> - Genera livello di dettaglio: Bassissimo - </text> - </panel> - <panel name="content2"> - <button label="Ricalcola geometria" name="recalculate_geometry_btn"/> - <text name="lod_label"> - Anteprima geometria - </text> - <combo_box name="preview_lod_combo" tool_tip="Livello di dettaglio per anteprima rendering"> - <combo_item name="high"> - Molti dettagli - </combo_item> - <combo_item name="medium"> - Dettagli medi - </combo_item> - <combo_item name="low"> - Meno dettagli - </combo_item> - <combo_item name="lowest"> - Dettaglio minimo - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> - Modifica fisica - </text> - </panel> - <text name="physics_description"> - Verrà creata una forma per lo scafo esterno del modello. Regola il livello di dettaglio della forma in base al fine desiderato del modello. - </text> - <panel name="physics_content"> - <button label="Ricalcola fisica" name="recalculate_physics_btn"/> - <button label="Ricalcolo in corso..." name="recalculating_physics_btn"/> - <text name="lod_label"> - Anteprima fisica - </text> - <combo_box name="preview_lod_combo2" tool_tip="Livello di dettaglio per anteprima rendering"> - <combo_item name="high"> - Molti dettagli - </combo_item> - <combo_item name="medium"> - Dettagli medi - </combo_item> - <combo_item name="low"> - Meno dettagli - </combo_item> - <combo_item name="lowest"> - Dettaglio minimo - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> - Rivedi - </text> - </panel> - <panel name="review_content"> - <text name="review_prim_equiv"> - Impatto sul lotto o sulla regione: [EQUIV] prim equivalenti - </text> - <text name="review_fee"> - All'account verrà accreditata una tariffa di caricamento pari a L$ [FEE]. - </text> - <text name="review_confirmation"> - Facendo clic sul pulsante Carica, confermi di possedere i diritti relativi ai materiali contenuti nel modello. - </text> - </panel> - </panel> - <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> - Caricamento completato - </text> - </panel> - <text name="model_uploaded_text"> - Il modello è stato caricato. - </text> - <text name="inventory_text"> - Puoi trovarlo nella cartella Oggetti nel tuo inventario. - </text> - <text name="charged_fee"> - La somma di L$ [FEE] è stata addebitata sul tuo account. - </text> - </panel> - <button label="<< Indietro" name="back"/> - <button label="Avanti >>" name="next"/> - <button label="Calcolare pesi e tariffa >>" name="calculate"/> - <button label="Calcolo in corso..." name="calculating"/> - <button label="Carica" name="upload" tool_tip="Carica al simulatore"/> - <button label="Annulla" name="cancel"/> - <button label="Chiudi" name="close"/> - <spinner name="import_scale" value="1.0"/> - <string name="status_idle"> - Pausa - </string> - <string name="status_parse_error"> - Problema nell'elaborazione DAE - vedi il registro per informazioni al riguardo. - </string> - <string name="status_reading_file"> - Caricamento in corso... - </string> - <string name="status_generating_meshes"> - Generazione reticoli... - </string> - <string name="status_vertex_number_overflow"> - Errore: numero di vertici maggiore di 65534, annullato. - </string> - <string name="bad_element"> - Errore: elemento non valido - </string> - <string name="high"> - Alto - </string> - <string name="medium"> - Medio - </string> - <string name="low"> - Basso - </string> - <string name="lowest"> - Bassissimo - </string> - <string name="mesh_status_good"> - Invia! - </string> - <string name="mesh_status_na"> - N/D - </string> - <string name="mesh_status_none"> - Nessuno - </string> - <string name="mesh_status_submesh_mismatch"> - Ai vari livelli del dettaglio corrispondono numeri diversi di faccette con texture. - </string> - <string name="mesh_status_mesh_mismatch"> - Ai vari livelli del dettaglio corrispondono numeri diversi istanze di reticoli. - </string> - <string name="mesh_status_too_many_vertices"> - Troppi vertici per il livello di dettaglio. - </string> - <string name="mesh_status_missing_lod"> - Livello di dettaglio minimo mancante. - </string> - <string name="layer_all"> - Tutto - </string> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml index 73082c9526..ed609c70fa 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Descrizione: </text> - <button label="Riproduci in Second Life" label_selected="Ferma" left="20" name="Anim play btn" tool_tip="Riproduci questa animazione così che gli altri possano vederla" width="131"/> - <button label="Esegui localmente" label_selected="Ferma" left="162" name="Anim audition btn" tool_tip="Riproduci questa animazione così che solo tu possa vederla" width="125"/> + <button label="Riproduci in Second Life" label_selected="Ferma" name="Inworld" tool_tip="Riproduci questa animazione così che gli altri possano vederla"/> + <button label="Riproduci localmente" label_selected="Ferma" name="Locally" tool_tip="Riproduci questa animazione così che solo tu possa vederla"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml new file mode 100644 index 0000000000..23da6f7588 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Test Floater" title="FINESTRA DI TEST"/> diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml index 0d981e2424..c963ac72e6 100644 --- a/indra/newview/skins/default/xui/it/floater_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_tools.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="toolbox floater" short_title="STRUMENTI PER COSTRUZIONE"> + <floater.string name="grid_screen_text"> + Schermo + </floater.string> + <floater.string name="grid_local_text"> + Locale + </floater.string> + <floater.string name="grid_world_text"> + Mondo + </floater.string> + <floater.string name="grid_reference_text"> + Riferimento + </floater.string> + <floater.string name="grid_attachment_text"> + Allegato + </floater.string> <floater.string name="status_rotate"> Sposta le fasce colorate per ruotare l'oggetto </floater.string> @@ -63,7 +78,12 @@ </text> <check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/> <check_box initial_value="true" label="Scatto" name="checkbox snap to grid"/> - <button label="Opzioni..." label_selected="Opzioni..." name="Options..." tool_tip="Vedi più opzioni della griglia"/> + <combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l'oggetto"> + <combo_box.item label="Mondo" name="World"/> + <combo_box.item label="Locale" name="Local"/> + <combo_box.item label="Riferimento" name="Reference"/> + </combo_box> + <button label="" label_selected="Opzioni..." name="Options..." tool_tip="Vedi più opzioni della griglia"/> <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/> <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="Piramide"/> diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml index a0e49525ea..c83b11f698 100644 --- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml @@ -42,13 +42,16 @@ <string name="effect_Demon"> Demonio </string> + <string name="effect_Female Elf"> + Elfo donna + </string> <string name="effect_Flirty"> Civettuolo </string> <string name="effect_Foxy"> Scaltro </string> - <string name="effect_Halloween_2010_Bonus"> + <string name="effect_Halloween 2010 Bonus"> Halloween_2010_Bonus </string> <string name="effect_Helium"> @@ -57,9 +60,18 @@ <string name="effect_Husky"> Fusto </string> + <string name="effect_Husky Whisper"> + Sospiro rauco + </string> <string name="effect_Intercom"> Interfono </string> + <string name="effect_Julia"> + Julia + </string> + <string name="effect_Lo Lilt"> + Inflessione bassa + </string> <string name="effect_Macho"> Macho </string> @@ -69,6 +81,9 @@ <string name="effect_Mini"> Mini </string> + <string name="effect_Model"> + Modella + </string> <string name="effect_Nano"> Nano </string> @@ -90,6 +105,9 @@ <string name="effect_Roxanne"> Rosanna </string> + <string name="effect_Rumble"> + Rombo + </string> <string name="effect_Sabrina"> Sabrina </string> @@ -102,6 +120,9 @@ <string name="effect_Shorty"> Bassotto </string> + <string name="effect_Smaller"> + Più piccolo + </string> <string name="effect_Sneaky"> Vile </string> diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml index fc3a82a959..4bf6be82fd 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory.xml @@ -59,6 +59,7 @@ <menu_item_call label="Proprietà" name="Properties"/> <menu_item_call label="Rinomina" name="Rename"/> <menu_item_call label="Copia UUID dell'oggetto" name="Copy Asset UUID"/> + <menu_item_call label="Taglia" name="Cut"/> <menu_item_call label="Copia" name="Copy"/> <menu_item_call label="Incolla" name="Paste"/> <menu_item_call label="Incolla come link" name="Paste As Link"/> diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index dee1634a1b..99b7e3c4e6 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -21,6 +21,7 @@ <menu_item_call label="Non disponibile" name="Set Busy"/> </menu> <menu_item_call label="Acquista L$..." name="Buy and Sell L$"/> + <menu_item_call label="Casella venditore in uscita..." name="MerchantOutbox"/> <menu_item_call label="Dashboard dell'account..." name="Manage My Account"> <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=it"/> </menu_item_call> @@ -334,8 +335,15 @@ </menu> <menu_item_check label="Texture HTTP" name="HTTP Textures"/> <menu_item_check label="Inventario HTTP" name="HTTP Inventory"/> + <menu_item_call label="Attiva Visual Leak Detector" name="Enable Visual Leak Detector"/> <menu_item_check label="Finestra Console al prossimo lancio" name="Console Window"/> - <menu label="Imposta livello di registrazione" name="Set Logging Level"/> + <menu label="Imposta livello di registrazione" name="Set Logging Level"> + <menu_item_check label="Debug" name="Debug"/> + <menu_item_check label="Informazioni" name="Info"/> + <menu_item_check label="Attenzione" name="Warning"/> + <menu_item_check label="Errore" name="Error"/> + <menu_item_check label="Nessuno" name="None"/> + </menu> <menu_item_call label="Richiedi diritti Admin" name="Request Admin Options"/> <menu_item_call label="Lascia stato Admin" name="Leave Admin Options"/> <menu_item_check label="Mostra menu Admin" name="View Admin Options"/> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 24e8fd6274..0e6fee60d1 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -668,7 +668,7 @@ Attese [VALIDS] Impossibile creare il file in uscita: [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - [APP_NAME] non supporta ancora il caricamento in blocco di file di animazione. + [APP_NAME] non supporta ancora il caricamento in blocco di file di animazione in formato BVH. </notification> <notification name="CannotUploadReason"> Impossibile importare il file [FILE] a causa del seguente motivo: [REASON] @@ -2632,16 +2632,16 @@ Concedi questa richiesta? '<nolink>[TITLE]</nolink>' di [NAME] [MESSAGE] <form name="form"> - <button name="Mute" text="Blocca"/> - <button name="Ignore" text="Ignora"/> + <button name="Client_Side_Mute" text="Blocca"/> + <button name="Client_Side_Ignore" text="Ignora"/> </form> </notification> <notification name="ScriptDialogGroup"> '<nolink>[TITLE]</nolink>' di [GROUPNAME] [MESSAGE] <form name="form"> - <button name="Mute" text="Blocca"/> - <button name="Ignore" text="Ignora"/> + <button name="Client_Side_Mute" text="Blocca"/> + <button name="Client_Side_Ignore" text="Ignora"/> </form> </notification> <notification name="BuyLindenDollarSuccess"> diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml index 1b529e2737..d46a15c735 100644 --- a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="nearby_chat"> - <check_box label="Traduci chat" name="translate_chat_checkbox"/> + <layout_stack name="stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Traduci chat" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml index 4abc90113f..0aaf89d8c8 100644 --- a/indra/newview/skins/default/xui/it/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml @@ -15,7 +15,7 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <panel name="balance_bg"> + <panel left="-405" name="balance_bg" width="195"> <text name="balance" tool_tip="Clicca per aggiornare il tuo saldo in L$" value="L$ 20"/> <button label="Acquista L$" name="buyL" tool_tip="Clicca per acquistare più L$"/> <button label="Acquisti" name="goShop" tool_tip="Apri Mercato Second Life" width="75"/> diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml index f5c00f432b..5ac0961bd7 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml @@ -14,7 +14,7 @@ <text name="inbox_fresh_new_count"> [NUM] nuovi </text> - <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <panel name="inbox_inventory_placeholder_panel" tool_tip="Trascina gli elementi nell'inventario per usarli"> <text name="inbox_inventory_placeholder"> Gli acquisti dal mercato verranno consegnati qui. </text> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 29bfab5f0d..8529fadd7d 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -829,6 +829,9 @@ Prova ad accedere nuovamente tra un minuto. <string name="anim_yes_head"> Si </string> + <string name="multiple_textures"> + Multiple + </string> <string name="texture_loading"> Caricamento in corso... </string> @@ -1226,7 +1229,7 @@ Prova ad accedere nuovamente tra un minuto. Non hai una copia di questa texture nel tuo inventario </string> <string name="InventoryInboxNoItems"> - Alcuni elementi che riceverai, come ad esempio gli omaggi per l'abbonamento Premium, verranno mostrati qui. Potrai quindi trascinarli nel tuo inventario. + Gli acquissti dal mercato verranno mostrati qui. Potrai quindi trascinarli nel tuo inventario per usarli. </string> <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ @@ -3843,6 +3846,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. <string name="Saved_message"> (Salvato [LONG_TIMESTAMP]) </string> + <string name="IM_unblock_only_groups_friends"> + Per vedere questo messaggio, devi deselezionare 'Solo amici e gruppi possono chiamarmi o mandarmi IM' in Preferenze/Privacy. + </string> <string name="answered_call"> Risposto alla chiamata </string> diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml new file mode 100644 index 0000000000..2bada303ae --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Anim Preview" title="ANIMATION.ANIM"> + <text name="name_label"> + 名前： + </text> + <text name="description_label"> + 説明： + </text> + <button label="アップロード（L$[AMOUNT]）" name="ok_btn"/> + <button label="取り消し" label_selected="取り消し" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml new file mode 100644 index 0000000000..f74bab3598 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Animation Preview"> + <floater.string name="failed_to_initialize"> + 動きを初期化できませんでした + </floater.string> + <floater.string name="anim_too_long"> + アニメーションファイルの長さは [LENGTH] 秒です。 + +アニメーションの最大長は [MAX_LENGTH] 秒です。 + </floater.string> + <floater.string name="failed_file_read"> + アニメーションファイルを読み取れません。 + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + Ok + </floater.string> + <floater.string name="E_ST_EOF"> + ファイルの終端が不完全です。 + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + 制約定義を読み取れません。 + </floater.string> + <floater.string name="E_ST_NO_FILE"> + BVH ファイルを開けません。 + </floater.string> + <floater.string name="E_ST_NO_HIER"> + HIERARCHY ヘッダーが無効です。 + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + ROOT または JOINT が見つかりません。 + </floater.string> + <floater.string name="E_ST_NO_NAME"> + JOINT 名を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + OFFSET が見つかりません。 + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + CHANNELS が見つかりません。 + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + 回転順序を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + 回転軸を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + MOTION が見つかりません。 + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + フレーム数を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + フレーム時間を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_POS"> + 位置の値を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_ROT"> + 回転値を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + 変換ファイルを開けません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + 変換ヘッダーを読み取れません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + 変換名を読み取れません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + 変換無視値を読み取れません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + 変換相対値を読み取れません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + 変換 outname 値を読み取れません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + 変換行列を読み取れません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + Mergechild 名を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + Mergeparent 名を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + priority 値を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + loop 値を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + easeln 値を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + easeOut 値を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + Hand morph 値を取得できません。 + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + emote 名を読みとれません。 + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + ルートジョイント名が不正です。「hip」を使用してください。 + </floater.string> + <text name="name_label"> + 名前： + </text> + <text name="description_label"> + 説明： + </text> + <spinner label="優先度" name="priority" tool_tip="このアニメーションでどのアニメーションを上書きできるかを決めます"/> + <check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生にします"/> + <spinner label="イン（％）" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します"/> + <spinner label="アウト（％）" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します"/> + <text name="hand_label"> + 手のポーズ + </text> + <combo_box name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます"> + <combo_box.item label="広げる" name="Spread"/> + <combo_box.item label="リラックス" name="Relaxed"/> + <combo_box.item label="指を指す・両手" name="PointBoth"/> + <combo_box.item label="拳" name="Fist"/> + <combo_box.item label="リラックス・左" name="RelaxedLeft"/> + <combo_box.item label="指を指す・左" name="PointLeft"/> + <combo_box.item label="拳を上げる・左" name="FistLeft"/> + <combo_box.item label="リラックス・右" name="RelaxedRight"/> + <combo_box.item label="指を指す・右" name="PointRight"/> + <combo_box.item label="拳を上げる・右" name="FistRight"/> + <combo_box.item label="敬礼・右" name="SaluteRight"/> + <combo_box.item label="タイピング" name="Typing"/> + <combo_box.item label="ピース・右" name="PeaceRight"/> + </combo_box> + <text name="emote_label"> + 表情 + </text> + <combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます"> + <item label="（なし）" name="[None]" value=""/> + <item label="アーーーーー" name="Aaaaah" value="アーーーーー"/> + <item label="恐れる" name="Afraid" value="恐れる"/> + <item label="怒る" name="Angry" value="怒る"/> + <item label="満面の笑み" name="BigSmile" value="満面の笑み"/> + <item label="退屈" name="Bored" value="退屈"/> + <item label="泣く" name="Cry" value="泣く"/> + <item label="軽蔑" name="Disdain" value="軽蔑"/> + <item label="恥ずかしがる" name="Embarrassed" value="恥ずかしがる"/> + <item label="しかめっ面" name="Frown" value="しかめっ面"/> + <item label="キス" name="Kiss" value="キス"/> + <item label="笑う" name="Laugh" value="笑う"/> + <item label="むかつく" name="Plllppt" value="むかつく"/> + <item label="嫌悪感" name="Repulsed" value="嫌悪感"/> + <item label="悲しい" name="Sad" value="悲しい"/> + <item label="肩をすくめる" name="Shrug" value="肩をすくめる"/> + <item label="微笑む" name="Smile" value="微笑む"/> + <item label="驚く" name="Surprise" value="驚く"/> + <item label="ウィンク" name="Wink" value="ウィンク"/> + <item label="心配する" name="Worry" value="心配する"/> + </combo_box> + <text name="preview_label"> + プレビュー中の動作 + </text> + <combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。"> + <item label="立つ" name="Standing" value="立つ"/> + <item label="歩く" name="Walking" value="歩く"/> + <item label="座る" name="Sitting" value="座る"/> + <item label="飛ぶ" name="Flying" value="飛ぶ"/> + </combo_box> + <spinner label="イーズイン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/> + <spinner label="イーズアウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/> + <button name="play_btn" tool_tip="アニメーションを再生する"/> + <button name="pause_btn" tool_tip="アニメーションを一時停止する"/> + <button name="stop_btn" tool_tip="アニメーションの再生を停止する"/> + <text name="bad_animation_text"> + アニメーションファイルを読み取れません。 + +Poser 4 からエクスポートした BVH ファイルをお勧めします。 + </text> + <button label="アップロード（L$[AMOUNT]）" name="ok_btn"/> + <button label="取り消し" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml index 725214086a..c01c46211e 100644 --- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="item properties" title="持ち物アイテムのプロパティ"> +<floater name="item properties" title="インベントリアイテムのプロパティ"> <floater.string name="unknown"> (不明） </floater.string> @@ -24,11 +24,11 @@ <text name="LabelCreatorTitle"> クリエーター </text> - <button label="情報" label_selected="" name="BtnCreator"/> + <button label="プロフィール..." label_selected="" name="BtnCreator"/> <text name="LabelOwnerTitle"> オーナー： </text> - <button label="情報" label_selected="" name="BtnOwner"/> + <button label="プロフィール..." label_selected="" name="BtnOwner"/> <text name="LabelAcquiredTitle"> 入手日時： </text> diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml index 47d57da031..af96edda79 100644 --- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Inventory Finder" title="最近取得した持ち物アイテム"> +<floater name="Inventory Finder" title="インベントリ最近取得したアイテム"> <check_box label="アニメーション" name="check_animation"/> <check_box label="コーリング・カード" name="check_calling_card"/> <check_box label="服" name="check_clothing"/> diff --git a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml deleted file mode 100644 index 270031a33e..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="モデルウィザードをアップロード"> - <button label="5. アップロード" name="upload_btn"/> - <button label="4. 確認" name="review_btn"/> - <button label="3. 物理効果" name="physics_btn"/> - <button label="2. 最適化" name="optimize_btn"/> - <button label="1. ファイルを選択" name="choose_file_btn"/> - <panel name="choose_file_panel"> - <panel name="choose_file_header_panel"> - <text name="choose_file_header_text"> - モデルファイルを選択 - </text> - </panel> - <panel name="choose_file_content"> - <text name="advanced_users_text"> - 上級ユーザーの場合：3D コンテンツ制作ツールの使用に慣れている方は、高度なアップローダーもお試しください。 - </text> - <button label="アドバンスモードに切り替える" name="switch_to_advanced"/> - <text name="Cache location"> - アップロードするモデルファイルを選択 - </text> - <button label="参照..." label_selected="参照..." name="browse"/> - <text name="Model types"> - Second Life は COLLADA (.dae) ファイルをサポートします。 - </text> - <text name="dimensions"> - X Y Z - </text> - <text name="warning_label"> - 警告： - </text> - <text name="warning_text"> - このモデルを Second Life サーバーにアップロードするための最終手順を実行できません。[secondlife:///app/floater/learn_more こちらを参照して]、メッシュモデルをアップロードできるようにアカウントを設定してください。 - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> - モデルを最適化 - </text> - </panel> - <text name="optimize_description"> - モデルはパフォーマンスを重視して最適化されています。必要に応じて調整してください。 - </text> - <panel name="optimize_content"> - <text name="high_detail_text"> - 次の描画詳細度を作成：高 - </text> - <text name="medium_detail_text"> - 次の描画詳細度を作成：中 - </text> - <text name="low_detail_text"> - 次の描画詳細度を作成：低 - </text> - <text name="lowest_detail_text"> - 次の描画詳細度を作成：最低 - </text> - </panel> - <panel name="content2"> - <button label="ジオメトリを再計算" name="recalculate_geometry_btn"/> - <text name="lod_label"> - ジオメトリのプレビュー - </text> - <combo_box name="preview_lod_combo" tool_tip="プレビュー表示の LOD 設定"> - <combo_item name="high"> - 高い詳細度 - </combo_item> - <combo_item name="medium"> - 中の詳細度 - </combo_item> - <combo_item name="low"> - 低い詳細度 - </combo_item> - <combo_item name="lowest"> - 最低の詳細度 - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> - 物理作用の調整 - </text> - </panel> - <text name="physics_description"> - モデルの外殻構造のシェイプは弊社が作成します。モデルの目的に応じてシェイプの詳細度を調整してください。 - </text> - <panel name="physics_content"> - <button label="物理作用を再計算" name="recalculate_physics_btn"/> - <button label="再計算中..." name="recalculating_physics_btn"/> - <text name="lod_label"> - 物理作用のプレビュー - </text> - <combo_box name="preview_lod_combo2" tool_tip="プレビュー表示の LOD 設定"> - <combo_item name="high"> - 高い詳細度 - </combo_item> - <combo_item name="medium"> - 中の詳細度 - </combo_item> - <combo_item name="low"> - 低い詳細度 - </combo_item> - <combo_item name="lowest"> - 最低の詳細度 - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> - 確認 - </text> - </panel> - <panel name="review_content"> - <text name="review_prim_equiv"> - 区画/リージョンへの負荷：[EQUIV] プリム換算値 - </text> - <text name="review_fee"> - L$ [FEE] のアップロード料金があなたのアカウントに請求されます。 - </text> - <text name="review_confirmation"> - アップロードボタンをクリックすることにより、モデルに含まれるマテリアルの所有権や使用許可の所持を認めたことになります。 - </text> - </panel> - </panel> - <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> - アップロード完了 - </text> - </panel> - <text name="model_uploaded_text"> - モデルがアップロードされました。 - </text> - <text name="inventory_text"> - それは持ち物の「オブジェクト」フォルダにあります。 - </text> - <text name="charged_fee"> - あなたのアカウントに L$ [FEE] が請求されました。 - </text> - </panel> - <button label="<< 戻る" name="back"/> - <button label="次へ>>" name="next"/> - <button label="ウェイトと料金の計算 >>" name="calculate"/> - <button label="計算中..." name="calculating"/> - <button label="アップロード" name="upload" tool_tip="シミュレーターにアップロード"/> - <button label="取り消し" name="cancel"/> - <button label="閉じる" name="close"/> - <spinner name="import_scale" value="1.0"/> - <string name="status_idle"> - 待機状態 - </string> - <string name="status_parse_error"> - Dae に問題が見つかりました - 詳細についてはログをご参照ください。 - </string> - <string name="status_reading_file"> - ローディング... - </string> - <string name="status_generating_meshes"> - メッシュを作成中 - </string> - <string name="status_vertex_number_overflow"> - エラー：頂点の数が65534を超過したので中止されました。 - </string> - <string name="bad_element"> - エラー：要素が無効です - </string> - <string name="high"> - 高 - </string> - <string name="medium"> - 中 - </string> - <string name="low"> - 低 - </string> - <string name="lowest"> - 最低 - </string> - <string name="mesh_status_good"> - 発送 - </string> - <string name="mesh_status_na"> - 該当なし - </string> - <string name="mesh_status_none"> - なし - </string> - <string name="mesh_status_submesh_mismatch"> - テクスチャ編集可能な面の数は描画詳細度に応じて異なります。 - </string> - <string name="mesh_status_mesh_mismatch"> - メッシュインスタンスの数は描画詳細度に応じて異なります。 - </string> - <string name="mesh_status_too_many_vertices"> - 描画詳細度に対して頂点の数が多すぎます。 - </string> - <string name="mesh_status_missing_lod"> - 必要な描画詳細度が見つかりません。 - </string> - <string name="layer_all"> - 全て - </string> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml index c6a789b63b..d708fc3dec 100644 --- a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_my_inventory" title="持ち物"/> +<floater name="floater_my_inventory" title="インベントリ"/> diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml index 3bd9b6b069..d727a268fb 100644 --- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml @@ -6,7 +6,7 @@ <text name="objects_label" value="オブジェクト"/> <text name="prims" value="--"/> <text name="prims_label" value="プリム"/> - <text name="weights_of_selected_text" value="選択済み項目のウエイト"/> + <text name="weights_of_selected_text" value="選択済みアイテムのウエイト"/> <text name="download" value="--"/> <text name="download_label" value="ダウンロード"/> <text name="physics" value="--"/> diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml index bd1b650f98..af02ffedda 100644 --- a/indra/newview/skins/default/xui/ja/floater_openobject.xml +++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml @@ -3,6 +3,6 @@ <text name="object_name"> [DESC]: </text> - <button label="持ち物にコピー" label_selected="持ち物にコピー" name="copy_to_inventory_button"/> + <button label="インベントリにコピー" label_selected="インベントリにコピー" name="copy_to_inventory_button"/> <button label="コピーして装着" label_selected="コピーして装着" name="copy_and_wear_button"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml index 08bee88103..b180658ab7 100644 --- a/indra/newview/skins/default/xui/ja/floater_people.xml +++ b/indra/newview/skins/default/xui/ja/floater_people.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_people" title="人"> <panel_container name="main_panel"> - <panel label="グループ情報" name="panel_group_info_sidetray"/> + <panel label="グループプロフィール" name="panel_group_info_sidetray"/> <panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/> </panel_container> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml index 4fc59e16d3..a3042f66ea 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> 説明： </text> - <button label="インワールドで再生" label_selected="停止" name="Anim play btn" tool_tip="他人にも見えるように再生します"/> - <button label="ローカル再生" label_selected="停止" name="Anim audition btn" tool_tip="自分だけが見えるように再生します"/> + <button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人に見えるように再生"/> + <button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml index 6ea1d79cfc..4617fd1d92 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml @@ -4,7 +4,7 @@ テクスチャ： [NAME] </floater.string> <floater.string name="Copy"> - 持ち物にコピー + インベントリにコピー </floater.string> <text name="desc txt"> 説明： diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml index cf4732a68e..f145a2e8b8 100644 --- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml @@ -10,7 +10,7 @@ 投稿 </string> <string name="inventory_progress_str"> - 持ち物に保存 + インベントリに保存 </string> <string name="local_progress_str"> コンピュータに保存 @@ -22,7 +22,7 @@ メールが送信されました </string> <string name="inventory_succeeded_str"> - 持ち物に保存されました + インベントリに保存されました </string> <string name="local_succeeded_str"> コンピュータに保存されました @@ -34,7 +34,7 @@ メールを送信できませんでした。 </string> <string name="inventory_failed_str"> - 持ち物に保存できませんでした。 + インベントリに保存できませんでした。 </string> <string name="local_failed_str"> コンピュータに保存できませんでした。 diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml new file mode 100644 index 0000000000..40fd8e9f93 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Test Floater" title="テスト用ウィンドウ"/> diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index 8eddf55a44..2d12a5e56a 100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="toolbox floater" short_title="制作ツール" title=""> + <floater.string name="grid_screen_text"> + 画面 + </floater.string> + <floater.string name="grid_local_text"> + ローカル + </floater.string> + <floater.string name="grid_world_text"> + 世界 + </floater.string> + <floater.string name="grid_reference_text"> + リファレンス + </floater.string> + <floater.string name="grid_attachment_text"> + アタッチメント + </floater.string> <floater.string name="status_rotate"> 色の付いたバンドをドラッグしてオブジェクトを回転 </floater.string> @@ -63,7 +78,12 @@ </text> <check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/> <check_box initial_value="true" label="スナップ" name="checkbox snap to grid"/> - <button label="オプション..." label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示します"/> + <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択"> + <combo_box.item label="世界" name="World"/> + <combo_box.item label="ローカル" name="Local"/> + <combo_box.item label="リファレンス" name="Reference"/> + </combo_box> + <button label="" label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示します"/> <button label="" label_selected="" name="ToolCube" tool_tip="キューブ"/> <button label="" label_selected="" name="ToolPrism" tool_tip="プリズム"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド"/> diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml index 801b7a9db0..ee675e143b 100644 --- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml @@ -42,13 +42,16 @@ <string name="effect_Demon"> デーモン </string> + <string name="effect_Female Elf"> + 女性のエルフ + </string> <string name="effect_Flirty"> 気のありそうな </string> <string name="effect_Foxy"> 魅惑的 </string> - <string name="effect_Halloween_2010_Bonus"> + <string name="effect_Halloween 2010 Bonus"> ハロウィン_2010_ボーナス </string> <string name="effect_Helium"> @@ -57,9 +60,18 @@ <string name="effect_Husky"> ハスキー </string> + <string name="effect_Husky Whisper"> + スモーキーウィスパー + </string> <string name="effect_Intercom"> インターホン </string> + <string name="effect_Julia"> + ジュリア + </string> + <string name="effect_Lo Lilt"> + 軽快 + </string> <string name="effect_Macho"> マッチョ </string> @@ -69,6 +81,9 @@ <string name="effect_Mini"> ミニ </string> + <string name="effect_Model"> + モデル + </string> <string name="effect_Nano"> ナノ </string> @@ -90,6 +105,9 @@ <string name="effect_Roxanne"> ロクサン </string> + <string name="effect_Rumble"> + ランブル + </string> <string name="effect_Sabrina"> サブリナ </string> @@ -102,6 +120,9 @@ <string name="effect_Shorty"> チビ </string> + <string name="effect_Smaller"> + 小さめ + </string> <string name="effect_Sneaky"> コソコソ </string> diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml index a59f5659c4..d1893a0fc8 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml @@ -59,6 +59,7 @@ <menu_item_call label="プロパティ" name="Properties"/> <menu_item_call label="名前を変更する" name="Rename"/> <menu_item_call label="UUID をコピーする" name="Copy Asset UUID"/> + <menu_item_call label="カット" name="Cut"/> <menu_item_call label="コピー" name="Copy"/> <menu_item_call label="貼り付け" name="Paste"/> <menu_item_call label="リンクを貼り付ける" name="Paste As Link"/> diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml index 1f425df83c..f38dbc71a8 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="menu_gear_default"> - <menu_item_call label="新しい持ち物ウィンドウ" name="new_window"/> + <menu_item_call label="新しいインベントリウィンドウ" name="new_window"/> <menu_item_check label="名前で並べ替え" name="sort_by_name"/> <menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/> <menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name"/> diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml index e64f97fda5..c455204722 100644 --- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="menu_folder_gear"> <menu_item_call label="ランドマークを追加" name="add_landmark"/> <menu_item_call label="フォルダを追加" name="add_folder"/> - <menu_item_call label="商品を復元" name="restore_item"/> + <menu_item_call label="アイテムを復元" name="restore_item"/> <menu_item_call label="切り取り" name="cut"/> <menu_item_call label="コピー" name="copy_folder"/> <menu_item_call label="貼り付け" name="paste"/> diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml index f416b5b1f6..579f2c2cbd 100644 --- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="menu_ladmark_gear"> <menu_item_call label="テレポート" name="teleport"/> <menu_item_call label="もっと詳しく" name="more_info"/> <menu_item_call label="地図に表示" name="show_on_map"/> <menu_item_call label="ランドマークを追加" name="add_landmark"/> <menu_item_call label="フォルダを追加" name="add_folder"/> - <menu_item_call label="商品を復元" name="restore_item"/> + <menu_item_call label="アイテムを復元" name="restore_item"/> <menu_item_call label="切り取り" name="cut"/> <menu_item_call label="ランドマークをコピー" name="copy_landmark"/> <menu_item_call label="SLurl をコピー" name="copy_slurl"/> diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml index 7af2f9e2cd..147ab44a1b 100644 --- a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="持ち物アイテムを表示" name="show_item"/> + <menu_item_call label="インベントリアイテムを表示" name="show_item"/> <menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/> <menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index 4430ec054c..8496dfb1db 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -4,8 +4,8 @@ <menu_item_call label="プロフィール..." name="Profile"/> <menu_item_call label="容姿..." name="ChangeOutfit"/> <menu_item_call label="アバターを選択..." name="Avatar Picker"/> - <menu_item_check label="持ち物..." name="Inventory"/> - <menu_item_call label="新しい持ち物ウィンドウ" name="NewInventoryWindow"/> + <menu_item_check label="インベントリ..." name="Inventory"/> + <menu_item_call label="新しいインベントリウィンドウ" name="NewInventoryWindow"/> <menu_item_call label="場所..." name="Places"/> <menu_item_call label="ピック..." name="Picks"/> <menu_item_call label="カメラコントロール..." name="Camera Controls"/> @@ -21,6 +21,7 @@ <menu_item_call label="取り込み中" name="Set Busy"/> </menu> <menu_item_call label="L$ の購入..." name="Buy and Sell L$"/> + <menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/> <menu_item_call label="マイアカウント..." name="Manage My Account"> <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/> </menu_item_call> @@ -112,7 +113,7 @@ <menu_item_call label="買う" name="Menu Object Buy"/> <menu_item_call label="取る" name="Menu Object Take"/> <menu_item_call label="コピーを取る" name="Take Copy"/> - <menu_item_call label="「持ち物」に保存" name="Save Object Back to My Inventory"/> + <menu_item_call label="マイインベントリに保存" name="Save Object Back to My Inventory"/> <menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/> <menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/> </menu> @@ -337,7 +338,7 @@ <menu_item_call label="メディアブラウザのテスト" name="Web Browser Test"/> <menu_item_call label="Web コンテンツブラウザ" name="Web Content Browser"/> <menu_item_call label="SelectMgr をダンプ" name="Dump SelectMgr"/> - <menu_item_call label="持ち物の出力" name="Dump Inventory"/> + <menu_item_call label="インベントリの出力" name="Dump Inventory"/> <menu_item_call label="タイマーをダンプ" name="Dump Timers"/> <menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/> <menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/> @@ -391,11 +392,18 @@ <menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures"/> </menu> <menu_item_check label="HTTP Texture" name="HTTP Textures"/> - <menu_item_check label="HTTP 持ち物" name="HTTP Inventory"/> + <menu_item_check label="HTTP インベントリ" name="HTTP Inventory"/> <menu_item_call label="圧縮画像" name="Compress Images"/> + <menu_item_call label="Visual Leak Detector を有効にする" name="Enable Visual Leak Detector"/> <menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/> <menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/> - <menu label="ログレベルを設定" name="Set Logging Level"/> + <menu label="ログレベルを設定" name="Set Logging Level"> + <menu_item_check label="デバッグ" name="Debug"/> + <menu_item_check label="情報" name="Info"/> + <menu_item_check label="警告" name="Warning"/> + <menu_item_check label="エラー" name="Error"/> + <menu_item_check label="なし" name="None"/> + </menu> <menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options"/> <menu_item_call label="管理者ステータス解除" name="Leave Admin Options"/> <menu_item_check label="管理者メニューを表示する" name="View Admin Options"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index c8e8dbb0f1..7bf8a7b8be 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -264,7 +264,7 @@ L$ が不足しているのでこのグループに参加することができ <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/> </notification> <notification name="ReturnObjectsDeededToGroup"> - この区画のグループ [NAME] 共有のすべてのオブジェクトを、以前の所有者の「持ち物」に戻そうとしています。 + この区画のグループ [NAME] 共有のすべてのオブジェクトを、以前の所有者のインベントリに戻そうとしています。 操作を続行しますか？ *警告* これにより、 @@ -275,21 +275,21 @@ L$ が不足しているのでこのグループに参加することができ <notification name="ReturnObjectsOwnedByUser"> この区画で、 住人 [NAME] が所有する全てのオブジェクトを -本人の「持ち物」に本当に返却してもよいですか？ +本人のインベントリに本当に返却してもよいですか？ オブジェクト： [N] <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> </notification> <notification name="ReturnObjectsOwnedBySelf"> この土地区画内にある、あなたが所有するすべてのオブジェクトを、 -あなたの「持ち物」に戻そうとしています。続けますか？ +あなたのインベントリに戻そうとしています。続けますか？ オブジェクト： [N] <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> </notification> <notification name="ReturnObjectsNotOwnedBySelf"> この土地区画内にある、あなた以外が所有するすべてのオブジェクトを、 -それぞれの所有者の「持ち物」に戻そうとしています。 +それぞれの所有者のインベントリに戻そうとしています。 操作を続行しますか？ グループに譲渡された「再販・プレゼント可」のオブジェクトは、以前の所有者に返却されます。 @@ -300,7 +300,7 @@ L$ が不足しているのでこのグループに参加することができ </notification> <notification name="ReturnObjectsNotOwnedByUser"> この土地区画内にある、 -[NAME]以外による所有のオブジェクトをすべてそれぞれの所有者の「持ち物」に返却しようとしています。 +[NAME]以外による所有のオブジェクトをすべてそれぞれの所有者のインベントリに返却しようとしています。 操作を続行しますか？グループに譲渡された「再販・プレゼント可」のオブジェクトは、以前の所有者に返却されます。 *警告* これにより、 @@ -464,14 +464,14 @@ L$ が不足しているのでこのグループに参加することができ ジェスチャーの保存に失敗しました。少し待ってからもう一度試してください。 </notification> <notification name="GestureSaveFailedObjectNotFound"> - ジェスチャーの保存に失敗しました。オブジェクト、または関連するオブジェクト持ち物が見つかりません。 + ジェスチャーの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。 オブジェクトが範囲内に存在しないか、または削除された可能性があります。 </notification> <notification name="GestureSaveFailedReason"> 次の理由で、ジェスチャーの保存時に問題が起こりました。 [REASON]。 後でもう一度試してください。 </notification> <notification name="SaveNotecardFailObjectNotFound"> - ノートカードの保存に失敗しました。オブジェクト、または関連するオブジェクト持ち物が見つかりません。 + ノートカードの保存に失敗しました。オブジェクト、または関連するオブジェクトインベントリが見つかりません。 オブジェクトが範囲内に存在しないか、または削除された可能性があります。 </notification> <notification name="SaveNotecardFailReason"> @@ -535,11 +535,11 @@ L$ が不足しているのでこのグループに参加することができ [REGION] では、地形の変更ができません。 </notification> <notification name="CannotCopyWarning"> - あなたには[ITEMS]というアイテムをコピーする許可がありません。他の住人に提供すると、そのアイテムはあなたの「持ち物」から削除されます。本当にこれらのアイテムを譲りますか？ + あなたには[ITEMS]というアイテムをコピーする許可がありません。他の住人に提供すると、そのアイテムはあなたのインベントリから削除されます。本当にこれらのアイテムを譲りますか？ <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> </notification> <notification name="CannotGiveItem"> - 持ち物のアイテムを渡せません。 + インベントリのアイテムを渡せません。 </notification> <notification name="TransactionCancelled"> 取引がキャンセルされました。 @@ -552,7 +552,7 @@ L$ が不足しているのでこのグループに参加することができ </notification> <notification name="CannotCopyCountItems"> あなたは選択した [COUNT] 個のアイテムののコピーを許されていません。 -これらのアイテムはあなたの「持ち物」から失われます。 +これらのアイテムはあなたのインベントリから失われます。 本当にアイテムを渡したいですか？ <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> </notification> @@ -693,7 +693,7 @@ L$ が不足しているのでこのグループに参加することができ 出力ファイルを作成できません： [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - 現在 [APP_NAME] では、アニメーションの一括アップロードはサポートされていません。 + 現在 [APP_NAME] では、BVH 形式のアニメーションファイルの一括アップロードはサポートされていません。 </notification> <notification name="CannotUploadReason"> 次の理由で、「 [FILE] 」をアップロードできません： [REASON] @@ -796,7 +796,7 @@ L$ が不足しているのでこのグループに参加することができ テレポート目的地を見つけられません。目的地が一時的に利用できない状態か、すでに消滅している可能性があります。数分後にやり直してください。 </notification> <notification name="no_inventory_host"> - 持ち物システムは現在利用できません。 + インベントリシステムは現在利用できません。 </notification> <notification name="CannotSetLandOwnerNothingSelected"> 土地所有者設定ができません： @@ -959,7 +959,7 @@ L$ は返金されません。 <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> </notification> <notification name="ConfirmItemCopy"> - このアイテムをあなたの持ち物にコピーしますか？ + このアイテムをあなたのインベントリにコピーしますか？ <usetemplate name="okcancelbuttons" notext="取り消し" yestext="コピー"/> </notification> <notification name="ResolutionSwitchFail"> @@ -1011,7 +1011,7 @@ L$ は返金されません。 </form> </notification> <notification label="着用物を保存" name="SaveWearableAs"> - アイテムを別名で持ち物に保存： + アイテムを別名でインベントリに保存： <form name="form"> <input name="message"> [DESC]（新規） @@ -1896,7 +1896,7 @@ Adult 専用リージョンに入るには、住人のアカウントが年齢 </notification> <notification name="BuyCopy"> コピーを [OWNER] から L$ [PRICE] で購入しますか？ -購入したオブジェクトは、あなたの「持ち物」にコピーされます。 +購入したオブジェクトは、あなたのインベントリにコピーされます。 可能な操作は、 修正：[MODIFYPERM]、コピー：[COPYPERM]、 再販・プレゼント：[RESELLPERM] です。 @@ -1904,7 +1904,7 @@ Adult 専用リージョンに入るには、住人のアカウントが年齢 </notification> <notification name="BuyCopyNoOwner"> L$ [PRICE] でコピーを購入しますか？ -購入したオブジェクトは、あなたの「持ち物」にコピーされます。 +購入したオブジェクトは、あなたのインベントリにコピーされます。 可能な操作は、 修正：[MODIFYPERM]、コピー：[COPYPERM]、 再販・プレゼント：[RESELLPERM] です。 @@ -1912,12 +1912,12 @@ Adult 専用リージョンに入るには、住人のアカウントが年齢 </notification> <notification name="BuyContents"> 中身を [OWNER] から L$ [PRICE] で購入しますか？ -購入した中身は、あなたの「持ち物」にコピーされます。 +購入した中身は、あなたのインベントリにコピーされます。 <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> </notification> <notification name="BuyContentsNoOwner"> L＄ [PRICE] で中身を購入しますか？ -購入した中身は、あなたの「持ち物」にコピーされます。 +購入した中身は、あなたのインベントリにコピーされます。 <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> </notification> <notification name="ConfirmPurchase"> @@ -1946,20 +1946,20 @@ Adult 専用リージョンに入るには、住人のアカウントが年齢 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MoveInventoryFromObject"> - 「コピー不可」の持ち物アイテムを選択しました。 -これらのアイテムはコピーされないまま、あなたの「持ち物」に移動されます。 + 「コピー不可」のインベントリアイテムを選択しました。 +これらのアイテムはコピーされないまま、あなたのインベントリに移動されます。 アイテムを動かしますか？ <usetemplate ignoretext="「コピー不可」のアイテムをオブジェクトから動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="OK"/> </notification> <notification name="MoveInventoryFromScriptedObject"> - 「コピー不可」の持ち物アイテムを選択しました。 -これらのアイテムはコピーされずに、あなたの「持ち物」に移動されます。 -このオブジェクトはスクリプト付きなので、「持ち物」に移動させると + 「コピー不可」のインベントリアイテムを選択しました。 +これらのアイテムはコピーされずに、あなたのインベントリに移動されます。 +このオブジェクトはスクリプト付きなので、インベントリに移動させると スクリプトに誤動作が起きる可能性があります。 -持ち物アイテムを移動しますか？ +インベントリアイテムを移動しますか？ <usetemplate ignoretext="スクリプト入りのオブジェクトを壊す恐れのある「コピー不可」のアイテムを動かす前の警告" name="okcancelignore" notext="キャンセル" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> @@ -2068,7 +2068,7 @@ Linden Lab </notification> <notification name="ConfirmEmptyTrash"> ごみ箱の中身をすべて削除しますか？ - <usetemplate ignoretext="持ち物のごみ箱フォルダを空にする前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/> + <usetemplate ignoretext="インベントリのごみ箱フォルダを空にする前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/> </notification> <notification name="ConfirmClearBrowserCache"> トラベル、Web、検索の履歴をすべて削除しますか？ @@ -2252,7 +2252,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ 親エステート間では IM を送信できません。 </notification> <notification name="TransferInventoryAcrossParentEstates"> - 親エステート間で持ち物を移動することはできません。 + 親エステート間でインベントリを移動することはできません。 </notification> <notification name="UnableToLoadNotecard"> ノートカードを読み込めません。あとで再度お試しください。 @@ -2304,7 +2304,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ [NAME] は、あなたが渡したアイテムを受け取りました。 </notification> <notification name="InventoryDeclined"> - [NAME] は、持ち物の提供を断りました。 + [NAME] は、インベントリの提供を断りました。 </notification> <notification name="ObjectMessage"> [NAME]： [MESSAGE] @@ -2389,16 +2389,16 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ </form> </notification> <notification name="OwnedObjectsReturned"> - 選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたの「持ち物」に返却されました。 + 選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたのインベントリに返却されました。 </notification> <notification name="OtherObjectsReturned"> - [NAME] が所有する、選択した区画にあるオブジェクトは、所有者の持ち物に返却されました。 + [NAME] が所有する、選択した区画にあるオブジェクトは、所有者のインベントリに返却されました。 </notification> <notification name="OtherObjectsReturned2"> 「 [NAME] 」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。 </notification> <notification name="GroupObjectsReturned"> - 選択した区画上の、[GROUPNAME] というグループと共有していたオブジェクトは、それぞれの所有者の「持ち物」に返却されました。 + 選択した区画上の、[GROUPNAME] というグループと共有していたオブジェクトは、それぞれの所有者のインベントリに返却されました。 譲渡されていた「再販・プレゼント可」のオブジェクトは、以前の所有者に返却されました。 グループに譲渡されていた「再販・プレゼント不可」のオブジェクトは、削除されました。 </notification> @@ -2617,7 +2617,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ </notification> <notification name="OfferCallingCard"> [NAME] がコーリングカードを渡そうとしています。 -あなたの持ち物にブックマークが追加され、この住人に素早く IM を送ることができます。 +あなたのインベントリにブックマークが追加され、この住人に素早く IM を送ることができます。 <form name="form"> <button name="Accept" text="受け入れる"/> <button name="Decline" text="辞退"/> @@ -2679,16 +2679,16 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ [NAME] の「<nolink>[TITLE]</nolink>」 [MESSAGE] <form name="form"> - <button name="Mute" text="ブロック"/> - <button name="Ignore" text="無視する"/> + <button name="Client_Side_Mute" text="ブロック"/> + <button name="Client_Side_Ignore" text="無視"/> </form> </notification> <notification name="ScriptDialogGroup"> [GROUPNAME] の「<nolink>[TITLE]</nolink>」 [MESSAGE] <form name="form"> - <button name="Mute" text="ブロック"/> - <button name="Ignore" text="無視する"/> + <button name="Client_Side_Mute" text="ブロック"/> + <button name="Client_Side_Ignore" text="無視"/> </form> </notification> <notification name="BuyLindenDollarSuccess"> @@ -2707,7 +2707,7 @@ M キーを押して変更します。 <notification name="FirstSandbox"> ここはサンドボックスエリアです。住人が制作を学ぶことができます。 -ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、持ち物に入れてお持ち帰りするのをお忘れなく。 +ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、インベントリに入れてお持ち帰りするのをお忘れなく。 </notification> <notification name="MaxListSelectMessage"> このリストから [MAX_SELECT] 個までのアイテムを選択できます。 @@ -2728,7 +2728,7 @@ M キーを押して変更します。 [NAME] はお金を受け取り、自動的にブロックが解除されました。 </notification> <notification name="AutoUnmuteByInventory"> - [NAME] は持ち物を受け取り、自動的にブロックが解除されました。 + [NAME] はインベントリを受け取り、自動的にブロックが解除されました。 </notification> <notification name="VoiceInviteGroup"> [NAME] は [GROUP] のボイスチャットコールに参加しました。 @@ -2895,6 +2895,18 @@ M キーを押して変更します。 [RESIDENTS] <usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/> </notification> + <notification name="ShareFolderConfirmation"> + フォルダは一度に 1 つしか共有できません。 + +次のアイテムを共有しますか？ + +<nolink>[ITEMS]</nolink> + +次の住人と共有： + +[RESIDENTS] + <usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/> + </notification> <notification name="ItemsShared"> アイテムが共有されました。 </notification> @@ -3021,7 +3033,7 @@ M キーを押して変更します。 カメラの視点を変更するには、水平・垂直コントロールを使います。Escape を押すか、または歩行すると、視点がリセットされます。 </notification> <notification label="インベントリ" name="HintInventory"> - 持ち物にはあなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。 + インベントリにはあなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。 </notification> <notification label="あなたのリンデンドル" name="HintLindenDollar"> これがあなたの L$ 残高です。リンデンドルを購入するには「L$ の購入」をクリックします。 @@ -3129,7 +3141,7 @@ M キーを押して変更します。 <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/> </notification> <notification label="" name="NoInventory"> - 持ち物の表示はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？ + インベントリの表示はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？ <usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/> </notification> <notification label="" name="NoAppearance"> diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml index f7f575206a..49749732c9 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> <layout_stack name="vertical_stack"> <layout_panel name="group_info_btn_panel"> - <button label="グループ情報" name="group_info_btn"/> + <button label="グループプロフィール" name="group_info_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> <button label="グループコール" name="call_btn"/> diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml index 85406702bc..7aa1aec6d0 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="グループ情報" name="GroupInfo"> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="グループインベントリ" name="GroupInfo"> <panel.string name="default_needs_apply_text"> 保存していない変更があります </panel.string> diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml index 96e0382975..ddad6c1f9b 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="通知" name="notices_tab"> <panel.string name="help_text"> 通知でメッセージを送ることができ、通知にアイテムを添付することができます。 @@ -39,10 +39,10 @@ <text name="string"> ここにアイテムをドラッグ＆ドロップして添付してください： </text> - <button label="持ち物" name="open_inventory" tool_tip="持ち物を開きます"/> + <button label="インベントリ" name="open_inventory" tool_tip="インベントリを開きます"/> <button label="取り外す" label_selected="添付物を削除" name="remove_attachment" tool_tip="あなたの通知から添付されたアイテムを削除します"/> <button label="送信" label_selected="送信" name="send_notice"/> - <group_drop_target name="drop_target" tool_tip="持ち物のアイテムをこのボックスにドラッグして、通知と一緒に送ります。 添付するには、そのアイテムのコピーと再販・プレゼントの権限があなたにある必要があります。"/> + <group_drop_target name="drop_target" tool_tip="インベントリのアイテムをこのボックスにドラッグして、通知と一緒に送ります。 添付するには、そのアイテムのコピーと再販・プレゼントの権限があなたにある必要があります。"/> </panel> <panel label="過去の通知を表示" name="panel_view_past_notice"> <text name="lbl"> diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml index e3b716c35b..24d6ff23ae 100644 --- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Landmarks"> <accordion name="landmarks_accordion"> <accordion_tab name="tab_favorites" title="お気に入りバー"/> <accordion_tab name="tab_landmarks" title="マイ ランドマーク"/> - <accordion_tab name="tab_inventory" title="持ち物"/> + <accordion_tab name="tab_inventory" title="インベントリ"/> <accordion_tab name="tab_library" title="ライブラリ"/> </accordion> <panel name="bottom_panel"> diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml index ff968696b7..f908262f4f 100644 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="もの" name="main inventory panel"> <panel.string name="ItemcountFetching"> [ITEM_COUNT] 個のアイテムを取得中です... [FILTER] @@ -9,9 +9,9 @@ <text name="ItemcountText"> アイテム： </text> - <filter_editor label="持ち物をフィルター" name="inventory search editor"/> + <filter_editor label="インベントリをフィルター" name="inventory search editor"/> <tab_container name="inventory filter tabs"> - <inventory_panel label="持ち物" name="All Items"/> + <inventory_panel label="インベントリ" name="All Items"/> <recent_inventory_panel label="最新" name="Recent Items"/> </tab_container> <layout_stack name="bottom_panel"> diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml index 896bbff0ee..3df1ae8048 100644 --- a/indra/newview/skins/default/xui/ja/panel_me.xml +++ b/indra/newview/skins/default/xui/ja/panel_me.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="マイ プロフィール" name="panel_me"> - <panel label="マイ ピック" name="panel_picks"/> + <panel label="マイ-ピック" name="panel_picks"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml index aca055bb43..4048b48d3a 100644 --- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="nearby_chat"> - <check_box label="チャットを翻訳" name="translate_chat_checkbox"/> + <layout_stack name="stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="チャットを翻訳" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml index 47f570ab86..1a14283113 100644 --- a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<outbox_inventory_panel name="inventory_outbox" tool_tip="商品をここにドラッグアンドドロップすると、あなたの店頭に並びます"/> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<outbox_inventory_panel name="inventory_outbox" tool_tip="アイテムをここにドラッグアンドドロップすると、あなたの店頭に並びます"/> diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml index 6897660214..e89ce0c479 100644 --- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- Side tray Outfit Edit panel --> <panel label="アウトフットの編集" name="outfit_edit"> <string name="No Outfit" value="アウトフィットなし"/> @@ -30,7 +30,7 @@ <button label="さらに追加..." name="show_add_wearables_btn" tool_tip="開く／閉じる"/> </layout_panel> <layout_panel name="filter_panel"> - <filter_editor label="持ち物の着用物をフィルター" name="look_item_filter"/> + <filter_editor label="インベントリの着用物をフィルター" name="look_item_filter"/> </layout_panel> </layout_stack> </layout_panel> diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml index 2a0647653d..93df0ba2bd 100644 --- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="もの" name="Outfits"> <panel.string name="wear_outfit_tooltip"> 選択したアウトフィットを着用する </panel.string> <panel.string name="wear_items_tooltip"> - 選択した商品を着用 + 選択したアイテムを着用 </panel.string> <tab_container name="appearance_tabs"> <panel label="マイ アウトフィット" name="outfitslist_tab"/> diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml index 1c90f7327e..88c31451b5 100644 --- a/indra/newview/skins/default/xui/ja/panel_people.xml +++ b/indra/newview/skins/default/xui/ja/panel_people.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- Side tray panel --> <panel label="人" name="people_panel"> <string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/> @@ -73,7 +73,7 @@ <button label="コール" name="call_btn" tool_tip="この住人にコールする"/> </layout_panel> <layout_panel name="share_btn_lp"> - <button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する"/> + <button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/> </layout_panel> <layout_panel name="teleport_btn_lp"> <button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/> @@ -81,7 +81,7 @@ </layout_stack> <layout_stack name="bottom_bar_ls1"> <layout_panel name="group_info_btn_lp"> - <button label="グループ情報" name="group_info_btn" tool_tip="グループ情報を表示します"/> + <button label="グループプロフィール" name="group_info_btn" tool_tip="グループプロフィールを表示します"/> </layout_panel> <layout_panel name="chat_btn_lp"> <button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/> diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml index 46f2b0a3f9..e496e6602b 100644 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_snapshot_inventory"> <text name="title"> - 「持ち物」に保存 + インベントリに保存 </text> <text name="hint_lbl"> - 画像を持ち物に保存するには L$[UPLOAD_COST] の費用がかかります。画像をテクスチャとして保存するには平方形式の 1 つを選択してください。 + 画像をインベントリに保存するには L$[UPLOAD_COST] の費用がかかります。画像をテクスチャとして保存するには平方形式の 1 つを選択してください。 </text> <combo_box label="解像度" name="texture_size_combo"> <combo_box.item label="現在のウィンドウ" name="CurrentWindow"/> diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml index cd5b7590ad..c3b1cd91e7 100644 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_snapshot_options"> <button label="プロフィールフィードに投稿する" name="save_to_profile_btn"/> <button label="メール" name="save_to_email_btn"/> - <button label="持ち物に保存（L$[Amount]）" name="save_to_inventory_btn"/> + <button label="インベントリに保存（L$[Amount]）" name="save_to_inventory_btn"/> <button label="コンピューターに保存" name="save_to_computer_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml index 4fb876f690..f09643d562 100644 --- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml @@ -15,7 +15,7 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <panel name="balance_bg"> + <panel left="-370" name="balance_bg" width="160"> <text name="balance" tool_tip="クリックして L$ 残高を更新" value="L$20"/> <button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/> <button label="店" name="goShop" tool_tip="Second Life マーケットプレイスを開く" width="40"/> diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml index c53ad838f7..896ed556ae 100644 --- a/indra/newview/skins/default/xui/ja/role_actions.xml +++ b/indra/newview/skins/default/xui/ja/role_actions.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <role_actions> <action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership"> <action description="このグループに人を招待" longdescription="「役割」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1"/> @@ -51,7 +51,7 @@ <action description="グループ所有オブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ所有のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group owned" value="48"/> <action description="グループに設定されているオブジェクトを返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループに設定されているオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return group set" value="33"/> <action description="非グループオブジェクトの返却" longdescription="グループ所有の区画上のオブジェクトのうち、グループ以外のオブジェクトを返却するには、「土地情報」＞「オブジェクト」タブを使います。" name="land return non group" value="34"/> - <action description="リンデン製の植物を使用して景観作成" longdescription="リンデン製の樹木、植物、草を植える、景観づくりの能力です。 これらの植物はあなたの持ち物内の「ライブラリ」 > 「オブジェクト」フォルダにあります。「制作」メニューで作成することもできます。" name="land gardening" value="35"/> + <action description="リンデン製の植物を使用して景観作成" longdescription="リンデン製の樹木、植物、草を植える、景観づくりの能力です。 これらの植物はあなたのインベントリ内の「ライブラリ」 > 「オブジェクト」フォルダにあります。「制作」メニューで作成することもできます。" name="land gardening" value="35"/> </action_set> <action_set description="これらの「能力」には、グループ所有のオブジェクトを譲渡、修正、販売する権限が含まれます。 変更は「制作ツール」 > 「一般」タブで行います。 オブジェクトを右クリックして「編集」を開くと設定内容を確認できます。" name="Object Management"> <action description="グループにオブジェクトを譲渡" longdescription="「制作ツール」 > 「一般」タブで、オブジェクトをグループに譲渡します。" name="object deed" value="36"/> diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml index a450d9b3c3..51d6d48f90 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml @@ -14,7 +14,7 @@ <text name="inbox_fresh_new_count"> [NUM] 個の新アイテム </text> - <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ"> <text name="inbox_inventory_placeholder"> マーケットプレイスから購入した商品はここに配達されます。 </text> @@ -28,7 +28,7 @@ <button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する"/> </layout_panel> <layout_panel name="share_btn_lp"> - <button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する"/> + <button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/> </layout_panel> <layout_panel name="shop_btn_lp"> <button label="店" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く"/> diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml index d820994b59..6931e448b3 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="item properties" title="アイテムのプロフィール"> <panel.string name="unknown"> （不明） @@ -16,13 +16,13 @@ [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] </panel.string> <panel.string name="origin_inventory"> - （持ち物） + （インベントリ） </panel.string> <panel.string name="origin_inworld"> （インワールド） </panel.string> <text name="title" value="アイテムのプロフィール"/> - <text name="origin" value="（持ち物）"/> + <text name="origin" value="（インベントリ）"/> <scroll_container name="item_profile_scroll"> <panel label="" name="item_profile"> <text name="LabelItemNameTitle"> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index a1279510c7..680ef60890 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -346,7 +346,7 @@ support@secondlife.com にお問い合わせください。 これらオブジェクトの 1 つまたは複数は売り渡したり譲渡したりできないものです。 </string> <string name="TooltipOutboxNotInInventory"> - マーチャントアウトボックスでは、ご自分の持ち物からのアイテムしか受け入れることができません + マーチャントアウトボックスでは、ご自分のインベントリからのアイテムしか受け入れることができません </string> <string name="TooltipOutboxWorn"> 着用しているアイテムをマーチャントアウトボックスに入れることはできません @@ -835,6 +835,9 @@ support@secondlife.com にお問い合わせください。 <string name="anim_yes_head"> 頷く </string> + <string name="multiple_textures"> + 複数 + </string> <string name="texture_loading"> ローディング... </string> @@ -1232,10 +1235,10 @@ support@secondlife.com にお問い合わせください。 ここにランドマークをドラッグしてお気に入りに追加します。 </string> <string name="InventoryNoTexture"> - 「持ち物」内にこのテクスチャのコピーがありません + インベントリ内にこのテクスチャのコピーがありません </string> <string name="InventoryInboxNoItems"> - プレミアムギフトなど、受け取る特定のアイテムはここに表示されます。その後、それらのアイテムを自分の持ち物の中にドラッグできます。 + マーケットプレイスで購入した商品はここに表示されます。その後、アイテムをインベントリにドラッグすれば、それらのアイテムを使用できます。 </string> <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ @@ -1270,25 +1273,25 @@ support@secondlife.com にお問い合わせください。 エラーなし </string> <string name="Marketplace Error Not Merchant"> - エラー：マーケットプレイスに商品を送る前に、あなた自身をマーチャント登録する必要があります（登録は無料です）。 + エラー：マーケットプレイスにアイテムを送る前に、あなた自身をマーチャント登録する必要があります（登録は無料です）。 </string> <string name="Marketplace Error Empty Folder"> エラー：このフォルダは空です。 </string> <string name="Marketplace Error Unassociated Products"> - エラー：あなたのマーチャントアカウントには、商品と無関係のアイテムが多すぎるため、このアイテムをアップロードできませんでした。このエラーを解消するには、マーケットプレイスのウェブサイトにログインし、商品に関係のないアイテムの数を減らしてください。 + エラー：あなたのマーチャントアカウントには、商品に関連付けられていないアイテムが多すぎるため、このアイテムをアップロードできませんでした。このエラーを解消するには、マーケットプレイスの Web サイトにログインし、関連付けられていないアイテムの数を減らしてください。 </string> <string name="Marketplace Error Object Limit"> - エラー：この商品に含まれるオブジェクトが多すぎます。オブジェクトをいくつかボックスにまとめ、オブジェクト数を200以下に減らしてください。 + エラー：このアイテムに含まれるオブジェクトが多すぎます。オブジェクトをいくつかボックスにまとめ、オブジェクト数を200以下に減らしてください。 </string> <string name="Marketplace Error Folder Depth"> - エラー：この商品はネスト入りフォルダの階層が多すぎます。ネスト入りフォルダを 3 階層以内にまとめ直してください。 + エラー：このアイテムはネスト入りフォルダの階層が多すぎます。ネスト入りフォルダを 3 階層以内にまとめ直してください。 </string> <string name="Marketplace Error Unsellable Item"> - エラー：この項目をマーケットプレイスで販売することはできません。 + エラー：このアイテムをマーケットプレイスで販売することはできません。 </string> <string name="Marketplace Error Internal Import"> - エラー：この商品に関して問題が発生しました。しばらくしてからお試しください。 + エラー：このアイテムに関して問題が発生しました。しばらくしてからお試しください。 </string> <string name="Open landmarks"> ランドマークを開く @@ -1337,7 +1340,7 @@ support@secondlife.com にお問い合わせください。 <string name="No Filters" value="いいえ "/> <string name="Since Logoff" value=" - ログオフ以来"/> <string name="InvFolder My Inventory"> - 持ち物 + インベントリ </string> <string name="InvFolder Library"> ライブラリ @@ -1370,7 +1373,7 @@ support@secondlife.com にお問い合わせください。 新規フォルダ </string> <string name="InvFolder Inventory"> - 持ち物 + インベントリ </string> <string name="InvFolder Uncompressed Images"> 圧縮されていない画像 @@ -3921,6 +3924,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Saved_message"> （保存日時：[LONG_TIMESTAMP]） </string> + <string name="IM_unblock_only_groups_friends"> + このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。 + </string> <string name="answered_call"> 相手がコールを受けました </string> @@ -3952,10 +3958,10 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ [AGENT_NAME] とコンファレンスする </string> <string name="inventory_item_offered-im"> - 持ち物アイテムを送りました + インベントリアイテムを送りました </string> <string name="share_alert"> - 持ち物からここにアイテムをドラッグします + インベントリからここにアイテムをドラッグします </string> <string name="no_session_message"> （IM セッションが存在しません） @@ -4839,7 +4845,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ ハウツー </string> <string name="Command_Inventory_Label"> - 持ち物 + インベントリ </string> <string name="Command_Map_Label"> 地図 @@ -4914,7 +4920,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ 一般的タスクの実行方法 </string> <string name="Command_Inventory_Tooltip"> - 持ち物を表示・使用 + インベントリを表示・使用 </string> <string name="Command_Map_Tooltip"> 世界地図 diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml index 6c69c7a231..64f01f4030 100644 --- a/indra/newview/skins/default/xui/ja/teleport_strings.xml +++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <teleport_messages> <message_set name="errors"> <message name="invalid_tport"> @@ -45,7 +45,7 @@ テレポートの目的地を見つけられません。目的地が一時的に利用できない状態か、またはすでに消滅している可能性があります。数分後にやり直してください。 </message> <message name="no_inventory_host"> - 持ち物システムは現在利用できません。 + インベントリシステムは現在利用できません。 </message> </message_set> <message_set name="progress"> diff --git a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml new file mode 100644 index 0000000000..05326d8594 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Anim Preview" title="ANIMATION.ANIM"> + <text name="name_label"> + Nome: + </text> + <text name="description_label"> + Descrição: + </text> + <button label="Envio (L$[AMOUNT])" name="ok_btn"/> + <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml new file mode 100644 index 0000000000..5cae581045 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Animation Preview"> + <floater.string name="failed_to_initialize"> + Falha ao iniciar animação + </floater.string> + <floater.string name="anim_too_long"> + O arquivo de animação possui [LENGTH] segundos de duração. + +A duração máxima da animação é de [MAX_LENGTH] segundos. + </floater.string> + <floater.string name="failed_file_read"> + Não foi possível ler o arquivo de animação. + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + Ok + </floater.string> + <floater.string name="E_ST_EOF"> + Fim de arquivo prematuro. + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + Impossível ler definição constraint. + </floater.string> + <floater.string name="E_ST_NO_FILE"> + Impossível abrir arquivo BVH. + </floater.string> + <floater.string name="E_ST_NO_HIER"> + Invalid HIERARCHY header. + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + RAIZ ou JUNTA não encontrados. + </floater.string> + <floater.string name="E_ST_NO_NAME"> + Impossível obter nome JOINT. + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + Impossível localizar OFFSET. + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + Impossível localizar CHANNELS. + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + Impossível obter ordem de rotação. + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + Impossível obter eixo de rotação. + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + Impossível localizar MOTION. + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + Impossível determinar número de quadros. + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + Impossível determinar tempo dos quadros. + </floater.string> + <floater.string name="E_ST_NO_POS"> + Impossível definir posicionamento. + </floater.string> + <floater.string name="E_ST_NO_ROT"> + Impossível definir valores da rotação. + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + Impossível abrir arquivo de tradução. + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + Impossível ler cabeçalho de tradução. + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + Impossível ler nomes traduzidos. + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + Impossível obter valor traduzido a ignorar. + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + Impossível obter valor traduzido relativo. + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + Impossível obter valor traduzido. + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + Impossível ler matriz de tradução. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + Impossível obter nome mergechild. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + Impossível obter nome mergeparent. + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + Impossível obter valor prioritário. + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + Impossível obter valor do loop. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + Impossível obter valor easeIn. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + Impossível obter valor easeOut. + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + Impossível obter valor de morph da mão. + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + Impossível ler nome do emote. + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Nome da junta incorreto, use "quadril". + </floater.string> + <text name="name_label"> + Nome: + </text> + <text name="description_label"> + Descrição: + </text> + <spinner label="Prioridade" name="priority" tool_tip="Controla quais animações podem ser interrompidas por esta animação"/> + <check_box label="Loop" name="loop_check" tool_tip="Executa esta animação sem parar"/> + <spinner label="Dentro(%)" name="loop_in_point" tool_tip="Define o ponto em que a animação em loop reinicia"/> + <spinner label="Fora(%)" name="loop_out_point" tool_tip="Define o ponto em que a animação em loop acaba"/> + <text name="hand_label"> + Pose das mãos + </text> + <combo_box name="hand_pose_combo" tool_tip="Controla os gestos das mãos durante a animação"> + <combo_box.item label="Abrir" name="Spread"/> + <combo_box.item label="Relaxado" name="Relaxed"/> + <combo_box.item label="Apontar ambas" name="PointBoth"/> + <combo_box.item label="Punho" name="Fist"/> + <combo_box.item label="E relaxada" name="RelaxedLeft"/> + <combo_box.item label="Apontar E" name="PointLeft"/> + <combo_box.item label="Punho E" name="FistLeft"/> + <combo_box.item label="D relaxada" name="RelaxedRight"/> + <combo_box.item label="Apontar D" name="PointRight"/> + <combo_box.item label="Punho D" name="FistRight"/> + <combo_box.item label="Saudação D" name="SaluteRight"/> + <combo_box.item label="Escrevendo" name="Typing"/> + <combo_box.item label="Paz D" name="PeaceRight"/> + </combo_box> + <text name="emote_label"> + Expressão + </text> + <combo_box name="emote_combo" tool_tip="Controla as expressões faciais durante a animação"> + <item label="(nenhum)" name="[None]" value=""/> + <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> + <item label="Com medo" name="Afraid" value="Com medo"/> + <item label="Bravo" name="Angry" value="Bravo"/> + <item label="Sorriso contagiante" name="BigSmile" value="Sorriso contagiante"/> + <item label="À toa" name="Bored" value="À toa"/> + <item label="Chorar" name="Cry" value="Chorar"/> + <item label="Desdenho" name="Disdain" value="Desdenho"/> + <item label="Com vergonha" name="Embarrassed" value="Com vergonha"/> + <item label="Franzir testa" name="Frown" value="Franzir testa"/> + <item label="Beijo" name="Kiss" value="Beijo"/> + <item label="Rir" name="Laugh" value="Rir"/> + <item label="Mostrar a língua" name="Plllppt" value="Mostrar a língua"/> + <item label="Asco" name="Repulsed" value="Asco"/> + <item label="Triste" name="Sad" value="Triste"/> + <item label="Encolher os ombros" name="Shrug" value="Encolher os ombros"/> + <item label="Sorriso" name="Smile" value="Sorriso"/> + <item label="Surpresa" name="Surprise" value="Surpresa"/> + <item label="Piscar" name="Wink" value="Piscar"/> + <item label="Preocupado" name="Worry" value="Preocupado"/> + </combo_box> + <text name="preview_label"> + Visualizar enquanto + </text> + <combo_box name="preview_base_anim" tool_tip="Use para testar o comportamento de sua animação enquanto seu avatar executa ações comuns."> + <item label="Em pé" name="Standing" value="Em pé"/> + <item label="Andar" name="Walking" value="Andar"/> + <item label="Sentado" name="Sitting" value="Sentado"/> + <item label="Voar" name="Flying" value="Voar"/> + </combo_box> + <spinner label="Aproximação (seg)" name="ease_in_time" tool_tip="Tempo (em segundos) da transição inicial da animação"/> + <spinner label="Afastamento (seg)" name="ease_out_time" tool_tip="Tempo (em segundos) da transição de saída da animação"/> + <button name="play_btn" tool_tip="Executar animação"/> + <button name="pause_btn" tool_tip="Pausar a animação"/> + <button name="stop_btn" tool_tip="Interromper a execução da animação"/> + <text name="bad_animation_text"> + Não foi possível ler o arquivo de animação. + +Recomendamos que os arquivos BVH sejam exportados do Poser 4. + </text> + <button label="Envio (L$[AMOUNT])" name="ok_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml deleted file mode 100644 index 0d07303c91..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="CARREGAR ASSISTENTE DE MODELAGEM"> - <button label="5. Carregar" name="upload_btn"/> - <button label="4. Revisar" name="review_btn"/> - <button label="3. Física" name="physics_btn"/> - <button label="2. Otimizar" name="optimize_btn"/> - <button label="1. Selecionra arquivo" name="choose_file_btn"/> - <panel name="choose_file_panel"> - <panel name="choose_file_header_panel"> - <text name="choose_file_header_text"> - Escolher arquivo de modelo - </text> - </panel> - <panel name="choose_file_content"> - <text name="advanced_users_text"> - Usuários avançados: se você estiver familiarizado com ferramentas de criação de conteúdo 3D, use o Advanced Uploader. - </text> - <button label="Trocar para avançado" name="switch_to_advanced"/> - <text name="Cache location"> - Escolha o arquivo de modelo para upload - </text> - <button label="Procurar..." label_selected="Procurar..." name="browse"/> - <text name="Model types"> - O Second Life oferece suporte a arquivos COLLADA (.dae) - </text> - <text name="dimensions"> - X Y Z - </text> - <text name="warning_label"> - AVISO: - </text> - <text name="warning_text"> - Não será possível concluir a etapa final do upload desse modelo para os servidores do Second Life. [secondlife:///app/floater/learn_more Saiba como] configurar sua conta para uploads de modelos mesh. - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> - Otimizar modelo - </text> - </panel> - <text name="optimize_description"> - O modelo foi ajustado para desempenho. Faça novos ajustes, se desejar. - </text> - <panel name="optimize_content"> - <text name="high_detail_text"> - Gerar nível de detalhes: Alto - </text> - <text name="medium_detail_text"> - Gerar nível de detalhes: Médio - </text> - <text name="low_detail_text"> - Gerar nível de detalhes: Baixo - </text> - <text name="lowest_detail_text"> - Gerar nível de detalhes: Mais baixo - </text> - </panel> - <panel name="content2"> - <button label="Recalcular geometria" name="recalculate_geometry_btn"/> - <text name="lod_label"> - Visualização da geometria - </text> - <combo_box name="preview_lod_combo" tool_tip="LOD para exibir na renderização de visualização"> - <combo_item name="high"> - Máximo de detalhes - </combo_item> - <combo_item name="medium"> - Detalhes médios - </combo_item> - <combo_item name="low"> - Poucos detalhes - </combo_item> - <combo_item name="lowest"> - Mínimo de detalhes - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> - Ajustar físico - </text> - </panel> - <text name="physics_description"> - Criaremos uma forma para o corpo externo do modelo. Ajuste o nível de detalhes como necessário para a finalidade desejada de seu modelo. - </text> - <panel name="physics_content"> - <button label="Recalcular físico" name="recalculate_physics_btn"/> - <button label="Recalculando..." name="recalculating_physics_btn"/> - <text name="lod_label"> - Visualização do físico - </text> - <combo_box name="preview_lod_combo2" tool_tip="LOD para exibir na renderização de visualização"> - <combo_item name="high"> - Máximo de detalhes - </combo_item> - <combo_item name="medium"> - Detalhes médios - </combo_item> - <combo_item name="low"> - Poucos detalhes - </combo_item> - <combo_item name="lowest"> - Mínimo de detalhes - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> - Revisar - </text> - </panel> - <panel name="review_content"> - <text name="review_prim_equiv"> - Impacto no lote/região: [EQUIV] equivalentes de prim - </text> - <text name="review_fee"> - Uma tarifa de upload de L$ [FEE] será debitada da sua conta. - </text> - <text name="review_confirmation"> - Ao clicar no botão de upload, você confirma que detém os direitos apropriados sobre o material contido no modelo. - </text> - </panel> - </panel> - <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> - Upload concluído - </text> - </panel> - <text name="model_uploaded_text"> - Seu modelo foi carregado. - </text> - <text name="inventory_text"> - Disponível na pasta Objetos do seu inventário. - </text> - <text name="charged_fee"> - L$ [FEE] foram debitados da sua conta. - </text> - </panel> - <button label="<< Voltar" name="back"/> - <button label="Próximo >>" name="next"/> - <button label="Calcular pesos e tarifa >>" name="calculate"/> - <button label="Calculando..." name="calculating"/> - <button label="Carregar" name="upload" tool_tip="Carregar no simulador"/> - <button label="Cancelar" name="cancel"/> - <button label="Fechar" name="close"/> - <spinner name="import_scale" value="1.0"/> - <string name="status_idle"> - Inativo - </string> - <string name="status_parse_error"> - Dae parsing - erro, detalhes no log. - </string> - <string name="status_reading_file"> - Carregando... - </string> - <string name="status_generating_meshes"> - Gerando meshes... - </string> - <string name="status_vertex_number_overflow"> - Erro: Número de Vertex acima de 65534. Abortado. - </string> - <string name="bad_element"> - Erro: elemento inválido - </string> - <string name="high"> - Alto - </string> - <string name="medium"> - Médio - </string> - <string name="low"> - Baixo - </string> - <string name="lowest"> - Mais baixo - </string> - <string name="mesh_status_good"> - Entregar! - </string> - <string name="mesh_status_na"> - N/D - </string> - <string name="mesh_status_none"> - Nenhum - </string> - <string name="mesh_status_submesh_mismatch"> - Cada nível de detalhamento têm um número de faces para textura. - </string> - <string name="mesh_status_mesh_mismatch"> - Cada nível de detalhamento têm um número de faces para textura. - </string> - <string name="mesh_status_too_many_vertices"> - O nível de detalhamento possui vértices demais. - </string> - <string name="mesh_status_missing_lod"> - Falta o nível de detalhamento necessário. - </string> - <string name="layer_all"> - Tudo - </string> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml index b650b7945c..19474d8099 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Descrição: </text> - <button label="Tocar inworld" label_selected="Parar" name="Anim play btn" tool_tip="Tocar essa animação de forma que outros possam ver" width="131"/> - <button label="Executar localmente" label_selected="Parar" left="162" name="Anim audition btn" tool_tip="Tocar essa animação de forma que apenas você possa ver" width="120"/> + <button label="Tocar inworld" label_selected="Parar" name="Inworld" tool_tip="Executar essa animação de forma que outros possam ver"/> + <button label="Tocar localmente" label_selected="Parar" name="Locally" tool_tip="Executar animação de forma que apenas você possa ver"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml new file mode 100644 index 0000000000..dd282bf1fc --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Test Floater" title="JANELA DE TESTE"/> diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml index f35f31f5f7..4b31833602 100644 --- a/indra/newview/skins/default/xui/pt/floater_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_tools.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="toolbox floater" short_title="BUILD TOOLS" title=""> + <floater.string name="grid_screen_text"> + Tela + </floater.string> + <floater.string name="grid_local_text"> + Local + </floater.string> + <floater.string name="grid_world_text"> + Mundo + </floater.string> + <floater.string name="grid_reference_text"> + Referência + </floater.string> + <floater.string name="grid_attachment_text"> + Anexo + </floater.string> <floater.string name="status_rotate"> Arrastar as faixas coloridas para girar o objeto </floater.string> @@ -63,7 +78,12 @@ </text> <check_box initial_value="true" label="Esticar texturas" name="checkbox stretch textures"/> <check_box initial_value="true" label="Ajustar" name="checkbox snap to grid"/> - <button label="Opções..." label_selected="Opções..." name="Options..." tool_tip="Mais opções de grade"/> + <combo_box name="combobox grid mode" tool_tip="Selecione o tipo de régua da grade onde o objeto será colocado"> + <combo_box.item label="Mundo" name="World"/> + <combo_box.item label="Local" name="Local"/> + <combo_box.item label="Referência" name="Reference"/> + </combo_box> + <button label="" label_selected="Opções..." name="Options..." tool_tip="Mais opções de grade"/> <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/> <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirâmide"/> diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml index 4f01600d9f..b29ca3d699 100644 --- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml @@ -42,13 +42,16 @@ <string name="effect_Demon"> Demônio </string> + <string name="effect_Female Elf"> + Elfa + </string> <string name="effect_Flirty"> Paquerador </string> <string name="effect_Foxy"> Sensual </string> - <string name="effect_Halloween_2010_Bonus"> + <string name="effect_Halloween 2010 Bonus"> Bônus_Halloween_2010 </string> <string name="effect_Helium"> @@ -57,9 +60,18 @@ <string name="effect_Husky"> Rouco </string> + <string name="effect_Husky Whisper"> + Sussurro rouco + </string> <string name="effect_Intercom"> Interfone </string> + <string name="effect_Julia"> + Julia + </string> + <string name="effect_Lo Lilt"> + Cantarolado baixo + </string> <string name="effect_Macho"> Macho </string> @@ -69,6 +81,9 @@ <string name="effect_Mini"> Mini </string> + <string name="effect_Model"> + Modelo + </string> <string name="effect_Nano"> Nano </string> @@ -90,6 +105,9 @@ <string name="effect_Roxanne"> Roxanne </string> + <string name="effect_Rumble"> + Ronco + </string> <string name="effect_Sabrina"> Sabrina </string> @@ -102,6 +120,9 @@ <string name="effect_Shorty"> Baixinho </string> + <string name="effect_Smaller"> + Menor + </string> <string name="effect_Sneaky"> Sorrateiro </string> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml index 24a2f713fd..09e1fbf72e 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml @@ -59,6 +59,7 @@ <menu_item_call label="Propriedades" name="Properties"/> <menu_item_call label="Renomear" name="Rename"/> <menu_item_call label="Copiar item UUID" name="Copy Asset UUID"/> + <menu_item_call label="Cortar" name="Cut"/> <menu_item_call label="Copiar" name="Copy"/> <menu_item_call label="Colar" name="Paste"/> <menu_item_call label="Colar como link" name="Paste As Link"/> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index 8960ffec81..fd973bf3c2 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -21,6 +21,7 @@ <menu_item_call label="Ocupado" name="Set Busy"/> </menu> <menu_item_call label="Comprar L$..." name="Buy and Sell L$"/> + <menu_item_call label="Caixa de saída do lojista..." name="MerchantOutbox"/> <menu_item_call label="Painel da conta..." name="Manage My Account"> <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=pt"/> </menu_item_call> @@ -117,7 +118,7 @@ <menu_item_call label="Devolver objeto" name="Return Object back to Owner"/> </menu> <menu label="Scripts" name="Scripts"> - <menu_item_call label="Recompilar scripts (LSL)" name="Mono"/> + <menu_item_call label="Recompilar scripts (Mono)" name="Mono"/> <menu_item_call label="Recompilar scripts (LSL)" name="LSL"/> <menu_item_call label="Resetar scripts" name="Reset Scripts"/> <menu_item_call label="Scripts em modo execução" name="Set Scripts to Running"/> @@ -162,7 +163,7 @@ <menu_item_check label="Limitar distância da seleção" name="Limit Select Distance"/> <menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/> <menu_item_check label="Foto de alta resolução" name="HighResSnapshot"/> - <menu_item_check label="Compactar fotos para HD" name="QuietSnapshotsToDisk"/> + <menu_item_check label="Fotos sem barulho para HD" name="QuietSnapshotsToDisk"/> <menu label="Ferramentas de desempenho" name="Performance Tools"> <menu_item_call label="Medidor de lag" name="Lag Meter"/> <menu_item_check label="Barra de estatísticas" name="Statistics Bar"/> @@ -334,8 +335,15 @@ </menu> <menu_item_check label="Texturas HTTP" name="HTTP Textures"/> <menu_item_check label="Inventário HTTP" name="HTTP Inventory"/> + <menu_item_call label="Habilitar Visual Leak Detector" name="Enable Visual Leak Detector"/> <menu_item_check label="Console Window on next Run" name="Console Window"/> - <menu label="Configurar nível de registro em log" name="Set Logging Level"/> + <menu label="Configurar nível de registro em log" name="Set Logging Level"> + <menu_item_check label="Depurar" name="Debug"/> + <menu_item_check label="Info" name="Info"/> + <menu_item_check label="Aviso" name="Warning"/> + <menu_item_check label="Error" name="Error"/> + <menu_item_check label="Nenhum" name="None"/> + </menu> <menu_item_call label="Request Admin Status" name="Request Admin Options"/> <menu_item_call label="Sair do modo admin" name="Leave Admin Options"/> <menu_item_check label="Mostrar menu admin" name="View Admin Options"/> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 20d59aa0f8..3b39c0f92c 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -664,7 +664,7 @@ Esperada [VALIDS] Incapaz de criar arquivo de saída: [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - O [APP_NAME] ainda não faz o upload de vários arquivos de animação de uma vez. + O [APP_NAME] ainda não faz o upload de vários arquivos de animação no formato BVH de uma vez. </notification> <notification name="CannotUploadReason"> Incapaz de carregar [FILE] devido ao seguinte motivo: [REASON] @@ -2612,16 +2612,16 @@ Deseja aceitar? '<nolink>[TITLE]</nolink>' de [NAME] [MESSAGE] <form name="form"> - <button name="Mute" text="Bloquear"/> - <button name="Ignore" text="Ignorar"/> + <button name="Client_Side_Mute" text="Bloquear"/> + <button name="Client_Side_Ignore" text="Ignorar"/> </form> </notification> <notification name="ScriptDialogGroup"> <nolink>[TITLE]</nolink>' de [GROUPNAME]' [MESSAGE] <form name="form"> - <button name="Mute" text="Bloquear"/> - <button name="Ignore" text="Ignorar"/> + <button name="Client_Side_Mute" text="Bloquear"/> + <button name="Client_Side_Ignore" text="Ignorar"/> </form> </notification> <notification name="BuyLindenDollarSuccess"> diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml index 15470dc94a..6828d41dee 100644 --- a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="nearby_chat"> - <check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/> + <layout_stack name="stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml index 22853f0643..cb9a6eb757 100644 --- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml @@ -15,7 +15,7 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <panel name="balance_bg"> + <panel left="-410" name="balance_bg" width="200"> <text name="balance" tool_tip="Atualizar saldo de L$" value="L$20"/> <button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/> <button label="Comprar" name="goShop" tool_tip="Abrir Mercado do Second Life" width="80"/> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml index 72baf3a5c3..7908ea5f3a 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml @@ -14,9 +14,9 @@ <text name="inbox_fresh_new_count"> [NUM] novo(s) </text> - <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <panel name="inbox_inventory_placeholder_panel" tool_tip="Arraste e solte itens para o seu inventário para usá-los"> <text name="inbox_inventory_placeholder"> - Compras do marketplace serão entregues aqui. + As compras do marketplace serão entregues aqui. </text> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 7fb3b3e6ee..342a52356b 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -784,6 +784,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="anim_yes_head"> Sim </string> + <string name="multiple_textures"> + Múltiplo + </string> <string name="texture_loading"> Carregando... </string> @@ -1181,7 +1184,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para Você não possui uma cópia desta textura no seu inventário </string> <string name="InventoryInboxNoItems"> - Alguns itens recebidos, como os brindes premium, aparecerão aqui. Você pode arrastá-los para o seu inventário. + Suas compras do Marketplace aparecerão aqui. Depois, você poderá arrastá-las para seu inventário para usá-las. </string> <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ @@ -3797,6 +3800,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Saved_message"> (Salvo em [LONG_TIMESTAMP]) </string> + <string name="IM_unblock_only_groups_friends"> + Para visualizar esta mensagem, você deve desmarcar "Apenas amigos e grupos podem me ligar ou enviar MIs" em Preferências/Privacidade. + </string> <string name="answered_call"> Ligação atendida </string> diff --git a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml new file mode 100644 index 0000000000..711afc2717 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Anim Preview" title="ANIMATION.ANIM"> + <text name="name_label"> + Название: + </text> + <text name="description_label"> + Описание: + </text> + <button label="Передать (L$[AMOUNT])" name="ok_btn"/> + <button label="Отмена" label_selected="Отмена" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml new file mode 100644 index 0000000000..8ad9d8657a --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Animation Preview"> + <floater.string name="failed_to_initialize"> + Невозможно инициализировать движение + </floater.string> + <floater.string name="anim_too_long"> + Длина файла анимации: [LENGTH] с. + +Максимальная длина анимации: [MAX_LENGTH] с. + </floater.string> + <floater.string name="failed_file_read"> + Невозможно прочитать файл анимации. + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + ОК + </floater.string> + <floater.string name="E_ST_EOF"> + Преждевременный конец файла. + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + Не могу прочитать определение ограничений. + </floater.string> + <floater.string name="E_ST_NO_FILE"> + Не удалось открыть BVH-файл. + </floater.string> + <floater.string name="E_ST_NO_HIER"> + Неправильный заголовок HIERARCHY. + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + Не удалось найти ROOT или JOINT. + </floater.string> + <floater.string name="E_ST_NO_NAME"> + Не удалось получить имя JOINT. + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + Не удалось найти OFFSET. + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + Не удалось найти CHANNELS. + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + Не удалось получить порядок вращения. + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + Не удалось получить оси вращения. + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + Не удалось найти MOTION. + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + Не удалось получить количество кадров. + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + Не удалось получить время кадра. + </floater.string> + <floater.string name="E_ST_NO_POS"> + Не удалось получить значения position. + </floater.string> + <floater.string name="E_ST_NO_ROT"> + Не удалось получить значения rotation. + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + Не удалось открыть файл перевода. + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + Не удалось прочитать заголовок перевода. + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + Не удалось прочитать имена перевода. + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + Не удалось прочитать значение перевода ignore. + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + Не удалось прочитать значение перевода relative. + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + Не удалось прочитать значение перевода outname. + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + Не удалось прочитать матрицу перевода. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + Не удалось получить имя mergechild. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + Не удалось получить имя mergeparent. + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + Не удалось получить значение priority. + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + Не удалось получить значение loop. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + Не удалось получить значения easeIn. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + Не удалось получить значения easeOut. + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + Не удалось получить значение hand morph. + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + Не удалось прочитать имя emote. + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Неверное имя корневого соединения, должно быть «hip». + </floater.string> + <text name="name_label"> + Название: + </text> + <text name="description_label"> + Описание: + </text> + <spinner label="Приоритет" name="priority" tool_tip="Управляет тем, как другие анимации могут перекрываться этой"/> + <check_box label="Цикл" name="loop_check" tool_tip="Делает анимацию зацикленной"/> + <spinner label="Начало(%)" name="loop_in_point" tool_tip="Устанавливает точку возврата цикла"/> + <spinner label="Конец(%)" name="loop_out_point" tool_tip="Устанавливает точку конца цикла"/> + <text name="hand_label"> + Положение пальцев + </text> + <combo_box name="hand_pose_combo" tool_tip="Контролирует положение пальцев во время анимации"> + <combo_box.item label="Разведены" name="Spread"/> + <combo_box.item label="Расслаблены" name="Relaxed"/> + <combo_box.item label="Указывают" name="PointBoth"/> + <combo_box.item label="Сжаты в кулак" name="Fist"/> + <combo_box.item label="Левые расслаблены" name="RelaxedLeft"/> + <combo_box.item label="Левые указывают" name="PointLeft"/> + <combo_box.item label="Левые в кулак" name="FistLeft"/> + <combo_box.item label="Правые расслаблены" name="RelaxedRight"/> + <combo_box.item label="Правые указывают" name="PointRight"/> + <combo_box.item label="Правые в кулак" name="FistRight"/> + <combo_box.item label="Правые в приветствии" name="SaluteRight"/> + <combo_box.item label="Печатают" name="Typing"/> + <combo_box.item label="Правые «V»" name="PeaceRight"/> + </combo_box> + <text name="emote_label"> + Выражение лица + </text> + <combo_box name="emote_combo" tool_tip="Контролирует выражение лица во время анимации"> + <item label="(нет)" name="[None]" value=""/> + <item label="Ааааах" name="Aaaaah" value="Ааааах"/> + <item label="Боится" name="Afraid" value="Боится"/> + <item label="Злится" name="Angry" value="Злится"/> + <item label="Широко улыбается" name="BigSmile" value="Широко улыбается"/> + <item label="Скучает" name="Bored" value="Скучает"/> + <item label="Плачет" name="Cry" value="Плачет"/> + <item label="Презирает" name="Disdain" value="Презирает"/> + <item label="Смущается" name="Embarrassed" value="Смущается"/> + <item label="Хмурится" name="Frown" value="Хмурится"/> + <item label="Целует" name="Kiss" value="Целует"/> + <item label="Смеется" name="Laugh" value="Смеется"/> + <item label="Дразнится" name="Plllppt" value="Дразнится"/> + <item label="Не соглашается" name="Repulsed" value="Не соглашается"/> + <item label="Грустит" name="Sad" value="Грустит"/> + <item label="Не понимает" name="Shrug" value="Не понимает"/> + <item label="Улыбается" name="Smile" value="Улыбается"/> + <item label="Удивляется" name="Surprise" value="Удивляется"/> + <item label="Подмигивает" name="Wink" value="Подмигивает"/> + <item label="Беспокоится" name="Worry" value="Беспокоится"/> + </combo_box> + <text name="preview_label"> + Просмотр во время + </text> + <combo_box name="preview_base_anim" tool_tip="Просмотр вашей анимации во время выполнения аватаром действий."> + <item label="Стояние" name="Standing" value="Стояние"/> + <item label="Ходьба" name="Walking" value="Ходьба"/> + <item label="Сидение" name="Sitting" value="Сидение"/> + <item label="Полет" name="Flying" value="Полет"/> + </combo_box> + <spinner label="Вход (сек.)" name="ease_in_time" tool_tip="Количество времени (в секундах) для входа в стартовое положение"/> + <spinner label="Выход (сек.)" name="ease_out_time" tool_tip="Количество времени (в секундах) для выхода из анимации"/> + <button name="play_btn" tool_tip="Проиграть анимацию"/> + <button name="pause_btn" tool_tip="Приостановить анимацию"/> + <button name="stop_btn" tool_tip="Остановить проигрывание анимации"/> + <text name="bad_animation_text"> + Невозможно прочитать файл анимации. + +Рекомендуется использовать BVH-файлы, экспортированные из Poser 4. + </text> + <button label="Передать (L$[AMOUNT])" name="ok_btn"/> + <button label="Отмена" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_model_wizard.xml b/indra/newview/skins/default/xui/ru/floater_model_wizard.xml deleted file mode 100644 index c1a63bf7da..0000000000 --- a/indra/newview/skins/default/xui/ru/floater_model_wizard.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="ПЕРЕДАТЬ МАСТЕР МОДЕЛИРОВАНИЯ"> - <button label="5. Передать" name="upload_btn"/> - <button label="4. Просмотр" name="review_btn"/> - <button label="3. Физика" name="physics_btn"/> - <button label="2. Оптимизировать" name="optimize_btn"/> - <button label="1. Выбрать файл" name="choose_file_btn"/> - <panel name="choose_file_panel"> - <panel name="choose_file_header_panel"> - <text name="choose_file_header_text"> - Выберите файл модели - </text> - </panel> - <panel name="choose_file_content"> - <text name="advanced_users_text"> - Пользователям, работающим в расширенном режиме: если вы умеете создавать трехмерные графические объекты, то, возможно, захотите воспользоваться средством Advanced Uploader, которое предоставляет расширенные возможности передачи объектов. - </text> - <button label="Перейти в расширенный режим" name="switch_to_advanced"/> - <text name="Cache location"> - Выберите файл модели для передачи - </text> - <button label="Обзор..." label_selected="Обзор..." name="browse"/> - <text name="Model types"> - В Second Life поддерживаются файлы COLLADA (.dae) - </text> - <text name="dimensions"> - X Y Z - </text> - <text name="warning_label"> - ВНИМАНИЕ! - </text> - <text name="warning_text"> - Вы не сможете завершить передачу этой модели на серверы Second Life. [secondlife:///app/floater/learn_more Узнайте, как] настроить в вашем аккаунте передачу сеточных моделей. - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> - Оптимизировать модель - </text> - </panel> - <text name="optimize_description"> - Мы оптимизировали модель для повышения быстродействия. По желанию можно выполнить дополнительную настройку. - </text> - <panel name="optimize_content"> - <text name="high_detail_text"> - Создать уровень детализации: Высокий - </text> - <text name="medium_detail_text"> - Создать уровень детализации: Средний - </text> - <text name="low_detail_text"> - Создать уровень детализации: Низкий - </text> - <text name="lowest_detail_text"> - Создать уровень детализации: Самый низкий - </text> - </panel> - <panel name="content2"> - <button label="Пересчитать геометрию" name="recalculate_geometry_btn"/> - <text name="lod_label"> - Просмотр геометрии - </text> - <combo_box name="preview_lod_combo" tool_tip="Детализация при предварительном просмотре"> - <combo_item name="high"> - Детально - </combo_item> - <combo_item name="medium"> - Средняя детализация - </combo_item> - <combo_item name="low"> - Мало деталей - </combo_item> - <combo_item name="lowest"> - Минимум деталей - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> - Настроить физические параметры - </text> - </panel> - <text name="physics_description"> - Мы создадим форму для внешнего каркаса модели. Настройте уровень детализации формы в соответствии с целями, для которых предназначена модель. - </text> - <panel name="physics_content"> - <button label="Пересчитать физические данные" name="recalculate_physics_btn"/> - <button label="Пересчет..." name="recalculating_physics_btn"/> - <text name="lod_label"> - Просмотр физических данных - </text> - <combo_box name="preview_lod_combo2" tool_tip="Уровень детализации при предварительном просмотре"> - <combo_item name="high"> - Детально - </combo_item> - <combo_item name="medium"> - Средняя детализация - </combo_item> - <combo_item name="low"> - Мало деталей - </combo_item> - <combo_item name="lowest"> - Минимум деталей - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> - Просмотр - </text> - </panel> - <panel name="review_content"> - <text name="review_prim_equiv"> - Воздействие на участок/регион: эквивалент в примитивах: [EQUIV] - </text> - <text name="review_fee"> - За передачу с вашего счета будет снята плата в размере L$[FEE]. - </text> - <text name="review_confirmation"> - Нажав кнопку «Передать», вы подтверждаете, что у вас есть надлежащие права на все составляющие модели. - </text> - </panel> - </panel> - <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> - Передача завершена - </text> - </panel> - <text name="model_uploaded_text"> - Ваша модель передана. - </text> - <text name="inventory_text"> - Находится в папке «Объекты» вашего инвентаря. - </text> - <text name="charged_fee"> - С вашего счета снято: L$[FEE]. - </text> - </panel> - <button label="<< Назад" name="back"/> - <button label="Далее >>" name="next"/> - <button label="Рассчитать вес и плату >>" name="calculate"/> - <button label="Расчет..." name="calculating"/> - <button label="Передать" name="upload" tool_tip="Передать в симулятор"/> - <button label="Отмена" name="cancel"/> - <button label="Закрыть" name="close"/> - <spinner name="import_scale" value="1.0"/> - <string name="status_idle"> - Неактивно - </string> - <string name="status_parse_error"> - Проблема при анализе файла DAE – см. подробности в журнале. - </string> - <string name="status_reading_file"> - Загрузка... - </string> - <string name="status_generating_meshes"> - Создаются меши... - </string> - <string name="status_vertex_number_overflow"> - Ошибка. Число вершин превышает 65534. Прервано. - </string> - <string name="bad_element"> - Ошибка: недопустимый элемент - </string> - <string name="high"> - высокий - </string> - <string name="medium"> - средний - </string> - <string name="low"> - низкий - </string> - <string name="lowest"> - самый низкий - </string> - <string name="mesh_status_good"> - Доставлено! - </string> - <string name="mesh_status_na"> - Н/Д - </string> - <string name="mesh_status_none"> - Нет - </string> - <string name="mesh_status_submesh_mismatch"> - Отличается число текстурируемых граней на уровнях детализации. - </string> - <string name="mesh_status_mesh_mismatch"> - Отличается число экземпляров меша на уровнях детализации. - </string> - <string name="mesh_status_too_many_vertices"> - Слишком много вершин на уровне детализации. - </string> - <string name="mesh_status_missing_lod"> - Отсутствует необходимый уровень детализации. - </string> - <string name="layer_all"> - Все - </string> -</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml index a1fabedb85..22c6bc5901 100644 --- a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Описание: </text> - <button label="Проиграть для всех" label_selected="Стоп" name="Anim play btn" tool_tip="Проигрывание этой анимации могут видеть другие участники"/> - <button label="Проиграть для себя" label_selected="Стоп" name="Anim audition btn" tool_tip="Проигрывание этой анимации можете видеть только вы"/> + <button label="Проиграть для всех" label_selected="Стоп" name="Inworld" tool_tip="Проигрывание этой анимации могут видеть другие участники"/> + <button label="Проиграть для себя" label_selected="Стоп" name="Locally" tool_tip="Проигрывание этой анимации можете видеть только вы"/> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml new file mode 100644 index 0000000000..d0bd86160e --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Test Floater" title="ТЕСТИРОВАТЬ ОКНО"/> diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml index eb9083f7fc..3d7d1198f0 100644 --- a/indra/newview/skins/default/xui/ru/floater_tools.xml +++ b/indra/newview/skins/default/xui/ru/floater_tools.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="toolbox floater" short_title="ИНСТРУМЕНТЫ ДЛЯ СТРОИТЕЛЬСТВА"> + <floater.string name="grid_screen_text"> + Экран + </floater.string> + <floater.string name="grid_local_text"> + Локальная + </floater.string> + <floater.string name="grid_world_text"> + Мировая + </floater.string> + <floater.string name="grid_reference_text"> + Точка отсчета + </floater.string> + <floater.string name="grid_attachment_text"> + Присоединение + </floater.string> <floater.string name="status_rotate"> Перетягивайте цветные полосы для вращения объекта </floater.string> @@ -63,7 +78,12 @@ </text> <check_box initial_value="истина" label="Растягивать текстуры" name="checkbox stretch textures"/> <check_box initial_value="истина" label="Привязка" name="checkbox snap to grid"/> - <button label="Параметры..." name="Options..." tool_tip="Дополнительные параметры сетки"/> + <combo_box name="combobox grid mode" tool_tip="Выберите тип линейки сетки для размещения объекта"> + <combo_box.item label="Мировая" name="World"/> + <combo_box.item label="Локальная" name="Local"/> + <combo_box.item label="Точка отсчета" name="Reference"/> + </combo_box> + <button label="" name="Options..." tool_tip="Дополнительные параметры сетки"/> <button name="ToolCube" tool_tip="Куб"/> <button name="ToolPrism" tool_tip="Призма"/> <button name="ToolPyramid" tool_tip="Пирамида"/> diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml index d4bf615fe4..1eb8a94d7a 100644 --- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml @@ -42,13 +42,16 @@ <string name="effect_Demon"> Demon </string> + <string name="effect_Female Elf"> + Фея + </string> <string name="effect_Flirty"> Flirty </string> <string name="effect_Foxy"> Foxy </string> - <string name="effect_Halloween_2010_Bonus"> + <string name="effect_Halloween 2010 Bonus"> Бонус_за_Хэллоуин_2010 </string> <string name="effect_Helium"> @@ -57,9 +60,18 @@ <string name="effect_Husky"> Husky </string> + <string name="effect_Husky Whisper"> + Хриплый шепот + </string> <string name="effect_Intercom"> Внутренняя связь </string> + <string name="effect_Julia"> + Julia + </string> + <string name="effect_Lo Lilt"> + Напев + </string> <string name="effect_Macho"> Macho </string> @@ -69,6 +81,9 @@ <string name="effect_Mini"> Mini </string> + <string name="effect_Model"> + Модель + </string> <string name="effect_Nano"> Nano </string> @@ -90,6 +105,9 @@ <string name="effect_Roxanne"> Roxanne </string> + <string name="effect_Rumble"> + Урчание + </string> <string name="effect_Sabrina"> Sabrina </string> @@ -102,6 +120,9 @@ <string name="effect_Shorty"> Shorty </string> + <string name="effect_Smaller"> + Меньше + </string> <string name="effect_Sneaky"> Sneaky </string> diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml index df5e5329a3..49f7281b4e 100644 --- a/indra/newview/skins/default/xui/ru/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml @@ -59,6 +59,7 @@ <menu_item_call label="Свойства" name="Properties"/> <menu_item_call label="Переименовать" name="Rename"/> <menu_item_call label="Копировать UUID актива" name="Copy Asset UUID"/> + <menu_item_call label="Вырезать" name="Cut"/> <menu_item_call label="Копировать" name="Copy"/> <menu_item_call label="Вставить" name="Paste"/> <menu_item_call label="Вставить как ссылку" name="Paste As Link"/> diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index 7698614751..0699314d97 100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -21,6 +21,7 @@ <menu_item_call label="Не беспокоить" name="Set Busy"/> </menu> <menu_item_call label="Купить L$..." name="Buy and Sell L$"/> + <menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/> <menu_item_call label="Информационная панель аккаунта..." name="Manage My Account"/> <menu_item_call label="Настройки..." name="Preferences"/> <menu_item_call label="Кнопки панели инструментов..." name="Toolbars"/> @@ -391,9 +392,16 @@ <menu_item_check label="Текстуры HTTP" name="HTTP Textures"/> <menu_item_check label="Инвентарь HTTP" name="HTTP Inventory"/> <menu_item_call label="Сжатие изображений" name="Compress Images"/> + <menu_item_call label="Включить Visual Leak Detector" name="Enable Visual Leak Detector"/> <menu_item_check label="Вывод минидампа при отладке" name="Output Debug Minidump"/> <menu_item_check label="Окно консоли при следующем запуске" name="Console Window"/> - <menu label="Уровень журнала" name="Set Logging Level"/> + <menu label="Уровень журнала" name="Set Logging Level"> + <menu_item_check label="Отладка" name="Debug"/> + <menu_item_check label="Информация" name="Info"/> + <menu_item_check label="Предупреждение" name="Warning"/> + <menu_item_check label="Ошибка" name="Error"/> + <menu_item_check label="Нет" name="None"/> + </menu> <menu_item_call label="Запрос статуса администратора" name="Request Admin Options"/> <menu_item_call label="Выход из статуса администратора" name="Leave Admin Options"/> <menu_item_check label="Показать меню администратора" name="View Admin Options"/> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 1854d43e0a..b4692385d1 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -670,7 +670,7 @@ Невозможно создать выходной файл: [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - [APP_NAME] пока не поддерживает массовую передачу файлов анимации. + [APP_NAME] пока не поддерживает массовую передачу файлов анимации формата BVH. </notification> <notification name="CannotUploadReason"> Невозможно передать [FILE] по следующей причине: [REASON] @@ -2630,16 +2630,16 @@ http://secondlife.com/download. [NAME] – «<nolink>[TITLE]</nolink>» [MESSAGE] <form name="form"> - <button name="Mute" text="Блокировать"/> - <button name="Ignore" text="Игнорировать"/> + <button name="Client_Side_Mute" text="Заблокировать"/> + <button name="Client_Side_Ignore" text="Игнорировать"/> </form> </notification> <notification name="ScriptDialogGroup"> [GROUPNAME] – «<nolink>[TITLE]</nolink>» [MESSAGE] <form name="form"> - <button name="Mute" text="Блокировать"/> - <button name="Ignore" text="Игнорировать"/> + <button name="Client_Side_Mute" text="Заблокировать"/> + <button name="Client_Side_Ignore" text="Игнорировать"/> </form> </notification> <notification name="BuyLindenDollarSuccess"> diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml index 8e3aac38d2..a8fdfde1c4 100644 --- a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="nearby_chat"> - <check_box label="Переводить чат" name="translate_chat_checkbox"/> + <layout_stack name="stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Переводить чат" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/indra/newview/skins/default/xui/ru/panel_status_bar.xml index babe5811ac..9c84ff1fd8 100644 --- a/indra/newview/skins/default/xui/ru/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/ru/panel_status_bar.xml @@ -15,7 +15,7 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <panel name="balance_bg"> + <panel left="-450" name="balance_bg" width="240"> <text name="balance" tool_tip="Щелкните для обновления вашего баланса L$" value="L$20"/> <button label="Купить L$" name="buyL" tool_tip="Щелкните для покупки L$"/> <button label="Торговый центр" name="goShop" tool_tip="Открыть торговый центр Second Life" width="121"/> diff --git a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml index b3d3ed9aad..c106c2de79 100644 --- a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml @@ -14,7 +14,7 @@ <text name="inbox_fresh_new_count"> Новых: [NUM] </text> - <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <panel name="inbox_inventory_placeholder_panel" tool_tip="Перетащите вещи в ваш инвентарь для их использования"> <text name="inbox_inventory_placeholder"> Покупки из торгового центра будут доставлены сюда. </text> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 4240514621..8dbc4f092d 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -832,6 +832,9 @@ support@secondlife.com. <string name="anim_yes_head"> Согласие </string> + <string name="multiple_textures"> + Несколько + </string> <string name="texture_loading"> Загрузка... </string> @@ -1232,7 +1235,7 @@ support@secondlife.com. В вашем инвентаре нет копии этой текстуры </string> <string name="InventoryInboxNoItems"> - Здесь будут появляться полученные вами предметы, например подарки. Их можно будет перетащить в ваш инвентарь. + Здесь будут показаны ваши покупки из торгового центра. Их можно будет перетащить в ваш инвентарь для использования. </string> <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ @@ -3915,6 +3918,9 @@ support@secondlife.com. <string name="Saved_message"> (Сохранено [LONG_TIMESTAMP]) </string> + <string name="IM_unblock_only_groups_friends"> + Для просмотра этого сообщения снимите флажок «Только друзья и группы могут звонить мне и отправлять IM» в окне «Настройки/Приватность». + </string> <string name="answered_call"> На ваш звонок ответили </string> diff --git a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml new file mode 100644 index 0000000000..a63e1e107e --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Anim Preview" title="ANIMATION.ANIM"> + <text name="name_label"> + Ad: + </text> + <text name="description_label"> + Açıklama: + </text> + <button label="Karşıya Yükle (L$[AMOUNT])" name="ok_btn"/> + <button label="İptal" label_selected="İptal" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml new file mode 100644 index 0000000000..f8800c674d --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Animation Preview"> + <floater.string name="failed_to_initialize"> + Hareket başlatılamadı + </floater.string> + <floater.string name="anim_too_long"> + Animasyon dosyası [LENGTH] saniye uzunluğunda. + +Maksimum animasyon uzunluğu [LENGTH] saniye. + </floater.string> + <floater.string name="failed_file_read"> + Animasyon dosyası okunamadı. + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + Tamam + </floater.string> + <floater.string name="E_ST_EOF"> + Dosyanın zamanından önce sonu. + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + Kısıtlama tanımı okunamadı. + </floater.string> + <floater.string name="E_ST_NO_FILE"> + BVH dosyası açılamadı. + </floater.string> + <floater.string name="E_ST_NO_HIER"> + Geçersiz HİYERARŞİ üst bilgisi. + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + KÖK veya EKLEM bulunamadı. + </floater.string> + <floater.string name="E_ST_NO_NAME"> + EKLEM adı alınamadı. + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + OFSET bulunamadı. + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + KANALLAR bulunamadı. + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + Döndürme sırası alınamadı. + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + Döndürme ekseni alınamadı. + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + HAREKET bulunamadı. + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + kARE SAYISI alınamadı. + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + Kare zamanı alınamadı. + </floater.string> + <floater.string name="E_ST_NO_POS"> + Konum değerleri alınamadı. + </floater.string> + <floater.string name="E_ST_NO_ROT"> + Döndürme değerleri alınamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + Çeviri dosyası açılamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + Çeviri üst bilgisi okunamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + Çeviri adları okunamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + Çeviri yoksay değeri okunamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + Çeviri nisbi değeri okunamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + Çeviri çıkış adı değeri okunamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + Çeviri matrisi okunamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + Birleştirme alt birim adı alınamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + Birleştirme üst birim adı alınamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + Öncelik değerleri alınamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + Döngü (tekrar) değerleri alınamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + Easln (Yavaş Başlangıç) değerleri alınamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + EaseOut (Yavaş Bitiş) değerleri alınamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + El şekillendirme değeri alınamadı. + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + Duygu ifadesi adı okunamadı. + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Yanlış kök eklem adı, "kalça" kullanın + </floater.string> + <text name="name_label"> + Ad: + </text> + <text name="description_label"> + Açıklama: + </text> + <spinner label="Öncelik" name="priority" tool_tip="Bu animasyonun diğer animasyonları geçersiz kılabileceği kontrolleri"/> + <check_box label="Döngü" name="loop_check" tool_tip="Bu animasyonun döngülenmesini (tekrarlanmasını) sağlar"/> + <spinner label="İç (%)" name="loop_in_point" tool_tip="Döngünün döndüğü animasyon noktasını belirler"/> + <spinner label="Dış (%)" name="loop_out_point" tool_tip="Animasyonda döngünün bittiği noktayı belirler"/> + <text name="hand_label"> + El Duruşu + </text> + <combo_box name="hand_pose_combo" tool_tip="Ellerin animasyon sırasında neler yaptığını kontrol eder"> + <combo_box.item label="Yayılım" name="Spread"/> + <combo_box.item label="Rahat" name="Relaxed"/> + <combo_box.item label="Her İkisi de İşaret Ediyor" name="PointBoth"/> + <combo_box.item label="Yumruk" name="Fist"/> + <combo_box.item label="Sol Rahat" name="RelaxedLeft"/> + <combo_box.item label="Sol İşaret Ediyor" name="PointLeft"/> + <combo_box.item label="Sol Yumruk" name="FistLeft"/> + <combo_box.item label="Sağ Rahat" name="RelaxedRight"/> + <combo_box.item label="Sağ İşaret Ediyor" name="PointRight"/> + <combo_box.item label="Sağ Yumruk" name="FistRight"/> + <combo_box.item label="Sağı Selamlıyor" name="SaluteRight"/> + <combo_box.item label="Yazı Yazıyor" name="Typing"/> + <combo_box.item label="Sağ Barış" name="PeaceRight"/> + </combo_box> + <text name="emote_label"> + İfade + </text> + <combo_box name="emote_combo" tool_tip="Yüzün animasyon sırasındaki ifadesini kontrol eder"> + <item label="(Hiçbiri)" name="[None]" value=""/> + <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> + <item label="Korkmuş" name="Afraid" value="Korkmuş"/> + <item label="Kızgın" name="Angry" value="Kızgın"/> + <item label="Yaygın Gülümseyiş" name="BigSmile" value="Yaygın Gülümseyiş"/> + <item label="Canı Sıkılmış" name="Bored" value="Canı Sıkılmış"/> + <item label="Ağlama" name="Cry" value="Ağlama"/> + <item label="Dudak Bükme" name="Disdain" value="Dudak Bükme"/> + <item label="Utanmış" name="Embarrassed" value="Utanmış"/> + <item label="Kaş Çatma" name="Frown" value="Kaş Çatma"/> + <item label="Öpücük" name="Kiss" value="Öpücük"/> + <item label="Gülme" name="Laugh" value="Gülme"/> + <item label="Kahkaha" name="Plllppt" value="Kahkaha"/> + <item label="Tiksinmiş" name="Repulsed" value="Tiksinmiş"/> + <item label="Üzgün" name="Sad" value="Üzgün"/> + <item label="Omuz Silkme" name="Shrug" value="Omuz Silkme"/> + <item label="Gülümseme" name="Smile" value="Gülümseme"/> + <item label="Sürpriz" name="Surprise" value="Sürpriz"/> + <item label="Göz Kırpma" name="Wink" value="Göz Kırpma"/> + <item label="Endişelenme" name="Worry" value="Endişelenme"/> + </combo_box> + <text name="preview_label"> + Şu sırada önizle + </text> + <combo_box name="preview_base_anim" tool_tip="Animasyon davranışınızı avatarınız genel hareketleri yaparken test etmek için bunu kullanın."> + <item label="Ayakta Duruyor" name="Standing" value="Ayakta Duruyor"/> + <item label="Yürüyor" name="Walking" value="Yürüyor"/> + <item label="Oturuyor" name="Sitting" value="Oturuyor"/> + <item label="Uçuyor" name="Flying" value="Uçuyor"/> + </combo_box> + <spinner label="Yavaş Başlangıç (saniye)" name="ease_in_time" tool_tip="Animasyonun kaynaştığı süre (saniye olarak)"/> + <spinner label="Yavaş Bitiş (saniye)" name="ease_out_time" tool_tip="Animasyonun ayrıştığı süre (saniye olarak)"/> + <button name="play_btn" tool_tip="Animasyonunu oynat"/> + <button name="pause_btn" tool_tip="Animasyonunu duraklat"/> + <button name="stop_btn" tool_tip="Animasyo oynatmayı durdur"/> + <text name="bad_animation_text"> + Animasyon dosyası okunamadı. + +Poser 4'ten aktarılan BHV dosyalarını tavsiye ederiz. + </text> + <button label="Karşıya Yükle (L$[AMOUNT])" name="ok_btn"/> + <button label="İptal" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_model_wizard.xml b/indra/newview/skins/default/xui/tr/floater_model_wizard.xml deleted file mode 100644 index 9d8b982c24..0000000000 --- a/indra/newview/skins/default/xui/tr/floater_model_wizard.xml +++ /dev/null @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Model Wizard" title="KARŞIYA MODEL YÜKLEME SİHİRBAZI"> - <button label="5. Karşıya Yükle" name="upload_btn"/> - <button label="4. İncele" name="review_btn"/> - <button label="3. Fizik" name="physics_btn"/> - <button label="2. Optimize et" name="optimize_btn"/> - <button label="1. Dosya Seç" name="choose_file_btn"/> - <panel name="choose_file_panel"> - <panel name="choose_file_header_panel"> - <text name="choose_file_header_text"> - Model dosyasını seçin - </text> - </panel> - <panel name="choose_file_content"> - <text name="advanced_users_text"> - Gelişmiş kullanıcılar: Eğer 3B içerik oluşturma araçlarını kullanmayı biliyorsanız, Gelişmiş Karşıya Yükleyiciyi kullanmak isteyebilirsiniz. - </text> - <button label="Gelişmişe geç" name="switch_to_advanced"/> - <text name="Cache location"> - Karşıya yüklenecek model dosyasını seçin - </text> - <button label="Gözat..." label_selected="Gözat..." name="browse"/> - <text name="Model types"> - Second Life, COLLADA (.dae) dosyalarını destekler - </text> - <text name="dimensions"> - X Y Z - </text> - <text name="warning_label"> - UYARI: - </text> - <text name="warning_text"> - Bu modelin Second Life sunucularına nihai karşıya yükleme adımını tamamlayamayacaksınız. Hesabınızı örgü modellerinin karşıya yüklenmesi için ayarlamanın [secondlife:///app/floater/learn_more nasıl yapılacağını öğrenin]. - </text> - </panel> - </panel> - <panel name="optimize_panel"> - <panel name="optimize_header_panel"> - <text name="optimize_header_text"> - Modeli optimize et - </text> - </panel> - <text name="optimize_description"> - Modeli performans için optimize ettik. İstiyorsanız daha da ayarlayabilirsiniz. - </text> - <panel name="optimize_content"> - <text name="high_detail_text"> - Ayrıntı Seviyesi Oluştur: Yüksek - </text> - <text name="medium_detail_text"> - Ayrıntı Seviyesi Oluştur: Orta - </text> - <text name="low_detail_text"> - Ayrıntı Seviyesi Oluştur: Düşük - </text> - <text name="lowest_detail_text"> - Ayrıntı Seviyesi Oluştur: En Düşük - </text> - </panel> - <panel name="content2"> - <button label="Geometri hesaplarını tekrar yap" name="recalculate_geometry_btn"/> - <text name="lod_label"> - Geometri önizleme - </text> - <combo_box name="preview_lod_combo" tool_tip="Önizleme işlemesinde görülecek ayrıntı seviyesi"> - <combo_item name="high"> - Çok ayrıntı - </combo_item> - <combo_item name="medium"> - Orta düzey ayrıntı - </combo_item> - <combo_item name="low"> - Az ayrıntı - </combo_item> - <combo_item name="lowest"> - En az ayrıntı - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="physics_panel"> - <panel name="physics_header_panel"> - <text name="physics_header_text"> - Fizik ayarlarını yap - </text> - </panel> - <text name="physics_description"> - Modelin dış gövdesi için bir şekil oluşturacağız. Modelinizin amacına uygun olarak şeklin ayrıntı seviyesini belirleyin. - </text> - <panel name="physics_content"> - <button label="Fizik hesaplarını tekrar yap" name="recalculate_physics_btn"/> - <button label="Tekrar hesaplanıyor..." name="recalculating_physics_btn"/> - <text name="lod_label"> - Fizik önizleme - </text> - <combo_box name="preview_lod_combo2" tool_tip="Önizleme işlemesinde görülecek ayrıntı seviyesi"> - <combo_item name="high"> - Çok ayrıntı - </combo_item> - <combo_item name="medium"> - Orta düzey ayrıntı - </combo_item> - <combo_item name="low"> - Az ayrıntı - </combo_item> - <combo_item name="lowest"> - En az ayrıntı - </combo_item> - </combo_box> - </panel> - </panel> - <panel name="review_panel"> - <panel name="review_header_panel"> - <text name="review_header_text"> - İncele - </text> - </panel> - <panel name="review_content"> - <text name="review_prim_equiv"> - Parsele/bölgeye etkisi: [EQUIV] prim eşdeğerleri - </text> - <text name="review_fee"> - Hesabınızdan L$ [FEE] karşıya yükleme ücreti düşülecektir. - </text> - <text name="review_confirmation"> - Karşıya yükleme düğmesine tıkladığınızda, modelde yer alan malzeme için ilgili haklara sahip olduğunuzu teyid edersiniz. - </text> - </panel> - </panel> - <panel name="upload_panel"> - <panel name="upload_header_panel"> - <text name="upload_header_text"> - Karşıya yükleme bitti - </text> - </panel> - <text name="model_uploaded_text"> - Modeliniz karşıya yüklendi. - </text> - <text name="inventory_text"> - Bunu, envanterinizdeki Nesneler klasöründe bulacaksınız. - </text> - <text name="charged_fee"> - Hesabınızdan L$ [FEE] düşüldü. - </text> - </panel> - <button label="<< Geri" name="back"/> - <button label="Sonraki >>" name="next"/> - <button label="Ağırlıkları ve ücreti hesapla >>" name="calculate"/> - <button label="Hesaplanıyor..." name="calculating"/> - <button label="Karşıya Yükle" name="upload" tool_tip="Simülatöre karşıya yükle"/> - <button label="İptal" name="cancel"/> - <button label="Kapat" name="close"/> - <spinner name="import_scale" value="1.0"/> - <string name="status_idle"> - Boşta - </string> - <string name="status_parse_error"> - Dae ayrıştırma sorunu - ayrıntılar için günlüğe bakın. - </string> - <string name="status_reading_file"> - Yükleniyor... - </string> - <string name="status_generating_meshes"> - Örgüler Oluşturuluyor... - </string> - <string name="status_vertex_number_overflow"> - Hata: Köşe numarası 65534'ten fazla, işlem durduruldu! - </string> - <string name="bad_element"> - Hata: Öğe geçersiz - </string> - <string name="high"> - Yüksek - </string> - <string name="medium"> - Orta - </string> - <string name="low"> - Düşük - </string> - <string name="lowest"> - En Düşük - </string> - <string name="mesh_status_good"> - Uygula! - </string> - <string name="mesh_status_na"> - G/D - </string> - <string name="mesh_status_none"> - Hiçbiri - </string> - <string name="mesh_status_submesh_mismatch"> - Ayrıntı seviyelerinde farklı sayıda dokulanabilir yüz var. - </string> - <string name="mesh_status_mesh_mismatch"> - Ayrıntı seviyelerinde farklı sayıda örgü örneği var. - </string> - <string name="mesh_status_too_many_vertices"> - Ayrıntı seviyesinde fazla sayıda köşe var. - </string> - <string name="mesh_status_missing_lod"> - Gereken ayrıntı seviyesi eksik. - </string> - <string name="layer_all"> - Tümü - </string> -</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml index 1c526c75f9..23b4848333 100644 --- a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Açıklama: </text> - <button label="SL Dünyasında Oynat" label_selected="Durdur" name="Anim play btn" tool_tip="Bu animasyonu başkaları görebilecek şekilde oynatın"/> - <button label="Yerel Olarak Oynat" label_selected="Durdur" name="Anim audition btn" tool_tip="Bu animasyonu sadece kendinizin görebileceği şekilde oynatın"/> + <button label="SL Dünyasında Oynat" label_selected="Durdur" name="Inworld" tool_tip="Bu animasyonu başkaları görebilecek şekilde oynatın"/> + <button label="Yerel Olarak Oynat" label_selected="Durdur" name="Locally" tool_tip="Bu animasyonu sadece kendinizin görebileceği şekilde oynatın"/> </floater> diff --git a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml new file mode 100644 index 0000000000..fcb7d87287 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Test Floater" title="TEST PENCERESİ"/> diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml index d4ee9995dd..b0c59ced42 100644 --- a/indra/newview/skins/default/xui/tr/floater_tools.xml +++ b/indra/newview/skins/default/xui/tr/floater_tools.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="toolbox floater" short_title="İNŞA ET ARAÇLARI"> + <floater.string name="grid_screen_text"> + Ekran + </floater.string> + <floater.string name="grid_local_text"> + Yerel + </floater.string> + <floater.string name="grid_world_text"> + Dünya + </floater.string> + <floater.string name="grid_reference_text"> + Referans + </floater.string> + <floater.string name="grid_attachment_text"> + Aksesuar + </floater.string> <floater.string name="status_rotate"> Nesneyi döndürmek için renkli bantları sürükleyin </floater.string> @@ -63,7 +78,12 @@ </text> <check_box initial_value="true" label="Dokuları Uzat" name="checkbox stretch textures"/> <check_box initial_value="true" label="Yasla" name="checkbox snap to grid"/> - <button label="Seçenekler..." name="Options..." tool_tip="İlave ağ seçeneklerine bak"/> + <combo_box name="combobox grid mode" tool_tip="Nesneyi konumlandırmak için ağ cetvelini seçin"> + <combo_box.item label="Dünya" name="World"/> + <combo_box.item label="Yerel" name="Local"/> + <combo_box.item label="Referans" name="Reference"/> + </combo_box> + <button label="" name="Options..." tool_tip="İlave ağ seçeneklerine bak"/> <button name="ToolCube" tool_tip="Küp"/> <button name="ToolPrism" tool_tip="Prizma"/> <button name="ToolPyramid" tool_tip="Piramit"/> diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml index a10da39a69..3534a3fe90 100644 --- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml @@ -42,13 +42,16 @@ <string name="effect_Demon"> İblis </string> + <string name="effect_Female Elf"> + Dişi Cin + </string> <string name="effect_Flirty"> Cilveli </string> <string name="effect_Foxy"> Alımlı </string> - <string name="effect_Halloween_2010_Bonus"> + <string name="effect_Halloween 2010 Bonus"> Halloween_2010_Bonus </string> <string name="effect_Helium"> @@ -57,9 +60,18 @@ <string name="effect_Husky"> Güçlü </string> + <string name="effect_Husky Whisper"> + Boğuk Fısıltı + </string> <string name="effect_Intercom"> İnterkom </string> + <string name="effect_Julia"> + Julia + </string> + <string name="effect_Lo Lilt"> + Yavaş Mırıltı + </string> <string name="effect_Macho"> Maço </string> @@ -69,6 +81,9 @@ <string name="effect_Mini"> Mini </string> + <string name="effect_Model"> + Model + </string> <string name="effect_Nano"> Nano </string> @@ -90,6 +105,9 @@ <string name="effect_Roxanne"> Roxanne </string> + <string name="effect_Rumble"> + Gurultu + </string> <string name="effect_Sabrina"> Sabrina </string> @@ -102,6 +120,9 @@ <string name="effect_Shorty"> Bücür </string> + <string name="effect_Smaller"> + Daha Küçük + </string> <string name="effect_Sneaky"> Sinsi </string> diff --git a/indra/newview/skins/default/xui/tr/menu_inventory.xml b/indra/newview/skins/default/xui/tr/menu_inventory.xml index 6aaaab9c79..170cdebd24 100644 --- a/indra/newview/skins/default/xui/tr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory.xml @@ -59,6 +59,7 @@ <menu_item_call label="Özellikler" name="Properties"/> <menu_item_call label="Yeniden Adlandır" name="Rename"/> <menu_item_call label="Varlık UUID'sini Kopyala" name="Copy Asset UUID"/> + <menu_item_call label="Kes" name="Cut"/> <menu_item_call label="Kopyala" name="Copy"/> <menu_item_call label="Yapıştır" name="Paste"/> <menu_item_call label="Bağlantı Olarak Yapıştır" name="Paste As Link"/> diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index d24757bb79..d7b20bac4b 100644 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -21,6 +21,7 @@ <menu_item_call label="Meşgul" name="Set Busy"/> </menu> <menu_item_call label="L$ Satın Al..." name="Buy and Sell L$"/> + <menu_item_call label="Satıcı Giden Kutusu..." name="MerchantOutbox"/> <menu_item_call label="Hesap kontrol paneli..." name="Manage My Account"/> <menu_item_call label="Tercihler..." name="Preferences"/> <menu_item_call label="Araç çubuğu düğmeleri..." name="Toolbars"/> @@ -391,9 +392,16 @@ <menu_item_check label="HTTP Dokuları" name="HTTP Textures"/> <menu_item_check label="HTTP Envanteri" name="HTTP Inventory"/> <menu_item_call label="Görüntüleri Sıkıştır" name="Compress Images"/> + <menu_item_call label="Visual Leak Detector'ı Etkinleştir" name="Enable Visual Leak Detector"/> <menu_item_check label="Mini Döküm Dosyası Hata Ayıklama Çıktısı" name="Output Debug Minidump"/> <menu_item_check label="Sonraki Çalışmada Konsol Penceresi" name="Console Window"/> - <menu label="Günlük Tutma Seviyesini Seç" name="Set Logging Level"/> + <menu label="Günlük Tutma Seviyesini Seç" name="Set Logging Level"> + <menu_item_check label="Hata ayıkla" name="Debug"/> + <menu_item_check label="Bilgi" name="Info"/> + <menu_item_check label="Uyarı" name="Warning"/> + <menu_item_check label="Hata" name="Error"/> + <menu_item_check label="Hiçbiri" name="None"/> + </menu> <menu_item_call label="Yönetici Durumu Talep Et" name="Request Admin Options"/> <menu_item_call label="Yönetici Durumundan Ayrıl" name="Leave Admin Options"/> <menu_item_check label="Yönetici Menüsünü Göster" name="View Admin Options"/> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 719dbb8781..6681cdac7a 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -670,7 +670,7 @@ Beklenen [VALIDS] Çıkış dosyası oluşturulamıyor: [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - [APP_NAME] şu an için animasyon dosyalarının toplu olarak karşıya yüklenmesini desteklemiyor. + [APP_NAME] şu an için BVH formatında animasyon dosyalarının toplu olarak yüklenmesini desteklemiyor. </notification> <notification name="CannotUploadReason"> Aşağıdaki nedenden dolayı [FILE] dosyası karşıya yüklenemedi: [REASON] @@ -2630,16 +2630,16 @@ Talep kabul edilsin mi? [NAME] adlı kişiye ait '<nolink>[TITLE]</nolink>' [MESSAGE] <form name="form"> - <button name="Mute" text="Engelle"/> - <button name="Ignore" text="Yok say"/> + <button name="Client_Side_Mute" text="Engelle"/> + <button name="Client_Side_Ignore" text="Yok say"/> </form> </notification> <notification name="ScriptDialogGroup"> [GROUPNAME] grubuna ait '<nolink>[TITLE]</nolink>' [MESSAGE] <form name="form"> - <button name="Mute" text="Engelle"/> - <button name="Ignore" text="Yok say"/> + <button name="Client_Side_Mute" text="Engelle"/> + <button name="Client_Side_Ignore" text="Yok say"/> </form> </notification> <notification name="BuyLindenDollarSuccess"> diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml index c405105e00..d238388b0e 100644 --- a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="nearby_chat"> - <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/> + <layout_stack name="stack"> + <layout_panel name="translate_chat_checkbox_lp"> + <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/indra/newview/skins/default/xui/tr/panel_status_bar.xml index 81c304a5d8..178cbda4a2 100644 --- a/indra/newview/skins/default/xui/tr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/tr/panel_status_bar.xml @@ -15,7 +15,7 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <panel name="balance_bg"> + <panel left="-425" name="balance_bg" width="215"> <text name="balance" tool_tip="L$ bakiyenizi yenilemek için buraya tıklayın" value="L$20"/> <button label="L$ Satın Al" name="buyL" tool_tip="Daha fazla L$ satın almak için tıklayın"/> <button label="Alışveriş yap" name="goShop" tool_tip="Second Life Pazaryeri Aç" width="95"/> diff --git a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml index f801cc5968..938b5a76d8 100644 --- a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml @@ -14,7 +14,7 @@ <text name="inbox_fresh_new_count"> [NUM] yeni </text> - <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <panel name="inbox_inventory_placeholder_panel" tool_tip="Öğeleri kullanmak için bunları sürükleyin ve envanterinize bırakın"> <text name="inbox_inventory_placeholder"> Pazaryerinden satın alınan öğeler buraya teslim edilir. </text> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index 199fa06d4f..2a4e2c20a7 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -832,6 +832,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="anim_yes_head"> Evet </string> + <string name="multiple_textures"> + Birden Çok + </string> <string name="texture_loading"> Yükleniyor... </string> @@ -1232,7 +1235,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. Envanterinizde bu dokunun kopyası yok </string> <string name="InventoryInboxNoItems"> - Özel hediyeler gibi aldığınız belirli öğeler burada görünecektir. Daha sonra bunları envanterinize sürükleyebilirsiniz. + Pazaryerinda satın aldıklarınız burada görünecektir. Bunları kullanmak için envanterinize sürükleyebilirsiniz. </string> <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ @@ -3918,6 +3921,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun. <string name="Saved_message"> (Kaydedildi [LONG_TIMESTAMP]) </string> + <string name="IM_unblock_only_groups_friends"> + Bu mesajı görmek için Tercihler/Gizlilik'de 'Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin' seçeneğinin işaretini kaldırmalısınız. + </string> <string name="answered_call"> Aramanız yanıtlandı </string> |
