From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 7 Jan 2018 01:25:41 +0000 (-0700)
Subject: edl plugin names eng, fix segv for opengl brender, renderfarm rework strategy, perf... 
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=723142d62d61cde588e961426440f839ca9dcda9;p=goodguy%2Fhistory.git

edl plugin names eng, fix segv for opengl brender, renderfarm rework strategy, perf prefs farm nodes gui, renderfarm for dvd/bd
---

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index a50f21a2..ae74854b 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -328,7 +328,7 @@ void AssetPicon::create_objects()
 	}
 	else
 	if( plugin ) {
-		strcpy(name,  plugin->title);
+		strcpy(name, _(plugin->title));
 		set_text(name);
 		icon_vframe = plugin->get_picon();
 		if( icon_vframe )
diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C
index 62ef2955..0b0e9d01 100644
--- a/cinelerra-5.1/cinelerra/batchrender.C
+++ b/cinelerra-5.1/cinelerra/batchrender.C
@@ -92,12 +92,13 @@ int BatchRenderMenuItem::handle_event()
 
 
 
-BatchRenderJob::BatchRenderJob(Preferences *preferences)
+BatchRenderJob::BatchRenderJob(Preferences *preferences, int strategy)
 {
 	this->preferences = preferences;
+	this->strategy = strategy;
+	file_per_label = 0;
 	asset = new Asset;
 	edl_path[0] = 0;
-	strategy = 0;
 	enabled = 1;
 	elapsed = 0;
 }
@@ -122,10 +123,9 @@ void BatchRenderJob::load(FileXML *file)
 
 	edl_path[0] = 0;
 	file->tag.get_property("EDL_PATH", edl_path);
-	strategy = file->tag.get_property("STRATEGY", strategy);
+	strategy = file->tag.get_property("STRATEGY", get_strategy());
 	enabled = file->tag.get_property("ENABLED", enabled);
 	elapsed = file->tag.get_property("ELAPSED", elapsed);
-	fix_strategy();
 
 	result = file->read_tag();
 	if(!result)
@@ -148,7 +148,7 @@ void BatchRenderJob::load(FileXML *file)
 void BatchRenderJob::save(FileXML *file)
 {
 	file->tag.set_property("EDL_PATH", edl_path);
-	file->tag.set_property("STRATEGY", strategy);
+	file->tag.set_property("STRATEGY", get_strategy());
 	file->tag.set_property("ENABLED", enabled);
 	file->tag.set_property("ELAPSED", elapsed);
 	file->append_tag();
@@ -177,20 +177,13 @@ void BatchRenderJob::save(FileXML *file)
 	file->append_newline();
 }
 
-void BatchRenderJob::fix_strategy()
+int BatchRenderJob::get_strategy()
 {
-	strategy = Render::fix_strategy(strategy, preferences->use_renderfarm);
+	return strategy >= 0 ? strategy :
+		Render::get_strategy(preferences->use_renderfarm, file_per_label);
 }
 
 
-
-
-
-
-
-
-
-
 BatchRenderThread::BatchRenderThread(MWindow *mwindow)
  : BC_DialogThread()
 {
@@ -323,7 +316,6 @@ void BatchRenderThread::load_defaults(BC_Hash *defaults)
 	{
 		default_job->asset->load_defaults(defaults,
 			"BATCHRENDER_", 1, 1, 1, 1, 1);
-		default_job->fix_strategy();
 	}
 
 	for(int i = 0; i < BATCHRENDER_COLUMNS; i++)
@@ -336,20 +328,17 @@ void BatchRenderThread::load_defaults(BC_Hash *defaults)
 
 void BatchRenderThread::save_defaults(BC_Hash *defaults)
 {
-	if(default_job)
-	{
+	if( default_job ) {
 		default_job->asset->save_defaults(defaults,
 			"BATCHRENDER_", 1, 1, 1, 1, 1);
-		defaults->update("BATCHRENDER_STRATEGY", default_job->strategy);
 	}
-	for(int i = 0; i < BATCHRENDER_COLUMNS; i++)
-	{
+	for( int i=0; i<BATCHRENDER_COLUMNS; ++i ) {
 		char string[BCTEXTLEN];
 		sprintf(string, "BATCHRENDER_COLUMN%d", i);
 		defaults->update(string, column_width[i]);
 	}
 //	defaults->update("BATCHRENDER_JOB", current_job);
-	if(mwindow)
+	if( mwindow )
 		mwindow->save_defaults();
 	else
 		defaults->save();
@@ -534,7 +523,7 @@ void BatchRenderThread::calculate_dest_paths(ArrayList<char*> *paths,
 			packages->create_packages(mwindow,
 				command->get_edl(),
 				preferences,
-				job->strategy,
+				job->get_strategy(),
 				job->asset,
 				command->start_position,
 				command->end_position,
@@ -757,7 +746,7 @@ void BatchRenderGUI::create_objects()
 	format_tools = new BatchFormat(mwindow, this, thread->get_current_asset());
 	format_tools->set_w(get_w() / 2);
 	format_tools->create_objects(x1, y1, 1, 1, 1, 1, 0, 1, 0, 0,
-			&thread->get_current_job()->strategy, 0);
+			&thread->get_current_job()->file_per_label, 0);
 
 // input EDL
 	add_subwindow(edl_path_title = new BC_Title(x2, y2, _("EDL Path:")));
@@ -965,7 +954,7 @@ void BatchRenderGUI::create_list(int update_widget)
 void BatchRenderGUI::change_job()
 {
 	BatchRenderJob *job = thread->get_current_job();
-	format_tools->update(job->asset, &job->strategy);
+	format_tools->update(job->asset, &job->file_per_label);
 	edl_path_text->update(job->edl_path);
 }
 
diff --git a/cinelerra-5.1/cinelerra/batchrender.h b/cinelerra-5.1/cinelerra/batchrender.h
index 356ebf7e..6dfcabb4 100644
--- a/cinelerra-5.1/cinelerra/batchrender.h
+++ b/cinelerra-5.1/cinelerra/batchrender.h
@@ -54,19 +54,20 @@ public:
 class BatchRenderJob
 {
 public:
-	BatchRenderJob(Preferences *preferences);
+	BatchRenderJob(Preferences *preferences, int strategy=-1);
 	~BatchRenderJob();
 
 	void copy_from(BatchRenderJob *src);
 	void load(FileXML *file);
 	void save(FileXML *file);
-	void fix_strategy();
+	int get_strategy();
 
 // Source EDL to render
 	char edl_path[BCTEXTLEN];
 // Destination file for output
 	Asset *asset;
 	int strategy;
+	int file_per_label;
 	int enabled;
 // Amount of time elapsed in last render operation
 	double elapsed;
diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C
index 3ed07e48..57f40ea9 100644
--- a/cinelerra-5.1/cinelerra/bdcreate.C
+++ b/cinelerra-5.1/cinelerra/bdcreate.C
@@ -226,12 +226,12 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
 	fprintf(fp,"#!/bin/bash -ex\n");
 	fprintf(fp,"PATH=$PATH:%s\n",exec_path);
 	fprintf(fp,"mkdir -p $1/udfs\n");
-	fprintf(fp,"sz=`du -sb $1/bd.m2ts | sed -e 's/[ \t].*//'`\n");
+	fprintf(fp,"sz=`du -cb $1/bd.m2ts* | tail -1 | sed -e 's/[ \t].*//'`\n");
 	fprintf(fp,"blks=$((sz/2048 + 4096))\n");
 	fprintf(fp,"rm -f %s\n", udfs);
 	fprintf(fp,"mkudffs %s $blks\n", udfs);
 	fprintf(fp,"mount %s%s\n", mopts, mntpt);
-	fprintf(fp,"bdwrite %s $1/bd.m2ts\n",mntpt);
+	fprintf(fp,"bdwrite %s $1/bd.m2ts*\n",mntpt);
 	fprintf(fp,"umount %s\n",mntpt);
 	if( is_usr_mnt )
 		fprintf(fp,"mv -f %s $1/bd.udfs\n", udfs);
@@ -925,14 +925,13 @@ option_presets()
 					use_scale = Rescale::scaled;
 			}
 			for( int i=0; i<trk->plugin_set.size(); ++i ) {
-				for(Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
-						plugin;
-						plugin = (Plugin*)plugin->next) {
-					if( !strcmp(plugin->title, _("Deinterlace")) )
+				for( Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
+						plugin; plugin=(Plugin*)plugin->next ) {
+					if( !strcmp(plugin->title, "Deinterlace") )
 						has_deinterlace = 1;
-					if( !strcmp(plugin->title, _("Auto Scale")) ||
-					    !strcmp(plugin->title, _("Scale Ratio")) ||
-					    !strcmp(plugin->title, _("Scale")) )
+					if( !strcmp(plugin->title, "Auto Scale") ||
+					    !strcmp(plugin->title, "Scale Ratio") ||
+					    !strcmp(plugin->title, "Scale") )
 						has_scale = 1;
 				}
 			}
diff --git a/cinelerra-5.1/cinelerra/dvdcreate.C b/cinelerra-5.1/cinelerra/dvdcreate.C
index e7eb1db2..cb8214a9 100644
--- a/cinelerra-5.1/cinelerra/dvdcreate.C
+++ b/cinelerra-5.1/cinelerra/dvdcreate.C
@@ -16,6 +16,7 @@
 #include "mwindowgui.h"
 #include "plugin.h"
 #include "pluginset.h"
+#include "preferences.h"
 #include "rescale.h"
 #include "track.h"
 #include "tracks.h"
@@ -183,8 +184,10 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
 	fprintf(fp,"\n");
 	const char *exec_path = File::get_cinlib_path();
 	fprintf(fp,"PATH=$PATH:%s\n",exec_path);
+	if( mwindow->preferences->use_renderfarm )
+		fprintf(fp,"cat > $1/dvd.m2v $1/dvd.m2v0*\n");
 	if( !use_ffmpeg ) {
-		fprintf(fp,"mplex -f 8 -o $1/dvd.mpg $1/dvd.m2v $1/dvd.ac3\n");
+		fprintf(fp,"mplex -M -f 8 -o $1/dvd.mpg $1/dvd.m2v $1/dvd.ac3\n");
 		fprintf(fp,"\n");
 	}
 	fprintf(fp,"rm -rf $1/iso\n");
@@ -334,7 +337,7 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
 		asset->vmpeg_preset = 8;
 		asset->vmpeg_field_order = 0;
 		asset->vmpeg_pframe_distance = 0;
-		job = new BatchRenderJob(mwindow->preferences);
+		job = new BatchRenderJob(mwindow->preferences, SINGLE_PASS);
 		jobs->append(job);
 		strcpy(&job->edl_path[0], xml_filename);
 		asset = job->asset;
@@ -966,14 +969,13 @@ option_presets()
 				if( !EQUIV(aspect, dvd_aspect) ) use_scale = Rescale::scaled;
 			}
 			for( int i=0; i<trk->plugin_set.size(); ++i ) {
-				for(Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
-						plugin;
-						plugin = (Plugin*)plugin->next) {
-					if( !strcmp(plugin->title, _("Deinterlace")) )
+				for( Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
+						plugin; plugin=(Plugin*)plugin->next ) {
+					if( !strcmp(plugin->title, "Deinterlace") )
 						has_deinterlace = 1;
-					if( !strcmp(plugin->title, _("Auto Scale")) ||
-					    !strcmp(plugin->title, _("Scale Ratio")) ||
-					    !strcmp(plugin->title, _("Scale")) )
+					if( !strcmp(plugin->title, "Auto Scale") ||
+					    !strcmp(plugin->title, "Scale Ratio") ||
+					    !strcmp(plugin->title, "Scale") )
 						has_scale = 1;
 				}
 			}
diff --git a/cinelerra-5.1/cinelerra/effectlist.C b/cinelerra-5.1/cinelerra/effectlist.C
index bc7e5e3f..2f9a5dba 100644
--- a/cinelerra-5.1/cinelerra/effectlist.C
+++ b/cinelerra-5.1/cinelerra/effectlist.C
@@ -50,7 +50,7 @@ void EffectTipDialog::start(int x, int y, const char *effect, const char *text)
 	close_window();
 	AWindowGUI *gui = awindow->gui;
 	char string[BCTEXTLEN];
-	sprintf(string, _("Effect info: %s"), effect);
+	sprintf(string, _("Effect info: %s"), _(effect));
 	int effect_w = BC_Title::calculate_w(gui, string);
 	int text_w = BC_Title::calculate_w(gui, text);
 	int text_h = BC_Title::calculate_h(gui, text);
diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index ea74b396..71116721 100644
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -76,7 +76,7 @@ FormatTools::FormatTools(MWindow *mwindow,
 	prompt_audio_channels = 0;
 	prompt_video = 0;
 	prompt_video_compression = 0;
-	strategy = 0;
+	file_per_label = 0;
 	locked_compressor = 0;
 	video_driver = 0;
 }
@@ -111,7 +111,7 @@ void FormatTools::create_objects(
 		int prompt_video_compression,
 		const char *locked_compressor,
 		int recording,
-		int *strategy,
+		int *file_per_label,
 		int brender,
 		int horizontal_layout)
 {
@@ -129,31 +129,10 @@ void FormatTools::create_objects(
 	this->prompt_audio_channels = prompt_audio_channels;
 	this->prompt_video = prompt_video;
 	this->prompt_video_compression = prompt_video_compression;
-	this->strategy = strategy;
+	this->file_per_label = file_per_label;
 
 //printf("FormatTools::create_objects 1\n");
 
-// Modify strategy depending on render farm
-	if(strategy)
-	{
-		if(mwindow->preferences->use_renderfarm)
-		{
-			if(*strategy == FILE_PER_LABEL)
-				*strategy = FILE_PER_LABEL_FARM;
-			else
-			if(*strategy == SINGLE_PASS)
-				*strategy = SINGLE_PASS_FARM;
-		}
-		else
-		{
-			if(*strategy == FILE_PER_LABEL_FARM)
-				*strategy = FILE_PER_LABEL;
-			else
-			if(*strategy == SINGLE_PASS_FARM)
-				*strategy = SINGLE_PASS;
-		}
-	}
-
 	if(!recording)
 	{
 		int px = x;
@@ -257,9 +236,9 @@ void FormatTools::create_objects(
 //printf("FormatTools::create_objects 11\n");
 
 	x = init_x;
-	if(strategy)
-	{
-		window->add_subwindow(multiple_files = new FormatMultiple(mwindow, x, y, strategy));
+	if( file_per_label ) {
+		multiple_files = new FormatMultiple(mwindow, x, y, file_per_label);
+		window->add_subwindow(multiple_files);
 		y += multiple_files->get_h() + 10;
 	}
 
@@ -439,19 +418,14 @@ void FormatTools::update_extension()
 	}
 }
 
-void FormatTools::update(Asset *asset, int *strategy)
+void FormatTools::update(Asset *asset, int *file_per_label)
 {
 	this->asset = asset;
-	this->strategy = strategy;
-
-	if(path_textbox)
-		path_textbox->update(asset->path);
+	this->file_per_label = file_per_label;
+	if( file_per_label ) multiple_files->update(file_per_label);
+	if( path_textbox ) path_textbox->update(asset->path);
 	format_text->update(File::formattostr(asset->format));
 	update_format();
-	if(strategy)
-	{
-		multiple_files->update(strategy);
-	}
 	close_format_windows();
 }
 
@@ -553,8 +527,7 @@ void FormatTools::reposition_window(int &init_x, int &init_y)
 		x = init_x;
 	}
 
-	if(strategy)
-	{
+	if( file_per_label ) {
 		multiple_files->reposition_window(x, y);
 		y += multiple_files->get_h() + 10;
 	}
@@ -864,10 +837,7 @@ int FormatToTracks::handle_event()
 
 
 FormatMultiple::FormatMultiple(MWindow *mwindow, int x, int y, int *output)
- : BC_CheckBox(x,
- 	y,
-	(*output == FILE_PER_LABEL) || (*output == FILE_PER_LABEL_FARM),
-	_("Create new file at each label"))
+ : BC_CheckBox(x, y, *output, _("Create new file at each label"))
 {
 	this->output = output;
 	this->mwindow = mwindow;
@@ -879,31 +849,14 @@ FormatMultiple::~FormatMultiple()
 
 int FormatMultiple::handle_event()
 {
-	if(get_value())
-	{
-		if(mwindow->preferences->use_renderfarm)
-			*output = FILE_PER_LABEL_FARM;
-		else
-			*output = FILE_PER_LABEL;
-	}
-	else
-	{
-		if(mwindow->preferences->use_renderfarm)
-			*output = SINGLE_PASS_FARM;
-		else
-			*output = SINGLE_PASS;
-	}
+	*output = get_value();
 	return 1;
 }
 
 void FormatMultiple::update(int *output)
 {
 	this->output = output;
-	if(*output == FILE_PER_LABEL_FARM ||
-		*output ==FILE_PER_LABEL)
-		set_value(1);
-	else
-		set_value(0);
+	set_value(*output ? 1 : 0);
 }
 
 
diff --git a/cinelerra-5.1/cinelerra/formattools.h b/cinelerra-5.1/cinelerra/formattools.h
index d4c7761b..9f49c04f 100644
--- a/cinelerra-5.1/cinelerra/formattools.h
+++ b/cinelerra-5.1/cinelerra/formattools.h
@@ -64,7 +64,7 @@ public:
 						int prompt_video_compression,
 						const char *locked_compressor,  // Select compressors to be offered
 						int recording, // Change captions for recording
-						int *strategy,  // If nonzero, prompt for insertion strategy
+						int *file_per_label,  // prompt if nonzero
 						int brender,   // Supply file formats for background rendering
 						int horizontal_layout = 0);
 // In recording preferences, aspects of the format are locked
@@ -75,7 +75,7 @@ public:
 
 	void reposition_window(int &init_x, int &init_y);
 // Put new asset's parameters in and change asset.
-	void update(Asset *asset, int *strategy);
+	void update(Asset *asset, int *file_per_label);
 // Update filename extension when format is changed.
 	void update_extension();
 	void close_format_windows();
@@ -127,7 +127,7 @@ public:
 	int prompt_audio_channels;
 	int prompt_video;
 	int prompt_video_compression;
-	int *strategy;
+	int *file_per_label;
 	int w;
 // Determines what the configuration buttons do.
 	int video_driver;
diff --git a/cinelerra-5.1/cinelerra/indexfile.C b/cinelerra-5.1/cinelerra/indexfile.C
index 61e81cb5..eb9184f9 100644
--- a/cinelerra-5.1/cinelerra/indexfile.C
+++ b/cinelerra-5.1/cinelerra/indexfile.C
@@ -103,12 +103,12 @@ static int udf_volume_id(const char *path, char *fname)
 		if( strncmp(ISO_STANDARD_ID,id.id,sizeof(id.id)) ) continue;
 		// look for volume_id
 		if( !isalnum(id.volume_id[0]) ) continue;
-		char *bp = &id.volume_id[0], *cp = fname;
+		char *bp = (char*)&id.volume_id[0], *cp = fname;
 		for( int i=0; i<(int)sizeof(id.volume_id); ++i ) *cp++ = *bp++;
 		while( --cp>=fname && *cp==' ' ) *cp = 0;
 		if( !*fname ) continue;
 		// fname = volume_id _ creation_date
-		++cp;  *cp++ = '_';  bp = &id.creation_date[0];
+		++cp;  *cp++ = '_';  bp = (char*)&id.creation_date[0];
 		for( int i=0; i<(int)sizeof(id.creation_date)-1; ++i ) {
 			if( !isdigit(*bp) ) break;
 			*cp++ = *bp++;
diff --git a/cinelerra-5.1/cinelerra/menuattachtransition.C b/cinelerra-5.1/cinelerra/menuattachtransition.C
index 6971ed1d..143bcdb9 100644
--- a/cinelerra-5.1/cinelerra/menuattachtransition.C
+++ b/cinelerra-5.1/cinelerra/menuattachtransition.C
@@ -82,9 +82,9 @@ void TransitionDialogThread::start()
 		mwindow->search_plugindb(data_type == TRACK_AUDIO,
 			data_type == TRACK_VIDEO, 0, 1, 0, plugindb);
 		for(int i = 0; i < plugindb.total; i++) {
-			const char *title = _(plugindb.values[i]->title);
+			const char *title = plugindb.values[i]->title;
 			if( !strcmp(transition_title, title) ) number = i;
-			transition_names.append(new BC_ListBoxItem(title));
+			transition_names.append(new BC_ListBoxItem(_(title)));
 		}
 	}
 
diff --git a/cinelerra-5.1/cinelerra/menueffects.C b/cinelerra-5.1/cinelerra/menueffects.C
index 12f43384..34881cf4 100644
--- a/cinelerra-5.1/cinelerra/menueffects.C
+++ b/cinelerra-5.1/cinelerra/menueffects.C
@@ -169,27 +169,15 @@ void MenuEffectThread::run()
 	get_derived_attributes(default_asset, defaults);
 //	to_tracks = defaults->get("RENDER_EFFECT_TO_TRACKS", 1);
 	load_mode = defaults->get("RENDER_EFFECT_LOADMODE", LOADMODE_PASTE);
-	strategy = defaults->get("RENDER_EFFECT_STRATEGY", SINGLE_PASS);
+	file_per_label = defaults->get("RENDER_FILE_PER_LABEL", 0);
 
 // get plugin information
-	int need_plugin;
-	if(!strlen(title))
-		need_plugin = 1;
-	else
-		need_plugin = 0;
-
+	int need_plugin = !strlen(title) ? 1 : 0;
 // generate a list of plugins for the window
-	if(need_plugin)
-	{
+	if( need_plugin ) {
 		mwindow->search_plugindb(default_asset->audio_data,
-			default_asset->video_data,
-			-1,
-			0,
-			0,
-			local_plugindb);
-
-		for(int i = 0; i < local_plugindb.total; i++)
-		{
+			default_asset->video_data, -1, 0, 0, local_plugindb);
+		for(int i = 0; i < local_plugindb.total; i++) {
 			plugin_list.append(new BC_ListBoxItem(_(local_plugindb.values[i]->title)));
 		}
 	}
@@ -219,7 +207,7 @@ void MenuEffectThread::run()
 // save defaults
 	save_derived_attributes(default_asset, defaults);
 	defaults->update("RENDER_EFFECT_LOADMODE", load_mode);
-	defaults->update("RENDER_EFFECT_STRATEGY", strategy);
+	defaults->update("RENDER_EFFECT_FILE_PER_LABEL", file_per_label);
 	mwindow->save_defaults();
 
 // get plugin server to use and delete the plugin list
@@ -372,6 +360,7 @@ void MenuEffectThread::run()
 		default_asset->height = mwindow->edl->session->output_h;
 	}
 
+	int strategy = Render::get_strategy(mwindow->preferences->use_renderfarm, file_per_label);
 // Process the total length in fragments
 	ArrayList<MenuEffectPacket*> packets;
 	if(!result)
@@ -629,7 +618,7 @@ void MenuEffectWindow::create_objects()
 	add_subwindow(file_title = new BC_Title(
 		mwindow->theme->menueffect_file_x,
 		mwindow->theme->menueffect_file_y,
-		(char*)((menueffects->strategy == FILE_PER_LABEL  || menueffects->strategy == FILE_PER_LABEL_FARM) ?
+		(char*)(menueffects->file_per_label ?
 			_("Select the first file to render to:") :
 			_("Select a file to render to:"))));
 
@@ -638,18 +627,8 @@ void MenuEffectWindow::create_objects()
 	format_tools = new FormatTools(mwindow,
 					this,
 					asset);
-	format_tools->create_objects(x,
-					y,
-					asset->audio_data,
-					asset->video_data,
-					0,
-					0,
-					0,
-					1,
-					0,
-					0,
-					&menueffects->strategy,
-					0);
+	format_tools->create_objects(x, y, asset->audio_data, asset->video_data,
+		0, 0, 0, 1, 0, 0, &menueffects->file_per_label, 0);
 
 	loadmode = new LoadMode(mwindow, this, x, y, &menueffects->load_mode, 1);
 	loadmode->create_objects();
diff --git a/cinelerra-5.1/cinelerra/menueffects.h b/cinelerra-5.1/cinelerra/menueffects.h
index 798beba8..6ad0cb92 100644
--- a/cinelerra-5.1/cinelerra/menueffects.h
+++ b/cinelerra-5.1/cinelerra/menueffects.h
@@ -85,7 +85,7 @@ public:
 	MenuEffects *menu_item;
 	char title[BCTEXTLEN];
 	int realtime, load_mode;
-	int strategy;
+	int file_per_label;
 // GUI Plugins to delete
 	ArrayList<PluginServer*> *dead_plugins;
 
diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 4c875c97..1de35cb9 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -872,6 +872,20 @@ PluginServer* MWindow::scan_plugindb(char *title,
 	return 0;
 }
 
+// repair session files with xlated plugin titles
+void MWindow::fix_plugin_title(char *title)
+{
+	for(int i = 0; i < plugindb->total; i++) {
+		PluginServer *server = plugindb->get(i);
+		if( !server->title ) continue;
+		const char *server_title = server->title;
+		if( !bstrcasecmp(title, _(server_title)) ) {
+			strcpy(title, server_title);
+			return;
+		}
+	}
+}
+
 int MWindow::plugin_exists(const char *plugin_path, ArrayList<PluginServer*> &plugins)
 {
 	for( int i=0; i<plugins.size(); ++i )
@@ -1034,7 +1048,7 @@ void MWindow::init_theme()
 		fprintf(stderr, _("MWindow::init_theme: prefered theme %s not found.\n"),
 			 preferences->theme);
 
-	const char *default_theme = _(DEFAULT_THEME);
+	const char *default_theme = DEFAULT_THEME;
 	if( !theme_plugin && strcasecmp(preferences->theme, default_theme) ) {
 		fprintf(stderr, _("MWindow::init_theme: trying default theme %s\n"),
 			default_theme);
@@ -2199,74 +2213,37 @@ void MWindow::test_plugins(EDL *new_edl, char *path)
 {
 	char string[BCTEXTLEN];
 
-// Do a check weather plugins exist
-	for(Track *track = new_edl->tracks->first; track; track = track->next)
-	{
-		for(int k = 0; k < track->plugin_set.total; k++)
-		{
+// Do a check whether plugins exist
+	for( Track *track=new_edl->tracks->first; track; track=track->next ) {
+		for( int k=0; k<track->plugin_set.total; ++k ) {
 			PluginSet *plugin_set = track->plugin_set[k];
-			for(Plugin *plugin = (Plugin*)plugin_set->first;
-				plugin;
-				plugin = (Plugin*)plugin->next)
-			{
-				if(plugin->plugin_type == PLUGIN_STANDALONE)
-				{
+			for( Plugin *plugin = (Plugin*)plugin_set->first;
+					plugin; plugin = (Plugin*)plugin->next ) {
+				if( plugin->plugin_type != PLUGIN_STANDALONE ) continue;
 // ok we need to find it in plugindb
-					int plugin_found = 0;
-
-					for(int j = 0; j < plugindb->size(); j++)
-					{
-						PluginServer *server = plugindb->get(j);
-						if(server->title &&
-							!strcasecmp(server->title, plugin->title) &&
-							((track->data_type == TRACK_AUDIO && server->audio) ||
-							(track->data_type == TRACK_VIDEO && server->video)) &&
-							(!server->transition))
-							plugin_found = 1;
-					}
-
-					if (!plugin_found)
-					{
-						sprintf(string,
+				PluginServer *server =
+					scan_plugindb(plugin->title, track->data_type);
+				if( !server || server->transition ) {
+					sprintf(string,
 	_("The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n"
 	  "The project won't be rendered as it was meant and Cinelerra might crash.\n"),
-							"effect", plugin->title,
-							path);
-						MainError::show_error(string);
-					}
+						"effect", _(plugin->title), path);
+					MainError::show_error(string);
 				}
 			}
 		}
 
-		for(Edit *edit = (Edit*)track->edits->first;
-			edit;
-			edit = (Edit*)edit->next)
-		{
-			if (edit->transition)
-			{
+		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			if( !edit->transition ) continue;
 // ok we need to find transition in plugindb
-
-				int transition_found = 0;
-				for(int j = 0; j < plugindb->size(); j++)
-				{
-					PluginServer *server = plugindb->get(j);
-					if(server->title &&
-						!strcasecmp(server->title, edit->transition->title) &&
-						((track->data_type == TRACK_AUDIO && server->audio) ||
-						(track->data_type == TRACK_VIDEO && server->video)) &&
-						(server->transition))
-						transition_found = 1;
-				}
-
-				if (!transition_found)
-				{
-					sprintf(string,
+			PluginServer *server =
+				scan_plugindb(edit->transition->title, track->data_type);
+			if( !server || !server->transition ) {
+				sprintf(string,
 	_("The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n"
 	  "The project won't be rendered as it was meant and Cinelerra might crash.\n"),
-						"transition", edit->transition->title,
-						path);
-					MainError::show_error(string);
-				}
+					"transition", _(edit->transition->title), path);
+				MainError::show_error(string);
 			}
 		}
 	}
diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 12dac24f..31c5be70 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -199,6 +199,7 @@ public:
 // Find the plugin whose title matches title and return it
 	static PluginServer* scan_plugindb(char *title,
 		int data_type);
+	static void fix_plugin_title(char *title);
 	static int plugin_exists(const char *plugin_path, ArrayList<PluginServer*> &plugins);
 	static int plugin_exists(char *plugin_path);
 	void dump_plugindb(FILE *fp);
diff --git a/cinelerra-5.1/cinelerra/performanceprefs.C b/cinelerra-5.1/cinelerra/performanceprefs.C
index e3c7e2ca..f95f1e81 100644
--- a/cinelerra-5.1/cinelerra/performanceprefs.C
+++ b/cinelerra-5.1/cinelerra/performanceprefs.C
@@ -153,7 +153,7 @@ void PerformancePrefs::create_objects()
 		1,
 		0,  // Select compressors to be offered
 		0,  // Prompt for recording options
-		0,  // If nonzero, prompt for insertion strategy
+		0,  // prompt for file_per_label
 		1); // Supply file formats for background rendering
 	x = xmargin1;
 
@@ -547,17 +547,14 @@ int PrefsRenderFarmPort::handle_event()
 
 PrefsRenderFarmNodes::PrefsRenderFarmNodes(PreferencesWindow *pwindow,
 	PerformancePrefs *subwindow, int x, int y)
- : BC_ListBox(x, y, 340, 230,
-		LISTBOX_TEXT,                         // Display text list or icons
-		subwindow->nodes,
-		0, //default_titles,
-		0, //default_widths,
-		PerformancePrefs::TOTAL_COLUMNS)
+ : BC_ListBox(x, y, 340, 230, LISTBOX_TEXT)
 {
 	for( int i=0; i<PerformancePrefs::TOTAL_COLUMNS; ++i ) {
 		titles[i] = _(default_titles[i]);
 		widths[i] = default_widths[i];
 	}
+	update(subwindow->nodes, titles, widths, PerformancePrefs::TOTAL_COLUMNS,
+		0, 0, -1, 0, 0);
 	this->subwindow = subwindow;
 	this->pwindow = pwindow;
 }
diff --git a/cinelerra-5.1/cinelerra/plugin.C b/cinelerra-5.1/cinelerra/plugin.C
index 479a14e5..25023190 100644
--- a/cinelerra-5.1/cinelerra/plugin.C
+++ b/cinelerra-5.1/cinelerra/plugin.C
@@ -37,9 +37,7 @@
 #include "virtualnode.h"
 
 
-Plugin::Plugin(EDL *edl,
-		Track *track,
-		const char *title)
+Plugin::Plugin(EDL *edl, Track *track, const char *title)
  : Edit(edl, track)
 {
 	is_plugin = 1;
@@ -189,15 +187,10 @@ void Plugin::equivalent_output(Edit *edit, int64_t *result)
 	}
 
 // Start of plugin changed
-	if(
-		startproject != plugin->startproject ||
-		plugin_type != plugin->plugin_type ||
-		on != plugin->on ||
-		!(shared_location == plugin->shared_location) ||
-		strcmp(title, plugin->title)
-		)
-	{
-		if(*result < 0 || startproject < *result)
+	if( startproject != plugin->startproject || plugin_type != plugin->plugin_type ||
+	    on != plugin->on || !(shared_location == plugin->shared_location) ||
+		strcmp(title, plugin->title) ) {
+		if( *result < 0 || startproject < *result )
 			*result = startproject;
 	}
 
@@ -546,20 +539,22 @@ Track* Plugin::get_shared_track()
 
 void Plugin::calculate_title(char *string, int use_nudge)
 {
-	if(plugin_type == PLUGIN_STANDALONE || plugin_type == PLUGIN_NONE)
-	{
+	switch( plugin_type ) {
+	case PLUGIN_STANDALONE:
+	case PLUGIN_NONE:
 		strcpy(string, _(title));
+		break;
+	case PLUGIN_SHAREDPLUGIN:
+	case PLUGIN_SHAREDMODULE:
+		shared_location.calculate_title(string, edl,
+			startproject, 0, plugin_type, use_nudge);
+		break;
 	}
-	else
-	if(plugin_type == PLUGIN_SHAREDPLUGIN || plugin_type == PLUGIN_SHAREDMODULE)
-	{
-		shared_location.calculate_title(string,
-			edl,
-			startproject,
-			0,
-			plugin_type,
-			use_nudge);
-	}
+}
+
+void Plugin::fix_plugin_title(char *title)
+{
+	MWindow::fix_plugin_title(title);
 }
 
 
@@ -585,11 +580,7 @@ void Plugin::shift(int64_t difference)
 void Plugin::dump(FILE *fp)
 {
 	fprintf(fp,"    PLUGIN: type=%d title=\"%s\" on=%d track=%d plugin=%d\n",
-		plugin_type,
-		title,
-		on,
-		shared_location.module,
-		shared_location.plugin);
+		plugin_type, title, on, shared_location.module, shared_location.plugin);
 	fprintf(fp,"    startproject %jd length %jd\n", startproject, length);
 
 	keyframes->dump(fp);
diff --git a/cinelerra-5.1/cinelerra/plugin.h b/cinelerra-5.1/cinelerra/plugin.h
index ef5d7488..15aa75ce 100644
--- a/cinelerra-5.1/cinelerra/plugin.h
+++ b/cinelerra-5.1/cinelerra/plugin.h
@@ -108,6 +108,7 @@ public:
 // Shift in time
 	void shift(int64_t difference);
 	void dump(FILE *fp=stdout);
+	static void fix_plugin_title(char *title);
 // Called by PluginClient sequence to get rendering parameters
 	KeyFrame* get_prev_keyframe(int64_t position, int direction);
 	KeyFrame* get_next_keyframe(int64_t position, int direction);
diff --git a/cinelerra-5.1/cinelerra/pluginarray.C b/cinelerra-5.1/cinelerra/pluginarray.C
index 7a9b9f55..33a3ec15 100644
--- a/cinelerra-5.1/cinelerra/pluginarray.C
+++ b/cinelerra-5.1/cinelerra/pluginarray.C
@@ -193,7 +193,7 @@ int PluginArray::run_plugins()
 		MainProgressBar *progress;
 		char string[BCTEXTLEN], string2[BCTEXTLEN];
 
-		sprintf(string, "%s...", plugin_server->title);
+		sprintf(string, "%s...", _(plugin_server->title));
 		progress = mwindow->mainprogress->start_progress(string, end - start);
 
 		for(int64_t current_position = start;
@@ -219,7 +219,7 @@ int PluginArray::run_plugins()
 		progress->stop_progress();
 		delete progress;
 
-		sprintf(string, _("%s took %s"), plugin_server->title, string2);
+		sprintf(string, _("%s took %s"), _(plugin_server->title), string2);
 		mwindow->gui->lock_window();
 		mwindow->gui->show_message(string2);
 		mwindow->gui->unlock_window();
diff --git a/cinelerra-5.1/cinelerra/plugindialog.C b/cinelerra-5.1/cinelerra/plugindialog.C
index 9fec465d..5ce006c0 100644
--- a/cinelerra-5.1/cinelerra/plugindialog.C
+++ b/cinelerra-5.1/cinelerra/plugindialog.C
@@ -243,25 +243,8 @@ PluginDialog::~PluginDialog()
 void PluginDialog::create_objects()
 {
 //	int use_default = 1;
-	char string[BCTEXTLEN];
 	mwindow->theme->get_plugindialog_sizes();
-
 	lock_window("PluginDialog::create_objects");
- 	if(thread->plugin)
-	{
-		strcpy(string, thread->plugin->title);
-		//use_default = 0;
-	}
-	else
-	{
-// no plugin
-		sprintf(string, _("None"));
-	}
-
-
-
-
-
 
 // GET A LIST OF ALL THE PLUGINS AVAILABLE
 	mwindow->search_plugindb(thread->data_type == TRACK_AUDIO,
@@ -288,10 +271,9 @@ void PluginDialog::create_objects()
 			PLAY_FORWARD,
 			1,
 			0);
-		char *plugin_title = plugin->title;
 		char string[BCTEXTLEN];
-
-		snprintf(string, sizeof(string), "%s: %s", track_title, _(plugin_title));
+		const char *plugin_title = _(plugin->title);
+		snprintf(string, sizeof(string), "%s: %s", track_title, plugin_title);
 		shared_data.append(new BC_ListBoxItem(string));
 	}
 	for(int i = 0; i < module_locations.total; i++)
@@ -330,12 +312,6 @@ void PluginDialog::create_objects()
 // 			mwindow->theme->plugindialog_newattach_y));
 //
 
-
-
-
-
-
-
 	add_subwindow(shared_title = new BC_Title(mwindow->theme->plugindialog_shared_x,
 		mwindow->theme->plugindialog_shared_y - 20,
 		_("Shared effects:")));
@@ -357,13 +333,6 @@ void PluginDialog::create_objects()
 // 			mwindow->theme->plugindialog_sharedattach_y));
 //
 
-
-
-
-
-
-
-
 	add_subwindow(module_title = new BC_Title(mwindow->theme->plugindialog_module_x,
 		mwindow->theme->plugindialog_module_y - 20,
 		_("Shared tracks:")));
diff --git a/cinelerra-5.1/cinelerra/pluginserver.C b/cinelerra-5.1/cinelerra/pluginserver.C
index aff809f3..8feb6ed6 100644
--- a/cinelerra-5.1/cinelerra/pluginserver.C
+++ b/cinelerra-5.1/cinelerra/pluginserver.C
@@ -271,7 +271,7 @@ int PluginServer::get_synthesis()
 
 void PluginServer::set_title(const char *string)
 {
-	if(title) delete [] title;
+	delete [] title;
 	title = cstrdup(string);
 }
 
diff --git a/cinelerra-5.1/cinelerra/pluginserver.h b/cinelerra-5.1/cinelerra/pluginserver.h
index a99dc5d8..da8e8bd1 100644
--- a/cinelerra-5.1/cinelerra/pluginserver.h
+++ b/cinelerra-5.1/cinelerra/pluginserver.h
@@ -382,7 +382,7 @@ public:
 	int uses_gui;
 // Plugin is a transition
 	int transition;
-// name/tip of plugin in current locale.
+// name/tip of plugin
 	char *title, *tip;
 	int64_t written_samples, written_frames;
 	char *path;           // location of plugin on disk
diff --git a/cinelerra-5.1/cinelerra/pluginset.C b/cinelerra-5.1/cinelerra/pluginset.C
index 8061289c..e46fbd32 100644
--- a/cinelerra-5.1/cinelerra/pluginset.C
+++ b/cinelerra-5.1/cinelerra/pluginset.C
@@ -400,6 +400,7 @@ void PluginSet::load(FileXML *file, uint32_t load_flags)
 				char title[BCTEXTLEN];
 				title[0] = 0;
 				file->tag.get_property("TITLE", title);
+				Plugin::fix_plugin_title(title);
 				SharedLocation shared_location;
 				shared_location.load(file);
 
diff --git a/cinelerra-5.1/cinelerra/recordprefs.C b/cinelerra-5.1/cinelerra/recordprefs.C
index 5851eb90..8001973b 100644
--- a/cinelerra-5.1/cinelerra/recordprefs.C
+++ b/cinelerra-5.1/cinelerra/recordprefs.C
@@ -82,7 +82,7 @@ void RecordPrefs::create_objects()
 		1,
 		0,  // Select compressors to be offered
 		1,  // Prompt for recording options
-		0,  // If nonzero, prompt for insertion strategy
+		0,  // prompt for file_per_label
 		0); // Supply file formats for background rendering
 
 	realtime_toc = new RecordRealtimeTOC(mwindow, pwindow,
diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index f50ae895..4363cd9e 100644
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -219,8 +219,8 @@ void MainPackageRenderer::set_progress(int64_t value)
 
 	render->counter_lock->unlock();
 
-// This locks the preferences
-	if(mwindow) mwindow->preferences->copy_rates_from(preferences);
+	if( mwindow )
+		mwindow->preferences->copy_rates_from(preferences);
 }
 
 int MainPackageRenderer::progress_cancelled()
@@ -236,13 +236,13 @@ Render::Render(MWindow *mwindow)
 	this->mwindow = mwindow;
 	in_progress = 0;
 	progress = 0;
-	preferences = 0;
 	elapsed_time = 0.0;
 	package_lock = new Mutex("Render::package_lock");
 	counter_lock = new Mutex("Render::counter_lock");
 	completion = new Condition(0, "Render::completion");
 	progress_timer = new Timer;
 	range_type = RANGE_BACKCOMPAT;
+	preferences = new Preferences();
 	thread = new RenderThread(mwindow, this);
 	render_window = 0;
 	asset = 0;
@@ -306,14 +306,12 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
 }
 
 void Render::start_batches(ArrayList<BatchRenderJob*> *jobs,
-	BC_Hash *boot_defaults,
-	Preferences *preferences)
+	BC_Hash *boot_defaults, Preferences *batch_prefs)
 {
 	mode = Render::BATCH;
 	batch_cancelled = 0;
+	preferences->copy_from(batch_prefs);
 	this->jobs = jobs;
-	this->preferences = new Preferences;
-	this->preferences->copy_from(preferences);
 
 	completion->reset();
 	thread->run();
@@ -473,25 +471,15 @@ int Render::check_asset(EDL *edl, Asset &asset)
 	return 0;
 }
 
-int Render::fix_strategy(int strategy, int use_renderfarm)
+int Render::get_strategy(int use_renderfarm, int file_per_label)
 {
-	if(use_renderfarm)
-	{
-		if(strategy == FILE_PER_LABEL)
-			strategy = FILE_PER_LABEL_FARM;
-		else
-		if(strategy == SINGLE_PASS)
-			strategy = SINGLE_PASS_FARM;
-	}
-	else
-	{
-		if(strategy == FILE_PER_LABEL_FARM)
-			strategy = FILE_PER_LABEL;
-		else
-		if(strategy == SINGLE_PASS_FARM)
-			strategy = SINGLE_PASS;
-	}
-	return strategy;
+	return use_renderfarm ?
+		(file_per_label ? FILE_PER_LABEL_FARM : SINGLE_PASS_FARM) :
+		(file_per_label ? FILE_PER_LABEL      : SINGLE_PASS     ) ;
+}
+int Render::get_strategy()
+{
+	return get_strategy(preferences->use_renderfarm, file_per_label);
 }
 
 void Render::start_progress()
@@ -628,7 +616,7 @@ void Render::get_starting_number(char *path,
 
 int Render::load_defaults(Asset *asset)
 {
-	strategy = mwindow->defaults->get("RENDER_STRATEGY", SINGLE_PASS);
+	file_per_label = mwindow->defaults->get("RENDER_FILE_PER_LABEL", 0);
 	load_mode = mwindow->defaults->get("RENDER_LOADMODE", LOADMODE_NEW_TRACKS);
 	range_type = mwindow->defaults->get("RENDER_RANGE_TYPE", RANGE_PROJECT);
 
@@ -647,8 +635,8 @@ int Render::load_defaults(Asset *asset)
 int Render::load_profile(int profile_slot, Asset *asset)
 {
 	char string_name[100];
-	sprintf(string_name, "RENDER_%i_STRATEGY", profile_slot);
-	strategy = mwindow->defaults->get(string_name, SINGLE_PASS);
+	sprintf(string_name, "RENDER_%i_FILE_PER_LABEL", profile_slot);
+	file_per_label = mwindow->defaults->get(string_name, 0);
 // Load mode is not part of the profile
 //	printf(string_name, "RENDER_%i_LOADMODE", profile_slot);
 //	load_mode = mwindow->defaults->get(string_name, LOADMODE_NEW_TRACKS);
@@ -664,7 +652,7 @@ int Render::load_profile(int profile_slot, Asset *asset)
 
 int Render::save_defaults(Asset *asset)
 {
-	mwindow->defaults->update("RENDER_STRATEGY", strategy);
+	mwindow->defaults->update("RENDER_FILE_PER_LABEL", file_per_label);
 	mwindow->defaults->update("RENDER_LOADMODE", load_mode);
 	mwindow->defaults->update("RENDER_RANGE_TYPE", range_type);
 
@@ -711,12 +699,6 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl,
 	render->progress = 0;
 	render->result = 0;
 
-	if( mwindow ) {
-		if( !render->preferences )
-			render->preferences = new Preferences;
-		render->preferences->copy_from(mwindow->preferences);
-	}
-
 // Create rendering command
 	TransportCommand *command = new TransportCommand;
 	command->command = NORMAL_FWD;
@@ -778,7 +760,6 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl,
 		if(mwindow) mwindow->stop_brender();
 
 		fs.complete_path(render->default_asset->path);
-		strategy = Render::fix_strategy(strategy, render->preferences->use_renderfarm);
 
 		render->result = render->packages->create_packages(mwindow,
 			command->get_edl(),
@@ -1029,10 +1010,13 @@ if(debug) printf("Render::render %d\n", __LINE__);
 
 void RenderThread::run()
 {
+	if( mwindow )
+		render->preferences->copy_from(mwindow->preferences);
+
 	if(render->mode == Render::INTERACTIVE)
 	{
 		render_single(1, render->asset, mwindow->edl,
-			render->strategy, render->range_type);
+			render->get_strategy(), render->range_type);
 	}
 	else
 	if(render->mode == Render::BATCH)
@@ -1070,9 +1054,8 @@ void RenderThread::run()
 				edl->create_objects();
 				file->read_from_file(job->edl_path);
 				edl->load_xml(file, LOAD_ALL);
-
 //PRINT_TRACE
-				render_single(0, job->asset, edl, job->strategy, RANGE_BACKCOMPAT);
+				render_single(0, job->asset, edl, job->get_strategy(), RANGE_BACKCOMPAT);
 
 //PRINT_TRACE
 				edl->Garbage::remove_user();
@@ -1151,7 +1134,7 @@ void RenderWindow::load_profile(int profile_slot)
 {
 	render->load_profile(profile_slot, asset);
 	update_range_type(render->range_type);
-	render_format->update(asset, &render->strategy);
+	render_format->update(asset, &render->file_per_label);
 }
 
 
@@ -1160,15 +1143,14 @@ void RenderWindow::create_objects()
 	int x = 10, y = 10;
 	lock_window("RenderWindow::create_objects");
 	add_subwindow(new BC_Title(x, y,
-		(char*)((render->strategy == FILE_PER_LABEL ||
-				render->strategy == FILE_PER_LABEL_FARM) ?
+		(char*)(render->file_per_label ?
 			_("Select the first file to render to:") :
 			_("Select a file to render to:"))));
 	y += 25;
 
 	render_format = new RenderFormat(mwindow, this, asset);
 	render_format->create_objects(x, y,
-		1, 1, 1, 1, 0, 1, 0, 0, &render->strategy, 0);
+		1, 1, 1, 1, 0, 1, 0, 0, &render->file_per_label, 0);
 
 	BC_Title *title;
 	add_subwindow(title = new BC_Title(x, y, _("Render range:")));
diff --git a/cinelerra-5.1/cinelerra/render.h b/cinelerra-5.1/cinelerra/render.h
index 6faf5589..1e025abc 100644
--- a/cinelerra-5.1/cinelerra/render.h
+++ b/cinelerra-5.1/cinelerra/render.h
@@ -112,8 +112,7 @@ public:
 	void start_batches(ArrayList<BatchRenderJob*> *jobs);
 // The batches are processed in the foreground in non interactive mode.
 	void start_batches(ArrayList<BatchRenderJob*> *jobs,
-		BC_Hash *boot_defaults,
-		Preferences *preferences);
+		BC_Hash *boot_defaults, Preferences *batch_prefs);
 // Called by BatchRender to stop the operation.
 	void stop_operation();
 	BC_Window* new_gui();
@@ -129,8 +128,9 @@ public:
 // force asset parameters regardless of window
 // This should be integrated into the Asset Class.
 	static int check_asset(EDL *edl, Asset &asset);
-// Fix strategy to conform with using renderfarm.
-	static int fix_strategy(int strategy, int use_renderfarm);
+// strategy to conform with using renderfarm.
+	static int get_strategy(int use_renderfarm, int file_per_label);
+	int get_strategy();
 // Force filename to have a 0 padded number if rendering to a list.
 	int check_numbering(Asset &asset);
 	static void create_filename(char *path,
@@ -169,7 +169,6 @@ public:
 // Background compression must be disabled when direct frame copying and reenabled afterwards
 	int direct_frame_copying;
 
-// Copy of mwindow preferences or pointer to another preferences object
 	Preferences *preferences;
 	VFrame *compressed_output;
 	MainProgressBar *progress;
@@ -179,7 +178,7 @@ public:
 	PlayableTracks *playable_tracks;
 	PackageDispatcher *packages;
 	Mutex *package_lock, *counter_lock;
-	int strategy;
+	int file_per_label;
 	int range_type;
 // Total selection to render in seconds
 	double total_start, total_end;
diff --git a/cinelerra-5.1/cinelerra/renderprofiles.C b/cinelerra-5.1/cinelerra/renderprofiles.C
index 3f2cb74b..3e7eeb1b 100644
--- a/cinelerra-5.1/cinelerra/renderprofiles.C
+++ b/cinelerra-5.1/cinelerra/renderprofiles.C
@@ -218,8 +218,9 @@ int RenderProfile::save_to_slot(int profile_slot, const char *profile_name)
 	sprintf(string_name, "RENDER_%i_PROFILE_NAME", profile_slot);
 	mwindow->defaults->update(string_name, profile_name);
 
-	sprintf(string_name, "RENDER_%i_STRATEGY", profile_slot);
-	mwindow->defaults->update(string_name, rwindow->render->strategy);
+	sprintf(string_name, "RENDER_%i_FILE_PER_LABEL", profile_slot);
+	mwindow->defaults->update(string_name,
+		rwindow->render->file_per_label ? FILE_PER_LABEL : SINGLE_PASS);
 	sprintf(string_name, "RENDER_%i_LOADMODE", profile_slot);
 	mwindow->defaults->update(string_name, rwindow->render->load_mode);
 	sprintf(string_name, "RENDER_%i_RANGE_TYPE", profile_slot);
diff --git a/cinelerra-5.1/cinelerra/vrender.C b/cinelerra-5.1/cinelerra/vrender.C
index 1a3706fa..7a4323bd 100644
--- a/cinelerra-5.1/cinelerra/vrender.C
+++ b/cinelerra-5.1/cinelerra/vrender.C
@@ -271,7 +271,7 @@ int VRender::get_colormodel(VEdit *playable_edit, int use_vconsole, int use_bren
 					colormodel = BC_BGR8888;
 				else {
 // file favorite colormodel may mismatch rgb/yuv
-					int vstream = playable_edit->channel;
+					int vstream = playable_edit ? playable_edit->channel : -1;
 					int best_colormodel = file->get_best_colormodel(vconfig->driver, vstream);
 					if( BC_CModels::is_yuv(best_colormodel) == BC_CModels::is_yuv(colormodel) )
 						colormodel = best_colormodel;
diff --git a/cinelerra-5.1/plugins/1080to480/1080to480.C b/cinelerra-5.1/plugins/1080to480/1080to480.C
index 24bfa698..1f83f499 100644
--- a/cinelerra-5.1/plugins/1080to480/1080to480.C
+++ b/cinelerra-5.1/plugins/1080to480/1080to480.C
@@ -155,7 +155,7 @@ _1080to480Main::~_1080to480Main()
 	if(temp) delete temp;
 }
 
-const char* _1080to480Main::plugin_title() { return _("1080 to 480"); }
+const char* _1080to480Main::plugin_title() { return N_("1080 to 480"); }
 int _1080to480Main::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(_1080to480Main, _1080to480Window)
diff --git a/cinelerra-5.1/plugins/1080to540/1080to540.C b/cinelerra-5.1/plugins/1080to540/1080to540.C
index 8e44c87c..64bbbb53 100644
--- a/cinelerra-5.1/plugins/1080to540/1080to540.C
+++ b/cinelerra-5.1/plugins/1080to540/1080to540.C
@@ -159,7 +159,7 @@ _1080to540Main::~_1080to540Main()
 	if(temp) delete temp;
 }
 
-const char* _1080to540Main::plugin_title() { return _("1080 to 540"); }
+const char* _1080to540Main::plugin_title() { return N_("1080 to 540"); }
 int _1080to540Main::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(_1080to540Main, _1080to540Window)
diff --git a/cinelerra-5.1/plugins/720to480/720to480.C b/cinelerra-5.1/plugins/720to480/720to480.C
index e0b5d216..fda3e1d0 100644
--- a/cinelerra-5.1/plugins/720to480/720to480.C
+++ b/cinelerra-5.1/plugins/720to480/720to480.C
@@ -189,7 +189,7 @@ _720to480Main::~_720to480Main()
 	if(temp) delete temp;
 }
 
-const char* _720to480Main::plugin_title() { return _("720 to 480"); }
+const char* _720to480Main::plugin_title() { return N_("720 to 480"); }
 int _720to480Main::is_realtime() { return 0; }
 
 double _720to480Main::get_framerate()
diff --git a/cinelerra-5.1/plugins/C41/c41.C b/cinelerra-5.1/plugins/C41/c41.C
index 6006e07b..f4f372b1 100644
--- a/cinelerra-5.1/plugins/C41/c41.C
+++ b/cinelerra-5.1/plugins/C41/c41.C
@@ -214,7 +214,7 @@ int C41Slider::update(int v)
 	return 1;
 }
 
-const char* C41Effect::plugin_title() { return _("C41"); }
+const char* C41Effect::plugin_title() { return N_("C41"); }
 int C41Effect::is_realtime() { return 1; }
 int C41Effect::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/aging/aging.C b/cinelerra-5.1/plugins/aging/aging.C
index dc51d4c1..765a8fcd 100644
--- a/cinelerra-5.1/plugins/aging/aging.C
+++ b/cinelerra-5.1/plugins/aging/aging.C
@@ -73,7 +73,7 @@ AgingMain::~AgingMain()
 	if(aging_server) delete aging_server;
 }
 
-const char* AgingMain::plugin_title() { return _("AgingTV"); }
+const char* AgingMain::plugin_title() { return N_("AgingTV"); }
 int AgingMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(AgingMain, AgingWindow)
diff --git a/cinelerra-5.1/plugins/audioscope/audioscope.C b/cinelerra-5.1/plugins/audioscope/audioscope.C
index 129748d5..3726237b 100644
--- a/cinelerra-5.1/plugins/audioscope/audioscope.C
+++ b/cinelerra-5.1/plugins/audioscope/audioscope.C
@@ -661,7 +661,7 @@ void AudioScope::reset()
 }
 
 
-const char* AudioScope::plugin_title() { return _("AudioScope"); }
+const char* AudioScope::plugin_title() { return N_("AudioScope"); }
 int AudioScope::is_realtime() { return 1; }
 int AudioScope::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/bandslide/bandslide.C b/cinelerra-5.1/plugins/bandslide/bandslide.C
index 5f7015eb..e808f5ed 100644
--- a/cinelerra-5.1/plugins/bandslide/bandslide.C
+++ b/cinelerra-5.1/plugins/bandslide/bandslide.C
@@ -181,7 +181,7 @@ BandSlideMain::~BandSlideMain()
 
 }
 
-const char* BandSlideMain::plugin_title() { return _("BandSlide"); }
+const char* BandSlideMain::plugin_title() { return N_("BandSlide"); }
 int BandSlideMain::is_transition() { return 1; }
 int BandSlideMain::uses_gui() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/bandwipe/bandwipe.C b/cinelerra-5.1/plugins/bandwipe/bandwipe.C
index 4c9de91e..e707b487 100644
--- a/cinelerra-5.1/plugins/bandwipe/bandwipe.C
+++ b/cinelerra-5.1/plugins/bandwipe/bandwipe.C
@@ -178,7 +178,7 @@ BandWipeMain::~BandWipeMain()
 
 }
 
-const char* BandWipeMain::plugin_title() { return _("BandWipe"); }
+const char* BandWipeMain::plugin_title() { return N_("BandWipe"); }
 int BandWipeMain::is_transition() { return 1; }
 int BandWipeMain::uses_gui() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/bluebanana/bluebanana.C b/cinelerra-5.1/plugins/bluebanana/bluebanana.C
index 5e7b4103..fab60bbf 100644
--- a/cinelerra-5.1/plugins/bluebanana/bluebanana.C
+++ b/cinelerra-5.1/plugins/bluebanana/bluebanana.C
@@ -84,7 +84,7 @@ BluebananaMain::~BluebananaMain() {
   delete engine;
 }
 
-const char* BluebananaMain::plugin_title() { return _("Blue Banana"); }
+const char* BluebananaMain::plugin_title() { return N_("Blue Banana"); }
 int BluebananaMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(BluebananaMain, BluebananaWindow)
diff --git a/cinelerra-5.1/plugins/blur/blur.C b/cinelerra-5.1/plugins/blur/blur.C
index ab9a5be2..c357f943 100644
--- a/cinelerra-5.1/plugins/blur/blur.C
+++ b/cinelerra-5.1/plugins/blur/blur.C
@@ -128,7 +128,7 @@ BlurMain::~BlurMain()
 	if(overlayer) delete overlayer;
 }
 
-const char* BlurMain::plugin_title() { return _("Blur"); }
+const char* BlurMain::plugin_title() { return N_("Blur"); }
 int BlurMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/blurzoom/blurzoom.C b/cinelerra-5.1/plugins/blurzoom/blurzoom.C
index 2f2d3726..098d5f6c 100644
--- a/cinelerra-5.1/plugins/blurzoom/blurzoom.C
+++ b/cinelerra-5.1/plugins/blurzoom/blurzoom.C
@@ -60,7 +60,7 @@ BlurZoomMain::~BlurZoomMain()
 {
 }
 
-char* BlurZoomMain::plugin_title() { return _("RadioacTV"); }
+char* BlurZoomMain::plugin_title() { return N_("RadioacTV"); }
 int BlurZoomMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(BlurZoomMain, BlurZoomWindow)
diff --git a/cinelerra-5.1/plugins/brightness/brightness.C b/cinelerra-5.1/plugins/brightness/brightness.C
index 9eaf9a30..31fc23d6 100644
--- a/cinelerra-5.1/plugins/brightness/brightness.C
+++ b/cinelerra-5.1/plugins/brightness/brightness.C
@@ -93,7 +93,7 @@ BrightnessMain::~BrightnessMain()
 	if(engine) delete engine;
 }
 
-const char* BrightnessMain::plugin_title() { return _("Brightness/Contrast"); }
+const char* BrightnessMain::plugin_title() { return N_("Brightness/Contrast"); }
 int BrightnessMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(BrightnessMain, BrightnessWindow)
diff --git a/cinelerra-5.1/plugins/burn/burn.C b/cinelerra-5.1/plugins/burn/burn.C
index f7a7d586..cbf9939e 100644
--- a/cinelerra-5.1/plugins/burn/burn.C
+++ b/cinelerra-5.1/plugins/burn/burn.C
@@ -73,7 +73,7 @@ BurnMain::~BurnMain()
 	if(effecttv) delete effecttv;
 }
 
-const char* BurnMain::plugin_title() { return _("BurningTV"); }
+const char* BurnMain::plugin_title() { return N_("BurningTV"); }
 int BurnMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/cdripper/cdripper.C b/cinelerra-5.1/plugins/cdripper/cdripper.C
index 2744ce44..f1244466 100644
--- a/cinelerra-5.1/plugins/cdripper/cdripper.C
+++ b/cinelerra-5.1/plugins/cdripper/cdripper.C
@@ -51,7 +51,7 @@ CDRipMain::~CDRipMain()
 {
 }
 
-const char* CDRipMain::plugin_title() { return _("CD Ripper"); }
+const char* CDRipMain::plugin_title() { return N_("CD Ripper"); }
 int CDRipMain::is_realtime() { return 0; }
 int CDRipMain::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/chromakey/chromakey.C b/cinelerra-5.1/plugins/chromakey/chromakey.C
index fe52fec6..ef546b29 100644
--- a/cinelerra-5.1/plugins/chromakey/chromakey.C
+++ b/cinelerra-5.1/plugins/chromakey/chromakey.C
@@ -596,7 +596,7 @@ SET_TRACE
 	return 1;
 }
 
-const char* ChromaKey::plugin_title() { return _("Chroma key"); }
+const char* ChromaKey::plugin_title() { return N_("Chroma key"); }
 int ChromaKey::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(ChromaKey, ChromaKeyWindow)
diff --git a/cinelerra-5.1/plugins/chromakeyhsv/chromakey.C b/cinelerra-5.1/plugins/chromakeyhsv/chromakey.C
index b96b172a..154e2848 100644
--- a/cinelerra-5.1/plugins/chromakeyhsv/chromakey.C
+++ b/cinelerra-5.1/plugins/chromakeyhsv/chromakey.C
@@ -925,7 +925,7 @@ int ChromaKeyHSV::process_buffer(VFrame *frame,
 	return 0;
 }
 
-const char* ChromaKeyHSV::plugin_title() { return _("Chroma key (HSV)"); }
+const char* ChromaKeyHSV::plugin_title() { return N_("Chroma key (HSV)"); }
 int ChromaKeyHSV::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/color3way/color3way.C b/cinelerra-5.1/plugins/color3way/color3way.C
index 8cc288ee..ba1f0094 100644
--- a/cinelerra-5.1/plugins/color3way/color3way.C
+++ b/cinelerra-5.1/plugins/color3way/color3way.C
@@ -360,7 +360,7 @@ Color3WayMain::~Color3WayMain()
 	delete engine;
 }
 
-const char* Color3WayMain::plugin_title() { return _("Color 3 Way"); }
+const char* Color3WayMain::plugin_title() { return N_("Color 3 Way"); }
 int Color3WayMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/colorbalance/colorbalance.C b/cinelerra-5.1/plugins/colorbalance/colorbalance.C
index 16d26ef9..c180a720 100644
--- a/cinelerra-5.1/plugins/colorbalance/colorbalance.C
+++ b/cinelerra-5.1/plugins/colorbalance/colorbalance.C
@@ -336,7 +336,7 @@ ColorBalanceMain::~ColorBalanceMain()
 	}
 }
 
-const char* ColorBalanceMain::plugin_title() { return _("Color Balance"); }
+const char* ColorBalanceMain::plugin_title() { return N_("Color Balance"); }
 int ColorBalanceMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/compressor/compressor.C b/cinelerra-5.1/plugins/compressor/compressor.C
index 54405a4c..f25a59ec 100644
--- a/cinelerra-5.1/plugins/compressor/compressor.C
+++ b/cinelerra-5.1/plugins/compressor/compressor.C
@@ -114,7 +114,7 @@ void CompressorEffect::reset()
 	current_value = 1.0;
 }
 
-const char* CompressorEffect::plugin_title() { return _("Compressor"); }
+const char* CompressorEffect::plugin_title() { return N_("Compressor"); }
 int CompressorEffect::is_realtime() { return 1; }
 int CompressorEffect::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/crikey/crikey.C b/cinelerra-5.1/plugins/crikey/crikey.C
index 6c110c43..9ed221a5 100644
--- a/cinelerra-5.1/plugins/crikey/crikey.C
+++ b/cinelerra-5.1/plugins/crikey/crikey.C
@@ -299,7 +299,7 @@ void CriKey::get_color(int x, int y)
 	}
 }
 
-const char* CriKey::plugin_title() { return _("CriKey"); }
+const char* CriKey::plugin_title() { return N_("CriKey"); }
 int CriKey::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(CriKey, CriKeyWindow);
diff --git a/cinelerra-5.1/plugins/crossfade/crossfade.C b/cinelerra-5.1/plugins/crossfade/crossfade.C
index 174053d9..76b1fac2 100644
--- a/cinelerra-5.1/plugins/crossfade/crossfade.C
+++ b/cinelerra-5.1/plugins/crossfade/crossfade.C
@@ -43,7 +43,7 @@ CrossfadeMain::~CrossfadeMain()
 {
 }
 
-const char* CrossfadeMain::plugin_title() { return _("Crossfade"); }
+const char* CrossfadeMain::plugin_title() { return N_("Crossfade"); }
 int CrossfadeMain::is_transition() { return 1; }
 int CrossfadeMain::uses_gui() { return 0; }
 
diff --git a/cinelerra-5.1/plugins/dbx/dbx.h b/cinelerra-5.1/plugins/dbx/dbx.h
index e4a6d5e2..97a21942 100644
--- a/cinelerra-5.1/plugins/dbx/dbx.h
+++ b/cinelerra-5.1/plugins/dbx/dbx.h
@@ -124,7 +124,7 @@ public:
 	DBXEffect(PluginServer *server);
 	~DBXEffect();
 
-	char* plugin_title();
+	const char* plugin_title();
 	int is_multichannel();
 	int is_realtime();
 	void read_data(KeyFrame *keyframe);
diff --git a/cinelerra-5.1/plugins/dcoffset/dcoffset.C b/cinelerra-5.1/plugins/dcoffset/dcoffset.C
index cf1e2a49..9fca5cc7 100644
--- a/cinelerra-5.1/plugins/dcoffset/dcoffset.C
+++ b/cinelerra-5.1/plugins/dcoffset/dcoffset.C
@@ -56,7 +56,7 @@ DCOffset::~DCOffset()
 	delete reference;
 }
 
-const char* DCOffset::plugin_title() { return _("DC Offset"); }
+const char* DCOffset::plugin_title() { return N_("DC Offset"); }
 int DCOffset::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/decimate/decimate.C b/cinelerra-5.1/plugins/decimate/decimate.C
index f2d4d6bb..75b0d1e5 100644
--- a/cinelerra-5.1/plugins/decimate/decimate.C
+++ b/cinelerra-5.1/plugins/decimate/decimate.C
@@ -739,7 +739,7 @@ int Decimate::process_buffer(VFrame *frame,
 
 
 
-const char* Decimate::plugin_title() { return _("Decimate"); }
+const char* Decimate::plugin_title() { return N_("Decimate"); }
 int Decimate::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(Decimate, DecimateWindow)
diff --git a/cinelerra-5.1/plugins/deinterlace-cv/deinterlace-cv.C b/cinelerra-5.1/plugins/deinterlace-cv/deinterlace-cv.C
index b7cc0dc1..50a8ad33 100644
--- a/cinelerra-5.1/plugins/deinterlace-cv/deinterlace-cv.C
+++ b/cinelerra-5.1/plugins/deinterlace-cv/deinterlace-cv.C
@@ -94,7 +94,7 @@ DeInterlaceMain::~DeInterlaceMain()
 	if(temp_prevframe) delete temp_prevframe;
 }
 
-const char* DeInterlaceMain::plugin_title() { return _("Deinterlace-CV"); }
+const char* DeInterlaceMain::plugin_title() { return N_("Deinterlace-CV"); }
 int DeInterlaceMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/deinterlace/deinterlace.C b/cinelerra-5.1/plugins/deinterlace/deinterlace.C
index 028d90db..27a5c595 100644
--- a/cinelerra-5.1/plugins/deinterlace/deinterlace.C
+++ b/cinelerra-5.1/plugins/deinterlace/deinterlace.C
@@ -81,7 +81,7 @@ DeInterlaceMain::~DeInterlaceMain()
 //	if(temp) delete temp;
 }
 
-const char* DeInterlaceMain::plugin_title() { return _("Deinterlace"); }
+const char* DeInterlaceMain::plugin_title() { return N_("Deinterlace"); }
 int DeInterlaceMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/delayaudio/delayaudio.C b/cinelerra-5.1/plugins/delayaudio/delayaudio.C
index 3db63e88..e67b8840 100644
--- a/cinelerra-5.1/plugins/delayaudio/delayaudio.C
+++ b/cinelerra-5.1/plugins/delayaudio/delayaudio.C
@@ -55,7 +55,7 @@ DelayAudio::~DelayAudio()
 
 NEW_WINDOW_MACRO(DelayAudio, DelayAudioWindow)
 
-const char* DelayAudio::plugin_title() { return _("Delay audio"); }
+const char* DelayAudio::plugin_title() { return N_("Delay audio"); }
 int DelayAudio::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/delayvideo/delayvideo.C b/cinelerra-5.1/plugins/delayvideo/delayvideo.C
index 55ea5d4e..8047666e 100644
--- a/cinelerra-5.1/plugins/delayvideo/delayvideo.C
+++ b/cinelerra-5.1/plugins/delayvideo/delayvideo.C
@@ -246,7 +246,7 @@ int DelayVideo::is_realtime()
 	return 1;
 }
 
-const char* DelayVideo::plugin_title() { return _("Delay Video"); }
+const char* DelayVideo::plugin_title() { return N_("Delay Video"); }
 
 LOAD_CONFIGURATION_MACRO(DelayVideo, DelayVideoConfig)
 NEW_WINDOW_MACRO(DelayVideo, DelayVideoWindow)
diff --git a/cinelerra-5.1/plugins/denoise/denoise.C b/cinelerra-5.1/plugins/denoise/denoise.C
index 475f3952..e785e5e9 100644
--- a/cinelerra-5.1/plugins/denoise/denoise.C
+++ b/cinelerra-5.1/plugins/denoise/denoise.C
@@ -126,7 +126,7 @@ void DenoiseEffect::reset()
 	iterations = 1;
 }
 
-const char* DenoiseEffect::plugin_title() { return _("Denoise"); }
+const char* DenoiseEffect::plugin_title() { return N_("Denoise"); }
 int DenoiseEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/denoisefft/denoisefft.C b/cinelerra-5.1/plugins/denoisefft/denoisefft.C
index 57fec356..c9603689 100644
--- a/cinelerra-5.1/plugins/denoisefft/denoisefft.C
+++ b/cinelerra-5.1/plugins/denoisefft/denoisefft.C
@@ -308,7 +308,7 @@ void DenoiseFFTEffect::reset()
 }
 
 int DenoiseFFTEffect::is_realtime() { return 1; }
-const char* DenoiseFFTEffect::plugin_title() { return _("DenoiseFFT"); }
+const char* DenoiseFFTEffect::plugin_title() { return N_("DenoiseFFT"); }
 
 
 
diff --git a/cinelerra-5.1/plugins/denoisemjpeg/denoisemjpeg.C b/cinelerra-5.1/plugins/denoisemjpeg/denoisemjpeg.C
index 4e058fef..1fd3381a 100644
--- a/cinelerra-5.1/plugins/denoisemjpeg/denoisemjpeg.C
+++ b/cinelerra-5.1/plugins/denoisemjpeg/denoisemjpeg.C
@@ -444,7 +444,7 @@ int DenoiseMJPEG::process_realtime(VFrame *input, VFrame *output)
 	return 0;
 }
 
-const char* DenoiseMJPEG::plugin_title() { return _("Denoise video2"); }
+const char* DenoiseMJPEG::plugin_title() { return N_("Denoise video2"); }
 int DenoiseMJPEG::is_realtime() { return 1; }
 
 void DenoiseMJPEG::update_gui()
diff --git a/cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C b/cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C
index b5738981..743e7423 100644
--- a/cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C
+++ b/cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C
@@ -117,7 +117,7 @@ SelTempAvgMain::~SelTempAvgMain()
 	if(history_valid) delete [] history_valid;
 }
 
