From 4d65337f48066059eefb2a06cb33bf511b6eac02 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 11 Jan 2025 16:03:49 +0100
Subject: [PATCH] Update German translation

---
 .../skins/default/xui/de/menu_viewer.xml      |  1 +
 .../default/xui/de/panel_preferences_chat.xml |  1 +
 .../skins/default/xui/en/menu_viewer.xml      |  2 +-
 .../default/xui/en/panel_preferences_chat.xml | 29 +++++++++----------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 8510ec77d9..7c82d74512 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -109,6 +109,7 @@
 		<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation Log..."/>
 		<menu_item_check label="Stimmen in der Nähe" name="Nearby Voice"/>
 		<menu_item_call label="Blockierliste" name="Block List"/>
+		<menu_item_check label="Chat-Konsole anzeigen" name="Show On-screen Console"/>
 	</menu>
 	<menu label="Welt" name="World">
 		<menu_item_call label="Animationen synchronisieren" name="Resync Animations"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index b9a11d2c73..2fd9f646f6 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -31,6 +31,7 @@
 			<check_box label="Chat in der Nähe" name="show_timestamps_nearby_chat" width="120"/>
 			<check_box label="Instant Messages" name="show_timestamps_im" width="120"/>
 			<check_box label="Verlauf" name="show_timestamps_transcripts"/>
+			<check_box label="Chat-Konsole anzeigen" tool_tip="Chat in Konsole anzeigen/verstecken, falls das Gespräche-Fenster nicht angezeigt wird" name="FSShowOnscreenConsole"/>
 			<check_box name="FSConsoleClassicDrawMode" label="Klassischen Anzeigemodus für Konsole verwenden" tool_tip="Im klassischen Anzeigemodus wird der Hintergrund der Konsole als einzelner Block über alle Zeilen und mit der Breite der längsten Zeile dargestellt."/>
 			<check_box name="ChatFullWidth" label="Bildschirmbreite für Konsole verwenden" width="240"/>
 			<spinner label="Chat ausblenden nach:" label_width="130" name="fade_chat_time" width="180" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 02cf8b3e44..e32363aa0a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -928,7 +928,7 @@
         </menu_item_call>
         <!-- <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console -->
 	    <menu_item_check
-	    label="Show On-screen Console"
+	    label="Show On-screen Chat Console"
 	    name="Show On-screen Console"
 	    shortcut="shift|`">
 	      <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 078e26add0..34a8702b61 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -88,19 +88,6 @@
                  width="60" />
             </radio_group>
 
-            <!-- <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console -->
-			<check_box
-			 control_name="FSShowOnscreenConsole"
-			 follows="left|top"
-			 height="16"
-			 label="Show on-screen console"
-			 tool_tip="Show/Hide the chat console text, when the Conversations window is not displayed"
-			 layout="topleft"
-			 left="20"
-			 top_pad="5"
-			 name="FSShowOnscreenConsole"
-			 width="400" />
-            <!-- Changed the PlayChatAnim check_box's top_pad = 5 -> 1 to fix up the alignment with the new option -->
 			<check_box
 			 control_name="PlayChatAnim"
 			 follows="left|top"
@@ -108,10 +95,9 @@
 			 label="Play avatar animations (such as shouting)"
 			 layout="topleft"
 			 left="20"
-			 top_pad="1"
+			 top_pad="5"
 			 name="play_avatar_animations"
 			 width="400" />
-            <!-- </FS:minerjr> [FIRE-35039] -->            
             <check_box
              control_name="FSIMSystemMessageBrackets"
              enabled_control="PlainTextChatHistory"
@@ -247,10 +233,21 @@
              left_pad="4"
              width="100" />
 
+            <check_box
+             control_name="FSShowOnscreenConsole"
+             follows="left|top"
+             height="18"
+             top_pad="15"
+             label="Show on-screen chat console"
+             tool_tip="Show/Hide the chat console text, when the Conversations window is not displayed"
+             layout="topleft"
+             left="20"
+             name="FSShowOnscreenConsole"
+             width="400" />
             <check_box
              layout="topleft"
              follows="left|top"
-             top_pad="15"
+             top_pad="-2"
              left="20"
              width="200"
              height="18"