Merge branch 'master' into mw_do_recording_mvp

app/components-react/editor/elements/DualOutputSourceSelector.tsx

@@ -19,8 +19,13 @@ export function DualOutputSourceSelector(p: IDualOutputSourceSelector) {
       DualOutputService.views.verticalNodeIds && horizontalActive
         ? DualOutputService.views.activeSceneNodeMap[p.nodeId]
         : p.nodeId,
-    isHorizontalVisible: DualOutputService.views.getIsHorizontalVisible(p.nodeId, p?.sceneId),
-    isVerticalVisible: DualOutputService.views.getIsVerticalVisible(p.nodeId, p?.sceneId),
+    isHorizontalVisible:
+      !DualOutputService.views.isLoading &&
+      DualOutputService.views.getIsHorizontalVisible(p.nodeId, p?.sceneId),
+    isVerticalVisible:
+      !DualOutputService.views.isLoading &&
+      DualOutputService.views.getIsVerticalVisible(p.nodeId, p?.sceneId),
+    isLoading: DualOutputService.views.isLoading && !DualOutputService.views.hasVerticalNodes,
   }));
 
   const showHorizontalToggle = useMemo(() => {

app/components-react/windows/go-live/GoLiveSettings.tsx

@@ -48,8 +48,7 @@ export default function GoLiveSettings() {
       get canAddDestinations() {
         const linkedPlatforms = module.state.linkedPlatforms;
         const customDestinations = module.state.customDestinations;
-        const isPrime = UserService.views.isPrime;
-        return !isPrime && linkedPlatforms.length + customDestinations.length < 5;
+        return linkedPlatforms.length + customDestinations.length < 5;
       },
 
       addDestination() {
@@ -61,7 +60,7 @@ export default function GoLiveSettings() {
         }
       },
 
-      shouldShowPrimeLabel: !RestreamService.state.grandfathered,
+      shouldShowPrimeLabel: !RestreamService.state.grandfathered && !UserService.views.isPrime,
 
       canUseOptimizedProfile:
         VideoEncodingOptimizationService.state.canSeeOptimizedProfile ||
@@ -86,7 +85,7 @@ export default function GoLiveSettings() {
           {shouldShowAddDestButton && (
             <a className={styles.addDestinationBtn} onClick={addDestination}>
               <PlusIcon style={{ paddingLeft: '17px', fontSize: '24px' }} />
-              {$t('Add Destination')}
+              <span style={{ flex: 1 }}>{$t('Add Destination')}</span>
               {shouldShowPrimeLabel && (
                 <ButtonHighlighted filled text={$t('Ultra')} icon={<UltraIcon type="simple" />} />
               )}

app/components-react/windows/settings/General.tsx

@@ -74,12 +74,13 @@ function ExtraSettings() {
   }));
 
   // HDR Settings are not compliant with the auto-optimizer
-  const canRunOptimizer =
-    !SettingsService.views.hasHDRSettings &&
-    isTwitch &&
-    !isRecordingOrStreaming &&
-    protectedMode &&
-    isSimpleOutputMode;
+  // temporarily disable auto config until migrate to new api
+  const canRunOptimizer = false;
+  // !SettingsService.views.hasHDRSettings &&
+  // isTwitch &&
+  // !isRecordingOrStreaming &&
+  // protectedMode &&
+  // isSimpleOutputMode;
 
   function restartStreamlabelsSession() {
     StreamlabelsService.restartSession().then(result => {

app/components/LiveDock.vue

@@ -84,14 +84,14 @@
             </a>
           </div>
           <div class="flex">
-            <a @click="refreshChat" v-if="isTwitch || isTrovo || (isYoutube && isStreaming) || isFacebook || (isTwitter && isRestreaming)">
+            <a @click="refreshChat" v-if="isTwitch || isTrovo || (isYoutube && isStreaming) || isFacebook || (isTwitter && isStreaming)">
               {{ $t('Refresh Chat') }}
             </a>
           </div>
         </div>
         <div
           class="live-dock-chat"
-          v-if="!hideStyleBlockers && (isTwitch || isTrovo || (isYoutube && isStreaming) || (isFacebook && isStreaming) || (isTwitter && isRestreaming))"
+          v-if="!hideStyleBlockers && (isTwitch || isTrovo || (isYoutube && isStreaming) || (isFacebook && isStreaming) || (isTwitter && isStreaming))"
         >
           <div v-if="hasChatTabs" class="flex">
             <tabs :tabs="chatTabs" v-model="selectedChat" :hideContent="true" />

app/i18n/ar-SA/hotkeys.json

@@ -23,5 +23,6 @@
   "Next Slide": "Next Slide",
   "Previous Slide": "Previous Slide",
   "Toggle Performance Mode": "Toggle Performance Mode",
-  "Skip Alert": "Skip Alert"
+  "Skip Alert": "Skip Alert",
+  "To use hotkeys on Mac, go to System Settings > Security > Accessibility and toggle on for Streamlabs Desktop.": "To use hotkeys on Mac, go to System Settings > Security > Accessibility and toggle on for Streamlabs Desktop."
 }

app/i18n/cs-CZ/hotkeys.json

@@ -23,5 +23,6 @@
   "Next Slide": "Další snímek",
   "Previous Slide": "Předchozí snímek",
   "Toggle Performance Mode": "Aktivovat režim výkonu",
-  "Skip Alert": "Přeskočit upozornění"
+  "Skip Alert": "Přeskočit upozornění",
+  "To use hotkeys on Mac, go to System Settings > Security > Accessibility and toggle on for Streamlabs Desktop.": "To use hotkeys on Mac, go to System Settings > Security > Accessibility and toggle on for Streamlabs Desktop."
 }

app/i18n/da-DK/hotkeys.json

@@ -23,5 +23,6 @@
   "Next Slide": "Næste dias",
   "Previous Slide": "Forrige dias",
   "Toggle Performance Mode": "Performancetilstand til/fra",
-  "Skip Alert": "Spring over"
+  "Skip Alert": "Spring over",
+  "To use hotkeys on Mac, go to System Settings > Security > Accessibility and toggle on for Streamlabs Desktop.": "To use hotkeys on Mac, go to System Settings > Security > Accessibility and toggle on for Streamlabs Desktop."
 }

app/i18n/de-DE/guest-cam.json

@@ -47,5 +47,5 @@
   "Collab Cam requires a source": "Quelle erforderlich für Collab Cam",
   "At least one Collab Cam source is required to use Collab Cam. Would you like to add one now?": "Für die Verwendung von Collab Cam ist mindestens eine Collab Cam Quelle erforderlich. Möchten Sie sie jetzt hinzufügen?",
   "You now have access to Collab Cam!": "Sie haben jetzt Zugriff auf Collab Cam!",
-  "You must be logged in to use Collab Cam.": "You must be logged in to use Collab Cam."
+  "You must be logged in to use Collab Cam.": "Sie müssen eingeloggt sein, um Collab Cam zu nutzen."
 }

app/i18n/de-DE/highlighter.json

@@ -91,15 +91,15 @@
   "An error occurred while reading audio from %{file}": "Fehler beim Lesen von Audio aus %{file}",
   "An error occurred while mixing audio": "Fehler beim Mischen von Audio",
   "Edit your replays with Highlighter, a free editor built in to Streamlabs.": "Bearbeiten Sie Ihre Replays mit Highlighter, einem in Streamlabs integrierten kostenlosen Editor.",
-  "Upload To": "Upload To",
-  "Upload": "Upload",
-  "This feature requires a Streamlabs ID": "This feature requires a Streamlabs ID",
-  "Sign up for Streamlabs ID": "Sign up for Streamlabs ID",
-  "Add subtitles, transcribe, and more": "Add subtitles, transcribe, and more",
-  "Convert to mobile-friendly short video": "Convert to mobile-friendly short video",
-  "YouTube (private video)": "YouTube (private video)",
+  "Upload To": "Hochladen nach",
+  "Upload": "Hochladen",
+  "This feature requires a Streamlabs ID": "Diese Funktion erfordert eine Streamlabs ID",
+  "Sign up for Streamlabs ID": "Registrieren für Streamlabs ID",
+  "Add subtitles, transcribe, and more": "Untertitel hinzufügen, transkribieren und mehr",
+  "Convert to mobile-friendly short video": "In für Mobilgeräte geeignete Kurzvideos umwandeln",
+  "YouTube (private video)": "YouTube (privates Video)",
   "Clip": "Clip",
-  "Transcribe": "Transcribe",
-  "Record your screen with Streamlabs Desktop. Once recording is complete, it will be displayed here. Access your files or edit further with Streamlabs tools.": "Record your screen with Streamlabs Desktop. Once recording is complete, it will be displayed here. Access your files or edit further with Streamlabs tools.",
-  "Recordings": "Recordings"
+  "Transcribe": "Transkribieren",
+  "Record your screen with Streamlabs Desktop. Once recording is complete, it will be displayed here. Access your files or edit further with Streamlabs tools.": "Zeichnen Sie Ihren Bildschirm mit Streamlabs Desktop auf. Sobald die Aufnahme abgeschlossen ist, wird sie hier angezeigt. Greifen Sie auf Ihre Dateien zu oder bearbeiten Sie sie weiter mit den Streamlabs-Tools.",
+  "Recordings": "Aufzeichnungen"
 }

app/i18n/de-DE/hotkeys.json

@@ -23,5 +23,6 @@
   "Next Slide": "Nächstes Bild",
   "Previous Slide": "Vorheriges Bild",
   "Toggle Performance Mode": "Performance-Modus ein/aus",
-  "Skip Alert": "Benachrichtigung überspringen"
+  "Skip Alert": "Benachrichtigung überspringen",
+  "To use hotkeys on Mac, go to System Settings > Security > Accessibility and toggle on for Streamlabs Desktop.": "To use hotkeys on Mac, go to System Settings > Security > Accessibility and toggle on for Streamlabs Desktop."
 }

app/i18n/de-DE/notifications.json

@@ -25,7 +25,7 @@
   "Show in folder": "In Ordner anzeigen",
   "Recordings": "Aufzeichnungen",
   "Marker %{label} added at %{timestamp}": "Markierung %{label} hinzugefügt bei %{timestamp}",
-  "File is too large to upload": "File is too large to upload",
-  "File type %{extension} is not supported": "File type %{extension} is not supported",
-  "Upload already in progress": "Upload already in progress"
+  "File is too large to upload": "Datei ist zu groß zum Hochladen",
+  "File type %{extension} is not supported": "Der Dateityp %{extension} wird nicht unterstützt",
+  "Upload already in progress": "Upload läuft bereits"
 }

