Merge master.

9 files changed, 402 insertions, 170 deletions

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 4c50260fa..bfd92f0b6 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -35,7 +35,7 @@ AudioDialog::AudioDialog (wxWindow* parent)
 	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
 
 	_plot = new AudioPlot (this);
-	sizer->Add (_plot, 1, wxALL, 12);
+	sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
 
 	wxBoxSizer* side = new wxBoxSizer (wxVERTICAL);
 
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 071393139..feb49ed78 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -146,7 +146,7 @@ FilmEditor::make_film_panel ()
 	}
 	++r;
 
-	_frame_rate_description = new wxStaticText (_film_panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize);
+	_frame_rate_description = new wxStaticText (_film_panel, wxID_ANY, wxT (" \n \n "), wxDefaultPosition, wxDefaultSize);
 	grid->Add (_frame_rate_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
 	wxFont font = _frame_rate_description->GetFont();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
@@ -248,14 +248,6 @@ FilmEditor::make_video_panel ()
 	grid->Add (_format, wxGBPosition (r, 1));
 	++r;
 
-	_format_description = new wxStaticText (_video_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize);
-	grid->Add (_format_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
-	wxFont font = _format_description->GetFont();
-	font.SetStyle(wxFONTSTYLE_ITALIC);
-	font.SetPointSize(font.GetPointSize() - 1);
-	_format_description->SetFont(font);
-	++r;
-
 	add_label_to_grid_bag_sizer (grid, _video_panel, _("Left crop"), wxGBPosition (r, 0));
 	_left_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
 	grid->Add (_left_crop, wxGBPosition (r, 1));
@@ -276,6 +268,14 @@ FilmEditor::make_video_panel ()
 	grid->Add (_bottom_crop, wxGBPosition (r, 1));
 	++r;
 
+	_scaling_description = new wxStaticText (_video_panel, wxID_ANY, wxT ("\n \n \n \n"), wxDefaultPosition, wxDefaultSize);
+	grid->Add (_scaling_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+	wxFont font = _scaling_description->GetFont();
+	font.SetStyle(wxFONTSTYLE_ITALIC);
+	font.SetPointSize(font.GetPointSize() - 1);
+	_scaling_description->SetFont(font);
+	++r;
+
 	/* VIDEO-only stuff */
 	{
 		add_label_to_grid_bag_sizer (grid, _video_panel, _("Filters"), wxGBPosition (r, 0));
@@ -430,9 +430,14 @@ FilmEditor::make_subtitle_panel ()
 	_ffmpeg_subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
 	grid->Add (_ffmpeg_subtitle_stream);
 
-	add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Offset"));
-	_subtitle_offset = new wxSpinCtrl (_subtitle_panel);
-	grid->Add (_subtitle_offset, 1);
+	{
+		add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Offset"));
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_subtitle_offset = new wxSpinCtrl (_subtitle_panel);
+		s->Add (_subtitle_offset);
+		add_label_to_sizer (s, _subtitle_panel, _("pixels"));
+		grid->Add (s);
+	}
 
 	{
 		add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Scale"));
@@ -603,7 +608,6 @@ FilmEditor::film_changed (Film::Property p)
 		setup_subtitle_control_sensitivity ();
 		setup_streams ();
 		setup_show_audio_sensitivity ();
-		setup_length ();
 		break;
 	case Film::TRUST_CONTENT_HEADERS:
 		checked_set (_trust_content_headers, _film->trust_content_headers ());
@@ -616,6 +620,7 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_right_crop, _film->crop().right);
 		checked_set (_top_crop, _film->crop().top);
 		checked_set (_bottom_crop, _film->crop().bottom);
+		setup_scaling_description ();
 		break;
 	case Film::FILTERS:
 	{
@@ -690,12 +695,11 @@ FilmEditor::film_changed (Film::Property p)
 		}
 
 		if (_film->video_frame_rate()) {
-			_frame_rate_description->SetLabel (std_to_wx (FrameRateConversion (_film->video_frame_rate(), _film->dcp_frame_rate()).description));
 			_best_dcp_frame_rate->Enable (best_dcp_frame_rate (_film->video_frame_rate ()) != _film->dcp_frame_rate ());
 		} else {
-			_frame_rate_description->SetLabel (wxT (""));
 			_best_dcp_frame_rate->Disable ();
 		}
+		setup_frame_rate_description ();
 		break;
 	case Film::AUDIO_MAPPING:
 		_audio_mapping->set_mapping (_film->audio_mapping ());
@@ -748,18 +752,15 @@ FilmEditor::setup_format ()
 		++i;
 		++n;
 	}
+	
 	if (i == _formats.end()) {
 		checked_set (_format, -1);
 	} else {
 		checked_set (_format, n);
 	}
-	setup_dcp_name ();
 	
-	if (_film->format ()) {
-		_format_description->SetLabel (std_to_wx (_film->format()->description ()));
-	} else {
-		_format_description->SetLabel (wxT (""));
-	}
+	setup_dcp_name ();
+	setup_scaling_description ();
 }	
 
 void
@@ -780,6 +781,29 @@ FilmEditor::setup_length ()
 	}
 }	
 
