From c8d0cdb8f0451b290bf636fe17be3d5abda99e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 18:34:02 -0300 Subject: [PATCH 1/6] Changed upload_sourceforge.sh to use scp instead of rsync. --- bin/upload_sourceforge.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/upload_sourceforge.sh b/bin/upload_sourceforge.sh index bc9840f46..54acb3499 100755 --- a/bin/upload_sourceforge.sh +++ b/bin/upload_sourceforge.sh @@ -69,10 +69,14 @@ upload_file() { # Upload the file to the created directory echo - echo "Sending $1 as $2..." + echo "Uploading $1 as $2..." echo - rsync -avP --ignore-errors -e "ssh -i $SSH_KEY" $1 ggarra13@frs.sourceforge.net:/home/frs/project/mrv2/beta/$2 - #scp -i $SSH_KEY $1 ggarra13@frs.sourceforge.net:/home/frs/project/mrv2/beta/$2 + #rsync -av --ignore-errors -e "ssh -i $SSH_KEY" $1 ggarra13@frs.sourceforge.net:/home/frs/project/mrv2/beta/$2 + scp -i $SSH_KEY $1 ggarra13@frs.sourceforge.net:/home/frs/project/mrv2/beta/$2 + echo + echo "Upload was successful." + echo + sleep 15 } From 2794565e45cee05fbbb859b35bbcb7d39c6d0f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 19:32:44 -0300 Subject: [PATCH 2/6] Reverted change of WindowShowTypemap.i but made all paths call show without arguments. --- .../pyFLTK-patch/swig/WindowShowTypemap.i | 92 ++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/cmake/patches/pyFLTK-patch/swig/WindowShowTypemap.i b/cmake/patches/pyFLTK-patch/swig/WindowShowTypemap.i index e240f1f5a..01083c4da 100644 --- a/cmake/patches/pyFLTK-patch/swig/WindowShowTypemap.i +++ b/cmake/patches/pyFLTK-patch/swig/WindowShowTypemap.i @@ -1,8 +1,98 @@ +// This tells SWIG to treat char ** as a special case +%typemap(in) char ** { + // Check if is a list + if (PyList_Check($input)) { + int size = PyList_Size($input); + int i = 0; + $1 = (char **) malloc((size+1)*sizeof(char *)); + for (i = 0; i < size; i++) { + PyObject *o = PyList_GetItem($input,i); +%#if PY_VERSION_HEX>=0x03000000 + if (PyUnicode_Check(o)) +%#else + if (PyString_Check(o)) +%#endif + //$1[i] = PyString_AsString(PyList_GetItem($input,i)); + $1[i] = SWIG_Python_str_AsChar(PyList_GetItem($input,i)); + else { + PyErr_SetString(PyExc_TypeError,"list must contain strings"); + free($1); + return NULL; + } + } + $1[i] = 0; + } else { + PyErr_SetString(PyExc_TypeError,"not a list"); + return NULL; + } +} + +// This cleans up the char ** array we malloc'd before the function call +%typemap(freearg) char ** { + free((char *) $1); +} %define MACRO_WINDOW_SHOW -void show() +void show(PyObject *count = 0, PyObject *data = 0) { + Py_XINCREF(count); + Py_XINCREF(data); + if (!count) self->show(); + else if (!data) { + if (PyList_Check(count)) { + int size = PyList_Size(count); + int i = 0; + char** tmp = (char **) malloc((size+1)*sizeof(char *)); + for (i = 0; i < size; i++) { + PyObject *o = PyList_GetItem(count,i); +%#if PY_VERSION_HEX>=0x03000000 + if (PyUnicode_Check(o)) +%#else + if (PyString_Check(o)) +%#endif + tmp[i] = SWIG_Python_str_AsChar(PyList_GetItem(count,i)); + //tmp[i] = PyString_AsString(PyList_GetItem(count,i)); + else { + PyErr_SetString(PyExc_TypeError,"list must contain strings"); + free(tmp); + return; + } + } + tmp[i] = 0; + self->show(); + free(tmp); + } + } + else { + if (PyList_Check(data)) { + int size = PyInt_AsLong(count); + int i = 0; + char** tmp = (char **) malloc((size+1)*sizeof(char *)); + for (i = 0; i < size; i++) { + PyObject *o = PyList_GetItem(data,i); +%#if PY_VERSION_HEX>=0x03000000 + if (PyUnicode_Check(o)) +%#else + if (PyString_Check(o)) +%#endif + tmp[i] = SWIG_Python_str_AsChar(PyList_GetItem(data,i)); + //tmp[i] = PyString_AsString(PyList_GetItem(data,i)); + else { + PyErr_SetString(PyExc_TypeError,"list must contain strings"); + free(tmp); + return; + } + } + tmp[i] = 0; + self->show(); + free(tmp); + } else { + PyErr_SetString(PyExc_TypeError,"not a list"); + self->show(); + } + + } } %enddef From c4869ed17fe7e567f48bd648582874bd9f7fd526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 20:25:12 -0300 Subject: [PATCH 3/6] Added Save/OTIO EDL Timeline to menus. Refactor Saving timeline code. Allowed saving single movie files and .otio files, not just EDLs. --- etc/functions.sh | 12 +- mrv2/docs/HISTORY.md | 2 + mrv2/lib/mrvCore/mrvHotkey.cpp | 2 + mrv2/lib/mrvCore/mrvHotkey.h | 1 + mrv2/lib/mrvEdit/mrvEditCallbacks.cpp | 28 +- mrv2/lib/mrvEdit/mrvEditCallbacks.h | 5 +- mrv2/lib/mrvPy/Playlist.cpp | 19 +- mrv2/lib/mrvUI/mrvMenus.cpp | 5 +- mrv2/po/es.po | 27 +- mrv2/po/messages.pot | 914 +++++++++++++------------- 10 files changed, 531 insertions(+), 484 deletions(-) diff --git a/etc/functions.sh b/etc/functions.sh index 50719c619..0639ad6d9 100755 --- a/etc/functions.sh +++ b/etc/functions.sh @@ -12,10 +12,15 @@ # run_cmd() { - echo echo "> $*" - echo - time eval command $* + # These quick commands we won't time them + if [[ "$1" == "rm" || "$1" == "mv" || "$1" == "cp" || \ + "$1" == "ln" ]]; then + eval command $* + else + time eval command $* + echo + fi } # @@ -40,7 +45,6 @@ get_kernel() else export ARCH=i386 fi - echo "KERNEL=$KERNEL ARCH=$ARCH" } # diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md index 73c6f1ed2..4db9759d1 100644 --- a/mrv2/docs/HISTORY.md +++ b/mrv2/docs/HISTORY.md @@ -39,6 +39,8 @@ Preferences->User Interface->Single Instance. This solves the issues with losing focus on the Frame, Start Frame and End Frame widgets. It also fixes problems when showing a Python window which would otherwise not stay on top. +- Added Save/OTIO EDL Timeline to the menus. +- Allowed Saving OTIO Timelines of single clips and other .otio files. - Build system changes and fixes: * Renamed runme.sh script to runme_nolog.sh. * Added a new runme.sh script that calls runme_nolog.sh but saves the compile log into BUILD-KERNEL-ARCH/CMAKE_BUILD_TYPE/compile.log. diff --git a/mrv2/lib/mrvCore/mrvHotkey.cpp b/mrv2/lib/mrvCore/mrvHotkey.cpp index f0271bbb9..0d8d70c92 100644 --- a/mrv2/lib/mrvCore/mrvHotkey.cpp +++ b/mrv2/lib/mrvCore/mrvHotkey.cpp @@ -25,6 +25,7 @@ namespace mrv Hotkey kSaveImage(false, false, false, false, 0); Hotkey kSaveSequence(true, false, false, true, 's'); + Hotkey kSaveOTIOEDL(false, false, false, false, 0); Hotkey kSavePDF(false, false, false, false, 0); Hotkey kSaveSession(true, false, false, false, 's'); Hotkey kSaveSessionAs(false, false, false, false, 0); @@ -323,6 +324,7 @@ namespace mrv HotkeyEntry(_("Save Image"), kSaveImage), HotkeyEntry(_("Save Movie or Sequence"), kSaveSequence), + HotkeyEntry(_("Save OTIO Timeline"), kSaveOTIOEDL), HotkeyEntry(_("Save PDF Document"), kSavePDF), HotkeyEntry(_("Save Session"), kSaveSession), HotkeyEntry(_("Save Session As"), kSaveSessionAs), diff --git a/mrv2/lib/mrvCore/mrvHotkey.h b/mrv2/lib/mrvCore/mrvHotkey.h index 4cbe85d74..454c7d8bd 100644 --- a/mrv2/lib/mrvCore/mrvHotkey.h +++ b/mrv2/lib/mrvCore/mrvHotkey.h @@ -90,6 +90,7 @@ namespace mrv extern Hotkey kOpenStereoImage; extern Hotkey kOpenSession; extern Hotkey kSaveImage; + extern Hotkey kSaveOTIOEDL; extern Hotkey kSaveSequence; extern Hotkey kSavePDF; extern Hotkey kSaveSession; diff --git a/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp b/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp index 59e3bb500..dbcc6c6fc 100644 --- a/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp +++ b/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp @@ -1386,14 +1386,18 @@ namespace mrv tcp->unlock(); } - void - save_timeline_to_disk(otio::Timeline* timeline, const std::string& otioFile) + void save_timeline_to_disk( + otio::Timeline* timeline, const std::string& otioFile, + bool makeRelativePaths) { const std::string s = timeline->to_json_string(); otio::SerializableObject::Retainer out( dynamic_cast(otio::Timeline::from_json_string(s))); auto stack = out->tracks(); - makePathsRelative(stack, otioFile); + if (makeRelativePaths) + makePathsRelative(stack, otioFile); + else + makePathsAbsolute(out, App::ui); otio::ErrorStatus errorStatus; out->to_json_file(otioFile, &errorStatus); if (otio::is_error(errorStatus)) @@ -1405,8 +1409,10 @@ namespace mrv } } - void save_timeline_to_disk_cb(Fl_Menu_* m, ViewerUI* ui) + void save_timeline_to_disk(const std::string& otioFile) { + + ViewerUI* ui = App::ui; auto player = ui->uiView->getTimelinePlayer(); if (!player) return; @@ -1414,10 +1420,10 @@ namespace mrv auto model = ui->app->filesModel(); auto Aitem = model->observeA()->get(); file::Path path = Aitem->path; - if (!isTemporaryEDL(path)) + bool makeRelativePaths = false; + if (isTemporaryEDL(path)) { - LOG_ERROR(_("Not an EDL file to save.")); - return; + makeRelativePaths = true; } auto timeline = player->getTimeline(); @@ -1427,11 +1433,17 @@ namespace mrv return; } + save_timeline_to_disk(timeline, otioFile, makeRelativePaths); + } + + void save_timeline_to_disk_cb(Fl_Menu_* m, ViewerUI* ui) + { + auto otioFile = save_otio(nullptr); if (otioFile.empty()) return; - save_timeline_to_disk(timeline, otioFile); + save_timeline_to_disk(otioFile); } void diff --git a/mrv2/lib/mrvEdit/mrvEditCallbacks.h b/mrv2/lib/mrvEdit/mrvEditCallbacks.h index 58db1ce4e..cc0a6da83 100644 --- a/mrv2/lib/mrvEdit/mrvEditCallbacks.h +++ b/mrv2/lib/mrvEdit/mrvEditCallbacks.h @@ -113,9 +113,8 @@ namespace mrv //! Save current OTIO timeline (EDL) to a permanent place on disk. void save_timeline_to_disk_cb(Fl_Menu_* m, ViewerUI* ui); - //! Save current OTIO timeline (EDL) to a filename. Timeline and EDL - //! must be verified first. - void save_timeline_to_disk(otio::Timeline*, const std::string& fileName); + //! Save current OTIO timeline (EDL) to a filename. + void save_timeline_to_disk(const std::string& otioFile); // // Set the edit mode height. diff --git a/mrv2/lib/mrvPy/Playlist.cpp b/mrv2/lib/mrvPy/Playlist.cpp index 0986ff1e6..27ac6e4a6 100644 --- a/mrv2/lib/mrvPy/Playlist.cpp +++ b/mrv2/lib/mrvPy/Playlist.cpp @@ -142,33 +142,18 @@ namespace mrv2 } /** - * @brief Save the .otio playlist to disk with relative paths - * and loads it right after. + * @brief Save the .otio playlist to disk with relative paths. * * @param fileName file name of the playlist to save on disk. */ void save(const std::string& fileName) { - ViewerUI* ui = App::ui; - auto model = App::app->filesModel(); - auto Aitem = model->observeA()->get(); - file::Path path = Aitem->path; - if (!isTemporaryEDL(path)) - throw std::runtime_error(_("Not an EDL file to save.")); - - auto player = ui->uiView->getTimelinePlayer(); - if (!player) - return; - auto timeline = player->getTimeline(); - if (timeline->duration().value() <= 0.0) - throw std::runtime_error(_("Empty EDL file. Not saving.")); - std::string otioFile = fileName; file::Path otioPath(otioFile); if (otioPath.getExtension() != ".otio") otioFile += ".otio"; - save_timeline_to_disk(timeline, otioFile); + save_timeline_to_disk(fileName); } } // namespace playlist diff --git a/mrv2/lib/mrvUI/mrvMenus.cpp b/mrv2/lib/mrvUI/mrvMenus.cpp index be6b3f709..6f2476b72 100644 --- a/mrv2/lib/mrvUI/mrvMenus.cpp +++ b/mrv2/lib/mrvUI/mrvMenus.cpp @@ -91,7 +91,10 @@ namespace mrv (Fl_Callback*)save_movie_cb, ui, mode); menu->add( _("File/Save/Single Frame"), kSaveImage.hotkey(), - (Fl_Callback*)save_single_frame_cb, ui, mode); + (Fl_Callback*)save_single_frame_cb, ui, mode | FL_MENU_DIVIDER); + menu->add( + _("File/Save/OTIO EDL Timeline"), kSaveOTIOEDL.hotkey(), + (Fl_Callback*)save_timeline_to_disk_cb, ui, mode | FL_MENU_DIVIDER); menu->add( _("File/Save/PDF Document"), kSavePDF.hotkey(), (Fl_Callback*)save_pdf_cb, ui, FL_MENU_DIVIDER | mode); diff --git a/mrv2/po/es.po b/mrv2/po/es.po index 92165e81b..d83201ac6 100644 --- a/mrv2/po/es.po +++ b/mrv2/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mrv2 v0.7.7\n" "Report-Msgid-Bugs-To: ggarra13@gmail.com\n" -"POT-Creation-Date: 2023-10-06 22:14-0300\n" +"POT-Creation-Date: 2023-10-07 20:02-0300\n" "PO-Revision-Date: 2023-02-11 13:42-0300\n" "Last-Translator: Gonzalo Garramuño \n" "Language-Team: Spanish \n" @@ -728,7 +728,6 @@ msgstr "&Buscar/&Encontrar..." msgid "&Search/&Replace" msgstr "&Buscar/&Reemplazer" -#, fuzzy msgid "&Search/&Replace Again" msgstr "&Buscar/Reemplazar de &Nuevo" @@ -991,6 +990,9 @@ msgstr "" "Acepta los seteos pero no los graba. Serán grabados cuando se sale del " "programa." +msgid "Accept the selected OCIO file." +msgstr "Acepte el archivo OCIO seleccionado." + msgid "Acrobat PDF (*.{pdf})" msgstr "Acrobat PDF (*.{pdf})" @@ -1268,6 +1270,9 @@ msgstr "" msgid "Cancel" msgstr "Cancelar" +msgid "Cancel the OCIO selection and don't change anything." +msgstr "Cancele la selección de OCIO y no cambie nada." + msgid "Cannot append audio clip" msgstr "No puedo agragar clip de audio" @@ -2013,6 +2018,9 @@ msgstr "Archivo/Reciente/%s" msgid "File/Save/Movie or Sequence" msgstr "Archivo/Grabar/Pelídula o Secuencia" +msgid "File/Save/OTIO EDL Timeline" +msgstr "&Archivo/&Grabar/Línea de Tiempo &OTIO" + msgid "File/Save/PDF Document" msgstr "&Archivo/&Grabar/Documento &PDF" @@ -2864,9 +2872,6 @@ msgstr "Ninguno" msgid "Normal" msgstr "Normal" -msgid "Not an EDL file to save." -msgstr "No es un archivo EDL para grabar." - msgid "Not an EDL playlist to add clips to." msgstr "No es un archivo EDL para agregar clips." @@ -2894,6 +2899,9 @@ msgstr "Número de pistas de video en archivo" msgid "OCIO" msgstr "OCIO" +msgid "OCIO Browser" +msgstr "Visor de OCIO" + msgid "OCIO Config File" msgstr "Archivo Config de OCIO" @@ -3760,6 +3768,9 @@ msgstr "Grabar Imagen" msgid "Save Movie or Sequence" msgstr "Grabar Película o Secuencia" +msgid "Save OTIO Timeline" +msgstr "Grabar Línea de Tiempo OTIO" + msgid "Save OTIO timeline" msgstr "Grabar Línea de Tiempo OTIO" @@ -3873,6 +3884,9 @@ msgstr "Seleccionar una lista de reproducción con el nombre de archivo dado." msgid "Select a playlist by index." msgstr "Seleccionar una lista de reproducción con el índice dado." +msgid "Select an OCIO Transform" +msgstr "Seleccione una Transformación de OCIO" + msgid "Select default looping mode in timeline." msgstr "Selecionar modo de bucle por defecto en la línea de tiempo." @@ -5364,6 +5378,9 @@ msgstr "x9" msgid "xyY CIE xyY" msgstr "xyY CIE xyY" +#~ msgid "Not an EDL file to save." +#~ msgstr "No es un archivo EDL para grabar." + #~ msgid "Directory {0} does not exist or no directory" #~ msgstr "Carpeta {0} no existe o no es carpeta" diff --git a/mrv2/po/messages.pot b/mrv2/po/messages.pot index aa55f0526..1e762bdb6 100644 --- a/mrv2/po/messages.pot +++ b/mrv2/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mrv2 v0.7.9\n" "Report-Msgid-Bugs-To: ggarra13@gmail.com\n" -"POT-Creation-Date: 2023-10-06 22:14-0300\n" +"POT-Creation-Date: 2023-10-07 20:10-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -171,7 +171,7 @@ msgid "" "Contains all classes and enums related to media. \n" msgstr "" -#: mrvPy/Playlist.cpp:182 +#: mrvPy/Playlist.cpp:167 msgid "" "\n" "Playlist module.\n" @@ -545,7 +545,7 @@ msgid "(PAL Fields)" msgstr "" #: mrvFl/mrvCallbacks.cpp:1908 mrvGL/mrvTimelineViewport.cpp:564 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2403 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2402 msgid "(no image)" msgstr "" @@ -625,16 +625,16 @@ msgstr "" msgid "1/9" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:616 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:615 msgid "11.988" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:615 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:614 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:158 msgid "12" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:614 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:613 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:157 msgid "12.5" msgstr "" @@ -643,11 +643,11 @@ msgstr "" msgid "14.985" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:613 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:612 msgid "14.988" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:612 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:611 msgid "15" msgstr "" @@ -699,16 +699,16 @@ msgstr "" msgid "2.39 Panavision (new 2.35)" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:611 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:610 msgid "23.976" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:610 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:609 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:155 msgid "24" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:609 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:608 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:154 msgid "25" msgstr "" @@ -717,11 +717,11 @@ msgstr "" msgid "29.97" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:608 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:607 msgid "29.976" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:607 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:606 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:152 msgid "30" msgstr "" @@ -758,17 +758,17 @@ msgstr "" msgid "4.00 Polyvision" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:606 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:605 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:151 msgid "50" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:605 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:604 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:150 msgid "59.94" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:604 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:603 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:149 msgid "60" msgstr "" @@ -793,21 +793,21 @@ msgstr "" msgid "8bit" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:839 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2420 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:838 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2419 msgid "@<" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:852 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:851 msgid "@<|" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:891 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2429 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:890 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2428 msgid "@>" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:905 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:904 msgid "@>|" msgstr "" @@ -819,15 +819,15 @@ msgstr "" msgid "@B12@C7@b@.Remote\t@B12@C7@b@.Local" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:826 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:825 msgid "@|<" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:878 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:877 msgid "@|>" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:865 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:864 msgid "@||" msgstr "" @@ -835,19 +835,19 @@ msgstr "" msgid "A client connected from {0}" msgstr "" -#: mrvApp/App.cpp:265 +#: mrvApp/App.cpp:266 msgid "A/B comparison \"B\" file name." msgstr "" -#: mrvApp/App.cpp:268 +#: mrvApp/App.cpp:269 msgid "A/B comparison mode." msgstr "" -#: mrvApp/App.cpp:273 +#: mrvApp/App.cpp:274 msgid "A/B comparison wipe center." msgstr "" -#: mrvApp/App.cpp:277 +#: mrvApp/App.cpp:278 msgid "A/B comparison wipe rotation." msgstr "" @@ -862,16 +862,17 @@ msgid "AVI Movie" msgstr "" #: mrvFl/mrvCallbacks.cpp:114 mrvFl/mrvCallbacks.cpp:736 -#: mrvFl/mrvCallbacks.cpp:767 mrvUI/mrvMenus.cpp:471 +#: mrvFl/mrvCallbacks.cpp:767 mrvUI/mrvMenus.cpp:474 msgid "About" msgstr "" -#: mrvApp/App.cpp:472 mrvUI/mrvMenus.cpp:1153 +#: mrvApp/App.cpp:473 mrvUI/mrvMenus.cpp:1156 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvAboutUI.cxx:24 msgid "About mrv2" msgstr "" #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:1378 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/make_ocio_chooser.cxx:53 msgid "Accept" msgstr "" @@ -881,6 +882,10 @@ msgid "" "program." msgstr "" +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/make_ocio_chooser.cxx:54 +msgid "Accept the selected OCIO file." +msgstr "" + #: mrvFl/mrvFileRequester.cpp:531 msgid "Acrobat PDF (*.{pdf})" msgstr "" @@ -889,7 +894,7 @@ msgstr "" msgid "Active" msgstr "" -#: mrvPanels/mrvColorPanel.cpp:234 mrvCore/mrvHotkey.cpp:532 +#: mrvPanels/mrvColorPanel.cpp:234 mrvCore/mrvHotkey.cpp:534 msgid "Add" msgstr "" @@ -901,7 +906,7 @@ msgstr "" msgid "Add a :class:`mrv2.math.Vector3f` to image." msgstr "" -#: mrvPy/Playlist.cpp:207 +#: mrvPy/Playlist.cpp:192 msgid "Add a clip to currently selected Playlist EDL." msgstr "" @@ -929,7 +934,7 @@ msgstr "" msgid "Adjusts how Log Window behaves in case of error." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:879 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:878 msgid "Advance one frame." msgstr "" @@ -950,18 +955,18 @@ msgstr "" msgid "All (*.{" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:993 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:992 msgid "Allows you to adjust frame rate playback." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2500 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2510 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2499 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2509 msgid "" "Allows you to adjust gamma curve for display.\n" "Value is: pow( 2, 1/x );" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2445 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2444 msgid "Allows you to adjust the gain or exposure of the image." msgstr "" @@ -969,19 +974,19 @@ msgstr "" msgid "Allows you to select a standard cropping area around image." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2404 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2403 msgid "Allows you to select different image channels or layers." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1042 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1041 msgid "Allows you to set starting frame for timeline." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1056 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1055 msgid "Allows you to set the ending frame for timeline." msgstr "" -#: mrvCore/mrvHotkey.cpp:356 +#: mrvCore/mrvHotkey.cpp:358 msgid "Alpha Channel" msgstr "" @@ -1009,19 +1014,19 @@ msgstr "" msgid "Anaglyph" msgstr "" -#: mrvCore/mrvHotkey.cpp:361 +#: mrvCore/mrvHotkey.cpp:363 msgid "Annotation Clear All Frames" msgstr "" -#: mrvCore/mrvHotkey.cpp:360 +#: mrvCore/mrvHotkey.cpp:362 msgid "Annotation Clear Frame" msgstr "" -#: mrvCore/mrvHotkey.cpp:362 +#: mrvCore/mrvHotkey.cpp:364 msgid "Annotation Frame Step Backwards" msgstr "" -#: mrvCore/mrvHotkey.cpp:366 +#: mrvCore/mrvHotkey.cpp:368 msgid "Annotation Frame Step Forwards" msgstr "" @@ -1030,7 +1035,7 @@ msgid "Annotation already existed at this time" msgstr "" #: mrvFl/mrvCallbacks.cpp:93 mrvFl/mrvCallbacks.cpp:1578 -#: mrvFl/mrvCallbacks.cpp:1616 mrvUI/mrvMenus.cpp:400 +#: mrvFl/mrvCallbacks.cpp:1616 mrvUI/mrvMenus.cpp:403 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:1447 msgid "Annotations" msgstr "" @@ -1047,11 +1052,11 @@ msgstr "" msgid "Area" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2576 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2575 msgid "Area Select Tool" msgstr "" -#: mrvCore/mrvHotkey.cpp:438 +#: mrvCore/mrvHotkey.cpp:440 msgid "Area Selection Mode" msgstr "" @@ -1059,11 +1064,11 @@ msgstr "" msgid "Arrow" msgstr "" -#: mrvCore/mrvHotkey.cpp:441 +#: mrvCore/mrvHotkey.cpp:443 msgid "Arrow Mode" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2651 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2650 msgid "Arrow Tool" msgstr "" @@ -1117,7 +1122,7 @@ msgstr "" msgid "Audio Streams" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1020 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1019 msgid "Audio Volume" msgstr "" @@ -1129,7 +1134,7 @@ msgstr "" msgid "Audio file name" msgstr "" -#: mrvApp/App.cpp:262 +#: mrvApp/App.cpp:263 msgid "Audio file name." msgstr "" @@ -1169,7 +1174,7 @@ msgstr "" msgid "B44A" msgstr "" -#: mrvCore/mrvHotkey.cpp:484 +#: mrvCore/mrvHotkey.cpp:486 msgid "BackSpace" msgstr "" @@ -1203,7 +1208,7 @@ msgstr "" msgid "Blue" msgstr "" -#: mrvCore/mrvHotkey.cpp:355 +#: mrvCore/mrvHotkey.cpp:357 msgid "Blue Channel" msgstr "" @@ -1248,22 +1253,27 @@ msgstr "" #: mrvApp/mrvOpenSeparateAudioDialog.cpp:63 mrvWidgets/mrvPythonEditor.cpp:103 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/PathMappingUI.cxx:43 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/keyboard_ui.cxx:99 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/make_ocio_chooser.cxx:57 msgid "Cancel" msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1683 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/make_ocio_chooser.cxx:58 +msgid "Cancel the OCIO selection and don't change anything." +msgstr "" + +#: mrvEdit/mrvEditCallbacks.cpp:1694 msgid "Cannot append audio clip" msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1695 +#: mrvEdit/mrvEditCallbacks.cpp:1706 msgid "Cannot append audio gap" msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1656 +#: mrvEdit/mrvEditCallbacks.cpp:1667 msgid "Cannot append audio track." msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1581 +#: mrvEdit/mrvEditCallbacks.cpp:1592 msgid "Cannot append video gap" msgstr "" @@ -1279,7 +1289,7 @@ msgid "" "annotation already exists." msgstr "" -#: mrvApp/App.cpp:457 +#: mrvApp/App.cpp:458 msgid "Cannot create window" msgstr "" @@ -1287,11 +1297,11 @@ msgstr "" msgid "Canon Raw Picture" msgstr "" -#: mrvCore/mrvHotkey.cpp:508 +#: mrvCore/mrvHotkey.cpp:510 msgid "CapsLock" msgstr "" -#: mrvCore/mrvHotkey.cpp:335 +#: mrvCore/mrvHotkey.cpp:337 msgid "Center Image" msgstr "" @@ -1339,11 +1349,11 @@ msgstr "" msgid "Circle" msgstr "" -#: mrvCore/mrvHotkey.cpp:443 +#: mrvCore/mrvHotkey.cpp:445 msgid "Circle Mode" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2621 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2620 msgid "Circle Tool" msgstr "" @@ -1379,11 +1389,11 @@ msgstr "" msgid "Clip Compression" msgstr "" -#: mrvCore/mrvHotkey.cpp:331 +#: mrvCore/mrvHotkey.cpp:333 msgid "Close All" msgstr "" -#: mrvCore/mrvHotkey.cpp:330 +#: mrvCore/mrvHotkey.cpp:332 msgid "Close Current" msgstr "" @@ -1435,15 +1445,15 @@ msgstr "" #: mrvFl/mrvCallbacks.cpp:88 mrvFl/mrvCallbacks.cpp:1570 #: mrvFl/mrvCallbacks.cpp:1608 mrvGL/mrvTimelineViewport.cpp:1679 #: mrvGL/mrvTimelineViewport.cpp:1681 mrvGL/mrvTimelineViewport.cpp:1683 -#: mrvUI/mrvMenus.cpp:351 +#: mrvUI/mrvMenus.cpp:354 msgid "Color" msgstr "" -#: mrvFl/mrvCallbacks.cpp:89 mrvUI/mrvMenus.cpp:358 +#: mrvFl/mrvCallbacks.cpp:89 mrvUI/mrvMenus.cpp:361 msgid "Color Area" msgstr "" -#: mrvCore/mrvHotkey.cpp:352 +#: mrvCore/mrvHotkey.cpp:354 msgid "Color Channel" msgstr "" @@ -1463,7 +1473,7 @@ msgstr "" msgid "Color channels :class:`mrv2.image.Channels`." msgstr "" -#: mrvApp/App.cpp:302 +#: mrvApp/App.cpp:303 msgid "Color configuration file name (config.ocio)." msgstr "" @@ -1487,7 +1497,7 @@ msgstr "" msgid "Common Settings" msgstr "" -#: mrvPanels/mrvPanelsAux.h:17 mrvFl/mrvCallbacks.cpp:90 mrvUI/mrvMenus.cpp:379 +#: mrvPanels/mrvPanelsAux.h:17 mrvFl/mrvCallbacks.cpp:90 mrvUI/mrvMenus.cpp:382 msgid "Compare" msgstr "" @@ -1499,27 +1509,27 @@ msgstr "" msgid "Compare B" msgstr "" -#: mrvCore/mrvHotkey.cpp:348 +#: mrvCore/mrvHotkey.cpp:350 msgid "Compare Difference" msgstr "" -#: mrvCore/mrvHotkey.cpp:349 +#: mrvCore/mrvHotkey.cpp:351 msgid "Compare Horizontal" msgstr "" -#: mrvCore/mrvHotkey.cpp:347 +#: mrvCore/mrvHotkey.cpp:349 msgid "Compare Overlay" msgstr "" -#: mrvCore/mrvHotkey.cpp:351 +#: mrvCore/mrvHotkey.cpp:353 msgid "Compare Tile" msgstr "" -#: mrvCore/mrvHotkey.cpp:350 +#: mrvCore/mrvHotkey.cpp:352 msgid "Compare Vertical" msgstr "" -#: mrvCore/mrvHotkey.cpp:346 +#: mrvCore/mrvHotkey.cpp:348 msgid "Compare Wipe" msgstr "" @@ -1560,7 +1570,7 @@ msgstr "" msgid "Connect" msgstr "" -#: mrvApp/App.cpp:367 +#: mrvApp/App.cpp:368 msgid "Connect to a server at . Use -port to specify a port number." msgstr "" @@ -1591,7 +1601,7 @@ msgstr "" msgid "Convert to timecode (``HH:MM:SS;FRAME``)" msgstr "" -#: mrvCore/mrvHotkey.cpp:397 +#: mrvCore/mrvHotkey.cpp:399 msgid "Copy Frame" msgstr "" @@ -1613,11 +1623,11 @@ msgstr "" msgid "Could not find clip in loaded clips." msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1627 +#: mrvEdit/mrvEditCallbacks.cpp:1638 msgid "Could not find video clip." msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:302 mrvEdit/mrvEditCallbacks.cpp:1471 +#: mrvEdit/mrvEditCallbacks.cpp:302 mrvEdit/mrvEditCallbacks.cpp:1482 msgid "Could not get current path." msgstr "" @@ -1633,7 +1643,7 @@ msgstr "" msgid "Could not paste {0}. Error {1}." msgstr "" -#: mrvApp/App.cpp:419 +#: mrvApp/App.cpp:420 msgid "Could not read python script '{0}'" msgstr "" @@ -1685,7 +1695,7 @@ msgstr "" msgid "Current frame in timeline." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:809 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:808 msgid "Current frame." msgstr "" @@ -1701,7 +1711,7 @@ msgstr "" msgid "Current time in timeline." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2887 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2886 msgid "Current tool being used." msgstr "" @@ -1709,7 +1719,7 @@ msgstr "" msgid "Currently, you cannot add an .otio file to an EDL playlist." msgstr "" -#: mrvCore/mrvHotkey.cpp:396 +#: mrvCore/mrvHotkey.cpp:398 msgid "Cut Frame" msgstr "" @@ -1733,20 +1743,20 @@ msgstr "" msgid "DWAB" msgstr "" -#: mrvCore/mrvHotkey.cpp:345 +#: mrvCore/mrvHotkey.cpp:347 msgid "Data Window" msgstr "" -#: mrvApp/App.cpp:259 +#: mrvApp/App.cpp:260 msgid "Debug verbosity." msgstr "" -#: mrvCore/mrvHotkey.cpp:534 +#: mrvCore/mrvHotkey.cpp:536 msgid "Decimal" msgstr "" #: mrvFl/mrvColorSchemes.cpp:111 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:603 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:602 msgid "Default" msgstr "" @@ -1771,7 +1781,7 @@ msgstr "" msgid "Defaults" msgstr "" -#: mrvCore/mrvHotkey.cpp:495 +#: mrvCore/mrvHotkey.cpp:497 msgid "Delete" msgstr "" @@ -1779,7 +1789,7 @@ msgstr "" msgid "Depth" msgstr "" -#: mrvFl/mrvCallbacks.cpp:95 mrvUI/mrvMenus.cpp:393 +#: mrvFl/mrvCallbacks.cpp:95 mrvUI/mrvMenus.cpp:396 msgid "Devices" msgstr "" @@ -1825,11 +1835,11 @@ msgstr "" msgid "Display" msgstr "" -#: mrvCore/mrvHotkey.cpp:344 +#: mrvCore/mrvHotkey.cpp:346 msgid "Display Window" msgstr "" -#: mrvApp/App.cpp:308 +#: mrvApp/App.cpp:309 msgid "Display color space." msgstr "" @@ -1852,7 +1862,7 @@ msgstr "" msgid "Disposition of Track" msgstr "" -#: mrvCore/mrvHotkey.cpp:535 +#: mrvCore/mrvHotkey.cpp:537 msgid "Divide" msgstr "" @@ -1864,7 +1874,7 @@ msgstr "" msgid "Dock" msgstr "" -#: mrvCore/mrvHotkey.cpp:502 +#: mrvCore/mrvHotkey.cpp:504 msgid "Down" msgstr "" @@ -1872,7 +1882,7 @@ msgstr "" msgid "Draw" msgstr "" -#: mrvPanels/mrvUSDPanel.cpp:149 mrvCore/mrvHotkey.cpp:439 +#: mrvPanels/mrvUSDPanel.cpp:149 mrvCore/mrvHotkey.cpp:441 msgid "Draw Mode" msgstr "" @@ -1900,7 +1910,7 @@ msgstr "" msgid "Duration of Subtitle" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1075 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1074 msgid "E" msgstr "" @@ -1920,7 +1930,7 @@ msgstr "" msgid "Early 35mm" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2374 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2373 msgid "Edit" msgstr "" @@ -1932,7 +1942,7 @@ msgstr "" msgid "Edit Associated Clips." msgstr "" -#: mrvCore/mrvHotkey.cpp:405 +#: mrvCore/mrvHotkey.cpp:407 msgid "Edit Redo" msgstr "" @@ -1944,7 +1954,7 @@ msgstr "" msgid "Edit Text Annotation" msgstr "" -#: mrvCore/mrvHotkey.cpp:404 +#: mrvCore/mrvHotkey.cpp:406 msgid "Edit Undo" msgstr "" @@ -1956,43 +1966,43 @@ msgstr "" msgid "Edit/&Copy" msgstr "" -#: mrvUI/mrvMenus.cpp:935 +#: mrvUI/mrvMenus.cpp:938 msgid "Edit/Frame/Copy" msgstr "" -#: mrvUI/mrvMenus.cpp:932 +#: mrvUI/mrvMenus.cpp:935 msgid "Edit/Frame/Cut" msgstr "" -#: mrvUI/mrvMenus.cpp:941 +#: mrvUI/mrvMenus.cpp:944 msgid "Edit/Frame/Insert" msgstr "" -#: mrvUI/mrvMenus.cpp:938 +#: mrvUI/mrvMenus.cpp:941 msgid "Edit/Frame/Paste" msgstr "" -#: mrvUI/mrvMenus.cpp:969 +#: mrvUI/mrvMenus.cpp:972 msgid "Edit/Redo" msgstr "" -#: mrvUI/mrvMenus.cpp:948 +#: mrvUI/mrvMenus.cpp:951 msgid "Edit/Remove" msgstr "" -#: mrvUI/mrvMenus.cpp:957 +#: mrvUI/mrvMenus.cpp:960 msgid "Edit/Remove With Gap" msgstr "" -#: mrvUI/mrvMenus.cpp:961 +#: mrvUI/mrvMenus.cpp:964 msgid "Edit/Roll" msgstr "" -#: mrvUI/mrvMenus.cpp:945 +#: mrvUI/mrvMenus.cpp:948 msgid "Edit/Slice" msgstr "" -#: mrvUI/mrvMenus.cpp:966 +#: mrvUI/mrvMenus.cpp:969 msgid "Edit/Undo" msgstr "" @@ -2020,7 +2030,7 @@ msgstr "" msgid "Elapsed" msgstr "" -#: mrvPy/Playlist.cpp:164 mrvEdit/mrvEditCallbacks.cpp:1426 +#: mrvEdit/mrvEditCallbacks.cpp:1431 msgid "Empty EDL file. Not saving." msgstr "" @@ -2041,7 +2051,7 @@ msgstr "" msgid "Enabled Soft Clip." msgstr "" -#: mrvCore/mrvHotkey.cpp:496 +#: mrvCore/mrvHotkey.cpp:498 msgid "End" msgstr "" @@ -2058,7 +2068,7 @@ msgstr "" msgid "English" msgstr "" -#: mrvFl/mrvCallbacks.cpp:97 mrvUI/mrvMenus.cpp:462 +#: mrvFl/mrvCallbacks.cpp:97 mrvUI/mrvMenus.cpp:465 msgid "Environment Map" msgstr "" @@ -2074,15 +2084,15 @@ msgstr "" msgid "Erase" msgstr "" -#: mrvCore/mrvHotkey.cpp:440 +#: mrvCore/mrvHotkey.cpp:442 msgid "Erase Mode" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2606 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2605 msgid "Eraser Tool" msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1401 +#: mrvEdit/mrvEditCallbacks.cpp:1404 msgid "Error saving {0}. {1}" msgstr "" @@ -2091,11 +2101,11 @@ msgstr "" msgid "Errors" msgstr "" -#: mrvCore/mrvHotkey.cpp:483 +#: mrvCore/mrvHotkey.cpp:485 msgid "Escape" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2876 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2875 msgid "Everything OK. " msgstr "" @@ -2111,11 +2121,11 @@ msgstr "" msgid "Expanded OCIO config to:" msgstr "" -#: mrvCore/mrvHotkey.cpp:430 +#: mrvCore/mrvHotkey.cpp:432 msgid "Exposure Less" msgstr "" -#: mrvCore/mrvHotkey.cpp:429 +#: mrvCore/mrvHotkey.cpp:431 msgid "Exposure More" msgstr "" @@ -2127,7 +2137,7 @@ msgstr "" msgid "F" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:784 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:783 msgid "F:" msgstr "" @@ -2158,7 +2168,7 @@ msgid "FIT" msgstr "" #: mrvWidgets/mrvProgressReport.cpp:64 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:935 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:934 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:671 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:898 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvHUDUI.cxx:172 @@ -2203,11 +2213,11 @@ msgstr "" msgid "File extension cannot be empty." msgstr "" -#: mrvUI/mrvMenus.cpp:110 +#: mrvUI/mrvMenus.cpp:113 msgid "File/Close All" msgstr "" -#: mrvUI/mrvMenus.cpp:106 +#: mrvUI/mrvMenus.cpp:109 msgid "File/Close Current" msgstr "" @@ -2227,11 +2237,11 @@ msgstr "" msgid "File/Open/With Separate Audio" msgstr "" -#: mrvUI/mrvMenus.cpp:127 +#: mrvUI/mrvMenus.cpp:130 msgid "File/Quit" msgstr "" -#: mrvUI/mrvMenus.cpp:122 +#: mrvUI/mrvMenus.cpp:125 #, c-format msgid "File/Recent/%s" msgstr "" @@ -2241,14 +2251,18 @@ msgid "File/Save/Movie or Sequence" msgstr "" #: mrvUI/mrvMenus.cpp:96 -msgid "File/Save/PDF Document" +msgid "File/Save/OTIO EDL Timeline" msgstr "" #: mrvUI/mrvMenus.cpp:99 -msgid "File/Save/Session" +msgid "File/Save/PDF Document" msgstr "" #: mrvUI/mrvMenus.cpp:102 +msgid "File/Save/Session" +msgstr "" + +#: mrvUI/mrvMenus.cpp:105 msgid "File/Save/Session As" msgstr "" @@ -2270,7 +2284,7 @@ msgstr "" msgid "Filename of the clip" msgstr "" -#: mrvPanels/mrvPanelsAux.h:17 mrvFl/mrvCallbacks.cpp:87 mrvUI/mrvMenus.cpp:344 +#: mrvPanels/mrvPanelsAux.h:17 mrvFl/mrvCallbacks.cpp:87 mrvUI/mrvMenus.cpp:347 msgid "Files" msgstr "" @@ -2282,11 +2296,11 @@ msgstr "" msgid "Find:" msgstr "" -#: mrvPanels/mrvImageInfoPanel.cpp:1773 mrvCore/mrvHotkey.cpp:375 +#: mrvPanels/mrvImageInfoPanel.cpp:1773 mrvCore/mrvHotkey.cpp:377 msgid "First Frame" msgstr "" -#: mrvCore/mrvHotkey.cpp:382 +#: mrvCore/mrvHotkey.cpp:384 msgid "First Image Version" msgstr "" @@ -2294,15 +2308,15 @@ msgstr "" msgid "First frame of clip - User selected" msgstr "" -#: mrvCore/mrvHotkey.cpp:338 +#: mrvCore/mrvHotkey.cpp:340 msgid "Fit All" msgstr "" -#: mrvCore/mrvHotkey.cpp:336 +#: mrvCore/mrvHotkey.cpp:338 msgid "Fit Screen" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2384 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2383 msgid "Fit Window to Image" msgstr "" @@ -2318,11 +2332,11 @@ msgstr "" msgid "Flash Movie" msgstr "" -#: mrvCore/mrvHotkey.cpp:357 +#: mrvCore/mrvHotkey.cpp:359 msgid "Flip X" msgstr "" -#: mrvCore/mrvHotkey.cpp:358 +#: mrvCore/mrvHotkey.cpp:360 msgid "Flip Y" msgstr "" @@ -2400,19 +2414,19 @@ msgstr "" msgid "Frame Range" msgstr "" -#: mrvCore/mrvHotkey.cpp:364 +#: mrvCore/mrvHotkey.cpp:366 msgid "Frame Step Backwards" msgstr "" -#: mrvCore/mrvHotkey.cpp:365 +#: mrvCore/mrvHotkey.cpp:367 msgid "Frame Step FPS Backwards" msgstr "" -#: mrvCore/mrvHotkey.cpp:368 +#: mrvCore/mrvHotkey.cpp:370 msgid "Frame Step FPS Forwards" msgstr "" -#: mrvCore/mrvHotkey.cpp:367 +#: mrvCore/mrvHotkey.cpp:369 msgid "Frame Step Forwards" msgstr "" @@ -2421,7 +2435,7 @@ msgid "Frame {0} - Timecode: {1} - {2} Secs." msgstr "" #: mrvPanels/mrvAnnotationsPanel.cpp:395 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:482 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:481 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:170 msgid "Frames" msgstr "" @@ -2430,7 +2444,7 @@ msgstr "" msgid "Frames Per Second value for sequences that don't have embedded speed." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2591 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2590 msgid "Freehand Drawing Tool" msgstr "" @@ -2471,7 +2485,7 @@ msgstr "" msgid "Gain" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2435 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2434 msgid "Gain image value. A simple multiplier of the image pixel values." msgstr "" @@ -2480,7 +2494,7 @@ msgstr "" msgid "Gamma" msgstr "" -#: mrvCore/mrvHotkey.cpp:432 +#: mrvCore/mrvHotkey.cpp:434 msgid "Gamma Less" msgstr "" @@ -2488,7 +2502,7 @@ msgstr "" msgid "Gamma Level value." msgstr "" -#: mrvCore/mrvHotkey.cpp:431 +#: mrvCore/mrvHotkey.cpp:433 msgid "Gamma More" msgstr "" @@ -2552,15 +2566,15 @@ msgstr "" msgid "Ghosting" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:853 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:852 msgid "Go back one frame." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:827 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:826 msgid "Go to the beginning of the sequence." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:906 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:905 msgid "Go to the end of the sequence." msgstr "" @@ -2568,7 +2582,7 @@ msgstr "" msgid "Green" msgstr "" -#: mrvCore/mrvHotkey.cpp:354 +#: mrvCore/mrvHotkey.cpp:356 msgid "Green Channel" msgstr "" @@ -2625,11 +2639,11 @@ msgstr "" msgid "Height of clip" msgstr "" -#: mrvUI/mrvMenus.cpp:1144 +#: mrvUI/mrvMenus.cpp:1147 msgid "Help/About" msgstr "" -#: mrvUI/mrvMenus.cpp:1141 +#: mrvUI/mrvMenus.cpp:1144 msgid "Help/Documentation" msgstr "" @@ -2641,19 +2655,19 @@ msgstr "" msgid "Hex Values" msgstr "" -#: mrvApp/App.cpp:475 mrvUI/mrvMenus.cpp:1156 +#: mrvApp/App.cpp:476 mrvUI/mrvMenus.cpp:1159 msgid "Hide Others" msgstr "" -#: mrvApp/App.cpp:474 mrvUI/mrvMenus.cpp:1155 +#: mrvApp/App.cpp:475 mrvUI/mrvMenus.cpp:1158 msgid "Hide mrv2" msgstr "" -#: mrvFl/mrvCallbacks.cpp:108 mrvUI/mrvMenus.cpp:365 +#: mrvFl/mrvCallbacks.cpp:108 mrvUI/mrvMenus.cpp:368 msgid "Histogram" msgstr "" -#: mrvCore/mrvHotkey.cpp:492 +#: mrvCore/mrvHotkey.cpp:494 msgid "Home" msgstr "" @@ -2684,7 +2698,7 @@ msgstr "" msgid "Hotkey for..." msgstr "" -#: mrvFl/mrvCallbacks.cpp:111 mrvFl/mrvCallbacks.cpp:734 mrvUI/mrvMenus.cpp:470 +#: mrvFl/mrvCallbacks.cpp:111 mrvFl/mrvCallbacks.cpp:734 mrvUI/mrvMenus.cpp:473 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvHotkeyUI.cxx:59 msgid "Hotkeys" msgstr "" @@ -2698,7 +2712,7 @@ msgstr "" msgid "How to display timeline by default." msgstr "" -#: mrvCore/mrvHotkey.cpp:455 +#: mrvCore/mrvHotkey.cpp:457 msgid "Hud Window" msgstr "" @@ -2766,19 +2780,19 @@ msgstr "" msgid "Image zoom setting." msgstr "" -#: mrvUI/mrvMenus.cpp:918 +#: mrvUI/mrvMenus.cpp:921 msgid "Image/Version/First" msgstr "" -#: mrvUI/mrvMenus.cpp:921 +#: mrvUI/mrvMenus.cpp:924 msgid "Image/Version/Last" msgstr "" -#: mrvUI/mrvMenus.cpp:927 +#: mrvUI/mrvMenus.cpp:930 msgid "Image/Version/Next" msgstr "" -#: mrvUI/mrvMenus.cpp:924 +#: mrvUI/mrvMenus.cpp:927 msgid "Image/Version/Previous" msgstr "" @@ -2807,7 +2821,7 @@ msgstr "" msgid "In/Out range :class:`mrv2.TimeRange` of the File Media." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2430 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2429 msgid "Increase gain 1/2 stop (multiply by sqrt(2))." msgstr "" @@ -2816,20 +2830,20 @@ msgid "Input" msgstr "" #: mrvPanels/mrvImageInfoPanel.cpp:1946 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2464 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2463 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:1203 msgid "Input Color Space" msgstr "" -#: mrvApp/App.cpp:305 +#: mrvApp/App.cpp:306 msgid "Input color space." msgstr "" -#: mrvCore/mrvHotkey.cpp:491 +#: mrvCore/mrvHotkey.cpp:493 msgid "Insert" msgstr "" -#: mrvCore/mrvHotkey.cpp:399 +#: mrvCore/mrvHotkey.cpp:401 msgid "Insert Frame" msgstr "" @@ -2899,7 +2913,7 @@ msgstr "" msgid "LUT" msgstr "" -#: mrvApp/App.cpp:314 +#: mrvApp/App.cpp:315 msgid "LUT file name." msgstr "" @@ -2907,7 +2921,7 @@ msgstr "" msgid "LUT filename." msgstr "" -#: mrvApp/App.cpp:317 +#: mrvApp/App.cpp:318 msgid "LUT operation order." msgstr "" @@ -2949,11 +2963,11 @@ msgstr "" msgid "Laser" msgstr "" -#: mrvPanels/mrvImageInfoPanel.cpp:1777 mrvCore/mrvHotkey.cpp:376 +#: mrvPanels/mrvImageInfoPanel.cpp:1777 mrvCore/mrvHotkey.cpp:378 msgid "Last Frame" msgstr "" -#: mrvCore/mrvHotkey.cpp:385 +#: mrvCore/mrvHotkey.cpp:387 msgid "Last Image Version" msgstr "" @@ -2961,23 +2975,23 @@ msgstr "" msgid "Last frame of clip - User selected" msgstr "" -#: mrvCore/mrvHotkey.cpp:498 +#: mrvCore/mrvHotkey.cpp:500 msgid "Left" msgstr "" -#: mrvCore/mrvHotkey.cpp:509 +#: mrvCore/mrvHotkey.cpp:511 msgid "LeftAlt" msgstr "" -#: mrvCore/mrvHotkey.cpp:505 +#: mrvCore/mrvHotkey.cpp:507 msgid "LeftCtrl" msgstr "" -#: mrvCore/mrvHotkey.cpp:511 +#: mrvCore/mrvHotkey.cpp:513 msgid "LeftMeta" msgstr "" -#: mrvCore/mrvHotkey.cpp:503 +#: mrvCore/mrvHotkey.cpp:505 msgid "LeftShift" msgstr "" @@ -3005,7 +3019,7 @@ msgstr "" msgid "Linear" msgstr "" -#: mrvPy/Playlist.cpp:188 +#: mrvPy/Playlist.cpp:173 msgid "List playlist items." msgstr "" @@ -3070,7 +3084,7 @@ msgstr "" msgid "Logarithmic" msgstr "" -#: mrvFl/mrvCallbacks.cpp:113 mrvUI/mrvMenus.cpp:414 +#: mrvFl/mrvCallbacks.cpp:113 mrvUI/mrvMenus.cpp:417 msgid "Logs" msgstr "" @@ -3078,7 +3092,7 @@ msgstr "" msgid "Loop" msgstr "" -#: mrvCore/mrvHotkey.cpp:378 +#: mrvCore/mrvHotkey.cpp:380 msgid "Loop Playback" msgstr "" @@ -3094,7 +3108,7 @@ msgstr "" msgid "Luminance" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:447 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:446 msgid "Luminance of image pixel under mouse." msgstr "" @@ -3168,7 +3182,7 @@ msgstr "" msgid "Max. Bitrate" msgstr "" -#: mrvWidgets/mrvVersion.cpp:880 +#: mrvWidgets/mrvVersion.cpp:888 msgid "Max. Texture Size:\t" msgstr "" @@ -3201,7 +3215,7 @@ msgstr "" msgid "Media" msgstr "" -#: mrvFl/mrvCallbacks.cpp:92 mrvUI/mrvMenus.cpp:455 +#: mrvFl/mrvCallbacks.cpp:92 mrvUI/mrvMenus.cpp:458 msgid "Media Information" msgstr "" @@ -3220,7 +3234,7 @@ msgstr "" msgid "Memory without Compression" msgstr "" -#: mrvCore/mrvHotkey.cpp:514 +#: mrvCore/mrvHotkey.cpp:516 msgid "Menu" msgstr "" @@ -3268,7 +3282,7 @@ msgstr "" msgid "Movies (*.{" msgstr "" -#: mrvCore/mrvHotkey.cpp:531 +#: mrvCore/mrvHotkey.cpp:533 msgid "Multiply" msgstr "" @@ -3276,7 +3290,7 @@ msgstr "" msgid "Mute" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1012 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1011 msgid "Mute audio." msgstr "" @@ -3298,30 +3312,30 @@ msgid "" "Need to reboot mrv2 to change language. Are you sure you want to continue?" msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1520 +#: mrvEdit/mrvEditCallbacks.cpp:1531 msgid "Neither video nor audio tracks found." msgstr "" #: mrvPanels/mrvPanelsAux.h:18 mrvFl/mrvCallbacks.cpp:103 -#: mrvUI/mrvMenus.cpp:430 +#: mrvUI/mrvMenus.cpp:433 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:1372 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:1575 msgid "Network" msgstr "" -#: mrvCore/mrvHotkey.cpp:394 +#: mrvCore/mrvHotkey.cpp:396 msgid "Next Channel" msgstr "" -#: mrvCore/mrvHotkey.cpp:388 +#: mrvCore/mrvHotkey.cpp:390 msgid "Next Image" msgstr "" -#: mrvCore/mrvHotkey.cpp:391 +#: mrvCore/mrvHotkey.cpp:393 msgid "Next Image Limited" msgstr "" -#: mrvCore/mrvHotkey.cpp:384 +#: mrvCore/mrvHotkey.cpp:386 msgid "Next Image Version" msgstr "" @@ -3373,11 +3387,11 @@ msgid "" "a versioning string." msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1618 +#: mrvEdit/mrvEditCallbacks.cpp:1629 msgid "No video children found." msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1612 +#: mrvEdit/mrvEditCallbacks.cpp:1623 msgid "No video track found." msgstr "" @@ -3393,10 +3407,6 @@ msgstr "" msgid "Normal" msgstr "" -#: mrvPy/Playlist.cpp:157 mrvEdit/mrvEditCallbacks.cpp:1419 -msgid "Not an EDL file to save." -msgstr "" - #: mrvPy/Playlist.cpp:126 msgid "Not an EDL playlist to add clips to." msgstr "" @@ -3409,7 +3419,7 @@ msgstr "" msgid "Nov" msgstr "" -#: mrvCore/mrvHotkey.cpp:515 +#: mrvCore/mrvHotkey.cpp:517 msgid "NumLock" msgstr "" @@ -3429,12 +3439,16 @@ msgstr "" msgid "Number of video streams in file" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2481 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2480 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:1175 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:1571 msgid "OCIO" msgstr "" +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/make_ocio_chooser.cxx:34 +msgid "OCIO Browser" +msgstr "" + #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:1179 msgid "OCIO Config File" msgstr "" @@ -3444,19 +3458,19 @@ msgstr "" msgid "OCIO Defaults" msgstr "" -#: mrvCore/mrvHotkey.cpp:434 +#: mrvCore/mrvHotkey.cpp:436 msgid "OCIO Display" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2482 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2481 msgid "OCIO Display/View" msgstr "" -#: mrvPanels/mrvImageInfoPanel.cpp:1947 mrvCore/mrvHotkey.cpp:433 +#: mrvPanels/mrvImageInfoPanel.cpp:1947 mrvCore/mrvHotkey.cpp:435 msgid "OCIO Input Color Space" msgstr "" -#: mrvCore/mrvHotkey.cpp:435 +#: mrvCore/mrvHotkey.cpp:437 msgid "OCIO View" msgstr "" @@ -3468,7 +3482,7 @@ msgstr "" msgid "OCIO config is now:" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2465 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2464 msgid "OCIO input color space for the image" msgstr "" @@ -3502,7 +3516,7 @@ msgstr "" msgid "Okay" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2692 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2691 msgid "Old Color Used. Click on the Arrow to alternate." msgstr "" @@ -3514,11 +3528,11 @@ msgstr "" msgid "Only One Panel" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2717 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2716 msgid "Opacity of pen stroke" msgstr "" -#: mrvCore/mrvHotkey.cpp:320 +#: mrvCore/mrvHotkey.cpp:321 msgid "Open Directory" msgstr "" @@ -3530,11 +3544,11 @@ msgstr "" msgid "Open Logs on Window" msgstr "" -#: mrvCore/mrvHotkey.cpp:321 +#: mrvCore/mrvHotkey.cpp:322 msgid "Open Movie or Sequence" msgstr "" -#: mrvFl/mrvFileRequester.cpp:559 mrvCore/mrvHotkey.cpp:322 +#: mrvFl/mrvFileRequester.cpp:559 mrvCore/mrvHotkey.cpp:323 msgid "Open Session" msgstr "" @@ -3582,7 +3596,7 @@ msgstr "" msgid "OpenGL" msgstr "" -#: mrvApp/App.cpp:281 +#: mrvApp/App.cpp:282 msgid "OpenTimelineIO Edit mode." msgstr "" @@ -3656,11 +3670,11 @@ msgstr "" msgid "PXR24" msgstr "" -#: mrvCore/mrvHotkey.cpp:497 +#: mrvCore/mrvHotkey.cpp:499 msgid "PageDown" msgstr "" -#: mrvCore/mrvHotkey.cpp:493 +#: mrvCore/mrvHotkey.cpp:495 msgid "PageUp" msgstr "" @@ -3672,15 +3686,15 @@ msgstr "" msgid "Pan and Zoom" msgstr "" -#: mrvUI/mrvMenus.cpp:269 +#: mrvUI/mrvMenus.cpp:272 msgid "Panel/" msgstr "" -#: mrvUI/mrvMenus.cpp:260 +#: mrvUI/mrvMenus.cpp:263 msgid "Panel/One Panel Only" msgstr "" -#: mrvCore/mrvHotkey.cpp:398 +#: mrvCore/mrvHotkey.cpp:400 msgid "Paste Frame" msgstr "" @@ -3701,7 +3715,7 @@ msgstr "" msgid "Path mappings have been saved to \"{0}mrv2.paths.prefs\"." msgstr "" -#: mrvCore/mrvHotkey.cpp:490 +#: mrvCore/mrvHotkey.cpp:492 msgid "Pause" msgstr "" @@ -3709,11 +3723,11 @@ msgstr "" msgid "Pen" msgstr "" -#: mrvCore/mrvHotkey.cpp:446 +#: mrvCore/mrvHotkey.cpp:448 msgid "Pen Size Less" msgstr "" -#: mrvCore/mrvHotkey.cpp:445 +#: mrvCore/mrvHotkey.cpp:447 msgid "Pen Size More" msgstr "" @@ -3736,7 +3750,7 @@ msgid "Pick" msgstr "" #: mrvFl/mrvCallbacks.cpp:1422 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2681 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2680 msgid "Pick Draw Color and Alpha" msgstr "" @@ -3774,19 +3788,19 @@ msgstr "" msgid "Play" msgstr "" -#: mrvCore/mrvHotkey.cpp:369 +#: mrvCore/mrvHotkey.cpp:371 msgid "Play Backwards" msgstr "" -#: mrvCore/mrvHotkey.cpp:370 +#: mrvCore/mrvHotkey.cpp:372 msgid "Play Backwards / Change Speed" msgstr "" -#: mrvCore/mrvHotkey.cpp:372 +#: mrvCore/mrvHotkey.cpp:374 msgid "Play Forwards" msgstr "" -#: mrvCore/mrvHotkey.cpp:373 +#: mrvCore/mrvHotkey.cpp:375 msgid "Play Forwards / Change Speed" msgstr "" @@ -3798,19 +3812,19 @@ msgstr "" msgid "Play forwards." msgstr "" -#: mrvCore/mrvHotkey.cpp:371 +#: mrvCore/mrvHotkey.cpp:373 msgid "Play in Current Direction" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:840 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:839 msgid "Play sequence backwards." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:892 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:891 msgid "Play sequence forward." msgstr "" -#: mrvApp/App.cpp:251 +#: mrvApp/App.cpp:252 msgid "Play timelines, movies, and image sequences." msgstr "" @@ -3819,23 +3833,23 @@ msgstr "" msgid "Playback" msgstr "" -#: mrvCore/mrvHotkey.cpp:379 +#: mrvCore/mrvHotkey.cpp:381 msgid "Playback Once" msgstr "" -#: mrvCore/mrvHotkey.cpp:380 +#: mrvCore/mrvHotkey.cpp:382 msgid "Playback Ping Pong" msgstr "" -#: mrvApp/App.cpp:290 +#: mrvApp/App.cpp:291 msgid "Playback loop mode." msgstr "" -#: mrvApp/App.cpp:286 +#: mrvApp/App.cpp:287 msgid "Playback mode." msgstr "" -#: mrvApp/App.cpp:283 +#: mrvApp/App.cpp:284 msgid "Playback speed." msgstr "" @@ -3843,75 +3857,75 @@ msgstr "" msgid "Playback state :class:`mrv2.timeline.Playbacks` of the File Media." msgstr "" -#: mrvUI/mrvMenus.cpp:788 +#: mrvUI/mrvMenus.cpp:791 msgid "Playback/Annotation/Clear" msgstr "" -#: mrvUI/mrvMenus.cpp:791 +#: mrvUI/mrvMenus.cpp:794 msgid "Playback/Annotation/Clear All" msgstr "" -#: mrvUI/mrvMenus.cpp:687 +#: mrvUI/mrvMenus.cpp:690 msgid "Playback/Backwards" msgstr "" -#: mrvUI/mrvMenus.cpp:680 +#: mrvUI/mrvMenus.cpp:683 msgid "Playback/Forwards" msgstr "" -#: mrvUI/mrvMenus.cpp:758 +#: mrvUI/mrvMenus.cpp:761 msgid "Playback/Go to/End" msgstr "" -#: mrvUI/mrvMenus.cpp:782 +#: mrvUI/mrvMenus.cpp:785 msgid "Playback/Go to/Next Annotation" msgstr "" -#: mrvUI/mrvMenus.cpp:765 +#: mrvUI/mrvMenus.cpp:768 msgid "Playback/Go to/Next Frame" msgstr "" -#: mrvUI/mrvMenus.cpp:778 +#: mrvUI/mrvMenus.cpp:781 msgid "Playback/Go to/Previous Annotation" msgstr "" -#: mrvUI/mrvMenus.cpp:762 +#: mrvUI/mrvMenus.cpp:765 msgid "Playback/Go to/Previous Frame" msgstr "" -#: mrvUI/mrvMenus.cpp:755 +#: mrvUI/mrvMenus.cpp:758 msgid "Playback/Go to/Start" msgstr "" -#: mrvUI/mrvMenus.cpp:732 +#: mrvUI/mrvMenus.cpp:735 msgid "Playback/Loop Playback" msgstr "" -#: mrvUI/mrvMenus.cpp:738 +#: mrvUI/mrvMenus.cpp:741 msgid "Playback/Playback Once" msgstr "" -#: mrvUI/mrvMenus.cpp:744 +#: mrvUI/mrvMenus.cpp:747 msgid "Playback/Playback Ping Pong" msgstr "" -#: mrvUI/mrvMenus.cpp:673 +#: mrvUI/mrvMenus.cpp:676 msgid "Playback/Stop" msgstr "" -#: mrvUI/mrvMenus.cpp:708 +#: mrvUI/mrvMenus.cpp:711 msgid "Playback/Toggle In Point" msgstr "" -#: mrvUI/mrvMenus.cpp:714 +#: mrvUI/mrvMenus.cpp:717 msgid "Playback/Toggle Out Point" msgstr "" -#: mrvUI/mrvMenus.cpp:697 +#: mrvUI/mrvMenus.cpp:700 msgid "Playback/Toggle Playback" msgstr "" -#: mrvPanels/mrvPanelsAux.h:18 mrvFl/mrvCallbacks.cpp:91 mrvUI/mrvMenus.cpp:386 +#: mrvPanels/mrvPanelsAux.h:18 mrvFl/mrvCallbacks.cpp:91 mrvUI/mrvMenus.cpp:389 msgid "Playlist" msgstr "" @@ -3925,7 +3939,7 @@ msgstr "" msgid "Port" msgstr "" -#: mrvApp/App.cpp:371 +#: mrvApp/App.cpp:372 msgid "" "Port number for the server to listen to or for the client to connect to." msgstr "" @@ -3940,7 +3954,7 @@ msgstr "" msgid "Positioning" msgstr "" -#: mrvFl/mrvCallbacks.cpp:112 mrvFl/mrvCallbacks.cpp:732 mrvUI/mrvMenus.cpp:470 +#: mrvFl/mrvCallbacks.cpp:112 mrvFl/mrvCallbacks.cpp:732 mrvUI/mrvMenus.cpp:473 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:391 msgid "Preferences" msgstr "" @@ -3957,19 +3971,19 @@ msgstr "" msgid "Preview Thumbnails" msgstr "" -#: mrvCore/mrvHotkey.cpp:393 +#: mrvCore/mrvHotkey.cpp:395 msgid "Previous Channel" msgstr "" -#: mrvCore/mrvHotkey.cpp:387 +#: mrvCore/mrvHotkey.cpp:389 msgid "Previous Image" msgstr "" -#: mrvCore/mrvHotkey.cpp:390 +#: mrvCore/mrvHotkey.cpp:392 msgid "Previous Image Limited" msgstr "" -#: mrvCore/mrvHotkey.cpp:383 +#: mrvCore/mrvHotkey.cpp:385 msgid "Previous Image Version" msgstr "" @@ -3985,7 +3999,7 @@ msgstr "" msgid "Previously used Hosts" msgstr "" -#: mrvCore/mrvHotkey.cpp:487 +#: mrvCore/mrvHotkey.cpp:489 msgid "Print" msgstr "" @@ -4025,15 +4039,15 @@ msgstr "" msgid "Protocols" msgstr "" -#: mrvFl/mrvCallbacks.cpp:100 mrvUI/mrvMenus.cpp:422 +#: mrvFl/mrvCallbacks.cpp:100 mrvUI/mrvMenus.cpp:425 msgid "Python" msgstr "" -#: mrvApp/App.cpp:438 +#: mrvApp/App.cpp:439 msgid "Python Error: " msgstr "" -#: mrvApp/App.cpp:323 +#: mrvApp/App.cpp:324 msgid "Python Script to run and exit." msgstr "" @@ -4045,11 +4059,11 @@ msgstr "" msgid "Quicktime Movie" msgstr "" -#: mrvCore/mrvHotkey.cpp:333 +#: mrvCore/mrvHotkey.cpp:335 msgid "Quit Program" msgstr "" -#: mrvApp/App.cpp:478 mrvUI/mrvMenus.cpp:1158 +#: mrvApp/App.cpp:479 mrvUI/mrvMenus.cpp:1161 msgid "Quit mrv2" msgstr "" @@ -4098,11 +4112,11 @@ msgstr "" msgid "Rectangle" msgstr "" -#: mrvCore/mrvHotkey.cpp:442 +#: mrvCore/mrvHotkey.cpp:444 msgid "Rectangle Mode" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2636 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2635 msgid "Rectangle Tool" msgstr "" @@ -4110,7 +4124,7 @@ msgstr "" msgid "Red" msgstr "" -#: mrvCore/mrvHotkey.cpp:353 +#: mrvCore/mrvHotkey.cpp:355 msgid "Red Channel" msgstr "" @@ -4118,15 +4132,15 @@ msgstr "" msgid "Red value of image pixel under mouse." msgstr "" -#: mrvCore/mrvHotkey.cpp:448 +#: mrvCore/mrvHotkey.cpp:450 msgid "Redo Draw" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2740 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2739 msgid "Redo Previous Shape Drawn in Current Frame." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2421 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2420 msgid "Reduce gain 1/2 stop (divide by sqrt(2))." msgstr "" @@ -4190,7 +4204,7 @@ msgstr "" msgid "Remote to Local Path Mapping" msgstr "" -#: mrvCore/mrvHotkey.cpp:402 +#: mrvCore/mrvHotkey.cpp:404 msgid "Remove Clip" msgstr "" @@ -4218,81 +4232,81 @@ msgstr "" msgid "Render Width" msgstr "" -#: mrvUI/mrvMenus.cpp:596 +#: mrvUI/mrvMenus.cpp:599 msgid "Render/Alpha Blend/None" msgstr "" -#: mrvUI/mrvMenus.cpp:610 +#: mrvUI/mrvMenus.cpp:613 msgid "Render/Alpha Blend/Premultiplied" msgstr "" -#: mrvUI/mrvMenus.cpp:603 +#: mrvUI/mrvMenus.cpp:606 msgid "Render/Alpha Blend/Straight" msgstr "" -#: mrvUI/mrvMenus.cpp:530 +#: mrvUI/mrvMenus.cpp:533 msgid "Render/Alpha Channel" msgstr "" -#: mrvUI/mrvMenus.cpp:558 +#: mrvUI/mrvMenus.cpp:561 msgid "Render/Black Background " msgstr "" -#: mrvUI/mrvMenus.cpp:521 +#: mrvUI/mrvMenus.cpp:524 msgid "Render/Blue Channel" msgstr "" -#: mrvUI/mrvMenus.cpp:494 +#: mrvUI/mrvMenus.cpp:497 msgid "Render/Color Channel" msgstr "" -#: mrvUI/mrvMenus.cpp:512 +#: mrvUI/mrvMenus.cpp:515 msgid "Render/Green Channel " msgstr "" #: mrvGL/mrvTimelineViewport.cpp:1441 mrvGL/mrvTimelineViewport.cpp:1648 -#: mrvUI/mrvMenus.cpp:656 +#: mrvUI/mrvMenus.cpp:659 msgid "Render/Magnify Filter/Linear" msgstr "" -#: mrvUI/mrvMenus.cpp:649 +#: mrvUI/mrvMenus.cpp:652 msgid "Render/Magnify Filter/Nearest" msgstr "" #: mrvGL/mrvTimelineViewport.cpp:1436 mrvGL/mrvTimelineViewport.cpp:1643 -#: mrvUI/mrvMenus.cpp:635 +#: mrvUI/mrvMenus.cpp:638 msgid "Render/Minify Filter/Linear" msgstr "" -#: mrvUI/mrvMenus.cpp:628 +#: mrvUI/mrvMenus.cpp:631 msgid "Render/Minify Filter/Nearest" msgstr "" -#: mrvUI/mrvMenus.cpp:540 +#: mrvUI/mrvMenus.cpp:543 msgid "Render/Mirror X" msgstr "" -#: mrvUI/mrvMenus.cpp:550 +#: mrvUI/mrvMenus.cpp:553 msgid "Render/Mirror Y" msgstr "" -#: mrvUI/mrvMenus.cpp:503 +#: mrvUI/mrvMenus.cpp:506 msgid "Render/Red Channel" msgstr "" -#: mrvUI/mrvMenus.cpp:570 +#: mrvUI/mrvMenus.cpp:573 msgid "Render/Video Levels/From File" msgstr "" -#: mrvUI/mrvMenus.cpp:584 +#: mrvUI/mrvMenus.cpp:587 msgid "Render/Video Levels/Full Range" msgstr "" -#: mrvUI/mrvMenus.cpp:577 +#: mrvUI/mrvMenus.cpp:580 msgid "Render/Video Levels/Legal Range" msgstr "" -#: mrvWidgets/mrvVersion.cpp:873 +#: mrvWidgets/mrvVersion.cpp:881 msgid "Renderer:\t" msgstr "" @@ -4320,7 +4334,7 @@ msgstr "" msgid "Reset" msgstr "" -#: mrvCore/mrvHotkey.cpp:428 +#: mrvCore/mrvHotkey.cpp:430 msgid "Reset Gain/Gamma" msgstr "" @@ -4328,7 +4342,7 @@ msgstr "" msgid "Reset Hotkeys" msgstr "" -#: mrvApp/App.cpp:330 +#: mrvApp/App.cpp:331 msgid "Reset hotkeys to defaults." msgstr "" @@ -4336,7 +4350,7 @@ msgstr "" msgid "Reset hotkeys to saved file." msgstr "" -#: mrvApp/App.cpp:327 +#: mrvApp/App.cpp:328 msgid "Reset settings to defaults." msgstr "" @@ -4344,7 +4358,7 @@ msgstr "" msgid "Reset to default value" msgstr "" -#: mrvCore/mrvHotkey.cpp:337 +#: mrvCore/mrvHotkey.cpp:339 msgid "Resize Main Window to Fit" msgstr "" @@ -4365,7 +4379,7 @@ msgstr "" msgid "Retrieve the cache memory setting in gigabytes." msgstr "" -#: mrvCore/mrvHotkey.cpp:486 +#: mrvCore/mrvHotkey.cpp:488 msgid "Return" msgstr "" @@ -4425,7 +4439,7 @@ msgstr "" msgid "Return the root path to the insallation of mrv2." msgstr "" -#: mrvApp/App.cpp:379 +#: mrvApp/App.cpp:380 msgid "Return the version and exit." msgstr "" @@ -4471,23 +4485,23 @@ msgstr "" msgid "Revert settings to last saved preferences." msgstr "" -#: mrvCore/mrvHotkey.cpp:501 +#: mrvCore/mrvHotkey.cpp:503 msgid "Right" msgstr "" -#: mrvCore/mrvHotkey.cpp:510 +#: mrvCore/mrvHotkey.cpp:512 msgid "RightAlt" msgstr "" -#: mrvCore/mrvHotkey.cpp:507 +#: mrvCore/mrvHotkey.cpp:509 msgid "RightCtrl" msgstr "" -#: mrvCore/mrvHotkey.cpp:513 +#: mrvCore/mrvHotkey.cpp:515 msgid "RightMeta" msgstr "" -#: mrvCore/mrvHotkey.cpp:504 +#: mrvCore/mrvHotkey.cpp:506 msgid "RightShift" msgstr "" @@ -4525,16 +4539,16 @@ msgstr "" msgid "Rotation on Y" msgstr "" -#: mrvApp/App.cpp:426 +#: mrvApp/App.cpp:427 msgid "Running python script '{0}'" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1069 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:1068 msgid "S" msgstr "" #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:601 -#: mrvCore/mrvHotkey.cpp:343 +#: mrvCore/mrvHotkey.cpp:345 msgid "Safe Areas" msgstr "" @@ -4560,19 +4574,23 @@ msgstr "" msgid "Save Annotations to PDF" msgstr "" -#: mrvCore/mrvHotkey.cpp:323 +#: mrvCore/mrvHotkey.cpp:324 msgid "Save Image" msgstr "" -#: mrvFl/mrvFileRequester.cpp:518 mrvCore/mrvHotkey.cpp:325 +#: mrvFl/mrvFileRequester.cpp:518 mrvCore/mrvHotkey.cpp:326 msgid "Save Movie or Sequence" msgstr "" +#: mrvCore/mrvHotkey.cpp:327 +msgid "Save OTIO Timeline" +msgstr "" + #: mrvFl/mrvFileRequester.cpp:380 msgid "Save OTIO timeline" msgstr "" -#: mrvCore/mrvHotkey.cpp:326 +#: mrvCore/mrvHotkey.cpp:328 msgid "Save PDF Document" msgstr "" @@ -4580,11 +4598,11 @@ msgstr "" msgid "Save Python Script" msgstr "" -#: mrvFl/mrvFileRequester.cpp:576 mrvCore/mrvHotkey.cpp:327 +#: mrvFl/mrvFileRequester.cpp:576 mrvCore/mrvHotkey.cpp:329 msgid "Save Session" msgstr "" -#: mrvCore/mrvHotkey.cpp:328 +#: mrvCore/mrvHotkey.cpp:330 msgid "Save Session As" msgstr "" @@ -4608,7 +4626,7 @@ msgstr "" msgid "Save annotations." msgstr "" -#: mrvPy/Playlist.cpp:211 +#: mrvPy/Playlist.cpp:196 msgid "Save current .otio file with relative paths." msgstr "" @@ -4647,16 +4665,16 @@ msgstr "" msgid "Scripts/Add To Script List" msgstr "" -#: mrvCore/mrvHotkey.cpp:489 +#: mrvCore/mrvHotkey.cpp:491 msgid "ScrollLock" msgstr "" #: mrvGL/mrvTimelineViewport.cpp:202 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2886 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2885 msgid "Scrub" msgstr "" -#: mrvCore/mrvHotkey.cpp:437 +#: mrvCore/mrvHotkey.cpp:439 msgid "Scrub Mode" msgstr "" @@ -4664,7 +4682,7 @@ msgstr "" msgid "Scrub Sensitivity" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2560 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2559 msgid "Scrubbing Tool" msgstr "" @@ -4685,7 +4703,7 @@ msgstr "" msgid "Secondary on Top" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:483 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:482 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:171 msgid "Seconds" msgstr "" @@ -4702,22 +4720,26 @@ msgstr "" msgid "Seek to a time in timeline." msgstr "" -#: mrvApp/App.cpp:295 +#: mrvApp/App.cpp:296 msgid "Seek to the given time." msgstr "" -#: mrvPy/Playlist.cpp:194 +#: mrvPy/Playlist.cpp:179 msgid "Select a playlist by FileModelItem." msgstr "" -#: mrvPy/Playlist.cpp:199 +#: mrvPy/Playlist.cpp:184 msgid "Select a playlist by fileName." msgstr "" -#: mrvPy/Playlist.cpp:203 +#: mrvPy/Playlist.cpp:188 msgid "Select a playlist by index." msgstr "" +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/make_ocio_chooser.cxx:40 +msgid "Select an OCIO Transform" +msgstr "" + #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:947 msgid "Select default looping mode in timeline." msgstr "" @@ -4833,7 +4855,7 @@ msgstr "" msgid "Server stopped." msgstr "" -#: mrvApp/App.cpp:476 mrvUI/mrvMenus.cpp:1157 +#: mrvApp/App.cpp:477 mrvUI/mrvMenus.cpp:1160 msgid "Services" msgstr "" @@ -4861,7 +4883,7 @@ msgstr "" msgid "Set FFmpeg YUV To RGB Conversion." msgstr "" -#: mrvCore/mrvHotkey.cpp:451 +#: mrvCore/mrvHotkey.cpp:453 msgid "Set In Point" msgstr "" @@ -4869,7 +4891,7 @@ msgstr "" msgid "Set Language to {0}, Numbers to {1}" msgstr "" -#: mrvCore/mrvHotkey.cpp:452 +#: mrvCore/mrvHotkey.cpp:454 msgid "Set Out Point" msgstr "" @@ -4973,7 +4995,7 @@ msgstr "" msgid "Set the in time of the selected time range of the timeline." msgstr "" -#: mrvApp/App.cpp:298 +#: mrvApp/App.cpp:299 msgid "Set the in/out points range." msgstr "" @@ -5037,7 +5059,7 @@ msgstr "" msgid "Setting OCIO config to default." msgstr "" -#: mrvFl/mrvCallbacks.cpp:98 mrvUI/mrvMenus.cpp:407 +#: mrvFl/mrvCallbacks.cpp:98 mrvUI/mrvMenus.cpp:410 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:395 msgid "Settings" msgstr "" @@ -5046,7 +5068,7 @@ msgstr "" msgid "Shift" msgstr "" -#: mrvApp/App.cpp:477 +#: mrvApp/App.cpp:478 msgid "Show All" msgstr "" @@ -5098,7 +5120,7 @@ msgstr "" msgid "Size:" msgstr "" -#: mrvCore/mrvHotkey.cpp:401 +#: mrvCore/mrvHotkey.cpp:403 msgid "Slice Clip" msgstr "" @@ -5134,11 +5156,11 @@ msgstr "" msgid "Softimage Picture" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:936 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:935 msgid "Some default frame rate settings." msgstr "" -#: mrvCore/mrvHotkey.cpp:529 +#: mrvCore/mrvHotkey.cpp:531 msgid "Space (' ')" msgstr "" @@ -5195,7 +5217,7 @@ msgstr "" msgid "Start Time" msgstr "" -#: mrvApp/App.cpp:363 +#: mrvApp/App.cpp:364 msgid "Start a server. Use -port to specify a port number." msgstr "" @@ -5216,7 +5238,7 @@ msgid "Status Bar" msgstr "" #: mrvPanels/mrvPanelsAux.h:19 mrvPanels/mrvStereo3DPanel.cpp:304 -#: mrvFl/mrvCallbacks.cpp:110 mrvUI/mrvMenus.cpp:448 +#: mrvFl/mrvCallbacks.cpp:110 mrvUI/mrvMenus.cpp:451 msgid "Stereo 3D" msgstr "" @@ -5234,11 +5256,11 @@ msgstr "" #: mrvGL/mrvTimelineViewportEvents.cpp:957 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:164 -#: mrvCore/mrvHotkey.cpp:374 +#: mrvCore/mrvHotkey.cpp:376 msgid "Stop" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:866 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:865 msgid "Stop playback." msgstr "" @@ -5283,7 +5305,7 @@ msgstr "" msgid "Subtitles (*.{" msgstr "" -#: mrvCore/mrvHotkey.cpp:533 +#: mrvCore/mrvHotkey.cpp:535 msgid "Subtract" msgstr "" @@ -5299,11 +5321,11 @@ msgstr "" msgid "Swap left and right eyes." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2703 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2702 msgid "Switch Colors" msgstr "" -#: mrvCore/mrvHotkey.cpp:449 +#: mrvCore/mrvHotkey.cpp:451 msgid "Switch Pen Color" msgstr "" @@ -5313,7 +5335,7 @@ msgid "" "decimal (0..255)." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:785 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:784 msgid "Switch between Frame, Seconds and Timecode display" msgstr "" @@ -5337,59 +5359,59 @@ msgid "" "Switch pixel color space information display for the pixel under the cursor." msgstr "" -#: mrvUI/mrvMenus.cpp:1114 +#: mrvUI/mrvMenus.cpp:1117 msgid "Sync/Accept/Annotations" msgstr "" -#: mrvUI/mrvMenus.cpp:1122 +#: mrvUI/mrvMenus.cpp:1125 msgid "Sync/Accept/Audio" msgstr "" -#: mrvUI/mrvMenus.cpp:1098 +#: mrvUI/mrvMenus.cpp:1101 msgid "Sync/Accept/Color" msgstr "" -#: mrvUI/mrvMenus.cpp:1071 +#: mrvUI/mrvMenus.cpp:1074 msgid "Sync/Accept/Media" msgstr "" -#: mrvUI/mrvMenus.cpp:1090 +#: mrvUI/mrvMenus.cpp:1093 msgid "Sync/Accept/Pan And Zoom" msgstr "" -#: mrvUI/mrvMenus.cpp:1106 +#: mrvUI/mrvMenus.cpp:1109 msgid "Sync/Accept/Timeline" msgstr "" -#: mrvUI/mrvMenus.cpp:1082 +#: mrvUI/mrvMenus.cpp:1085 msgid "Sync/Accept/UI" msgstr "" -#: mrvUI/mrvMenus.cpp:1051 +#: mrvUI/mrvMenus.cpp:1054 msgid "Sync/Send/Annotations" msgstr "" -#: mrvUI/mrvMenus.cpp:1059 +#: mrvUI/mrvMenus.cpp:1062 msgid "Sync/Send/Audio" msgstr "" -#: mrvUI/mrvMenus.cpp:1035 +#: mrvUI/mrvMenus.cpp:1038 msgid "Sync/Send/Color" msgstr "" -#: mrvUI/mrvMenus.cpp:1008 +#: mrvUI/mrvMenus.cpp:1011 msgid "Sync/Send/Media" msgstr "" -#: mrvUI/mrvMenus.cpp:1027 +#: mrvUI/mrvMenus.cpp:1030 msgid "Sync/Send/Pan And Zoom" msgstr "" -#: mrvUI/mrvMenus.cpp:1043 +#: mrvUI/mrvMenus.cpp:1046 msgid "Sync/Send/Timeline" msgstr "" -#: mrvUI/mrvMenus.cpp:1019 +#: mrvUI/mrvMenus.cpp:1022 msgid "Sync/Send/UI" msgstr "" @@ -5398,7 +5420,7 @@ msgstr "" msgid "TIFF Picture" msgstr "" -#: mrvCore/mrvHotkey.cpp:485 +#: mrvCore/mrvHotkey.cpp:487 msgid "Tab" msgstr "" @@ -5411,7 +5433,7 @@ msgstr "" msgid "Text" msgstr "" -#: mrvCore/mrvHotkey.cpp:444 +#: mrvCore/mrvHotkey.cpp:446 msgid "Text Mode" msgstr "" @@ -5419,7 +5441,7 @@ msgstr "" msgid "Text Overlay" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2666 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2665 msgid "Text Tool. Right click to edit previously stamped text." msgstr "" @@ -5520,7 +5542,7 @@ msgstr "" msgid "Time range of the timeline." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:484 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:483 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:172 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvPreferencesUI.cxx:665 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvHUDUI.cxx:165 @@ -5535,39 +5557,39 @@ msgstr "" msgid "Timeline" msgstr "" -#: mrvUI/mrvMenus.cpp:844 +#: mrvUI/mrvMenus.cpp:847 msgid "Timeline/Edit Associated Clips" msgstr "" -#: mrvUI/mrvMenus.cpp:836 +#: mrvUI/mrvMenus.cpp:839 msgid "Timeline/Editable" msgstr "" -#: mrvUI/mrvMenus.cpp:899 +#: mrvUI/mrvMenus.cpp:902 msgid "Timeline/Markers" msgstr "" -#: mrvUI/mrvMenus.cpp:883 +#: mrvUI/mrvMenus.cpp:886 msgid "Timeline/Thumbnails/Large" msgstr "" -#: mrvUI/mrvMenus.cpp:877 +#: mrvUI/mrvMenus.cpp:880 msgid "Timeline/Thumbnails/Medium" msgstr "" -#: mrvUI/mrvMenus.cpp:865 +#: mrvUI/mrvMenus.cpp:868 msgid "Timeline/Thumbnails/None" msgstr "" -#: mrvUI/mrvMenus.cpp:871 +#: mrvUI/mrvMenus.cpp:874 msgid "Timeline/Thumbnails/Small" msgstr "" -#: mrvUI/mrvMenus.cpp:893 +#: mrvUI/mrvMenus.cpp:896 msgid "Timeline/Transitions" msgstr "" -#: mrvApp/App.cpp:254 +#: mrvApp/App.cpp:255 msgid "Timelines, movies, image sequences, or folders." msgstr "" @@ -5579,172 +5601,172 @@ msgstr "" msgid "Tint" msgstr "" -#: mrvCore/mrvHotkey.cpp:476 +#: mrvCore/mrvHotkey.cpp:478 msgid "Toggle About Window" msgstr "" -#: mrvCore/mrvHotkey.cpp:465 +#: mrvCore/mrvHotkey.cpp:467 msgid "Toggle Annotation Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:454 +#: mrvCore/mrvHotkey.cpp:456 msgid "Toggle Black Background" msgstr "" -#: mrvCore/mrvHotkey.cpp:460 +#: mrvCore/mrvHotkey.cpp:462 msgid "Toggle Color Area Info Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:461 +#: mrvCore/mrvHotkey.cpp:463 msgid "Toggle Color Controls Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:463 +#: mrvCore/mrvHotkey.cpp:465 msgid "Toggle Compare Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:464 +#: mrvCore/mrvHotkey.cpp:466 msgid "Toggle Devices Panel" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2375 -#: mrvCore/mrvHotkey.cpp:422 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2374 +#: mrvCore/mrvHotkey.cpp:424 msgid "Toggle Edit Mode" msgstr "" -#: mrvCore/mrvHotkey.cpp:470 +#: mrvCore/mrvHotkey.cpp:472 msgid "Toggle Environment Map Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:458 +#: mrvCore/mrvHotkey.cpp:460 msgid "Toggle Files Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:415 +#: mrvCore/mrvHotkey.cpp:417 msgid "Toggle Float On Top" msgstr "" -#: mrvCore/mrvHotkey.cpp:413 +#: mrvCore/mrvHotkey.cpp:415 msgid "Toggle Full Screen" msgstr "" -#: mrvCore/mrvHotkey.cpp:467 +#: mrvCore/mrvHotkey.cpp:469 msgid "Toggle Histogram Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:475 +#: mrvCore/mrvHotkey.cpp:477 msgid "Toggle Hotkeys Window" msgstr "" -#: mrvCore/mrvHotkey.cpp:473 +#: mrvCore/mrvHotkey.cpp:475 msgid "Toggle Log Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:342 +#: mrvCore/mrvHotkey.cpp:344 msgid "Toggle Magnify Texture Filtering" msgstr "" -#: mrvCore/mrvHotkey.cpp:459 +#: mrvCore/mrvHotkey.cpp:461 msgid "Toggle Media Info Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:407 +#: mrvCore/mrvHotkey.cpp:409 msgid "Toggle Menu Bar" msgstr "" -#: mrvCore/mrvHotkey.cpp:340 +#: mrvCore/mrvHotkey.cpp:342 msgid "Toggle Minify Texture Filtering" msgstr "" -#: mrvCore/mrvHotkey.cpp:419 +#: mrvCore/mrvHotkey.cpp:421 msgid "Toggle Network" msgstr "" -#: mrvCore/mrvHotkey.cpp:457 +#: mrvCore/mrvHotkey.cpp:459 msgid "Toggle One Panel Only" msgstr "" -#: mrvCore/mrvHotkey.cpp:409 +#: mrvCore/mrvHotkey.cpp:411 msgid "Toggle Pixel Bar" msgstr "" -#: mrvCore/mrvHotkey.cpp:462 +#: mrvCore/mrvHotkey.cpp:464 msgid "Toggle Playlist Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:471 +#: mrvCore/mrvHotkey.cpp:473 msgid "Toggle Preferences Window" msgstr "" -#: mrvCore/mrvHotkey.cpp:414 +#: mrvCore/mrvHotkey.cpp:416 msgid "Toggle Presentation" msgstr "" -#: mrvCore/mrvHotkey.cpp:472 +#: mrvCore/mrvHotkey.cpp:474 msgid "Toggle Python Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:416 +#: mrvCore/mrvHotkey.cpp:418 msgid "Toggle Secondary" msgstr "" -#: mrvCore/mrvHotkey.cpp:418 +#: mrvCore/mrvHotkey.cpp:420 msgid "Toggle Secondary Float On Top" msgstr "" -#: mrvCore/mrvHotkey.cpp:466 +#: mrvCore/mrvHotkey.cpp:468 msgid "Toggle Settings Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:411 +#: mrvCore/mrvHotkey.cpp:413 msgid "Toggle Status Bar" msgstr "" -#: mrvCore/mrvHotkey.cpp:421 +#: mrvCore/mrvHotkey.cpp:423 msgid "Toggle Stereo 3D" msgstr "" -#: mrvCore/mrvHotkey.cpp:410 +#: mrvCore/mrvHotkey.cpp:412 msgid "Toggle Timeline" msgstr "" -#: mrvCore/mrvHotkey.cpp:426 +#: mrvCore/mrvHotkey.cpp:428 msgid "Toggle Timeline Markers" msgstr "" -#: mrvCore/mrvHotkey.cpp:423 +#: mrvCore/mrvHotkey.cpp:425 msgid "Toggle Timeline Thumbnails" msgstr "" -#: mrvCore/mrvHotkey.cpp:425 +#: mrvCore/mrvHotkey.cpp:427 msgid "Toggle Timeline Transitions" msgstr "" -#: mrvCore/mrvHotkey.cpp:412 +#: mrvCore/mrvHotkey.cpp:414 msgid "Toggle Tool Dock" msgstr "" -#: mrvCore/mrvHotkey.cpp:408 +#: mrvCore/mrvHotkey.cpp:410 msgid "Toggle Top Bar" msgstr "" -#: mrvCore/mrvHotkey.cpp:420 +#: mrvCore/mrvHotkey.cpp:422 msgid "Toggle USD" msgstr "" -#: mrvCore/mrvHotkey.cpp:468 +#: mrvCore/mrvHotkey.cpp:470 msgid "Toggle Vectorscope Panel" msgstr "" -#: mrvCore/mrvHotkey.cpp:469 +#: mrvCore/mrvHotkey.cpp:471 msgid "Toggle Waveform Panel" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2426 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2425 msgid "Toggle gain between 1 and the previous setting." msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2496 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2495 msgid "Toggle gamma between 1 and the previous setting." msgstr "" @@ -5801,7 +5823,7 @@ msgid "UI Elements" msgstr "" #: mrvPanels/mrvUSDPanel.cpp:65 mrvFl/mrvCallbacks.cpp:106 -#: mrvUI/mrvMenus.cpp:439 +#: mrvUI/mrvMenus.cpp:442 msgid "USD" msgstr "" @@ -5813,11 +5835,11 @@ msgstr "" msgid "USD Thumbnails" msgstr "" -#: mrvCore/mrvHotkey.cpp:447 +#: mrvCore/mrvHotkey.cpp:449 msgid "Undo Draw" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2725 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2724 msgid "Undo Last Shape Drawn in Current Frame." msgstr "" @@ -5826,8 +5848,8 @@ msgid "Undock" msgstr "" #: mrvPanels/mrvImageInfoPanel.cpp:1827 mrvPanels/mrvImageInfoPanel.cpp:1837 -#: mrvWidgets/mrvVersion.cpp:862 mrvWidgets/mrvVersion.cpp:866 -#: mrvWidgets/mrvVersion.cpp:870 +#: mrvWidgets/mrvVersion.cpp:870 mrvWidgets/mrvVersion.cpp:874 +#: mrvWidgets/mrvVersion.cpp:878 msgid "Unknown" msgstr "" @@ -5839,7 +5861,7 @@ msgstr "" msgid "Unknown bit depth" msgstr "" -#: mrvUI/mrvMenus.cpp:477 +#: mrvUI/mrvMenus.cpp:480 msgid "Unknown menu entry " msgstr "" @@ -5847,7 +5869,7 @@ msgstr "" msgid "Unknown type for mrvOCIOBrowser" msgstr "" -#: mrvCore/mrvHotkey.cpp:499 +#: mrvCore/mrvHotkey.cpp:501 msgid "Up" msgstr "" @@ -5943,11 +5965,11 @@ msgstr "" msgid "Vector of 4 floats." msgstr "" -#: mrvFl/mrvCallbacks.cpp:109 mrvUI/mrvMenus.cpp:372 +#: mrvFl/mrvCallbacks.cpp:109 mrvUI/mrvMenus.cpp:375 msgid "Vectorscope" msgstr "" -#: mrvWidgets/mrvVersion.cpp:872 +#: mrvWidgets/mrvVersion.cpp:880 msgid "Vendor:\t" msgstr "" @@ -5955,7 +5977,7 @@ msgstr "" msgid "Version Regex" msgstr "" -#: mrvWidgets/mrvVersion.cpp:874 +#: mrvWidgets/mrvVersion.cpp:882 msgid "Version:\t" msgstr "" @@ -6010,19 +6032,19 @@ msgstr "" msgid "View Window" msgstr "" -#: mrvApp/App.cpp:311 +#: mrvApp/App.cpp:312 msgid "View color space." msgstr "" -#: mrvUI/mrvMenus.cpp:198 +#: mrvUI/mrvMenus.cpp:201 msgid "View/Data Window" msgstr "" -#: mrvUI/mrvMenus.cpp:205 +#: mrvUI/mrvMenus.cpp:208 msgid "View/Display Window" msgstr "" -#: mrvUI/mrvMenus.cpp:820 +#: mrvUI/mrvMenus.cpp:823 msgid "View/Hud" msgstr "" @@ -6030,36 +6052,36 @@ msgstr "" msgid "View/Mask" msgstr "" -#: mrvUI/mrvMenus.cpp:808 +#: mrvUI/mrvMenus.cpp:811 #, c-format msgid "View/Mask/%s" msgstr "" -#: mrvUI/mrvMenus.cpp:191 +#: mrvUI/mrvMenus.cpp:194 msgid "View/Safe Areas" msgstr "" -#: mrvUI/mrvMenus.cpp:251 +#: mrvUI/mrvMenus.cpp:254 msgid "View/Toggle Action Dock" msgstr "" -#: mrvUI/mrvMenus.cpp:211 +#: mrvUI/mrvMenus.cpp:214 msgid "View/Toggle Menu bar" msgstr "" -#: mrvUI/mrvMenus.cpp:227 +#: mrvUI/mrvMenus.cpp:230 msgid "View/Toggle Pixel bar" msgstr "" -#: mrvUI/mrvMenus.cpp:243 +#: mrvUI/mrvMenus.cpp:246 msgid "View/Toggle Status Bar" msgstr "" -#: mrvUI/mrvMenus.cpp:235 +#: mrvUI/mrvMenus.cpp:238 msgid "View/Toggle Timeline" msgstr "" -#: mrvUI/mrvMenus.cpp:219 +#: mrvUI/mrvMenus.cpp:222 msgid "View/Toggle Top bar" msgstr "" @@ -6221,27 +6243,27 @@ msgstr "" msgid "Window Behavior" msgstr "" -#: mrvUI/mrvMenus.cpp:270 +#: mrvUI/mrvMenus.cpp:273 msgid "Window/" msgstr "" -#: mrvUI/mrvMenus.cpp:158 +#: mrvUI/mrvMenus.cpp:161 msgid "Window/Float On Top" msgstr "" -#: mrvUI/mrvMenus.cpp:146 +#: mrvUI/mrvMenus.cpp:149 msgid "Window/Full Screen" msgstr "" -#: mrvUI/mrvMenus.cpp:130 +#: mrvUI/mrvMenus.cpp:133 msgid "Window/Presentation" msgstr "" -#: mrvUI/mrvMenus.cpp:168 +#: mrvUI/mrvMenus.cpp:171 msgid "Window/Secondary" msgstr "" -#: mrvUI/mrvMenus.cpp:177 +#: mrvUI/mrvMenus.cpp:180 msgid "Window/Secondary Float On Top" msgstr "" @@ -6312,7 +6334,7 @@ msgid "XYZ CIE XYZ" msgstr "" #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:414 -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2495 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2494 msgid "Y" msgstr "" @@ -6358,7 +6380,7 @@ msgstr "" msgid "Yes" msgstr "" -#: mrvEdit/mrvEditCallbacks.cpp:1460 +#: mrvEdit/mrvEditCallbacks.cpp:1471 msgid "You can only add clips to an .otio EDL playlist." msgstr "" @@ -6382,7 +6404,7 @@ msgstr "" msgid "base" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2425 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2424 msgid "f/8" msgstr "" @@ -6418,7 +6440,7 @@ msgstr "" msgid "macOS Menus" msgstr "" -#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2338 +#: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrViewer.cxx:2337 #: /media/gga/datos/code/applications/mrv2/BUILD-Linux-amd64/Release/mrv2/src/mrv2-build/lib/mrvWidgets/mrvAboutUI.cxx:31 msgid "mrv2" msgstr "" @@ -6431,47 +6453,47 @@ msgstr "" msgid "oxy" msgstr "" -#: mrvCore/mrvHotkey.cpp:517 +#: mrvCore/mrvHotkey.cpp:519 msgid "pad0" msgstr "" -#: mrvCore/mrvHotkey.cpp:519 +#: mrvCore/mrvHotkey.cpp:521 msgid "pad1" msgstr "" -#: mrvCore/mrvHotkey.cpp:520 +#: mrvCore/mrvHotkey.cpp:522 msgid "pad2" msgstr "" -#: mrvCore/mrvHotkey.cpp:521 +#: mrvCore/mrvHotkey.cpp:523 msgid "pad3" msgstr "" -#: mrvCore/mrvHotkey.cpp:522 +#: mrvCore/mrvHotkey.cpp:524 msgid "pad4" msgstr "" -#: mrvCore/mrvHotkey.cpp:523 +#: mrvCore/mrvHotkey.cpp:525 msgid "pad5" msgstr "" -#: mrvCore/mrvHotkey.cpp:525 +#: mrvCore/mrvHotkey.cpp:527 msgid "pad6" msgstr "" -#: mrvCore/mrvHotkey.cpp:526 +#: mrvCore/mrvHotkey.cpp:528 msgid "pad7" msgstr "" -#: mrvCore/mrvHotkey.cpp:527 +#: mrvCore/mrvHotkey.cpp:529 msgid "pad8" msgstr "" -#: mrvCore/mrvHotkey.cpp:528 +#: mrvCore/mrvHotkey.cpp:530 msgid "pad9" msgstr "" -#: mrvCore/mrvHotkey.cpp:516 +#: mrvCore/mrvHotkey.cpp:518 msgid "padEnter" msgstr "" From fcc39fb0af52b944cd56a87fa06712186065adc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 7 Oct 2023 21:28:22 -0300 Subject: [PATCH 4/6] Fixed upload_sourceforge.sh script. --- bin/upload_sourceforge.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bin/upload_sourceforge.sh b/bin/upload_sourceforge.sh index 54acb3499..673d961f1 100755 --- a/bin/upload_sourceforge.sh +++ b/bin/upload_sourceforge.sh @@ -41,9 +41,7 @@ mkdir -p packages cd packages # Read all the files of this version -shopt -s nullglob -files=(*v${mrv2_VERSION}*) -shopt -u nullglob +files=$(ls -1 *v${mrv2_VERSION}*) if [[ "$files" == "" ]]; then echo @@ -71,12 +69,12 @@ upload_file() echo echo "Uploading $1 as $2..." echo - #rsync -av --ignore-errors -e "ssh -i $SSH_KEY" $1 ggarra13@frs.sourceforge.net:/home/frs/project/mrv2/beta/$2 + #rsync -avP --ignore-errors -e "ssh -i $SSH_KEY" $1 ggarra13@frs.sourceforge.net:/home/frs/project/mrv2/beta/$2 scp -i $SSH_KEY $1 ggarra13@frs.sourceforge.net:/home/frs/project/mrv2/beta/$2 echo echo "Upload was successful." echo - sleep 15 + } @@ -246,13 +244,12 @@ file_array=($files) # Iterate over the array of filenames for src in "${file_array[@]}"; do dest=`echo $src | sed -e "s/v$mrv2_VERSION/beta/"` - upload_file $src $dest + upload_file "${src}" "${dest}" done # Reset IFS to its default value (space, tab, newline) IFS=$' \t\n' - # Go back to root directory cd .. From 5e38416e255760fe2803fc7b40c4421414b65325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sun, 8 Oct 2023 05:09:03 -0300 Subject: [PATCH 5/6] Moved sudoku.py from unsure to list. --- README.html | 296 +++++------------- mrv2/python/demos/fltk/{unsure => }/sudoku.py | 0 2 files changed, 72 insertions(+), 224 deletions(-) rename mrv2/python/demos/fltk/{unsure => }/sudoku.py (100%) diff --git a/README.html b/README.html index 939e1966e..d8df61909 100644 --- a/README.html +++ b/README.html @@ -1,15 +1,6 @@ -

+

License Build Status Donate

mrv2

-

mrv2 is an open source professional player and review tool for vfx, -animation and computer graphics.

+

mrv2 is an open source professional player and review tool for vfx, animation and computer graphics.

Contents:

  • Running mrv2

    Pre-built binaries

    -

    If you are looking for pre-built binaries for Windows, Linux or macOS -(Intel), they can be found in:

    +

    If you are looking for pre-built binaries for Windows, Linux or macOS (Intel), they can be found in:

    GitHub

    or in its mirror site at:

    -

    SourceForge

    -

    The source forge site also hosts beta builds (nightly builds with the -latest changes).

    +

    SourceForge

    +

    The source forge site also hosts beta builds (nightly builds with the latest changes).

    Compatibility

    -

    mrv2 binaries run on Windows 8.1+, RedHat 8+ or Ubuntu 20.04+ and -macOS 10.15+.

    +

    mrv2 binaries run on Windows 8.1+, RedHat 8.1+ or Ubuntu 20.04+ and macOS 11.0+.

    Notes on installation

      -

    • On macOS you install it by opening the .dmg file, and dragging -the mrv2 icon to the Applications directory. If there’s already an mrv2 -version, we recommend you overwrite it. The macOS application is -currently not notarized, so when you launch it you will not be able to -run it as macOS will warn you that the file is not secure as it was -downloaded from internet. To avoid that, you need to open the Finder, go -to the Applications directory and CTRL + Left mouse click on the mrv2 -application. That will bring up the same warning, but this time it will -have a button that will allow you to open it. You only need to do this -once.

      • -

    • Windows and Chrome, like macOS, also protect you from installing -files from the Internet. When you first download it with Chrome it may -warn you that it is not an usual archive to be downloaded. Make sure to -click on the right up arrow menu to Save it anyway. You cannot open the -.exe from Chrome directly. You will need to open Windows Explorer and go -to the Downloads directory. You should then run it from there. Then -Windows will popup a Blue box telling you Windows SmartScreen prevented -the start of an unknown aplication and that you can place your PC at -risk. Click on the More Information text and a Button that says Run -anyway or similar should appear. Click on it and follow the standard -instructions to any Windows installer.

      • -

    • On Linux, in order to install the .rpm or .deb packages requires -your user to have sudo permissions.

      +

    • On macOS you install it by opening the .dmg file, and dragging the mrv2 icon to the Applications directory. If there’s already an mrv2 version, we recommend you overwrite it. The macOS application is currently not notarized, so when you launch it you will not be able to run it as macOS will warn you that the file is not secure as it was downloaded from internet. To avoid that, you need to open the Finder, go to the Applications directory and CTRL + Left mouse click on the mrv2 application. That will bring up the same warning, but this time it will have a button that will allow you to open it. You only need to do this once.

      • +

    • Windows and Chrome, like macOS, also protect you from installing files from the Internet. When you first download it with Chrome it may warn you that it is not an usual archive to be downloaded. Make sure to click on the right up arrow menu to Save it anyway. You cannot open the .exe from Chrome directly. You will need to open Windows Explorer and go to the Downloads directory. You should then run it from there. Then Windows will popup a Blue box telling you Windows SmartScreen prevented the start of an unknown aplication and that you can place your PC at risk. Click on the More Information text and a Button that says Run anyway or similar should appear. Click on it and follow the standard instructions to any Windows installer.

      • +

    • On Linux, in order to install the .rpm or .deb packages requires your user to have sudo permissions.

      On Debian (Ubuntu, etc) systems, you would install with:

      sudo dpkg -i mrv2-v0.7.8-Linux-amd64.tar.gz

    On Red Hat (Rocky Linux, etc), you would install it with:

      sudo rpm -i mrv2-v0.7.8-Linux-amd64.tar.gz
    -

    Once you install it, you can run mrv2 by just typing mrv2 in the -shell, as a symlink to the executable is placed in /usr/bin. The -installers will also associate file extensions and install an icon for -easy starting up in the Desktop icon of the user that installed it. For -running mrv2 with the icon, you need to select it and use the right -mouse button to open the menu and choose Allow Launch.

    -

    If you lack sudo permissions in your organization, you should -download the .tar.gz file and you can uncompress it with:

    +

    Once you install it, you can run mrv2 by just typing mrv2 in the shell, as a symlink to the executable is placed in /usr/bin. The installers will also associate file extensions and install an icon for easy starting up in the Desktop icon of the user that installed it. For running mrv2 with the icon, you need to select it and use the right mouse button to open the menu and choose Allow Launch.

    +

    If you lack sudo permissions in your organization, you should download the .tar.gz file and you can uncompress it with:

      tar -xf mrv2-v0.7.8-Linux-amd64.tar.gz
    -

    That will create a folder in the direcory you uncompress it from. You -can then run mrv2 by using the mrv2.sh shell script in the bin/ -subdirectory.

    +

    That will create a folder in the direcory you uncompress it from. You can then run mrv2 by using the mrv2.sh shell script in the bin/ subdirectory.

    Features

    -

    The source code is written in C++17 and uses CMake for the build -system, with some bash scripts for auxiliary tasks.
    -The core of the playback engine is a custom version of tlRender -(www.github.com/darbyjohnston/tlRender.git).

    +

    The source code is written in C++17 and uses CMake for the build system, with some bash scripts for auxiliary tasks.
    +The core of the playback engine is a custom version of tlRender (www.github.com/darbyjohnston/tlRender.git).

    Currently supported:

    • Movie files (H264, MP4, VPX, WEBM, etc.)
      • -
    • Image file sequences (Cineon, DPX, JPEG, OpenEXR, PNG, PPM, TIFF, -TGA, BMP, PSD)
      • +
    • Image file sequences (Cineon, DPX, JPEG, OpenEXR, PNG, PPM, TIFF, TGA, BMP, PSD)
    • RAW Camera Formats (CR2, CR3, X3F, etc).
    • Multi-channel audio
    • Color management
      • @@ -127,39 +81,15 @@

      Features

    • Environment mapping (Spherical and Cubic)
    • Python3 API and Plugin system
    • Network connections
      • -
    • Stereo 3D (Anaglyph, Scanlines, Columns, Checkered, Side by -Side)
      • +
    • Stereo 3D (Anaglyph, Scanlines, Columns, Checkered, Side by Side)
    • PDF Exporting of Annotations and Notes

    Building

    Building with Docker

    -

    On Linux, if you have Docker installed with your user as part of the -docker group, you can just build mrv2 with:

    +

    On Linux, if you have Docker installed with your user as part of the docker group, you can just build mrv2 with:

    ./runme_docker.sh
    -

    The resulting installers will be placed in a new packages/ directory -of the root of mrv2. The docker images are compatible with RedHat 8.1 -and Ubuntu 20.04.

    +

    The resulting installers will be placed in a new packages/ directory of the root of mrv2. The docker images are compatible with RedHat 8.1 and Ubuntu 20.04.

    Dependencies

    -

    Basic required dependencies:

    - -

    Basic Windows required dependencies:

    - -

    Additional dependencies are downloaded and built automatically by the -CMake superbuild script. For a list of non-system libraries that mrv2 -depends on and their licenses, please refer to mrv2/docs/Legal. The -system dependencies for each OS is listed below.

    RedHat

    #
 # Repositories
@@ -202,7 +132,7 @@ 
    Ubuntu
    
             libpulse-dev libssl-dev libffi-dev \
             libwayland-dev wayland-protocols libdbus-1-dev \
             libxkbcommon-dev libegl-dev libgtk-3-dev rpm \
-                    doxygen tk-dev libxt-dev
    + doxygen tk-dev libxt-dev swig subversion

    macOS

    #
 # Install
@@ -220,10 +150,15 @@ 
    macOS
    
 brew install git cmake ninja gettext openssl readline sqlite3 xz zlib

    Windows

    -

    The only special requirement is installing a new copy of cmake than -the one that ships with MSVC19. If building the NSIS installer, you need -to place the root of mrv2 in a path that has less than 20 characters, -like:

    + +

    Additional dependencies are downloaded and built automatically by the CMake superbuild script. For a list of non-system libraries that mrv2 depends on and their licenses, please refer to mrv2/docs/Legal. The system dependencies for each OS is listed below.

    +

    The only special requirement is installing a new copy of cmake than the one that ships with MSVC19. If building the NSIS installer, you need to place the root of mrv2 in a path that has less than 20 characters, like:

         /D/code/applications

    Building mrv2

    Clone the repository:

    @@ -236,56 +171,32 @@

    Building mrv2

    cd mrv2 ./runme.sh -

    The script is a superbuild script that will download all needed -dependencies required. It will create a build and a:

    +

    The script is a superbuild script that will download all needed dependencies required. It will create a build and a:

    BUILD-KERNEL-ARCH/BUILDTYPE/install

    directory where all files shall reside.

    -

    Make sure you meet the basic dependencies for your platform. See Dependencies.

    -

    The runme.sh sript will output its progress to the terminal and also -save itt in:

    +

    Make sure you meet the basic dependencies for your platform. See Dependencies.

    +

    The runme.sh sript will output its progress to the terminal and also save itt in:

    BUILD-KERNEL-ARCH/BUILDTYPE/compile.log.
    -

    The default is to build with all cores in all the Operating Systems. -If you want more or less cores pass another number to any of the -runme*.sh scripts. For example, to build with 4 cores, you can do:

    +

    The default is to build with all cores in all the Operating Systems. If you want more or less cores pass another number to any of the runme*.sh scripts. For example, to build with 4 cores, you can do:

    ./runme.sh -j 4
    -

    Later, if you just want to build mrv2 quickly (runme quick mnemonic) -without running through all the dependencies, run:

    +

    Later, if you just want to build mrv2 quickly (runme quick mnemonic) without running through all the dependencies, run:

    ./runmeq.sh
    -

    Later, to just build FLTK, tlRender and mrv2 (runme three mnemonic), -run;

    +

    Later, to just build FLTK, tlRender and mrv2 (runme three mnemonic), run;

    ./runmet.sh

    Debug builds

    -

    All runme.sh scripts support two additional parameters. For a debug -build, you would do:

    +

    All runme.sh scripts support two additional parameters. For a debug build, you would do:

    ./runme.sh debug

    To clean up the directory, run a debug build with 8 cores, run:

    ./runme.sh clean debug -j 8

    Building on Windows

    -

    For windows, in addition to Visual Studio, you will need a new and -fresh copy of Msys. There is a .bat file included in the distribution -(in windows/bat), which needs to be modified to the path of Visual -Studio (2019 by default), the optional Windows SDK (none by default) and -your copy of Msys.

    -

    As a convernience for Windows users, DLLs, includes and .lib files -for FFmpeg and liblcms2 libraries are provided in mrv2’s windows/win64 -directory. The libintl and libiconv libraries are taken from the MSys64 -repositories as pre-flight check with the bin/install_libintl_window.sh -script (part of runme.sh).

    -

    If you unset LCMS2_ROOT in windows/envvars/envvars.sh, the library -will be compiled.

    +

    For windows, in addition to Visual Studio, you will need a new and fresh copy of Msys. There is a .bat file included in the distribution (in windows/bat), which needs to be modified to the path of Visual Studio (2019 by default), the optional Windows SDK (none by default) and your copy of Msys.

    +

    As a convernience for Windows users, DLLs, includes and .lib files for FFmpeg and liblcms2 libraries are provided in mrv2’s windows/win64 directory. The libintl and libiconv libraries are taken from the MSys64 repositories as pre-flight check with the bin/install_libintl_window.sh script (part of runme.sh).

    +

    If you unset LCMS2_ROOT in windows/envvars/envvars.sh, the library will be compiled.

    CMake build options

    -

    The main runme.sh script supports passing CMake flags to it and -allows turning on or off some options of mrv2. You must pass them -like:

    +

    The main runme.sh script supports passing CMake flags to it and allows turning on or off some options of mrv2. You must pass them like:

    -D TLRENDER_USD=OFF

    Currently, the flags supported are:

    ----- @@ -331,90 +242,48 @@

    CMake build options

    Name
    -

    Building FFmpeg as GPL or -LGPL

    +

    Building FFmpeg as GPL or LGPL

    If you pass -gpl or -lpgl to the runme.sh script, like:

    ./runme.sh -gpl
    -

    The build system will compile FFmpeg as GPL or LGPL on all platforms. -The default is to build a LGPL version of FFmpeg as that complies with -the BSD binary distribution license. The LGPL version of FFmpeg, -however, does not come with libx264, which means you cannot save movie -files with the H264 codec. On Windows, if you don’t specify neither -gpl -nor -lgpl, the pre-compiled LGPL binaries are used.

    -

    The GPL version of FFmpeg does not have that restriction and it will -compile libx264 on all platforms.

    +

    The build system will compile FFmpeg as GPL or LGPL on all platforms. The default is to build a LGPL version of FFmpeg as that complies with the BSD binary distribution license. The LGPL version of FFmpeg, however, does not come with libx264, which means you cannot save movie files with the H264 codec. On Windows, if you don’t specify neither -gpl nor -lgpl, the pre-compiled LGPL binaries are used.

    +

    The GPL version of FFmpeg does not have that restriction and it will compile libx264 on all platforms.

    Running mrv2

    macOS and Linux

    -

    If you have a bin directory in your $HOME (ie. ~/bin ), the build -scripts will create a symlink there. So you should add ~/bin to your -PATH in your .bashrc or .zshrc.

    -

    Assuming you complied mrv2 with the ~/bin directory already created, -then to start mrv2 then you’d do:

    +

    If you have a bin directory in your $HOME (ie. ~/bin ), the build scripts will create a symlink there. So you should add ~/bin to your PATH in your .bashrc or .zshrc.

    +

    Assuming you complied mrv2 with the ~/bin directory already created, then to start mrv2 then you’d do:

    export PATH=~/bin:$PATH  # no need if you add this line to your .bashrc
 mrv2

    and to run the debug build.

    export PATH=~/bin:$PATH  # no need if you add this line to your .bashrc
 mrv2-dbg
    -

    If you compiled mrv2 without bin directory in your HOME directory, -you can start it from the BUILD directory with the mrv2.sh script, -like:

    +

    If you compiled mrv2 without bin directory in your HOME directory, you can start it from the BUILD directory with the mrv2.sh script, like:

    BUILD-Linux-amd64/Release/install/bin/mrv2.sh

    Windows

    -

    On Windows, we cannot create symbolic links, so in Msys you need to -type the whole path to the install. That is, for example:

    +

    On Windows, we cannot create symbolic links, so in Msys you need to type the whole path to the install. That is, for example:

    BUILD-Msys-amd64/Release/install/bin/mrv2.exe
    -

    If you like to work command line, you should add the whole path to -the mrv2.exe to your path. In Msys, you can add it to the .bashrc like -shown on macOS and Linux.

    -

    For cmd.exe or PowerShell, on the Windows taskbar, right-click the -Windows icon and select System. In the Settings window, under Related -Settings, click Advanced system settings. On the Advanced tab, click -Environment Variables. Find the PATH environment variable and add the -full path to mrv2.exe.

    +

    If you like to work command line, you should add the whole path to the mrv2.exe to your path. In Msys, you can add it to the .bashrc like shown on macOS and Linux.

    +

    For cmd.exe or PowerShell, on the Windows taskbar, right-click the Windows icon and select System. In the Settings window, under Related Settings, click Advanced system settings. On the Advanced tab, click Environment Variables. Find the PATH environment variable and add the full path to mrv2.exe.

    For working with a GUI, after the build is done, you should do:

    cd BUILD-Msys-amd64/Release/install/bin/  # or similar
 explorer .
    -

    And in the explorer directory that it will open, you should create a -shortcut with the RMB to the mrv2.exe. Once that is done, you can drag -and rename the shortcut to your Desktop to have it handy. Note that if -you will not be developing mrv2, you should instead proceed to Packaging.

    +

    And in the explorer directory that it will open, you should create a shortcut with the RMB to the mrv2.exe. Once that is done, you can drag and rename the shortcut to your Desktop to have it handy. Note that if you will not be developing mrv2, you should instead proceed to Packaging.

    Tutorials

    -

    Besides the basic API documentation included, there is a special -channel on youtube.com where you can find some tutorials on its basic -use:

    -

    Video -Tutorials

    +

    Besides the basic API documentation included, there is a special channel on youtube.com where you can find some tutorials on its basic use:

    +

    Video Tutorials

    Documenting

    -

    Currently, the documentation is generated automatically from the -translations. To do so, you must run:

    +

    Currently, the documentation is generated automatically from the translations. To do so, you must run:

    ./runmeq.sh -t doc

    Translating

    -

    mrv2 can support multiple natural language translations. Currently, -English and Spanish are supported. The translation system used is -gettext so familiarity with it is desired (albeit not essential). The -translations reside in mrv2/po and follow internationalization language -code files, like es.po (for Spanish) or de.po (for German).

    -

    To create such a file for a new language, open the file -cmake/translations.cmake and add a language international code to this -line:

    +

    mrv2 can support multiple natural language translations. Currently, English and Spanish are supported. The translation system used is gettext so familiarity with it is desired (albeit not essential). The translations reside in mrv2/po and follow internationalization language code files, like es.po (for Spanish) or de.po (for German).

    +

    To create such a file for a new language, open the file cmake/translations.cmake and add a language international code to this line:

    set( LANGUAGES es ) # add a new language code inside the parenthesis, like "de".

    Then, run:

    ./runmeq.sh -t po
    -

    If there’s no .po file for that language yet, gettext’s msginit -command will be run for you. You may be asked for your email address as -part of the process.

    +

    If there’s no .po file for that language yet, gettext’s msginit command will be run for you. You may be asked for your email address as part of the process.

    Go to mrv2/po/{lang}.po where lang is the language you added.

    and edit the text. Make sure to change the charset to UTF-8.

    -

    Note that you should use an editor that can write in Unicode (UTF-8) -to write non-Occidental languages.

    -

    You need to edit “msgstr” strings and leave “msgid” untouched as a -reference. If the comment has a “fuzzy” string it means gettext tried to -guess the translation, but it will not use it. Remove the fuzzy -qualifier and change the “msgstr” string. Note that if the “msgid” has -new-lines you need to match them too. Refer to the gettext manual for -further information.

    +

    Note that you should use an editor that can write in Unicode (UTF-8) to write non-Occidental languages.

    +

    You need to edit “msgstr” strings and leave “msgid” untouched as a reference. If the comment has a “fuzzy” string it means gettext tried to guess the translation, but it will not use it. Remove the fuzzy qualifier and change the “msgstr” string. Note that if the “msgid” has new-lines you need to match them too. Refer to the gettext manual for further information.

    Once you are ready to test your translation, run:

    ./runmeq.sh -t mo

    That will create the .mo files for your language.

    @@ -423,49 +292,28 @@

    If you compiled mrv2

    ./runmeq.sh -t install

    or just:

    ./runmeq.sh
    -

    and that will place the .mo files in the: BUILD−OS-ARCH/BUILD_TYPE/install/share/locale -directory.

    -

    If you add or remove strings as part of your code changes, you may -want to regenerate the .pot files after a while, before calling -t mo. -To do so:

    +

    and that will place the .mo files in the: BUILD−OS-ARCH/BUILD_TYPE/install/share/locale directory.

    +

    If you add or remove strings as part of your code changes, you may want to regenerate the .pot files after a while, before calling -t mo. To do so:

    ./runmeq.sh -t pot
    -

    Note that this change is dramatic as your commits of the code changes -will get mangled with all the .pot/.po comments, preventing a clean PR -(Pull Request) on github.com.

    +

    Note that this change is dramatic as your commits of the code changes will get mangled with all the .pot/.po comments, preventing a clean PR (Pull Request) on github.com.

    If you did not compile mrv2

    -

    Manually copy the .mo to your installed mrv2 directory. Make sure the -VERSION matches.

    +

    Manually copy the .mo to your installed mrv2 directory. Make sure the VERSION matches.

    cp mrv2/share/locale/${lang}/LC_MESSAGES/mrv2-v${VERSION}.mo ${installed_location of mrv2)/hare/locale/${lang}/LC_MESSAGES/

    Translating on Windows

    -

    On Windows, besides the text of mrv2, you also need to translate the -text for the NSIS .exe installer.

    -

    You can do it by editing the cmake/nsis/mrv2_translations.nsh file. -Just follow the examples in that file.

    +

    On Windows, besides the text of mrv2, you also need to translate the text for the NSIS .exe installer.

    +

    You can do it by editing the cmake/nsis/mrv2_translations.nsh file. Just follow the examples in that file.

    Packaging

    -

    Once you build mrv2 and tested that it runs, you might want to create -a package for distribution. On macOS, this is a .dmg file. On Linux it -is a RPM, DEB or TGZ file. On Windows it is a ZIP or an NSIS EXE -installer.

    +

    Once you build mrv2 and tested that it runs, you might want to create a package for distribution. On macOS, this is a .dmg file. On Linux it is a RPM, DEB or TGZ file. On Windows it is a ZIP or an NSIS EXE installer.

    To do so, from the main dir of mrv2, you have to do:

    ./runmeq.sh -t package

    For all architectures, the installers will be stored in:

    packages/

    That is the root directory of mrv2.

    Developing

    -

    If you want to become a developer, first familiarize yourself with -the build process. Then clone the repository to your github account and -send PRs. If you become an avid developer, you can then request access -to the main repository.

    -

    One additional thing that you will need for making commits to the -repository, is:

    +

    If you want to become a developer, first familiarize yourself with the build process. Then clone the repository to your github account and send PRs. If you become an avid developer, you can then request access to the main repository.

    +

    One additional thing that you will need for making commits to the repository, is:

    clang-format
    -

    This is part of the LLVM project, you can download it from your usual -repositories (apt, brew, etc.), or from:

    -

    LLVM Main Download -Page

    -

    This utility verifies previous to a commit that all the C++ -formatting follows the standard used in mrv2.

    -

    You might also want to get Doxygen so as to get the source code -documentation in docs/Doxygen.

    +

    This is part of the LLVM project, you can download it from your usual repositories (apt, brew, etc.), or from:

    +

    LLVM Main Download Page

    +

    This utility verifies previous to a commit that all the C++ formatting follows the standard used in mrv2.

    +

    You might also want to get Doxygen so as to get the source code documentation in docs/Doxygen.

    diff --git a/mrv2/python/demos/fltk/unsure/sudoku.py b/mrv2/python/demos/fltk/sudoku.py similarity index 100% rename from mrv2/python/demos/fltk/unsure/sudoku.py rename to mrv2/python/demos/fltk/sudoku.py From da62c6196a6da5c8c7b6d643fa49e77bcaf3c07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sun, 8 Oct 2023 05:42:30 -0300 Subject: [PATCH 6/6] Made .githooks/pre-commit more verbose. --- .githooks/pre-commit | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 04af88dd2..d430e4bcc 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -13,16 +13,18 @@ do fi else echo "Skipping formatting of $FILE" - if [[ $FILE == *.sh || $FILE == .py || $FILE == .rb || + if [[ $FILE == *.sh || $FILE == *.py || $FILE == *.rb || $FILE == *pre-commit ]]; then if [[ -e $FILE ]]; then + echo "Changing $FILE permissions to 0755" chmod 0755 $FILE fi else if [[ -d $FILE ]]; then chmod 0755 $FILE elif [[ -e $FILE ]]; then - chmod 0644 $FILE + echo "Changing $FILE permissions to 0644" + chmod 0644 $FILE fi fi fi