-const char* SelTempAvgMain::plugin_title() { return _("Selective Temporal Averaging"); }
+const char* SelTempAvgMain::plugin_title() { return N_("Selective Temporal Averaging"); }
 int SelTempAvgMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/denoisevideo/denoisevideo.C b/cinelerra-5.1/plugins/denoisevideo/denoisevideo.C
index ad6a340d..12563624 100644
--- a/cinelerra-5.1/plugins/denoisevideo/denoisevideo.C
+++ b/cinelerra-5.1/plugins/denoisevideo/denoisevideo.C
@@ -411,7 +411,7 @@ int DenoiseVideo::process_realtime(VFrame *input, VFrame *output)
 }
 
 
-const char* DenoiseVideo::plugin_title() { return _("Denoise video"); }
+const char* DenoiseVideo::plugin_title() { return N_("Denoise video"); }
 int DenoiseVideo::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/despike/despike.C b/cinelerra-5.1/plugins/despike/despike.C
index ca8b96ac..ad636f12 100644
--- a/cinelerra-5.1/plugins/despike/despike.C
+++ b/cinelerra-5.1/plugins/despike/despike.C
@@ -51,7 +51,7 @@ Despike::~Despike()
 
 }
 
-const char* Despike::plugin_title() { return _("Despike"); }
+const char* Despike::plugin_title() { return N_("Despike"); }
 int Despike::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(Despike, DespikeWindow)
