--- hv/cinelerra/adeviceprefs.C 2003-11-08 01:29:49.000000000 +0100 +++ hvirtual-1.1.8/cinelerra/adeviceprefs.C 2003-12-15 17:20:41.000000000 +0100 @@ -365,8 +365,8 @@ output_int = &out_config->alsa_out_channels; break; } - dialog->add_subwindow(channels_title = new BC_Title(x1, y, "Channels:", MEDIUMFONT, BLACK)); - dialog->add_subwindow(alsa_channels = new ALSAChannels(x1, y1 + 20, output_int)); + dialog->add_subwindow(channels_title = new BC_Title(x1, y, _("Channels:"), MEDIUMFONT, BLACK)); + dialog->add_subwindow(alsa_channels = new ADeviceIntBox(x1, y1 + 20, output_int)); y1 += DEVICE_H; #endif --- hv/cinelerra/browsebutton.C 2003-10-17 07:18:30.000000000 +0200 +++ hvirtual-1.1.8/cinelerra/browsebutton.C 2003-12-15 17:20:44.000000000 +0100 @@ -26,7 +26,7 @@ this->init_directory = init_directory; this->textbox = textbox; this->mwindow = mwindow; - set_tooltip("Look for file"); + set_tooltip(_("Look for file")); gui = 0; startup_lock = new Mutex; } --- hv/cinelerra/confirmsave.C 2003-10-16 07:51:53.000000000 +0200 +++ hvirtual-1.1.8/cinelerra/confirmsave.C 2003-12-15 17:20:48.000000000 +0100 @@ -1,5 +1,6 @@ #include "asset.h" #include "confirmsave.h" +#include "language.h" #include "mwindow.h" #include "mwindowgui.h" @@ -86,7 +87,7 @@ int x = 10, y = 10; add_subwindow(title = new BC_Title(5, 5, - "The following files exist. Overwrite them?")); + _("The following files exist. Overwrite them?"))); y += 30; add_subwindow(listbox = new BC_ListBox(x, y, --- hv/cinelerra/mainindexes.C 2003-10-16 07:51:53.000000000 +0200 +++ hvirtual-1.1.8/cinelerra/mainindexes.C 2003-12-15 17:20:59.000000000 +0100 @@ -4,6 +4,7 @@ #include "filesystem.h" #include "indexfile.h" #include "condition.h" +#include "language.h" #include "loadfile.h" #include "guicast.h" #include "mainindexes.h" @@ -13,10 +14,6 @@ #include -#include -#define _(String) gettext(String) -#define gettext_noop(String) String -#define N_(String) gettext_noop (String) MainIndexes::MainIndexes(MWindow *mwindow) : Thread() @@ -167,7 +164,7 @@ if(!progress) { if(mwindow->gui) mwindow->gui->lock_window("MainIndexes::run 1"); - progress = mwindow->mainprogress->start_progress("Building Indexes...", 1); + progress = mwindow->mainprogress->start_progress(_("Building Indexes..."), 1); if(mwindow->gui) mwindow->gui->unlock_window(); } --- hv/cinelerra/menueffects.C 2003-10-17 06:48:03.000000000 +0200 +++ hvirtual-1.1.8/cinelerra/menueffects.C 2003-12-15 17:20:59.000000000 +0100 @@ -453,7 +453,7 @@ mwindow->edl->session->frame_rate)) { // open failed - sprintf(string, "Couldn't open %s", asset->path); + sprintf(string, _("Couldn't open %s"), asset->path); ErrorBox error(PROGRAM_NAME ": Error"); error.create_objects(string); error.run_window(); --- hv/cinelerra/mwindowedit.C 2003-11-10 11:34:56.000000000 +0100 +++ hvirtual-1.1.8/cinelerra/mwindowedit.C 2003-12-15 17:20:59.000000000 +0100 @@ -14,6 +14,7 @@ #include "filexml.h" #include "keyframe.h" #include "labels.h" +#include "language.h" #include "levelwindow.h" #include "localsession.h" #include "mainclock.h" @@ -52,7 +53,7 @@ void MWindow::add_audio_track_entry(int above, Track *dst) { - undo->update_undo_before("add track", LOAD_ALL); + undo->update_undo_before(_("add track"), LOAD_ALL); add_audio_track(above, dst); save_backup(); undo->update_undo_after(); @@ -1824,7 +1825,7 @@ void MWindow::trim_selection() { - undo->update_undo_before("trim selection", LOAD_EDITS | LOAD_TIMEBAR); + undo->update_undo_before(_("trim selection"), LOAD_EDITS | LOAD_TIMEBAR); edl->trim_selection(edl->local_session->get_selectionstart(), --- hv/cinelerra/render.C 2003-11-04 09:22:16.000000000 +0100 +++ hvirtual-1.1.8/cinelerra/render.C 2003-12-15 17:21:00.000000000 +0100 @@ -868,8 +878,8 @@ y, (char*)((render->strategy == FILE_PER_LABEL || render->strategy == FILE_PER_LABEL_FARM) ? - "Select the first file to render to:" : - "Select a file to render to:"))); + _("Select the first file to render to:") : + _("Select a file to render to:")))); y += 25; format_tools = new FormatTools(mwindow, --- hv/cinelerra/mwindow.C 2003-11-10 11:39:05.000000000 +0100 +++ hvirtual-1.1.8/cinelerra/mwindow.C 2003-12-21 15:22:26.000000000 +0100 @@ -1022,7 +1022,7 @@ init_preferences(); TRACE("MWindow::create_objects 1"); init_plugins(preferences, plugindb, splash_window); - if(splash_window) splash_window->operation->update("Initializing GUI"); + if(splash_window) splash_window->operation->update(_("Initializing GUI")); TRACE("MWindow::create_objects 1"); init_theme(); // Default project created here --- hv/cinelerra/vpatchgui.C 2003-11-08 03:00:46.000000000 +0100 +++ hvirtual-1.1.8/cinelerra/vpatchgui.C 2003-12-15 17:21:00.000000000 +0100 @@ -327,31 +327,31 @@ switch(mode) { case TRANSFER_NORMAL: - return "Normal"; + return _("Normal"); break; case TRANSFER_REPLACE: - return "Replace"; + return _("Replace"); break; case TRANSFER_ADDITION: - return "Addition"; + return _("Addition"); break; case TRANSFER_SUBTRACT: - return "Subtract"; + return _("Subtract"); break; case TRANSFER_MULTIPLY: - return "Multiply"; + return _("Multiply"); break; case TRANSFER_DIVIDE: - return "Divide"; + return _("Divide"); break; default: - return "Normal"; + return _("Normal"); break; } return ""; --- hv/plugins/burn/burnwindow.C 2003-10-14 09:54:17.000000000 +0200 +++ hvirtual-1.1.8/plugins/burn/burnwindow.C 2003-10-12 19:36:27.000000000 +0200 @@ -2,6 +2,10 @@ #include "burnwindow.h" +#include +#define _(String) gettext(String) +#define gettext_noop(String) String +#define N_(String) gettext_noop (String) @@ -35,8 +39,8 @@ { int x = 10, y = 10; add_subwindow(new BC_Title(x, y, - "BurningTV from EffectTV\n" - "Copyright (C) 2001 FUKUCHI Kentarou" + _("BurningTV from EffectTV\n" + "Copyright (C) 2001 FUKUCHI Kentarou") )); show_window(); --- hv/plugins/delayvideo/delayvideo.C 2003-10-16 08:05:13.000000000 +0200 +++ hvirtual-1.1.8/plugins/delayvideo/delayvideo.C 2003-10-13 00:19:56.000000000 +0200 @@ -293,7 +293,7 @@ char* DelayVideo::plugin_title() { - return "Delay Video"; + return _("Delay Video"); } SET_STRING_MACRO(DelayVideo) --- hv/plugins/gradient/gradient.C 2003-10-16 08:05:13.000000000 +0200 +++ hvirtual-1.1.8/plugins/gradient/gradient.C 2003-12-15 17:21:20.000000000 +0100 @@ -328,7 +328,7 @@ GradientOutColorThread::GradientOutColorThread(GradientMain *plugin, GradientWindow *window) - : ColorThread(1, "Outer color") + : ColorThread(1, _("Outer color")) { this->plugin = plugin; this->window = window; --- hv/plugins/rotate/rotate.C 2003-10-16 08:05:36.000000000 +0200 +++ hvirtual-1.1.8/plugins/rotate/rotate.C 2003-12-15 17:21:21.000000000 +0100 @@ -375,7 +375,7 @@ y += fine->get_h() + 10; add_tool(text = new RotateText(this, plugin, x, y)); y += 30; - add_tool(new BC_Title(x, y, "Angle")); + add_tool(new BC_Title(x, y, _("Angle")));