+void
+FilmEditor::setup_frame_rate_description ()
+{
+	wxString d;
+	if (_film->video_frame_rate()) {
+		d << std_to_wx (FrameRateConversion (_film->video_frame_rate(), _film->dcp_frame_rate()).description);
+#ifdef HAVE_SWRESAMPLE
+		if (_film->audio_frame_rate() != _film->target_audio_sample_rate ()) {
+			d << wxString::Format (
+				_("Audio will be resampled from %dHz to %dHz\n"),
+				_film->audio_frame_rate(),
+				_film->target_audio_sample_rate()
+				);
+		} else {
+			d << "\n";
+		}
+#else
+		d << "\n";
+#endif		
+	}
+
+	_frame_rate_description->SetLabel (d);
+}
 
 /** Called when the format widget has been changed */
 void
@@ -814,14 +838,14 @@ FilmEditor::dcp_content_type_changed (wxCommandEvent &)
 void
 FilmEditor::set_film (shared_ptr<Film> f)
 {
+	set_things_sensitive (_film != 0);
+
 	if (_film == f) {
 		return;
 	}
 	
 	_film = f;
 
-	set_things_sensitive (_film != 0);
-
 	if (_film) {
 		_film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
 		_film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _1, _2));
@@ -950,6 +974,24 @@ FilmEditor::audio_delay_changed (wxCommandEvent &)
 }
 
 void
+FilmEditor::setup_notebook_size ()
+{
+	_notebook->InvalidateBestSize ();
+	
+	_film_sizer->Layout ();
+	_film_sizer->SetSizeHints (_film_panel);
+	_video_sizer->Layout ();
+	_video_sizer->SetSizeHints (_video_panel);
+	_audio_sizer->Layout ();
+	_audio_sizer->SetSizeHints (_audio_panel);
+	_subtitle_sizer->Layout ();
+	_subtitle_sizer->SetSizeHints (_subtitle_panel);
+
+	_notebook->Fit ();
+	Fit ();
+}
+
+void
 FilmEditor::trim_start_changed (wxCommandEvent &)
 {
 	if (!_film) {
@@ -1136,15 +1178,17 @@ FilmEditor::setup_audio_details ()
 	if (!_film->ffmpeg_audio_stream()) {
 		_audio->SetLabel (wxT (""));
 	} else {
-		stringstream s;
+		wxString s;
 		if (_film->audio_channels() == 1) {
-			s << wx_to_std (_("1 channel"));
+			s << _("1 channel");
 		} else {
-			s << _film->audio_channels() << " " << wx_to_std (_("channels"));
+			s << _film->audio_channels() << " " << _("channels");
 		}
-		s << ", " << _film->audio_frame_rate() << wx_to_std (_("Hz"));
-		_audio->SetLabel (std_to_wx (s.str ()));
+		s << ", " << _film->audio_frame_rate() << _("Hz");
+		_audio->SetLabel (s);
 	}
+
+	setup_notebook_size ();
 }
 
 void
@@ -1350,3 +1394,58 @@ FilmEditor::selected_content ()
 	
 	return c[s];
 }
+
+void
+FilmEditor::setup_scaling_description ()
+{
+	wxString d;
+
+	int lines = 0;
+
+	d << wxString::Format (
+		_("Original video is %dx%d (%.2f:1)\n"),
+		_film->video_size().width, _film->video_size().height,
+		float (_film->video_size().width) / _film->video_size().height
+		);
+
+	++lines;
+
+	Crop const crop = _film->crop ();
+	if (crop.left || crop.right || crop.top || crop.bottom) {
+		libdcp::Size const cropped = _film->cropped_size (_film->video_size ());
+		d << wxString::Format (
+			_("Cropped to %dx%d (%.2f:1)\n"),
+			cropped.width, cropped.height,
+			float (cropped.width) / cropped.height
+			);
+		++lines;
+	}
+
+	Format const * format = _film->format ();
+	if (format) {
+		int const padding = format->dcp_padding (_film);
+		libdcp::Size scaled = format->dcp_size ();
+		scaled.width -= padding * 2;
+		d << wxString::Format (
+			_("Scaled to %dx%d (%.2f:1)\n"),
+			scaled.width, scaled.height,
+			float (scaled.width) / scaled.height
+			);
+		++lines;
+
+		if (padding) {
+			d << wxString::Format (
+				_("Padded with black to %dx%d (%.2f:1)\n"),
+				format->dcp_size().width, format->dcp_size().height,
+				float (format->dcp_size().width) / format->dcp_size().height
+				);
+			++lines;
+		}
+	}
+
+	for (int i = lines; i < 4; ++i) {
+		d << " \n";
+	}
+
+	_scaling_description->SetLabel (d);
+}
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index bc6b045c4..0f3d8eb50 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -104,11 +104,14 @@ private:
 	void setup_audio_details ();
 	void setup_dcp_name ();
 	void setup_show_audio_sensitivity ();
+	void setup_scaling_description ();
+	void setup_notebook_size ();
+	void setup_frame_rate_description ();
 	void setup_content ();
-	void setup_content_button_sensitivity ();
-	void setup_length ();
 	void setup_format ();
+	void setup_length ();
 	void setup_content_information ();
+	void setup_content_button_sensitivity ();
 	
 	void active_jobs_changed (bool);
 	boost::shared_ptr<Content> selected_content ();
@@ -143,6 +146,7 @@ private:
 	wxChoice* _format;
 	wxStaticText* _format_description;
 	wxCheckBox* _trust_content_headers;
