From cc40f5aa738a34caab0eedb04417dca919e3a67e Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Tue, 3 Mar 2015 00:41:47 +0100
Subject: [PATCH] Prefs minor rework: 1) Renaming 'Network & Cache' tab to
 'Network & Files', 2) Removing log files location field from Privacy tab, we
 have it already in Network & Files tab along with few fancy buttons

---
 indra/newview/llfloaterpreference.cpp         |  2 +-
 .../xui/de/panel_preferences_privacy.xml      |  3 ---
 .../default/xui/en/floater_preferences.xml    |  2 +-
 .../xui/en/panel_preferences_privacy.xml      | 26 +------------------
 .../xui/es/panel_preferences_privacy.xml      |  3 ---
 .../xui/fr/panel_preferences_privacy.xml      |  4 ---
 .../xui/ja/panel_preferences_privacy.xml      |  4 ---
 .../default/xui/pl/floater_preferences.xml    |  2 +-
 .../xui/pl/panel_preferences_privacy.xml      |  3 ---
 .../xui/pl/panel_preferences_setup.xml        |  2 +-
 .../xui/pt/panel_preferences_privacy.xml      |  4 ---
 .../xui/en/floater_preferences.xml            |  2 +-
 .../xui/pl/floater_preferences.xml            |  2 +-
 .../vintage/xui/en/floater_preferences.xml    |  2 +-
 14 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 37e359e4d7..cc2d8b07f4 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -623,7 +623,7 @@ BOOL LLFloaterPreference::postBuild()
 	// </FS:Ansariel>
 	
 	getChild<LLUICtrl>("cache_location")->setEnabled(FALSE); // make it read-only but selectable (STORM-227)
-	getChildView("log_path_string")->setEnabled(FALSE);// do the same for chat logs path
+	// getChildView("log_path_string")->setEnabled(FALSE);// do the same for chat logs path - <FS:PP> Field removed from Privacy tab, we have it already in Network & Files tab along with few fancy buttons (03 Mar 2015)
 	getChildView("log_path_string-panelsetup")->setEnabled(FALSE);// and the redundant instance -WoLf
 	std::string cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
 	setCacheLocation(cache_location);
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
index d89d1d436c..ebdd1c21c2 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
@@ -43,9 +43,6 @@
 			</combo_box>
 			<button label="Protokoll löschen..." name="clear_log"/>
 			<button label="Verläufe löschen..." name="delete_transcripts"/>
-			<text name="log_location_label">
-				Speicherort:
-			</text>
 			<check_box name="UseLegacyIMLogNames" label="Klassisches Dateinamensformat für Verläufe verwenden" tool_tip="Falls aktiviert, wird das alte Namensformat für Verläufe (Benutzer Name) anstatt des aktuellen (benutzer_name) verwendet."/>
 			<check_box name="LogFileNamewithDate" label="Datum zum Verlaufsdateinamen hinzufügen" tool_tip="Fügt das aktuelle Datum zum Dateinamen des Verlaufs im Format „chat-JJJJ-MM-TT“ bzw. „Verlaufname-JJJJ-MM-TT“ hinzu."/>
 			<check_box name="FSUseBuiltInHistory" label="Integrierte Verlaufsansicht verwenden" tool_tip="Verwendet den integrierten Betrachter für Verläufe. Falls deaktiviert, wird der standardmäßige Texteditor des Betriebssystems verwendet."/>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 947d8e758e..2516592773 100755
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -132,7 +132,7 @@
         <panel
          class="panel_preference"
          filename="panel_preferences_setup.xml"
-         label="Network &amp; Cache"
+         label="Network &amp; Files"
          layout="topleft"
          help_topic="preferences_input_tab"
          name="input" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 78e0028ac6..3918cc41df 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -271,30 +271,6 @@
      <commit_callback
       function="Pref.DeleteTranscripts" />
     </button>
