From ffae98e43adcefdcd6306a427c0ea629e1f55a05 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 10 Sep 2019 17:36:07 +0200
Subject: [PATCH] Update German translation + minor fixes in EN + removal of
 unused duplicate strings

---
 indra/newview/fsfloaterdiscord.cpp            |  6 ++--
 .../default/xui/de/floater_fs_discord.xml     | 34 +++++++++++++++++++
 .../skins/default/xui/de/menu_viewer.xml      |  3 ++
 .../newview/skins/default/xui/de/strings.xml  | 18 ++++++----
 .../default/xui/en/floater_fs_discord.xml     | 10 +++---
 .../newview/skins/default/xui/en/strings.xml  |  5 ---
 6 files changed, 57 insertions(+), 19 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_fs_discord.xml

diff --git a/indra/newview/fsfloaterdiscord.cpp b/indra/newview/fsfloaterdiscord.cpp
index 061fcc19e4..7df654c5eb 100644
--- a/indra/newview/fsfloaterdiscord.cpp
+++ b/indra/newview/fsfloaterdiscord.cpp
@@ -298,7 +298,7 @@ void FSFloaterDiscord::draw()
 		case FSDiscordConnect::DISCORD_CONNECTION_IN_PROGRESS:
 			// Connection loading indicator
 			mStatusText->setVisible(true);
-			status_text = LLTrans::getString("SocialDiscordConnecting");
+			status_text = getString("SocialDiscordConnecting");
 			mStatusText->setValue(status_text);
 			break;
         case FSDiscordConnect::DISCORD_CONNECTED:
@@ -307,13 +307,13 @@ void FSFloaterDiscord::draw()
         case FSDiscordConnect::DISCORD_CONNECTION_FAILED:
             // Error connecting to the service
 			mStatusText->setVisible(true);
-            status_text = LLTrans::getString("SocialDiscordErrorConnecting");
+            status_text = getString("SocialDiscordErrorConnecting");
 			mStatusText->setValue(status_text);
             break;
 		case FSDiscordConnect::DISCORD_DISCONNECTING:
 			// Disconnecting loading indicator
 			mStatusText->setVisible(true);
-			status_text = LLTrans::getString("SocialDiscordDisconnecting");
+			status_text = getString("SocialDiscordDisconnecting");
 			mStatusText->setValue(status_text);
 			break;
         }
diff --git a/indra/newview/skins/default/xui/de/floater_fs_discord.xml b/indra/newview/skins/default/xui/de/floater_fs_discord.xml
new file mode 100644
index 0000000000..5782d2886b
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_fs_discord.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_discord" title="Discord">
+	<string name="discord_connected" value="Verbunden mit Discord als:" />
+	<string name="discord_disconnected" value="Nicht mit Discord verbunden." />
+	<string name="SocialDiscordConnecting">
+		Verbinde mit Discord...
+	</string>
+	<string name="SocialDiscordErrorConnecting">
+		Problem beim Verbinden mit Discord
+	</string>
+	<string name="SocialDiscordDisconnecting">
+		Discord-Verbindung wird getrennt...
+	</string>
+	<text name="account_caption_label">
+		Nicht mit Discord verbunden.
+	</text>
+	<check_box label="Automatisch beim Login verbinden" name="startup_check"/>
+	<button label="Verbinden..." name="connect_btn"/>
+	<button label="Trennen" name="disconnect_btn"/>
+	<text name="dont_show_higher_label">
+		Regionsnamen nicht mit Discord teilen, deren Alterseinstufung höher ist als:
+	</text>
+	<combo_box name="maturity_desired_combobox">
+		<combo_box.item label="Generell, Moderate, Adult" name="Desired_Adult"/>
+		<combo_box.item label="Generell und Moderate" name="Desired_Mature"/>
+		<combo_box.item label="Generell" name="Desired_PG"/>
+	</combo_box>
+	<text name="dont_names_label">
+		Regionsnamen nicht mit Discord teilen, die unten aufgeführt sind:
+	</text>
+	<text name="connection_status_text">
+		Wird geladen...
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 5f519f7995..8b7665b5d8 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -70,6 +70,9 @@
             <menu_item_check label="Alle Freundschaftsanfragen abweisen" name="Reject all friendship requests"/>
         </menu>
         <menu_item_check label="Gesten" name="Gestures"/>