+	wxStaticText* _scaling_description;
 	wxSpinCtrl* _left_crop;
 	wxSpinCtrl* _right_crop;
 	wxSpinCtrl* _top_crop;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index bd56efd57..f8373d3fd 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -58,7 +58,6 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
 	, _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
 	, _display_frame_x (0)
 	, _got_frame (false)
-	, _clear_required (false)
 {
 	_panel->SetDoubleBuffered (true);
 #if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
@@ -193,11 +192,6 @@ FilmViewer::paint_panel (wxPaintEvent &)
 {
 	wxPaintDC dc (_panel);
 
-	if (_clear_required) {
-		dc.Clear ();
-		_clear_required = false;
-	}
-
 	if (!_display_frame || !_film || !_out_size.width || !_out_size.height) {
 		dc.Clear ();
 		return;
@@ -219,6 +213,22 @@ FilmViewer::paint_panel (wxPaintEvent &)
 		wxBitmap sub_bitmap (sub);
 		dc.DrawBitmap (sub_bitmap, _display_sub_position.x, _display_sub_position.y);
 	}
+
+	if (_film_size.width < _panel_size.width) {
+		wxPen p (GetBackgroundColour ());
+		wxBrush b (GetBackgroundColour ());
+		dc.SetPen (p);
+		dc.SetBrush (b);
+		dc.DrawRectangle (_film_size.width, 0, _panel_size.width - _film_size.width, _panel_size.height);
+	}
+
+	if (_film_size.height < _panel_size.height) {
+		wxPen p (GetBackgroundColour ());
+		wxBrush b (GetBackgroundColour ());
+		dc.SetPen (p);
+		dc.SetBrush (b);
+		dc.DrawRectangle (0, _film_size.height, _panel_size.width, _panel_size.height - _film_size.height);
+	}		
 }
 
 
@@ -267,11 +277,6 @@ FilmViewer::raw_to_display ()
 		return;
 	}
 
-	libdcp::Size old_size;
-	if (_display_frame) {
-		old_size = _display_frame->size();
-	}
-
 	shared_ptr<Image> input = _raw_frame;
 
 	pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
@@ -282,10 +287,6 @@ FilmViewer::raw_to_display ()
 	/* Get a compacted image as we have to feed it to wxWidgets */
 	_display_frame = input->scale_and_convert_to_rgb (_film_size, 0, _film->scaler(), false);
 
-	if (old_size != _display_frame->size()) {
-		_clear_required = true;
-	}
-
 	if (_raw_sub) {
 
 		/* Our output is already cropped by the decoder, so we need to account for that
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 22f443703..0f7b142b5 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -98,6 +98,4 @@ private:
 	libdcp::Size _film_size;
 	/** Size of the panel that we have available */
 	libdcp::Size _panel_size;
-
-	bool _clear_required;
 };
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index de0f93024..9f96fceff 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,41 +7,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdvdomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-15 08:39+0000\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
 "PO-Revision-Date: 2013-04-02 19:08-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
+"Language: es-ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
-"Language: es-ES\n"
 
-#: src/wx/film_editor.cc:441
+#: src/wx/film_editor.cc:445
 msgid "%"
 msgstr "%"
 
-#: src/wx/film_editor.cc:1230
+#: src/wx/config_dialog.cc:61
+msgid "(restart DVD-o-matic to see language changes)"
+msgstr ""
+
+#: src/wx/film_editor.cc:1269
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:184
 msgid "A/B"
 msgstr "A/B"
 
-#: src/wx/config_dialog.cc:124
+#: src/wx/config_dialog.cc:143
 msgid "Add"
 msgstr "Añadir"
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:78
+#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:382
+#: src/wx/film_editor.cc:381
 msgid "Audio Delay"
 msgstr "Retardo del audio"
 
-#: src/wx/film_editor.cc:370
+#: src/wx/film_editor.cc:369
 msgid "Audio Gain"
 msgstr "Ganancia del audio"
 
@@ -49,12 +53,17 @@ msgstr "Ganancia del audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
+#: src/wx/film_editor.cc:820
+#, c-format
+msgid "Audio will be resampled from %dHz to %dHz\n"
+msgstr ""
+
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Configuración erronea para %s (%s)"
 
-#: src/wx/film_editor.cc:297
+#: src/wx/film_editor.cc:288
 msgid "Bottom crop"
 msgstr "Recortar abajo"
 
@@ -66,27 +75,31 @@ msgstr "Explorar..."
 msgid "But I have to use fader"
 msgstr "pero tengo que usar el fader a"
 
-#: src/wx/film_editor.cc:375
+#: src/wx/film_editor.cc:374
 msgid "Calculate..."
 msgstr "Calcular..."
 
+#: src/wx/job_manager_view.cc:88
+msgid "Cancel"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:43
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/film_editor.cc:326
+#: src/wx/film_editor.cc:325
 msgid "Colour look-up table"
 msgstr "Tabla de referencia de colores"
 
-#: src/wx/film_editor.cc:121
+#: src/wx/film_editor.cc:120
 msgid "Content"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:130
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: src/wx/film_viewer.cc:414
+#: src/wx/film_viewer.cc:415
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
@@ -96,12 +109,12 @@ msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "No se pudo crear el DCP: %s"
 
-#: src/wx/film_viewer.cc:108
+#: src/wx/film_viewer.cc:107
 #, c-format
 msgid "Could not open content file (%s)"
 msgstr "No se pudo abrir el fichero (%s)"
 