diff --git a/cinelerra-5.1/plugins/diffkey/diffkey.C b/cinelerra-5.1/plugins/diffkey/diffkey.C
index 2f24a587..ff8502f0 100644
--- a/cinelerra-5.1/plugins/diffkey/diffkey.C
+++ b/cinelerra-5.1/plugins/diffkey/diffkey.C
@@ -327,7 +327,7 @@ DiffKey::~DiffKey()
 NEW_WINDOW_MACRO(DiffKey, DiffKeyGUI)
 LOAD_CONFIGURATION_MACRO(DiffKey, DiffKeyConfig)
 
-const char* DiffKey::plugin_title() { return _("Difference key"); }
+const char* DiffKey::plugin_title() { return N_("Difference key"); }
 int DiffKey::is_realtime() { return 1; }
 int DiffKey::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/dissolve/dissolve.C b/cinelerra-5.1/plugins/dissolve/dissolve.C
index 6c04fa07..37b5ac8c 100644
--- a/cinelerra-5.1/plugins/dissolve/dissolve.C
+++ b/cinelerra-5.1/plugins/dissolve/dissolve.C
@@ -47,7 +47,7 @@ DissolveMain::~DissolveMain()
 	delete overlayer;
 }
 
-const char* DissolveMain::plugin_title() { return _("Dissolve"); }
+const char* DissolveMain::plugin_title() { return N_("Dissolve"); }
 int DissolveMain::is_video() { return 1; }
 int DissolveMain::is_transition() { return 1; }
 int DissolveMain::uses_gui() { return 0; }
