UI,mac-avcapture: Use consistent variables in locales

UI/data/locale/en-US.ini

@@ -356,7 +356,7 @@ ConfirmExit.Text="OBS is currently active. All streams/recordings will be shut d
 
 # confirm delete dialog box
 ConfirmRemove.Title="Confirm Remove"
-ConfirmRemove.Text="Are you sure you wish to remove '$1'?"
+ConfirmRemove.Text="Are you sure you wish to remove '%1'?"
 ConfirmRemove.TextMultiple="Are you sure you wish to remove %1 items?"
 
 # output start messages
@@ -437,7 +437,7 @@ MissingFiles.MissingFile="Missing File"
 MissingFiles.NewFile="New File"
 MissingFiles.HelpText="Some files are missing since you last used OBS."
 MissingFiles.Clear="<cleared>"
-MissingFiles.NumFound="Found $1 of $2"
+MissingFiles.NumFound="Found %1 of %2"
 MissingFiles.Search="Search Directory..."
 MissingFiles.SelectFile="Select file..."
 MissingFiles.SelectDir="Select Folder to Search in"

UI/window-basic-filters.cpp

@@ -799,8 +799,7 @@ static bool QueryRemove(QWidget *parent, obs_source_t *source)
 {
 	const char *name = obs_source_get_name(source);
 
-	QString text = QTStr("ConfirmRemove.Text");
-	text.replace("$1", QT_UTF8(name));
+	QString text = QTStr("ConfirmRemove.Text").arg(QT_UTF8(name));
 
 	QMessageBox remove_source(parent);
 	remove_source.setText(text);

UI/window-basic-main-profiles.cpp

@@ -563,8 +563,8 @@ void OBSBasic::on_actionRemoveProfile_triggered(bool skipConfirmation)
 		return;
 
 	if (!skipConfirmation) {
-		QString text = QTStr("ConfirmRemove.Text");
-		text.replace("$1", QT_UTF8(oldName.c_str()));
+		QString text = QTStr("ConfirmRemove.Text")
+				       .arg(QT_UTF8(oldName.c_str()));
 
 		QMessageBox::StandardButton button = OBSMessageBox::question(
 			this, QTStr("ConfirmRemove.Title"), text);

UI/window-basic-main-scene-collections.cpp

@@ -320,8 +320,8 @@ void OBSBasic::on_actionRemoveSceneCollection_triggered()
 	if (newPath.empty())
 		return;
 
-	QString text = QTStr("ConfirmRemove.Text");
-	text.replace("$1", QT_UTF8(oldName.c_str()));
+	QString text =
+		QTStr("ConfirmRemove.Text").arg(QT_UTF8(oldName.c_str()));
 
 	QMessageBox::StandardButton button = OBSMessageBox::question(
 		this, QTStr("ConfirmRemove.Title"), text);

UI/window-basic-main.cpp

@@ -3632,8 +3632,7 @@ bool OBSBasic::QueryRemoveSource(obs_source_t *source)
 
 	const char *name = obs_source_get_name(source);
 
-	QString text = QTStr("ConfirmRemove.Text");
-	text.replace("$1", QT_UTF8(name));
+	QString text = QTStr("ConfirmRemove.Text").arg(QT_UTF8(name));
 
 	QMessageBox remove_source(this);
 	remove_source.setText(text);

UI/window-missing-files.cpp

@@ -493,9 +493,10 @@ OBSMissingFiles::OBSMissingFiles(obs_missing_files_t *files, QWidget *parent)
 		addMissingFile(oldPath, name);
 	}
 
-	QString found = QTStr("MissingFiles.NumFound");
-	found.replace("$1", "0");
-	found.replace("$2", QString::number(obs_missing_files_count(files)));
+	QString found =
+		QTStr("MissingFiles.NumFound")
+			.arg("0",
+			     QString::number(obs_missing_files_count(files)));
 
 	ui->found->setText(found);
 
@@ -573,10 +574,10 @@ void OBSMissingFiles::browseFolders()
 
 void OBSMissingFiles::dataChanged()
 {
-	QString found = QTStr("MissingFiles.NumFound");
-	found.replace("$1", QString::number(filesModel->found()));
-	found.replace("$2",
-		      QString::number(obs_missing_files_count(fileStore)));
+	QString found = QTStr("MissingFiles.NumFound")
+				.arg(QString::number(filesModel->found()),
+				     QString::number(obs_missing_files_count(
+					     fileStore)));
 
 	ui->found->setText(found);
 

plugins/mac-avcapture/av-capture.mm

@@ -1940,7 +1940,7 @@ static bool update_int_list_property(obs_property_t *p, const int *val,
 	DStr buf, label;
 	dstr_printf(buf, "%d", *val);
 	dstr_init_copy(label, obs_module_text(localization_name));
-	dstr_replace(label, "$1", buf->array);
+	dstr_replace(label, "%1", buf->array);
 	size_t idx = obs_property_list_add_int(p, label->array, *val);
 	obs_property_list_item_disable(p, idx, true);
 

plugins/mac-avcapture/data/locale/en-US.ini

@@ -10,5 +10,5 @@ VideoRange="Video range"
 VideoRange.Partial="Partial"
 VideoRange.Full="Full"
 Auto="Auto"
-Unknown="Unknown ($1)"
+Unknown="Unknown (%1)"
 EnableAudio="Enable audio if supported by device"