-    <text
-     name="log_location_label"
-     layout="topleft"
-     follows="left|top"
-     left="30"
-     height="12"
-     top_pad="4"
-     width="100">
-     Location:
-    </text>
-    <line_editor
-     control_name="InstantMessageLogPath"
-     follows="left|top"
-     border_style="line"
-     border_thickness="1"
-     font="SansSerif"
-     height="23"
-     layout="topleft"
-     left_pad="5"
-     max_length_bytes="4096"
-     name="log_path_string"
-     top_delta="-5"
-     width="285">
-    </line_editor>
    <check_box
      control_name="UseLegacyIMLogNames"
      label="Use legacy file name format for transcripts"
@@ -333,7 +309,7 @@
      layout="topleft"
      left="30"
      name="block_list"
-     top="380"
+     top="360"
      width="255">
      <!-- <button.commit_callback
       function="SideTray.ShowPanel"-->
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
index a467e8949c..a772fe6a8f 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
@@ -31,9 +31,6 @@
 			</combo_box>
 			<button label="Limpiar registros..." name="clear_log"/>
 			<button label="Borrar transcripciones..." name="delete_transcripts"/>
-			<text name="log_location_label">
-				Ubicación:
-			</text>
 			<check_box label="Usar el formato clásico de nombre de archivo para las transcripciones" name="UseLegacyIMLogNames" tool_tip="Si lo activas, se usará el formato de nombre de archivo para las transcripciones (nombre de usuario) en vez del nuevo formato (nombre_de_usuario)."/>
 			<check_box label="Añadir marca horaria a los nombres de archivo de registro" name="LogFileNamewithDate" tool_tip="Añadir fecha y hora a los nombres de archivo de los registros de MI y chat, con formato chat-YYYY-MM-DD y 'nombre_MI'-YYYY-MM."/>
 			<check_box label="Usar el visor de transcripciones incorporado" name="FSUseBuiltInHistory" tool_tip="Utiliza el visor incorporado de transcripciones. Si lo desactivas, las transcripciones se abrirán en el editor de texto predefinido en tu sistema operativo."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
index c59cb7a021..8fcad00d0b 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
@@ -19,10 +19,6 @@
 	<check_box label="Sauvegarder les IM sur mon ordinateur" name="log_instant_messages"/>
 	<check_box label="Inclure la date et l&apos;heure pour chaque ligne du journal de chat" name="show_timestamps_check_im"/>
 	<check_box label="Inclure la date dans le nom du fichier journal" name="logfile_name_datestamp"/>
-	<text name="log_path_desc">
-		Emplacement journaux :
-	</text>
-	<line_editor left="308" name="log_path_string" right="-20"/>
 	<button label="Parcourir" label_selected="Parcourir" name="log_path_button" width="150"/>
 	<button label="Liste des ignorés" name="block_list"/>
 	<text name="block_list_label">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index 5bda293ba6..da1be54747 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -39,10 +39,6 @@
 				</combo_box>
 				<button label="記録をクリア..." name="clear_log" />
 				<button label="会話内容をクリア..." name="delete_transcripts" />
-				<text name="log_location_label">
-					保存場所:
-				</text>
-				<line_editor name="log_path_string" />
 				<check_box label="会話内容の保存には古い形式のファイル名を使用" name="UseLegacyIMLogNames" tool_tip="ここにチェックを入れると会話内容の古い形式のユーザー名でファイルが作成され、入れない場合は新しいユーザー名の形式でファイルが作成されます。" />
 				<!-- Deleted: Aug.03, 2013
 			<check_box label="IM ログをコンピューターに保存する" name="log_instant_messages"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
index ffe56f6111..24d4c3e4f2 100755
--- a/indra/newview/skins/default/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml
@@ -12,7 +12,7 @@
 		<panel label="Kolory" name="colors"/>
 		<panel label="Grafika" name="display"/>
 		<panel label="Dźwięk i media" name="audio"/>