app/i18n/de-DE/onboarding.json

@@ -124,7 +124,7 @@
   "Basic Chatbot": "Basic Chatbot",
   "Basic Features": "Grundfunktionen",
   "Access to All Overlays and Themes (%{themeNumber})": "Zugriff auf alle Overlays und Themen (%{themeNumber})",
-  "Add Up To 11 Guests or Cameras": "Add Up To 11 Guests or Cameras",
+  "Add Up To 11 Guests or Cameras": "Bis zu 11 Gäste oder Kameras hinzufügen",
   "Access Full App Library (%{appNumber})": "Zugriff auf vollständige App-Bibliothek (%{appNumber})",
   "Custom Tip Page and Domain": "Benutzerdefinierte Spendenseite und Domäne",
   "Custom Named Chatbot": "Chatbot mit benutzerdefiniertem Namen",
@@ -137,7 +137,7 @@
   "Streamlabs Desktop requires that you have a connected platform account in order to use all of its features. By skipping this step, you will be logged out and some features may be unavailable.": "Für Streamlabs Desktop benötigen Sie ein verbundenes Plattformkonto, um alle Funktionen nutzen zu können. Wenn Sie diesen Schritt überspringst, werden Sie ausgeloggt und einige Funktionen sind dann eventuell nicht verfügbar.",
   "Your Streamlabs account has multiple connected content platforms. Please select the primary platform you will be streaming to using Streamlabs Desktop.": "Mit Ihrem Streamlabs Konto sind mehrere Inhaltsplattformen verbunden. Bitte wählen Sie die primäre Plattform, auf der Sie mit Streamlabs Desktop streamen wollen.",
   "Streamlabs Desktop requires you to connect a content platform to your Streamlabs account": "Für Streamlabs Desktop müssen Sie eine Inhaltsplattform mit Ihrem Streamlabs Konto verbinden.",