diff --git a/cinelerra-5.1/plugins/dot/dot.C b/cinelerra-5.1/plugins/dot/dot.C
index 5060efd2..daf17d3d 100644
--- a/cinelerra-5.1/plugins/dot/dot.C
+++ b/cinelerra-5.1/plugins/dot/dot.C
@@ -79,7 +79,7 @@ DotMain::~DotMain()
 	}
 }
 
-const char* DotMain::plugin_title() { return _("DotTV"); }
+const char* DotMain::plugin_title() { return N_("DotTV"); }
 int DotMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(DotMain, DotWindow)
diff --git a/cinelerra-5.1/plugins/downsample/downsample.C b/cinelerra-5.1/plugins/downsample/downsample.C
index 49e1489b..a63bc5a7 100644
--- a/cinelerra-5.1/plugins/downsample/downsample.C
+++ b/cinelerra-5.1/plugins/downsample/downsample.C
@@ -373,7 +373,7 @@ DownSampleMain::~DownSampleMain()
 	if(engine) delete engine;
 }
 
-const char* DownSampleMain::plugin_title() { return _("Downsample"); }
+const char* DownSampleMain::plugin_title() { return N_("Downsample"); }
 int DownSampleMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/echo/echo.C b/cinelerra-5.1/plugins/echo/echo.C
