From 13ece17f1d177a90b09e66d81fd9b4a99496de11 Mon Sep 17 00:00:00 2001 From: eli Date: Mon, 21 Nov 2011 16:24:49 -0800 Subject: sync with viewer-development --- .../skins/default/xui/en/floater_model_preview.xml | 5 +- .../skins/default/xui/en/floater_snapshot.xml | 132 +++++++++++++++------ .../default/xui/en/panel_postcard_message.xml | 6 +- .../default/xui/en/panel_snapshot_inventory.xml | 5 +- .../skins/default/xui/en/panel_snapshot_local.xml | 17 ++- .../default/xui/en/panel_snapshot_options.xml | 64 ---------- .../default/xui/en/panel_snapshot_profile.xml | 4 +- 7 files changed, 120 insertions(+), 113 deletions(-) (limited to 'indra/newview/skins') 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 fbaf4f0a8a..eebc5ddc72 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -6,6 +6,7 @@ Error: Dae parsing issue - see log for details. + Error: Material of model is not a subset of reference model. Loading... Generating Meshes... Error: Vertex number is more than 65534, aborted! @@ -789,7 +790,7 @@ --> - + - Step 2: Analyse + Step 2: Analyze - Your Profile Feed has been updated! + Profile feed updated! @@ -65,45 +65,15 @@ name="local_failed_str"> Failed to save to computer. - - - - + + + diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml index 792f6dbec8..d2f29ade44 100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml @@ -81,68 +81,4 @@ - - - Succeeded - - - - - Failed - - 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 0760a33f82..ee79a4b3b8 100644 --- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml @@ -119,7 +119,7 @@ Date: Mon, 21 Nov 2011 16:36:14 -0800 Subject: FIX INTL-82 LQA changes for Turkish and French --- .../default/xui/fr/panel_preferences_privacy.xml | 2 +- .../default/xui/fr/panel_preferences_sound.xml | 6 +- .../skins/default/xui/fr/panel_region_debug.xml | 2 +- indra/newview/skins/default/xui/fr/strings.xml | 2 +- .../newview/skins/default/xui/tr/floater_about.xml | 6 +- .../skins/default/xui/tr/floater_about_land.xml | 16 ++-- .../skins/default/xui/tr/floater_buy_land.xml | 4 +- .../default/xui/tr/floater_edit_day_cycle.xml | 4 +- .../xui/tr/floater_environment_settings.xml | 2 +- .../skins/default/xui/tr/floater_god_tools.xml | 2 +- .../skins/default/xui/tr/floater_joystick.xml | 8 +- .../skins/default/xui/tr/floater_preferences.xml | 2 +- .../default/xui/tr/floater_preview_gesture.xml | 2 +- .../skins/default/xui/tr/floater_report_abuse.xml | 2 +- .../newview/skins/default/xui/tr/floater_tools.xml | 6 +- indra/newview/skins/default/xui/tr/menu_viewer.xml | 4 +- .../newview/skins/default/xui/tr/notifications.xml | 2 +- .../newview/skins/default/xui/tr/panel_people.xml | 6 +- .../default/xui/tr/panel_preferences_advanced.xml | 4 +- .../default/xui/tr/panel_preferences_chat.xml | 4 +- .../default/xui/tr/panel_preferences_general.xml | 2 +- .../default/xui/tr/panel_preferences_graphics1.xml | 4 +- .../default/xui/tr/panel_preferences_privacy.xml | 2 +- .../skins/default/xui/tr/panel_region_debug.xml | 4 +- .../default/xui/tr/panel_region_environment.xml | 2 +- .../skins/default/xui/tr/panel_region_terrain.xml | 2 +- .../newview/skins/default/xui/tr/role_actions.xml | 2 +- .../skins/default/xui/tr/sidepanel_task_info.xml | 2 +- indra/newview/skins/default/xui/tr/strings.xml | 92 +++++++++++----------- 29 files changed, 99 insertions(+), 99 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml index 3123a4c6fe..b122db9502 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml @@ -20,7 +20,7 @@ - Emplacement : + Emplacement des journaux :