-  "Error": "Error",
-  "Ok": "Ok",
-  "An error has occurred during optimization attempt. Only default settings are applied": "An error has occurred during optimization attempt. Only default settings are applied"
+  "Error": "Fehler",
+  "Ok": "OK",
+  "An error has occurred during optimization attempt. Only default settings are applied": "Beim Optimierungsversuch ist ein Fehler aufgetreten. Nur Standardeinstellungen werden angewendet"
 }

app/i18n/de-DE/overlays.json

@@ -1,20 +1,20 @@
 {
   "Successfully saved %{filename}": "%{filename} erfolgreich gespeichert",
-  "Successfully converted %{filename}": "Successfully converted %{filename}",
-  "Successfully saved %{filename} to %{filepath}": "Successfully saved %{filename} to %{filepath}",
+  "Successfully converted %{filename}": "%{filename} wurde konvertiert",
+  "Successfully saved %{filename} to %{filepath}": "%{filename} wurde unter %{filepath} gespeichert",
   "Successfully loaded %{filename}.overlay": "%{filename}.overlay erfolgreich geladen",
   "This is an experimental feature.  Use at your own risk.": "Diese Funktion befindet sich noch im Versuchsstadium, Verwendung auf eigene Gefahr.",
   "Export Overlay File": "Overlay-Datei exportieren",
   "Import Overlay File": "Overlay-Datei importieren",
   "Import Widget File in Current Scene": "Widget-Datei in aktuelle Szene importieren",
-  "The active scene collection is not a dual output scene collection.": "The active scene collection is not a dual output scene collection.",
-  "Convert to Vanilla Scene": "Convert to Vanilla Scene",
-  "Convert": "Convert",
-  "Convert and Export Overlay": "Convert and Export Overlay",
-  "Assign": "Assign",
-  "Assign and Export Overlay": "Assign and Export Overlay",
-  "Assign Vertical Sources to Horizontal Display": "Assign Vertical Sources to Horizontal Display",
-  "The below will create a copy of the active scene collection, set the copy as the active collection, and then apply the function.": "The below will create a copy of the active scene collection, set the copy as the active collection, and then apply the function.",
-  "Manage Dual Output Scene": "Manage Dual Output Scene",
-  "Unable to convert dual output collection.": "Unable to convert dual output collection."
+  "The active scene collection is not a dual output scene collection.": "Die aktive Szenensammlung ist keine Szenensammlung mit Dual Output.",
+  "Convert to Vanilla Scene": "In Vanilla-Szene konvertieren",
+  "Convert": "Konvertieren",
+  "Convert and Export Overlay": "Overlay konvertieren und exportieren",
+  "Assign": "Zuweisen",
+  "Assign and Export Overlay": "Overlay zuweisen und exportieren",
+  "Assign Vertical Sources to Horizontal Display": "Vertikale Quellen der horizontalen Anzeige zuordnen",
+  "The below will create a copy of the active scene collection, set the copy as the active collection, and then apply the function.": "Im Folgenden wird eine Kopie der aktiven Szenensammlung erstellt und die Kopie als aktive Sammlung festgelegt. Anschließend wird die Funktion angewendet.",
+  "Manage Dual Output Scene": "Verwalten der Dual Output Szene",
+  "Unable to convert dual output collection.": "Die Dual Output Sammlung kann nicht konvertiert werden."
 }