-#: src/wx/film_editor.cc:505
+#: src/wx/film_editor.cc:509
 #, c-format
 msgid "Could not set content: %s"
 msgstr "No se pudo establecer el contenido: %s"
@@ -110,15 +123,20 @@ msgstr "No se pudo establecer el contenido: %s"
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
+#: src/wx/film_editor.cc:1363
+#, c-format
+msgid "Cropped to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:28
 msgid "DCI name"
 msgstr "Nombre DCI"
 
-#: src/wx/film_editor.cc:142
+#: src/wx/film_editor.cc:141
 msgid "DCP Frame Rate"
 msgstr "Velocidad DCP"
 
-#: src/wx/film_editor.cc:110
+#: src/wx/film_editor.cc:109
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
@@ -131,18 +149,19 @@ msgid "DVD-o-matic Preferences"
 msgstr "Preferencias DVD-o-matic"
 
 #: src/wx/audio_dialog.cc:101
-msgid "DVD-o-matic audio - %1"
+#, fuzzy, c-format
+msgid "DVD-o-matic audio - %s"
 msgstr "Audio DVD-o-matic - %1"
 
-#: src/wx/config_dialog.cc:83
+#: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:74
+#: src/wx/config_dialog.cc:93
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/film_editor.cc:117 src/wx/job_manager_view.cc:88
+#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:92
 msgid "Details..."
 msgstr "Detalles..."
 
@@ -150,24 +169,24 @@ msgstr "Detalles..."
 msgid "Disk space required"
 msgstr "Espacio requerido en disco"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:191
 msgid "Duration"
 msgstr "Duración"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:145
 msgid "Edit"
 msgstr "Editar"
 
-#: src/wx/config_dialog.cc:84 src/wx/config_dialog.cc:103
-#: src/wx/film_editor.cc:309
+#: src/wx/config_dialog.cc:103 src/wx/config_dialog.cc:122
+#: src/wx/film_editor.cc:308
 msgid "Edit..."
 msgstr "Editar..."
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:128
 msgid "Encoding Servers"
 msgstr "Servidores de codificación"
 
-#: src/wx/film_editor.cc:177
+#: src/wx/film_editor.cc:176
 msgid "End"
 msgstr "Fin"
 
@@ -175,7 +194,7 @@ msgstr "Fin"
 msgid "Facility (e.g. DLA)"
 msgstr "Compañía (ej. DLA)"
 
-#: src/wx/film_editor.cc:74
+#: src/wx/film_editor.cc:73
 msgid "Film"
 msgstr "Película"
 
@@ -187,11 +206,11 @@ msgstr "Propiedades de la película"
 msgid "Film name"
 msgstr "Nombre de la película"
 
-#: src/wx/film_editor.cc:304 src/wx/filter_dialog.cc:32
+#: src/wx/film_editor.cc:303 src/wx/filter_dialog.cc:32
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/wx/film_editor.cc:269
+#: src/wx/film_editor.cc:268
 msgid "Format"
 msgstr "Formato"
 
@@ -215,7 +234,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Nombre o dirección IP"
 
-#: src/wx/film_editor.cc:1234
+#: src/wx/film_editor.cc:1273
 msgid "Hz"
 msgstr "Hz"
 
@@ -223,23 +242,23 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:132
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/film_editor.cc:336
+#: src/wx/film_editor.cc:335
 msgid "JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:273
 msgid "Left crop"
 msgstr "Recorte izquierda"
 
-#: src/wx/film_editor.cc:165
+#: src/wx/film_editor.cc:164
 msgid "Length"
 msgstr "Longitud"
 
-#: src/wx/film_editor.cc:340
+#: src/wx/film_editor.cc:339
 msgid "MBps"
 msgstr "MBps"
 
@@ -247,7 +266,7 @@ msgstr "MBps"
 msgid "My Documents"
 msgstr "Mis documentos"
 
-#: src/wx/film_editor.cc:105
+#: src/wx/film_editor.cc:104
 msgid "Name"
 msgstr "Nombre"
 
@@ -255,22 +274,32 @@ msgstr "Nombre"
 msgid "New Film"
 msgstr "Nueva película"
 
-#: src/wx/film_editor.cc:306 src/wx/film_editor.cc:665
+#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:667
 msgid "None"
 msgstr "Ninguno"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:135
 msgid "Original Frame Rate"
 msgstr "Velocidad original"
 
-#: src/wx/film_editor.cc:160
+#: src/wx/film_editor.cc:159
 msgid "Original Size"
 msgstr "Tamaño original"
 
+#: src/wx/film_editor.cc:1352
+#, c-format
+msgid "Original video is %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:57
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
+#: src/wx/film_editor.cc:1384
+#, c-format
+msgid "Padded with black to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:60
 msgid "Peak"
 msgstr "Pico"
@@ -291,35 +320,40 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Clasificación (ej. 16)"
 
-#: src/wx/config_dialog.cc:99
+#: src/wx/config_dialog.cc:118
 msgid "Reference filters for A/B"
 msgstr "Filtros de referencia para A/B"
 
-#: src/wx/config_dialog.cc:88
+#: src/wx/config_dialog.cc:107
 msgid "Reference scaler for A/B"
 msgstr "Escalador de referencia para A/B"
 
