summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-09 22:18:42 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-09 22:18:42 +0000
commite8204f55c981493b99814f71a50b3c3d62601032 (patch)
tree19e155586aca13839e440a0574ed5aa5cfa4c4d5 /src/wx
parentae9b0b509787d244366eb8f69bdf9d563b6c6bb6 (diff)
parente28def57ff4591f02ca3585a506ea58fbeba5d46 (diff)
Merge master.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/about_dialog.cc1
-rw-r--r--src/wx/audio_gain_dialog.cc64
-rw-r--r--src/wx/audio_gain_dialog.h33
-rw-r--r--src/wx/audio_mapping_view.cc212
-rw-r--r--src/wx/audio_mapping_view.h16
-rw-r--r--src/wx/audio_panel.cc11
-rw-r--r--src/wx/cinema_dialog.cc6
-rw-r--r--src/wx/config_dialog.cc24
-rw-r--r--src/wx/config_dialog.h5
-rw-r--r--src/wx/po/de_DE.po169
-rw-r--r--src/wx/po/es_ES.po169
-rw-r--r--src/wx/po/fr_FR.po168
-rw-r--r--src/wx/po/it_IT.po168
-rw-r--r--src/wx/po/sv_SE.po168
-rw-r--r--src/wx/properties_dialog.cc2
-rw-r--r--src/wx/timecode.cc22
-rw-r--r--src/wx/timecode.h4
-rw-r--r--src/wx/timing_panel.cc65
-rw-r--r--src/wx/timing_panel.h16
-rw-r--r--src/wx/update_dialog.cc61
-rw-r--r--src/wx/update_dialog.h27
-rw-r--r--src/wx/wscript2
22 files changed, 1124 insertions, 289 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 5ded69339..5f801bfe4 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -128,6 +128,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
supported_by.Add (wxT ("Rodolfo Giuliano"));
supported_by.Add (wxT ("Sylvain Mielle"));
supported_by.Add (wxT ("Ivan Pullman"));
+ supported_by.Add (wxT ("Aldo Midali"));
add_section (_("Supported by"), supported_by);
sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());
diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc
new file mode 100644
index 000000000..7622e443e
--- /dev/null
+++ b/src/wx/audio_gain_dialog.cc
@@ -0,0 +1,64 @@
+/*
+ Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <cmath>
+#include <wx/spinctrl.h>
+#include "audio_gain_dialog.h"
+#include "wx_util.h"
+
+AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v)
+ : wxDialog (parent, wxID_ANY, _("Channel gain"))
+{
+ wxFlexGridSizer* table = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+
+ add_label_to_sizer (table, this, wxString::Format (_("Gain for content channel %d in DCP channel %d"), c + 1, d + 1), false);
+ _gain = new wxSpinCtrlDouble (this);
+ table->Add (_gain);
+
+ add_label_to_sizer (table, this, _("dB"), false);
+
+ wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+ overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+ if (buttons) {
+ overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+
+ SetSizer (overall_sizer);
+ overall_sizer->Layout ();
+ overall_sizer->SetSizeHints (this);
+
+ _gain->SetRange (-144, 0);
+ _gain->SetDigits (1);
+ _gain->SetIncrement (0.1);
+
+ _gain->SetValue (20 * log10 (v));
+}
+
+float
+AudioGainDialog::value () const
+{
+ if (_gain->GetValue() <= -144) {
+ return 0;
+ }
+
+ return pow (10, _gain->GetValue () / 20);
+}
diff --git a/src/wx/audio_gain_dialog.h b/src/wx/audio_gain_dialog.h
new file mode 100644
index 000000000..370e9f1bc
--- /dev/null
+++ b/src/wx/audio_gain_dialog.h
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+
+class wxSpinCtrlDouble;
+
+class AudioGainDialog : public wxDialog
+{
+public:
+ AudioGainDialog (wxWindow *, int, int, float);
+
+ float value () const;
+
+private:
+ wxSpinCtrlDouble* _gain;
+};
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 3136b8679..9fa57a1b1 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -25,22 +25,23 @@
#include "lib/util.h"
#include "audio_mapping_view.h"
#include "wx_util.h"
+#include "audio_gain_dialog.h"
using std::cout;
using std::list;
+using std::string;
+using std::max;
using boost::shared_ptr;
+using boost::lexical_cast;
-/* This could go away with wxWidgets 2.9, which has an API call
- to find these values.
-*/
+#define INDICATOR_SIZE 20
-#ifdef __WXMSW__
-#define CHECKBOX_WIDTH 16
-#define CHECKBOX_HEIGHT 16
-#else
-#define CHECKBOX_WIDTH 20
-#define CHECKBOX_HEIGHT 20
-#endif
+enum {
+ ID_off = 1,
+ ID_full = 2,
+ ID_minus3dB = 3,
+ ID_edit = 4
+};
class NoSelectionStringRenderer : public wxGridCellStringRenderer
{
@@ -51,40 +52,64 @@ public:
}
};
-class CheckBoxRenderer : public wxGridCellRenderer
+class ValueRenderer : public wxGridCellRenderer
{
public:
void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool)
{
- dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 0, wxPENSTYLE_SOLID));
+ dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 1, wxPENSTYLE_SOLID));
+ dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID));
dc.DrawRectangle (rect);
+
+ int const xo = (rect.GetWidth() - INDICATOR_SIZE) / 2;
+ int const yo = (rect.GetHeight() - INDICATOR_SIZE) / 2;
+
+ dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID));
+ dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID));
+ dc.DrawRectangle (wxRect (rect.GetLeft() + xo, rect.GetTop() + yo, INDICATOR_SIZE, INDICATOR_SIZE));
+
+ float const value = lexical_cast<float> (wx_to_std (grid.GetCellValue (row, col)));
+ float const value_dB = 20 * log10 (value);
+ int const range = 18;
+ int height = 0;
+ if (value_dB > -range) {
+ height = INDICATOR_SIZE * (1 + value_dB / range);
+ }
+
+ height = max (0, height);
- wxRendererNative::Get().DrawCheckBox (
- &grid,
- dc, rect,
- grid.GetCellValue (row, col) == wxT("1") ? static_cast<int>(wxCONTROL_CHECKED) : 0
- );
+ if (value > 0) {
+ /* Make sure we get a little bit of the marker if there is any gain */
+ height = max (3, height);
+ }
+
+ dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (0, 255, 0), wxBRUSHSTYLE_SOLID));
+ dc.DrawRectangle (wxRect (rect.GetLeft() + xo, rect.GetTop() + yo + INDICATOR_SIZE - height, INDICATOR_SIZE, height));
}
wxSize GetBestSize (wxGrid &, wxGridCellAttr &, wxDC &, int, int)
{
- return wxSize (CHECKBOX_WIDTH + 4, CHECKBOX_HEIGHT + 4);
+ return wxSize (INDICATOR_SIZE + 4, INDICATOR_SIZE + 4);
}
wxGridCellRenderer* Clone () const
{
- return new CheckBoxRenderer;
+ return new ValueRenderer;
}
};
AudioMappingView::AudioMappingView (wxWindow* parent)
: wxPanel (parent, wxID_ANY)
+ , _menu_row (0)
+ , _menu_column (1)
+ , _last_tooltip_row (0)
+ , _last_tooltip_column (0)
{
_grid = new wxGrid (this, wxID_ANY);
- _grid->CreateGrid (0, 7);
+ _grid->CreateGrid (0, MAX_AUDIO_CHANNELS + 1);
_grid->HideRowLabels ();
_grid->DisableDragRowSize ();
_grid->DisableDragColSize ();
@@ -99,64 +124,128 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
SetSizerAndFit (_sizer);
Bind (wxEVT_GRID_CELL_LEFT_CLICK, boost::bind (&AudioMappingView::left_click, this, _1));
+ Bind (wxEVT_GRID_CELL_RIGHT_CLICK, boost::bind (&AudioMappingView::right_click, this, _1));
+ _grid->GetGridWindow()->Bind (wxEVT_MOTION, boost::bind (&AudioMappingView::mouse_moved, this, _1));
+
+ _menu = new wxMenu;
+ _menu->Append (ID_off, _("Off"));
+ _menu->Append (ID_full, _("Full"));
+ _menu->Append (ID_minus3dB, _("-3dB"));
+ _menu->Append (ID_edit, _("Edit..."));
+
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::off, this), ID_off);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::full, this), ID_full);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::minus3dB, this), ID_minus3dB);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::edit, this), ID_edit);
}
void
+AudioMappingView::map_changed ()
+{
+ update_cells ();
+ Changed (_map);
+ _last_tooltip_column = -1;
+}
+
+void
AudioMappingView::left_click (wxGridEvent& ev)
{
if (ev.GetCol() == 0) {
return;
}
+
+ libdcp::Channel d = static_cast<libdcp::Channel> (ev.GetCol() - 1);
- if (_grid->GetCellValue (ev.GetRow(), ev.GetCol()) == wxT("1")) {
- _grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("0"));
+ if (_map.get (ev.GetRow(), d) > 0) {
+ _map.set (ev.GetRow(), d, 0);
} else {
- _grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("1"));
+ _map.set (ev.GetRow(), d, 1);
}
- _map = AudioMapping (_map.content_channels ());
-
- for (int i = 0; i < _grid->GetNumberRows(); ++i) {
- for (int j = 1; j < _grid->GetNumberCols(); ++j) {
- if (_grid->GetCellValue (i, j) == wxT ("1")) {
- _map.add (i, static_cast<libdcp::Channel> (j - 1));
- }
- }
+ map_changed ();
+}
+
+void
+AudioMappingView::right_click (wxGridEvent& ev)
+{
+ if (ev.GetCol() == 0) {
+ return;
}
- Changed (_map);
+ _menu_row = ev.GetRow ();
+ _menu_column = ev.GetCol ();
+ PopupMenu (_menu, ev.GetPosition ());
+}
+
+void
+AudioMappingView::off ()
+{
+ _map.set (_menu_row, static_cast<libdcp::Channel> (_menu_column - 1), 0);
+ map_changed ();
+}
+
+void
+AudioMappingView::full ()
+{
+ _map.set (_menu_row, static_cast<libdcp::Channel> (_menu_column - 1), 1);
+ map_changed ();
+}
+
+void
+AudioMappingView::minus3dB ()
+{
+ _map.set (_menu_row, static_cast<libdcp::Channel> (_menu_column - 1), 1 / sqrt (2));
+ map_changed ();
+}
+
+void
+AudioMappingView::edit ()
+{
+ libdcp::Channel d = static_cast<libdcp::Channel> (_menu_column - 1);
+
+ AudioGainDialog* dialog = new AudioGainDialog (this, _menu_row, _menu_column - 1, _map.get (_menu_row, d));
+ if (dialog->ShowModal () == wxID_OK) {
+ _map.set (_menu_row, d, dialog->value ());
+ map_changed ();
+ }
+
+ dialog->Destroy ();
}
void
AudioMappingView::set (AudioMapping map)
{
_map = map;
-
+ update_cells ();
+}
+
+void
+AudioMappingView::update_cells ()
+{
if (_grid->GetNumberRows ()) {
_grid->DeleteRows (0, _grid->GetNumberRows ());
}
_grid->InsertRows (0, _map.content_channels ());
- for (int r = 0; r < _map.content_channels(); ++r) {
- for (int c = 1; c < 7; ++c) {
- _grid->SetCellRenderer (r, c, new CheckBoxRenderer);
+ for (int i = 0; i < _map.content_channels(); ++i) {
+ for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) {
+ _grid->SetCellRenderer (i, j + 1, new ValueRenderer);
}
}
for (int i = 0; i < _map.content_channels(); ++i) {
_grid->SetCellValue (i, 0, wxString::Format (wxT("%d"), i + 1));
- list<libdcp::Channel> const d = _map.content_to_dcp (i);
- for (list<libdcp::Channel>::const_iterator j = d.begin(); j != d.end(); ++j) {
- int const c = static_cast<int>(*j) + 1;
- if (c < _grid->GetNumberCols ()) {
- _grid->SetCellValue (i, c, wxT("1"));
- }
+ for (int j = 1; j < _grid->GetNumberCols(); ++j) {
+ _grid->SetCellValue (i, j, std_to_wx (lexical_cast<string> (_map.get (i, static_cast<libdcp::Channel> (j - 1)))));
}
}
+
+ _grid->AutoSize ();
}
+/** @param c Number of DCP channels */
void
AudioMappingView::set_channels (int c)
{
@@ -169,7 +258,7 @@ AudioMappingView::set_channels (int c)
set_column_labels ();
}
- set (_map);
+ update_cells ();
}
void
@@ -205,3 +294,40 @@ AudioMappingView::set_column_labels ()
_grid->AutoSize ();
}
+
+void
+AudioMappingView::mouse_moved (wxMouseEvent& ev)
+{
+ int xx;
+ int yy;
+ _grid->CalcUnscrolledPosition (ev.GetX(), ev.GetY(), &xx, &yy);
+
+ int const row = _grid->YToRow (yy);
+ int const column = _grid->XToCol (xx);
+
+ if (row < 0 || column < 1) {
+ _grid->GetGridWindow()->SetToolTip ("");
+ _last_tooltip_row = row;
+ _last_tooltip_column = column;
+ }
+
+ if (row != _last_tooltip_row || column != _last_tooltip_column) {
+
+ wxString s;
+ float const gain = _map.get (row, static_cast<libdcp::Channel> (column - 1));
+ if (gain == 0) {
+ s = wxString::Format (_("No audio will be passed from content channel %d to DCP channel %d."), row + 1, column);
+ } else if (gain == 1) {
+ s = wxString::Format (_("Audio will be passed from content channel %d to DCP channel %d unaltered."), row + 1, column);
+ } else {
+ float const dB = 20 * log10 (gain);
+ s = wxString::Format (_("Audio will be passed from content channel %d to DCP channel %d with gain %.1fdB."), row + 1, column, dB);
+ }
+
+ _grid->GetGridWindow()->SetToolTip (s + " " + _("Right click to change gain."));
+ _last_tooltip_row = row;
+ _last_tooltip_column = column;
+ }
+
+ ev.Skip ();
+}
diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 80534a613..26f1746e0 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -34,9 +34,25 @@ public:
private:
void left_click (wxGridEvent &);
+ void right_click (wxGridEvent &);
+ void mouse_moved (wxMouseEvent &);
void set_column_labels ();
+ void update_cells ();
+ void map_changed ();
+
+ void off ();
+ void full ();
+ void minus3dB ();
+ void edit ();
wxGrid* _grid;
wxSizer* _sizer;
AudioMapping _map;
+
+ wxMenu* _menu;
+ int _menu_row;
+ int _menu_column;
+
+ int _last_tooltip_row;
+ int _last_tooltip_column;
};
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 6b30c0dd2..ba458f1ff 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -64,7 +64,7 @@ AudioPanel::AudioPanel (FilmEditor* e)
grid->Add (_gain_calculate_button, wxGBPosition (r, 3));
++r;
- add_label_to_grid_bag_sizer (grid, this, _("Audio Delay"), false, wxGBPosition (r, 0));
+ add_label_to_grid_bag_sizer (grid, this, _("Audio Delay"), true, wxGBPosition (r, 0));
_delay = new ContentSpinCtrl<AudioContent> (
this,
new wxSpinCtrl (this),
@@ -73,7 +73,7 @@ AudioPanel::AudioPanel (FilmEditor* e)
boost::mem_fn (&AudioContent::set_audio_delay)
);
- _delay->add (grid, wxGBPosition (r,1 ));
+ _delay->add (grid, wxGBPosition (r, 1));
/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
add_label_to_grid_bag_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
++r;
@@ -81,10 +81,7 @@ AudioPanel::AudioPanel (FilmEditor* e)
add_label_to_grid_bag_sizer (grid, this, _("Audio Stream"), true, wxGBPosition (r, 0));
_stream = new wxChoice (this, wxID_ANY);
grid->Add (_stream, wxGBPosition (r, 1));
- ++r;
-
- _description = new wxStaticText (this, wxID_ANY, wxT (""));
- grid->Add (_description, wxGBPosition (r, 0));
+ _description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3));
++r;
_mapping = new AudioMappingView (this);
@@ -131,6 +128,7 @@ AudioPanel::film_content_changed (int property)
} else if (property == FFmpegContentProperty::AUDIO_STREAM) {
setup_stream_description ();
_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
+ _sizer->Layout ();
} else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
_stream->Clear ();
if (fcs) {
@@ -224,6 +222,7 @@ AudioPanel::setup_stream_description ()
{
FFmpegContentList fc = _editor->selected_ffmpeg_content ();
if (fc.size() != 1) {
+ _description->SetLabel ("");
return;
}
diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 2c0b0b4a4..e663fc3b8 100644
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -25,14 +25,14 @@ using std::string;
CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, string email)
: wxDialog (parent, wxID_ANY, std_to_wx (title))
{
- wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
- add_label_to_sizer (table, this, "Name", true);
+ add_label_to_sizer (table, this, _("Name"), true);
_name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (256, -1));
table->Add (_name, 1, wxEXPAND);
- add_label_to_sizer (table, this, "Email address for KDM delivery", true);
+ add_label_to_sizer (table, this, _("Email address for KDM delivery"), true);
_email = new wxTextCtrl (this, wxID_ANY, std_to_wx (email), wxDefaultPosition, wxSize (256, -1));
table->Add (_email, 1, wxEXPAND);
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 52c08018f..2b07dd1dc 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -135,6 +135,14 @@ ConfigDialog::make_misc_panel ()
add_label_to_sizer (table, _misc_panel, _("From address for KDM emails"), true);
_kdm_from = new wxTextCtrl (_misc_panel, wxID_ANY);
table->Add (_kdm_from, 1, wxEXPAND | wxALL);
+
+ _check_for_updates = new wxCheckBox (_misc_panel, wxID_ANY, _("Check for updates on startup"));
+ table->Add (_check_for_updates, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+
+ _check_for_test_updates = new wxCheckBox (_misc_panel, wxID_ANY, _("Check for testing updates as well as stable ones"));
+ table->Add (_check_for_test_updates, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
Config* config = Config::instance ();
@@ -171,6 +179,10 @@ ConfigDialog::make_misc_panel ()
_mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::mail_password_changed, this));
_kdm_from->SetValue (std_to_wx (config->kdm_from ()));
_kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::kdm_from_changed, this));
+ _check_for_updates->SetValue (config->check_for_updates ());
+ _check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ConfigDialog::check_for_updates_changed, this));
+ _check_for_test_updates->SetValue (config->check_for_test_updates ());
+ _check_for_test_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ConfigDialog::check_for_test_updates_changed, this));
}
void
@@ -578,3 +590,15 @@ ConfigDialog::kdm_email_changed ()
{
Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
}
+
+void
+ConfigDialog::check_for_updates_changed ()
+{
+ Config::instance()->set_check_for_updates (_check_for_updates->GetValue ());
+}
+
+void
+ConfigDialog::check_for_test_updates_changed ()
+{
+ Config::instance()->set_check_for_test_updates (_check_for_test_updates->GetValue ());
+}
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 49b466bcb..8a17de58d 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -76,6 +76,9 @@ private:
void make_colour_conversions_panel ();
void make_kdm_email_panel ();
+ void check_for_updates_changed ();
+ void check_for_test_updates_changed ();
+
wxNotebook* _notebook;
wxPanel* _misc_panel;
wxPanel* _defaults_panel;
@@ -110,6 +113,8 @@ private:
wxPanel* _kdm_email_panel;
wxTextCtrl* _kdm_email;
wxCheckBox* _use_any_servers;
+ wxCheckBox* _check_for_updates;
+ wxCheckBox* _check_for_test_updates;
EditableList<std::string, ServerDialog>* _servers_list;
};
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 83d82ae62..5a1046524 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-05 18:00+0000\n"
+"POT-Creation-Date: 2014-01-07 20:01+0000\n"
"PO-Revision-Date: 2014-01-05 23:08+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,11 +36,15 @@ msgstr "(Passwort wird in Klartext gespeichert)"
msgid "(restart DCP-o-matic to see language changes)"
msgstr "(DCP-o-matic zum ändern der Sprache neu starten)"
+#: src/wx/audio_mapping_view.cc:133
+msgid "-3dB"
+msgstr ""
+
#: src/wx/colour_conversion_editor.cc:83
msgid "1 / "
msgstr "1/"
-#: src/wx/audio_panel.cc:237
+#: src/wx/audio_panel.cc:239
msgid "1 channel"
msgstr "1 Kanal"
@@ -68,6 +72,10 @@ msgstr "3D Oben/Unten"
msgid "4K"
msgstr "4K"
+#: src/wx/update_dialog.cc:34
+msgid "A new version of DCP-o-matic is available."
+msgstr ""
+
#: src/wx/about_dialog.cc:30
msgid "About DCP-o-matic"
msgstr "Über DCP-o-matic"
@@ -116,6 +124,19 @@ msgstr "Tonspur"
msgid "Audio channels"
msgstr "Ton Kanäle"
+#: src/wx/audio_mapping_view.cc:321
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d unaltered."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d with gain "
+"%.1fdB."
+msgstr ""
+
#: src/wx/job_wrapper.cc:38
#, c-format
msgid "Bad setting for %s (%s)"
@@ -133,7 +154,7 @@ msgstr "Durchsuchen..."
msgid "But I have to use fader"
msgstr "Aber ich muss diese Lautstärke benutzen"
-#: src/wx/audio_mapping_view.cc:191
+#: src/wx/audio_mapping_view.cc:280
msgid "C"
msgstr "C"
@@ -145,10 +166,23 @@ msgstr "Berechne..."
msgid "Cancel"
msgstr "Abbrechen"
+#: src/wx/audio_gain_dialog.cc:26
+#, fuzzy
+msgid "Channel gain"
+msgstr "Kanäle"
+
#: src/wx/audio_dialog.cc:44
msgid "Channels"
msgstr "Kanäle"
+#: src/wx/config_dialog.cc:143
+msgid "Check for testing updates as well as stable ones"
+msgstr ""
+
+#: src/wx/config_dialog.cc:139
+msgid "Check for updates on startup"
+msgstr ""
+
#: src/wx/content_menu.cc:182
msgid "Choose a file"
msgstr "Datei auswählen"
@@ -182,7 +216,7 @@ msgstr "Inhalt"
msgid "Content Type"
msgstr "Inhalt Typ"
-#: src/wx/audio_mapping_view.cc:180
+#: src/wx/audio_mapping_view.cc:269
msgid "Content channel"
msgstr "Inhalt Kanal"
@@ -218,7 +252,7 @@ msgstr "DCP konnte nicht erstellt werden: %s"
msgid "Create in folder"
msgstr "In Ordner erstellen"
-#: src/wx/config_dialog.cc:332
+#: src/wx/config_dialog.cc:344
msgid "Creator"
msgstr "Ersteller"
@@ -256,31 +290,31 @@ msgstr "DCP-o-matic Einstellungen"
msgid "DCP-o-matic audio - %s"
msgstr "DCP-o-matic Ton - %s"
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:216
msgid "Default DCI name details"
msgstr "Standard DCI Name Details"
-#: src/wx/config_dialog.cc:217
+#: src/wx/config_dialog.cc:229
msgid "Default JPEG2000 bandwidth"
msgstr "Standard JPEG2000 Bandbreite"
-#: src/wx/config_dialog.cc:226
+#: src/wx/config_dialog.cc:238
msgid "Default audio delay"
msgstr "Standard Ton Delay"
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:220
msgid "Default container"
msgstr "Standard Container"
-#: src/wx/config_dialog.cc:212
+#: src/wx/config_dialog.cc:224
msgid "Default content type"
msgstr "Standard Inhalt Typ"
-#: src/wx/config_dialog.cc:196
+#: src/wx/config_dialog.cc:208
msgid "Default directory for new films"
msgstr "Standard Ordner für neue Filme"
-#: src/wx/config_dialog.cc:188
+#: src/wx/config_dialog.cc:200
msgid "Default duration of still images"
msgstr "Satndard Länge der Standbilder"
@@ -308,11 +342,17 @@ msgstr "Kino bearbeiten..."
msgid "Edit Screen..."
msgstr "Saal bearbeiten..."
-#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:134 src/wx/config_dialog.cc:217
+#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
+#: src/wx/editable_list.h:63
msgid "Edit..."
msgstr "Bearbeiten..."
+#: src/wx/cinema_dialog.cc:35
+#, fuzzy
+msgid "Email address for KDM delivery"
+msgstr "Von Adresse für KDM Emails"
+
#: src/wx/servers_list_dialog.cc:30
msgid "Encoding Servers"
msgstr "Encodier Server"
@@ -369,7 +409,11 @@ msgstr "Von"
msgid "From address for KDM emails"
msgstr "Von Adresse für KDM Emails"
-#: src/wx/timing_panel.cc:40
+#: src/wx/audio_mapping_view.cc:132
+msgid "Full"
+msgstr ""
+
+#: src/wx/timing_panel.cc:42
msgid "Full length"
msgstr "Ganze Länge"
@@ -377,6 +421,11 @@ msgstr "Ganze Länge"
msgid "Gain Calculator"
msgstr "Lautstärken Rechner"
+#: src/wx/audio_gain_dialog.cc:31
+#, c-format
+msgid "Gain for content channel %d in DCP channel %d"
+msgstr ""
+
#: src/wx/properties_dialog.cc:57
msgid "Gb"
msgstr "Gb"
@@ -393,7 +442,7 @@ msgstr "Host"
msgid "Host name or IP address"
msgstr "Host Name oder IP-Adresse"
-#: src/wx/audio_panel.cc:241
+#: src/wx/audio_panel.cc:243
msgid "Hz"
msgstr "Hz"
@@ -401,11 +450,11 @@ msgstr "Hz"
msgid "I want to play this back at fader"
msgstr "Ich möchte bei dieser Lautstärke spielen"
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:301
msgid "IP address"
msgstr "IP Adresse"
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:373
msgid "IP address / host name"
msgstr "IP Adresse / Host Name"
@@ -417,7 +466,7 @@ msgstr "Eingangs Gamma"
msgid "Interop"
msgstr "Interop"
-#: src/wx/config_dialog.cc:328
+#: src/wx/config_dialog.cc:340
msgid "Issuer"
msgstr "Herausgeber"
@@ -437,7 +486,7 @@ msgstr "KDM Email"
msgid "Keep video in sequence"
msgstr "Bildreihenfolge behalten"
-#: src/wx/audio_mapping_view.cc:183
+#: src/wx/audio_mapping_view.cc:272
msgid "L"
msgstr "L"
@@ -445,7 +494,7 @@ msgstr "L"
msgid "Left crop"
msgstr "Links beschneiden"
-#: src/wx/audio_mapping_view.cc:195
+#: src/wx/audio_mapping_view.cc:284
msgid "Lfe"
msgstr "LFE"
@@ -453,11 +502,11 @@ msgstr "LFE"
msgid "Linearise input gamma curve for low values"
msgstr "Linearisiere Eingangs Gamma für niedrige Werte"
-#: src/wx/audio_mapping_view.cc:199
+#: src/wx/audio_mapping_view.cc:288
msgid "Ls"
msgstr "SL"
-#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
msgid "MBps"
msgstr "MBps"
@@ -497,8 +546,8 @@ msgstr "Mehrere Inhalte ausgewählt"
msgid "My Documents"
msgstr "Meine Dokumente"
-#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
-#: src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
+#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
msgid "Name"
msgstr "Name"
@@ -506,6 +555,15 @@ msgstr "Name"
msgid "New Film"
msgstr "Neuer Film"
+#: src/wx/update_dialog.cc:36
+msgid "New versions of DCP-o-matic are available."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:319
+#, c-format
+msgid "No audio will be passed from content channel %d to DCP channel %d."
+msgstr ""
+
#: src/wx/video_panel.cc:198
msgid "No stretch"
msgstr "Ohne Zerrung"
@@ -514,6 +572,10 @@ msgstr "Ohne Zerrung"
msgid "None"
msgstr "Kein"
+#: src/wx/audio_mapping_view.cc:131
+msgid "Off"
+msgstr ""
+
#: src/wx/config_dialog.cc:119
msgid "Outgoing mail server"
msgstr "Ausgehender Mail Server"
@@ -531,7 +593,7 @@ msgstr "Paket Typ (e.g. OV)"
msgid "Padded with black to %dx%d (%.2f:1)\n"
msgstr "Mit Schwarz gefüllt auf %dx%d (%.2f:1)\n"
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:313
msgid "Password"
msgstr "Passwort"
@@ -547,7 +609,7 @@ msgstr "Spitze"
msgid "Play"
msgstr "Abspielen"
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:51
msgid "Play length"
msgstr "Abspiellänge"
@@ -555,11 +617,11 @@ msgstr "Abspiellänge"
msgid "Please wait; audio is being analysed..."
msgstr "Bitte warten; Ton wird analysiert..."
-#: src/wx/timing_panel.cc:37
+#: src/wx/timing_panel.cc:39
msgid "Position"
msgstr "Position"
-#: src/wx/audio_mapping_view.cc:187
+#: src/wx/audio_mapping_view.cc:276
msgid "R"
msgstr "R"
@@ -604,11 +666,15 @@ msgstr "Auflösung"
msgid "Resume"
msgstr "Neustart"
+#: src/wx/audio_mapping_view.cc:327
+msgid "Right click to change gain."
+msgstr ""
+
#: src/wx/video_panel.cc:101
msgid "Right crop"
msgstr "Rechts beschneiden"
-#: src/wx/audio_mapping_view.cc:203
+#: src/wx/audio_mapping_view.cc:292
msgid "Rs"
msgstr "SR"
@@ -641,7 +707,7 @@ msgstr "Per Email senden"
msgid "Server"
msgstr "Server"
-#: src/wx/timecode.cc:65
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
msgid "Set"
msgstr "Setzen"
@@ -665,6 +731,11 @@ msgstr "Glätten"
msgid "Snap"
msgstr "Einschnappen"
+#: src/wx/update_dialog.cc:43
+#, fuzzy
+msgid "Stable version "
+msgstr "Inhalt Version"
+
#: src/wx/film_editor.cc:185
msgid "Standard"
msgstr "Standard"
@@ -693,7 +764,7 @@ msgstr "Untertitel Spur"
msgid "Subtitles"
msgstr "Untertitel"
-#: src/wx/about_dialog.cc:131
+#: src/wx/about_dialog.cc:132
msgid "Supported by"
msgstr "Unterstützt durch"
@@ -701,7 +772,7 @@ msgstr "Unterstützt durch"
msgid "TMS"
msgstr "TMS"
-#: src/wx/config_dialog.cc:293
+#: src/wx/config_dialog.cc:305
msgid "Target path"
msgstr "Zielpfad"
@@ -709,6 +780,11 @@ msgstr "Zielpfad"
msgid "Territory (e.g. UK)"
msgstr "Gebiet (z.B. UK)"
+#: src/wx/update_dialog.cc:48
+#, fuzzy
+msgid "Test version "
+msgstr "Inhalt Version"
+
#: src/wx/content_menu.cc:223
msgid ""
"The content file(s) you specified are not the same as those that are "
@@ -743,7 +819,7 @@ msgstr "Zeitlinie"
msgid "Timeline..."
msgstr "Zeitlinie..."
-#: src/wx/timing_panel.cc:32
+#: src/wx/timing_panel.cc:34
msgid "Timing"
msgstr "Timing"
@@ -755,11 +831,11 @@ msgstr "Oben beschneiden"
msgid "Translated by"
msgstr "Übersetzt von"
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:48
msgid "Trim from end"
msgstr "Schnitt vom Ende"
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:45
msgid "Trim from start"
msgstr "Schnitt vom Anfang"
@@ -775,11 +851,15 @@ msgstr "Bis"
msgid "Up"
msgstr "Nach oben"
+#: src/wx/update_dialog.cc:27
+msgid "Update"
+msgstr ""
+
#: src/wx/film_editor.cc:126
msgid "Use DCI name"
msgstr "DCI Name benutzen"
-#: src/wx/config_dialog.cc:357
+#: src/wx/config_dialog.cc:369
msgid "Use all servers"
msgstr "Alle Server benutzen"
@@ -791,7 +871,7 @@ msgstr "Beste benutzen"
msgid "Use preset"
msgstr "Preset benutzen"
-#: src/wx/config_dialog.cc:297
+#: src/wx/config_dialog.cc:309
msgid "User name"
msgstr "Benutzer Name"
@@ -799,6 +879,11 @@ msgstr "Benutzer Name"
msgid "Video"
msgstr "Bild"
+#: src/wx/timing_panel.cc:56
+#, fuzzy
+msgid "Video frame rate"
+msgstr "Bild Rate"
+
#: src/wx/subtitle_panel.cc:39
msgid "With Subtitles"
msgstr "Mit Untertitel"
@@ -850,7 +935,7 @@ msgstr ""
msgid "audio"
msgstr "Ton"
-#: src/wx/audio_panel.cc:239
+#: src/wx/audio_panel.cc:241
msgid "channels"
msgstr "Kanäle"
@@ -858,16 +943,16 @@ msgstr "Kanäle"
msgid "counting..."
msgstr "zähle..."
-#: src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
msgid "dB"
msgstr "dB"
#. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
msgid "ms"
msgstr "ms"
-#: src/wx/config_dialog.cc:192
+#: src/wx/config_dialog.cc:204
msgid "s"
msgstr "s"
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 7db715459..c85405549 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libdcpomatic-wx\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-05 18:00+0000\n"
+"POT-Creation-Date: 2014-01-07 20:01+0000\n"
"PO-Revision-Date: 2013-11-09 03:00-0500\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -36,11 +36,15 @@ msgstr ""
msgid "(restart DCP-o-matic to see language changes)"
msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
+#: src/wx/audio_mapping_view.cc:133
+msgid "-3dB"
+msgstr ""
+
#: src/wx/colour_conversion_editor.cc:83
msgid "1 / "
msgstr ""
-#: src/wx/audio_panel.cc:237
+#: src/wx/audio_panel.cc:239
msgid "1 channel"
msgstr "1 canal"
@@ -68,6 +72,10 @@ msgstr ""
msgid "4K"
msgstr ""
+#: src/wx/update_dialog.cc:34
+msgid "A new version of DCP-o-matic is available."
+msgstr ""
+
#: src/wx/about_dialog.cc:30
#, fuzzy
msgid "About DCP-o-matic"
@@ -119,6 +127,19 @@ msgstr "Retardo del audio"
msgid "Audio channels"
msgstr "canales"
+#: src/wx/audio_mapping_view.cc:321
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d unaltered."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d with gain "
+"%.1fdB."
+msgstr ""
+
#: src/wx/job_wrapper.cc:38
#, c-format
msgid "Bad setting for %s (%s)"
@@ -136,7 +157,7 @@ msgstr "Explorar..."
msgid "But I have to use fader"
msgstr "pero tengo que usar el fader a"
-#: src/wx/audio_mapping_view.cc:191
+#: src/wx/audio_mapping_view.cc:280
msgid "C"
msgstr ""
@@ -148,10 +169,23 @@ msgstr "Calcular..."
msgid "Cancel"
msgstr "Cancelar"
+#: src/wx/audio_gain_dialog.cc:26
+#, fuzzy
+msgid "Channel gain"
+msgstr "Canales"
+
#: src/wx/audio_dialog.cc:44
msgid "Channels"
msgstr "Canales"
+#: src/wx/config_dialog.cc:143
+msgid "Check for testing updates as well as stable ones"
+msgstr ""
+
+#: src/wx/config_dialog.cc:139
+msgid "Check for updates on startup"
+msgstr ""
+
#: src/wx/content_menu.cc:182
#, fuzzy
msgid "Choose a file"
@@ -188,7 +222,7 @@ msgstr "Contenido"
msgid "Content Type"
msgstr "Tipo de contenido"
-#: src/wx/audio_mapping_view.cc:180
+#: src/wx/audio_mapping_view.cc:269
#, fuzzy
msgid "Content channel"
msgstr "1 canal"
@@ -226,7 +260,7 @@ msgstr "No se pudo crear el DCP: %s"
msgid "Create in folder"
msgstr "Crear en carpeta"
-#: src/wx/config_dialog.cc:332
+#: src/wx/config_dialog.cc:344
#, fuzzy
msgid "Creator"
msgstr "Crear en carpeta"
@@ -265,35 +299,35 @@ msgstr "Preferencias DCP-o-matic"
msgid "DCP-o-matic audio - %s"
msgstr "Audio DCP-o-matic - %1"
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:216
msgid "Default DCI name details"
msgstr "Detalles por defecto del nombre DCI"
-#: src/wx/config_dialog.cc:217
+#: src/wx/config_dialog.cc:229
#, fuzzy
msgid "Default JPEG2000 bandwidth"
msgstr "Ancho de banda JPEG2000"
-#: src/wx/config_dialog.cc:226
+#: src/wx/config_dialog.cc:238
#, fuzzy
msgid "Default audio delay"
msgstr "Tipo de contenido"
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:220
#, fuzzy
msgid "Default container"
msgstr "Tipo de contenido"
-#: src/wx/config_dialog.cc:212
+#: src/wx/config_dialog.cc:224
#, fuzzy
msgid "Default content type"
msgstr "Tipo de contenido"
-#: src/wx/config_dialog.cc:196
+#: src/wx/config_dialog.cc:208
msgid "Default directory for new films"
msgstr "Carpeta por defecto para nuevas películas"
-#: src/wx/config_dialog.cc:188
+#: src/wx/config_dialog.cc:200
#, fuzzy
msgid "Default duration of still images"
msgstr "Carpeta por defecto para nuevas películas"
@@ -324,11 +358,17 @@ msgstr "Editar..."
msgid "Edit Screen..."
msgstr "Editar..."
-#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:134 src/wx/config_dialog.cc:217
+#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
+#: src/wx/editable_list.h:63
msgid "Edit..."
msgstr "Editar..."
+#: src/wx/cinema_dialog.cc:35
+#, fuzzy
+msgid "Email address for KDM delivery"
+msgstr "Remitente para los emails de KDM"
+
#: src/wx/servers_list_dialog.cc:30
#, fuzzy
msgid "Encoding Servers"
@@ -389,7 +429,11 @@ msgstr "De"
msgid "From address for KDM emails"
msgstr "Remitente para los emails de KDM"
-#: src/wx/timing_panel.cc:40
+#: src/wx/audio_mapping_view.cc:132
+msgid "Full"
+msgstr ""
+
+#: src/wx/timing_panel.cc:42
msgid "Full length"
msgstr ""
@@ -397,6 +441,11 @@ msgstr ""
msgid "Gain Calculator"
msgstr "Calculadora de ganancia"
+#: src/wx/audio_gain_dialog.cc:31
+#, c-format
+msgid "Gain for content channel %d in DCP channel %d"
+msgstr ""
+
#: src/wx/properties_dialog.cc:57
msgid "Gb"
msgstr "Gb"
@@ -413,7 +462,7 @@ msgstr ""
msgid "Host name or IP address"
msgstr "Nombre o dirección IP"
-#: src/wx/audio_panel.cc:241
+#: src/wx/audio_panel.cc:243
msgid "Hz"
msgstr "Hz"
@@ -421,11 +470,11 @@ msgstr "Hz"
msgid "I want to play this back at fader"
msgstr "Quiero reproducir con el fader a"
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:301
msgid "IP address"
msgstr "Dirección IP"
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:373
#, fuzzy
msgid "IP address / host name"
msgstr "Dirección IP"
@@ -438,7 +487,7 @@ msgstr "Gamma de entrada"
msgid "Interop"
msgstr ""
-#: src/wx/config_dialog.cc:328
+#: src/wx/config_dialog.cc:340
msgid "Issuer"
msgstr "Emisor"
@@ -458,7 +507,7 @@ msgstr "Email KDM"
msgid "Keep video in sequence"
msgstr "Mantener el video secuencia"
-#: src/wx/audio_mapping_view.cc:183
+#: src/wx/audio_mapping_view.cc:272
msgid "L"
msgstr ""
@@ -466,7 +515,7 @@ msgstr ""
msgid "Left crop"
msgstr "Recorte izquierda"
-#: src/wx/audio_mapping_view.cc:195
+#: src/wx/audio_mapping_view.cc:284
msgid "Lfe"
msgstr ""
@@ -474,12 +523,12 @@ msgstr ""
msgid "Linearise input gamma curve for low values"
msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
-#: src/wx/audio_mapping_view.cc:199
+#: src/wx/audio_mapping_view.cc:288
#, fuzzy
msgid "Ls"
msgstr "s"
-#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
msgid "MBps"
msgstr "MBps"
@@ -522,8 +571,8 @@ msgstr "Tipo de contenido"
msgid "My Documents"
msgstr "Mis documentos"
-#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
-#: src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
+#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
msgid "Name"
msgstr "Nombre"
@@ -531,6 +580,15 @@ msgstr "Nombre"
msgid "New Film"
msgstr "Nueva película"
+#: src/wx/update_dialog.cc:36
+msgid "New versions of DCP-o-matic are available."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:319
+#, c-format
+msgid "No audio will be passed from content channel %d to DCP channel %d."
+msgstr ""
+
#: src/wx/video_panel.cc:198
msgid "No stretch"
msgstr "Sin deformar"
@@ -539,6 +597,10 @@ msgstr "Sin deformar"
msgid "None"
msgstr "Ninguno"
+#: src/wx/audio_mapping_view.cc:131
+msgid "Off"
+msgstr ""
+
#: src/wx/config_dialog.cc:119
#, fuzzy
msgid "Outgoing mail server"
@@ -557,7 +619,7 @@ msgstr "Tipo de paquete (ej. OV)"
msgid "Padded with black to %dx%d (%.2f:1)\n"
msgstr "Completado con negro hasta %dx%d (%.2f:1)\n"
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:313
#, fuzzy
msgid "Password"
msgstr "Clave del TMS"
@@ -574,7 +636,7 @@ msgstr "Pico"
msgid "Play"
msgstr "Reproducir"
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:51
msgid "Play length"
msgstr ""
@@ -582,11 +644,11 @@ msgstr ""
msgid "Please wait; audio is being analysed..."
msgstr "Por favor espere, el audio está siendo analizado..."
-#: src/wx/timing_panel.cc:37
+#: src/wx/timing_panel.cc:39
msgid "Position"
msgstr "Posición"
-#: src/wx/audio_mapping_view.cc:187
+#: src/wx/audio_mapping_view.cc:276
msgid "R"
msgstr ""
@@ -634,11 +696,15 @@ msgstr "Resolución"
msgid "Resume"
msgstr "Continuar"
+#: src/wx/audio_mapping_view.cc:327
+msgid "Right click to change gain."
+msgstr ""
+
#: src/wx/video_panel.cc:101
msgid "Right crop"
msgstr "Recorte derecha"
-#: src/wx/audio_mapping_view.cc:203
+#: src/wx/audio_mapping_view.cc:292
#, fuzzy
msgid "Rs"
msgstr "s"
@@ -674,7 +740,7 @@ msgstr "Enviar por email"
msgid "Server"
msgstr "Servidor"
-#: src/wx/timecode.cc:65
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
msgid "Set"
msgstr "Seleccionar"
@@ -698,6 +764,11 @@ msgstr "Suavizado"
msgid "Snap"
msgstr ""
+#: src/wx/update_dialog.cc:43
+#, fuzzy
+msgid "Stable version "
+msgstr "Tipo de contenido"
+
#: src/wx/film_editor.cc:185
msgid "Standard"
msgstr "Estandard"
@@ -727,7 +798,7 @@ msgstr "Escala del subtítulo"
msgid "Subtitles"
msgstr "Subtítulos"
-#: src/wx/about_dialog.cc:131
+#: src/wx/about_dialog.cc:132
msgid "Supported by"
msgstr "Soportado por"
@@ -736,7 +807,7 @@ msgstr "Soportado por"
msgid "TMS"
msgstr "RMS"
-#: src/wx/config_dialog.cc:293
+#: src/wx/config_dialog.cc:305
#, fuzzy
msgid "Target path"
msgstr "Ruta en el TMS"
@@ -745,6 +816,11 @@ msgstr "Ruta en el TMS"
msgid "Territory (e.g. UK)"
msgstr "Territorio (ej. ES)"
+#: src/wx/update_dialog.cc:48
+#, fuzzy
+msgid "Test version "
+msgstr "Tipo de contenido"
+
#: src/wx/content_menu.cc:223
msgid ""
"The content file(s) you specified are not the same as those that are "
@@ -777,7 +853,7 @@ msgstr "Tiempo"
msgid "Timeline..."
msgstr "Linea de tiempo..."
-#: src/wx/timing_panel.cc:32
+#: src/wx/timing_panel.cc:34
msgid "Timing"
msgstr ""
@@ -789,12 +865,12 @@ msgstr "Recortar arriba"
msgid "Translated by"
msgstr "Traducido por"
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:48
#, fuzzy
msgid "Trim from end"
msgstr "Recortar fotogramas"
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:45
#, fuzzy
msgid "Trim from start"
msgstr "Recortar fotogramas"
@@ -811,11 +887,15 @@ msgstr "Hasta"
msgid "Up"
msgstr ""
+#: src/wx/update_dialog.cc:27
+msgid "Update"
+msgstr ""
+
#: src/wx/film_editor.cc:126
msgid "Use DCI name"
msgstr "Usar el nombre DCI"
-#: src/wx/config_dialog.cc:357
+#: src/wx/config_dialog.cc:369
msgid "Use all servers"
msgstr ""
@@ -828,7 +908,7 @@ msgstr "Usar la mejor"
msgid "Use preset"
msgstr "Usar la mejor"
-#: src/wx/config_dialog.cc:297
+#: src/wx/config_dialog.cc:309
#, fuzzy
msgid "User name"
msgstr "Usar el nombre DCI"
@@ -837,6 +917,11 @@ msgstr "Usar el nombre DCI"
msgid "Video"
msgstr "Vídeo"
+#: src/wx/timing_panel.cc:56
+#, fuzzy
+msgid "Video frame rate"
+msgstr "Velocidad DCP"
+
#: src/wx/subtitle_panel.cc:39
msgid "With Subtitles"
msgstr "Con subtítulos"
@@ -880,7 +965,7 @@ msgstr ""
msgid "audio"
msgstr "Audio"
-#: src/wx/audio_panel.cc:239
+#: src/wx/audio_panel.cc:241
msgid "channels"
msgstr "canales"
@@ -888,16 +973,16 @@ msgstr "canales"
msgid "counting..."
msgstr "contando..."
-#: src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
msgid "dB"
msgstr "dB"
#. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
msgid "ms"
msgstr "ms"
-#: src/wx/config_dialog.cc:192
+#: src/wx/config_dialog.cc:204
msgid "s"
msgstr "s"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 4af528c15..f8460ba46 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-05 18:00+0000\n"
+"POT-Creation-Date: 2014-01-07 20:01+0000\n"
"PO-Revision-Date: 2013-11-25 19:28+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -37,11 +37,15 @@ msgid "(restart DCP-o-matic to see language changes)"
msgstr ""
"(redémarrez DCP-o-matic pour que les changements de langue prennent effet)"
+#: src/wx/audio_mapping_view.cc:133
+msgid "-3dB"
+msgstr ""
+
#: src/wx/colour_conversion_editor.cc:83
msgid "1 / "
msgstr ""
-#: src/wx/audio_panel.cc:237
+#: src/wx/audio_panel.cc:239
msgid "1 channel"
msgstr "1 canal"
@@ -69,6 +73,10 @@ msgstr ""
msgid "4K"
msgstr ""
+#: src/wx/update_dialog.cc:34
+msgid "A new version of DCP-o-matic is available."
+msgstr ""
+
#: src/wx/about_dialog.cc:30
msgid "About DCP-o-matic"
msgstr "À propos de DCP-o-matic"
@@ -117,6 +125,19 @@ msgstr "Flux audio"
msgid "Audio channels"
msgstr "Canaux audios"
+#: src/wx/audio_mapping_view.cc:321
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d unaltered."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d with gain "
+"%.1fdB."
+msgstr ""
+
#: src/wx/job_wrapper.cc:38
#, c-format
msgid "Bad setting for %s (%s)"
@@ -134,7 +155,7 @@ msgstr "Parcourir..."
msgid "But I have to use fader"
msgstr "Je souhaite utiliser ce volume"
-#: src/wx/audio_mapping_view.cc:191
+#: src/wx/audio_mapping_view.cc:280
msgid "C"
msgstr "C"
@@ -146,10 +167,23 @@ msgstr "Calcul..."
msgid "Cancel"
msgstr "Annuler"
+#: src/wx/audio_gain_dialog.cc:26
+#, fuzzy
+msgid "Channel gain"
+msgstr "Canaux"
+
#: src/wx/audio_dialog.cc:44
msgid "Channels"
msgstr "Canaux"
+#: src/wx/config_dialog.cc:143
+msgid "Check for testing updates as well as stable ones"
+msgstr ""
+
+#: src/wx/config_dialog.cc:139
+msgid "Check for updates on startup"
+msgstr ""
+
#: src/wx/content_menu.cc:182
#, fuzzy
msgid "Choose a file"
@@ -184,7 +218,7 @@ msgstr "Contenu"
msgid "Content Type"
msgstr "Type de Contenu"
-#: src/wx/audio_mapping_view.cc:180
+#: src/wx/audio_mapping_view.cc:269
msgid "Content channel"
msgstr "Contenu audio"
@@ -220,7 +254,7 @@ msgstr "Impossible de créer le DCP : %s"
msgid "Create in folder"
msgstr "Créer dans le dossier"
-#: src/wx/config_dialog.cc:332
+#: src/wx/config_dialog.cc:344
msgid "Creator"
msgstr "Créateur"
@@ -258,32 +292,32 @@ msgstr "Préférences DCP-o-matic"
msgid "DCP-o-matic audio - %s"
msgstr "Son DCP-o-matic - %s"
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:216
msgid "Default DCI name details"
msgstr "Détails du nom DCI par défaut"
-#: src/wx/config_dialog.cc:217
+#: src/wx/config_dialog.cc:229
msgid "Default JPEG2000 bandwidth"
msgstr "Qualité JPEG2000 par défaut"
-#: src/wx/config_dialog.cc:226
+#: src/wx/config_dialog.cc:238
#, fuzzy
msgid "Default audio delay"
msgstr "Type de contenu par défaut"
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:220
msgid "Default container"
msgstr "Type de contenu par défaut"
-#: src/wx/config_dialog.cc:212
+#: src/wx/config_dialog.cc:224
msgid "Default content type"
msgstr "Type de contenu par défaut"
-#: src/wx/config_dialog.cc:196
+#: src/wx/config_dialog.cc:208
msgid "Default directory for new films"
msgstr "Dossier par défaut des nouveaux films"
-#: src/wx/config_dialog.cc:188
+#: src/wx/config_dialog.cc:200
msgid "Default duration of still images"
msgstr "Durée par défaut des images fixes"
@@ -312,11 +346,16 @@ msgstr "Éditer le cinéma"
msgid "Edit Screen..."
msgstr "Éditer la salle"
-#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:134 src/wx/config_dialog.cc:217
+#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
+#: src/wx/editable_list.h:63
msgid "Edit..."
msgstr "Éditer..."
+#: src/wx/cinema_dialog.cc:35
+msgid "Email address for KDM delivery"
+msgstr ""
+
#: src/wx/servers_list_dialog.cc:30
#, fuzzy
msgid "Encoding Servers"
@@ -374,7 +413,11 @@ msgstr "À partir du"
msgid "From address for KDM emails"
msgstr ""
-#: src/wx/timing_panel.cc:40
+#: src/wx/audio_mapping_view.cc:132
+msgid "Full"
+msgstr ""
+
+#: src/wx/timing_panel.cc:42
msgid "Full length"
msgstr ""
@@ -382,6 +425,11 @@ msgstr ""
msgid "Gain Calculator"
msgstr "Calculateur de gain"
+#: src/wx/audio_gain_dialog.cc:31
+#, c-format
+msgid "Gain for content channel %d in DCP channel %d"
+msgstr ""
+
#: src/wx/properties_dialog.cc:57
msgid "Gb"
msgstr "Gb"
@@ -398,7 +446,7 @@ msgstr ""
msgid "Host name or IP address"
msgstr "Nom de l'hôte ou adresse IP"
-#: src/wx/audio_panel.cc:241
+#: src/wx/audio_panel.cc:243
msgid "Hz"
msgstr "Hz"
@@ -406,11 +454,11 @@ msgstr "Hz"
msgid "I want to play this back at fader"
msgstr "Je veux le jouer à ce volume"
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:301
msgid "IP address"
msgstr "Adresse IP"
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:373
#, fuzzy
msgid "IP address / host name"
msgstr "Adresse IP"
@@ -423,7 +471,7 @@ msgstr "Gamma d'entrée"
msgid "Interop"
msgstr ""
-#: src/wx/config_dialog.cc:328
+#: src/wx/config_dialog.cc:340
msgid "Issuer"
msgstr "Emetteur"
@@ -443,7 +491,7 @@ msgstr "e-mail des KDM"
msgid "Keep video in sequence"
msgstr "Garder la vidéo en séquence"
-#: src/wx/audio_mapping_view.cc:183
+#: src/wx/audio_mapping_view.cc:272
msgid "L"
msgstr "L"
@@ -451,7 +499,7 @@ msgstr "L"
msgid "Left crop"
msgstr "Découpe gauche"
-#: src/wx/audio_mapping_view.cc:195
+#: src/wx/audio_mapping_view.cc:284
msgid "Lfe"
msgstr "Lfe"
@@ -459,11 +507,11 @@ msgstr "Lfe"
msgid "Linearise input gamma curve for low values"
msgstr "Linéariser la courbe gamma d'entrée pour les bas niveaux"
-#: src/wx/audio_mapping_view.cc:199
+#: src/wx/audio_mapping_view.cc:288
msgid "Ls"
msgstr "Ls"
-#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
msgid "MBps"
msgstr "MBps"
@@ -506,8 +554,8 @@ msgstr "Type de contenu par défaut"
msgid "My Documents"
msgstr "Mes Documents"
-#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
-#: src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
+#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
msgid "Name"
msgstr "Nom"
@@ -515,6 +563,15 @@ msgstr "Nom"
msgid "New Film"
msgstr "Nouveau Film"
+#: src/wx/update_dialog.cc:36
+msgid "New versions of DCP-o-matic are available."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:319
+#, c-format
+msgid "No audio will be passed from content channel %d to DCP channel %d."
+msgstr ""
+
#: src/wx/video_panel.cc:198
msgid "No stretch"
msgstr "Pas d'étirement"
@@ -523,6 +580,10 @@ msgstr "Pas d'étirement"
msgid "None"
msgstr "Aucun"
+#: src/wx/audio_mapping_view.cc:131
+msgid "Off"
+msgstr ""
+
#: src/wx/config_dialog.cc:119
msgid "Outgoing mail server"
msgstr "Serveurs de messagerie sortante"
@@ -540,7 +601,7 @@ msgstr "Type de paquet (ex. OV)"
msgid "Padded with black to %dx%d (%.2f:1)\n"
msgstr "Enveloppe noire de %dx%d (%.2f:1)\n"
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:313
msgid "Password"
msgstr "Mot de passe"
@@ -556,7 +617,7 @@ msgstr "Crête"
msgid "Play"
msgstr "Lecture"
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:51
msgid "Play length"
msgstr ""
@@ -564,11 +625,11 @@ msgstr ""
msgid "Please wait; audio is being analysed..."
msgstr "Merci de patienter ; analyse de la piste son..."
-#: src/wx/timing_panel.cc:37
+#: src/wx/timing_panel.cc:39
msgid "Position"
msgstr "Position"
-#: src/wx/audio_mapping_view.cc:187
+#: src/wx/audio_mapping_view.cc:276
msgid "R"
msgstr "R"
@@ -613,11 +674,15 @@ msgstr "Résolution"
msgid "Resume"
msgstr "Reprendre"
+#: src/wx/audio_mapping_view.cc:327
+msgid "Right click to change gain."
+msgstr ""
+
#: src/wx/video_panel.cc:101
msgid "Right crop"
msgstr "Découpe droite"
-#: src/wx/audio_mapping_view.cc:203
+#: src/wx/audio_mapping_view.cc:292
msgid "Rs"
msgstr "Rs"
@@ -650,7 +715,7 @@ msgstr "Envoyé par e-mail"
msgid "Server"
msgstr "Serveur"
-#: src/wx/timecode.cc:65
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
msgid "Set"
msgstr "Sélection"
@@ -674,6 +739,11 @@ msgstr "Lissage"
msgid "Snap"
msgstr ""
+#: src/wx/update_dialog.cc:43
+#, fuzzy
+msgid "Stable version "
+msgstr "Version du contenu"
+
#: src/wx/film_editor.cc:185
msgid "Standard"
msgstr "Standard"
@@ -702,7 +772,7 @@ msgstr "Flux de sous-titre"
msgid "Subtitles"
msgstr "Sous-titres"
-#: src/wx/about_dialog.cc:131
+#: src/wx/about_dialog.cc:132
msgid "Supported by"
msgstr "Soutenu par"
@@ -710,7 +780,7 @@ msgstr "Soutenu par"
msgid "TMS"
msgstr "TMS"
-#: src/wx/config_dialog.cc:293
+#: src/wx/config_dialog.cc:305
msgid "Target path"
msgstr "Chemin d'accès"
@@ -718,6 +788,11 @@ msgstr "Chemin d'accès"
msgid "Territory (e.g. UK)"
msgstr "Territoire (ex. FR)"
+#: src/wx/update_dialog.cc:48
+#, fuzzy
+msgid "Test version "
+msgstr "Version du contenu"
+
#: src/wx/content_menu.cc:223
msgid ""
"The content file(s) you specified are not the same as those that are "
@@ -749,7 +824,7 @@ msgstr "Timeline"
msgid "Timeline..."
msgstr "Timeline..."
-#: src/wx/timing_panel.cc:32
+#: src/wx/timing_panel.cc:34
msgid "Timing"
msgstr ""
@@ -761,11 +836,11 @@ msgstr "Découpe haut"
msgid "Translated by"
msgstr "Traduit par"
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:48
msgid "Trim from end"
msgstr "Images coupées depuis la fin"
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:45
msgid "Trim from start"
msgstr "Images coupées depuis le début"
@@ -781,11 +856,15 @@ msgstr "Jusqu'au"
msgid "Up"
msgstr ""
+#: src/wx/update_dialog.cc:27
+msgid "Update"
+msgstr ""
+
#: src/wx/film_editor.cc:126
msgid "Use DCI name"
msgstr "Utiliser le nom DCI"
-#: src/wx/config_dialog.cc:357
+#: src/wx/config_dialog.cc:369
msgid "Use all servers"
msgstr ""
@@ -797,7 +876,7 @@ msgstr "Automatique"
msgid "Use preset"
msgstr "Utiliser le préréglage"
-#: src/wx/config_dialog.cc:297
+#: src/wx/config_dialog.cc:309
msgid "User name"
msgstr "Nom d'utilisateur"
@@ -805,6 +884,11 @@ msgstr "Nom d'utilisateur"
msgid "Video"
msgstr "Vidéo"
+#: src/wx/timing_panel.cc:56
+#, fuzzy
+msgid "Video frame rate"
+msgstr "Cadence image"
+
#: src/wx/subtitle_panel.cc:39
msgid "With Subtitles"
msgstr "Avec sous-titres"
@@ -847,7 +931,7 @@ msgstr ""
msgid "audio"
msgstr "audio"
-#: src/wx/audio_panel.cc:239
+#: src/wx/audio_panel.cc:241
msgid "channels"
msgstr "canaux"
@@ -855,16 +939,16 @@ msgstr "canaux"
msgid "counting..."
msgstr "calcul..."
-#: src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
msgid "dB"
msgstr "dB"
#. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
msgid "ms"
msgstr "ms"
-#: src/wx/config_dialog.cc:192
+#: src/wx/config_dialog.cc:204
msgid "s"
msgstr "s"
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index bd7f5f136..553971039 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: 2014-01-05 18:00+0000\n"
+"POT-Creation-Date: 2014-01-07 20:01+0000\n"
"PO-Revision-Date: 2013-04-28 10:27+0100\n"
"Last-Translator: Maci <macibro@gmail.com>\n"
"Language-Team: \n"
@@ -34,11 +34,15 @@ msgstr ""
msgid "(restart DCP-o-matic to see language changes)"
msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
+#: src/wx/audio_mapping_view.cc:133
+msgid "-3dB"
+msgstr ""
+
#: src/wx/colour_conversion_editor.cc:83
msgid "1 / "
msgstr ""
-#: src/wx/audio_panel.cc:237
+#: src/wx/audio_panel.cc:239
msgid "1 channel"
msgstr "1 canale"
@@ -66,6 +70,10 @@ msgstr ""
msgid "4K"
msgstr ""
+#: src/wx/update_dialog.cc:34
+msgid "A new version of DCP-o-matic is available."
+msgstr ""
+
#: src/wx/about_dialog.cc:30
#, fuzzy
msgid "About DCP-o-matic"
@@ -117,6 +125,19 @@ msgstr "Ritardo dell'audio"
msgid "Audio channels"
msgstr "canali"
+#: src/wx/audio_mapping_view.cc:321
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d unaltered."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d with gain "
+"%.1fdB."
+msgstr ""
+
#: src/wx/job_wrapper.cc:38
#, c-format
msgid "Bad setting for %s (%s)"
@@ -134,7 +155,7 @@ msgstr "Sfoglia..."
msgid "But I have to use fader"
msgstr "Ma dovrò riprodurre con il fader a"
-#: src/wx/audio_mapping_view.cc:191
+#: src/wx/audio_mapping_view.cc:280
msgid "C"
msgstr ""
@@ -146,10 +167,23 @@ msgstr "Calcola..."
msgid "Cancel"
msgstr "Annulla"
+#: src/wx/audio_gain_dialog.cc:26
+#, fuzzy
+msgid "Channel gain"
+msgstr "Canali"
+
#: src/wx/audio_dialog.cc:44
msgid "Channels"
msgstr "Canali"
+#: src/wx/config_dialog.cc:143
+msgid "Check for testing updates as well as stable ones"
+msgstr ""
+
+#: src/wx/config_dialog.cc:139
+msgid "Check for updates on startup"
+msgstr ""
+
#: src/wx/content_menu.cc:182
#, fuzzy
msgid "Choose a file"
@@ -186,7 +220,7 @@ msgstr "Contenuto"
msgid "Content Type"
msgstr "Tipo di contenuto"
-#: src/wx/audio_mapping_view.cc:180
+#: src/wx/audio_mapping_view.cc:269
#, fuzzy
msgid "Content channel"
msgstr "1 canale"
@@ -224,7 +258,7 @@ msgstr "Non posso creare il DCP: %s"
msgid "Create in folder"
msgstr "Crea nella cartella"
-#: src/wx/config_dialog.cc:332
+#: src/wx/config_dialog.cc:344
#, fuzzy
msgid "Creator"
msgstr "Crea nella cartella"
@@ -263,35 +297,35 @@ msgstr "Preferenze DCP-o-matic"
msgid "DCP-o-matic audio - %s"
msgstr "Audio DCP-o-matic - %s"
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:216
msgid "Default DCI name details"
msgstr "Dettagli del nome di default DCI"
-#: src/wx/config_dialog.cc:217
+#: src/wx/config_dialog.cc:229
#, fuzzy
msgid "Default JPEG2000 bandwidth"
msgstr "Banda passante JPEG2000"
-#: src/wx/config_dialog.cc:226
+#: src/wx/config_dialog.cc:238
#, fuzzy
msgid "Default audio delay"
msgstr "Tipo di contenuto"
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:220
#, fuzzy
msgid "Default container"
msgstr "Tipo di contenuto"
-#: src/wx/config_dialog.cc:212
+#: src/wx/config_dialog.cc:224
#, fuzzy
msgid "Default content type"
msgstr "Tipo di contenuto"
-#: src/wx/config_dialog.cc:196
+#: src/wx/config_dialog.cc:208
msgid "Default directory for new films"
msgstr "Directory di default per i nuovi films"
-#: src/wx/config_dialog.cc:188
+#: src/wx/config_dialog.cc:200
#, fuzzy
msgid "Default duration of still images"
msgstr "Directory di default per i nuovi films"
@@ -322,11 +356,16 @@ msgstr "Modifica..."
msgid "Edit Screen..."
msgstr "Modifica..."
-#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:134 src/wx/config_dialog.cc:217
+#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
+#: src/wx/editable_list.h:63
msgid "Edit..."
msgstr "Modifica..."
+#: src/wx/cinema_dialog.cc:35
+msgid "Email address for KDM delivery"
+msgstr ""
+
#: src/wx/servers_list_dialog.cc:30
#, fuzzy
msgid "Encoding Servers"
@@ -386,7 +425,11 @@ msgstr ""
msgid "From address for KDM emails"
msgstr ""
-#: src/wx/timing_panel.cc:40
+#: src/wx/audio_mapping_view.cc:132
+msgid "Full"
+msgstr ""
+
+#: src/wx/timing_panel.cc:42
msgid "Full length"
msgstr ""
@@ -394,6 +437,11 @@ msgstr ""
msgid "Gain Calculator"
msgstr "Calcolatore del guadagno audio"
+#: src/wx/audio_gain_dialog.cc:31
+#, c-format
+msgid "Gain for content channel %d in DCP channel %d"
+msgstr ""
+
#: src/wx/properties_dialog.cc:57
msgid "Gb"
msgstr "Gb"
@@ -410,7 +458,7 @@ msgstr ""
msgid "Host name or IP address"
msgstr "Nome dell'Host o indirizzo IP"
-#: src/wx/audio_panel.cc:241
+#: src/wx/audio_panel.cc:243
msgid "Hz"
msgstr "Hz"
@@ -418,11 +466,11 @@ msgstr "Hz"
msgid "I want to play this back at fader"
msgstr "Sto usando il fader a"
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:301
msgid "IP address"
msgstr "Indirizzo IP"
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:373
#, fuzzy
msgid "IP address / host name"
msgstr "Indirizzo IP"
@@ -435,7 +483,7 @@ msgstr ""
msgid "Interop"
msgstr ""
-#: src/wx/config_dialog.cc:328
+#: src/wx/config_dialog.cc:340
msgid "Issuer"
msgstr ""
@@ -455,7 +503,7 @@ msgstr ""
msgid "Keep video in sequence"
msgstr ""
-#: src/wx/audio_mapping_view.cc:183
+#: src/wx/audio_mapping_view.cc:272
msgid "L"
msgstr ""
@@ -463,7 +511,7 @@ msgstr ""
msgid "Left crop"
msgstr "Taglio a sinistra"
-#: src/wx/audio_mapping_view.cc:195
+#: src/wx/audio_mapping_view.cc:284
msgid "Lfe"
msgstr ""
@@ -471,12 +519,12 @@ msgstr ""
msgid "Linearise input gamma curve for low values"
msgstr ""
-#: src/wx/audio_mapping_view.cc:199
+#: src/wx/audio_mapping_view.cc:288
#, fuzzy
msgid "Ls"
msgstr "s"
-#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
msgid "MBps"
msgstr "MBps"
@@ -519,8 +567,8 @@ msgstr "Tipo di contenuto"
msgid "My Documents"
msgstr "Documenti"
-#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
-#: src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
+#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
msgid "Name"
msgstr "Nome"
@@ -528,6 +576,15 @@ msgstr "Nome"
msgid "New Film"
msgstr "Nuovo Film"
+#: src/wx/update_dialog.cc:36
+msgid "New versions of DCP-o-matic are available."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:319
+#, c-format
+msgid "No audio will be passed from content channel %d to DCP channel %d."
+msgstr ""
+
#: src/wx/video_panel.cc:198
msgid "No stretch"
msgstr ""
@@ -536,6 +593,10 @@ msgstr ""
msgid "None"
msgstr "Nessuno"
+#: src/wx/audio_mapping_view.cc:131
+msgid "Off"
+msgstr ""
+
#: src/wx/config_dialog.cc:119
#, fuzzy
msgid "Outgoing mail server"
@@ -554,7 +615,7 @@ msgstr "Tipo di Package (es. OV)"
msgid "Padded with black to %dx%d (%.2f:1)\n"
msgstr "Riempito con nero a %dx%d (%.2f:1)\n"
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:313
#, fuzzy
msgid "Password"
msgstr "Password del TMS"
@@ -571,7 +632,7 @@ msgstr "Picco"
msgid "Play"
msgstr "Riproduci"
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:51
msgid "Play length"
msgstr ""
@@ -579,11 +640,11 @@ msgstr ""
msgid "Please wait; audio is being analysed..."
msgstr "Attendere prego; sto analizzando l'audio..."
-#: src/wx/timing_panel.cc:37
+#: src/wx/timing_panel.cc:39
msgid "Position"
msgstr ""
-#: src/wx/audio_mapping_view.cc:187
+#: src/wx/audio_mapping_view.cc:276
msgid "R"
msgstr ""
@@ -631,11 +692,15 @@ msgstr ""
msgid "Resume"
msgstr ""
+#: src/wx/audio_mapping_view.cc:327
+msgid "Right click to change gain."
+msgstr ""
+
#: src/wx/video_panel.cc:101
msgid "Right crop"
msgstr "Taglio a destra"
-#: src/wx/audio_mapping_view.cc:203
+#: src/wx/audio_mapping_view.cc:292
#, fuzzy
msgid "Rs"
msgstr "s"
@@ -671,7 +736,7 @@ msgstr ""
msgid "Server"
msgstr "Server"
-#: src/wx/timecode.cc:65
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
msgid "Set"
msgstr ""
@@ -695,6 +760,11 @@ msgstr "Levigatura"
msgid "Snap"
msgstr ""
+#: src/wx/update_dialog.cc:43
+#, fuzzy
+msgid "Stable version "
+msgstr "Tipo di contenuto"
+
#: src/wx/film_editor.cc:185
msgid "Standard"
msgstr ""
@@ -724,7 +794,7 @@ msgstr "Scala dei Sottotitoli"
msgid "Subtitles"
msgstr "Sottotitoli"
-#: src/wx/about_dialog.cc:131
+#: src/wx/about_dialog.cc:132
msgid "Supported by"
msgstr ""
@@ -733,7 +803,7 @@ msgstr ""
msgid "TMS"
msgstr "RMS"
-#: src/wx/config_dialog.cc:293
+#: src/wx/config_dialog.cc:305
#, fuzzy
msgid "Target path"
msgstr "Percorso di destinazione del TMS"
@@ -742,6 +812,11 @@ msgstr "Percorso di destinazione del TMS"
msgid "Territory (e.g. UK)"
msgstr "Nazione (es. UK)"
+#: src/wx/update_dialog.cc:48
+#, fuzzy
+msgid "Test version "
+msgstr "Tipo di contenuto"
+
#: src/wx/content_menu.cc:223
msgid ""
"The content file(s) you specified are not the same as those that are "
@@ -774,7 +849,7 @@ msgstr "Tempo"
msgid "Timeline..."
msgstr ""
-#: src/wx/timing_panel.cc:32
+#: src/wx/timing_panel.cc:34
msgid "Timing"
msgstr ""
@@ -786,12 +861,12 @@ msgstr "Taglio in alto"
msgid "Translated by"
msgstr ""
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:48
#, fuzzy
msgid "Trim from end"
msgstr "Taglia fotogrammi"
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:45
#, fuzzy
msgid "Trim from start"
msgstr "Taglia fotogrammi"
@@ -808,11 +883,15 @@ msgstr ""
msgid "Up"
msgstr ""
+#: src/wx/update_dialog.cc:27
+msgid "Update"
+msgstr ""
+
#: src/wx/film_editor.cc:126
msgid "Use DCI name"
msgstr "Usa nome DCI"
-#: src/wx/config_dialog.cc:357
+#: src/wx/config_dialog.cc:369
msgid "Use all servers"
msgstr ""
@@ -825,7 +904,7 @@ msgstr "Usa la migliore"
msgid "Use preset"
msgstr "Usa la migliore"
-#: src/wx/config_dialog.cc:297
+#: src/wx/config_dialog.cc:309
#, fuzzy
msgid "User name"
msgstr "Usa nome DCI"
@@ -834,6 +913,11 @@ msgstr "Usa nome DCI"
msgid "Video"
msgstr "Video"
+#: src/wx/timing_panel.cc:56
+#, fuzzy
+msgid "Video frame rate"
+msgstr "Frequenza fotogrammi del DCP"
+
#: src/wx/subtitle_panel.cc:39
msgid "With Subtitles"
msgstr "Con sottotitoli"
@@ -877,7 +961,7 @@ msgstr ""
msgid "audio"
msgstr "Audio"
-#: src/wx/audio_panel.cc:239
+#: src/wx/audio_panel.cc:241
msgid "channels"
msgstr "canali"
@@ -885,16 +969,16 @@ msgstr "canali"
msgid "counting..."
msgstr "conteggio..."
-#: src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
msgid "dB"
msgstr "dB"
#. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
msgid "ms"
msgstr "ms"
-#: src/wx/config_dialog.cc:192
+#: src/wx/config_dialog.cc:204
msgid "s"
msgstr "s"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 23fed1074..b57f19e31 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-05 18:00+0000\n"
+"POT-Creation-Date: 2014-01-07 20:01+0000\n"
"PO-Revision-Date: 2013-04-09 10:13+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
@@ -34,11 +34,15 @@ msgstr ""
msgid "(restart DCP-o-matic to see language changes)"
msgstr "(starta om DCP-o-matic för att se språkändringar)"
+#: src/wx/audio_mapping_view.cc:133
+msgid "-3dB"
+msgstr ""
+
#: src/wx/colour_conversion_editor.cc:83
msgid "1 / "
msgstr ""
-#: src/wx/audio_panel.cc:237
+#: src/wx/audio_panel.cc:239
msgid "1 channel"
msgstr "1 kanal"
@@ -66,6 +70,10 @@ msgstr ""
msgid "4K"
msgstr ""
+#: src/wx/update_dialog.cc:34
+msgid "A new version of DCP-o-matic is available."
+msgstr ""
+
#: src/wx/about_dialog.cc:30
#, fuzzy
msgid "About DCP-o-matic"
@@ -117,6 +125,19 @@ msgstr "Audio Fördröjning"
msgid "Audio channels"
msgstr "kanaler"
+#: src/wx/audio_mapping_view.cc:321
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d unaltered."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d with gain "
+"%.1fdB."
+msgstr ""
+
#: src/wx/job_wrapper.cc:38
#, c-format
msgid "Bad setting for %s (%s)"
@@ -134,7 +155,7 @@ msgstr "Bläddra..."
msgid "But I have to use fader"
msgstr "Men jag måste använda mixervolym"
-#: src/wx/audio_mapping_view.cc:191
+#: src/wx/audio_mapping_view.cc:280
msgid "C"
msgstr ""
@@ -146,10 +167,23 @@ msgstr "Beräkna..."
msgid "Cancel"
msgstr "Avbryt"
+#: src/wx/audio_gain_dialog.cc:26
+#, fuzzy
+msgid "Channel gain"
+msgstr "Kanaler"
+
#: src/wx/audio_dialog.cc:44
msgid "Channels"
msgstr "Kanaler"
+#: src/wx/config_dialog.cc:143
+msgid "Check for testing updates as well as stable ones"
+msgstr ""
+
+#: src/wx/config_dialog.cc:139
+msgid "Check for updates on startup"
+msgstr ""
+
#: src/wx/content_menu.cc:182
#, fuzzy
msgid "Choose a file"
@@ -186,7 +220,7 @@ msgstr "Innehåll"
msgid "Content Type"
msgstr "Innehållstyp"
-#: src/wx/audio_mapping_view.cc:180
+#: src/wx/audio_mapping_view.cc:269
#, fuzzy
msgid "Content channel"
msgstr "1 kanal"
@@ -224,7 +258,7 @@ msgstr "Kunde inte skapa DCP: %s"
msgid "Create in folder"
msgstr "Skapa i katalog"
-#: src/wx/config_dialog.cc:332
+#: src/wx/config_dialog.cc:344
#, fuzzy
msgid "Creator"
msgstr "Skapa i katalog"
@@ -263,35 +297,35 @@ msgstr "DCP-o-matic Inställningar"
msgid "DCP-o-matic audio - %s"
msgstr "DCP-o-matic audio - %s"
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:216
msgid "Default DCI name details"
msgstr "Detaljer om förvalda DCI-namn"
-#: src/wx/config_dialog.cc:217
+#: src/wx/config_dialog.cc:229
#, fuzzy
msgid "Default JPEG2000 bandwidth"
msgstr "JPEG2000 bandbredd"
-#: src/wx/config_dialog.cc:226
+#: src/wx/config_dialog.cc:238
#, fuzzy
msgid "Default audio delay"
msgstr "Innehållstyp"
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:220
#, fuzzy
msgid "Default container"
msgstr "Innehållstyp"
-#: src/wx/config_dialog.cc:212
+#: src/wx/config_dialog.cc:224
#, fuzzy
msgid "Default content type"
msgstr "Innehållstyp"
-#: src/wx/config_dialog.cc:196
+#: src/wx/config_dialog.cc:208
msgid "Default directory for new films"
msgstr "Förvald katalog för nya filmer"
-#: src/wx/config_dialog.cc:188
+#: src/wx/config_dialog.cc:200
#, fuzzy
msgid "Default duration of still images"
msgstr "Förvald katalog för nya filmer"
@@ -322,11 +356,16 @@ msgstr "Redigera..."
msgid "Edit Screen..."
msgstr "Redigera..."
-#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:134 src/wx/config_dialog.cc:217
+#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
+#: src/wx/editable_list.h:63
msgid "Edit..."
msgstr "Redigera..."
+#: src/wx/cinema_dialog.cc:35
+msgid "Email address for KDM delivery"
+msgstr ""
+
#: src/wx/servers_list_dialog.cc:30
#, fuzzy
msgid "Encoding Servers"
@@ -386,7 +425,11 @@ msgstr ""
msgid "From address for KDM emails"
msgstr ""
-#: src/wx/timing_panel.cc:40
+#: src/wx/audio_mapping_view.cc:132
+msgid "Full"
+msgstr ""
+
+#: src/wx/timing_panel.cc:42
msgid "Full length"
msgstr ""
@@ -394,6 +437,11 @@ msgstr ""
msgid "Gain Calculator"
msgstr "Volym Kalkylator"
+#: src/wx/audio_gain_dialog.cc:31
+#, c-format
+msgid "Gain for content channel %d in DCP channel %d"
+msgstr ""
+
#: src/wx/properties_dialog.cc:57
msgid "Gb"
msgstr "Gb"
@@ -410,7 +458,7 @@ msgstr ""
msgid "Host name or IP address"
msgstr "Värd-namn eller IP-adress"
-#: src/wx/audio_panel.cc:241
+#: src/wx/audio_panel.cc:243
msgid "Hz"
msgstr "Hz"
@@ -418,11 +466,11 @@ msgstr "Hz"
msgid "I want to play this back at fader"
msgstr "Jag vill spela upp detta med mixervolym"
-#: src/wx/config_dialog.cc:289
+#: src/wx/config_dialog.cc:301
msgid "IP address"
msgstr "IP-adress"
-#: src/wx/config_dialog.cc:361
+#: src/wx/config_dialog.cc:373
#, fuzzy
msgid "IP address / host name"
msgstr "IP-adress"
@@ -435,7 +483,7 @@ msgstr ""
msgid "Interop"
msgstr ""
-#: src/wx/config_dialog.cc:328
+#: src/wx/config_dialog.cc:340
msgid "Issuer"
msgstr ""
@@ -455,7 +503,7 @@ msgstr ""
msgid "Keep video in sequence"
msgstr ""
-#: src/wx/audio_mapping_view.cc:183
+#: src/wx/audio_mapping_view.cc:272
msgid "L"
msgstr ""
@@ -463,7 +511,7 @@ msgstr ""
msgid "Left crop"
msgstr "Vänster beskärning"
-#: src/wx/audio_mapping_view.cc:195
+#: src/wx/audio_mapping_view.cc:284
msgid "Lfe"
msgstr ""
@@ -471,12 +519,12 @@ msgstr ""
msgid "Linearise input gamma curve for low values"
msgstr ""
-#: src/wx/audio_mapping_view.cc:199
+#: src/wx/audio_mapping_view.cc:288
#, fuzzy
msgid "Ls"
msgstr "s"
-#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
msgid "MBps"
msgstr "MBps"
@@ -519,8 +567,8 @@ msgstr "Innehållstyp"
msgid "My Documents"
msgstr "Mina Dokument"
-#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
-#: src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
+#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
msgid "Name"
msgstr "Namn"
@@ -528,6 +576,15 @@ msgstr "Namn"
msgid "New Film"
msgstr "Ny Film"
+#: src/wx/update_dialog.cc:36
+msgid "New versions of DCP-o-matic are available."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:319
+#, c-format
+msgid "No audio will be passed from content channel %d to DCP channel %d."
+msgstr ""
+
#: src/wx/video_panel.cc:198
msgid "No stretch"
msgstr ""
@@ -536,6 +593,10 @@ msgstr ""
msgid "None"
msgstr "Inget"
+#: src/wx/audio_mapping_view.cc:131
+msgid "Off"
+msgstr ""
+
#: src/wx/config_dialog.cc:119
#, fuzzy
msgid "Outgoing mail server"
@@ -554,7 +615,7 @@ msgstr "Förpackningstyp (ex. OV)"
msgid "Padded with black to %dx%d (%.2f:1)\n"
msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n"
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:313
#, fuzzy
msgid "Password"
msgstr "TMS lösenord"
@@ -571,7 +632,7 @@ msgstr "Topp"
msgid "Play"
msgstr "Spela"
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:51
msgid "Play length"
msgstr ""
@@ -579,11 +640,11 @@ msgstr ""
msgid "Please wait; audio is being analysed..."
msgstr "Vänligen vänta; audio analyseras..."
-#: src/wx/timing_panel.cc:37
+#: src/wx/timing_panel.cc:39
msgid "Position"
msgstr ""
-#: src/wx/audio_mapping_view.cc:187
+#: src/wx/audio_mapping_view.cc:276
msgid "R"
msgstr ""
@@ -631,11 +692,15 @@ msgstr ""
msgid "Resume"
msgstr ""
+#: src/wx/audio_mapping_view.cc:327
+msgid "Right click to change gain."
+msgstr ""
+
#: src/wx/video_panel.cc:101
msgid "Right crop"
msgstr "Höger beskärning"
-#: src/wx/audio_mapping_view.cc:203
+#: src/wx/audio_mapping_view.cc:292
#, fuzzy
msgid "Rs"
msgstr "s"
@@ -671,7 +736,7 @@ msgstr ""
msgid "Server"
msgstr "Server"
-#: src/wx/timecode.cc:65
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
msgid "Set"
msgstr ""
@@ -695,6 +760,11 @@ msgstr "Utjämning"
msgid "Snap"
msgstr ""
+#: src/wx/update_dialog.cc:43
+#, fuzzy
+msgid "Stable version "
+msgstr "Innehållstyp"
+
#: src/wx/film_editor.cc:185
msgid "Standard"
msgstr ""
@@ -724,7 +794,7 @@ msgstr "Undertext Skalning"
msgid "Subtitles"
msgstr "Undertexter"
-#: src/wx/about_dialog.cc:131
+#: src/wx/about_dialog.cc:132
msgid "Supported by"
msgstr ""
@@ -733,7 +803,7 @@ msgstr ""
msgid "TMS"
msgstr "RMS"
-#: src/wx/config_dialog.cc:293
+#: src/wx/config_dialog.cc:305
#, fuzzy
msgid "Target path"
msgstr "TMS målsökväg"
@@ -742,6 +812,11 @@ msgstr "TMS målsökväg"
msgid "Territory (e.g. UK)"
msgstr "Område (ex. SV)"
+#: src/wx/update_dialog.cc:48
+#, fuzzy
+msgid "Test version "
+msgstr "Innehållstyp"
+
#: src/wx/content_menu.cc:223
msgid ""
"The content file(s) you specified are not the same as those that are "
@@ -774,7 +849,7 @@ msgstr "Tid"
msgid "Timeline..."
msgstr ""
-#: src/wx/timing_panel.cc:32
+#: src/wx/timing_panel.cc:34
msgid "Timing"
msgstr ""
@@ -786,12 +861,12 @@ msgstr "Övre beskärning"
msgid "Translated by"
msgstr ""
-#: src/wx/timing_panel.cc:46
+#: src/wx/timing_panel.cc:48
#, fuzzy
msgid "Trim from end"
msgstr "Skippa bilder"
-#: src/wx/timing_panel.cc:43
+#: src/wx/timing_panel.cc:45
#, fuzzy
msgid "Trim from start"
msgstr "Skippa bilder"
@@ -808,11 +883,15 @@ msgstr ""
msgid "Up"
msgstr ""
+#: src/wx/update_dialog.cc:27
+msgid "Update"
+msgstr ""
+
#: src/wx/film_editor.cc:126
msgid "Use DCI name"
msgstr "Använd DCI-namnet"
-#: src/wx/config_dialog.cc:357
+#: src/wx/config_dialog.cc:369
msgid "Use all servers"
msgstr ""
@@ -825,7 +904,7 @@ msgstr "Använd bästa"
msgid "Use preset"
msgstr "Använd bästa"
-#: src/wx/config_dialog.cc:297
+#: src/wx/config_dialog.cc:309
#, fuzzy
msgid "User name"
msgstr "Använd DCI-namnet"
@@ -834,6 +913,11 @@ msgstr "Använd DCI-namnet"
msgid "Video"
msgstr "Video"
+#: src/wx/timing_panel.cc:56
+#, fuzzy
+msgid "Video frame rate"
+msgstr "DCP bildhastighet"
+
#: src/wx/subtitle_panel.cc:39
msgid "With Subtitles"
msgstr "Med Undertexter"
@@ -877,7 +961,7 @@ msgstr ""
msgid "audio"
msgstr "Audio"
-#: src/wx/audio_panel.cc:239
+#: src/wx/audio_panel.cc:241
msgid "channels"
msgstr "kanaler"
@@ -885,16 +969,16 @@ msgstr "kanaler"
msgid "counting..."
msgstr "räknar..."
-#: src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
msgid "dB"
msgstr "dB"
#. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
msgid "ms"
msgstr "ms"
-#: src/wx/config_dialog.cc:192
+#: src/wx/config_dialog.cc:204
msgid "s"
msgstr "s"
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index f3f841a43..11510cd0f 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -52,7 +52,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
_table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length()))));
- double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f);
+ double const disk = double (_film->required_disk_space()) / 1073741824.0f;
stringstream s;
s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
_disk->SetLabel (std_to_wx (s.str ()));
diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index b23ff2a39..493650aae 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -26,7 +26,7 @@ using std::string;
using std::cout;
using boost::lexical_cast;
-DCPTimecode::DCPTimecode (wxWindow* parent)
+Timecode::Timecode (wxWindow* parent)
: wxPanel (parent)
{
wxClientDC dc (parent);
@@ -69,11 +69,11 @@ DCPTimecode::DCPTimecode (wxWindow* parent)
_fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false);
- _hours->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPTimecode::changed, this));
- _minutes->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPTimecode::changed, this));
- _seconds->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPTimecode::changed, this));
- _frames->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPTimecode::changed, this));
- _set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPTimecode::set_clicked, this));
+ _hours->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&Timecode::changed, this));
+ _minutes->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&Timecode::changed, this));
+ _seconds->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&Timecode::changed, this));
+ _frames->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&Timecode::changed, this));
+ _set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&Timecode::set_clicked, this));
_set_button->Enable (false);
@@ -83,7 +83,7 @@ DCPTimecode::DCPTimecode (wxWindow* parent)
}
void
-DCPTimecode::set (DCPTime t, int fps)
+Timecode::set (DCPTime t, int fps)
{
int const h = t / (3600 * TIME_HZ);
t -= h * 3600 * TIME_HZ;
@@ -102,7 +102,7 @@ DCPTimecode::set (DCPTime t, int fps)
}
DCPTime
-DCPTimecode::get (int fps) const
+Timecode::get (int fps) const
{
DCPTime t = 0;
string const h = wx_to_std (_hours->GetValue ());
@@ -118,20 +118,20 @@ DCPTimecode::get (int fps) const
}
void
-DCPTimecode::changed ()
+Timecode::changed ()
{
_set_button->Enable (true);
}
void
-DCPTimecode::set_clicked ()
+Timecode::set_clicked ()
{
Changed ();
_set_button->Enable (false);
}
void
-DCPTimecode::set_editable (bool e)
+Timecode::set_editable (bool e)
{
_editable->Show (e);
_fixed->Show (!e);
diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index f95740255..b13e8c3c0 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -21,10 +21,10 @@
#include <wx/wx.h>
#include "lib/types.h"
-class DCPTimecode : public wxPanel
+class Timecode : public wxPanel
{
public:
- DCPTimecode (wxWindow *);
+ Timecode (wxWindow *);
void set (DCPTime, int);
DCPTime get (int) const;
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 08334da4b..34702463c 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -25,8 +25,10 @@
#include "film_editor.h"
using std::cout;
+using std::string;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
+using boost::lexical_cast;
TimingPanel::TimingPanel (FilmEditor* e)
: FilmEditorPanel (e, _("Timing"))
@@ -35,26 +37,39 @@ TimingPanel::TimingPanel (FilmEditor* e)
_sizer->Add (grid, 0, wxALL, 8);
add_label_to_sizer (grid, this, _("Position"), true);
- _position = new DCPTimecode (this);
+ _position = new Timecode (this);
grid->Add (_position);
add_label_to_sizer (grid, this, _("Full length"), true);
- _full_length = new DCPTimecode (this);
+ _full_length = new Timecode (this);
grid->Add (_full_length);
add_label_to_sizer (grid, this, _("Trim from start"), true);
- _trim_start = new DCPTimecode (this);
+ _trim_start = new Timecode (this);
grid->Add (_trim_start);
add_label_to_sizer (grid, this, _("Trim from end"), true);
- _trim_end = new DCPTimecode (this);
+ _trim_end = new Timecode (this);
grid->Add (_trim_end);
add_label_to_sizer (grid, this, _("Play length"), true);
- _play_length = new DCPTimecode (this);
+ _play_length = new Timecode (this);
grid->Add (_play_length);
+ {
+ add_label_to_sizer (grid, this, _("Video frame rate"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _video_frame_rate = new wxTextCtrl (this, wxID_ANY);
+ s->Add (_video_frame_rate, 1, wxEXPAND);
+ _set_video_frame_rate = new wxButton (this, wxID_ANY, _("Set"));
+ _set_video_frame_rate->Enable (false);
+ s->Add (_set_video_frame_rate, 0, wxLEFT | wxRIGHT, 8);
+ grid->Add (s, 1, wxEXPAND);
+ }
+
_position->Changed.connect (boost::bind (&TimingPanel::position_changed, this));
_full_length->Changed.connect (boost::bind (&TimingPanel::full_length_changed, this));
_trim_start->Changed.connect (boost::bind (&TimingPanel::trim_start_changed, this));
_trim_end->Changed.connect (boost::bind (&TimingPanel::trim_end_changed, this));
_play_length->Changed.connect (boost::bind (&TimingPanel::play_length_changed, this));
+ _video_frame_rate->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TimingPanel::video_frame_rate_changed, this));
+ _set_video_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::set_video_frame_rate, this));
}
void
@@ -72,7 +87,7 @@ TimingPanel::film_content_changed (int property)
} else {
_position->set (0, 24);
}
- } else if (property == ContentProperty::LENGTH) {
+ } else if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_RATE) {
if (content) {
_full_length->set (content->full_length (), _editor->film()->video_frame_rate ());
_play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ());
@@ -96,11 +111,26 @@ TimingPanel::film_content_changed (int property)
_trim_end->set (0, 24);
_play_length->set (0, 24);
}
- }
+ }
+
+ if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
+ if (content) {
+ shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (content);
+ if (vc) {
+ _video_frame_rate->SetValue (std_to_wx (lexical_cast<string> (vc->video_frame_rate ())));
+ } else {
+ _video_frame_rate->SetValue ("24");
+ }
+ } else {
+ _video_frame_rate->SetValue ("24");
+ }
+ }
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (content);
_full_length->set_editable (ic && ic->still ());
_play_length->set_editable (!ic || !ic->still ());
+ _video_frame_rate->Enable (ic && !ic->still ());
+ _set_video_frame_rate->Enable (false);
}
void
@@ -153,6 +183,25 @@ TimingPanel::play_length_changed ()
}
void
+TimingPanel::video_frame_rate_changed ()
+{
+ _set_video_frame_rate->Enable (true);
+}
+
+void
+TimingPanel::set_video_frame_rate ()
+{
+ ContentList c = _editor->selected_content ();
+ if (c.size() == 1) {
+ shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
+ if (ic) {
+ ic->set_video_frame_rate (lexical_cast<float> (wx_to_std (_video_frame_rate->GetValue ())));
+ _set_video_frame_rate->Enable (false);
+ }
+ }
+}
+
+void
TimingPanel::content_selection_changed ()
{
ContentList sel = _editor->selected_content ();
@@ -164,9 +213,11 @@ TimingPanel::content_selection_changed ()
_trim_start->Enable (single);
_trim_end->Enable (single);
_play_length->Enable (single);
+ _video_frame_rate->Enable (single);
film_content_changed (ContentProperty::POSITION);
film_content_changed (ContentProperty::LENGTH);
film_content_changed (ContentProperty::TRIM_START);
film_content_changed (ContentProperty::TRIM_END);
+ film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
}
diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index 7fea45eb5..d9696a201 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -19,7 +19,7 @@
#include "film_editor_panel.h"
-class DCPTimecode;
+class Timecode;
class TimingPanel : public FilmEditorPanel
{
@@ -35,10 +35,14 @@ private:
void trim_start_changed ();
void trim_end_changed ();
void play_length_changed ();
+ void video_frame_rate_changed ();
+ void set_video_frame_rate ();
- DCPTimecode* _position;
- DCPTimecode* _full_length;
- DCPTimecode* _trim_start;
- DCPTimecode* _trim_end;
- DCPTimecode* _play_length;
+ Timecode* _position;
+ Timecode* _full_length;
+ Timecode* _trim_start;
+ Timecode* _trim_end;
+ Timecode* _play_length;
+ wxTextCtrl* _video_frame_rate;
+ wxButton* _set_video_frame_rate;
};
diff --git a/src/wx/update_dialog.cc b/src/wx/update_dialog.cc
new file mode 100644
index 000000000..271c4174c
--- /dev/null
+++ b/src/wx/update_dialog.cc
@@ -0,0 +1,61 @@
+/*
+ Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/hyperlink.h>
+#include "update_dialog.h"
+#include "wx_util.h"
+
+using std::string;
+
+UpdateDialog::UpdateDialog (wxWindow* parent, string stable, string test)
+ : wxDialog (parent, wxID_ANY, _("Update"))
+{
+ wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+
+ wxStaticText* message;
+
+ if (test.empty ()) {
+ message = new wxStaticText (this, wxID_ANY, _("A new version of DCP-o-matic is available."));
+ } else {
+ message = new wxStaticText (this, wxID_ANY, _("New versions of DCP-o-matic are available."));
+ }
+
+ overall_sizer->Add (message, 1, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
+
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+
+ add_label_to_sizer (table, this, _("Stable version ") + std_to_wx (stable), true);
+ wxHyperlinkCtrl* h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/download", "http://dcpomatic.com/download");
+ table->Add (h);
+
+ if (!test.empty ()) {
+ add_label_to_sizer (table, this, _("Test version ") + std_to_wx (test), true);
+ wxHyperlinkCtrl* h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/test-download", "http://dcpomatic.com/test-download");
+ table->Add (h);
+ }
+
+ overall_sizer->Add (table, 1, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
+
+ wxSizer* buttons = CreateButtonSizer (wxOK);
+ if (buttons) {
+ overall_sizer->Add (buttons, 1, wxEXPAND | wxALL);
+ }
+
+ SetSizerAndFit (overall_sizer);
+}
diff --git a/src/wx/update_dialog.h b/src/wx/update_dialog.h
new file mode 100644
index 000000000..d9c7b855d
--- /dev/null
+++ b/src/wx/update_dialog.h
@@ -0,0 +1,27 @@
+/*
+ Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+
+class UpdateDialog : public wxDialog
+{
+public:
+ UpdateDialog (wxWindow *, std::string, std::string);
+};
+
diff --git a/src/wx/wscript b/src/wx/wscript
index dc8a07b99..9de32d39e 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -6,6 +6,7 @@ import i18n
sources = """
about_dialog.cc
audio_dialog.cc
+ audio_gain_dialog.cc
audio_mapping_view.cc
audio_panel.cc
audio_plot.cc
@@ -38,6 +39,7 @@ sources = """
timeline.cc
timeline_dialog.cc
timing_panel.cc
+ update_dialog.cc
video_panel.cc
wx_util.cc
wx_ui_signaller.cc
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-22 12:32:21 +0000