Skip to content

Commit 7c9d0b5

Browse files
committed
Release (Beta) Changes
1 parent c374cfd commit 7c9d0b5

4 files changed

Lines changed: 10 additions & 13 deletions

File tree

UI/data/locale/en-US.ini

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# Note to translators: *DO NOT* translate this file directly. Instead, visit http://crowdin.com/project/obs-studio and submit your translations there.
2-
# Pull requests for translations outside of Crowdin will not be accepted.
3-
# Read this forum post for more instructions on submitting translations: https://obsproject.com/forum/threads/how-to-contribute-translations-for-obs.16327/
4-
5-
# Language of this file
61
Language="English"
72

83
# DroidCam Specific
@@ -356,8 +351,8 @@ ConfirmBWTest.Title="Start Bandwidth Test?"
356351
ConfirmBWTest.Text="You have OBS configured in bandwidth test mode. This mode allows for network testing without your channel going live. Once you are done testing, you will need to disable it in order for viewers to be able to see your stream.\n\nDo you want to continue?"
357352

358353
# confirm exit dialog box
359-
ConfirmExit.Title="Exit OBS?"
360-
ConfirmExit.Text="OBS is currently active. All streams/recordings will be shut down. Are you sure you wish to exit?"
354+
ConfirmExit.Title="Exit?"
355+
ConfirmExit.Text="Droidcam is currently active. Are you sure you wish to exit?"
361356

362357
# confirm delete dialog box
363358
ConfirmRemove.Title="Confirm Remove"
@@ -434,7 +429,7 @@ Remux.HelpText="Drop files in this window to remux, or select an empty \"OBS Rec
434429
MissingFiles="Missing Files"
435430
MissingFiles.MissingFile="Missing File"
436431
MissingFiles.NewFile="New File"
437-
MissingFiles.HelpText="Some files are missing since you last used OBS."
432+
MissingFiles.HelpText="Some files are missing since you last used DroidCam."
438433
MissingFiles.Clear="<cleared>"
439434
MissingFiles.NumFound="Found $1 of $2"
440435
MissingFiles.Search="Search Directory..."
@@ -446,7 +441,7 @@ MissingFiles.Replaced="Replaced"
446441
MissingFiles.Cleared="Cleared"
447442
MissingFiles.Found="Found"
448443
MissingFiles.AutoSearch="Additional file matches found"
449-
MissingFiles.AutoSearchText="OBS has found additional matches for missing files in that directory. Would you like to add them?"
444+
MissingFiles.AutoSearchText="DroidCam has found additional matches for missing files in that directory. Would you like to add them?"
450445
MissingFiles.NoMissing.Title="Missing Files Check"
451446
MissingFiles.NoMissing.Text="No files appear to be missing."
452447

@@ -1150,7 +1145,7 @@ About.Copyright="DroidCam (C) 2010-2023, DEV47APPS\nOBS Studio (C) 2012-2023, Co
11501145

11511146
# Drag-drop URL
11521147
AddUrl.Title="Add Source via URL"
1153-
AddUrl.Text="You have dragged a URL into OBS. This will automatically add the link as a source. Continue?"
1148+
AddUrl.Text="You have dragged in a URL. This will automatically add the link as a source. Continue?"
11541149
AddUrl.Text.Url="URL: %1"
11551150

11561151
# Dynamic output size

UI/win-update/droidcam-update.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define ilog(format, ...) xlog(LOG_INFO, format, ##__VA_ARGS__)
2222
#define elog(format, ...) xlog(LOG_ERROR, format, ##__VA_ARGS__)
2323

24-
#define UPDATES_URL "https://update.dev47apps.net/"
24+
#define UPDATES_URL "https://www.dev47apps.com/files/update/"
2525
#define UPDATE_FILE "droidcam-obs-client.1.txt"
2626

2727
const BYTE DEV47APPS_SERIAL[] = {

UI/window-basic-droidcam-overrides.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,13 +343,13 @@ void OBSBasicDroidCam::ActivateDeactivateClicked() {
343343

344344
void OBSBasicDroidCam::on_actionHelpPortal_triggered()
345345
{
346-
QUrl url = QUrl("https://droidcam.app/help", QUrl::TolerantMode);
346+
QUrl url = QUrl("https://beta.droidcam.app/help", QUrl::TolerantMode);
347347
QDesktopServices::openUrl(url);
348348
}
349349

350350
void OBSBasicDroidCam::on_actionWebsite_triggered()
351351
{
352-
QUrl url = QUrl("https://droidcam.app", QUrl::TolerantMode);
352+
QUrl url = QUrl("https://beta.droidcam.app", QUrl::TolerantMode);
353353
QDesktopServices::openUrl(url);
354354
}
355355

UI/window-basic-main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6735,6 +6735,7 @@ inline void OBSBasic::OnActivate()
67356735
ui->autoConfigure->setEnabled(false);
67366736
App()->IncrementSleepInhibition();
67376737
UpdateProcessPriority();
6738+
blog(LOG_INFO, "OnActivate +++");
67386739

67396740
if (trayIcon && trayIcon->isVisible()) {
67406741
#ifdef __APPLE__
@@ -6762,6 +6763,7 @@ inline void OBSBasic::OnDeactivate()
67626763
ui->profileMenu->setEnabled(true);
67636764
App()->DecrementSleepInhibition();
67646765
ClearProcessPriority();
6766+
blog(LOG_INFO, "OnDeactivate ---");
67656767
}
67666768
#else
67676769
if (!outputHandler->Active() && !ui->profileMenu->isEnabled()) {

0 commit comments

Comments
 (0)