From: Carl Hetherington Date: Sun, 31 Aug 2014 16:31:38 +0000 (+0100) Subject: Merge master. X-Git-Tag: v2.0.48~631 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;hp=2d24bc7aaed800415bce4fffe06f261d5e9e464a Merge master. --- diff --git a/ChangeLog b/ChangeLog index b584a6c7c..36a282919 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-08-31 Carl Hetherington + + * Give a hint when content and container aspect ratios are not + the same (#392). + + * Add "copy" button to colour conversion presets editor (#399). + + * Allow drag-and-drop of files onto the content list (#395). + 2014-08-29 Carl Hetherington * Version 2.0.4 released. diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po index fb94ba358..8fab60408 100644 --- a/src/lib/po/de_DE.po +++ b/src/lib/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-07-13 02:32+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po index e9cf3b9d0..61eaa7390 100644 --- a/src/lib/po/es_ES.po +++ b/src/lib/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: LIBDCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-04-20 10:12-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index e8e271b6b..816ed559e 100644 --- a/src/lib/po/fr_FR.po +++ b/src/lib/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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-07-14 12:04+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po index f8de067f0..15a0cbb83 100644 --- a/src/lib/po/it_IT.po +++ b/src/lib/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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-02-03 10:48+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po index a794560ff..802ecd46d 100644 --- a/src/lib/po/nl_NL.po +++ b/src/lib/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-03-30 19:39+0100\n" "Last-Translator: Theo Kooijmans \n" "Language-Team: UniversalDV \n" diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po index 3cc777fd5..622319b3d 100644 --- a/src/lib/po/sv_SE.po +++ b/src/lib/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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po index 869b031c9..bbfc187bb 100644 --- a/src/tools/po/de_DE.po +++ b/src/tools/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-07-13 03:04+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po index 31d8913e8..daa03c385 100644 --- a/src/tools/po/es_ES.po +++ b/src/tools/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-04-20 10:21-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po index 7be46921a..b83fa60c3 100644 --- a/src/tools/po/fr_FR.po +++ b/src/tools/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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-07-14 10:43+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po index 9846423c6..66d4cc241 100644 --- a/src/tools/po/it_IT.po +++ b/src/tools/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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-02-03 09:36+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po index a63af0d24..cc3b6715d 100644 --- a/src/tools/po/nl_NL.po +++ b/src/tools/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-03-30 19:38+0100\n" "Last-Translator: Theo Kooijmans \n" "Language-Team: UniversalDV \n" diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po index cd0f8d471..61c01d168 100644 --- a/src/tools/po/sv_SE.po +++ b/src/tools/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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 5d1e546f7..349581972 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -134,6 +134,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Chris Kay")); supported_by.Add (wxT ("Adam Klotblixt")); supported_by.Add (wxT ("Filip Kovcin")); + supported_by.Add (wxT ("Cihan Kulaber")); supported_by.Add (wxT ("Carsten Kurz")); supported_by.Add (wxT ("Lilian Lefranc")); supported_by.Add (wxT ("Sean Leigh")); diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index b752a0e5f..991080e59 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -100,6 +100,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr f) _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this)); _content->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this)); _content->Bind (wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1)); + _content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1)); _add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_file_clicked, this)); _add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_folder_clicked, this)); _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this)); @@ -456,3 +457,15 @@ ContentPanel::setup () } } +void +ContentPanel::files_dropped (wxDropFilesEvent& event) +{ + if (!_film) { + return; + } + + wxString* paths = event.GetFiles (); + for (int i = 0; i < event.GetNumberOfFiles(); i++) { + _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i]))); + } +} diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index 5701696e5..1f64d51c6 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -72,6 +72,7 @@ private: void earlier_clicked (); void later_clicked (); void right_click (wxListEvent &); + void files_dropped (wxDropFilesEvent &); void timeline_clicked (); void setup (); diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h index a282bba69..481a14741 100644 --- a/src/wx/editable_list.h +++ b/src/wx/editable_list.h @@ -61,6 +61,8 @@ public: wxSizer* s = new wxBoxSizer (wxVERTICAL); _add = new wxButton (this, wxID_ANY, _("Add...")); s->Add (_add, 0, wxTOP | wxBOTTOM, 2); + _copy = new wxButton (this, wxID_ANY, _("Copy...")); + s->Add (_copy, 0, wxTOP | wxBOTTOM, 2); _edit = new wxButton (this, wxID_ANY, _("Edit...")); s->Add (_edit, 0, wxTOP | wxBOTTOM, 2); _remove = new wxButton (this, wxID_ANY, _("Remove")); @@ -74,6 +76,7 @@ public: } _add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::add_clicked, this)); + _copy->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::copy_clicked, this)); _edit->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::edit_clicked, this)); _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::remove_clicked, this)); @@ -121,6 +124,23 @@ private: dialog->Destroy (); } + void copy_clicked () + { + int item = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (item == -1) { + return; + } + + std::vector all = _get (); + assert (item >= 0 && item < int (all.size ())); + + T copy (all[item]); + add_to_control (copy); + + all.push_back (copy); + _set (all); + } + void edit_clicked () { int item = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); @@ -174,6 +194,7 @@ private: boost::function _column; wxButton* _add; + wxButton* _copy; wxButton* _edit; wxButton* _remove; wxListCtrl* _list; diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc index 668d71321..74ac05508 100644 --- a/src/wx/hints_dialog.cc +++ b/src/wx/hints_dialog.cc @@ -20,8 +20,12 @@ #include #include #include "lib/film.h" +#include "lib/ratio.h" #include "hints_dialog.h" +using boost::shared_ptr; +using boost::dynamic_pointer_cast; + HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr f) : wxDialog (parent, wxID_ANY, _("Hints")) , _film (f) @@ -44,6 +48,7 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr f) boost::shared_ptr film = _film.lock (); if (film) { film->Changed.connect (boost::bind (&HintsDialog::film_changed, this)); + film->ContentChanged.connect (boost::bind (&HintsDialog::film_changed, this)); } film_changed (); @@ -71,13 +76,39 @@ HintsDialog::film_changed () _text->Newline (); } + ContentList content = film->content (); + int flat_or_narrower = 0; + int scope = 0; + for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { + shared_ptr vc = dynamic_pointer_cast (*i); + if (vc) { + Ratio const * r = vc->scale().ratio (); + if (r && r->id() == "239") { + ++scope; + } else if (r && r->id() != "239" && r->id() != "full-frame") { + ++flat_or_narrower; + } + } + } + + if (scope && !flat_or_narrower && film->container()->id() == "185") { + hint = true; + _text->WriteText (_("All of your content is in Scope (2.39:1) but your DCP's container is Flat (1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" tab.")); + _text->Newline (); + } + + if (!scope && flat_or_narrower && film->container()->id() == "239") { + hint = true; + _text->WriteText (_("All of your content is at 1.85:1 or narrower but your DCP's container is Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) frame. You may prefer to set your DCP's container to Flat (1.85:1) in the \"DCP\" tab.")); + _text->Newline (); + } + if (film->video_frame_rate() != 24 && film->video_frame_rate() != 48) { hint = true; _text->WriteText (wxString::Format (_("Your DCP frame rate (%d fps) may cause problems in a few (mostly older) projectors. Use 24 or 48 frames per second to be on the safe side."), film->video_frame_rate())); _text->Newline (); } - ContentList content = film->content (); int vob = 0; for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { if (boost::algorithm::starts_with ((*i)->path(0).filename().string(), "VTS_")) { diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po index 745831485..b158d231f 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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-07-13 03:08+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" @@ -105,11 +105,11 @@ msgstr "Kino hinzufügen..." msgid "Add Screen..." msgstr "Saal hinzufügen..." -#: src/wx/film_editor.cc:279 +#: src/wx/film_editor.cc:280 msgid "Add file(s)..." msgstr "Datei(en) hinzufügen..." -#: src/wx/film_editor.cc:281 +#: src/wx/film_editor.cc:282 msgid "Add folder..." msgstr "Ordner hinzufügen..." @@ -117,6 +117,22 @@ msgstr "Ordner hinzufügen..." msgid "Add..." msgstr "Hinzufügen..." +#: src/wx/hints_dialog.cc:102 +msgid "" +"All of your content is at 1.85:1 or narrower but your DCP's container is " +"Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " +"frame. You may prefer to set your DCP's container to Flat (1.85:1) in the " +"\"DCP\" tab." +msgstr "" + +#: src/wx/hints_dialog.cc:96 +msgid "" +"All of your content is in Scope (2.39:1) but your DCP's container is Flat " +"(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " +"You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" " +"tab." +msgstr "" + #: src/wx/config_dialog.cc:820 msgid "Allow any DCP frame rate" msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)" @@ -244,11 +260,11 @@ msgstr "Beim Start auf Updates überprüfen." msgid "Choose a file" msgstr "Datei auswählen" -#: src/wx/film_editor.cc:792 +#: src/wx/film_editor.cc:795 msgid "Choose a file or files" msgstr "Eine oder mehrere Dateien auswählen" -#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:815 +#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:818 msgid "Choose a folder" msgstr "Ordner wählen" @@ -295,6 +311,10 @@ msgstr "Inhalt Version" msgid "Content video is %dx%d (%.2f:1)\n" msgstr "Inhalt Video ist %dx%d (%.2f:1)\n" +#: src/wx/editable_list.h:64 +msgid "Copy..." +msgstr "" + #: src/wx/audio_dialog.cc:151 msgid "Could not analyse audio." msgstr "Ton konnte nicht analysiert werden" @@ -423,7 +443,7 @@ msgstr "Doremi" msgid "Doremi serial numbers must have 6 digits" msgstr "Doremi Seriennummern müssen aus 6 Zahlen bestehen!" -#: src/wx/film_editor.cc:287 +#: src/wx/film_editor.cc:288 msgid "Down" msgstr "Nach unten" @@ -450,7 +470,7 @@ msgstr "Saal bearbeiten..." #: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172 -#: src/wx/editable_list.h:64 +#: src/wx/editable_list.h:66 msgid "Edit..." msgstr "Bearbeiten..." @@ -554,7 +574,7 @@ msgstr "Allgemein" msgid "HI" msgstr "HI" -#: src/wx/hints_dialog.cc:26 +#: src/wx/hints_dialog.cc:30 msgid "Hints" msgstr "Tipps" @@ -614,7 +634,7 @@ msgstr "" msgid "KDM|Timing" msgstr "Zeitfenster" -#: src/wx/film_editor.cc:297 +#: src/wx/film_editor.cc:298 msgid "Keep video in sequence" msgstr "Lücken in Zeitleiste automatisch schließen" @@ -650,7 +670,7 @@ msgstr "Log" msgid "Ls" msgstr "SL" -#: src/wx/film_editor.cc:766 +#: src/wx/film_editor.cc:769 msgid "MISSING: " msgstr "FEHLT:" @@ -795,8 +815,8 @@ msgstr "Rc" msgid "Red band" msgstr "Red band (USA, für explizite Inhalte)" -#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283 -#: src/wx/editable_list.h:66 +#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 +#: src/wx/editable_list.h:68 msgid "Remove" msgstr "Entfernen" @@ -953,7 +973,7 @@ msgstr "Untertitel Sprache (z.B. EN)" msgid "Subtitles" msgstr "Untertitel" -#: src/wx/about_dialog.cc:157 +#: src/wx/about_dialog.cc:158 msgid "Supported by" msgstr "Unterstützt durch" @@ -977,7 +997,7 @@ msgstr "Gebiet (z.B. UK)" msgid "Test version " msgstr "Test Version" -#: src/wx/about_dialog.cc:202 +#: src/wx/about_dialog.cc:203 msgid "Tested by" msgstr "Getestet von" @@ -991,7 +1011,7 @@ msgstr "" "Entweder nochmals mit den richtigen Inhaltsdateien probieren oder Fehlende " "löschen." -#: src/wx/hints_dialog.cc:97 +#: src/wx/hints_dialog.cc:128 msgid "There are no hints: everything looks good!" msgstr "Keine Warnungen: Alles sieht gut aus!" @@ -1019,7 +1039,7 @@ msgstr "Zeit" msgid "Timeline" msgstr "Zeitleiste" -#: src/wx/film_editor.cc:289 +#: src/wx/film_editor.cc:290 msgid "Timeline..." msgstr "Zeitleiste..." @@ -1059,7 +1079,7 @@ msgstr "Unbekannt" msgid "Until" msgstr "Bis" -#: src/wx/film_editor.cc:285 +#: src/wx/film_editor.cc:286 msgid "Up" msgstr "Nach oben" @@ -1123,7 +1143,7 @@ msgstr "Horizontale Verschiebung" msgid "Y Offset" msgstr "Vertikale Verschiebung" -#: src/wx/hints_dialog.cc:90 +#: src/wx/hints_dialog.cc:121 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1132,7 +1152,7 @@ msgstr "" "Sie haben %d Dateien die wie VOB Dateien einer DVD aussehen. Sie sollten sie " "verbinden um einen sanften Übergang zwischen den Dateien zu haben." -#: src/wx/hints_dialog.cc:76 +#: src/wx/hints_dialog.cc:108 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1142,7 +1162,7 @@ msgstr "" "Probleme verursachen. Um auf der sicheren Seite zu sein sollten Sie 24 oder " "48 Bilder/s benutzen." -#: src/wx/hints_dialog.cc:66 +#: src/wx/hints_dialog.cc:71 msgid "" "Your DCP has an odd number of audio channels. This is very likely to cause " "problems on playback." @@ -1150,7 +1170,7 @@ msgstr "" "Ihr DCP hat eine ungerade Anzahl an Tonkanälen. Das wird wahrscheinlich zu " "Abspielproblemen führen." -#: src/wx/hints_dialog.cc:70 +#: src/wx/hints_dialog.cc:75 msgid "" "Your DCP has fewer than 6 audio channels. This may cause problems on some " "projectors." diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po index 3b782b353..bfa2d0b2f 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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-04-20 12:06-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@ -106,11 +106,11 @@ msgstr "Añadir cine..." msgid "Add Screen..." msgstr "Añadir pantalla..." -#: src/wx/film_editor.cc:279 +#: src/wx/film_editor.cc:280 msgid "Add file(s)..." msgstr "Añadir fichero(s)..." -#: src/wx/film_editor.cc:281 +#: src/wx/film_editor.cc:282 msgid "Add folder..." msgstr "Añadir carpeta..." @@ -118,6 +118,22 @@ msgstr "Añadir carpeta..." msgid "Add..." msgstr "Añadir..." +#: src/wx/hints_dialog.cc:102 +msgid "" +"All of your content is at 1.85:1 or narrower but your DCP's container is " +"Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " +"frame. You may prefer to set your DCP's container to Flat (1.85:1) in the " +"\"DCP\" tab." +msgstr "" + +#: src/wx/hints_dialog.cc:96 +msgid "" +"All of your content is in Scope (2.39:1) but your DCP's container is Flat " +"(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " +"You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" " +"tab." +msgstr "" + #: src/wx/config_dialog.cc:820 #, fuzzy msgid "Allow any DCP frame rate" @@ -245,11 +261,11 @@ msgstr "Buscar actualizaciones al iniciar" msgid "Choose a file" msgstr "Elige un fichero" -#: src/wx/film_editor.cc:792 +#: src/wx/film_editor.cc:795 msgid "Choose a file or files" msgstr "Elegir un fichero o ficheros" -#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:815 +#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:818 msgid "Choose a folder" msgstr "Elige una carpeta" @@ -297,6 +313,10 @@ msgstr "Versión del contenido" msgid "Content video is %dx%d (%.2f:1)\n" msgstr "El video es %dx%d (%.2f:1)\n" +#: src/wx/editable_list.h:64 +msgid "Copy..." +msgstr "" + #: src/wx/audio_dialog.cc:151 msgid "Could not analyse audio." msgstr "No se pudo analizar el audio." @@ -427,7 +447,7 @@ msgstr "Doremi" msgid "Doremi serial numbers must have 6 digits" msgstr "Los números de serie de Doremi deben tener 6 cifras" -#: src/wx/film_editor.cc:287 +#: src/wx/film_editor.cc:288 msgid "Down" msgstr "Bajar" @@ -454,7 +474,7 @@ msgstr "Editar pantalla..." #: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172 -#: src/wx/editable_list.h:64 +#: src/wx/editable_list.h:66 msgid "Edit..." msgstr "Editar..." @@ -558,7 +578,7 @@ msgstr "" msgid "HI" msgstr "HI" -#: src/wx/hints_dialog.cc:26 +#: src/wx/hints_dialog.cc:30 msgid "Hints" msgstr "Pistas" @@ -620,7 +640,7 @@ msgstr "" msgid "KDM|Timing" msgstr "Tiempo" -#: src/wx/film_editor.cc:297 +#: src/wx/film_editor.cc:298 msgid "Keep video in sequence" msgstr "Mantener el video secuencia" @@ -656,7 +676,7 @@ msgstr "" msgid "Ls" msgstr "Ls" -#: src/wx/film_editor.cc:766 +#: src/wx/film_editor.cc:769 msgid "MISSING: " msgstr "FALTA:" @@ -802,8 +822,8 @@ msgstr "Rc" msgid "Red band" msgstr "" -#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283 -#: src/wx/editable_list.h:66 +#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 +#: src/wx/editable_list.h:68 msgid "Remove" msgstr "Quitar" @@ -965,7 +985,7 @@ msgstr "Idioma del subtítulo (ej. EN)" msgid "Subtitles" msgstr "Subtítulos" -#: src/wx/about_dialog.cc:157 +#: src/wx/about_dialog.cc:158 msgid "Supported by" msgstr "Soportado por" @@ -990,7 +1010,7 @@ msgstr "Territorio (ej. ES)" msgid "Test version " msgstr "Versión en prueba" -#: src/wx/about_dialog.cc:202 +#: src/wx/about_dialog.cc:203 msgid "Tested by" msgstr "Comprobado por" @@ -1003,7 +1023,7 @@ msgstr "" "El fichero(s) especificados no es el mismo que el ausente. Puedes probar de " "nuevo con el fichero correcto o eliminar el contenido ausente." -#: src/wx/hints_dialog.cc:97 +#: src/wx/hints_dialog.cc:128 msgid "There are no hints: everything looks good!" msgstr "No hay recomendaciones: ¡todo parece bien!" @@ -1031,7 +1051,7 @@ msgstr "Tiempo" msgid "Timeline" msgstr "Línea de tiempo" -#: src/wx/film_editor.cc:289 +#: src/wx/film_editor.cc:290 msgid "Timeline..." msgstr "Linea de tiempo..." @@ -1072,7 +1092,7 @@ msgstr "Desconocido" msgid "Until" msgstr "Hasta" -#: src/wx/film_editor.cc:285 +#: src/wx/film_editor.cc:286 msgid "Up" msgstr "Subir" @@ -1139,7 +1159,7 @@ msgstr "Desplazamiento en X" msgid "Y Offset" msgstr "Desplazamiento en Y" -#: src/wx/hints_dialog.cc:90 +#: src/wx/hints_dialog.cc:121 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1148,7 +1168,7 @@ msgstr "" "Hay %d ficheros que parecen VOBs en el DVD. Deberías unirlos para asegurarte " "transiciones suaves." -#: src/wx/hints_dialog.cc:76 +#: src/wx/hints_dialog.cc:108 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1158,7 +1178,7 @@ msgstr "" "proyectores (sobre todo antiguos). Utiliza 24 o 48 imágenes por segundo " "para asegurarte." -#: src/wx/hints_dialog.cc:66 +#: src/wx/hints_dialog.cc:71 msgid "" "Your DCP has an odd number of audio channels. This is very likely to cause " "problems on playback." @@ -1166,7 +1186,7 @@ msgstr "" "Tu DCP tiene un número impar de canales de audio. Es muy probable que cause " "problemas de reproducción." -#: src/wx/hints_dialog.cc:70 +#: src/wx/hints_dialog.cc:75 msgid "" "Your DCP has fewer than 6 audio channels. This may cause problems on some " "projectors." diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po index e9685808c..5e1e2df5d 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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-07-14 11:27+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" @@ -105,11 +105,11 @@ msgstr "Ajout cinéma" msgid "Add Screen..." msgstr "Ajout une salle" -#: src/wx/film_editor.cc:279 +#: src/wx/film_editor.cc:280 msgid "Add file(s)..." msgstr "Ajout fichier(s)..." -#: src/wx/film_editor.cc:281 +#: src/wx/film_editor.cc:282 msgid "Add folder..." msgstr "Ajout dossier..." @@ -117,6 +117,22 @@ msgstr "Ajout dossier..." msgid "Add..." msgstr "Ajouter..." +#: src/wx/hints_dialog.cc:102 +msgid "" +"All of your content is at 1.85:1 or narrower but your DCP's container is " +"Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " +"frame. You may prefer to set your DCP's container to Flat (1.85:1) in the " +"\"DCP\" tab." +msgstr "" + +#: src/wx/hints_dialog.cc:96 +msgid "" +"All of your content is in Scope (2.39:1) but your DCP's container is Flat " +"(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " +"You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" " +"tab." +msgstr "" + #: src/wx/config_dialog.cc:820 msgid "Allow any DCP frame rate" msgstr "Autoriser toutes cadences" @@ -244,11 +260,11 @@ msgstr "Recherche de mises à jour au démarrage." msgid "Choose a file" msgstr "Choisissez un fichier" -#: src/wx/film_editor.cc:792 +#: src/wx/film_editor.cc:795 msgid "Choose a file or files" msgstr "Choisissez un ou plusieurs fichiers" -#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:815 +#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:818 msgid "Choose a folder" msgstr "Choisissez un dossier" @@ -295,6 +311,10 @@ msgstr "Version du contenu" msgid "Content video is %dx%d (%.2f:1)\n" msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n" +#: src/wx/editable_list.h:64 +msgid "Copy..." +msgstr "" + #: src/wx/audio_dialog.cc:151 msgid "Could not analyse audio." msgstr "Analyse du son impossible" @@ -423,7 +443,7 @@ msgstr "Doremi" msgid "Doremi serial numbers must have 6 digits" msgstr "Les numéros de série Doremi doivent être composés de 6 chiffres" -#: src/wx/film_editor.cc:287 +#: src/wx/film_editor.cc:288 msgid "Down" msgstr "Descendre" @@ -450,7 +470,7 @@ msgstr "Éditer la salle" #: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172 -#: src/wx/editable_list.h:64 +#: src/wx/editable_list.h:66 msgid "Edit..." msgstr "Éditer..." @@ -552,7 +572,7 @@ msgstr "Général" msgid "HI" msgstr "HI" -#: src/wx/hints_dialog.cc:26 +#: src/wx/hints_dialog.cc:30 msgid "Hints" msgstr "Conseils" @@ -612,7 +632,7 @@ msgstr "" msgid "KDM|Timing" msgstr "Temps" -#: src/wx/film_editor.cc:297 +#: src/wx/film_editor.cc:298 msgid "Keep video in sequence" msgstr "Conserver la vidéo dans la séquence" @@ -648,7 +668,7 @@ msgstr "Rapport" msgid "Ls" msgstr "Sr.G" -#: src/wx/film_editor.cc:766 +#: src/wx/film_editor.cc:769 msgid "MISSING: " msgstr "MANQUANT:" @@ -793,8 +813,8 @@ msgstr "CD" msgid "Red band" msgstr "Red Band" -#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283 -#: src/wx/editable_list.h:66 +#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 +#: src/wx/editable_list.h:68 msgid "Remove" msgstr "Supprimer" @@ -951,7 +971,7 @@ msgstr "Langue de sous-titres (ex. FR)" msgid "Subtitles" msgstr "Sous-titres" -#: src/wx/about_dialog.cc:157 +#: src/wx/about_dialog.cc:158 msgid "Supported by" msgstr "Soutenu par" @@ -975,7 +995,7 @@ msgstr "Territoire (ex. FR)" msgid "Test version " msgstr "Version test" -#: src/wx/about_dialog.cc:202 +#: src/wx/about_dialog.cc:203 msgid "Tested by" msgstr "Testé par" @@ -989,7 +1009,7 @@ msgstr "" "ceux détectés comme manquants. Vous pouvez réessayer avec les contenus " "corrects ou supprimer les contenus manquants." -#: src/wx/hints_dialog.cc:97 +#: src/wx/hints_dialog.cc:128 msgid "There are no hints: everything looks good!" msgstr "Il n'y a aucun avertissement: tout semble correct!" @@ -1017,7 +1037,7 @@ msgstr "Durée" msgid "Timeline" msgstr "Timeline" -#: src/wx/film_editor.cc:289 +#: src/wx/film_editor.cc:290 msgid "Timeline..." msgstr "Timeline..." @@ -1057,7 +1077,7 @@ msgstr "inconnu." msgid "Until" msgstr "Jusqu'au" -#: src/wx/film_editor.cc:285 +#: src/wx/film_editor.cc:286 msgid "Up" msgstr "Monter" @@ -1121,7 +1141,7 @@ msgstr "Position horizontale" msgid "Y Offset" msgstr "Position verticale" -#: src/wx/hints_dialog.cc:90 +#: src/wx/hints_dialog.cc:121 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1130,7 +1150,7 @@ msgstr "" "%d fichiers ressemblent à des fichiers VOB de DVD. Vous devriez les ajouter " "afin de vous assurer d'une jonction correcte entre vos fichiers." -#: src/wx/hints_dialog.cc:76 +#: src/wx/hints_dialog.cc:108 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1140,7 +1160,7 @@ msgstr "" "quelques projecteurs (anciens). Utilisez plutôt une cadence de 24 ou 48 " "images par seconde pour assurer une plus grande compatibilité." -#: src/wx/hints_dialog.cc:66 +#: src/wx/hints_dialog.cc:71 msgid "" "Your DCP has an odd number of audio channels. This is very likely to cause " "problems on playback." @@ -1148,7 +1168,7 @@ msgstr "" "Votre DCP possède un nombre impair de canaux audio. Cela peut créer des " "problèmes de lecture." -#: src/wx/hints_dialog.cc:70 +#: src/wx/hints_dialog.cc:75 msgid "" "Your DCP has fewer than 6 audio channels. This may cause problems on some " "projectors." diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po index a00640c48..d2d191dff 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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-02-03 10:46+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" @@ -104,11 +104,11 @@ msgstr "Aggiungi Cinema" msgid "Add Screen..." msgstr "Aggiungi Schermo" -#: src/wx/film_editor.cc:279 +#: src/wx/film_editor.cc:280 msgid "Add file(s)..." msgstr "Aggiungi File" -#: src/wx/film_editor.cc:281 +#: src/wx/film_editor.cc:282 msgid "Add folder..." msgstr "Aggiungi cartella" @@ -116,6 +116,22 @@ msgstr "Aggiungi cartella" msgid "Add..." msgstr "Aggiungi..." +#: src/wx/hints_dialog.cc:102 +msgid "" +"All of your content is at 1.85:1 or narrower but your DCP's container is " +"Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " +"frame. You may prefer to set your DCP's container to Flat (1.85:1) in the " +"\"DCP\" tab." +msgstr "" + +#: src/wx/hints_dialog.cc:96 +msgid "" +"All of your content is in Scope (2.39:1) but your DCP's container is Flat " +"(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " +"You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" " +"tab." +msgstr "" + #: src/wx/config_dialog.cc:820 #, fuzzy msgid "Allow any DCP frame rate" @@ -247,11 +263,11 @@ msgstr "Controlla gli aggiornamentio alla partenza" msgid "Choose a file" msgstr "Scegli un file" -#: src/wx/film_editor.cc:792 +#: src/wx/film_editor.cc:795 msgid "Choose a file or files" msgstr "Scegli uno o più file" -#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:815 +#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:818 msgid "Choose a folder" msgstr "Scegli una cartella" @@ -300,6 +316,10 @@ msgstr "Tipo di sorgente" msgid "Content video is %dx%d (%.2f:1)\n" msgstr "Il video originale è %dx%d (%.2f:1)\n" +#: src/wx/editable_list.h:64 +msgid "Copy..." +msgstr "" + #: src/wx/audio_dialog.cc:151 msgid "Could not analyse audio." msgstr "Non posso analizzare l'audio." @@ -433,7 +453,7 @@ msgstr "" msgid "Doremi serial numbers must have 6 digits" msgstr "" -#: src/wx/film_editor.cc:287 +#: src/wx/film_editor.cc:288 msgid "Down" msgstr "" @@ -460,7 +480,7 @@ msgstr "Modifica Schermo..." #: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172 -#: src/wx/editable_list.h:64 +#: src/wx/editable_list.h:66 msgid "Edit..." msgstr "Modifica..." @@ -565,7 +585,7 @@ msgstr "" msgid "HI" msgstr "HI" -#: src/wx/hints_dialog.cc:26 +#: src/wx/hints_dialog.cc:30 msgid "Hints" msgstr "Suggerimenti" @@ -627,7 +647,7 @@ msgstr "" msgid "KDM|Timing" msgstr "" -#: src/wx/film_editor.cc:297 +#: src/wx/film_editor.cc:298 msgid "Keep video in sequence" msgstr "Tieni i video in sequenza" @@ -663,7 +683,7 @@ msgstr "" msgid "Ls" msgstr "Ls" -#: src/wx/film_editor.cc:766 +#: src/wx/film_editor.cc:769 msgid "MISSING: " msgstr "MANCANTE:" @@ -813,8 +833,8 @@ msgstr "Rc" msgid "Red band" msgstr "" -#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283 -#: src/wx/editable_list.h:66 +#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 +#: src/wx/editable_list.h:68 msgid "Remove" msgstr "Rimuovi" @@ -976,7 +996,7 @@ msgstr "Lingua dei Sottotitoli (es. FR)" msgid "Subtitles" msgstr "Sottotitoli" -#: src/wx/about_dialog.cc:157 +#: src/wx/about_dialog.cc:158 msgid "Supported by" msgstr "" @@ -1002,7 +1022,7 @@ msgstr "Nazione (es. UK)" msgid "Test version " msgstr "Versione di test" -#: src/wx/about_dialog.cc:202 +#: src/wx/about_dialog.cc:203 msgid "Tested by" msgstr "" @@ -1015,7 +1035,7 @@ msgstr "" "Il/i file sorgenteo che hai specificato sono diversi da quelli mancanti. " "Riprova oppure rimuovi la sorgente mancante." -#: src/wx/hints_dialog.cc:97 +#: src/wx/hints_dialog.cc:128 msgid "There are no hints: everything looks good!" msgstr "Non ci sono suggerimenti: sembra tutto a posto!" @@ -1043,7 +1063,7 @@ msgstr "Tempo" msgid "Timeline" msgstr "Timeline" -#: src/wx/film_editor.cc:289 +#: src/wx/film_editor.cc:290 msgid "Timeline..." msgstr "" @@ -1085,7 +1105,7 @@ msgstr "sconosciuto" msgid "Until" msgstr "Fino a" -#: src/wx/film_editor.cc:285 +#: src/wx/film_editor.cc:286 msgid "Up" msgstr "Su" @@ -1150,7 +1170,7 @@ msgstr "Spostamento X" msgid "Y Offset" msgstr "Spostamento Y" -#: src/wx/hints_dialog.cc:90 +#: src/wx/hints_dialog.cc:121 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1159,7 +1179,7 @@ msgstr "" "Ci sono %d file che sembrano essere DVD VOB. Dovresti unirli per assicurare " "una giunta senza interruzioni tra i file." -#: src/wx/hints_dialog.cc:76 +#: src/wx/hints_dialog.cc:108 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1169,7 +1189,7 @@ msgstr "" "problemi in alcuni (per lo più vecchi) proiettori. Usa 24 o 48 frame al " "secondo se vuoi esssere sicuro." -#: src/wx/hints_dialog.cc:66 +#: src/wx/hints_dialog.cc:71 msgid "" "Your DCP has an odd number of audio channels. This is very likely to cause " "problems on playback." @@ -1177,7 +1197,7 @@ msgstr "" "Il vostro DCP ha un numero dispari di canali audio. Questo può causare " "problemi durante la riproduzione." -#: src/wx/hints_dialog.cc:70 +#: src/wx/hints_dialog.cc:75 msgid "" "Your DCP has fewer than 6 audio channels. This may cause problems on some " "projectors." diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po index 92a395144..3ed860548 100644 --- a/src/wx/po/nl_NL.po +++ b/src/wx/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-03-30 19:40+0100\n" "Last-Translator: Theo Kooijmans \n" "Language-Team: UniversalDV \n" @@ -107,11 +107,11 @@ msgstr "Voeg Bioscoop toe..." msgid "Add Screen..." msgstr "Voeg Scherm toe..." -#: src/wx/film_editor.cc:279 +#: src/wx/film_editor.cc:280 msgid "Add file(s)..." msgstr "Voeg bestande(n) toe..." -#: src/wx/film_editor.cc:281 +#: src/wx/film_editor.cc:282 msgid "Add folder..." msgstr "Voeg map toe..." @@ -119,6 +119,22 @@ msgstr "Voeg map toe..." msgid "Add..." msgstr "Toevoegen.." +#: src/wx/hints_dialog.cc:102 +msgid "" +"All of your content is at 1.85:1 or narrower but your DCP's container is " +"Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " +"frame. You may prefer to set your DCP's container to Flat (1.85:1) in the " +"\"DCP\" tab." +msgstr "" + +#: src/wx/hints_dialog.cc:96 +msgid "" +"All of your content is in Scope (2.39:1) but your DCP's container is Flat " +"(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " +"You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" " +"tab." +msgstr "" + #: src/wx/config_dialog.cc:820 #, fuzzy msgid "Allow any DCP frame rate" @@ -251,11 +267,11 @@ msgstr "Selecteer voor updates controle bij startup" msgid "Choose a file" msgstr "Kies een bestand" -#: src/wx/film_editor.cc:792 +#: src/wx/film_editor.cc:795 msgid "Choose a file or files" msgstr "Kies bestand(en)" -#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:815 +#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:818 msgid "Choose a folder" msgstr "Kies map" @@ -303,6 +319,10 @@ msgstr "Content versie" msgid "Content video is %dx%d (%.2f:1)\n" msgstr "Content video is %dx%d (%.2f:1)\n" +#: src/wx/editable_list.h:64 +msgid "Copy..." +msgstr "" + #: src/wx/audio_dialog.cc:151 msgid "Could not analyse audio." msgstr "Kan audio niet analyseren" @@ -433,7 +453,7 @@ msgstr "Doremi" msgid "Doremi serial numbers must have 6 digits" msgstr "Doremi serial numbers moeten bestaan uit 6 digits" -#: src/wx/film_editor.cc:287 +#: src/wx/film_editor.cc:288 msgid "Down" msgstr "Naar beneden" @@ -460,7 +480,7 @@ msgstr "Edit scherm" #: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172 -#: src/wx/editable_list.h:64 +#: src/wx/editable_list.h:66 msgid "Edit..." msgstr "Edit..." @@ -563,7 +583,7 @@ msgstr "" msgid "HI" msgstr "HI" -#: src/wx/hints_dialog.cc:26 +#: src/wx/hints_dialog.cc:30 msgid "Hints" msgstr "Tips" @@ -625,7 +645,7 @@ msgstr "" msgid "KDM|Timing" msgstr "Timing" -#: src/wx/film_editor.cc:297 +#: src/wx/film_editor.cc:298 msgid "Keep video in sequence" msgstr "Behoud video in tijdlijn" @@ -661,7 +681,7 @@ msgstr "" msgid "Ls" msgstr "Ls" -#: src/wx/film_editor.cc:766 +#: src/wx/film_editor.cc:769 msgid "MISSING: " msgstr "ONTBREEKT:" @@ -809,8 +829,8 @@ msgstr "Rc" msgid "Red band" msgstr "" -#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283 -#: src/wx/editable_list.h:66 +#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 +#: src/wx/editable_list.h:68 msgid "Remove" msgstr "Verwijder" @@ -971,7 +991,7 @@ msgstr "Ondertitel Taal (vb NL)" msgid "Subtitles" msgstr "Ondertitels" -#: src/wx/about_dialog.cc:157 +#: src/wx/about_dialog.cc:158 msgid "Supported by" msgstr "Ondersteund door" @@ -996,7 +1016,7 @@ msgstr "Grondgebied (vb NL)" msgid "Test version " msgstr "Test Versie" -#: src/wx/about_dialog.cc:202 +#: src/wx/about_dialog.cc:203 msgid "Tested by" msgstr "Getest door" @@ -1010,7 +1030,7 @@ msgstr "" "ontbrekende bestanden. Probeer opnieuw met de goede content of verwijder de " "ontbrekende content. " -#: src/wx/hints_dialog.cc:97 +#: src/wx/hints_dialog.cc:128 msgid "There are no hints: everything looks good!" msgstr "Er zijn geen tips, alles lijkt goed!" @@ -1038,7 +1058,7 @@ msgstr "Tijd" msgid "Timeline" msgstr "Tijdlijn" -#: src/wx/film_editor.cc:289 +#: src/wx/film_editor.cc:290 msgid "Timeline..." msgstr "Tijdlijn..." @@ -1079,7 +1099,7 @@ msgstr "Onbekend" msgid "Until" msgstr "Totdat" -#: src/wx/film_editor.cc:285 +#: src/wx/film_editor.cc:286 msgid "Up" msgstr "Omhoog" @@ -1144,7 +1164,7 @@ msgstr "X offset" msgid "Y Offset" msgstr "Y offset" -#: src/wx/hints_dialog.cc:90 +#: src/wx/hints_dialog.cc:121 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1153,7 +1173,7 @@ msgstr "" "U hebt %d bestanden die lijken op VOB bestanden van DVD. U moet deze " "samenvoegen om soepele weergave mogelijk te maken." -#: src/wx/hints_dialog.cc:76 +#: src/wx/hints_dialog.cc:108 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1162,7 +1182,7 @@ msgstr "" "Uw DCP frame rate (%d fps) kan mogelijk problemen veroorzaken met oudere " "projectors. Gebruik 24 of 48 frames per seconde voor zekerheid." -#: src/wx/hints_dialog.cc:66 +#: src/wx/hints_dialog.cc:71 msgid "" "Your DCP has an odd number of audio channels. This is very likely to cause " "problems on playback." @@ -1170,7 +1190,7 @@ msgstr "" "Uw DCP heeft een oneven aantal audio kanalen. Dit geeft hoogstwaarschijnlijk " "problemen met weergave." -#: src/wx/hints_dialog.cc:70 +#: src/wx/hints_dialog.cc:75 msgid "" "Your DCP has fewer than 6 audio channels. This may cause problems on some " "projectors." diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po index 7ede737b8..e3606f1a5 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-08-26 21:47+0100\n" +"POT-Creation-Date: 2014-08-31 17:20+0100\n" "PO-Revision-Date: 2014-01-19 09:14+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@ -106,11 +106,11 @@ msgstr "Lägg till Cinema..." msgid "Add Screen..." msgstr "Lägg till Skärm..." -#: src/wx/film_editor.cc:279 +#: src/wx/film_editor.cc:280 msgid "Add file(s)..." msgstr "Lägg till fil(er)..." -#: src/wx/film_editor.cc:281 +#: src/wx/film_editor.cc:282 msgid "Add folder..." msgstr "Lägg till folder..." @@ -118,6 +118,22 @@ msgstr "Lägg till folder..." msgid "Add..." msgstr "Lägg till..." +#: src/wx/hints_dialog.cc:102 +msgid "" +"All of your content is at 1.85:1 or narrower but your DCP's container is " +"Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " +"frame. You may prefer to set your DCP's container to Flat (1.85:1) in the " +"\"DCP\" tab." +msgstr "" + +#: src/wx/hints_dialog.cc:96 +msgid "" +"All of your content is in Scope (2.39:1) but your DCP's container is Flat " +"(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " +"You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" " +"tab." +msgstr "" + #: src/wx/config_dialog.cc:820 #, fuzzy msgid "Allow any DCP frame rate" @@ -251,11 +267,11 @@ msgstr "Sök efter uppdateringar vid start" msgid "Choose a file" msgstr "Välj en fil" -#: src/wx/film_editor.cc:792 +#: src/wx/film_editor.cc:795 msgid "Choose a file or files" msgstr "Välj en fil eller filer" -#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:815 +#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:818 msgid "Choose a folder" msgstr "Välj en folder" @@ -306,6 +322,10 @@ msgstr "Innehållsversion" msgid "Content video is %dx%d (%.2f:1)\n" msgstr "Original-videon är %dx%d (%.2f:1)\n" +#: src/wx/editable_list.h:64 +msgid "Copy..." +msgstr "" + #: src/wx/audio_dialog.cc:151 msgid "Could not analyse audio." msgstr "Kunde inte analysera audio." @@ -439,7 +459,7 @@ msgstr "" msgid "Doremi serial numbers must have 6 digits" msgstr "" -#: src/wx/film_editor.cc:287 +#: src/wx/film_editor.cc:288 msgid "Down" msgstr "Ner" @@ -467,7 +487,7 @@ msgstr "Redigera Skärm..." #: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172 -#: src/wx/editable_list.h:64 +#: src/wx/editable_list.h:66 msgid "Edit..." msgstr "Redigera..." @@ -572,7 +592,7 @@ msgstr "" msgid "HI" msgstr "HI" -#: src/wx/hints_dialog.cc:26 +#: src/wx/hints_dialog.cc:30 msgid "Hints" msgstr "Råd" @@ -637,7 +657,7 @@ msgid "KDM|Timing" msgstr "Tajming" # "sekvens" eller "ordning"? -#: src/wx/film_editor.cc:297 +#: src/wx/film_editor.cc:298 msgid "Keep video in sequence" msgstr "Behåll video i sekvens" @@ -673,7 +693,7 @@ msgstr "" msgid "Ls" msgstr "Vs" -#: src/wx/film_editor.cc:766 +#: src/wx/film_editor.cc:769 msgid "MISSING: " msgstr "SAKNAS:" @@ -823,8 +843,8 @@ msgstr "Hc" msgid "Red band" msgstr "" -#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283 -#: src/wx/editable_list.h:66 +#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284 +#: src/wx/editable_list.h:68 msgid "Remove" msgstr "Ta bort" @@ -988,7 +1008,7 @@ msgstr "Undertextspråk (ex. SV)" msgid "Subtitles" msgstr "Undertexter" -#: src/wx/about_dialog.cc:157 +#: src/wx/about_dialog.cc:158 msgid "Supported by" msgstr "Stöd från" @@ -1013,7 +1033,7 @@ msgstr "Område (ex. SV)" msgid "Test version " msgstr "Testversion" -#: src/wx/about_dialog.cc:202 +#: src/wx/about_dialog.cc:203 #, fuzzy msgid "Tested by" msgstr "Översatt av" @@ -1027,7 +1047,7 @@ msgstr "" "Innehållsfilerna du angav är inte samma som de som saknas. Försök igen med " "rätt innehållsfiler eller ta bort det saknade innehållet." -#: src/wx/hints_dialog.cc:97 +#: src/wx/hints_dialog.cc:128 msgid "There are no hints: everything looks good!" msgstr "Det finns inga råd: allt verkar bra!" @@ -1055,7 +1075,7 @@ msgstr "Tid" msgid "Timeline" msgstr "Tidslinje" -#: src/wx/film_editor.cc:289 +#: src/wx/film_editor.cc:290 msgid "Timeline..." msgstr "Tidslinje..." @@ -1100,7 +1120,7 @@ msgstr "okänt" msgid "Until" msgstr "Tills" -#: src/wx/film_editor.cc:285 +#: src/wx/film_editor.cc:286 msgid "Up" msgstr "Upp" @@ -1167,7 +1187,7 @@ msgstr "Undertext Förskjutning" msgid "Y Offset" msgstr "Undertext Förskjutning" -#: src/wx/hints_dialog.cc:90 +#: src/wx/hints_dialog.cc:121 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1176,7 +1196,7 @@ msgstr "" "Du har %d filer som verkar vara VOB-filer från DVD. Du borde sammanfoga dom " "för att säkerställa jämna övergångar mellan filerna." -#: src/wx/hints_dialog.cc:76 +#: src/wx/hints_dialog.cc:108 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1185,7 +1205,7 @@ msgstr "" "Din DCP-bildhastighet (%d bps) kan orsaka problem i några få (äldre) " "projektorer. Använd 24 eller 48 bilder per sekund för att vara säker." -#: src/wx/hints_dialog.cc:66 +#: src/wx/hints_dialog.cc:71 msgid "" "Your DCP has an odd number of audio channels. This is very likely to cause " "problems on playback." @@ -1193,7 +1213,7 @@ msgstr "" "Din DCP har udda antal audiokanaler. Detta kommer troligen att ge problem " "vid uppspelning." -#: src/wx/hints_dialog.cc:70 +#: src/wx/hints_dialog.cc:75 msgid "" "Your DCP has fewer than 6 audio channels. This may cause problems on some " "projectors."