index d8b426d0..99ae7959 100644
--- a/cinelerra-5.1/plugins/echo/echo.C
+++ b/cinelerra-5.1/plugins/echo/echo.C
@@ -207,7 +207,7 @@ void Echo::reset()
 	bfr_pos = 0;
 }
 
-const char* Echo::plugin_title() { return _("Echo"); }
+const char* Echo::plugin_title() { return N_("Echo"); }
 int Echo::is_realtime() { return 1; }
 int Echo::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/echocancel/echocancel.C b/cinelerra-5.1/plugins/echocancel/echocancel.C
index b0cf73dd..f1ff269e 100644
--- a/cinelerra-5.1/plugins/echocancel/echocancel.C
+++ b/cinelerra-5.1/plugins/echocancel/echocancel.C
@@ -720,7 +720,7 @@ remove(int len)
 		sample_data -= len;
 }
 
-const char* EchoCancel::plugin_title() { return _("EchoCancel"); }
+const char* EchoCancel::plugin_title() { return N_("EchoCancel"); }
 int EchoCancel::is_realtime() { return 1; }
 
 static inline double sqr(double v) { return v*v; }
diff --git a/cinelerra-5.1/plugins/edge/edge.C b/cinelerra-5.1/plugins/edge/edge.C
index b8541927..24c95dd4 100644
--- a/cinelerra-5.1/plugins/edge/edge.C
+++ b/cinelerra-5.1/plugins/edge/edge.C
@@ -71,7 +71,7 @@ Edge::~Edge()
 	delete dst;
 }
 
-const char* Edge::plugin_title() { return _("Edge"); }
+const char* Edge::plugin_title() { return N_("Edge"); }
 int Edge::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(Edge, EdgeWindow);
diff --git a/cinelerra-5.1/plugins/fieldframe/fieldframe.C b/cinelerra-5.1/plugins/fieldframe/fieldframe.C
index 0a39eb1b..253e2a3c 100644
--- a/cinelerra-5.1/plugins/fieldframe/fieldframe.C
+++ b/cinelerra-5.1/plugins/fieldframe/fieldframe.C
@@ -332,7 +332,7 @@ FieldFrame::~FieldFrame()
 	if(input) delete input;
 }
 
-const char* FieldFrame::plugin_title() { return _("Fields to frames"); }
+const char* FieldFrame::plugin_title() { return N_("Fields to frames"); }
 int FieldFrame::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/findobj/findobj.C b/cinelerra-5.1/plugins/findobj/findobj.C
index 737167e5..86235f2d 100644
--- a/cinelerra-5.1/plugins/findobj/findobj.C
+++ b/cinelerra-5.1/plugins/findobj/findobj.C
@@ -145,7 +145,7 @@ FindObjMain::~FindObjMain()
 	delete overlayer;
 }
 
-const char* FindObjMain::plugin_title() { return _("FindObj"); }
+const char* FindObjMain::plugin_title() { return N_("FindObj"); }
 int FindObjMain::is_realtime() { return 1; }
 int FindObjMain::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/flash/flash.C b/cinelerra-5.1/plugins/flash/flash.C
index e66f3962..599ef395 100644
--- a/cinelerra-5.1/plugins/flash/flash.C
+++ b/cinelerra-5.1/plugins/flash/flash.C
@@ -42,7 +42,7 @@ FlashMain::~FlashMain()
 {
 }
 
-const char* FlashMain::plugin_title() { return _("Flash"); }
+const char* FlashMain::plugin_title() { return N_("Flash"); }
 int FlashMain::is_video() { return 1; }
 int FlashMain::is_transition() { return 1; }
 int FlashMain::uses_gui() { return 0; }
diff --git a/cinelerra-5.1/plugins/flip/flip.C b/cinelerra-5.1/plugins/flip/flip.C
index 81cd7532..5d866620 100644
--- a/cinelerra-5.1/plugins/flip/flip.C
+++ b/cinelerra-5.1/plugins/flip/flip.C
@@ -85,7 +85,7 @@ FlipMain::~FlipMain()
 
 }
 
-const char* FlipMain::plugin_title() { return _("Flip"); }
+const char* FlipMain::plugin_title() { return N_("Flip"); }
 int FlipMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/framefield/framefield.C b/cinelerra-5.1/plugins/framefield/framefield.C
index f4ff5487..b29d3f03 100644
--- a/cinelerra-5.1/plugins/framefield/framefield.C
+++ b/cinelerra-5.1/plugins/framefield/framefield.C
@@ -559,7 +559,7 @@ void FrameField::average_rows(int offset, VFrame *frame)
 
 
 
-const char* FrameField::plugin_title() { return _("Frames to fields"); }
+const char* FrameField::plugin_title() { return N_("Frames to fields"); }
 int FrameField::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(FrameField, FrameFieldWindow)
diff --git a/cinelerra-5.1/plugins/freeverb/freeverb.C b/cinelerra-5.1/plugins/freeverb/freeverb.C
index cc5bd378..64db3048 100644
--- a/cinelerra-5.1/plugins/freeverb/freeverb.C
+++ b/cinelerra-5.1/plugins/freeverb/freeverb.C
@@ -456,7 +456,7 @@ FreeverbEffect::~FreeverbEffect()
 NEW_WINDOW_MACRO(FreeverbEffect, FreeverbWindow)
 
 
-const char* FreeverbEffect::plugin_title() { return _("Freeverb"); }
+const char* FreeverbEffect::plugin_title() { return N_("Freeverb"); }
 int FreeverbEffect::is_realtime() { return 1; }
 int FreeverbEffect::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/freezeframe/freezeframe.C b/cinelerra-5.1/plugins/freezeframe/freezeframe.C
index 67904ed6..b873b22f 100644
--- a/cinelerra-5.1/plugins/freezeframe/freezeframe.C
+++ b/cinelerra-5.1/plugins/freezeframe/freezeframe.C
@@ -154,7 +154,7 @@ FreezeFrameMain::~FreezeFrameMain()
 	if(first_frame) delete first_frame;
 }
 
-const char* FreezeFrameMain::plugin_title() { return _("Freeze Frame"); }
+const char* FreezeFrameMain::plugin_title() { return N_("Freeze Frame"); }
 int FreezeFrameMain::is_synthesis() { return 1; }
 int FreezeFrameMain::is_realtime() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/gain/gain.C b/cinelerra-5.1/plugins/gain/gain.C
index 75c431a3..111c7f80 100644
--- a/cinelerra-5.1/plugins/gain/gain.C
+++ b/cinelerra-5.1/plugins/gain/gain.C
@@ -82,7 +82,7 @@ Gain::~Gain()
 
 }
 
-const char* Gain::plugin_title() { return _("Gain"); }
+const char* Gain::plugin_title() { return N_("Gain"); }
 int Gain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/gamma/gamma.C b/cinelerra-5.1/plugins/gamma/gamma.C
index a462b062..32312105 100644
--- a/cinelerra-5.1/plugins/gamma/gamma.C
+++ b/cinelerra-5.1/plugins/gamma/gamma.C
@@ -398,7 +398,7 @@ GammaMain::~GammaMain()
 	delete engine;
 }
 
-const char* GammaMain::plugin_title() { return _("Gamma"); }
+const char* GammaMain::plugin_title() { return N_("Gamma"); }
 int GammaMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/gradient/gradient.C b/cinelerra-5.1/plugins/gradient/gradient.C
index 2378aec9..1c4a9566 100644
--- a/cinelerra-5.1/plugins/gradient/gradient.C
+++ b/cinelerra-5.1/plugins/gradient/gradient.C
@@ -657,7 +657,7 @@ GradientMain::~GradientMain()
 	if(overlayer) delete overlayer;
 }
 
-const char* GradientMain::plugin_title() { return _("Gradient"); }
+const char* GradientMain::plugin_title() { return N_("Gradient"); }
 int GradientMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/graphic/graphic.C b/cinelerra-5.1/plugins/graphic/graphic.C
index f927679c..e64d9c69 100644
--- a/cinelerra-5.1/plugins/graphic/graphic.C
+++ b/cinelerra-5.1/plugins/graphic/graphic.C
@@ -1045,7 +1045,7 @@ GraphicEQ::~GraphicEQ()
 
 int GraphicEQ::is_realtime() { return 1; }
 
-const char* GraphicEQ::plugin_title() { return _("EQ Graphic"); }
+const char* GraphicEQ::plugin_title() { return N_("EQ Graphic"); }
 
 NEW_WINDOW_MACRO(GraphicEQ, GraphicGUI)
 
diff --git a/cinelerra-5.1/plugins/greycstoration/greycstorationplugin.C b/cinelerra-5.1/plugins/greycstoration/greycstorationplugin.C
index 6b65ac72..c2029ca3 100644
--- a/cinelerra-5.1/plugins/greycstoration/greycstorationplugin.C
+++ b/cinelerra-5.1/plugins/greycstoration/greycstorationplugin.C
@@ -93,7 +93,7 @@ GreyCStorationMain::~GreyCStorationMain()
 	delete [] alpha;
 }
 
-const char* GreyCStorationMain::plugin_title() { return _("GreyCStoration"); }
+const char* GreyCStorationMain::plugin_title() { return N_("GreyCStoration"); }
 int GreyCStorationMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/histeq/histeq.C b/cinelerra-5.1/plugins/histeq/histeq.C
index a4f647cd..d24b2018 100644
--- a/cinelerra-5.1/plugins/histeq/histeq.C
+++ b/cinelerra-5.1/plugins/histeq/histeq.C
@@ -294,7 +294,7 @@ HistEqMain::~HistEqMain()
 	delete [] wts;
 }
 
-const char* HistEqMain::plugin_title() { return _("HistEq"); }
+const char* HistEqMain::plugin_title() { return N_("HistEq"); }
 int HistEqMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/histogram/histogram.C b/cinelerra-5.1/plugins/histogram/histogram.C
index 183d5c0e..33c7b21d 100644
--- a/cinelerra-5.1/plugins/histogram/histogram.C
+++ b/cinelerra-5.1/plugins/histogram/histogram.C
@@ -96,7 +96,7 @@ HistogramMain::~HistogramMain()
 	delete engine;
 }
 
-const char* HistogramMain::plugin_title() { return _("Histogram"); }
+const char* HistogramMain::plugin_title() { return N_("Histogram"); }
 int HistogramMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/histogram_bezier/bistogram.C b/cinelerra-5.1/plugins/histogram_bezier/bistogram.C
index 7c096cbe..584a5e6f 100644
--- a/cinelerra-5.1/plugins/histogram_bezier/bistogram.C
+++ b/cinelerra-5.1/plugins/histogram_bezier/bistogram.C
@@ -78,7 +78,7 @@ HistogramMain::~HistogramMain()
 	delete engine;
 }
 
-const char* HistogramMain::plugin_title() { return _("Histogram Bezier"); }
+const char* HistogramMain::plugin_title() { return N_("Histogram Bezier"); }
 int HistogramMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/holo/holo.C b/cinelerra-5.1/plugins/holo/holo.C
index 717f0f36..083e5174 100644
--- a/cinelerra-5.1/plugins/holo/holo.C
+++ b/cinelerra-5.1/plugins/holo/holo.C
@@ -73,7 +73,7 @@ HoloMain::~HoloMain()
 		delete bgimage;
 }
 
-const char* HoloMain::plugin_title() { return _("HolographicTV"); }
+const char* HoloMain::plugin_title() { return N_("HolographicTV"); }
 int HoloMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(HoloMain, HoloWindow)
diff --git a/cinelerra-5.1/plugins/huesaturation/huesaturation.C b/cinelerra-5.1/plugins/huesaturation/huesaturation.C
index db76fa23..5800928e 100644
--- a/cinelerra-5.1/plugins/huesaturation/huesaturation.C
+++ b/cinelerra-5.1/plugins/huesaturation/huesaturation.C
@@ -568,7 +568,7 @@ int HueEffect::process_buffer(VFrame *frame,
 	return 0;
 }
 
-const char* HueEffect::plugin_title() { return _("Hue saturation"); }
+const char* HueEffect::plugin_title() { return N_("Hue saturation"); }
 int HueEffect::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(HueEffect, HueWindow)
diff --git a/cinelerra-5.1/plugins/interpolate/interpolate.C b/cinelerra-5.1/plugins/interpolate/interpolate.C
index 84f1bfc6..e7133ab1 100644
--- a/cinelerra-5.1/plugins/interpolate/interpolate.C
+++ b/cinelerra-5.1/plugins/interpolate/interpolate.C
@@ -167,7 +167,7 @@ InterpolatePixelsMain::~InterpolatePixelsMain()
 	delete engine;
 }
 
-const char* InterpolatePixelsMain::plugin_title() { return _("Interpolate Bayer"); }
+const char* InterpolatePixelsMain::plugin_title() { return N_("Interpolate Bayer"); }
 int InterpolatePixelsMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/interpolateall/interpolateall.C b/cinelerra-5.1/plugins/interpolateall/interpolateall.C