+		<menu_item_call label="Twitter..." name="Twitter"/>
+		<menu_item_call label="Flickr..." name="Flickr"/>
+		<menu_item_call label="Discord..." name="Discord"/>
 		<menu label="Voice-Morphing" name="VoiceMorphing">
 			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
 			<menu_item_check label="Vorschau..." name="Preview"/>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 6d1959b525..a1f7c4b37b 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -5862,6 +5862,12 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Beacons_Label">
 		Ortungssignale
 	</string>
+	<string name="Command_Stop_Animations_Label">
+		Avatar-Animationen stoppen
+	</string>
+	<string name="Command_Discord_Label">
+		Discord
+	</string>
 	<string name="Command_Appearance_Tooltip">
 		Avatar ändern
 	</string>
@@ -5985,12 +5991,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Fly_Tooltip">
 		Flugmodus ein-/ausschalten (Pos1)
 	</string>
- 	<string name="Command_Stop_Animations_Label">
- 		Avatar-Animationen stoppen
- 	</string>
- 	<string name="Command_Stop_Animations_Tooltip">
- 		Avatar-Animationen stoppen
- 	</string>
+	<string name="Command_Stop_Animations_Tooltip">
+		Avatar-Animationen stoppen
+	</string>
 	<string name="Command_Groundsit_Tooltip">
 		Aktiviert/Deaktiviert erzwungenes Sitzen auf dem Boden (Strg+Alt+S)
 	</string>
@@ -6057,6 +6060,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Beacons_Tooltip">
 		Ortungssignale anzeigen
 	</string>
+	<string name="Command_Discord_Tooltip">
+		Discord
+	</string>
 	<string name="Toolbar_Bottom_Tooltip">
 		gegenwärtig in der unteren Symbolleiste
 	</string>
diff --git a/indra/newview/skins/default/xui/en/floater_fs_discord.xml b/indra/newview/skins/default/xui/en/floater_fs_discord.xml
index 5cd62a8801..805148d4b6 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_discord.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_discord.xml
@@ -17,10 +17,10 @@
 	  value="You are connected to Discord as:" />
   <string
 	  name="discord_disconnected"
-	  value="Not connected to Discord" />
-   <string name="SocialDiscordConnecting">Connecting to Discord</string>
-   <string name="SocialDiscordErrorConnecting">Error connecting to Discord</string>
-   <string name="SocialDiscordDisconnecting">Disconnecting from Discord</string>
+	  value="Not connected to Discord." />
+   <string name="SocialDiscordConnecting">Connecting to Discord...</string>
+   <string name="SocialDiscordErrorConnecting">Problem connecting to Discord</string>
+   <string name="SocialDiscordDisconnecting">Disconnecting from Discord...</string>
 	  <text
 	   layout="topleft"
 	   length="1"
@@ -52,7 +52,7 @@
 			 right="-10"
 			 visible="true"
 			 height="23"
-			 label="Automaticly connect to Discord on login?"
+			 label="Automatically connect on login"
 			 name="startup_check"
 			 width="210">
 			  <commit_callback function="FSDiscord.Allow"/>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 236c4ac62d..d90d8733a9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -234,11 +234,6 @@ Please try logging in again in a minute.</string>
   <string name="SocialTwitterErrorConnecting">Problem connecting to Twitter</string>
   <string name="SocialTwitterErrorPosting">Problem posting to Twitter</string>
   <string name="SocialTwitterErrorDisconnecting">Problem disconnecting from Twitter</string>
-  
-  <!-- Firestorm social strings -->
-  <string name="SocialDiscordConnecting">Connecting to Discord</string>
-  <string name="SocialDiscordErrorConnecting">Error connecting to Discord</string>
-  <string name="SocialDiscordDisconnecting">Disconnecting from Discord</string>
     
 	<!-- SLShare: User Friendly Filter Names Translation -->
     <string name="BlackAndWhite">Black &amp; White</string>