app/i18n/de-DE/promotional-copy.json

@@ -71,5 +71,5 @@
   "1 Hour Videos + 250GB Storage + More": "1 Stunde Videos + 250 GB Speicherplatz + mehr",
   "Highest Profit Margins": "Höchste Profitmargen",
   "%{monthlyPrice}/mo or %{yearlyPrice}/year": "%{monthlyPrice}/Mon. oder %{yearlyPrice}/Jahr",
-  "Text-based editing of VOD content": "Text-based editing of VOD content"
+  "Text-based editing of VOD content": "Textbasierte Bearbeitung von VOD-Inhalten"
 }

app/i18n/de-DE/scenes.json

@@ -50,11 +50,11 @@
   "Enter a Scene Collection Name": "Name für Szenen-Sammlung eingeben",
   "Copy of %{collectionName}": "Kopie von %{collectionName}",
   "Your Scene Collections": "Ihre Szenen-Sammlungen",
-  "Dual Output Mode": "Dual Output Mode",
-  "Horizontal Output": "Horizontal Output",
-  "Vertical Output": "Vertical Output",
-  "Arrange sources here for a vertical scene layout.": "Arrange sources here for a vertical scene layout.",
-  "Arrange sources here for a horizontal scene layout.": "Arrange sources here for a horizontal scene layout.",
-  "Toggle Dual Output Mode.": "Toggle Dual Output Mode.",
-  "Cannot hide dual output toggles in dual output mode.": "Cannot hide dual output toggles in dual output mode."
+  "Dual Output Mode": "Dual Output Modus",
+  "Horizontal Output": "Horizontale Ausgabe",
+  "Vertical Output": "Vertikale Ausgabe",
+  "Arrange sources here for a vertical scene layout.": "Quellen für vertikales Szenenlayout hier anordnen.",
+  "Arrange sources here for a horizontal scene layout.": "Quellen für horizontales Szenenlayout hier anordnen.",
+  "Toggle Dual Output Mode.": "Dual Output Modus ein/aus.",
+  "Cannot hide dual output toggles in dual output mode.": "Im Dual Output Modus können die Umschalter für Dual Output nicht ausgeblendet werden."
 }

