summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinspectavatar.cpp7
-rw-r--r--indra/newview/lllocationinputctrl.cpp11
-rw-r--r--indra/newview/lllocationinputctrl.h2
-rw-r--r--indra/newview/llsearchcombobox.cpp6
-rw-r--r--indra/newview/llviewermenu.cpp20
-rw-r--r--indra/newview/llviewermenu.h1
-rw-r--r--indra/newview/skins/default/xui/da/panel_preferences_alerts.xml20
-rw-r--r--indra/newview/skins/default/xui/da/panel_preferences_privacy.xml33
-rw-r--r--indra/newview/skins/default/xui/da/panel_preferences_setup.xml30
-rw-r--r--indra/newview/skins/default/xui/da/panel_preferences_sound.xml40
-rw-r--r--indra/newview/skins/default/xui/de/panel_preferences_alerts.xml24
-rw-r--r--indra/newview/skins/default/xui/de/panel_preferences_privacy.xml32
-rw-r--r--indra/newview/skins/default/xui/de/panel_preferences_setup.xml30
-rw-r--r--indra/newview/skins/default/xui/de/panel_preferences_sound.xml73
-rw-r--r--indra/newview/skins/default/xui/en/floater_buy_currency.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml9
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml26
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml5
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml10
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/search_combo_box.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_preferences_alerts.xml18
-rw-r--r--indra/newview/skins/default/xui/es/panel_preferences_privacy.xml34
-rw-r--r--indra/newview/skins/default/xui/es/panel_preferences_setup.xml32
-rw-r--r--indra/newview/skins/default/xui/es/panel_preferences_sound.xml38
-rw-r--r--indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml21
-rw-r--r--indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml32
-rw-r--r--indra/newview/skins/default/xui/fr/panel_preferences_setup.xml30
-rw-r--r--indra/newview/skins/default/xui/fr/panel_preferences_sound.xml40
-rw-r--r--indra/newview/skins/default/xui/it/panel_preferences_alerts.xml18
-rw-r--r--indra/newview/skins/default/xui/it/panel_preferences_privacy.xml33
-rw-r--r--indra/newview/skins/default/xui/it/panel_preferences_setup.xml36
-rw-r--r--indra/newview/skins/default/xui/it/panel_preferences_sound.xml38
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml21
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml32
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_setup.xml31
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_sound.xml77
-rwxr-xr-xindra/newview/skins/default/xui/pl/panel_preferences_alerts.xml21
-rwxr-xr-xindra/newview/skins/default/xui/pl/panel_preferences_privacy.xml33
-rwxr-xr-xindra/newview/skins/default/xui/pl/panel_preferences_setup.xml31
-rwxr-xr-xindra/newview/skins/default/xui/pl/panel_preferences_sound.xml40
-rw-r--r--indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml18
-rw-r--r--indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml33
-rw-r--r--indra/newview/skins/default/xui/pt/panel_preferences_setup.xml33
-rw-r--r--indra/newview/skins/default/xui/pt/panel_preferences_sound.xml39
45 files changed, 1106 insertions, 58 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 4eb6061bea..99580d0918 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -110,7 +110,6 @@ private:
void onClickZoomIn();
void onClickFindOnMap();
bool onVisibleFindOnMap();
- bool onVisibleGodMode();
void onClickMuteVolume();
void onVolumeChange(const LLSD& data);
@@ -195,7 +194,6 @@ LLInspectAvatar::LLInspectAvatar(const LLSD& sd)
mCommitCallbackRegistrar.add("InspectAvatar.FindOnMap", boost::bind(&LLInspectAvatar::onClickFindOnMap, this));
mCommitCallbackRegistrar.add("InspectAvatar.ZoomIn", boost::bind(&LLInspectAvatar::onClickZoomIn, this));
mVisibleCallbackRegistrar.add("InspectAvatar.VisibleFindOnMap", boost::bind(&LLInspectAvatar::onVisibleFindOnMap, this));
- mVisibleCallbackRegistrar.add("InspectAvatar.VisibleGodMode", boost::bind(&LLInspectAvatar::onVisibleGodMode, this));
// can't make the properties request until the widgets are constructed
@@ -453,11 +451,6 @@ bool LLInspectAvatar::onVisibleFindOnMap()
return gAgent.isGodlike() || is_agent_mappable(mAvatarID);
}
-bool LLInspectAvatar::onVisibleGodMode()
-{
- return gAgent.isGodlike();
-}
-
void LLInspectAvatar::onClickIM()
{
LLAvatarActions::startIM(mAvatarID);
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index a3296dbffc..42838b311b 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -159,9 +159,7 @@ LLLocationInputCtrl::Params::Params()
add_landmark_image_selected("add_landmark_image_selected"),
add_landmark_button("add_landmark_button"),
add_landmark_hpad("add_landmark_hpad", 0),
- info_button("info_button"),
- add_landmark_tool_tip("add_landmark_tool_tip"),
- edit_landmark_tool_tip("edit_landmark_tool_tip")
+ info_button("info_button")
{
}
@@ -172,9 +170,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
mLocationContextMenu(NULL),
mAddLandmarkBtn(NULL),
mLandmarkImageOn(NULL),
- mLandmarkImageOff(NULL),
- mAddLandmarkTooltip(p.add_landmark_tool_tip),
- mEditLandmarkTooltip(p.edit_landmark_tool_tip)
+ mLandmarkImageOff(NULL)
{
// Lets replace default LLLineEditor with LLLocationLineEditor
// to make needed escaping while copying and cutting url
@@ -265,6 +261,9 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
mAddLandmarkObserver = new LLAddLandmarkObserver(this);
gInventory.addObserver(mRemoveLandmarkObserver);
gInventory.addObserver(mAddLandmarkObserver);
+
+ mAddLandmarkTooltip = LLTrans::getString("LocationCtrlAddLandmarkTooltip");
+ mEditLandmarkTooltip = LLTrans::getString("LocationCtrlEditLandmarkTooltip");
}
LLLocationInputCtrl::~LLLocationInputCtrl()
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index cd5c482005..c74a294ca3 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -66,8 +66,6 @@ public:
Optional<S32> add_landmark_hpad;
Optional<LLButton::Params> add_landmark_button,
info_button;
- Optional<std::string> add_landmark_tool_tip;
- Optional<std::string> edit_landmark_tool_tip;
Params();
};
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp
index 0b7621daa5..5123d862ce 100644
--- a/indra/newview/llsearchcombobox.cpp
+++ b/indra/newview/llsearchcombobox.cpp
@@ -34,6 +34,7 @@
#include "llsearchcombobox.h"
#include "llkeyboard.h"
+#include "lltrans.h" // for LLTrans::getString()
#include "lluictrlfactory.h"
static LLDefaultChildRegistry::Register<LLSearchComboBox> r1("search_combo_box");
@@ -84,6 +85,11 @@ LLSearchComboBox::LLSearchComboBox(const Params&p)
setSelectionCallback(boost::bind(&LLSearchComboBox::onSelectionCommit, this));
setPrearrangeCallback(boost::bind(&LLSearchComboBox::onSearchPrearrange, this, _2));
mSearchButton->setCommitCallback(boost::bind(&LLSearchComboBox::onTextCommit, this, _2));
+
+ // set tooltip here for now since we don't want to parse /en/widgets
+ std::string tool_tip = LLTrans::getString("Search");
+ getChild<LLView>("child1")->setToolTip(tool_tip);
+ getChild<LLView>("child3")->setToolTip(tool_tip);
}
void LLSearchComboBox::rebuildSearchHistory(const std::string& filter)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index d61de77f58..cb4f4de05e 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1637,16 +1637,6 @@ class LLAdvancedToggleCharacterGeometry : public view_listener_t
}
};
-class LLEnableGodCustomerService : public view_listener_t
-{
- bool handleEvent(const LLSD& userdata)
-{
- bool new_value = enable_god_customer_service(NULL);
- return new_value;
- }
-};
-
-
/////////////////////////////
// TEST MALE / TEST FEMALE //
@@ -4032,7 +4022,7 @@ void handle_god_request_avatar_geometry(void *)
{
if (gAgent.isGodlike())
{
- LLSelectMgr::getInstance()->sendGodlikeRequest("avatar toggle", NULL);
+ LLSelectMgr::getInstance()->sendGodlikeRequest("avatar toggle", "");
}
}
@@ -6805,7 +6795,7 @@ BOOL enable_god_liaison(void*)
return gAgent.getGodLevel() >= GOD_LIAISON;
}
-BOOL enable_god_customer_service(void*)
+bool is_god_customer_service()
{
return gAgent.getGodLevel() >= GOD_CUSTOMER_SERVICE;
}
@@ -7749,8 +7739,10 @@ void initialize_menus()
LLUICtrl::CommitCallbackRegistry::Registrar& commit = LLUICtrl::CommitCallbackRegistry::currentRegistrar();
LLUICtrl::VisibleCallbackRegistry::Registrar& visible = LLUICtrl::VisibleCallbackRegistry::currentRegistrar();
- // Enable God Mode
- view_listener_t::addMenu(new LLEnableGodCustomerService(), "EnableGodCustomerService");
+ // Generic enable and visible
+ // Don't prepend MenuName.Foo because these can be used in any menu.
+ enable.add("IsGodCustomerService", boost::bind(&is_god_customer_service));
+ visible.add("IsGodCustomerService", boost::bind(&is_god_customer_service));
// Agent
commit.add("Agent.toggleFlying", boost::bind(&LLAgent::toggleFlying));
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index d28d54c933..6d32df2bc5 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -84,7 +84,6 @@ void detach_label(std::string& label, const LLSD&);
void handle_detach(void*);
BOOL enable_god_full(void* user_data);
BOOL enable_god_liaison(void* user_data);
-BOOL enable_god_customer_service(void* user_data);
BOOL enable_god_basic(void* user_data);
void set_underclothes_menu_options();
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
new file mode 100644
index 0000000000..c7a49ef307
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Popups" name="popups" title="Popups">
+ <text name="dont_show_label">
+ Vis ikke disse popups:
+ </text>
+ <button label="Aktivér denne popup" name="enable_popup" />
+ <button label="Aktivér alle popups..." name="reset_dialogs_btn"
+ tool_tip="Viser alle de valgfrie popups og &apos;første gangs&apos; beskeder." />
+ <text name="show_label">
+ Vis disse popups:
+ </text>
+ <button label="Deaktivér alle disse popups..." name="skip_dialogs_btn"
+ tool_tip="Viser ingen af de valgfrie popups og &apos;første gangs&apos; beskeder." />
+ <text name="text_box2" width="310">
+ Ved tilbud om tekstdokumenter, teksturer og landemærker:
+ </text>
+ <check_box label="Accepter automatisk" name="accept_new_inventory" />
+ <check_box label="Vis automatisk efter accept" name="show_new_inventory" />
+ <check_box label="Vis nye objekter i beholdning automatisk" name="show_in_inventory" />
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
new file mode 100644
index 0000000000..c62beac899
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Kommunikation" name="im">
+ <text name="text_box">
+ Min online status:
+ </text>
+ <check_box label="Kun mine venner og grupper kan se når jeg er online"
+ name="online_visibility" />
+ <text name="text_box2">
+ IM valg:
+ </text>
+ <string name="log_in_to_change">
+ Log ind for at ændre
+ </string>
+ <check_box label="Send IM til E-mail ([EMAIL])" name="send_im_to_email" />
+ <check_box label="Inkludér IM i chat vindue" name="include_im_in_chat_console" />
+ <check_box label="Vis tidslinje i private beskeder (IM)" name="show_timestamps_check" />
+ <check_box label="Vis når venner logger på" name="friends_online_notify_checkbox" />
+ <text name="text_box3">
+ Optaget autosvar:
+ </text>
+ <text name="text_box4">
+ Log funktioner:
+ </text>
+ <check_box label="Gem en log af privat beskeder (IM) på min computer"
+ name="log_instant_messages" />
+ <check_box label="Vis klokkeslæt i log" name="log_instant_messages_timestamp" />
+ <check_box label="Vis slutningen af sidste samtale i beskeder" name="log_show_history" />
+ <check_box label="Gem log af lokal chat på min computer" name="log_chat" />
+ <check_box label="Vis klokkeslæt i lokat chat log" name="log_chat_timestamp" />
+ <check_box label="Vis indkommende IM i lokal chat log" name="log_chat_IM" />
+ <check_box label="Inkludér dato med klokkeslæt" name="log_date_timestamp" />
+ <button label="Ændre sti" label_selected="Ændre sti" name="log_path_button" left="150"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
new file mode 100644
index 0000000000..e826e65315
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Input &amp; kamera" name="Input panel">
+ <text name=" Mouselook Options:">
+ Førstepersons valg:
+ </text>
+ <text name=" Mouse Sensitivity:">
+ Mus følsomhed:
+ </text>
+ <check_box label="Omvendt mus" name="invert_mouse"/>
+ <text name=" Auto Fly Options:">
+ Auto flyv valg:
+ </text>
+ <check_box label="Flyv/Land ved at holde Page Up/Down nede" name="automatic_fly"/>
+ <text name=" Camera Options:">
+ Kamera valg:
+ </text>
+ <text name="camera_fov_label">
+ Camera synsvinkel:
+ </text>
+ <text name="Camera Follow Distance:">
+ Kamera følge-afstand:
+ </text>
+ <check_box label="Fokusér kamera automatisk ved redigering" name="edit_camera_movement" tool_tip="Fokusér kamera automatisk når du går ind og ud af redigering."/>
+ <check_box label="Fokusér kamera automatisk ved udseende" name="appearance_camera_movement" tool_tip="Lad kameraet automatisk placere sig når du er i redigering"/>
+ <text name="text2">
+ Avatar skærm funktioner:
+ </text>
+ <check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/>
+ <button label="Joystick opsætning" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
new file mode 100644
index 0000000000..d50c05a192
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Lyd &amp; video" name="Preference Media panel">
+ <slider label="Generel" name="System Volume"/>
+ <slider label="Omgivelser" name="Wind Volume"/>
+ <slider label="Effekter" name="SFX Volume"/>
+ <slider label="Media" name="Media Volume"/>
+ <slider label="Brugerflade" name="UI Volume"/>
+ <slider label="Musik" name="Music Volume"/>
+ <slider label="Tale" name="Voice Volume"/>
+ <text_editor name="voice_unavailable">
+ Stemme chat er ikke tilgængelig
+ </text_editor>
+ <check_box label="Aktivér stemme chat" name="enable_voice_check"/>
+ <radio_group name="ear_location">
+ <radio_item name="0" label="Hør stemmer fra kamera position" />
+ <radio_item name="1" label="Hør stemmer fra avatar position" />
+ </radio_group>
+ <button label="Enheds Indstillinger" name="device_settings_btn"/>
+ <text name="muting_text">
+ Lydstyrke:
+ </text>
+ <text name="streaming_prefs_text">
+ Streaming indstillinger:
+ </text>
+ <text name="audio_prefs_text">
+ Lyd indstillinger:
+ </text>
+ <panel label="Lydstyrke" name="Volume Panel" />
+ <check_box label="Afspil musik når det er muligt"
+ name="streaming_music" />
+ <check_box label="Afspil video når det er muligt"
+ name="streaming_video" />
+ <check_box label="Afspil automatisk medie" name="auto_streaming_video" />
+ <check_box label="Sluk lyd når vinduet er minimeret" name="mute_when_minimized" />
+ <slider label="Doppler effekt" name="Doppler Effect" />
+ <slider label="Rækkevidde" name="Distance Factor" />
+ <slider label="Styrkefald/afstand" name="Rolloff Factor" />
+ <spinner label="Penge lydstyrke" name="L$ Change Threshold" />
+ <spinner label="Livspoint lydstyrke" name="Health Change Threshold" />
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
new file mode 100644
index 0000000000..0ad6291537
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Popups" name="popups" title="Popups">
+ <text>
+ Popups nicht anzeigen:
+ </text>
+ <text name="dont_show_label">
+ Diese Popups nicht anzeigen:
+ </text>
+ <button label="Dieses Popup aktivieren" name="enable_popup"/>
+ <text>
+ Popups anzeigen:
+ </text>
+ <text name="show_label">
+ Diese Popups anzeigen:
+ </text>
+ <text name="text_box2">
+ Anbieten von Notizkarten, Texturen und Landmarken:
+ </text>
+ <check_box label="Automatisch annehmen" name="accept_new_inventory"/>
+ <check_box label="Nach Annahme automatisch anzeigen" name="show_new_inventory"/>
+ <button width="200" label="Alle Popups aktivieren..." name="reset_dialogs_btn" tool_tip="Alle optionalen Popups und „Das erste Mal“-Meldungen aktivieren."/>
+ <button width="200" label="Alle diese Popups deaktivieren..." name="skip_dialogs_btn" tool_tip="Alle optionalen Popups und „Das erste Mal“-Meldungen deaktivieren."/>
+ <check_box label="Neue Objekte im Inventar automatisch anzeigen" name="show_in_inventory"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
new file mode 100644
index 0000000000..b52e535114
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Kommunikation" name="im">
+ <text name="text_box">
+ Mein Onlinestatus:
+ </text>
+ <check_box label="Nur Freunden und Gruppen meinen Online-Status mitteilen" name="online_visibility"/>
+ <text name="text_box2">
+ IM-Optionen:
+ </text>
+ <text name="log_in_to_change">
+ Zum Ändern anmelden
+ </text>
+ <check_box label="IM an E-Mail senden ([EMAIL])" name="send_im_to_email"/>
+ <check_box label="IM in Chat-Konsole anzeigen" name="include_im_in_chat_console"/>
+ <check_box label="Zeitstempel in IM anzeigen" name="show_timestamps_check"/>
+ <check_box label="Online-Freundbenachrichtigungen anzeigen" name="friends_online_notify_checkbox"/>
+ <text name="text_box3">
+ Antwort für
+Beschäftigt-Modus:
+ </text>
+ <text name="text_box4">
+ Protokolloptionen:
+ </text>
+ <check_box label="IM-Verlauf auf meinem Computer speichern" name="log_instant_messages"/>
+ <check_box label="Zeitstempel in IM-Verlauf anzeigen" name="log_instant_messages_timestamp"/>
+ <check_box label="Ende des letzten IM-Gesprächs anzeigen" name="log_show_history"/>
+ <check_box label="Verlauf des lokalen Chats auf meinem Computer speichern" name="log_chat"/>
+ <check_box label="Zeitstempel im Verlauf des lokalen Chats anzeigen" name="log_chat_timestamp"/>
+ <check_box label="Eingehende IM in Chat-Verlauf anzeigen" name="log_chat_IM"/>
+ <check_box label="Datum mit Zeitstempeln hinzufügen" name="log_date_timestamp"/>
+ <button label="Pfad ändern" label_selected="Pfad ändern" name="log_path_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
new file mode 100644
index 0000000000..97ec745d4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Kamera" name="Input panel">
+ <text name=" Mouselook Options:">
+ Mouselook-Optionen:
+ </text>
+ <text name=" Mouse Sensitivity:">
+ Mausempfindlichkeit:
+ </text>
+ <check_box label="Maus umkehren" name="invert_mouse"/>
+ <text name=" Auto Fly Options:">
+ Auto-Flug-Optionen:
+ </text>
+ <check_box label="Zum Fliegen/Landen nach oben/unten halten" name="automatic_fly"/>
+ <text name=" Camera Options:">
+ Kameraoptionen:
+ </text>
+ <text name="camera_fov_label">
+ Kamera-Sichtwinkel:
+ </text>
+ <text name="Camera Follow Distance:">
+ Kameraabstand:
+ </text>
+ <check_box label="Automatischer Kameraschwenk im Bearbeiten-Modus" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
+ <check_box label="Automatischer Kameraschwenk im Aussehen-Modus" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
+ <text name="text2">
+ Avatar-Anzeigeoptionen:
+ </text>
+ <check_box label="Avatar in Mouselook anzeigen" name="first_person_avatar_visible"/>
+ <button label="Joystick-Einrichtung" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
new file mode 100644
index 0000000000..3c4d8203fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Audio und Video" name="Preference Media panel">
+ <slider label="Master" name="System Volume"/>
+ <slider label="Umgebung" name="Wind Volume"/>
+ <slider label="Sounds" name="SFX Volume"/>
+ <slider label="Medien" name="Media Volume"/>
+ <slider label="UI" name="UI Volume"/>
+ <slider label="Musik" name="Music Volume"/>
+ <slider label="Sprache" name="Voice Volume"/>
+ <text_editor name="voice_unavailable">
+ Voice-Chat ist nicht verfügbar
+ </text_editor>
+ <check_box label="Voice-Chat aktivieren" name="enable_voice_check"/>
+ <radio_group name="ear_location">
+ <radio_item name="0" label="Voice-Chat von Kameraposition aus hören" />
+ <radio_item name="1" label="Voice-Chat von Avatarposition aus hören" />
+ </radio_group>
+ <button label="Geräte-Einstellungen" name="device_settings_btn"/>
+ <text name="muting_text">
+ Lautstärke:
+ </text>
+ <check_box label="Audio stummschalten" name="disable audio" />
+ <text name="streaming_prefs_text">
+ Streaming-Einstellungen:
+ </text>
+ <text name="audio_prefs_text">
+ Audio-Einstellungen:
+ </text>
+ <panel label="Lautstärke" name="Volume Panel" />
+ <check_box label="Medien automatisch wiedergeben" name="auto_streaming_video" />
+ <check_box label="Audio stummschalten, wenn Fenster minimiert ist"
+ name="mute_when_minimized" />
+ <text name="streaming_text">
+ Streaming:
+ </text>
+ <check_box label="Streaming-Musik abspielen" name="streaming_music" />
+ <check_box label="Streaming-Media abspielen" name="streaming_video" />
+ <text name="system_volume_text">
+ Soundeffekte:
+ </text>
+ <text name="wind_volume_text">
+ Windlautstärke:
+ </text>
+ <text name="footsteps_volume_text">
+ Schrittlautstärke:
+ </text>
+ <text name="ui_volume_text">
+ UI-Volumen:
+ </text>
+ <slider label="Dopplereffekt" name="Doppler Effect" />
+ <slider label="Distanzfaktor" name="Distance Factor" />
+ <slider label="Rolloff-Faktor" name="Rolloff Factor" />
+ <spinner label="L$ Änderungs-Grenzwert" name="L$ Change Threshold" />
+ <spinner label="Gesundheitsschwellwert" name="Health Change Threshold" />
+ <text name="doppler_effect_text">
+ Audio-Einstellungen:
+ </text>
+ <text name="distance_factor_text">
+ Distanzfaktor:
+ </text>
+ <text name="rolloff_factor_text">
+ Rolloff-Faktor:
+ </text>
+ <text name="default_upload_bitrate_text">
+ Standard-Upload-Bitrate:
+ </text>
+ <radio_group name="bitrate">
+ <radio_item name="32kbps" label="32 kbit/s" />
+ <radio_item name="64kbps" label="64 kbit/s" />
+ <radio_item name="96kbps" label="96 kbit/s" />
+ <radio_item name="128kbps" label="128 kbit/s" />
+ </radio_group>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 5bab421adf..9b0b56d9cf 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -263,7 +263,7 @@ Re-enter amount to see the latest exchange rate.
width="300"
height="30"
name="purchase_warning_notenough">
- You aren&apos;t buying enough L$. Increase the amount.
+ You aren&apos;t buying enough L$. Please increase the amount.
</text>
<button
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 5279f9d141..edff1a093a 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -64,30 +64,27 @@
</menu_item_call>
<menu_item_call
label="Freeze"
- layout="topleft"
name="freeze">
<menu_item_call.on_click
function="InspectAvatar.Freeze"/>
<menu_item_call.on_visible
- function="InspectAvatar.VisibleGodMode"/>
+ function="IsGodCustomerService"/>
</menu_item_call>
<menu_item_call
label="Eject"
- layout="topleft"
name="eject">
<menu_item_call.on_click
function="InspectAvatar.Eject"/>
<menu_item_call.on_visible
- function="InspectAvatar.VisibleGodMode"/>
+ function="IsGodCustomerService"/>
</menu_item_call>
<menu_item_call
label="Debug"
- layout="topleft"
name="debug">
<menu_item_call.on_click
function="InspectAvatar.Debug"/>
<menu_item_call.on_visible
- function="InspectAvatar.VisibleGodMode"/>
+ function="IsGodCustomerService"/>
</menu_item_call>
<menu_item_call
label="Find On Map"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5979bfab4f..495795d14a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3006,7 +3006,7 @@
<menu_item_call.on_click
function="Advanced.ToggleCharacterGeometry" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Test Male"
@@ -3259,7 +3259,7 @@
<menu_item_call.on_click
function="Admin.ForceTakeCopy" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Force Owner To Me"
@@ -3268,7 +3268,7 @@
<menu_item_call.on_click
function="Admin.HandleObjectOwnerSelf" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Force Owner Permissive"
@@ -3277,7 +3277,7 @@
<menu_item_call.on_click
function="Admin.HandleObjectOwnerPermissive" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Delete"
@@ -3287,7 +3287,7 @@
<menu_item_call.on_click
function="Admin.HandleForceDelete" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Lock"
@@ -3297,7 +3297,7 @@
<menu_item_call.on_click
function="Admin.HandleObjectLock" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Get Assets IDs"
@@ -3307,7 +3307,7 @@
<menu_item_call.on_click
function="Admin.HandleObjectAssetIDs" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
</menu>
<menu
@@ -3323,7 +3323,7 @@
<menu_item_call.on_click
function="Admin.HandleForceParcelOwnerToMe" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Set to Linden Content"
@@ -3333,7 +3333,7 @@
<menu_item_call.on_click
function="Admin.HandleForceParcelToContent" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Claim Public Land"
@@ -3342,7 +3342,7 @@
<menu_item_call.on_click
function="Admin.HandleClaimPublicLand" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
</menu>
<menu
@@ -3358,7 +3358,7 @@
<menu_item_call.on_click
function="Admin.HandleRegionDumpTempAssetData" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
<menu_item_call
label="Save Region State"
@@ -3367,7 +3367,7 @@
<menu_item_call.on_click
function="Admin.OnSaveState" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
</menu>
<menu_item_call
@@ -3378,7 +3378,7 @@
function="Floater.Show"
parameter="god_tools" />
<menu_item_call.on_enable
- function="EnableGodCustomerService" />
+ function="IsGodCustomerService" />
</menu_item_call>
</menu>
<menu
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 36a4798367..7c5925550a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6144,9 +6144,10 @@ Your L$ balance is shown in the upper-right.
type="notify">
Thank you for your payment!
-When processing completes, your L$ balance will be credited. If your payment takes more than 20 minutes to complete, the purchase amount will be credited to your account for use on your next purchase.
+When the processing completes, your L$ balance will be updated at the top of your screen.
+If processing your payment takes more than 20 minutes to complete, the purchase amount will be credited to your account for use on your next purchase.
-Payment status can be checked on your Transaction History page at SecondLife.com.
+The status of your payment can be checked on your Transaction History page at Me > My Dashboard, or http://secondlife.com/account/
</notification>
<notification
icon="notify.tga"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d13f5dbde3..0ca6c87585 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2844,8 +2844,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Wide Lips">Wide Lips</string>
<string name="Wild">Wild</string>
<string name="Wrinkles">Wrinkles</string>
-
- <!-- Strings used by the (currently Linux) auto-updater app -->
+
+ <string name="Search">Search</string>
+
+ <!-- Favorites Bar -->
+ <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string>
+ <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string>
+
+ <!-- Strings used by the (currently Linux) auto-updater app -->
<string name="UpdaterWindowTitle">
[APP_NAME] Update
</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 40c8dc860d..1377a3c945 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -18,8 +18,6 @@
max_chars="20"
follows="left|top"
allow_new_values="true"
- add_landmark_tool_tip="Add this to My Landmarks"
- edit_landmark_tool_tip="Edit My Landmark"
>
<info_button name="Place Information"
label=""
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
index 769af42e38..56204201ef 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -14,7 +14,6 @@
name="child1"
select_on_focus="true"
text_pad_left="28"
- tool_tip="Search"
background_image="TextField_Search_Off"
background_image_disabled="TextField_Search_Disabled"
background_image_focused="TextField_Search_Active"/>
@@ -29,7 +28,6 @@
name="child3"
width="13"
height="13"
- tool_tip="Search"
image_unselected="Search"
image_selected="Search" />
</search_combo_box> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
new file mode 100644
index 0000000000..a71ac172a3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ventanas emergentes" name="popups" title="Ventanas emergentes">
+ <text name="dont_show_label">
+ No mostrar estas ventanas emergentes:
+ </text>
+ <button width="200" label="Activar esta ventana emergente" label_selected="Activar esta popup" name="enable_popup"/>
+ <button width="255" left="225" label="Activar todas las ventanas emergentes..." label_selected="Restaurar cajas de diálogo &apos;Mostrar en la próxima vez&apos;..." name="reset_dialogs_btn" tool_tip="Activar todas las ventanas emergentes y los avisos de &apos;primera vez que se usa&apos;."/>
+ <text name="show_label" width="300">
+ Mostrar estas ventanas emergentes:
+ </text>
+ <button left="205" width="275" label="Desactivar todas estas ventanas emergentes..." name="skip_dialogs_btn" tool_tip="Desactivar todas las ventanas emergentes y los avisos de &apos;primera vez que se usa&apos;."/>
+ <text name="text_box2">
+ Oferta de notas, texturas e hitos:
+ </text>
+ <check_box label="Aceptar automáticamente" name="accept_new_inventory"/>
+ <check_box label="Ver automáticamente tras aceptar" name="show_new_inventory"/>
+ <check_box label="Mostrar automáticamente los objetos aceptados recientemente en el inventario" name="show_in_inventory"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
new file mode 100644
index 0000000000..cbaa3d96ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Comunicación" name="im">
+ <text name="text_box">
+ Mi estado de conexión:
+ </text>
+ <check_box label="Sólo pueden ver si estoy conectado mis amigos y grupos" name="online_visibility"/>
+ <text name="text_box2">
+ Opciones de los MI:
+ </text>
+ <string name="log_in_to_change">
+ inicie sesión para cambiar
+ </string>
+ <check_box label="Enviar MI al correo electrónico ([EMAIL])" name="send_im_to_email"/>
+ <check_box label="Incluir los MI en la consola del chat" name="include_im_in_chat_console"/>
+ <check_box label="Incluir la hora en los MI" name="show_timestamps_check"/>
+ <check_box label="Avisar si se conecta un amigo" name="friends_online_notify_checkbox"/>
+ <text name="text_box3">
+ Mensaje en el estado
+ocupado:
+ </text>
+ <text name="text_box4">
+ Opciones de los
+registros:
+ </text>
+ <check_box label="Guardar un registro de los MI en mi ordenador" name="log_instant_messages"/>
+ <check_box label="Incluir la hora en el registro de los MI" name="log_instant_messages_timestamp"/>
+ <check_box label="Mostrar el final de la última conversación por MI" name="log_show_history"/>
+ <check_box label="Guardar un registro del chat en mi ordenador" name="log_chat"/>
+ <check_box label="Incluir la hora en el registro del chat" name="log_chat_timestamp"/>
+ <check_box label="Mostrar en el chat la llegada de los MI" name="log_chat_IM"/>
+ <check_box label="Incluir la fecha junto a la hora" name="log_date_timestamp"/>
+ <button label="Cambiar la ruta" label_selected="Cambiar la ruta" name="log_path_button" width="120"/>
+ <line_editor left="278" name="log_path_string" right="-20"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
new file mode 100644
index 0000000000..967626b8d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Dispositivos y Cámara" name="Input panel">
+ <text name=" Mouselook Options:">
+ Vista subjetiva:
+ </text>
+ <text name=" Mouse Sensitivity:">
+ Sensibilidad del ratón:
+ </text>
+ <check_box label="Invertir el ratón" name="invert_mouse"/>
+ <text name=" Auto Fly Options:">
+ Vuelo:
+ </text>
+ <check_box label="Despegar/Aterrizar pulsando RePág/AvPág" name="automatic_fly"/>
+ <text name=" Camera Options:">
+ Opciones de la cámara:
+ </text>
+ <text name="camera_fov_label" width="218">
+ Ángulo de vista de la cámara:
+ </text>
+ <slider bottom_delta="-6" width="128" left="326" name="camera_fov" />
+ <text name="Camera Follow Distance:" width="218">
+ Distancia a la que sigue la cámara:
+ </text>
+ <slider bottom_delta="-6" width="128" left="326" name="camera_offset_scale" />
+ <check_box label="Reorientar la cámara al editar" name="edit_camera_movement" tool_tip="Usar la reorientación automática de la cámara al entrar y salir del modo de edición"/>
+ <check_box label="Reorientar la cámara al modificar la apariencia" name="appearance_camera_movement" tool_tip="Usar la reorientación automática de la cámara mientras se modifica la apariencia"/>
+ <text name="text2">
+ Visualización del avatar:
+ </text>
+ <check_box label="Ver el avatar en vista subjetiva" name="first_person_avatar_visible"/>
+ <button bottom_delta="-40" label="Configurar el joystick" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
new file mode 100644
index 0000000000..241f3042fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Audio y Vídeo" name="Preference Media panel">
+ <slider label="General" name="System Volume"/>
+ <slider label="Ambiental" name="Wind Volume"/>
+ <slider label="Sonidos" name="SFX Volume"/>
+ <slider label="Media" name="Media Volume"/>
+ <slider label="Interfaz" name="UI Volume"/>
+ <slider label="Música" name="Music Volume"/>
+ <slider label="Voz" name="Voice Volume"/>
+ <text_editor name="voice_unavailable">
+ El chat de voz no está disponible
+ </text_editor>
+ <check_box label="Activar el chat de voz" name="enable_voice_check"/>
+ <radio_group name="ear_location">
+ <radio_item name="0" label="Oír el chat desde la posición de la cámara." />
+ <radio_item name="1" label="Oír el chat desde la posición del avatar." />
+ </radio_group>
+ <button label="Configuración de los dispositivos" name="device_settings_btn" width="210" />
+ <text name="muting_text">
+ Volumen:
+ </text>
+ <text name="streaming_prefs_text">
+ Preferencias multimedia:
+ </text>
+ <text name="audio_prefs_text">
+ Preferencias de sonido:
+ </text>
+ <panel label="Volumen" name="Volume Panel"/>
+ <check_box label="Si hay música, reproducirla en streaming" name="streaming_music"/>
+ <check_box label="Si hay media, reproducirlos en streaming" name="streaming_video"/>
+ <check_box label="Reproducir automáticamente los media" name="auto_streaming_video"/>
+ <check_box label="Silenciar el sonido al minimizar la ventana" name="mute_when_minimized"/>
+ <slider label="Efecto Doppler" name="Doppler Effect" label_width="140" width="270" />
+ <slider label="Distancia de escucha" name="Distance Factor" label_width="140" width="270" />
+ <slider label="Nivel de atenuación" name="Rolloff Factor" label_width="140" width="270" />
+ <spinner label="Avisar de transacción de L$ desde" name="L$ Change Threshold" label_width="195" width="259"/>
+ <spinner label="Avisar del estado de la vida desde" name="Health Change Threshold" label_width="195" width="259"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
new file mode 100644
index 0000000000..61fcd912f5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Pop-ups" name="popups" title="Pop-ups">
+ <text name="text_box">
+ Ne pas afficher les pop-ups :
+ </text>
+ <text name="dont_show_label">
+ Ne pas afficher ces pop-ups :
+ </text>
+ <button label="Activer ce pop-up" label_selected="Autoriser ce pop-up" name="enable_popup"/>
+ <text name="show_label">
+ Afficher ces pop-ups :
+ </text>
+ <button label="Désactiver tous les pop-ups" name="skip_dialogs_btn" tool_tip="Désactiver tous les pop-ups et les notifications envoyées lors d&apos;un premier usage." width="185"/>
+ <text name="text_box2">
+ Offres de notes, textures et repères :
+ </text>
+ <button label="Activer tous les pop-ups" label_selected="Réinitialiser les dialogues &apos;Afficher la prochaine fois&apos;..." name="reset_dialogs_btn" tool_tip="Activer tous les pop-ups et les notifications envoyées lors d&apos;un premier usage." width="185"/>
+ <check_box label="Accepter automatiquement" name="accept_new_inventory"/>
+ <check_box label="Afficher après avoir accepté" name="show_new_inventory"/>
+ <check_box label="Ouvrir l&apos;inventaire et sélectionner les objets reçus" name="show_in_inventory"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
new file mode 100644
index 0000000000..527097b392
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Communication" name="im">
+ <text name="text_box">
+ Mon statut en ligne :
+ </text>
+ <check_box label="Seuls mes amis et groupes voient quand je suis connecté(e)" name="online_visibility"/>
+ <text name="log_in_to_change">
+ se connecter pour changer
+ </text>
+ <check_box label="Envoyer les IM à mon adresse e-mail ([EMAIL])" name="send_im_to_email"/>
+ <check_box label="Afficher les IM dans la console du chat" name="include_im_in_chat_console"/>
+ <check_box label="Afficher l&apos;heure dans les IM" name="show_timestamps_check"/>
+ <check_box label="Me prévenir quand des amis se connectent" name="friends_online_notify_checkbox"/>
+ <text name="text_box3">
+ Réponse si occupé(e) :
+ </text>
+ <text name="text_box4">
+ Enregistrements :
+ </text>
+ <check_box label="Enregistrer les IM sur mon ordinateur" name="log_instant_messages"/>
+ <check_box label="Inclure les heures" name="log_instant_messages_timestamp"/>
+ <check_box label="Enregistrer le chat local sur mon ordinateur" name="log_chat"/>
+ <check_box label="Inclure la fin de la dernière conversation IM" name="log_show_history"/>
+ <check_box label="Inclure les heures" name="log_chat_timestamp"/>
+ <check_box label="Inclure les IM reçus" name="log_chat_IM"/>
+ <check_box label="Inclure la date avec les heures" name="log_date_timestamp"/>
+ <button label="Changer d&apos;emplacement" label_selected="Changer d&apos;emplacement" name="log_path_button" width="150"/>
+ <line_editor left="308" name="log_path_string" right="-20"/>
+ <text name="text_box2">
+ IM :
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
new file mode 100644
index 0000000000..b52ab672b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Contrôle et caméra" name="Input panel">
+ <text name=" Mouselook Options:">
+ Vue subjective :
+ </text>
+ <text name=" Mouse Sensitivity:">
+ Sensibilité de la souris :
+ </text>
+ <check_box label="Inverser la souris" name="invert_mouse"/>
+ <text name=" Auto Fly Options:">
+ Vol automatique :
+ </text>
+ <check_box label="Voler/atterrir en appuyant sur la flèche du haut/bas" name="automatic_fly"/>
+ <text name=" Camera Options:">
+ Options de la caméra :
+ </text>
+ <text name="camera_fov_label">
+ Angle de vision :
+ </text>
+ <text name="Camera Follow Distance:">
+ Distance :
+ </text>
+ <check_box label="Ajustement automatique en mode Édition" name="edit_camera_movement" tool_tip="Positionner automatiquement la caméra lors de l&apos;entrée ou de la sortie du mode Édition"/>
+ <check_box label="Ajustement automatique en mode Édition d&apos;apparence" name="appearance_camera_movement" tool_tip="Positionner automatiquement la caméra en mode Édition"/>
+ <text name="text2">
+ Affichage de l&apos;avatar :
+ </text>
+ <check_box label="Montrer l&apos;avatar en vue subjective" name="first_person_avatar_visible"/>
+ <button label="Configuration du joystick" name="joystick_setup_button" width="175"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
new file mode 100644
index 0000000000..facd22988c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Audio et vidéo" name="Preference Media panel">
+ <slider label="Principal" name="System Volume"/>
+ <slider label="Son ambiant" name="Wind Volume"/>
+ <slider label="Sons" name="SFX Volume"/>
+ <slider label="Média" name="Media Volume"/>
+ <slider label="Interface" name="UI Volume"/>
+ <slider label="Musique" name="Music Volume"/>
+ <slider label="Voix" name="Voice Volume"/>
+ <text_editor name="voice_unavailable">
+ Le chat vocal n&apos;est pas disponible
+ </text_editor>
+ <check_box label="Activer la voix" name="enable_voice_check"/>
+ <radio_group name="ear_location">
+ <radio_item name="0" label="Écouter depuis la position de la caméra." />
+ <radio_item name="1" label="Écouter depuis la position de l&apos;avatar." />
+ </radio_group>
+ <button label="Paramètres du matériel" name="device_settings_btn"/>
+ <text name="muting_text">
+ Volume :
+ </text>
+ <panel name="Volume Panel" width="249"/>
+ <check_box label="Couper le son" name="disable audio"/>
+ <text bottom="-195" name="streaming_prefs_text" width="145">
+ Média :
+ </text>
+ <text name="audio_prefs_text">
+ Audio :
+ </text>
+ <panel label="Volume" name="Volume Panel"/>
+ <check_box label="Couper le son lorsque la fenêtre est minimisée" name="mute_when_minimized"/>
+ <check_box label="Jouer la musique disponible" name="streaming_music"/>
+ <check_box label="Jouer le média disponible" name="streaming_video"/>
+ <check_box label="Lire automatiquement le média" name="auto_streaming_video"/>
+ <slider label="Effet Doppler" label_width="115" name="Doppler Effect"/>
+ <slider label="Facteur d&apos;éloignement" label_width="115" name="Distance Factor"/>
+ <slider label="Facteur d&apos;atténuation" label_width="115" name="Rolloff Factor"/>
+ <spinner label="Alerte L$" name="L$ Change Threshold"/>
+ <spinner label="Alerte santé" name="Health Change Threshold"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
new file mode 100644
index 0000000000..54517635fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Pop-up" name="popups" title="Pop-up">
+ <text name="dont_show_label">
+ Non mostrare questi pop-up:
+ </text>
+ <button label="Abilita questo pop-up" name="enable_popup"/>
+ <button width="200" label="Abilita tutti i pop-up..." name="reset_dialogs_btn" tool_tip="Abilita tutti i pop-up opzionali e le notifiche da &apos;utilizzo per la prima volta&apos;."/>
+ <text name="show_label">
+ Mostra questi pop-up:
+ </text>
+ <button width="200" label="Disabilita tutti questi pop-up..." name="skip_dialogs_btn" tool_tip="Disabilita tutti i pop-up opzionali e le notifiche da &apos;utilizzo per la prima volta&apos;."/>
+ <text name="text_box2">
+ Offerte di notecard, texture e landmark:
+ </text>
+ <check_box label="Accetta automaticamente" name="accept_new_inventory"/>
+ <check_box label="Apri automaticamente dopo aver accettato" name="show_new_inventory"/>
+ <check_box label="Mostra automaticamente nell&apos;inventario, gli oggetti appena accettati" name="show_in_inventory"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
new file mode 100644
index 0000000000..2249d94688
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Comunicazioni" name="im">
+ <text name="text_box">
+ Il mio stato online:
+ </text>
+ <check_box label="Solo i miei amici e i miei gruppi possono vedermi online" name="online_visibility"/>
+ <text name="text_box2">
+ Opzioni IM:
+ </text>
+ <string name="log_in_to_change">
+ Effettua login per cambiare
+ </string>
+ <check_box label="Invia gli IM alla mia email ([EMAIL])" name="send_im_to_email"/>
+ <check_box label="Inserisci gli IM nella console della chat" name="include_im_in_chat_console"/>
+ <check_box label="Mostra l&apos;orario negli IM" name="show_timestamps_check"/>
+ <check_box label="Mostrami le notifiche degli amici online" name="friends_online_notify_checkbox"/>
+ <text name="text_box3">
+ Risposta agli IM quando
+sono in &apos;Occupato&apos;:
+ </text>
+ <text name="text_box4" width="136">
+ Opzioni salvataggio chat:
+ </text>
+ <check_box label="Salva una copia degli IM sul mio computer" name="log_instant_messages"/>
+ <check_box label="Mostra l&apos;orario nei registri IM" name="log_instant_messages_timestamp"/>
+ <check_box label="Mostra la parte finale della precedente conversazione IM" name="log_show_history"/>
+ <check_box label="Salva un registro della chat locale sul mio computer" name="log_chat"/>
+ <check_box label="Mostra l&apos;orario nei registri della chat locale" name="log_chat_timestamp"/>
+ <check_box label="Mostra gli IM entranti nel registro della chat locale" name="log_chat_IM"/>
+ <check_box label="Includi la data nell&apos;orario" name="log_date_timestamp"/>
+ <button label="Cambia percorso" label_selected="Cambia percorso" name="log_path_button" width="130"/>
+ <line_editor left="288" name="log_path_string" right="-20"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
new file mode 100644
index 0000000000..e1239d5820
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Controlli &amp; Telecamera" name="Input panel">
+ <text name=" Mouselook Options:">
+ Opzioni visualizzazione
+in soggettiva:
+ </text>
+ <text name=" Mouse Sensitivity:">
+ Sensibilità del mouse:
+ </text>
+ <check_box label="Inverti i controlli del mouse" name="invert_mouse"/>
+ <text name=" Auto Fly Options:">
+ Opzioni di volo
+automatico:
+ </text>
+ <check_box label="Vola/atterra premendo su/giù" name="automatic_fly"/>
+ <text name=" Camera Options:">
+ Opzioni della
+telecamera:
+ </text>
+ <text name="camera_fov_label" width="218">
+ Angolo di visualizzazione della telecamera:
+ </text>
+ <slider bottom_delta="-6" width="128" left="366" name="camera_fov" />
+ <text name="Camera Follow Distance:" width="218">
+ Distanza della telecamera dall&apos;avatar:
+ </text>
+ <slider bottom_delta="-6" width="128" left="366" name="camera_offset_scale" />
+ <check_box label="Movimenti automatici della telecamera in &#10;modalità modifica oggetti" name="edit_camera_movement" tool_tip="Usa il posizionamento automatico della telecamera entrando e uscendo dalla modalità modifica oggetti"/>
+ <check_box bottom_delta="-34" label="Movimenti automatici della telecamera in &#10;modalità aspetto fisico" name="appearance_camera_movement" tool_tip="Usa il posizionamento automatico della telecamera durante la modalità modifica oggetti"/>
+ <text name="text2" bottom_delta="-42">
+ Opzione di visualizzazione
+dell&apos;avatar:
+ </text>
+ <check_box label="Mostra l&apos;avatar in prima persona" name="first_person_avatar_visible"/>
+ <button bottom_delta="-40" label="Installazione del joystick" name="joystick_setup_button" width="165"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
new file mode 100644
index 0000000000..41f67951c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Audio &amp; Video" name="Preference Media panel">
+ <slider label="Master" name="System Volume"/>
+ <slider label="Ambiente" name="Wind Volume"/>
+ <slider label="Suoni" name="SFX Volume"/>
+ <slider label="Media" name="Media Volume"/>
+ <slider label="Interfaccia utente" name="UI Volume"/>
+ <slider label="Musica" name="Music Volume"/>
+ <slider label="Voice" name="Voice Volume"/>
+ <text_editor name="voice_unavailable">
+ Voice chat non disponibile
+ </text_editor>
+ <check_box label="Abilita voice chat" name="enable_voice_check"/>
+ <radio_group name="ear_location">
+ <radio_item name="0" label="Ascolta voice chat dalla posizione della telecamera" />
+ <radio_item name="1" label="Ascolta voice chat dalla posizione dell&apos;avatar" />
+ </radio_group>
+ <button label="Configurazione periferica" name="device_settings_btn" width="165"/>
+ <text name="muting_text">
+ Volume:
+ </text>
+ <text name="streaming_prefs_text" bottom="-195" >
+ Preferenze Streaming:
+ </text>
+ <text name="audio_prefs_text">
+ Preferenze Audio:
+ </text>
+ <panel label="Volume" name="Volume Panel"/>
+ <check_box label="Ascolta il canale della musica" name="streaming_music"/>
+ <check_box height="32" label="Guarda i video" name="streaming_video"/>
+ <check_box label="Attiva automaticamente i video" name="auto_streaming_video"/>
+ <check_box label="Muta l&apos;audio quando minimizzi la finestra" name="mute_when_minimized"/>
+ <slider label="Effetto Doppler" name="Doppler Effect" label_width="140" width="270" />
+ <slider label="Fattore di Distanza" name="Distance Factor" label_width="140" width="270"/>
+ <slider label="Fattore di Allontanamento" name="Rolloff Factor" label_width="140" width="270"/>
+ <spinner label="Suono di Avviso Transazioni &#8805; a L$" name="L$ Change Threshold" label_width="195" width="259"/>
+ <spinner label="Livello vitale dell&apos;avatar" name="Health Change Threshold" label_width="195" width="259"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
new file mode 100644
index 0000000000..96123c9d98
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="ポップアップ" name="popups" title="ポップアップ">
+ <text name="text_box">
+ ポップアップを表示しない:
+ </text>
+ <text name="dont_show_label">
+ 次のポップアップは表示しない:
+ </text>
+ <button label="これは表示する" label_selected="これは表示する" name="enable_popup"/>
+ <text name="show_label" width="300" >
+ 次のポップアップは表示:
+ </text>
+ <text name="text_box2" width="280">
+ ノートカード、テクスチャ、ランドマークの提供:
+ </text>
+ <check_box label="自動的に承認" name="accept_new_inventory"/>
+ <check_box label="承認後、自動的に閲覧" name="show_new_inventory"/>
+ <button width="235" label="ポップアップ全てを有効化..." label_selected="「次回表示」ダイアログリセット..." name="reset_dialogs_btn" tool_tip="全てのオプショナルポップアップと「初回使用」通知を有効にしてください。"/>
+ <button width="235" label="これらのポップアップ全てを無効化..." name="skip_dialogs_btn" tool_tip="全てのオプショナルポップアップと「初回使用」通知を無効にしてください。"/>
+ <check_box label="新たに受け取ったオブジェクトを持ち物に自動的に表示" name="show_in_inventory"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
new file mode 100644
index 0000000000..20299542fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="チャット設定" name="im">
+ <text name="text_box">
+ オンライン通知:
+ </text>
+ <check_box label="フレンドとグループのみ自分のオンラインを確認可能に" name="online_visibility"/>
+ <text name="text_box2">
+ IMオプション:
+ </text>
+ <text name="log_in_to_change">
+ ログインして変更してください
+ </text>
+ <check_box label="IMを電子メール([EMAIL])へ送信" name="send_im_to_email"/>
+ <check_box label="チャットコンソールにIMを表示する" name="include_im_in_chat_console"/>
+ <check_box label="IMにタイムスタンプを表示" name="show_timestamps_check"/>
+ <check_box label="オンライン・フレンド通知を表示" name="friends_online_notify_checkbox"/>
+ <text name="text_box4">
+ 記録オプション:
+ </text>
+ <check_box label="IMログを自分のコンピュータに保存" name="log_instant_messages"/>
+ <check_box label="IMログにタイムスタンプを表示" name="log_instant_messages_timestamp"/>
+ <check_box label="ローカルチャットのログを自分のコンピュータに保存" name="log_chat"/>
+ <check_box label="最後のIMチャットの末尾を表示" name="log_show_history"/>
+ <check_box label="ローカルチャットのログにタイムスタンプを表示" name="log_chat_timestamp"/>
+ <check_box label="ローカルチャットのログに受信IMを表示" name="log_chat_IM"/>
+ <check_box label="タイムスタンプに日付を加える" name="log_date_timestamp"/>
+ <button label="パス変更" label_selected="パス変更" name="log_path_button"/>
+ <text name="text_box3">
+ 取り込み中
+応答メッセージ:
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
new file mode 100644
index 0000000000..ded6f9df38
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="操作とカメラ" name="Input panel">
+ <text name=" Mouselook Options:">
+ 一人称視点
+(マウスルック):
+ </text>
+ <text name=" Mouse Sensitivity:">
+ 感度:
+ </text>
+ <check_box label="上下を反転" name="invert_mouse"/>
+ <text name=" Auto Fly Options:">
+ 自動飛行オプション:
+ </text>
+ <check_box label="上下矢印キーの長押しで飛行/着地" name="automatic_fly"/>
+ <text name=" Camera Options:">
+ カメラ・オプション:
+ </text>
+ <text name="camera_fov_label">
+ カメラ視野角:
+ </text>
+ <text name="Camera Follow Distance:">
+ カメラ追従距離:
+ </text>
+ <check_box label="編集カメラの自動移動" name="edit_camera_movement" tool_tip="編集モードの開始、終了時はカメラ自動位置調整を使用"/>
+ <check_box label="容姿カメラの自動移動" name="appearance_camera_movement" tool_tip="編集モードでは、カメラ自動位置調整を使用"/>
+ <text name="text2">
+ アバター表示:
+ </text>
+ <check_box label="アバターを一人称視点(マウスルック)で表示" name="first_person_avatar_visible"/>
+ <button label="ジョイスティック設定" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
new file mode 100644
index 0000000000..d8763193ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="音声とビデオ" name="Preference Media panel">
+ <slider label="マスター" name="System Volume"/>
+ <slider label="風の音量" name="Wind Volume"/>
+ <slider label="サウンド" name="SFX Volume"/>
+ <slider label="メディア" name="Media Volume"/>
+ <slider label="UI" name="UI Volume"/>
+ <slider label="ミュージック" name="Music Volume"/>
+ <slider label="ボイス" name="Voice Volume"/>
+ <text_editor name="voice_unavailable">
+ ボイスチャットを利用できません
+ </text_editor>
+ <check_box label="ボイスチャットを有効にする" name="enable_voice_check"/>
+ <radio_group name="ear_location">
+ <radio_item name="0" label="カメラの位置からボイスチャットを聞く。" />
+ <radio_item name="1" label="アバターの位置からボイスチャットを聞く。" />
+ </radio_group>
+ <button label="機器の設定" name="device_settings_btn"/>
+ <text name="muting_text">
+ ボリューム:
+ </text>
+ <check_box label="オーディオをミュート" name="disable audio" />
+ <text name="streaming_prefs_text">
+ ストリーム環境設定:
+ </text>
+ <text name="audio_prefs_text">
+ オーディオ環境設定:
+ </text>
+ <panel label="ボリューム" name="Volume Panel" />
+ <check_box label="メディアを自動再生" name="auto_streaming_video" />
+ <check_box
+ label="ウィンドウが最小化されたときにオーディオをミュート"
+ name="mute_when_minimized" />
+ <text name="streaming_text">
+ ストリーミング:
+ </text>
+ <check_box label="音楽がある場合再生する"
+ name="streaming_music" />
+ <check_box
+ label="ストリーミング・メディア使用可時に再生"
+ name="streaming_video" />
+ <text name="system_volume_text">
+ サウンド効果:
+ </text>
+ <text name="wind_volume_text">
+ 風の音量:
+ </text>
+ <text name="footsteps_volume_text">
+ 足音:
+ </text>
+ <text name="ui_volume_text">
+ UI音量:
+ </text>
+ <slider label="ドップラー効果" name="Doppler Effect" />
+ <slider label="遠隔要因" name="Distance Factor" />
+ <slider label="ロールオフ係数" name="Rolloff Factor" />
+ <spinner label="L$変更基準点" name="L$ Change Threshold" />
+ <spinner label="ヘルス変化基準点" name="Health Change Threshold" />
+ <text name="doppler_effect_text">
+ オーディオ環境設定:
+ </text>
+ <text name="distance_factor_text">
+ 距離係数:
+ </text>
+ <text name="rolloff_factor_text">
+ ロールオフ:
+ </text>
+ <text name="default_upload_bitrate_text">
+ デフォルトUL速度:
+ </text>
+ <radio_group name="bitrate">
+ <radio_item name="32kbps" label="32kbps" />
+ <radio_item name="64kbps" label="64kbps" />
+ <radio_item name="96kbps" label="96kbps" />
+ <radio_item name="128kbps" label="128kbps" />
+ </radio_group>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
new file mode 100755
index 0000000000..7826af8b03
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Informacje" name="popups" title="Popups">
+ <text name="dont_show_label">
+ Ukryj te informacje:
+ </text>
+ <button label="Pokazuj Tę Informację" name="enable_popup" />
+ <button label="Pokazuj Wszystko..." name="reset_dialogs_btn"
+ tool_tip="Wyświetlaj wszystkie opcjonalne i &apos;Użyte pierwszy raz&apos; informacje." />
+ <text name="show_label">
+ Pokazuj te informacje:
+ </text>
+ <button label="Ukryj Tę Informację..." name="skip_dialogs_btn"
+ tool_tip="Nie wyświetlaj żadnych opcjonalnych i &apos;Użyte pierwszy raz&apos; informacji" />
+ <text name="text_box2">
+ Oferty notek, obrazów i miejsc (LM):
+ </text>
+ <check_box label="Akceptuj automatycznie" name="accept_new_inventory" />
+ <check_box label="Wyświetlaj automatycznie po akceptacji" name="show_new_inventory" />
+ <check_box label="Automatycznie pokazuj nowe obiekty w szafie po akceptacji"
+ name="show_in_inventory" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
new file mode 100755
index 0000000000..e3cdaae840
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Komunikacja" name="im">
+ <text name="text_box">
+ Mój Status Online:
+ </text>
+ <check_box label="Mój status online jest dostepny tylko dla Znajomych i Grup"
+ name="online_visibility" />
+ <text name="text_box2">
+ Ustawienia IM:
+ </text>
+ <string name="log_in_to_change">
+ zaloguj się żeby zmienić
+ </string>
+ <check_box label="Wysyłaj IMy na email ([EMAIL])" name="send_im_to_email" />
+ <check_box label="Dołącz IMy do Konsola Czatu" name="include_im_in_chat_console" />
+ <check_box label="Pokazuj czas w IM" name="show_timestamps_check" />
+ <check_box label="Powiadamiaj o zalogowanych znajomych"
+ name="friends_online_notify_checkbox" />
+ <text name="text_box3">
+ Pracuś Mówi:
+ </text>
+ <text name="text_box4">
+ Ustawienia Zapisu:
+ </text>
+ <check_box label="Zapisuj IMy" name="log_instant_messages" />
+ <check_box label="Pokazuj czas w zapisie IM" name="log_instant_messages_timestamp" />
+ <check_box label="Pokazuj koniec ostatniego dialogu IM" name="log_show_history" />
+ <check_box label="Zapisuj czat" name="log_chat" />
+ <check_box label="Pokazuj czas w zapisie czatu" name="log_chat_timestamp" />
+ <check_box label="Pokazuj nowe IMy w zapisie czatu" name="log_chat_IM" />
+ <check_box label="Pokazuj czas łącznie z datą" name="log_date_timestamp" />
+ <button label="Lokacja" label_selected="Lokacja" name="log_path_button" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
new file mode 100755
index 0000000000..1e2289b496
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Joystick i Kamera" name="Input panel">
+ <text name=" Mouselook Options:">
+ Widok Panoramiczny:
+ </text>
+ <text name=" Mouse Sensitivity:">
+ Czułość Myszki:
+ </text>
+ <slider_bar name="mouse_sensitivity"/>
+ <check_box label="Zamień klawisze myszy" name="invert_mouse"/>
+ <text name=" Auto Fly Options:">
+ Automatczne Latanie:
+ </text>
+ <check_box label="Lataj/Ląduj Używając Klawiszy PgUp/PgDn" name="automatic_fly"/>
+ <text name=" Camera Options:">
+ Ustawienia Kamery:
+ </text>
+ <text name="camera_fov_label">
+ Kąt Widoku Kamery:
+ </text>
+ <text name="Camera Follow Distance:">
+ Dystans Kamery:
+ </text>
+ <check_box label="Edycja - Automatyczny Ruch Kamery" name="edit_camera_movement" tool_tip="Używaj automatycznego ustawienia kamery podczas włączania i wyłączania trybu edycji"/>
+ <check_box label="Wygląd - Automatyczny Ruch Kamery" name="appearance_camera_movement" tool_tip="Używaj automatycznego ustawienia kamery w trybu edycji"/>
+ <text name="text2">
+ Wyświetlanie Awatara:
+ </text>
+ <check_box label="Awatar Widoczny w Trybie Panoramicznym" name="first_person_avatar_visible"/>
+ <button label="Ustawienia Joysticka" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
new file mode 100755
index 0000000000..64e3acfcde
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Audio i Video" name="Preference Media panel">
+ <slider label="Master" name="System Volume"/>
+ <slider label="Otoczenie" name="Wind Volume"/>
+ <slider label="Dźwięki" name="SFX Volume"/>
+ <slider label="Media" name="Media Volume"/>
+ <slider label="UI" name="UI Volume"/>
+ <slider label="Muzyka" name="Music Volume"/>
+ <slider label="Głos" name="Voice Volume"/>
+ <text_editor name="voice_unavailable">
+ Rozmowy są Niedostępne
+ </text_editor>
+ <check_box label="Pozwól na Rozmowy" name="enable_voice_check"/>
+ <radio_group name="ear_location">
+ <radio_item name="0" label="Odtwarzaj głos z pozycji kamery" />
+ <radio_item name="1" label="Odtwarzaj głos z pozycji awatara" />
+ </radio_group>
+ <button label="Ustawienia Sprzętowe" name="device_settings_btn"/>
+ <text name="muting_text">
+ Głośność:
+ </text>
+ <text name="streaming_prefs_text">
+ Ustawienia Strumieni:
+ </text>
+ <text name="audio_prefs_text">
+ Ustawienia Audio:
+ </text>
+ <panel label="Głośność" name="Volume Panel" />
+ <check_box label="Odtwarzaj Strumienie Muzyki"
+ name="streaming_music" />
+ <check_box label="Odtwarzaj Strumienie Video"
+ name="streaming_video" />
+ <check_box label="Automatycznie Odtwarzaj Media" name="auto_streaming_video" />
+ <check_box label="Wyciszaj Audio Podczas Minimalizacji Okna" name="mute_when_minimized" />
+ <slider label="Efekt Dopplera" name="Doppler Effect" />
+ <slider label="Wpływ Dystansu" name="Distance Factor" />
+ <slider label="Wyciszanie" name="Rolloff Factor" />
+ <spinner label="Próg Zmiany L$" name="L$ Change Threshold" />
+ <spinner label="Próg Zmiany Statusu" name="Health Change Threshold" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
new file mode 100644
index 0000000000..e060d784da
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Popups" name="popups" title="Popups">
+ <text name="dont_show_label">
+ Não mostrar estas popups:
+ </text>
+ <button label="Habilitar esta popup" label_selected="Habilitar este popup" name="enable_popup"/>
+ <button label="Habilitar todas as popups..." label_selected="Reiniciar Dialogos que serão mostrados na próxima vez..." name="reset_dialogs_btn" tool_tip="Habilitar todas as popups opcionais e notificações de “primeiro uso”." width="200"/>
+ <text name="show_label">
+ Mostrar estas popups:
+ </text>
+ <button label="Desabilitar todas estas popups..." name="skip_dialogs_btn" tool_tip="Desabilitar todas as popups opcionais e notificações de “primeiro uso”." width="200"/>
+ <text name="text_box2">
+ Ofertas de notecards, texturas e landmarks:
+ </text>
+ <check_box label="Aceitar automaticamente" name="accept_new_inventory"/>
+ <check_box label="Visualizar automaticamente após aceitar" name="show_new_inventory"/>
+ <check_box label="Mostrar automaticamente objetos aceitos recentemente no inventário." name="show_in_inventory"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
new file mode 100644
index 0000000000..84c6c934c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Comunicação" name="im">
+ <text name="text_box">
+ Minha situação online:
+ </text>
+ <check_box label="Apenas meus Amigos e Grupos podem me ver online" name="online_visibility"/>
+ <text name="text_box2">
+ Opções MI:
+ </text>
+ <string name="log_in_to_change">
+ Logar para Alterar
+ </string>
+ <check_box label="Enviar MI para o e-mail ([EMAIL])" name="send_im_to_email"/>
+ <check_box label="Incluir MIs no console do chat" name="include_im_in_chat_console"/>
+ <check_box label="Mostrar data e hora na MI" name="show_timestamps_check"/>
+ <check_box label="Mostrar notificação de Amigo online" name="friends_online_notify_checkbox"/>
+ <text name="text_box3" width="134">
+ Resposta no Modo
+Ocupado:
+ </text>
+ <text name="text_box4">
+ Opções de Registro:
+ </text>
+ <check_box label="Salvar um registro das MIs em meu computador" name="log_instant_messages"/>
+ <check_box label="Mostrar a hora nas MIs" name="log_instant_messages_timestamp"/>
+ <check_box label="Mostrar o final da última conversa em MI" name="log_show_history"/>
+ <check_box label="Salvar um registro da Conversa local em meu computador" name="log_chat"/>
+ <check_box label="Mostrar a hora no registro da Conversa local" name="log_chat_timestamp"/>
+ <check_box label="Mostrar MIs recebidas no registro de Conversa local" name="log_chat_IM"/>
+ <check_box label="Incluir data e hora" name="log_date_timestamp"/>
+ <button label="Mudar Local" label_selected="Alterar Caminho" name="log_path_button" width="120"/>
+ <line_editor left="278" name="log_path_string" right="-20"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
new file mode 100644
index 0000000000..3c94090131
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Câmera" name="Input panel">
+ <text name=" Mouselook Options:">
+ Mouselook:
+ </text>
+ <text name=" Mouse Sensitivity:">
+ Sensibilidade do Mouse:
+ </text>
+ <check_box label="Inverter o Mouse" name="invert_mouse"/>
+ <text name=" Auto Fly Options:">
+ Vôo Automático:
+ </text>
+ <check_box label="Voar/Aterrissar pressionando teclas para cima/baixo" name="automatic_fly"/>
+ <text name=" Camera Options:">
+ Opções de Câmera:
+ </text>
+ <text name="camera_fov_label" width="218">
+ Angulo de Visão da Câmera:
+ </text>
+ <slider bottom_delta="-6" width="128" left="360" name="camera_fov" />
+ <text name="Camera Follow Distance:" width="218">
+ Distância de Acompanhamento da Camêra:
+ </text>
+ <slider bottom_delta="-6" width="128" left="360" name="camera_offset_scale" />
+ <check_box label="Edição automática do movimento da câmera" name="edit_camera_movement" tool_tip="Usar posicionamento automático da câmera quando entrar e sair do modo de edição"/>
+ <check_box label="Movimento Automático da Câmera na edição de aparência" name="appearance_camera_movement" tool_tip="Usar posicionamento automático da câmera em modo de edição"/>
+ <text name="text2">
+ Opções de Exibição
+do Avatar:
+ </text>
+ <check_box label="Mostra o avatar em primeira pessoa" name="first_person_avatar_visible"/>
+ <button bottom_delta="-40" label="Configuração do Joystick" name="joystick_setup_button" width="165"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
new file mode 100644
index 0000000000..5574679cde
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Áudio &amp; Vídeo" name="Preference Media panel">
+ <slider label="Mestre" name="System Volume"/>
+ <slider label="Ambiente" name="Wind Volume"/>
+ <slider label="Sons" name="SFX Volume"/>
+ <slider label="Mídia" name="Media Volume"/>
+ <slider label="UI" name="UI Volume"/>
+ <slider label="Música" name="Music Volume"/>
+ <slider label="Voz" name="Voice Volume"/>
+ <text_editor name="voice_unavailable">
+ Bate-papo de Voz nâo está disponível
+ </text_editor>
+ <check_box label="Habilitar bate-papo de Voz" name="enable_voice_check"/>
+ <radio_group name="ear_location">
+ <radio_item name="0" label="Ouvir o bate-papo de voz pela posição de câmera" />
+ <radio_item name="1" label="Ouvir o bate-papo de voz pela posição do avatar" />
+ </radio_group>
+ <button label="Configurações do dispositivo" name="device_settings_btn" width="180"/>
+ <text name="muting_text">
+ Volume:
+ </text>
+ <text name="streaming_prefs_text">
+ Preferências de
+Streaming:
+ </text>
+ <text name="audio_prefs_text">
+ Preferências de Áudio:
+ </text>
+ <panel label="Volume" name="Volume Panel"/>
+ <check_box label="Tocar música em streaming" name="streaming_music"/>
+ <check_box label="Tocar streaming de Mídia" name="streaming_video"/>
+ <check_box label="Tocar mídia automaticamente" name="auto_streaming_video"/>
+ <check_box label="Silenciar Áudio quando minimizar janela" name="mute_when_minimized"/>
+ <slider label="Efeito Doppler" name="Doppler Effect"/>
+ <slider label="Fator Distância" name="Distance Factor"/>
+ <slider label="Fator Rolloff" name="Rolloff Factor"/>
+ <spinner label="Mudar nível de alerta de L$" name="L$ Change Threshold" label_width="165" width="229"/>
+ <spinner label="Mudar nível de alerta de Saúde" name="Health Change Threshold" label_width="165" width="229"/>
+</panel>