-		<panel label="Sieć i bufory" name="input"/>
+		<panel label="Sieć i pliki" name="input"/>
 		<panel label="Ruch i widok" name="move"/>
 		<panel label="Powiadomienia" name="msgs"/>
 		<panel label="Prywatność" name="im"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
index a6ee19a8a8..6d7c1c2cfd 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
@@ -41,9 +41,6 @@
 			</combo_box>
 			<button label="Wyczyść dziennik" name="clear_log"/>
 			<button label="Usuń logi rozmów" name="delete_transcripts"/>
-			<text name="log_location_label">
-				Miejsce zapisu:
-			</text>
 			<check_box label="Używaj starego formatu nazw plików dla logów rozmów" name="UseLegacyIMLogNames" tool_tip="Włączenie tej opcji spowoduje używanie starego formatu nazw plików dla logów rozmów (Nazwa Użytkownika) zamiast nowego (nazwa_użytkownika)."/>
 			<check_box label="Dodawaj datę do nazw plików logów rozmów" name="LogFileNamewithDate" tool_tip="Dodawaj znaczniki czasu do logów czatów oraz IM w formacie czat-RRRR-MM-DD oraz 'Nazwa pliku IM'-RRRR-MM."/>
 			<check_box label="Używaj wbudowanej przeglądarki logów" name="FSUseBuiltInHistory" tool_tip="Używaj wbudowanej przeglądarki logów do przeglądania logów czatów. Gdy wyłączysz tą opcję, to logi będą się otwierać w domyślnym edytorze tekstowym Twojego systemu operacyjnego."/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
index c8504f2388..f9c6c215ef 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Sieć i bufory" name="Input panel">
+<panel label="Sieć i pliki" name="Input panel">
 	<tab_container name="max_bandwidth_layout">
 		<panel label="Połączenie" name="tab-conn">
 			<text name="Maximum bandwidth">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
index 78323fc47d..904a6cbc33 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
@@ -19,10 +19,6 @@
 	<check_box label="Salvar logs de MI no meu computador" name="log_instant_messages"/>
 	<check_box label="Anotar horas de cada linha de bate-papo" name="show_timestamps_check_im"/>
 	<check_box label="Anotar a data ao arquivo." name="logfile_name_datestamp"/>
-	<text name="log_path_desc">
-		Localização dos logs:
-	</text>
-	<line_editor left="278" name="log_path_string" right="-20"/>
 	<button label="Procurar" label_selected="Procurar" name="log_path_button" width="120"/>
 	<button label="Lista de bloqueados" name="block_list"/>
 	<text name="block_list_label">
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
index f43c6176d0..9e7a6d9913 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
@@ -139,7 +139,7 @@
         <panel
          class="panel_preference"
          filename="panel_preferences_setup.xml"
-         label="Network &amp; Cache"
+         label="Network &amp; Files"
          layout="topleft"
          help_topic="preferences_input_tab"
          name="input" />
diff --git a/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
index 7a67c2dfba..23d4af58c3 100644
--- a/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
@@ -13,7 +13,7 @@
 		<panel label="Własne kolory" name="custom_colors"/>
 		<panel label="Grafika" name="display"/>
 		<panel label="Dźwięk i media" name="audio"/>
-		<panel label="Sieć i cache" name="input"/>
+		<panel label="Sieć i pliki" name="input"/>
 		<panel label="Ruch i widok" name="move"/>
 		<panel label="Powiadomienia" name="msgs"/>
 		<panel label="Prywatność" name="im"/>
diff --git a/indra/newview/skins/vintage/xui/en/floater_preferences.xml b/indra/newview/skins/vintage/xui/en/floater_preferences.xml
index f5f3e7454d..11c653e9fb 100644
--- a/indra/newview/skins/vintage/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_preferences.xml
@@ -133,7 +133,7 @@
         <panel
          class="panel_preference"
          filename="panel_preferences_setup.xml"
-         label="Network &amp; Cache"
+         label="Network &amp; Files"
          layout="topleft"
          help_topic="preferences_input_tab"
          name="input" />