app/i18n/de-DE/settings.json

@@ -249,7 +249,7 @@
   "This number is too large for a FPS Numerator of %{fpsNum}, please decrease it or increase the Numerator": "Diese Zahl ist zu groß für den FPS-Zähler %{fpsNum}. Bitte kleineren Wert angeben oder größeren Zähler festlegen.",
   "FPS Value must be between 1 and 1000": "FPS-Wert muss zwischen 1 und 1000 liegen.",
   "%{fieldName} must be greater than 0": "%{fieldName} muss größer sein als 0",
-  "Markers": "Markers",
-  "Manage Dual Output": "Manage Dual Output",
-  "Auto optimizer disabled for dual output scenes": "Auto optimizer disabled for dual output scenes"
+  "Markers": "Markierungen",
+  "Manage Dual Output": "Verwalten von Dual Output",
+  "Auto optimizer disabled for dual output scenes": "Automatischer Optimierer für Dual Output Szenen deaktiviert"
 }

app/i18n/de-DE/sources.json

@@ -355,7 +355,7 @@
   "Set scale filter 'Bilinear'": "Skalierungsfilter „Bilinear“ festlegen",
   "Set scale filter 'Lanczos'": "Skalierungsfilter „Lanczos“ festlegen",
   "Set scale filter 'Area'": "Skalierungsfilter „Bereich“ festlegen",
-  "You currently have the same source on both canvases selected. Please select the source in the canvas to edit it independently.": "You currently have the same source on both canvases selected. Please select the source in the canvas to edit it independently.",
-  "Selective Recording can only be used with horizontal sources.": "Selective Recording can only be used with horizontal sources.",
-  "Cannot move source outside canvas in Dual Output Mode.": "Cannot move source outside canvas in Dual Output Mode."
+  "You currently have the same source on both canvases selected. Please select the source in the canvas to edit it independently.": "Sie haben derzeit dieselbe Quelle für beide Arbeitsflächen ausgewählt. Bitte wählen Sie die Quelle in der Arbeitsfläche aus, um sie unabhängig zu bearbeiten.",
+  "Selective Recording can only be used with horizontal sources.": "Die selektive Aufzeichnung kann nur mit horizontalen Quellen verwendet werden.",
+  "Cannot move source outside canvas in Dual Output Mode.": "Die Quelle kann im Dual Output Modus nicht aus der Arbeitsfläche heraus verschoben werden."
 }