index d52e8bdb..79124bbc 100644
--- a/cinelerra-5.1/plugins/interpolateall/interpolateall.C
+++ b/cinelerra-5.1/plugins/interpolateall/interpolateall.C
@@ -44,7 +44,7 @@ public:
 	InterpolateAllEffect(PluginServer *server);
 	~InterpolateAllEffect();
 
-	char* plugin_title();
+	const char* plugin_title();
 	int is_realtime();
 	int is_multichannel();
 	int get_parameters();
@@ -94,7 +94,7 @@ InterpolateAllEffect::~InterpolateAllEffect()
 
 
 
-char* InterpolateAllEffect::plugin_title() { return _("Interpolate"); }
+char* InterpolateAllEffect::plugin_title() { return N_("Interpolate"); }
 int InterpolateAllEffect::is_realtime() { return 0; }
 int InterpolateAllEffect::is_multichannel() { return 0; }
 
diff --git a/cinelerra-5.1/plugins/interpolateaudio/interpolateaudio.C b/cinelerra-5.1/plugins/interpolateaudio/interpolateaudio.C
index 2dd6e32d..3657582e 100644
--- a/cinelerra-5.1/plugins/interpolateaudio/interpolateaudio.C
+++ b/cinelerra-5.1/plugins/interpolateaudio/interpolateaudio.C
@@ -93,7 +93,7 @@ InterpolateAudioEffect::~InterpolateAudioEffect()
 
 
 
-const char* InterpolateAudioEffect::plugin_title() { return _("Interpolate"); }
+const char* InterpolateAudioEffect::plugin_title() { return N_("Interpolate"); }
 int InterpolateAudioEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C b/cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C
index 83ff93b6..892298b8 100644
--- a/cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C
+++ b/cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C
@@ -846,7 +846,7 @@ int InterpolateVideo::process_buffer(VFrame *frame,
 
 
 NEW_WINDOW_MACRO(InterpolateVideo, InterpolateVideoWindow)
-const char* InterpolateVideo::plugin_title() { return _("Interpolate Video"); }
+const char* InterpolateVideo::plugin_title() { return N_("Interpolate Video"); }
 int InterpolateVideo::is_realtime() { return 1; }
 
 int InterpolateVideo::load_configuration()
diff --git a/cinelerra-5.1/plugins/invertaudio/invert.C b/cinelerra-5.1/plugins/invertaudio/invert.C
index 4cb08b23..159fff1b 100644
--- a/cinelerra-5.1/plugins/invertaudio/invert.C
+++ b/cinelerra-5.1/plugins/invertaudio/invert.C
@@ -32,7 +32,7 @@ public:
 	 : PluginAClient(server) {};
 	~InvertAudioEffect() {};
 
-	const char* plugin_title() { return  _("Invert Audio"); };
+	const char* plugin_title() { return N_("Invert Audio"); };
 	int is_realtime() { return 1; };
 	int process_realtime(int64_t size, Samples *input_ptr, Samples *output_ptr) {
 		double *output_samples = output_ptr->get_data();
diff --git a/cinelerra-5.1/plugins/invertvideo/invert.C b/cinelerra-5.1/plugins/invertvideo/invert.C
index fed3f3ef..66fd88bb 100644
--- a/cinelerra-5.1/plugins/invertvideo/invert.C
+++ b/cinelerra-5.1/plugins/invertvideo/invert.C
@@ -201,7 +201,7 @@ InvertVideoEffect::~InvertVideoEffect()
 
 }
 
-const char* InvertVideoEffect::plugin_title() { return _("Invert Video"); }
+const char* InvertVideoEffect::plugin_title() { return N_("Invert Video"); }
 int InvertVideoEffect::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(InvertVideoEffect, InvertVideoWindow)
diff --git a/cinelerra-5.1/plugins/irissquare/irissquare.C b/cinelerra-5.1/plugins/irissquare/irissquare.C
index be72bd4c..0408a394 100644
--- a/cinelerra-5.1/plugins/irissquare/irissquare.C
+++ b/cinelerra-5.1/plugins/irissquare/irissquare.C
@@ -141,7 +141,7 @@ IrisSquareMain::~IrisSquareMain()
 
 }
 
-const char* IrisSquareMain::plugin_title() { return _("IrisSquare"); }
+const char* IrisSquareMain::plugin_title() { return N_("IrisSquare"); }
 int IrisSquareMain::is_video() { return 1; }
 int IrisSquareMain::is_transition() { return 1; }
 int IrisSquareMain::uses_gui() { return 1; }
diff --git a/cinelerra-5.1/plugins/ivtc/ivtc.C b/cinelerra-5.1/plugins/ivtc/ivtc.C
index 8966ea51..fc74ad0e 100644
--- a/cinelerra-5.1/plugins/ivtc/ivtc.C
+++ b/cinelerra-5.1/plugins/ivtc/ivtc.C
@@ -73,7 +73,7 @@ IVTCMain::~IVTCMain()
 	}
 }
 
-const char* IVTCMain::plugin_title() { return _("Inverse Telecine"); }
+const char* IVTCMain::plugin_title() { return N_("Inverse Telecine"); }
 int IVTCMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/lens/lens.C b/cinelerra-5.1/plugins/lens/lens.C
index c5b4648c..9248b96f 100644
--- a/cinelerra-5.1/plugins/lens/lens.C
+++ b/cinelerra-5.1/plugins/lens/lens.C
@@ -584,7 +584,7 @@ LensMain::~LensMain()
 NEW_WINDOW_MACRO(LensMain, LensGUI)
 LOAD_CONFIGURATION_MACRO(LensMain, LensConfig)
 int LensMain::is_realtime() { return 1; }
-const char* LensMain::plugin_title() { return _("Lens"); }
+const char* LensMain::plugin_title() { return N_("Lens"); }
 
 void LensMain::update_gui()
 {
diff --git a/cinelerra-5.1/plugins/level/leveleffect.C b/cinelerra-5.1/plugins/level/leveleffect.C
index 30b2a34d..8f70e467 100644
--- a/cinelerra-5.1/plugins/level/leveleffect.C
+++ b/cinelerra-5.1/plugins/level/leveleffect.C
@@ -193,7 +193,7 @@ void SoundLevelEffect::reset()
 	accum_size = 0;
 }
 
-const char* SoundLevelEffect::plugin_title() { return _("SoundLevel"); }
+const char* SoundLevelEffect::plugin_title() { return N_("SoundLevel"); }
 int SoundLevelEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/linearblur/linearblur.C b/cinelerra-5.1/plugins/linearblur/linearblur.C
index 2557f9d1..5f646b3e 100644
--- a/cinelerra-5.1/plugins/linearblur/linearblur.C
+++ b/cinelerra-5.1/plugins/linearblur/linearblur.C
@@ -388,7 +388,7 @@ LinearBlurMain::~LinearBlurMain()
 	if(temp) delete temp;
 }
 
-const char* LinearBlurMain::plugin_title() { return _("Linear Blur"); }
+const char* LinearBlurMain::plugin_title() { return N_("Linear Blur"); }
 int LinearBlurMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/liveaudio/liveaudio.C b/cinelerra-5.1/plugins/liveaudio/liveaudio.C
index 5fba45ae..d0a9591a 100644
--- a/cinelerra-5.1/plugins/liveaudio/liveaudio.C
+++ b/cinelerra-5.1/plugins/liveaudio/liveaudio.C
@@ -374,7 +374,7 @@ void LiveAudio::render_stop()
 }
 
 
-const char* LiveAudio::plugin_title() { return _("Live Audio"); }
+const char* LiveAudio::plugin_title() { return N_("Live Audio"); }
 int LiveAudio::is_realtime() { return 1; }
 int LiveAudio::is_multichannel() { return 1; }
 int LiveAudio::is_synthesis() { return 1; }
diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C
index 23edbc73..59b4015b 100644
--- a/cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/cinelerra-5.1/plugins/livevideo/livevideo.C
@@ -572,7 +572,7 @@ void LiveVideo::render_stop()
 }
 
 
-const char* LiveVideo::plugin_title() { return _("Live Video"); }
+const char* LiveVideo::plugin_title() { return N_("Live Video"); }
 int LiveVideo::is_realtime() { return 1; }
 int LiveVideo::is_multichannel() { return 0; }
 int LiveVideo::is_synthesis() { return 1; }
diff --git a/cinelerra-5.1/plugins/loopaudio/loopaudio.C b/cinelerra-5.1/plugins/loopaudio/loopaudio.C
index 40634795..8a21ad6f 100644
--- a/cinelerra-5.1/plugins/loopaudio/loopaudio.C
+++ b/cinelerra-5.1/plugins/loopaudio/loopaudio.C
@@ -178,7 +178,7 @@ LoopAudio::~LoopAudio()
 
 }
 
-const char* LoopAudio::plugin_title() { return _("Loop audio"); }
+const char* LoopAudio::plugin_title() { return N_("Loop audio"); }
 int LoopAudio::is_realtime() { return 1; }
 int LoopAudio::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/loopvideo/loopvideo.C b/cinelerra-5.1/plugins/loopvideo/loopvideo.C
index e01972d2..f25299a2 100644
--- a/cinelerra-5.1/plugins/loopvideo/loopvideo.C
+++ b/cinelerra-5.1/plugins/loopvideo/loopvideo.C
@@ -176,7 +176,7 @@ LoopVideo::~LoopVideo()
 
 }
 
-const char* LoopVideo::plugin_title() { return _("Loop video"); }
+const char* LoopVideo::plugin_title() { return N_("Loop video"); }
 int LoopVideo::is_realtime() { return 1; }
 int LoopVideo::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/motion-cv/motion-cv.C b/cinelerra-5.1/plugins/motion-cv/motion-cv.C
index fbbef54c..923a183d 100644
--- a/cinelerra-5.1/plugins/motion-cv/motion-cv.C
+++ b/cinelerra-5.1/plugins/motion-cv/motion-cv.C
@@ -206,7 +206,7 @@ MotionCVMain::~MotionCVMain()
 	delete rotate_target_dst;
 }
 
-const char *MotionCVMain::plugin_title() { return _("MotionCV"); }
+const char *MotionCVMain::plugin_title() { return N_("MotionCV"); }
 int MotionCVMain::is_realtime() { return 1; }
 int MotionCVMain::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/motion-hv/motion-hv.C b/cinelerra-5.1/plugins/motion-hv/motion-hv.C
index b61c654a..ba5b5d19 100644
--- a/cinelerra-5.1/plugins/motion-hv/motion-hv.C
+++ b/cinelerra-5.1/plugins/motion-hv/motion-hv.C
@@ -258,7 +258,7 @@ MotionHVMain::~MotionHVMain()
 	delete rotate_target_dst;
 }
 
-const char* MotionHVMain::plugin_title() { return _("MotionHV"); }
+const char* MotionHVMain::plugin_title() { return N_("MotionHV"); }
 int MotionHVMain::is_realtime() { return 1; }
 int MotionHVMain::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/motion/motion.C b/cinelerra-5.1/plugins/motion/motion.C
index 4661b144..21468bde 100644
--- a/cinelerra-5.1/plugins/motion/motion.C
+++ b/cinelerra-5.1/plugins/motion/motion.C
@@ -212,7 +212,7 @@ MotionMain::~MotionMain()
 	delete rotate_target_dst;
 }
 
-const char* MotionMain::plugin_title() { return _("Motion"); }
+const char* MotionMain::plugin_title() { return N_("Motion"); }
 int MotionMain::is_realtime() { return 1; }
 int MotionMain::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/motion2point/motion.C b/cinelerra-5.1/plugins/motion2point/motion.C
index 5897ae0e..103afb07 100644
--- a/cinelerra-5.1/plugins/motion2point/motion.C
+++ b/cinelerra-5.1/plugins/motion2point/motion.C
@@ -242,7 +242,7 @@ MotionMain2::~MotionMain2()
 	delete global_target_dst;
 }
 
-const char* MotionMain2::plugin_title() { return _("Motion 2 Point"); }
+const char* MotionMain2::plugin_title() { return N_("Motion 2 Point"); }
 int MotionMain2::is_realtime() { return 1; }
 int MotionMain2::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/motion51/motion51.C b/cinelerra-5.1/plugins/motion51/motion51.C
index cac4ed3a..9e4143f4 100644
--- a/cinelerra-5.1/plugins/motion51/motion51.C
+++ b/cinelerra-5.1/plugins/motion51/motion51.C
@@ -120,7 +120,7 @@ Motion51Main::~Motion51Main()
 	delete [] ypts;
 }
 
-const char* Motion51Main::plugin_title() { return _("Motion51"); }
+const char* Motion51Main::plugin_title() { return N_("Motion51"); }
 int Motion51Main::is_realtime() { return 1; }
 int Motion51Main::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/motionblur/motionblur.C b/cinelerra-5.1/plugins/motionblur/motionblur.C
index a5bc3be5..8777413a 100644
--- a/cinelerra-5.1/plugins/motionblur/motionblur.C
+++ b/cinelerra-5.1/plugins/motionblur/motionblur.C
@@ -312,7 +312,7 @@ MotionBlurMain::~MotionBlurMain()
 	if(temp) delete temp;
 }
 
-const char* MotionBlurMain::plugin_title() { return _("Motion Blur"); }
+const char* MotionBlurMain::plugin_title() { return N_("Motion Blur"); }
 int MotionBlurMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/normalize/normalize.C b/cinelerra-5.1/plugins/normalize/normalize.C
index def79d53..89b201ea 100644
--- a/cinelerra-5.1/plugins/normalize/normalize.C
+++ b/cinelerra-5.1/plugins/normalize/normalize.C
@@ -50,7 +50,7 @@ NormalizeMain::~NormalizeMain()
 {
 }
 
-const char* NormalizeMain::plugin_title() { return _("Normalize"); }
+const char* NormalizeMain::plugin_title() { return N_("Normalize"); }
 int NormalizeMain::is_realtime() { return 0; }
 int NormalizeMain::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/oilpainting/oil.C b/cinelerra-5.1/plugins/oilpainting/oil.C
index 0b782ab5..e1014185 100644
--- a/cinelerra-5.1/plugins/oilpainting/oil.C
+++ b/cinelerra-5.1/plugins/oilpainting/oil.C
@@ -306,7 +306,7 @@ OilEffect::~OilEffect()
 }
 
 
-const char* OilEffect::plugin_title() { return _("Oil painting"); }
+const char* OilEffect::plugin_title() { return N_("Oil painting"); }
 int OilEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/overlay/overlay.C b/cinelerra-5.1/plugins/overlay/overlay.C
index fd423d75..e9909e85 100644
--- a/cinelerra-5.1/plugins/overlay/overlay.C
+++ b/cinelerra-5.1/plugins/overlay/overlay.C
@@ -632,7 +632,7 @@ static const char * const overlay_shaders[TRANSFER_TYPES] = {
 }
 
 
-const char* Overlay::plugin_title() { return _("Overlay"); }
+const char* Overlay::plugin_title() { return N_("Overlay"); }
 int Overlay::is_realtime() { return 1; }
 int Overlay::is_multichannel() { return 1; }
 int Overlay::is_synthesis() { return 1; }
diff --git a/cinelerra-5.1/plugins/overlayaudio/overlayaudio.C b/cinelerra-5.1/plugins/overlayaudio/overlayaudio.C
index ab7b0793..b5d54457 100644
--- a/cinelerra-5.1/plugins/overlayaudio/overlayaudio.C
+++ b/cinelerra-5.1/plugins/overlayaudio/overlayaudio.C
@@ -328,7 +328,7 @@ OverlayAudio::~OverlayAudio()
 
 }
 
-const char* OverlayAudio::plugin_title() { return _("Overlay"); }
+const char* OverlayAudio::plugin_title() { return N_("Overlay"); }
 int OverlayAudio::is_realtime() { return 1; }
 int OverlayAudio::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/parametric/parametric.C b/cinelerra-5.1/plugins/parametric/parametric.C
index ddf15c48..a19ff7ff 100644
--- a/cinelerra-5.1/plugins/parametric/parametric.C
+++ b/cinelerra-5.1/plugins/parametric/parametric.C
@@ -816,7 +816,7 @@ NEW_WINDOW_MACRO(ParametricEQ, ParametricWindow)
 LOAD_CONFIGURATION_MACRO(ParametricEQ, ParametricConfig)
 
 
-const char* ParametricEQ::plugin_title() { return _("EQ Parametric"); }
+const char* ParametricEQ::plugin_title() { return N_("EQ Parametric"); }
 int ParametricEQ::is_realtime() { return 1; }
 
 void ParametricEQ::read_data(KeyFrame *keyframe)
diff --git a/cinelerra-5.1/plugins/perspective/perspective.C b/cinelerra-5.1/plugins/perspective/perspective.C
index a9e2adf3..5c31ea87 100644
--- a/cinelerra-5.1/plugins/perspective/perspective.C
+++ b/cinelerra-5.1/plugins/perspective/perspective.C
@@ -656,7 +656,7 @@ PerspectiveMain::~PerspectiveMain()
 	if(temp) delete temp;
 }
 
-const char* PerspectiveMain::plugin_title() { return _("Perspective"); }
+const char* PerspectiveMain::plugin_title() { return N_("Perspective"); }
 int PerspectiveMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/photoscale/photoscale.C b/cinelerra-5.1/plugins/photoscale/photoscale.C
index f858456a..5c3f3c79 100644
--- a/cinelerra-5.1/plugins/photoscale/photoscale.C
+++ b/cinelerra-5.1/plugins/photoscale/photoscale.C
@@ -288,7 +288,7 @@ PhotoScaleMain::~PhotoScaleMain()
 	if(engine) delete engine;
 }
 
-const char* PhotoScaleMain::plugin_title() { return _("Auto Scale"); }
+const char* PhotoScaleMain::plugin_title() { return N_("Auto Scale"); }
 int PhotoScaleMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/piano/piano.C b/cinelerra-5.1/plugins/piano/piano.C