-#: src/wx/config_dialog.cc:128
+#: src/wx/config_dialog.cc:147
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/wx/film_editor.cc:287
+#: src/wx/film_editor.cc:278
 msgid "Right crop"
 msgstr "Recorte derecha"
 
-#: src/wx/job_manager_view.cc:104
+#: src/wx/job_manager_view.cc:108
 msgid "Running"
 msgstr "Ejecutando"
 
-#: src/wx/film_editor.cc:316
+#: src/wx/film_editor.cc:1376
+#, c-format
+msgid "Scaled to %dx%d (%.2f:1)\n"
+msgstr ""
+
+#: src/wx/film_editor.cc:315
 msgid "Scaler"
 msgstr "Escalador"
 
-#: src/wx/film_editor.cc:408
+#: src/wx/film_editor.cc:407
 msgid "Select Audio File"
 msgstr "Seleccionar fichero de audio"
 
-#: src/wx/film_editor.cc:122
+#: src/wx/film_editor.cc:121
 msgid "Select Content File"
 msgstr "Seleccionar fichero de contenido"
 
@@ -327,7 +361,11 @@ msgstr "Seleccionar fichero de contenido"
 msgid "Server"
 msgstr "Servidor"
 
-#: src/wx/film_editor.cc:365
+#: src/wx/config_dialog.cc:49
+msgid "Set language"
+msgstr ""
+
+#: src/wx/film_editor.cc:364
 msgid "Show Audio..."
 msgstr "Mostrar audio..."
 
@@ -335,7 +373,7 @@ msgstr "Mostrar audio..."
 msgid "Smoothing"
 msgstr "Suavizado"
 
-#: src/wx/film_editor.cc:174
+#: src/wx/film_editor.cc:173
 msgid "Start"
 msgstr "Inicio"
 
@@ -351,27 +389,27 @@ msgstr "Idioma del subtítulo (ej. EN)"
 msgid "Subtitle Offset"
 msgstr "Desplazamiento del subtítulo"
 
-#: src/wx/film_editor.cc:437
+#: src/wx/film_editor.cc:441
 msgid "Subtitle Scale"
 msgstr "Escala del subtítulo"
 
-#: src/wx/film_editor.cc:80
+#: src/wx/film_editor.cc:79
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/config_dialog.cc:49
+#: src/wx/config_dialog.cc:68
 msgid "TMS IP address"
 msgstr "Dirección IP del TMS"
 
-#: src/wx/config_dialog.cc:64
+#: src/wx/config_dialog.cc:83
 msgid "TMS password"
 msgstr "Clave del TMS"
 
-#: src/wx/config_dialog.cc:54
+#: src/wx/config_dialog.cc:73
 msgid "TMS target path"
 msgstr "Ruta en el TMS"
 
-#: src/wx/config_dialog.cc:59
+#: src/wx/config_dialog.cc:78
 msgid "TMS user name"
 msgstr "Usuario del TMS"
 
@@ -379,7 +417,7 @@ msgstr "Usuario del TMS"
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:136
 msgid "Threads"
 msgstr "Hilos"
 
@@ -387,7 +425,7 @@ msgstr "Hilos"
 msgid "Threads to use"
 msgstr "Hilos a utilizar"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/config_dialog.cc:88
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
@@ -395,15 +433,15 @@ msgstr "Hilos a utilizar para la codificación en esta máquina"
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/wx/film_editor.cc:292
+#: src/wx/film_editor.cc:283
 msgid "Top crop"
 msgstr "Recortar arriba"
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:171
 msgid "Trim frames"
 msgstr "Recortar fotogramas"
 
-#: src/wx/film_editor.cc:126
+#: src/wx/film_editor.cc:125
 msgid "Trust content's header"
 msgstr "Confiar en la cabecera del contenido"
 
@@ -411,31 +449,31 @@ msgstr "Confiar en la cabecera del contenido"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:114
 msgid "Use DCI name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/film_editor.cc:145
 msgid "Use best"
 msgstr "Usar la mejor"
 
-#: src/wx/film_editor.cc:392
+#: src/wx/film_editor.cc:391
 msgid "Use content's audio"
 msgstr "Usar el audio del contenido"
 
-#: src/wx/film_editor.cc:402
+#: src/wx/film_editor.cc:401
 msgid "Use external audio"
 msgstr "Usar audio externo"
 
-#: src/wx/film_editor.cc:76
+#: src/wx/film_editor.cc:75
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/wx/film_editor.cc:425
+#: src/wx/film_editor.cc:424
 msgid "With Subtitles"
 msgstr "Con subtítulos"
 
-#: src/wx/film_editor.cc:1232
+#: src/wx/film_editor.cc:1271
 msgid "channels"
 msgstr "canales"
 
@@ -443,21 +481,25 @@ msgstr "canales"
 msgid "counting..."
 msgstr "contando..."
 
-#: src/wx/film_editor.cc:374
+#: src/wx/film_editor.cc:373
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:691 src/wx/film_editor.cc:693
+#: src/wx/film_editor.cc:696 src/wx/film_editor.cc:699
 msgid "frames"
 msgstr "fotogramas"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:387
+#: src/wx/film_editor.cc:386
 msgid "ms"
 msgstr "ms"
 
+#: src/wx/film_editor.cc:436
+msgid "pixels"
+msgstr ""
+
 #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-#: src/wx/film_editor.cc:198
