Merged in lindenlab/viewer-lynx

36 files changed, 367 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/de/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/de/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..e73ace4296
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="EINSTELLUNGEN ZUR DARSTELLUNG VON AVATAREN">
+	<string name="av_never_render" value="Nie"/>
+	<string name="av_always_render" value="Immer"/>
+	<filter_editor label="Nach Personen filtern" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="Aktionen für ausgewählte Person"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="Name" name="name"/>
+		<name_list.columns label="Darstellungseinstellung" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/de/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..8d8498e77c
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="Standard" name="default"/>
+	<menu_item_check label="Immer darstellen" name="always_render"/>
+	<menu_item_check label="Nie darstellen" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/de/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..01125c0799
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="Einwohner immer darstellen..." name="add_avatar_always_render"/>
+	<menu_item_call label="Einwohner nie darstellen..." name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/de/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..e2759715d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_preferences_uploads.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Uploads" name="uploads">
+	<text name="title">
+		Aktuelle Zielorder für Uploads
+	</text>
+	<text name="title_models">
+		Bilder
+	</text>
+	<text name="title_sounds">
+		Sounds
+	</text>
+	<text name="title_animation">
+		Animationen
+	</text>
+	<text name="upload_help">
+		Um einen Zielordner zu ändern, klicken Sie im Inventar mit der rechten Maustaste auf den Ordner und wählen Sie „Als Standard verwenden für“.
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/es/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..727b1118c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="CONFIGURACIÓN DE RENDERIZADO DE AVATAR">
+	<string name="av_never_render" value="Nunca"/>
+	<string name="av_always_render" value="Siempre"/>
+	<filter_editor label="Filtrar la gente" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="Acciones en la persona seleccionada"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="Nombre" name="name"/>
+		<name_list.columns label="Configuración de renderizado" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/es/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..11f68e7792
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="Predeterminado" name="default"/>
+	<menu_item_check label="Renderizar siempre" name="always_render"/>
+	<menu_item_check label="No renderizar nunca" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/es/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..a7c673cf2c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="Renderizar siempre un Residente..." name="add_avatar_always_render"/>
+	<menu_item_call label="No renderizar nunca un Residente..." name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/es/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..b095ed6c67
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_uploads.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Subidas" name="uploads">
+	<text name="title">
+		Carpetas de destino actuales para las subidas
+	</text>
+	<text name="title_models">
+		Imágenes
+	</text>
+	<text name="title_sounds">
+		Sonidos
+	</text>
+	<text name="title_animation">
+		Animaciones
+	</text>
+	<text name="upload_help">
+		Para cambiar una carpeta de destino, pulsa con el botón derecho en ella en el inventario y elige
+&quot;Usar como valor predeterminado para&quot;
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/fr/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..5d178bf2dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="PARAMÈTRES DE RENDU DE L’AVATAR">
+	<string name="av_never_render" value="Jamais"/>
+	<string name="av_always_render" value="Toujours"/>
+	<filter_editor label="Filtrer les personnes" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="Actions sur la personne sélectionnée"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="Nom" name="name"/>
+		<name_list.columns label="Paramètre de rendu" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/fr/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..59dad01a11
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="Valeur par défaut" name="default"/>
+	<menu_item_check label="Toujours effectuer le rendu" name="always_render"/>
+	<menu_item_check label="Ne jamais effectuer le rendu" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/fr/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..44f3961f1a
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="Toujours effectuer le rendu d’un résident" name="add_avatar_always_render"/>
+	<menu_item_call label="Ne jamais effectuer le rendu d’un résident" name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/fr/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..c1d9d15a93
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_uploads.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Chargements" name="uploads">
+	<text name="title">
+		Dossiers de destination actuels pour les chargements
+	</text>
+	<text name="title_models">
+		Images
+	</text>
+	<text name="title_sounds">
+		Sons
+	</text>
+	<text name="title_animation">
+		Animations
+	</text>
+	<text name="upload_help">
+		Pour modifier un dossier de destination, cliquez-droit sur ce dossier dans l’inventaire et faites votre choix
+ &quot;Utiliser comme défaut pour&quot;
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/it/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..4c992dceb4
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="IMPOSTAZIONI DI RENDERING AVATAR">
+	<string name="av_never_render" value="Mai"/>
+	<string name="av_always_render" value="Sempre"/>
+	<filter_editor label="Filtro persone" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="Azioni per la persona selezionata"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="Nome" name="name"/>
+		<name_list.columns label="Impostazione di rendering" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/it/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..f29b3166fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="Impostazione predefinita" name="default"/>
+	<menu_item_check label="Esegui sempre il rendering" name="always_render"/>
+	<menu_item_check label="Non eseguire mai il rendering" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/it/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..d8918d07d0
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="Esegui sempre il rendering di un residente..." name="add_avatar_always_render"/>
+	<menu_item_call label="Non eseguire mai il rendering di un residente..." name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/it/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..5083ceb552
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_preferences_uploads.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Caricamenti" name="uploads">
+	<text name="title">
+		Cartelle correnti di destinazione dei caricamenti
+	</text>
+	<text name="title_models">
+		Immagini
+	</text>
+	<text name="title_sounds">
+		Suoni
+	</text>
+	<text name="title_animation">
+		Animazioni
+	</text>
+	<text name="upload_help">
+		Per cambiare una cartella di destinazione, fai clic col pulsante destro del mouse sulla cartella desiderata nell&apos;inventario e sceglila
+ &quot;Usa come impostazione predefinita per&quot;
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..c0a644e3ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="アバターの描画設定">
+	<string name="av_never_render" value="使用しない"/>
+	<string name="av_always_render" value="常に使用する"/>
+	<filter_editor label="人をフィルター" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="選択した人に対するアクション:"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="名前" name="name"/>
+		<name_list.columns label="描画設定" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..59c80bdb0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="デフォルト" name="default"/>
+	<menu_item_check label="常に描画" name="always_render"/>
+	<menu_item_check label="描画しない" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..e4f78cad31
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="常に住人を描画する..." name="add_avatar_always_render"/>
+	<menu_item_call label="住人を描画しない..." name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..b8524aa60f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_uploads.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="アップロード" name="uploads">
+	<text name="title">
+		アップロード用の最新の宛先フォルダ
+	</text>
+	<text name="title_models">
+		画像
+	</text>
+	<text name="title_sounds">
+		サウンド
+	</text>
+	<text name="title_animation">
+		アニメーション
+	</text>
+	<text name="upload_help">
+		宛先フォルダを変更するには、持ち物でそのフォルダを右クリックして、&quot;デフォルトとして使用&quot; を選択します
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/pt/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..b512126f98
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="CONFIGURAÇÕES DE RENDERIZAÇÃO DO AVATAR">
+	<string name="av_never_render" value="Nunca"/>
+	<string name="av_always_render" value="Sempre"/>
+	<filter_editor label="Filtrar pessoas" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="Ações nas pessoas selecionadas"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="Nome" name="name"/>
+		<name_list.columns label="Configuração de renderização" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/pt/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..e38bfe5802
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="Padrão" name="default"/>
+	<menu_item_check label="Sempre renderizar" name="always_render"/>
+	<menu_item_check label="Nunca renderizar" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/pt/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..c6b405645d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="Sempre renderizar um residente..." name="add_avatar_always_render"/>
+	<menu_item_call label="Nunca renderizar um residente..." name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/pt/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..8050b56f0a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_uploads.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Envios" name="uploads">
+	<text name="title">
+		Pastas de destino atuais para envios
+	</text>
+	<text name="title_models">
+		Imagens
+	</text>
+	<text name="title_sounds">
+		Sons
+	</text>
+	<text name="title_animation">
+		Animações
+	</text>
+	<text name="upload_help">
+		Para alterar a pasta de destino, clique com o botão direito nela no inventário e selecione
+&quot;Usar como padrão para&quot;
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/ru/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..9c0c3196aa
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="НАСТРОЙКИ ОТРИСОВКИ АВАТАРА">
+	<string name="av_never_render" value="Никогда"/>
+	<string name="av_always_render" value="Всегда"/>
+	<filter_editor label="Фильтр для людей" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="Действия с выбранным жителем"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="Имя" name="name"/>
+		<name_list.columns label="Настройка отрисовки" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/ru/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..c1ec8d67b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="По умолчанию" name="default"/>
+	<menu_item_check label="Всегда рисовать" name="always_render"/>
+	<menu_item_check label="Никогда не рисовать" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/ru/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..3807458cd3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="Всегда рисовать жителя..." name="add_avatar_always_render"/>
+	<menu_item_call label="Никогда не рисовать жителя..." name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/ru/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..487c92bd2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_uploads.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Загрузки" name="uploads">
+	<text name="title">
+		Текущие папки назначения для передачи
+	</text>
+	<text name="title_models">
+		Изображения
+	</text>
+	<text name="title_sounds">
+		Звуки
+	</text>
+	<text name="title_animation">
+		Анимация
+	</text>
+	<text name="upload_help">
+		Чтобы сменить папку назначения, щелкните ее в инвентаре правой кнопкой мыши и выберите
+ &quot;Использовать по умолчанию для&quot;
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/tr/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..3f16d73c23
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="AVATAR İŞLEME AYARLARI">
+	<string name="av_never_render" value="Asla"/>
+	<string name="av_always_render" value="Her Zaman"/>
+	<filter_editor label="Kişileri Filtrele" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="Seçilen kişi üzerinde eylemler"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="Ad" name="name"/>
+		<name_list.columns label="İşleme ayarı" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/tr/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..3a27fec53a
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="Varsayılan" name="default"/>
+	<menu_item_check label="Her zaman işle" name="always_render"/>
+	<menu_item_check label="Asla işleme" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/tr/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..8379f22a68
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="Her Zaman Bir Sakin Olarak İşle..." name="add_avatar_always_render"/>
+	<menu_item_call label="Asla Bir Sakin Olarak İşleme..." name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/tr/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..d60a11159d
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_uploads.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Karşıya Yüklemeler" name="uploads">
+	<text name="title">
+		Karşıya yüklemeler için mevcut hedef klasörler
+	</text>
+	<text name="title_models">
+		Görüntüler
+	</text>
+	<text name="title_sounds">
+		Sesler
+	</text>
+	<text name="title_animation">
+		Animasyonlar
+	</text>
+	<text name="upload_help">
+		Bir hedef klasörü değiştirmek için, envanterde o klasöre sağ tıklayın ve şu öğeyi seçin:
+&quot;Şunun için varsayılan olarak kullan:&quot;
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/zh/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000..2de8c5bc89
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_render_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_avatar_render_settings" title="化身呈像設定">
+	<string name="av_never_render" value="絕不"/>
+	<string name="av_always_render" value="永遠"/>
+	<filter_editor label="過濾人員" name="people_filter_input"/>
+	<menu_button name="plus_btn" tool_tip="對選取的人採取的動作"/>
+	<name_list name="render_settings_list">
+		<name_list.columns label="名稱" name="name"/>
+		<name_list.columns label="呈像設定" name="setting"/>
+	</name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/zh/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000..18c33e1c39
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Settings">
+	<menu_item_check label="預設" name="default"/>
+	<menu_item_check label="總是呈現" name="always_render"/>
+	<menu_item_check label="絕不呈現" name="never_render"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/zh/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..98c3f27abb
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_settings_add.xml">
+	<menu_item_call label="永遠呈現居民…" name="add_avatar_always_render"/>
+	<menu_item_call label="永不呈現居民…" name="add_avatar_never_render"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/zh/panel_preferences_uploads.xml
new file mode 100644
index 0000000000..b34b4109d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_uploads.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="上傳內容" name="uploads">
+	<text name="title">
+		目前的上傳目的資料夾
+	</text>
+	<text name="title_models">
+		圖像
+	</text>
+	<text name="title_sounds">
+		聲音
+	</text>
+	<text name="title_animation">
+		動作
+	</text>
+	<text name="upload_help">
+		要變更目的資料夾，請在收納區用滑鼠右鍵按一下新的資料夾並選擇
+ 「用作預設值」
+	</text>
+</panel>