index a1fa01ea..6404fdee 100644
--- a/cinelerra-5.1/plugins/piano/piano.C
+++ b/cinelerra-5.1/plugins/piano/piano.C
@@ -51,7 +51,7 @@ Piano::~Piano()
 }
 
 
-char* Piano::plugin_title() { return _("Pianoesizer"); }
+char* Piano::plugin_title() { return N_("Pianoesizer"); }
 int Piano::is_realtime() { return 1; }
 int Piano::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/piano/piano.h b/cinelerra-5.1/plugins/piano/piano.h
index fa442a95..d008eb03 100644
--- a/cinelerra-5.1/plugins/piano/piano.h
+++ b/cinelerra-5.1/plugins/piano/piano.h
@@ -125,7 +125,7 @@ public:
 	int is_realtime();
 	int is_synthesis();
 	int load_configuration();
-	char* plugin_title();
+	const char* plugin_title();
 	void read_data(KeyFrame *keyframe);
 	void save_data(KeyFrame *keyframe);
 	int show_gui();
diff --git a/cinelerra-5.1/plugins/pitch/pitch.C b/cinelerra-5.1/plugins/pitch/pitch.C
index f6b2c0ae..c0de9c39 100644
--- a/cinelerra-5.1/plugins/pitch/pitch.C
+++ b/cinelerra-5.1/plugins/pitch/pitch.C
@@ -60,7 +60,7 @@ PitchEffect::~PitchEffect()
 	if(fft) delete fft;
 }
 
-const char* PitchEffect::plugin_title() { return _("Pitch shift"); }
+const char* PitchEffect::plugin_title() { return N_("Pitch shift"); }
 int PitchEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/polar/polar.C b/cinelerra-5.1/plugins/polar/polar.C
index f226720a..3c8ba7a6 100644
--- a/cinelerra-5.1/plugins/polar/polar.C
+++ b/cinelerra-5.1/plugins/polar/polar.C
@@ -282,7 +282,7 @@ PolarEffect::~PolarEffect()
 
 
 
-const char* PolarEffect::plugin_title() { return _("Polar"); }
+const char* PolarEffect::plugin_title() { return N_("Polar"); }
 int PolarEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/radialblur/radialblur.C b/cinelerra-5.1/plugins/radialblur/radialblur.C
index 969b8694..28f532e3 100644
--- a/cinelerra-5.1/plugins/radialblur/radialblur.C
+++ b/cinelerra-5.1/plugins/radialblur/radialblur.C
@@ -380,7 +380,7 @@ RadialBlurMain::~RadialBlurMain()
 	delete rotate;
 }
 
-const char* RadialBlurMain::plugin_title() { return _("Radial Blur"); }
+const char* RadialBlurMain::plugin_title() { return N_("Radial Blur"); }
 int RadialBlurMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/reframe/reframe.C b/cinelerra-5.1/plugins/reframe/reframe.C
index 62b14197..dc3ddda1 100644
--- a/cinelerra-5.1/plugins/reframe/reframe.C
+++ b/cinelerra-5.1/plugins/reframe/reframe.C
@@ -51,7 +51,7 @@ ReFrame::~ReFrame()
 {
 }
 
-const char* ReFrame::plugin_title() { return _("Reframe"); }
+const char* ReFrame::plugin_title() { return N_("Reframe"); }
 
 
 
diff --git a/cinelerra-5.1/plugins/reframert/reframert.C b/cinelerra-5.1/plugins/reframert/reframert.C
index ac5b3846..afacecc9 100644
--- a/cinelerra-5.1/plugins/reframert/reframert.C
+++ b/cinelerra-5.1/plugins/reframert/reframert.C
@@ -387,7 +387,7 @@ ReframeRT::~ReframeRT()
 
 }
 
-const char* ReframeRT::plugin_title() { return _("ReframeRT"); }
+const char* ReframeRT::plugin_title() { return N_("ReframeRT"); }
 int ReframeRT::is_realtime() { return 1; }
 int ReframeRT::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/removegaps/removegaps.C b/cinelerra-5.1/plugins/removegaps/removegaps.C
index 7f99dd13..0a87acca 100644
--- a/cinelerra-5.1/plugins/removegaps/removegaps.C
+++ b/cinelerra-5.1/plugins/removegaps/removegaps.C
@@ -194,7 +194,7 @@ RemoveGaps::~RemoveGaps()
 	delete temp;
 }
 
-const char* RemoveGaps::plugin_title() { return _("Remove Gaps"); }
+const char* RemoveGaps::plugin_title() { return N_("Remove Gaps"); }
 int RemoveGaps::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(RemoveGaps, RemoveGapsWindow)
diff --git a/cinelerra-5.1/plugins/reroute/reroute.C b/cinelerra-5.1/plugins/reroute/reroute.C
index 9a8aa6a0..f236f23e 100644
--- a/cinelerra-5.1/plugins/reroute/reroute.C
+++ b/cinelerra-5.1/plugins/reroute/reroute.C
@@ -468,7 +468,7 @@ int Reroute::process_buffer(VFrame **frame,
 
 
 
-const char* Reroute::plugin_title() { return _("Reroute"); }
+const char* Reroute::plugin_title() { return N_("Reroute"); }
 int Reroute::is_realtime() 		{ return 1; }
 int Reroute::is_multichannel() 	{ return 1; }
 
diff --git a/cinelerra-5.1/plugins/resample/resample.C b/cinelerra-5.1/plugins/resample/resample.C
index 562cbc66..29e6a258 100644
--- a/cinelerra-5.1/plugins/resample/resample.C
+++ b/cinelerra-5.1/plugins/resample/resample.C
@@ -126,7 +126,7 @@ ResampleEffect::~ResampleEffect()
 {
 }
 
-const char* ResampleEffect::plugin_title() { return _("Resample"); }
+const char* ResampleEffect::plugin_title() { return N_("Resample"); }
 
 void ResampleEffect::reset()
 {
diff --git a/cinelerra-5.1/plugins/resamplert/resamplert.C b/cinelerra-5.1/plugins/resamplert/resamplert.C
index 409db6df..9408afaa 100644
--- a/cinelerra-5.1/plugins/resamplert/resamplert.C
+++ b/cinelerra-5.1/plugins/resamplert/resamplert.C
@@ -220,7 +220,7 @@ ResampleRT::~ResampleRT()
 	delete resample;
 }
 
-const char* ResampleRT::plugin_title() { return _("ResampleRT"); }
+const char* ResampleRT::plugin_title() { return N_("ResampleRT"); }
 int ResampleRT::is_realtime() { return 1; }
 int ResampleRT::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/reverb/reverb.C b/cinelerra-5.1/plugins/reverb/reverb.C
index eb60c71d..f1aaadea 100644
--- a/cinelerra-5.1/plugins/reverb/reverb.C
+++ b/cinelerra-5.1/plugins/reverb/reverb.C
@@ -98,7 +98,7 @@ Reverb::~Reverb()
 	}
 }
 
-const char* Reverb::plugin_title() { return _("Reverb"); }
+const char* Reverb::plugin_title() { return N_("Reverb"); }
 int Reverb::is_realtime() { return 1; }
 int Reverb::is_multichannel() { return 1; }
 int Reverb::is_synthesis() { return 1; }
diff --git a/cinelerra-5.1/plugins/reverseaudio/reverseaudio.C b/cinelerra-5.1/plugins/reverseaudio/reverseaudio.C
index 5fe8c49e..ac735cdd 100644
--- a/cinelerra-5.1/plugins/reverseaudio/reverseaudio.C
+++ b/cinelerra-5.1/plugins/reverseaudio/reverseaudio.C
@@ -167,7 +167,7 @@ ReverseAudio::~ReverseAudio()
 
 }
 
-const char* ReverseAudio::plugin_title() { return _("Reverse audio"); }
+const char* ReverseAudio::plugin_title() { return N_("Reverse audio"); }
 int ReverseAudio::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/reversevideo/reversevideo.C b/cinelerra-5.1/plugins/reversevideo/reversevideo.C
index e770c7d0..eaa5b54e 100644
--- a/cinelerra-5.1/plugins/reversevideo/reversevideo.C
+++ b/cinelerra-5.1/plugins/reversevideo/reversevideo.C
@@ -175,7 +175,7 @@ ReverseVideo::~ReverseVideo()
 
 }
 
-const char* ReverseVideo::plugin_title() { return _("Reverse video"); }
+const char* ReverseVideo::plugin_title() { return N_("Reverse video"); }
 int ReverseVideo::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/rgb601/ivtc.C.2 b/cinelerra-5.1/plugins/rgb601/ivtc.C.2
index 5fb34f7e..0435464c 100644
--- a/cinelerra-5.1/plugins/rgb601/ivtc.C.2
+++ b/cinelerra-5.1/plugins/rgb601/ivtc.C.2
@@ -42,7 +42,7 @@ RGB601Main::~RGB601Main()
 	delete defaults;
 }
 
-char* RGB601Main::plugin_title() { return _("Inverse Telecine"); }
+char* RGB601Main::plugin_title() { return "Inverse Telecine"; }
 int RGB601Main::is_realtime() { return 1; }
 
 int RGB601Main::load_defaults()
diff --git a/cinelerra-5.1/plugins/rgb601/rgb601.C b/cinelerra-5.1/plugins/rgb601/rgb601.C
index e04e0f41..988f6ec8 100644
--- a/cinelerra-5.1/plugins/rgb601/rgb601.C
+++ b/cinelerra-5.1/plugins/rgb601/rgb601.C
@@ -51,7 +51,7 @@ RGB601Main::~RGB601Main()
 
 }
 
-const char* RGB601Main::plugin_title() { return _("RGB - 601"); }
+const char* RGB601Main::plugin_title() { return N_("RGB - 601"); }
 int RGB601Main::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/rgbshift/rgbshift.C b/cinelerra-5.1/plugins/rgbshift/rgbshift.C
index 165680a2..1f3d7399 100644
--- a/cinelerra-5.1/plugins/rgbshift/rgbshift.C
+++ b/cinelerra-5.1/plugins/rgbshift/rgbshift.C
@@ -208,7 +208,7 @@ RGBShiftEffect::~RGBShiftEffect()
 	delete temp_frame;
 }
 
-const char* RGBShiftEffect::plugin_title() { return _("RGBShift"); }
+const char* RGBShiftEffect::plugin_title() { return N_("RGBShift"); }
 int RGBShiftEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/rotate/rotate.C b/cinelerra-5.1/plugins/rotate/rotate.C
index e0497d03..4c51276f 100644
--- a/cinelerra-5.1/plugins/rotate/rotate.C
+++ b/cinelerra-5.1/plugins/rotate/rotate.C
@@ -607,7 +607,7 @@ RotateEffect::~RotateEffect()
 
 
 
-const char* RotateEffect::plugin_title() { return _("Rotate"); }
+const char* RotateEffect::plugin_title() { return N_("Rotate"); }
 int RotateEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/rumbler/rumbler.C b/cinelerra-5.1/plugins/rumbler/rumbler.C
index ec822d15..08e3e2a0 100644
--- a/cinelerra-5.1/plugins/rumbler/rumbler.C
+++ b/cinelerra-5.1/plugins/rumbler/rumbler.C
@@ -303,7 +303,7 @@ int Rumbler::handle_opengl()
 }
 
 
-const char* Rumbler::plugin_title() { return _("Rumbler"); }
+const char* Rumbler::plugin_title() { return N_("Rumbler"); }
 int Rumbler::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(Rumbler, RumblerWindow)
diff --git a/cinelerra-5.1/plugins/scale/scale.C b/cinelerra-5.1/plugins/scale/scale.C
index 7b964fcf..2530dfdc 100644
--- a/cinelerra-5.1/plugins/scale/scale.C
+++ b/cinelerra-5.1/plugins/scale/scale.C
@@ -87,7 +87,7 @@ ScaleMain::~ScaleMain()
 	if(overlayer) delete overlayer;
 }
 
-const char* ScaleMain::plugin_title() { return _("Scale"); }
+const char* ScaleMain::plugin_title() { return N_("Scale"); }
 int ScaleMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/scaleratio/scaleratio.C b/cinelerra-5.1/plugins/scaleratio/scaleratio.C
index 52073c10..4c200f8a 100644
--- a/cinelerra-5.1/plugins/scaleratio/scaleratio.C
+++ b/cinelerra-5.1/plugins/scaleratio/scaleratio.C
@@ -93,7 +93,7 @@ ScaleRatioMain::~ScaleRatioMain()
 	overlayer = 0;
 }
 
-const char* ScaleRatioMain::plugin_title() { return _("Scale Ratio"); }
+const char* ScaleRatioMain::plugin_title() { return N_("Scale Ratio"); }
 int ScaleRatioMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/shapewipe/shapewipe.C b/cinelerra-5.1/plugins/shapewipe/shapewipe.C
index bb91c5ec..1f80e288 100644
--- a/cinelerra-5.1/plugins/shapewipe/shapewipe.C
+++ b/cinelerra-5.1/plugins/shapewipe/shapewipe.C
@@ -344,7 +344,7 @@ ShapeWipeMain::~ShapeWipeMain()
 	shape_titles.remove_all_objects();
 }
 
-const char* ShapeWipeMain::plugin_title() { return _("Shape Wipe"); }
+const char* ShapeWipeMain::plugin_title() { return N_("Shape Wipe"); }
 int ShapeWipeMain::is_transition() { return 1; }
 int ShapeWipeMain::uses_gui() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/sharpen/sharpen.C b/cinelerra-5.1/plugins/sharpen/sharpen.C
index f349eba6..4223c10a 100644
--- a/cinelerra-5.1/plugins/sharpen/sharpen.C
+++ b/cinelerra-5.1/plugins/sharpen/sharpen.C
@@ -112,7 +112,7 @@ NEW_WINDOW_MACRO(SharpenMain, SharpenWindow)
 
 LOAD_CONFIGURATION_MACRO(SharpenMain, SharpenConfig)
 
-const char* SharpenMain::plugin_title() { return _("Sharpen"); }
+const char* SharpenMain::plugin_title() { return N_("Sharpen"); }
 int SharpenMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.C b/cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.C
index e7d93e75..90722d6f 100644
--- a/cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.C
+++ b/cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.C
@@ -259,7 +259,7 @@ ShiftInterlaceMain::~ShiftInterlaceMain()
 }
 
 
-const char* ShiftInterlaceMain::plugin_title()  { return _("ShiftInterlace"); }
+const char* ShiftInterlaceMain::plugin_title() { return N_("ShiftInterlace"); }
 int ShiftInterlaceMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/slide/slide.C b/cinelerra-5.1/plugins/slide/slide.C
index 4c918213..6b893f68 100644
--- a/cinelerra-5.1/plugins/slide/slide.C
+++ b/cinelerra-5.1/plugins/slide/slide.C
@@ -207,7 +207,7 @@ SlideMain::~SlideMain()
 
 }
 
-const char* SlideMain::plugin_title() { return _("Slide"); }
+const char* SlideMain::plugin_title() { return N_("Slide"); }
 int SlideMain::is_video() { return 1; }
 int SlideMain::is_transition() { return 1; }
 int SlideMain::uses_gui() { return 1; }
diff --git a/cinelerra-5.1/plugins/spectrogram/spectrogram.C b/cinelerra-5.1/plugins/spectrogram/spectrogram.C
index 4648737b..fc851128 100644
--- a/cinelerra-5.1/plugins/spectrogram/spectrogram.C
+++ b/cinelerra-5.1/plugins/spectrogram/spectrogram.C
@@ -699,7 +699,7 @@ void Spectrogram::reset()
 }
 
 
-const char* Spectrogram::plugin_title() { return _("Spectrogram"); }
+const char* Spectrogram::plugin_title() { return N_("Spectrogram"); }
 int Spectrogram::is_realtime() { return 1; }
 
 int Spectrogram::process_buffer(int64_t size,
diff --git a/cinelerra-5.1/plugins/spherecam/spherecam.C.bak b/cinelerra-5.1/plugins/spherecam/spherecam.C.bak
index 99d40770..865dccf0 100644
--- a/cinelerra-5.1/plugins/spherecam/spherecam.C.bak
+++ b/cinelerra-5.1/plugins/spherecam/spherecam.C.bak
@@ -622,7 +622,7 @@ Fuse360Main::~Fuse360Main()
 NEW_WINDOW_MACRO(Fuse360Main, Fuse360GUI)
 LOAD_CONFIGURATION_MACRO(Fuse360Main, Fuse360Config)
 int Fuse360Main::is_realtime() { return 1; }
-const char* Fuse360Main::plugin_title() { return N_("360 Fuser"); }
+const char* Fuse360Main::plugin_title() { return "360 Fuser"; }
 
 void Fuse360Main::update_gui()
 {
diff --git a/cinelerra-5.1/plugins/svg/svg.C b/cinelerra-5.1/plugins/svg/svg.C
index 9a7f7744..89499d15 100644
--- a/cinelerra-5.1/plugins/svg/svg.C
+++ b/cinelerra-5.1/plugins/svg/svg.C
@@ -97,7 +97,7 @@ SvgMain::~SvgMain()
 	delete overlayer;
 }
 
-const char* SvgMain::plugin_title() { return _("SVG via Inkscape"); }
+const char* SvgMain::plugin_title() { return N_("SVG via Inkscape"); }
 int SvgMain::is_realtime() { return 1; }
 int SvgMain::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/swapchannels/swapchannels.C b/cinelerra-5.1/plugins/swapchannels/swapchannels.C
index 3ea0f900..d8a6543b 100644
--- a/cinelerra-5.1/plugins/swapchannels/swapchannels.C
+++ b/cinelerra-5.1/plugins/swapchannels/swapchannels.C
@@ -208,7 +208,7 @@ void SwapMain::reset()
 }
 
 