+#: src/wx/film_editor.cc:197
 msgid "s"
 msgstr "s"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 03da04610..37cd6d8ab 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
 "PO-Revision-Date: 2013-03-20 00:34+0100\n"
 "Last-Translator: FreeDCP.net <freedcp.net@gmail.com>\n"
 "Language-Team: \n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/wx/film_editor.cc:440
+#: src/wx/film_editor.cc:445
 msgid "%"
 msgstr "%"
 
@@ -24,7 +24,7 @@ msgstr "%"
 msgid "(restart DVD-o-matic to see language changes)"
 msgstr ""
 
-#: src/wx/film_editor.cc:1231
+#: src/wx/film_editor.cc:1269
 msgid "1 channel"
 msgstr "1 canal"
 
@@ -52,12 +52,17 @@ msgstr "Gain audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Langue audio (ex. FR)"
 
+#: src/wx/film_editor.cc:820
+#, c-format
+msgid "Audio will be resampled from %dHz to %dHz\n"
+msgstr ""
+
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Mauvais paramètre pour %s (%s)"
 
-#: src/wx/film_editor.cc:296
+#: src/wx/film_editor.cc:288
 msgid "Bottom crop"
 msgstr "Découpe bas"
 
@@ -93,7 +98,7 @@ msgstr "Contenu"
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#: src/wx/film_viewer.cc:414
+#: src/wx/film_viewer.cc:415
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
@@ -103,12 +108,12 @@ msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Impossible de créer le DCP : %s"
 
-#: src/wx/film_viewer.cc:108
+#: src/wx/film_viewer.cc:107
 #, c-format
 msgid "Could not open content file (%s)"
 msgstr "Ouverture du contenu impossible (%s)"
 
-#: src/wx/film_editor.cc:504
+#: src/wx/film_editor.cc:509
 #, c-format
 msgid "Could not set content: %s"
 msgstr "Sélectionner du contenu impossible : %s"
@@ -117,6 +122,11 @@ msgstr "Sélectionner du contenu impossible : %s"
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
+#: src/wx/film_editor.cc:1363
+#, c-format
+msgid "Cropped to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:28
 msgid "DCI name"
 msgstr "Nom DCI"
@@ -223,7 +233,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
-#: src/wx/film_editor.cc:1235
+#: src/wx/film_editor.cc:1273
 msgid "Hz"
 msgstr "Hz"
 
@@ -239,7 +249,7 @@ msgstr "Adresse IP"
 msgid "JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000"
 
-#: src/wx/film_editor.cc:281
+#: src/wx/film_editor.cc:273
 msgid "Left crop"
 msgstr "Découpe gauche"
 
@@ -263,7 +273,7 @@ msgstr "Nom"
 msgid "New Film"
 msgstr "Nouveau Film"
 
-#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:664
+#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:667
 msgid "None"
 msgstr "Aucun"
 
@@ -275,10 +285,20 @@ msgstr "Cadence d'images originale"
 msgid "Original Size"
 msgstr "Taille Originale"
 
+#: src/wx/film_editor.cc:1352
+#, c-format
+msgid "Original video is %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:57
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
+#: src/wx/film_editor.cc:1384
+#, c-format
+msgid "Padded with black to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:60
 msgid "Peak"
 msgstr "Crête"
@@ -311,7 +331,7 @@ msgstr "Échelle de référence pour A/B"
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:278
 msgid "Right crop"
 msgstr "Découpe droite"
 
@@ -319,6 +339,11 @@ msgstr "Découpe droite"
 msgid "Running"
 msgstr "Progression"
 
+#: src/wx/film_editor.cc:1376
+#, c-format
+msgid "Scaled to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/film_editor.cc:315
 msgid "Scaler"
 msgstr "Mise à l'échelle"
@@ -359,11 +384,11 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Langue de sous-titres (ex. FR)"
 
-#: src/wx/film_editor.cc:431
+#: src/wx/film_editor.cc:432
 msgid "Subtitle Offset"
 msgstr "Décalage du sous-titre"
 
-#: src/wx/film_editor.cc:436
+#: src/wx/film_editor.cc:441
 msgid "Subtitle Scale"
 msgstr "Taille du sous-titre"
 
@@ -407,7 +432,7 @@ msgstr "Nombre de processus à utiliser sur cet hôte"
 msgid "Time"
 msgstr "Durée"
 
-#: src/wx/film_editor.cc:291
+#: src/wx/film_editor.cc:283
 msgid "Top crop"
 msgstr "Découpe haut"
 
@@ -447,7 +472,7 @@ msgstr "Vidéo"
 msgid "With Subtitles"
 msgstr "Avec sous-titres"
 
-#: src/wx/film_editor.cc:1233
+#: src/wx/film_editor.cc:1271
 msgid "channels"
 msgstr "canaux"
 
@@ -459,7 +484,7 @@ msgstr "calcul..."
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:691 src/wx/film_editor.cc:694
+#: src/wx/film_editor.cc:696 src/wx/film_editor.cc:699
 msgid "frames"
 msgstr "images"
 
@@ -468,6 +493,10 @@ msgstr "images"
 msgid "ms"
 msgstr "ms"
 
+#: src/wx/film_editor.cc:436
+msgid "pixels"
+msgstr ""
+
 #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
 #: src/wx/film_editor.cc:197
 msgid "s"
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 3de3816f6..9a0f13d2e 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
 "PO-Revision-Date: 2013-03-22 18:10+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/wx/film_editor.cc:440