-const char* SwapMain::plugin_title()  { return _("Swap channels"); }
+const char* SwapMain::plugin_title() { return N_("Swap channels"); }
 int SwapMain::is_synthesis() { return 1; }
 int SwapMain::is_realtime()  { return 1; }
 
diff --git a/cinelerra-5.1/plugins/swapframes/swapframes.C b/cinelerra-5.1/plugins/swapframes/swapframes.C
index b1f87f5e..d4270c46 100644
--- a/cinelerra-5.1/plugins/swapframes/swapframes.C
+++ b/cinelerra-5.1/plugins/swapframes/swapframes.C
@@ -213,7 +213,7 @@ SwapFrames::~SwapFrames()
 	delete buffer;
 }
 
-const char* SwapFrames::plugin_title() { return _("Swap Frames"); }
+const char* SwapFrames::plugin_title() { return N_("Swap Frames"); }
 int SwapFrames::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(SwapFrames, SwapFramesWindow)
diff --git a/cinelerra-5.1/plugins/synthesizer/synthesizer.C b/cinelerra-5.1/plugins/synthesizer/synthesizer.C
index 5838a48f..d9fe51e2 100644
--- a/cinelerra-5.1/plugins/synthesizer/synthesizer.C
+++ b/cinelerra-5.1/plugins/synthesizer/synthesizer.C
@@ -57,7 +57,7 @@ Synth::~Synth()
 
 NEW_WINDOW_MACRO(Synth, SynthWindow);
 
-const char* Synth::plugin_title() { return _("Synthesizer"); }
+const char* Synth::plugin_title() { return N_("Synthesizer"); }
 int Synth::is_realtime() { return 1; }
 int Synth::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
index de0343ba..dae82726 100644
--- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
@@ -68,10 +68,7 @@ BlondThemeMain::~BlondThemeMain()
 {
 }
 
-const char* BlondThemeMain::plugin_title()
-{
-	return _("Blond");
-}
+const char* BlondThemeMain::plugin_title() { return N_("Blond"); }
 
 Theme* BlondThemeMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index 6c7a0732..be0e7a73 100644
--- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
@@ -67,10 +67,7 @@ BlondCVThemeMain::~BlondCVThemeMain()
 {
 }
 
-const char* BlondCVThemeMain::plugin_title()
-{
-	return _("Blond-cv");
-}
+const char* BlondCVThemeMain::plugin_title() { return N_("Blond-cv"); }
 
 Theme* BlondCVThemeMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig
index 4551451e..8aff33a4 100644
--- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig
+++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig
@@ -66,10 +66,7 @@ BlondThemeMain::~BlondThemeMain()
 {
 }
 
-const char* BlondThemeMain::plugin_title()
-{
-	return _("Blond-cv");
-}
+const char* BlondThemeMain::plugin_title() { return "Blond-cv"; }
 
 Theme* BlondThemeMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_blue/bluetheme.C b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
index c66ff351..1e190855 100644
--- a/cinelerra-5.1/plugins/theme_blue/bluetheme.C
+++ b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
@@ -68,10 +68,7 @@ BlueDotThemeMain::~BlueDotThemeMain()
 {
 }
 
-const char* BlueDotThemeMain::plugin_title()
-{
-	return _("Blue");
-}
+const char* BlueDotThemeMain::plugin_title() { return N_("Blue"); }
 
 Theme* BlueDotThemeMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
index b2cb0e7b..1eed422d 100644
--- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
+++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
@@ -70,10 +70,7 @@ BlueDotThemeMain::~BlueDotThemeMain()
 {
 }
 
-const char* BlueDotThemeMain::plugin_title()
-{
-	return _("Blue Dot");
-}
+const char* BlueDotThemeMain::plugin_title() { return N_("Blue Dot"); }
 
 Theme* BlueDotThemeMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
index 9e02df4a..2ad0b127 100644
--- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C
+++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
@@ -66,10 +66,7 @@ BrightThemeMain::~BrightThemeMain()
 {
 }
 
-const char* BrightThemeMain::plugin_title()
-{
-	return _("Bright");
-}
+const char* BrightThemeMain::plugin_title() { return N_("Bright"); }
 
 Theme* BrightThemeMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index f05a9829..2309ff03 100644
--- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
+++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
@@ -69,10 +69,7 @@ HULKTHEMEMain::~HULKTHEMEMain()
 {
 }
 
-const char* HULKTHEMEMain::plugin_title()
-{
-	return _("Hulk");
-}
+const char* HULKTHEMEMain::plugin_title() { return N_("Hulk"); }
 
 Theme* HULKTHEMEMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
index 094796ad..4007c355 100644
--- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
+++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
@@ -60,10 +60,7 @@ PINKLADYMain::~PINKLADYMain()
 {
 }
 
-const char* PINKLADYMain::plugin_title()
-{
-	return _("PinkLady");
-}
+const char* PINKLADYMain::plugin_title() { return N_("PinkLady"); }
 
 Theme* PINKLADYMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_suv/suv.C b/cinelerra-5.1/plugins/theme_suv/suv.C
index 5f66b154..55ab0f87 100644
--- a/cinelerra-5.1/plugins/theme_suv/suv.C
+++ b/cinelerra-5.1/plugins/theme_suv/suv.C
@@ -65,11 +65,7 @@ SUVMain::SUVMain(PluginServer *server)
 SUVMain::~SUVMain()
 {
 }
-
-const char* SUVMain::plugin_title()
-{
-	return _("S.U.V.");
-}
+const char* SUVMain::plugin_title() { return N_("S.U.V."); }
 
 Theme* SUVMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index 3273ed89..5649253d 100644
--- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@ -63,10 +63,7 @@ UNFLATTHEMEMain::~UNFLATTHEMEMain()
 {
 }
 
-const char* UNFLATTHEMEMain::plugin_title()
-{
-	return _("UnFlat");
-}
+const char* UNFLATTHEMEMain::plugin_title() { return N_("UnFlat"); }
 
 Theme* UNFLATTHEMEMain::new_theme()
 {
diff --git a/cinelerra-5.1/plugins/threshold/threshold.C b/cinelerra-5.1/plugins/threshold/threshold.C
index 13231b6e..402ba598 100644
--- a/cinelerra-5.1/plugins/threshold/threshold.C
+++ b/cinelerra-5.1/plugins/threshold/threshold.C
@@ -127,7 +127,7 @@ ThresholdMain::~ThresholdMain()
 	delete threshold_engine;
 }
 
-const char* ThresholdMain::plugin_title() { return _("Threshold"); }
+const char* ThresholdMain::plugin_title() { return N_("Threshold"); }
 int ThresholdMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/timeavg/timeavg.C b/cinelerra-5.1/plugins/timeavg/timeavg.C
index 0de40c2d..2061c81c 100644
--- a/cinelerra-5.1/plugins/timeavg/timeavg.C
+++ b/cinelerra-5.1/plugins/timeavg/timeavg.C
@@ -116,7 +116,7 @@ TimeAvgMain::~TimeAvgMain()
 	if(history_valid) delete [] history_valid;
 }
 
-const char* TimeAvgMain::plugin_title() { return _("Time Average"); }
+const char* TimeAvgMain::plugin_title() { return N_("Time Average"); }
 int TimeAvgMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/timefront/timefront.C b/cinelerra-5.1/plugins/timefront/timefront.C
index 2fdfab31..2227f7ad 100644
--- a/cinelerra-5.1/plugins/timefront/timefront.C
+++ b/cinelerra-5.1/plugins/timefront/timefront.C
@@ -647,7 +647,7 @@ TimeFrontMain::~TimeFrontMain()
 	if(overlayer) delete overlayer;
 }
 
-const char* TimeFrontMain::plugin_title() { return _("TimeFront"); }
+const char* TimeFrontMain::plugin_title() { return N_("TimeFront"); }
 int TimeFrontMain::is_realtime() { return 1; }
 int TimeFrontMain::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/timestretch/timestretch.C b/cinelerra-5.1/plugins/timestretch/timestretch.C
index b23954a2..780c452a 100644
--- a/cinelerra-5.1/plugins/timestretch/timestretch.C
+++ b/cinelerra-5.1/plugins/timestretch/timestretch.C
@@ -351,7 +351,7 @@ TimeStretch::~TimeStretch()
 
 
 
-const char* TimeStretch::plugin_title() { return _("Time stretch"); }
+const char* TimeStretch::plugin_title() { return N_("Time stretch"); }
 
 int TimeStretch::get_parameters()
 {
diff --git a/cinelerra-5.1/plugins/timestretchrt/timestretchrt.C b/cinelerra-5.1/plugins/timestretchrt/timestretchrt.C
index 89b7efa4..84a86578 100644
--- a/cinelerra-5.1/plugins/timestretchrt/timestretchrt.C
+++ b/cinelerra-5.1/plugins/timestretchrt/timestretchrt.C
@@ -222,7 +222,7 @@ TimeStretchRT::~TimeStretchRT()
 	delete engine;
 }
 
-const char* TimeStretchRT::plugin_title() { return _("Time Stretch RT"); }
+const char* TimeStretchRT::plugin_title() { return N_("Time Stretch RT"); }
 int TimeStretchRT::is_realtime() { return 1; }
 int TimeStretchRT::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/titler/titler.C b/cinelerra-5.1/plugins/titler/titler.C
index 27ed9a1f..940462b1 100644
--- a/cinelerra-5.1/plugins/titler/titler.C
+++ b/cinelerra-5.1/plugins/titler/titler.C
@@ -1144,7 +1144,7 @@ TitleMain::~TitleMain()
 	delete outline_engine;
 }
 
-const char* TitleMain::plugin_title() { return C_("Title"); }
+const char* TitleMain::plugin_title() { return N_("Title"); }
 int TitleMain::is_realtime() { return 1; }
 int TitleMain::is_synthesis() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/translate/translate.C b/cinelerra-5.1/plugins/translate/translate.C
index ce112b04..e69f8087 100644
--- a/cinelerra-5.1/plugins/translate/translate.C
+++ b/cinelerra-5.1/plugins/translate/translate.C
@@ -112,7 +112,7 @@ TranslateMain::~TranslateMain()
 	overlayer = 0;
 }
 
-const char* TranslateMain::plugin_title() { return _("Translate"); }
+const char* TranslateMain::plugin_title() { return N_("Translate"); }
 int TranslateMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/unsharp/unsharp.C b/cinelerra-5.1/plugins/unsharp/unsharp.C
index 5e5c61b8..96364d9a 100644
--- a/cinelerra-5.1/plugins/unsharp/unsharp.C
+++ b/cinelerra-5.1/plugins/unsharp/unsharp.C
@@ -102,7 +102,7 @@ UnsharpMain::~UnsharpMain()
 	delete engine;
 }
 
-const char* UnsharpMain::plugin_title() { return _("Unsharp"); }
+const char* UnsharpMain::plugin_title() { return N_("Unsharp"); }
 int UnsharpMain::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/videoscope/videoscope.C b/cinelerra-5.1/plugins/videoscope/videoscope.C
index 57722432..0744e83c 100644
--- a/cinelerra-5.1/plugins/videoscope/videoscope.C
+++ b/cinelerra-5.1/plugins/videoscope/videoscope.C
@@ -235,7 +235,7 @@ VideoScopeEffect::~VideoScopeEffect()
 
 
 
-const char* VideoScopeEffect::plugin_title() { return _("VideoScope"); }
+const char* VideoScopeEffect::plugin_title() { return N_("VideoScope"); }
 int VideoScopeEffect::is_realtime() { return 1; }
 
 int VideoScopeEffect::load_configuration()
diff --git a/cinelerra-5.1/plugins/vocoder/vocoder.C b/cinelerra-5.1/plugins/vocoder/vocoder.C
index 17a1de09..8e117296 100644
--- a/cinelerra-5.1/plugins/vocoder/vocoder.C
+++ b/cinelerra-5.1/plugins/vocoder/vocoder.C
@@ -360,7 +360,7 @@ NEW_WINDOW_MACRO(Vocoder, VocoderWindow)
 LOAD_CONFIGURATION_MACRO(Vocoder, VocoderConfig)
 
 
-const char* Vocoder::plugin_title() { return _("Vocoder"); }
+const char* Vocoder::plugin_title() { return N_("Vocoder"); }
 int Vocoder::is_realtime() { return 1; }
 int Vocoder::is_multichannel() { return 1; }
 
diff --git a/cinelerra-5.1/plugins/wave/wave.C b/cinelerra-5.1/plugins/wave/wave.C
index 82b750ce..5e2ab3a4 100644
--- a/cinelerra-5.1/plugins/wave/wave.C
+++ b/cinelerra-5.1/plugins/wave/wave.C
@@ -443,7 +443,7 @@ WaveEffect::~WaveEffect()
 }
 
 
-const char* WaveEffect::plugin_title() { return _("Wave"); }
+const char* WaveEffect::plugin_title() { return N_("Wave"); }
 int WaveEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/whirl/whirl.C b/cinelerra-5.1/plugins/whirl/whirl.C
index 3b034490..25be3bc9 100644
--- a/cinelerra-5.1/plugins/whirl/whirl.C
+++ b/cinelerra-5.1/plugins/whirl/whirl.C
@@ -363,7 +363,7 @@ WhirlEffect::~WhirlEffect()
 
 
 
-const char* WhirlEffect::plugin_title() { return _("Whirl"); }
+const char* WhirlEffect::plugin_title() { return N_("Whirl"); }
 int WhirlEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/whirl/whirl.h b/cinelerra-5.1/plugins/whirl/whirl.h
index 476de689..04ea8165 100644
--- a/cinelerra-5.1/plugins/whirl/whirl.h
+++ b/cinelerra-5.1/plugins/whirl/whirl.h
@@ -44,7 +44,7 @@ public:
 	int process_realtime(long size, VFrame **input_ptr, VFrame **output_ptr);
 	int plugin_is_realtime();
 	int plugin_is_multi_channel();
-	char* plugin_title();
+	const char* plugin_title();
 	int start_realtime();
 	int stop_realtime();
 	PluginClientWindow* new_window();
diff --git a/cinelerra-5.1/plugins/wipe/wipe.C b/cinelerra-5.1/plugins/wipe/wipe.C
index c7e89cab..71b1d722 100644
--- a/cinelerra-5.1/plugins/wipe/wipe.C
+++ b/cinelerra-5.1/plugins/wipe/wipe.C
@@ -143,7 +143,7 @@ WipeMain::~WipeMain()
 
 }
 
-const char* WipeMain::plugin_title() { return _("Wipe"); }
+const char* WipeMain::plugin_title() { return N_("Wipe"); }
 int WipeMain::is_video() { return 1; }
 int WipeMain::is_transition() { return 1; }
 int WipeMain::uses_gui() { return 1; }
diff --git a/cinelerra-5.1/plugins/yuv/yuv.C b/cinelerra-5.1/plugins/yuv/yuv.C
index 83f7f03c..c6b73134 100644
--- a/cinelerra-5.1/plugins/yuv/yuv.C
+++ b/cinelerra-5.1/plugins/yuv/yuv.C
@@ -206,7 +206,7 @@ YUVEffect::~YUVEffect()
 
 }
 
-const char* YUVEffect::plugin_title() { return _("YUV"); }
+const char* YUVEffect::plugin_title() { return N_("YUV"); }
 int YUVEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/yuv411/yuv411.C b/cinelerra-5.1/plugins/yuv411/yuv411.C
index 84ead782..79ca1859 100644
--- a/cinelerra-5.1/plugins/yuv411/yuv411.C
+++ b/cinelerra-5.1/plugins/yuv411/yuv411.C
@@ -70,7 +70,7 @@ yuv411Main::~yuv411Main()
 	delete temp_frame;
 }
 
-const char *yuv411Main::plugin_title() { return _("YUV411"); }
+const char *yuv411Main::plugin_title() { return N_("YUV411"); }
 int yuv411Main::is_realtime() { return 1; }
 
 #define YUV411_MACRO(type, components) \
diff --git a/cinelerra-5.1/plugins/yuvshift/yuvshift.C b/cinelerra-5.1/plugins/yuvshift/yuvshift.C
index 558c4804..7298efcb 100644
--- a/cinelerra-5.1/plugins/yuvshift/yuvshift.C
+++ b/cinelerra-5.1/plugins/yuvshift/yuvshift.C
@@ -208,7 +208,7 @@ YUVShiftEffect::~YUVShiftEffect()
 	delete temp_frame;
 }
 
-const char* YUVShiftEffect::plugin_title() { return _("YUVShift"); }
+const char* YUVShiftEffect::plugin_title() { return N_("YUVShift"); }
 int YUVShiftEffect::is_realtime() { return 1; }
 
 
diff --git a/cinelerra-5.1/plugins/zoom/zoom.C b/cinelerra-5.1/plugins/zoom/zoom.C
index b5c74d03..c9c4301f 100644
--- a/cinelerra-5.1/plugins/zoom/zoom.C
+++ b/cinelerra-5.1/plugins/zoom/zoom.C
@@ -144,7 +144,7 @@ ZoomMain::~ZoomMain()
 	delete temp;
 }
 
-const char* ZoomMain::plugin_title() { return _("Zoom"); }
+const char* ZoomMain::plugin_title() { return N_("Zoom"); }
 int ZoomMain::is_video() { return 1; }
 int ZoomMain::is_transition() { return 1; }
 int ZoomMain::uses_gui() { return 1; }
diff --git a/cinelerra-5.1/plugins/zoomblur/zoomblur.C b/cinelerra-5.1/plugins/zoomblur/zoomblur.C
index aa7e87b1..4499ea29 100644
--- a/cinelerra-5.1/plugins/zoomblur/zoomblur.C
+++ b/cinelerra-5.1/plugins/zoomblur/zoomblur.C
@@ -399,7 +399,7 @@ ZoomBlurMain::~ZoomBlurMain()
 	if(temp) delete temp;
 }
 
-const char* ZoomBlurMain::plugin_title() { return _("Zoom Blur"); }
+const char* ZoomBlurMain::plugin_title() { return N_("Zoom Blur"); }
 int ZoomBlurMain::is_realtime() { return 1; }