+#: src/wx/film_editor.cc:445
 msgid "%"
 msgstr "%"
 
@@ -25,7 +25,7 @@ msgstr "%"
 msgid "(restart DVD-o-matic to see language changes)"
 msgstr ""
 
-#: src/wx/film_editor.cc:1231
+#: src/wx/film_editor.cc:1269
 msgid "1 channel"
 msgstr "Canale 1"
 
@@ -53,12 +53,17 @@ msgstr "Guadagno dell'audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Lingua dell'audio (es. EN)"
 
+#: src/wx/film_editor.cc:820
+#, c-format
+msgid "Audio will be resampled from %dHz to %dHz\n"
+msgstr ""
+
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Valore sbagliato per %s (%s)"
 
-#: src/wx/film_editor.cc:296
+#: src/wx/film_editor.cc:288
 msgid "Bottom crop"
 msgstr "Taglio in basso"
 
@@ -94,7 +99,7 @@ msgstr "Contenuto"
 msgid "Content Type"
 msgstr "Tipo di contenuto"
 
-#: src/wx/film_viewer.cc:414
+#: src/wx/film_viewer.cc:415
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Non posso decodificare il video per guardarlo (%s)"
@@ -104,12 +109,12 @@ msgstr "Non posso decodificare il video per guardarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Non posso creare il DCP: %s"
 
-#: src/wx/film_viewer.cc:108
+#: src/wx/film_viewer.cc:107
 #, c-format
 msgid "Could not open content file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
 
-#: src/wx/film_editor.cc:504
+#: src/wx/film_editor.cc:509
 #, c-format
 msgid "Could not set content: %s"
 msgstr "Non posso regolare il contenuto: %s"
@@ -118,6 +123,11 @@ msgstr "Non posso regolare il contenuto: %s"
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
+#: src/wx/film_editor.cc:1363
+#, c-format
+msgid "Cropped to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:28
 msgid "DCI name"
 msgstr "Nome del DCP"
@@ -224,7 +234,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
-#: src/wx/film_editor.cc:1235
+#: src/wx/film_editor.cc:1273
 msgid "Hz"
 msgstr "Hz"
 
@@ -240,7 +250,7 @@ msgstr "Indirizzo IP"
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/film_editor.cc:281
+#: src/wx/film_editor.cc:273
 msgid "Left crop"
 msgstr "Taglio a sinistra"
 
@@ -264,7 +274,7 @@ msgstr "Nome"
 msgid "New Film"
 msgstr "Nuovo Film"
 
-#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:664
+#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:667
 msgid "None"
 msgstr "Nessuno"
 
@@ -276,10 +286,20 @@ msgstr "Frequenza fotogrammi originale"
 msgid "Original Size"
 msgstr "Dimensione Originale"
 
+#: src/wx/film_editor.cc:1352
+#, c-format
+msgid "Original video is %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:57
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
+#: src/wx/film_editor.cc:1384
+#, c-format
+msgid "Padded with black to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:60
 msgid "Peak"
 msgstr "Picco"
@@ -312,7 +332,7 @@ msgstr "Scalatura di riferimento A/B"
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:278
 msgid "Right crop"
 msgstr "Taglio a destra"
 
@@ -320,6 +340,11 @@ msgstr "Taglio a destra"
 msgid "Running"
 msgstr "In corso"
 
+#: src/wx/film_editor.cc:1376
+#, c-format
+msgid "Scaled to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/film_editor.cc:315
 msgid "Scaler"
 msgstr "Scaler"
@@ -360,11 +385,11 @@ msgstr "Studio (es. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Lingua dei Sottotitoli (es. FR)"
 
-#: src/wx/film_editor.cc:431
+#: src/wx/film_editor.cc:432
 msgid "Subtitle Offset"
 msgstr "Sfalsamento dei Sottotitoli"
 
-#: src/wx/film_editor.cc:436
+#: src/wx/film_editor.cc:441
 msgid "Subtitle Scale"
 msgstr "Scala dei Sottotitoli"
 
@@ -408,7 +433,7 @@ msgstr "Threads da usare per codificare su questo host"
 msgid "Time"
 msgstr "Tempo"
 
-#: src/wx/film_editor.cc:291
+#: src/wx/film_editor.cc:283
 msgid "Top crop"
 msgstr "Taglio in alto"
 
@@ -448,7 +473,7 @@ msgstr "Video"
 msgid "With Subtitles"
 msgstr "Con Sottotitoli"
 
-#: src/wx/film_editor.cc:1233
+#: src/wx/film_editor.cc:1271
 msgid "channels"
 msgstr "canali"
 
@@ -460,7 +485,7 @@ msgstr "conteggio..."
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:691 src/wx/film_editor.cc:694
+#: src/wx/film_editor.cc:696 src/wx/film_editor.cc:699
 msgid "frames"
 msgstr "fotogrammi"
 
@@ -469,6 +494,10 @@ msgstr "fotogrammi"
 msgid "ms"
 msgstr "ms"
 
+#: src/wx/film_editor.cc:436
+msgid "pixels"
+msgstr ""
+
 #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
 #: src/wx/film_editor.cc:197
 msgid "s"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 24a6060de..ab9873877 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,16 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
 "PO-Revision-Date: 2013-04-04 10:18+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/wx/film_editor.cc:440
+#: src/wx/film_editor.cc:445
 msgid "%"
 msgstr "%"
 
@@ -24,7 +25,7 @@ msgstr "%"
 msgid "(restart DVD-o-matic to see language changes)"
 msgstr "(starta om DVD-o-matic för att se språkändringar)"
 
-#: src/wx/film_editor.cc:1231
+#: src/wx/film_editor.cc:1269
 msgid "1 channel"
 msgstr "1 kanal"
 
@@ -52,12 +53,17 @@ msgstr "Audio Förstärkning"
 msgid "Audio Language (e.g. EN)"
 msgstr "Audio Språk (ex. SV)"
 
+#: src/wx/film_editor.cc:820
+#, c-format
+msgid "Audio will be resampled from %dHz to %dHz\n"
+msgstr ""
+
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Felaktig inställning för %s (%s)"
 
-#: src/wx/film_editor.cc:296
+#: src/wx/film_editor.cc:288
 msgid "Bottom crop"
 msgstr "Nedre beskärning"
 
@@ -93,7 +99,7 @@ msgstr "Innehåll"
 msgid "Content Type"
 msgstr "Innehållstyp"
 
-#: src/wx/film_viewer.cc:414
+#: src/wx/film_viewer.cc:415
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kunde inte avkoda video för visning (%s)"
@@ -103,12 +109,12 @@ msgstr "Kunde inte avkoda video för visning (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Kunde inte skapa DCP: %s"
 
-#: src/wx/film_viewer.cc:108
+#: src/wx/film_viewer.cc:107
 #, c-format
 msgid "Could not open content file (%s)"
 msgstr "Kunde inte öppna innehållsfilen (%s)"
 
-#: src/wx/film_editor.cc:504
+#: src/wx/film_editor.cc:509
 #, c-format
 msgid "Could not set content: %s"
 msgstr "Kunde inte fastställa innehåll: %s"
@@ -117,6 +123,11 @@ msgstr "Kunde inte fastställa innehåll: %s"
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
+#: src/wx/film_editor.cc:1363
+#, c-format
+msgid "Cropped to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:28
 msgid "DCI name"
 msgstr "DCI namn"
@@ -223,7 +234,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Värd-namn eller IP-adress"
 
-#: src/wx/film_editor.cc:1235
+#: src/wx/film_editor.cc:1273
 msgid "Hz"
 msgstr "Hz"
 
@@ -239,7 +250,7 @@ msgstr "IP-adress"
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbredd"
 
-#: src/wx/film_editor.cc:281
+#: src/wx/film_editor.cc:273
 msgid "Left crop"
 msgstr "Vänster beskärning"
 
@@ -263,7 +274,7 @@ msgstr "Namn"
 msgid "New Film"
 msgstr "Ny Film"
 
-#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:664
+#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:667
 msgid "None"
 msgstr "Inget"
 
@@ -275,10 +286,20 @@ msgstr "Ursprunglig bildhastighet"
 msgid "Original Size"
 msgstr "Ursprunglig Storlek"
 
+#: src/wx/film_editor.cc:1352
+#, c-format
+msgid "Original video is %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:57
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
+#: src/wx/film_editor.cc:1384
+#, c-format
+msgid "Padded with black to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:60
 msgid "Peak"
 msgstr "Topp"
@@ -311,7 +332,7 @@ msgstr "Referensomskalare för A/B"
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:278
 msgid "Right crop"
 msgstr "Höger beskärning"
 
@@ -319,6 +340,11 @@ msgstr "Höger beskärning"
 msgid "Running"
 msgstr "Körs"
 
+#: src/wx/film_editor.cc:1376
+#, c-format
+msgid "Scaled to %dx%d (%.2f:1)\n"
+msgstr ""
+
 #: src/wx/film_editor.cc:315
 msgid "Scaler"
 msgstr "Omskalare"
@@ -359,11 +385,11 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Undertextspråk (ex. SV)"
 
-#: src/wx/film_editor.cc:431
+#: src/wx/film_editor.cc:432
 msgid "Subtitle Offset"
 msgstr "Undertext Förskjutning"
 
-#: src/wx/film_editor.cc:436
+#: src/wx/film_editor.cc:441
 msgid "Subtitle Scale"
 msgstr "Undertext Skalning"
 
@@ -407,7 +433,7 @@ msgstr "Antal trådar att använda vid kodning på denna maskin"
 msgid "Time"
 msgstr "Tid"
 
-#: src/wx/film_editor.cc:291
+#: src/wx/film_editor.cc:283
 msgid "Top crop"
 msgstr "Övre beskärning"
 
@@ -447,7 +473,7 @@ msgstr "Video"
 msgid "With Subtitles"
 msgstr "Med Undertexter"
 
-#: src/wx/film_editor.cc:1233
+#: src/wx/film_editor.cc:1271
 msgid "channels"
 msgstr "kanaler"
 
@@ -459,7 +485,7 @@ msgstr "räknar..."
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:691 src/wx/film_editor.cc:694
+#: src/wx/film_editor.cc:696 src/wx/film_editor.cc:699
 msgid "frames"
 msgstr "bilder"
 
@@ -468,6 +494,10 @@ msgstr "bilder"
 msgid "ms"
 msgstr "ms"
 
+#: src/wx/film_editor.cc:436
+msgid "pixels"
+msgstr ""
+
 #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
 #: src/wx/film_editor.cc:197
 msgid "s"