From: Carl Hetherington Date: Thu, 6 Nov 2014 11:55:05 +0000 (+0000) Subject: Forward-port move of content description generation to lib/ rather than wx/. X-Git-Tag: v2.0.48~505^2 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2734637c959928a7d412c709cc3433357418ae03;hp=b17b68bb8e564601c7ea80ceea853fa564998c39 Forward-port move of content description generation to lib/ rather than wx/. --- diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index d02728b00..988090bf8 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -33,6 +33,9 @@ using std::string; using std::cout; using std::vector; +using std::stringstream; +using std::fixed; +using std::setprecision; using boost::shared_ptr; using boost::dynamic_pointer_cast; using dcp::raw_convert; @@ -236,3 +239,22 @@ AudioContent::processed_audio_channels () const return audio_processor()->out_channels (audio_channels ()); } +string +AudioContent::processing_description () const +{ + stringstream d; + + if (audio_frame_rate() != resampled_audio_frame_rate ()) { + stringstream from; + from << fixed << setprecision(3) << (audio_frame_rate() / 1000.0); + stringstream to; + to << fixed << setprecision(3) << (resampled_audio_frame_rate() / 1000.0); + + d << String::compose (_("Audio will be resampled from %1kHz to %2kHz."), from.str(), to.str()); + } else { + d << _("Audio will not be resampled."); + } + + return d.str (); +} + diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h index 57085a765..f4a537b30 100644 --- a/src/lib/audio_content.h +++ b/src/lib/audio_content.h @@ -98,6 +98,8 @@ public: boost::mutex::scoped_lock lm (_mutex); return _audio_processor; } + + std::string processing_description () const; private: /** Gain to apply to audio in dB */ diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po index d24391f6f..30a753bc1 100644 --- a/src/lib/po/de_DE.po +++ b/src/lib/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-07-13 02:32+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" @@ -38,7 +38,7 @@ msgstr "%1 Kanäle, %2kHz, %3 samples" msgid "%1 frames; %2 frames per second" msgstr "%1 Bilder; %2 Bilder pro Sekunde" -#: src/lib/video_content.cc:247 +#: src/lib/video_content.cc:250 msgid "%1x%2 pixels (%3:1)" msgstr "%1x%2 pixel (%3:1)" @@ -86,6 +86,14 @@ msgstr "Audio analysieren" msgid "Area" msgstr "Bereich" +#: src/lib/audio_content.cc:253 +msgid "Audio will be resampled from %1kHz to %2kHz." +msgstr "" + +#: src/lib/audio_content.cc:255 +msgid "Audio will not be resampled." +msgstr "" + #: src/lib/scaler.cc:62 msgid "Bicubic" msgstr "Bi-Kubisch" @@ -126,38 +134,42 @@ msgstr "Bildübersicht berechnen" msgid "Content and DCP have the same rate.\n" msgstr "Quelle und DCP haben dieselbe Bildrate. Gut ;-)\n" +#: src/lib/video_content.cc:566 +msgid "Content frame rate" +msgstr "Inhalt Bildrate" + #: src/lib/subtitle_content.cc:103 #, fuzzy msgid "Content to be joined must have the same 'use subtitles' setting." msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden." -#: src/lib/audio_content.cc:100 +#: src/lib/audio_content.cc:103 msgid "Content to be joined must have the same audio delay." msgstr "Zu verbindende Inhalte müssen die gleiche Tonverzögerung verwenden." -#: src/lib/audio_content.cc:96 +#: src/lib/audio_content.cc:99 msgid "Content to be joined must have the same audio gain." msgstr "" "Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden." -#: src/lib/video_content.cc:161 +#: src/lib/video_content.cc:164 msgid "Content to be joined must have the same colour conversion." msgstr "Zu verbindende Inhalte müssen die gleiche Farbumwandlung verwenden." -#: src/lib/video_content.cc:153 +#: src/lib/video_content.cc:156 msgid "Content to be joined must have the same crop." msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden." -#: src/lib/video_content.cc:165 +#: src/lib/video_content.cc:168 #, fuzzy msgid "Content to be joined must have the same fades." msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden." -#: src/lib/video_content.cc:141 +#: src/lib/video_content.cc:144 msgid "Content to be joined must have the same picture size." msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben." -#: src/lib/video_content.cc:157 +#: src/lib/video_content.cc:160 msgid "Content to be joined must have the same scale setting." msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden." @@ -183,11 +195,11 @@ msgstr "" msgid "Content to be joined must have the same subtitle Y scale." msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden." -#: src/lib/video_content.cc:145 +#: src/lib/video_content.cc:148 msgid "Content to be joined must have the same video frame rate." msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben." -#: src/lib/video_content.cc:149 +#: src/lib/video_content.cc:152 msgid "Content to be joined must have the same video frame type." msgstr "Zu verbindende Inhalte müssen den gleichen Bildtyp (z.B. 2D) haben." @@ -200,6 +212,10 @@ msgstr "" msgid "Content to be joined must use the same subtitle stream." msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelspur verwenden." +#: src/lib/video_content.cc:524 +msgid "Content video is %1x%2" +msgstr "Inhalt Video ist %1x%2" + #: src/lib/scp_dcp_job.cc:111 msgid "Copy DCP to TMS" msgstr "DCP zu TMS übertragen" @@ -243,6 +259,10 @@ msgstr "SCP Session (%1) konnte nicht gestartet werden" msgid "Could not write to remote file (%1)" msgstr "Entfernte Datei (%1) konnte nicht gespeichert werden" +#: src/lib/video_content.cc:535 +msgid "Cropped to %1x%2" +msgstr "Beschnitten zu %1x%2" + #: src/lib/dcp_subtitle_content.cc:72 msgid "DCP XML subtitles" msgstr "" @@ -479,6 +499,10 @@ msgstr "Zuwenig Speicher" msgid "Overcomplete wavelet denoiser" msgstr "Überbestimmte Wavelet Entrauschung" +#: src/lib/video_content.cc:559 +msgid "Padded with black to %1x%2" +msgstr "Mit Schwarz gefüllt auf %1x%2" + #: src/lib/dcp_content_type.cc:51 msgid "Policy" msgstr "Vorschrift" @@ -515,6 +539,10 @@ msgstr "Surround rechts" msgid "SSH error (%1)" msgstr "SSH Fehler (%1)" +#: src/lib/video_content.cc:550 +msgid "Scaled to %1x%2" +msgstr "Skaliert auf %1x%2" + #: src/lib/ratio.cc:41 msgid "Scope" msgstr "Scope" @@ -615,7 +643,7 @@ msgstr "Ungültiges Bildformat vom Server erhalten" msgid "Unknown error" msgstr "Unbekannter Fehler" -#: src/lib/ffmpeg_decoder.cc:263 +#: src/lib/ffmpeg_decoder.cc:264 msgid "Unrecognised audio sample format (%1)" msgstr "Ton Sample Format (%1) nicht erkannt." @@ -783,7 +811,7 @@ msgstr "Benötigte Einstellung %1 fehlt" msgid "moving" msgstr "wird verschoben" -#: src/lib/ffmpeg_decoder.cc:420 +#: src/lib/ffmpeg_decoder.cc:431 msgid "multi-part subtitles not yet supported" msgstr "Mehr-Segment Untertitel werden noch nicht unterstützt" @@ -797,7 +825,7 @@ msgstr "Name" msgid "remaining" msgstr "verbleibend" -#: src/lib/config.cc:90 src/lib/video_content.cc:204 +#: src/lib/config.cc:90 src/lib/video_content.cc:207 msgid "sRGB" msgstr "sRGB" diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po index ae02808d4..fac36332c 100644 --- a/src/lib/po/es_ES.po +++ b/src/lib/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: LIBDCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-10-24 16:11-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@ -37,7 +37,7 @@ msgstr "%1 canales, %2kHz, %3 muestras" msgid "%1 frames; %2 frames per second" msgstr "%1 imágenes; %2 imágenes per second" -#: src/lib/video_content.cc:247 +#: src/lib/video_content.cc:250 msgid "%1x%2 pixels (%3:1)" msgstr "%1x%2 pixels (%3:1)" @@ -85,6 +85,14 @@ msgstr "Analizar audio" msgid "Area" msgstr "Área" +#: src/lib/audio_content.cc:253 +msgid "Audio will be resampled from %1kHz to %2kHz." +msgstr "" + +#: src/lib/audio_content.cc:255 +msgid "Audio will not be resampled." +msgstr "" + #: src/lib/scaler.cc:62 msgid "Bicubic" msgstr "Bicúbico" @@ -125,35 +133,39 @@ msgstr "Calculando la firma resumen de imagen" msgid "Content and DCP have the same rate.\n" msgstr "La fuente y el DCP tienen la misma velocidad.\n" +#: src/lib/video_content.cc:566 +msgid "Content frame rate" +msgstr "Velocidad del contenido" + #: src/lib/subtitle_content.cc:103 msgid "Content to be joined must have the same 'use subtitles' setting." msgstr "Para unir contenido debe tener la misma opción 'usar subtítulos'." -#: src/lib/audio_content.cc:100 +#: src/lib/audio_content.cc:103 msgid "Content to be joined must have the same audio delay." msgstr "Para unir contenido debe tener el mismo retardo de audio." -#: src/lib/audio_content.cc:96 +#: src/lib/audio_content.cc:99 msgid "Content to be joined must have the same audio gain." msgstr "Para unir contenido debe tener la misma ganancia de audio." -#: src/lib/video_content.cc:161 +#: src/lib/video_content.cc:164 msgid "Content to be joined must have the same colour conversion." msgstr "Para unir contenido debe tener la misma conversión de color." -#: src/lib/video_content.cc:153 +#: src/lib/video_content.cc:156 msgid "Content to be joined must have the same crop." msgstr "Para unir contenido debe tener el mismo recorte." -#: src/lib/video_content.cc:165 +#: src/lib/video_content.cc:168 msgid "Content to be joined must have the same fades." msgstr "Para unir contenido debe tener los mismos fundidos." -#: src/lib/video_content.cc:141 +#: src/lib/video_content.cc:144 msgid "Content to be joined must have the same picture size." msgstr "Para unir contenido debe tener el mismo tamaño de imagen." -#: src/lib/video_content.cc:157 +#: src/lib/video_content.cc:160 msgid "Content to be joined must have the same scale setting." msgstr "Para unir contenido debe tener la misma redimensión." @@ -176,11 +188,11 @@ msgstr "" msgid "Content to be joined must have the same subtitle Y scale." msgstr "Para unir contenido debe tener la misma redimensión de subtítulo en Y." -#: src/lib/video_content.cc:145 +#: src/lib/video_content.cc:148 msgid "Content to be joined must have the same video frame rate." msgstr "Para unir contenido debe tener la misma velocidad de imagen." -#: src/lib/video_content.cc:149 +#: src/lib/video_content.cc:152 msgid "Content to be joined must have the same video frame type." msgstr "Para unir contenido debe tener el mismo tamaño de imagen." @@ -192,6 +204,10 @@ msgstr "Para unir contenido debe usar el mismo tipo de audio." msgid "Content to be joined must use the same subtitle stream." msgstr "Para unir contenido debe tener el mismo tipo de subtítulos." +#: src/lib/video_content.cc:524 +msgid "Content video is %1x%2" +msgstr "El video es %1x%2" + #: src/lib/scp_dcp_job.cc:111 msgid "Copy DCP to TMS" msgstr "Copiar DCP al TMS" @@ -234,6 +250,10 @@ msgstr "No se pudo iniciar la sesión SCP (%1)" msgid "Could not write to remote file (%1)" msgstr "No se pudo escribir el fichero remoto (%1)" +#: src/lib/video_content.cc:535 +msgid "Cropped to %1x%2" +msgstr "Recortado a %1x%2" + #: src/lib/dcp_subtitle_content.cc:72 msgid "DCP XML subtitles" msgstr "Subtítulos DCP XML" @@ -466,6 +486,10 @@ msgstr "Falta de memoria" msgid "Overcomplete wavelet denoiser" msgstr "Overcomplete wavelet denoiser" +#: src/lib/video_content.cc:559 +msgid "Padded with black to %1x%2" +msgstr "Completado con negro hasta %1x%2" + #: src/lib/dcp_content_type.cc:51 msgid "Policy" msgstr "Policy" @@ -502,6 +526,10 @@ msgstr "Surround derecha" msgid "SSH error (%1)" msgstr "error SSH (%1)" +#: src/lib/video_content.cc:550 +msgid "Scaled to %1x%2" +msgstr "Redimensionado a %1x%2" + #: src/lib/ratio.cc:41 msgid "Scope" msgstr "Scope" @@ -604,7 +632,7 @@ msgstr "El servidor recibió un tipo de imagen inesperada" msgid "Unknown error" msgstr "Error desconocido" -#: src/lib/ffmpeg_decoder.cc:263 +#: src/lib/ffmpeg_decoder.cc:264 msgid "Unrecognised audio sample format (%1)" msgstr "Formato de audio desconocido (%1)" @@ -772,7 +800,7 @@ msgstr "falta una configuración obligatoria %1" msgid "moving" msgstr "moviendo" -#: src/lib/ffmpeg_decoder.cc:420 +#: src/lib/ffmpeg_decoder.cc:431 msgid "multi-part subtitles not yet supported" msgstr "todavía no se soportan subtítulos en múltiples partes" @@ -786,7 +814,7 @@ msgstr "nombre" msgid "remaining" msgstr "pendiente" -#: src/lib/config.cc:90 src/lib/video_content.cc:204 +#: src/lib/config.cc:90 src/lib/video_content.cc:207 msgid "sRGB" msgstr "sRGB" diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index 3e72cf2c0..3b2ba6714 100644 --- a/src/lib/po/fr_FR.po +++ b/src/lib/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-07-14 12:04+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" @@ -37,7 +37,7 @@ msgstr "%1 canaux, %2kHz, %3 échantillons" msgid "%1 frames; %2 frames per second" msgstr "%1 images ; %2 images par seconde" -#: src/lib/video_content.cc:247 +#: src/lib/video_content.cc:250 msgid "%1x%2 pixels (%3:1)" msgstr "%1x%2 pixels (%3:1)" @@ -85,6 +85,14 @@ msgstr "Analyse audio" msgid "Area" msgstr "Surface" +#: src/lib/audio_content.cc:253 +msgid "Audio will be resampled from %1kHz to %2kHz." +msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz." + +#: src/lib/audio_content.cc:255 +msgid "Audio will not be resampled." +msgstr "" + #: src/lib/scaler.cc:62 msgid "Bicubic" msgstr "Bicubique" @@ -125,38 +133,42 @@ msgstr "Fabrication rendu image" msgid "Content and DCP have the same rate.\n" msgstr "Le DCP et la source ont la même cadence image.\n" +#: src/lib/video_content.cc:566 +msgid "Content frame rate" +msgstr "Cadence du contenu" + #: src/lib/subtitle_content.cc:103 #, fuzzy msgid "Content to be joined must have the same 'use subtitles' setting." msgstr "" "Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle" -#: src/lib/audio_content.cc:100 +#: src/lib/audio_content.cc:103 msgid "Content to be joined must have the same audio delay." msgstr "Le contenu à ajouter doit présenter le même délais audio" -#: src/lib/audio_content.cc:96 +#: src/lib/audio_content.cc:99 msgid "Content to be joined must have the same audio gain." msgstr "Le contenu à ajouter doit avoir le même gain audio" -#: src/lib/video_content.cc:161 +#: src/lib/video_content.cc:164 msgid "Content to be joined must have the same colour conversion." msgstr "Le contenu à ajouter doit avoir le même type de conversion couleur" -#: src/lib/video_content.cc:153 +#: src/lib/video_content.cc:156 msgid "Content to be joined must have the same crop." msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage" -#: src/lib/video_content.cc:165 +#: src/lib/video_content.cc:168 #, fuzzy msgid "Content to be joined must have the same fades." msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage" -#: src/lib/video_content.cc:141 +#: src/lib/video_content.cc:144 msgid "Content to be joined must have the same picture size." msgstr "Le contenu à ajouter doit avoir la même taille d'image" -#: src/lib/video_content.cc:157 +#: src/lib/video_content.cc:160 msgid "Content to be joined must have the same scale setting." msgstr "" "Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle" @@ -183,11 +195,11 @@ msgstr "" msgid "Content to be joined must have the same subtitle Y scale." msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre" -#: src/lib/video_content.cc:145 +#: src/lib/video_content.cc:148 msgid "Content to be joined must have the same video frame rate." msgstr "Le contenu à ajouter doit avoir la même cadence d'images" -#: src/lib/video_content.cc:149 +#: src/lib/video_content.cc:152 msgid "Content to be joined must have the same video frame type." msgstr "Le contenu à ajouter doit avoir le même type de trame vidéo" @@ -199,6 +211,10 @@ msgstr "Le contenu à ajouter doit avoir le même flux audio" msgid "Content to be joined must use the same subtitle stream." msgstr "Le contenu à ajouter doit avoir le même flux sous titre" +#: src/lib/video_content.cc:524 +msgid "Content video is %1x%2" +msgstr "Le contenu vidéo est %1x%2" + #: src/lib/scp_dcp_job.cc:111 msgid "Copy DCP to TMS" msgstr "Copier le DCP dans le TMS" @@ -242,6 +258,10 @@ msgstr "Démarrage de session SCP (%1) impossible" msgid "Could not write to remote file (%1)" msgstr "Écriture vers fichier distant (%1) impossible" +#: src/lib/video_content.cc:535 +msgid "Cropped to %1x%2" +msgstr "Rognage de %1x%2" + #: src/lib/dcp_subtitle_content.cc:72 msgid "DCP XML subtitles" msgstr "" @@ -473,6 +493,10 @@ msgstr "Hors capacité mémoire" msgid "Overcomplete wavelet denoiser" msgstr "Réduction de bruit par ondelettes" +#: src/lib/video_content.cc:559 +msgid "Padded with black to %1x%2" +msgstr "Enveloppe noire de %1x%2" + #: src/lib/dcp_content_type.cc:51 msgid "Policy" msgstr "Policy" @@ -509,6 +533,10 @@ msgstr "Arrière droite" msgid "SSH error (%1)" msgstr "Erreur SSH (%1)" +#: src/lib/video_content.cc:550 +msgid "Scaled to %1x%2" +msgstr "Mis à l'échelle de %1x%2" + #: src/lib/ratio.cc:41 msgid "Scope" msgstr "Scope" @@ -608,7 +636,7 @@ msgstr "Type d'image non conforme reçu par le serveur" msgid "Unknown error" msgstr "Erreur inconnue" -#: src/lib/ffmpeg_decoder.cc:263 +#: src/lib/ffmpeg_decoder.cc:264 msgid "Unrecognised audio sample format (%1)" msgstr "Échantillonnage audio (%1) inconnu" @@ -778,7 +806,7 @@ msgstr "paramètre %1 manquant" msgid "moving" msgstr "déplacement" -#: src/lib/ffmpeg_decoder.cc:420 +#: src/lib/ffmpeg_decoder.cc:431 msgid "multi-part subtitles not yet supported" msgstr "sous-titres en plusieurs parties non supportés" @@ -792,7 +820,7 @@ msgstr "nom" msgid "remaining" msgstr "restant" -#: src/lib/config.cc:90 src/lib/video_content.cc:204 +#: src/lib/config.cc:90 src/lib/video_content.cc:207 msgid "sRGB" msgstr "sRGB" diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po index e149f083f..8815005fb 100644 --- a/src/lib/po/it_IT.po +++ b/src/lib/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-02-03 10:48+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" @@ -37,7 +37,7 @@ msgstr "" msgid "%1 frames; %2 frames per second" msgstr "%1 fotogrammi; %2 fotogrammi al secondo" -#: src/lib/video_content.cc:247 +#: src/lib/video_content.cc:250 msgid "%1x%2 pixels (%3:1)" msgstr "" @@ -86,6 +86,14 @@ msgstr "Analizzo l'audio di %1" msgid "Area" msgstr "Area" +#: src/lib/audio_content.cc:253 +msgid "Audio will be resampled from %1kHz to %2kHz." +msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz" + +#: src/lib/audio_content.cc:255 +msgid "Audio will not be resampled." +msgstr "" + #: src/lib/scaler.cc:62 msgid "Bicubic" msgstr "Bicubica" @@ -127,39 +135,44 @@ msgstr "" msgid "Content and DCP have the same rate.\n" msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n" +#: src/lib/video_content.cc:566 +#, fuzzy +msgid "Content frame rate" +msgstr "tipo di contenuto" + #: src/lib/subtitle_content.cc:103 #, fuzzy msgid "Content to be joined must have the same 'use subtitles' setting." msgstr "" "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli." -#: src/lib/audio_content.cc:100 +#: src/lib/audio_content.cc:103 msgid "Content to be joined must have the same audio delay." msgstr "" -#: src/lib/audio_content.cc:96 +#: src/lib/audio_content.cc:99 msgid "Content to be joined must have the same audio gain." msgstr "" -#: src/lib/video_content.cc:161 +#: src/lib/video_content.cc:164 msgid "Content to be joined must have the same colour conversion." msgstr "" -#: src/lib/video_content.cc:153 +#: src/lib/video_content.cc:156 msgid "Content to be joined must have the same crop." msgstr "" -#: src/lib/video_content.cc:165 +#: src/lib/video_content.cc:168 #, fuzzy msgid "Content to be joined must have the same fades." msgstr "" "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli." -#: src/lib/video_content.cc:141 +#: src/lib/video_content.cc:144 msgid "Content to be joined must have the same picture size." msgstr "" -#: src/lib/video_content.cc:157 +#: src/lib/video_content.cc:160 #, fuzzy msgid "Content to be joined must have the same scale setting." msgstr "" @@ -187,11 +200,11 @@ msgid "Content to be joined must have the same subtitle Y scale." msgstr "" "Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli." -#: src/lib/video_content.cc:145 +#: src/lib/video_content.cc:148 msgid "Content to be joined must have the same video frame rate." msgstr "" -#: src/lib/video_content.cc:149 +#: src/lib/video_content.cc:152 msgid "Content to be joined must have the same video frame type." msgstr "" @@ -203,6 +216,10 @@ msgstr "" msgid "Content to be joined must use the same subtitle stream." msgstr "" +#: src/lib/video_content.cc:524 +msgid "Content video is %1x%2" +msgstr "Il video originale è %1x%2" + #: src/lib/scp_dcp_job.cc:111 msgid "Copy DCP to TMS" msgstr "Copia del DCP al TMS" @@ -247,6 +264,10 @@ msgstr "Non posso avviare la sessione SCP (%1)" msgid "Could not write to remote file (%1)" msgstr "Non posso scrivere il file remoto (%1)" +#: src/lib/video_content.cc:535 +msgid "Cropped to %1x%2" +msgstr "Tagliato da %1x%2" + #: src/lib/dcp_subtitle_content.cc:72 msgid "DCP XML subtitles" msgstr "" @@ -482,6 +503,10 @@ msgstr "" msgid "Overcomplete wavelet denoiser" msgstr "Overcomplete wavelet denoiser" +#: src/lib/video_content.cc:559 +msgid "Padded with black to %1x%2" +msgstr "Riempito con nero a %1x%2" + #: src/lib/dcp_content_type.cc:51 msgid "Policy" msgstr "Politica" @@ -520,6 +545,10 @@ msgstr "Surround destro" msgid "SSH error (%1)" msgstr "Errore SSH (%1)" +#: src/lib/video_content.cc:550 +msgid "Scaled to %1x%2" +msgstr "Scalato a %1x%2" + #: src/lib/ratio.cc:41 msgid "Scope" msgstr "Scope" @@ -623,7 +652,7 @@ msgstr "" msgid "Unknown error" msgstr "Errore sconosciuto" -#: src/lib/ffmpeg_decoder.cc:263 +#: src/lib/ffmpeg_decoder.cc:264 msgid "Unrecognised audio sample format (%1)" msgstr "Formato di campionamento audio non riconosciuto (%1)" @@ -794,7 +823,7 @@ msgstr "persa la regolazione richiesta %1" msgid "moving" msgstr "" -#: src/lib/ffmpeg_decoder.cc:420 +#: src/lib/ffmpeg_decoder.cc:431 msgid "multi-part subtitles not yet supported" msgstr "sottotitoli multi-part non ancora supportati" @@ -808,7 +837,7 @@ msgstr "nome" msgid "remaining" msgstr "restano" -#: src/lib/config.cc:90 src/lib/video_content.cc:204 +#: src/lib/config.cc:90 src/lib/video_content.cc:207 msgid "sRGB" msgstr "sRGB" diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po index 4d9287fad..5d2e51f33 100644 --- a/src/lib/po/nl_NL.po +++ b/src/lib/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-09-04 20:34+0100\n" "Last-Translator: Cherif Ben Brahim \n" "Language-Team: UniversalDV \n" @@ -38,7 +38,7 @@ msgstr "%1 kanalen, %2kHz, %3 samples" msgid "%1 frames; %2 frames per second" msgstr "%1 frames; %2 frames per seconde" -#: src/lib/video_content.cc:247 +#: src/lib/video_content.cc:250 msgid "%1x%2 pixels (%3:1)" msgstr "%1x%2 pixels (%3:1)" @@ -86,6 +86,14 @@ msgstr "Analyseer audio" msgid "Area" msgstr "Gebied" +#: src/lib/audio_content.cc:253 +msgid "Audio will be resampled from %1kHz to %2kHz." +msgstr "" + +#: src/lib/audio_content.cc:255 +msgid "Audio will not be resampled." +msgstr "" + #: src/lib/scaler.cc:62 msgid "Bicubic" msgstr "Bicubic" @@ -126,37 +134,41 @@ msgstr "Verwerk video data" msgid "Content and DCP have the same rate.\n" msgstr "Inhoud en DCP hebben dezelfde framerate .\n" +#: src/lib/video_content.cc:566 +msgid "Content frame rate" +msgstr "Content frame rate" + #: src/lib/subtitle_content.cc:103 #, fuzzy msgid "Content to be joined must have the same 'use subtitles' setting." msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben." -#: src/lib/audio_content.cc:100 +#: src/lib/audio_content.cc:103 msgid "Content to be joined must have the same audio delay." msgstr "Toegevoegde bestanden moeten dezelfde audio vertraging hebben." -#: src/lib/audio_content.cc:96 +#: src/lib/audio_content.cc:99 msgid "Content to be joined must have the same audio gain." msgstr "Toegevoegde bestanden moeten dezelfde audio gain hebben." -#: src/lib/video_content.cc:161 +#: src/lib/video_content.cc:164 msgid "Content to be joined must have the same colour conversion." msgstr "Toegevoegde bestanden moeten dezelfde kleurindeling hebben." -#: src/lib/video_content.cc:153 +#: src/lib/video_content.cc:156 msgid "Content to be joined must have the same crop." msgstr "Toegevoegde bestanden moeten dezelfde crop hebben." -#: src/lib/video_content.cc:165 +#: src/lib/video_content.cc:168 #, fuzzy msgid "Content to be joined must have the same fades." msgstr "Toegevoegde bestanden moeten dezelfde crop hebben." -#: src/lib/video_content.cc:141 +#: src/lib/video_content.cc:144 msgid "Content to be joined must have the same picture size." msgstr "Toegevoegde bestanden moeten dezelfde grootte hebben." -#: src/lib/video_content.cc:157 +#: src/lib/video_content.cc:160 msgid "Content to be joined must have the same scale setting." msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben." @@ -178,11 +190,11 @@ msgstr "Toegevoegde bestanden moeten dezelfde ondertitel Y offset hebben." msgid "Content to be joined must have the same subtitle Y scale." msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben." -#: src/lib/video_content.cc:145 +#: src/lib/video_content.cc:148 msgid "Content to be joined must have the same video frame rate." msgstr "Toegevoegde bestanden moeten dezelfde video frame rate hebben." -#: src/lib/video_content.cc:149 +#: src/lib/video_content.cc:152 msgid "Content to be joined must have the same video frame type." msgstr "Toegevoegde bestanden moeten dezelfde video formaat hebben." @@ -194,6 +206,10 @@ msgstr "Toegevoegde bestanden moeten dezelfde audio stream gebruiken." msgid "Content to be joined must use the same subtitle stream." msgstr "Toegevoegde bestanden moeten dezelfde ondertitel stream gebruiken." +#: src/lib/video_content.cc:524 +msgid "Content video is %1x%2" +msgstr "Content video is %1x%2" + #: src/lib/scp_dcp_job.cc:111 msgid "Copy DCP to TMS" msgstr "Kopieer DCP to TMS" @@ -237,6 +253,10 @@ msgstr "Kan SCP sessie niet starten (%1)" msgid "Could not write to remote file (%1)" msgstr "Kan niet schrijven naar bestand op FTP server" +#: src/lib/video_content.cc:535 +msgid "Cropped to %1x%2" +msgstr "Cropped naar %1x%2" + #: src/lib/dcp_subtitle_content.cc:72 msgid "DCP XML subtitles" msgstr "" @@ -473,6 +493,10 @@ msgstr "Te weinig geheugen" msgid "Overcomplete wavelet denoiser" msgstr "Overcomplete wavelet denoiser" +#: src/lib/video_content.cc:559 +msgid "Padded with black to %1x%2" +msgstr "Opgevuld met zwart tot %1x%2" + #: src/lib/dcp_content_type.cc:51 msgid "Policy" msgstr "Beleid" @@ -509,6 +533,10 @@ msgstr "Rechts surround" msgid "SSH error (%1)" msgstr "SSH fout (%1)" +#: src/lib/video_content.cc:550 +msgid "Scaled to %1x%2" +msgstr "Geschaald naar %1x%2" + #: src/lib/ratio.cc:41 msgid "Scope" msgstr "Gebied" @@ -608,7 +636,7 @@ msgstr "Onverwacht beeldtype ontvangen door server" msgid "Unknown error" msgstr "Onbekende fout" -#: src/lib/ffmpeg_decoder.cc:263 +#: src/lib/ffmpeg_decoder.cc:264 msgid "Unrecognised audio sample format (%1)" msgstr "Niet herkenbaar audio sample formaat (%1)" @@ -776,7 +804,7 @@ msgstr "ontbrekende verplichte setting %1" msgid "moving" msgstr "bewegend" -#: src/lib/ffmpeg_decoder.cc:420 +#: src/lib/ffmpeg_decoder.cc:431 msgid "multi-part subtitles not yet supported" msgstr "ondertitels met meerdere delen worden nog niet ondersteund." @@ -790,7 +818,7 @@ msgstr "naam" msgid "remaining" msgstr "resterend" -#: src/lib/config.cc:90 src/lib/video_content.cc:204 +#: src/lib/config.cc:90 src/lib/video_content.cc:207 msgid "sRGB" msgstr "sRGB" diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po index b8b452bf0..d4bccb1ef 100644 --- a/src/lib/po/sv_SE.po +++ b/src/lib/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@ -37,7 +37,7 @@ msgstr "%1 kanaler, %2kHz, %3 sampel" msgid "%1 frames; %2 frames per second" msgstr "%1 bilder; %2 bilder per sekund" -#: src/lib/video_content.cc:247 +#: src/lib/video_content.cc:250 msgid "%1x%2 pixels (%3:1)" msgstr "%1x%2 pixlar (%3:1)" @@ -85,6 +85,14 @@ msgstr "Analysera audio" msgid "Area" msgstr "Yta" +#: src/lib/audio_content.cc:253 +msgid "Audio will be resampled from %1kHz to %2kHz." +msgstr "Audio kommer att samplas om från %1kHz till %2kHz." + +#: src/lib/audio_content.cc:255 +msgid "Audio will not be resampled." +msgstr "" + #: src/lib/scaler.cc:62 msgid "Bicubic" msgstr "Bikubisk" @@ -125,37 +133,42 @@ msgstr "Beräknar bildsammanfattning" msgid "Content and DCP have the same rate.\n" msgstr "Källa och DCP har samma bildfrekvens.\n" +#: src/lib/video_content.cc:566 +#, fuzzy +msgid "Content frame rate" +msgstr "Innehållets bildhastighet" + #: src/lib/subtitle_content.cc:103 #, fuzzy msgid "Content to be joined must have the same 'use subtitles' setting." msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande." -#: src/lib/audio_content.cc:100 +#: src/lib/audio_content.cc:103 msgid "Content to be joined must have the same audio delay." msgstr "Innehåll som ska sammanfogas måste använda samma audiofördröjning." -#: src/lib/audio_content.cc:96 +#: src/lib/audio_content.cc:99 msgid "Content to be joined must have the same audio gain." msgstr "Innehåll som ska sammanfogas måste använda samma audioförstärkning." -#: src/lib/video_content.cc:161 +#: src/lib/video_content.cc:164 msgid "Content to be joined must have the same colour conversion." msgstr "Innehåll som ska sammanfogas måste använda samma färgkonvertering." -#: src/lib/video_content.cc:153 +#: src/lib/video_content.cc:156 msgid "Content to be joined must have the same crop." msgstr "Innehåll som ska sammanfogas måste använda samma beskärning." -#: src/lib/video_content.cc:165 +#: src/lib/video_content.cc:168 #, fuzzy msgid "Content to be joined must have the same fades." msgstr "Innehåll som ska sammanfogas måste använda samma beskärning." -#: src/lib/video_content.cc:141 +#: src/lib/video_content.cc:144 msgid "Content to be joined must have the same picture size." msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek." -#: src/lib/video_content.cc:157 +#: src/lib/video_content.cc:160 #, fuzzy msgid "Content to be joined must have the same scale setting." msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande." @@ -182,11 +195,11 @@ msgstr "" msgid "Content to be joined must have the same subtitle Y scale." msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten." -#: src/lib/video_content.cc:145 +#: src/lib/video_content.cc:148 msgid "Content to be joined must have the same video frame rate." msgstr "Innehåll som ska sammanfogas måste använda samma videobildhastighet." -#: src/lib/video_content.cc:149 +#: src/lib/video_content.cc:152 msgid "Content to be joined must have the same video frame type." msgstr "Innehåll som ska sammanfogas måste använda samma videobildtyp." @@ -198,6 +211,10 @@ msgstr "Innehåll som ska sammanfogas måste använda samma audioström." msgid "Content to be joined must use the same subtitle stream." msgstr "Innehåll som ska sammanfogas måste använda samma undertextström." +#: src/lib/video_content.cc:524 +msgid "Content video is %1x%2" +msgstr "Original-videon är %1x%2" + #: src/lib/scp_dcp_job.cc:111 msgid "Copy DCP to TMS" msgstr "Kopiera DCP till TMS" @@ -242,6 +259,10 @@ msgstr "Kunde inte starta SCP-session (%1)" msgid "Could not write to remote file (%1)" msgstr "Kunde inte skriva till fjärrfil (%1)" +#: src/lib/video_content.cc:535 +msgid "Cropped to %1x%2" +msgstr "Beskuren till %1x%2" + #: src/lib/dcp_subtitle_content.cc:72 msgid "DCP XML subtitles" msgstr "" @@ -475,6 +496,10 @@ msgstr "" msgid "Overcomplete wavelet denoiser" msgstr "Överkomplett wavelet-brusreducering" +#: src/lib/video_content.cc:559 +msgid "Padded with black to %1x%2" +msgstr "Svarta kanter tillagda för %1x%2" + #: src/lib/dcp_content_type.cc:51 msgid "Policy" msgstr "Policy" @@ -512,6 +537,10 @@ msgstr "Höger surround" msgid "SSH error (%1)" msgstr "SSH fel (%1)" +#: src/lib/video_content.cc:550 +msgid "Scaled to %1x%2" +msgstr "Skalad till %1x%2" + #: src/lib/ratio.cc:41 msgid "Scope" msgstr "Scope" @@ -614,7 +643,7 @@ msgid "Unknown error" msgstr "Okänt fel" # Svengelska -#: src/lib/ffmpeg_decoder.cc:263 +#: src/lib/ffmpeg_decoder.cc:264 msgid "Unrecognised audio sample format (%1)" msgstr "Okänt audio-sampelformat (%1)" @@ -786,7 +815,7 @@ msgstr "saknad nödvändig inställning %1" msgid "moving" msgstr "rörlig" -#: src/lib/ffmpeg_decoder.cc:420 +#: src/lib/ffmpeg_decoder.cc:431 msgid "multi-part subtitles not yet supported" msgstr "undertexter i flera delar stöds inte ännu" @@ -800,7 +829,7 @@ msgstr "namn" msgid "remaining" msgstr "återstående tid" -#: src/lib/config.cc:90 src/lib/video_content.cc:204 +#: src/lib/config.cc:90 src/lib/video_content.cc:207 msgid "sRGB" msgstr "sRGB" diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 98c3d929a..3470e62bf 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -53,6 +53,9 @@ using std::cout; using std::vector; using std::min; using std::max; +using std::stringstream; +using std::fixed; +using std::setprecision; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; @@ -509,3 +512,62 @@ VideoContent::fade (VideoFrame f) const return optional (); } + +string +VideoContent::processing_description () const +{ + /* stringstream is OK here as this string is just for presentation to the user */ + stringstream d; + + if (video_size().width && video_size().height) { + d << String::compose ( + _("Content video is %1x%2"), + video_size_after_3d_split().width, + video_size_after_3d_split().height + ); + + d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n"; + } + + if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) { + dcp::Size cropped = video_size_after_crop (); + d << String::compose ( + _("Cropped to %1x%2"), + cropped.width, cropped.height + ); + + d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n"; + } + + shared_ptr film = _film.lock (); + assert (film); + + dcp::Size const container_size = film->frame_size (); + dcp::Size const scaled = scale().size (dynamic_pointer_cast (shared_from_this ()), container_size, container_size, 1); + + if (scaled != video_size_after_crop ()) { + d << String::compose ( + _("Scaled to %1x%2"), + scaled.width, scaled.height + ); + + d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; + } + + if (scaled != container_size) { + d << String::compose ( + _("Padded with black to %1x%2"), + container_size.width, container_size.height + ); + + d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n"; + } + + d << _("Content frame rate"); + d << " " << fixed << setprecision(4) << video_frame_rate() << "\n"; + + FrameRateChange frc (video_frame_rate(), film->video_frame_rate ()); + d << frc.description () << "\n"; + + return d.str (); +} diff --git a/src/lib/video_content.h b/src/lib/video_content.h index b5936d16d..64112c1da 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -157,6 +157,8 @@ public: void scale_and_crop_to_fit_width (); void scale_and_crop_to_fit_height (); + std::string processing_description () const; + protected: void take_from_video_examiner (boost::shared_ptr); diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po index c856a0c34..3d5bc9587 100644 --- a/src/tools/po/de_DE.po +++ b/src/tools/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-07-13 03:04+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po index 9ed51d459..cce0320f4 100644 --- a/src/tools/po/es_ES.po +++ b/src/tools/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-10-24 20:18-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po index 6c850f56f..70db11a1b 100644 --- a/src/tools/po/fr_FR.po +++ b/src/tools/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-07-14 10:43+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po index fdfbac45a..c3132e8d4 100644 --- a/src/tools/po/it_IT.po +++ b/src/tools/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-02-03 09:36+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po index 06a850d15..f8d836a5b 100644 --- a/src/tools/po/nl_NL.po +++ b/src/tools/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-09-04 20:29+0100\n" "Last-Translator: Cherif Ben Brahim \n" "Language-Team: UniversalDV \n" diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po index bd13d7a3b..4d73e2059 100644 --- a/src/tools/po/sv_SE.po +++ b/src/tools/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index b7d6979d3..a2de484c0 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -268,16 +268,7 @@ AudioPanel::setup_description () return; } - shared_ptr acs = ac.front (); - if (acs->audio_frame_rate() != acs->resampled_audio_frame_rate ()) { - _description->SetLabel (wxString::Format ( - _("Audio will be resampled from %.3fkHz to %.3fkHz."), - acs->audio_frame_rate() / 1000.0, - acs->resampled_audio_frame_rate() / 1000.0 - )); - } else { - _description->SetLabel (_("Audio will not be resampled.")); - } + _description->SetLabel (std_to_wx (ac.front()->processing_description ())); } void diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po index bc47cbb52..a9a1e737f 100644 --- a/src/wx/po/de_DE.po +++ b/src/wx/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-07-13 03:08+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" @@ -53,11 +53,11 @@ msgstr "2D" msgid "2D version of content available in 3D" msgstr "2D Version eines Films, der auch in 3D verfügbar ist" -#: src/wx/dcp_panel.cc:607 +#: src/wx/dcp_panel.cc:617 msgid "2K" msgstr "2K" -#: src/wx/dcp_panel.cc:555 +#: src/wx/dcp_panel.cc:565 msgid "3D" msgstr "3D" @@ -81,10 +81,17 @@ msgstr "3D nur rechts" msgid "3D top/bottom" msgstr "3D Oben/Unten" -#: src/wx/dcp_panel.cc:608 +#: src/wx/dcp_panel.cc:618 msgid "4K" msgstr "4K" +#: src/wx/hints_dialog.cc:119 +msgid "" +"A few projectors have problems playing back very high bit-rate DCPs. It is " +"a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is " +"unlikely to have any visible effect on the image." +msgstr "" + #: src/wx/update_dialog.cc:34 msgid "A new version of DCP-o-matic is available." msgstr "Es ist eine neue Version von DCP-o-matic verfügbar." @@ -106,20 +113,30 @@ msgstr "Kino hinzufügen..." msgid "Add Screen..." msgstr "Saal hinzufügen..." -#: src/wx/content_panel.cc:67 +#: src/wx/content_panel.cc:73 +msgid "" +"Add a directory of image files which will be used as a moving image sequence." +msgstr "" + +#: src/wx/content_panel.cc:68 msgid "Add file(s)..." msgstr "Datei(en) hinzufügen..." +#: src/wx/content_panel.cc:72 +msgid "" +"Add image\n" +"sequence..." +msgstr "" + #: src/wx/content_panel.cc:69 -#, fuzzy -msgid "Add folder..." -msgstr "Datei(en) hinzufügen..." +msgid "Add video, image or sound files to the film." +msgstr "" #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62 msgid "Add..." msgstr "Hinzufügen..." -#: src/wx/hints_dialog.cc:102 +#: src/wx/hints_dialog.cc:107 msgid "" "All of your content is at 1.85:1 or narrower but your DCP's container is " "Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " @@ -127,7 +144,7 @@ msgid "" "\"DCP\" tab." msgstr "" -#: src/wx/hints_dialog.cc:96 +#: src/wx/hints_dialog.cc:101 msgid "" "All of your content is in Scope (2.39:1) but your DCP's container is Flat " "(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " @@ -167,15 +184,6 @@ msgstr "" "Der Ton von Kanal %d wird wird an den DCP Kanal %d mit %.1fdB Pegel " "weitergegeben." -#: src/wx/audio_panel.cc:274 -#, c-format -msgid "Audio will be resampled from %.3fkHz to %.3fkHz." -msgstr "" - -#: src/wx/audio_panel.cc:279 -msgid "Audio will not be resampled." -msgstr "" - #: src/wx/config_dialog.cc:1022 msgid "BCC address" msgstr "BCC: Adresse" @@ -201,7 +209,7 @@ msgstr "BsL" msgid "BsR" msgstr "BsR" -#: src/wx/dcp_panel.cc:551 +#: src/wx/dcp_panel.cc:561 msgid "Burn subtitles into image" msgstr "" @@ -262,7 +270,7 @@ msgstr "Kinokette" msgid "Channel gain" msgstr "Kanal Verstärkung (+/-)" -#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:623 +#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:633 msgid "Channels" msgstr "Kanäle" @@ -278,11 +286,11 @@ msgstr "Beim Start auf Updates überprüfen." msgid "Choose a file" msgstr "Datei auswählen" -#: src/wx/content_panel.cc:241 +#: src/wx/content_panel.cc:236 msgid "Choose a file or files" msgstr "Eine oder mehrere Dateien auswählen" -#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264 +#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:259 msgid "Choose a folder" msgstr "Ordner wählen" @@ -303,7 +311,7 @@ msgstr "Farbumwandlung" msgid "Config|Timing" msgstr "Timing" -#: src/wx/dcp_panel.cc:532 +#: src/wx/dcp_panel.cc:542 msgid "Container" msgstr "Container" @@ -315,20 +323,10 @@ msgstr "Inhalt" msgid "Content Type" msgstr "Inhalt Typ" -#: src/wx/video_panel.cc:367 -#, c-format -msgid "Content frame rate %.4f\n" -msgstr "Inhalt Bildrate %4f\n" - #: src/wx/isdcf_metadata_dialog.cc:32 msgid "Content version" msgstr "Inhalt Version" -#: src/wx/video_panel.cc:327 -#, c-format -msgid "Content video is %dx%d (%.2f:1)\n" -msgstr "Inhalt Video ist %dx%d (%.2f:1)\n" - #: src/wx/editable_list.h:64 msgid "Copy..." msgstr "" @@ -337,7 +335,7 @@ msgstr "" msgid "Could not analyse audio." msgstr "Ton konnte nicht analysiert werden" -#: src/wx/content_panel.cc:280 +#: src/wx/content_panel.cc:275 msgid "Could not find any images nor a DCP in that folder" msgstr "" @@ -365,11 +363,6 @@ msgstr "Land" msgid "Create in folder" msgstr "In Ordner erstellen" -#: src/wx/video_panel.cc:339 -#, c-format -msgid "Cropped to %dx%d (%.2f:1)\n" -msgstr "Beschnitten zu %dx%d(%.2f:1)\n" - #: src/wx/video_panel.cc:248 msgid "Custom" msgstr "Eigene" @@ -461,7 +454,7 @@ msgstr "Doremi" msgid "Doremi serial numbers must have 6 digits" msgstr "Doremi Seriennummern müssen aus 6 Zahlen bestehen!" -#: src/wx/content_panel.cc:75 +#: src/wx/content_panel.cc:84 msgid "Down" msgstr "Nach unten" @@ -550,7 +543,7 @@ msgstr "Filter" msgid "Find missing..." msgstr "Suche fehlende..." -#: src/wx/dcp_panel.cc:538 +#: src/wx/dcp_panel.cc:548 msgid "Frame Rate" msgstr "Bild Rate" @@ -653,7 +646,7 @@ msgstr "" msgid "Interop" msgstr "Interop" -#: src/wx/dcp_panel.cc:565 +#: src/wx/dcp_panel.cc:575 msgid "JPEG2000 bandwidth" msgstr "JPEG2000 Datenrate" @@ -673,7 +666,7 @@ msgstr "" msgid "KDM|Timing" msgstr "Zeitfenster" -#: src/wx/content_panel.cc:85 src/wx/timeline_dialog.cc:42 +#: src/wx/timeline_dialog.cc:42 msgid "Keep video in sequence" msgstr "Lücken in Zeitleiste automatisch schließen" @@ -731,7 +724,7 @@ msgstr "" msgid "Ls" msgstr "SL" -#: src/wx/content_panel.cc:438 +#: src/wx/content_panel.cc:432 msgid "MISSING: " msgstr "FEHLT:" @@ -766,10 +759,18 @@ msgid "Maximum JPEG2000 bandwidth" msgstr "Maximale JPEG2000 Datenrate (Vorsicht!)" #: src/wx/config_dialog.cc:297 src/wx/config_dialog.cc:1137 -#: src/wx/dcp_panel.cc:569 +#: src/wx/dcp_panel.cc:579 msgid "Mbit/s" msgstr "Mbit/s" +#: src/wx/content_panel.cc:81 +msgid "Move the selected piece of content earlier in the film." +msgstr "" + +#: src/wx/content_panel.cc:85 +msgid "Move the selected piece of content later in the film." +msgstr "" + #: src/wx/video_panel.cc:315 msgid "Multiple content selected" msgstr "Mehrere Inhalte ausgewählt" @@ -778,7 +779,7 @@ msgstr "Mehrere Inhalte ausgewählt" msgid "My Documents" msgstr "Meine Dokumente" -#: src/wx/content_panel.cc:442 +#: src/wx/content_panel.cc:436 msgid "NEEDS KDM: " msgstr "" @@ -801,7 +802,7 @@ msgstr "Eine neue Version von DCP-o-matic ist verfügbar." msgid "No audio will be passed from content channel %d to DCP channel %d." msgstr "Der Ton von Kanal %d wird nicht an das DCP Kanal %d weitergegeben." -#: src/wx/audio_panel.cc:326 src/wx/video_panel.cc:161 +#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:161 #: src/wx/video_panel.cc:253 src/wx/video_panel.cc:262 msgid "None" msgstr "Kein" @@ -814,6 +815,10 @@ msgstr "Aus" msgid "Open console window" msgstr "" +#: src/wx/content_panel.cc:89 +msgid "Open the timeline for the film." +msgstr "" + #: src/wx/make_signer_chain_dialog.cc:25 msgid "Organisation" msgstr "" @@ -847,11 +852,6 @@ msgstr "Ziel Gamma" msgid "Package Type (e.g. OV)" msgstr "DCP Paket Typ (z.B. OV)" -#: src/wx/video_panel.cc:360 -#, c-format -msgid "Padded with black to %dx%d (%.2f:1)\n" -msgstr "Mit Schwarz gefüllt auf %dx%d (%.2f:1)\n" - #: src/wx/config_dialog.cc:911 msgid "Password" msgstr "Passwort" @@ -926,7 +926,7 @@ msgid "Red band" msgstr "Red band (USA, für explizite Inhalte)" #: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59 -#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68 +#: src/wx/content_panel.cc:76 src/wx/editable_list.h:68 msgid "Remove" msgstr "Entfernen" @@ -938,6 +938,10 @@ msgstr "Kino entfernen" msgid "Remove Screen" msgstr "Saal entfernen" +#: src/wx/content_panel.cc:77 +msgid "Remove the selected piece of content from the film." +msgstr "" + #: src/wx/repeat_dialog.cc:26 msgid "Repeat" msgstr "Wiederholen" @@ -954,7 +958,7 @@ msgstr "Wiederhole..." msgid "Reset to default text" msgstr "Auf Standardtext zurücksetzen" -#: src/wx/dcp_panel.cc:559 +#: src/wx/dcp_panel.cc:569 msgid "Resolution" msgstr "Auflösung" @@ -990,12 +994,7 @@ msgstr "SMPTE" msgid "Scale to" msgstr "Skaliere auf" -#: src/wx/video_panel.cc:351 -#, c-format -msgid "Scaled to %dx%d (%.2f:1)\n" -msgstr "Skaliert auf %dx%d (%.2f:1)\n" - -#: src/wx/dcp_panel.cc:574 +#: src/wx/dcp_panel.cc:584 msgid "Scaler" msgstr "Skalierverfahren" @@ -1144,7 +1143,7 @@ msgstr "" "Entweder nochmals mit den richtigen Inhaltsdateien probieren oder Fehlende " "löschen." -#: src/wx/hints_dialog.cc:128 +#: src/wx/hints_dialog.cc:139 msgid "There are no hints: everything looks good!" msgstr "Keine Warnungen: Alles sieht gut aus!" @@ -1176,7 +1175,7 @@ msgstr "Zeit" msgid "Timeline" msgstr "Zeitleiste" -#: src/wx/content_panel.cc:77 +#: src/wx/content_panel.cc:88 msgid "Timeline..." msgstr "Zeitleiste..." @@ -1217,7 +1216,7 @@ msgstr "Unbekannt" msgid "Until" msgstr "Bis" -#: src/wx/content_panel.cc:73 +#: src/wx/content_panel.cc:80 msgid "Up" msgstr "Nach oben" @@ -1233,7 +1232,7 @@ msgstr "ISDCF Name benutzen" msgid "Use all servers" msgstr "Alle verfügbaren Server im Subnetz benutzen" -#: src/wx/dcp_panel.cc:545 +#: src/wx/dcp_panel.cc:555 msgid "Use best" msgstr "Beste benutzen" @@ -1296,7 +1295,7 @@ msgstr "Vertikale Verschiebung" msgid "Y Scale" msgstr "Größe" -#: src/wx/hints_dialog.cc:121 +#: src/wx/hints_dialog.cc:132 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1305,7 +1304,7 @@ msgstr "" "Sie haben %d Dateien die wie VOB Dateien einer DVD aussehen. Sie sollten sie " "verbinden um einen sanften Übergang zwischen den Dateien zu haben." -#: src/wx/hints_dialog.cc:108 +#: src/wx/hints_dialog.cc:113 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1331,6 +1330,15 @@ msgstr "" "Ihr DCP hat weniger als 6 Audiokanäle. Das kann auf manchen Projektoren zu " "Problemen führen." +#: src/wx/hints_dialog.cc:80 +#, fuzzy +msgid "" +"Your DCP has no audio channels. This is likely to cause problems on " +"playback." +msgstr "" +"Ihr DCP hat eine ungerade Anzahl an Tonkanälen. Das wird wahrscheinlich zu " +"Abspielproblemen führen." + #: src/wx/timeline.cc:229 msgid "audio" msgstr "Ton" @@ -1369,6 +1377,10 @@ msgstr "mal" msgid "video" msgstr "Bild" +#, fuzzy +#~ msgid "Add folder..." +#~ msgstr "Datei(en) hinzufügen..." + #~ msgid "1 channel" #~ msgstr "1 Kanal" diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po index ddc975868..bc894e71b 100644 --- a/src/wx/po/es_ES.po +++ b/src/wx/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libdcpomatic-wx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-10-24 23:00-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" @@ -52,11 +52,11 @@ msgstr "2D" msgid "2D version of content available in 3D" msgstr "Versión 2D de contenido disponible en 3D" -#: src/wx/dcp_panel.cc:607 +#: src/wx/dcp_panel.cc:617 msgid "2K" msgstr "2K" -#: src/wx/dcp_panel.cc:555 +#: src/wx/dcp_panel.cc:565 msgid "3D" msgstr "3D" @@ -80,10 +80,17 @@ msgstr "3D sólo derecha" msgid "3D top/bottom" msgstr "3D arriba/abajo" -#: src/wx/dcp_panel.cc:608 +#: src/wx/dcp_panel.cc:618 msgid "4K" msgstr "4K" +#: src/wx/hints_dialog.cc:119 +msgid "" +"A few projectors have problems playing back very high bit-rate DCPs. It is " +"a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is " +"unlikely to have any visible effect on the image." +msgstr "" + #: src/wx/update_dialog.cc:34 msgid "A new version of DCP-o-matic is available." msgstr "Una nueva versión de DCP-o-matic está disponible." @@ -104,19 +111,30 @@ msgstr "Añadir KDM..." msgid "Add Screen..." msgstr "Añadir pantalla..." -#: src/wx/content_panel.cc:67 +#: src/wx/content_panel.cc:73 +msgid "" +"Add a directory of image files which will be used as a moving image sequence." +msgstr "" + +#: src/wx/content_panel.cc:68 msgid "Add file(s)..." msgstr "Añadir fichero(s)..." +#: src/wx/content_panel.cc:72 +msgid "" +"Add image\n" +"sequence..." +msgstr "" + #: src/wx/content_panel.cc:69 -msgid "Add folder..." -msgstr "Añadir carpeta..." +msgid "Add video, image or sound files to the film." +msgstr "" #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62 msgid "Add..." msgstr "Añadir..." -#: src/wx/hints_dialog.cc:102 +#: src/wx/hints_dialog.cc:107 msgid "" "All of your content is at 1.85:1 or narrower but your DCP's container is " "Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " @@ -128,7 +146,7 @@ msgstr "" "Flat (1.85:1). Puede que prefieras seleccionar el contenedor DCP en Flat " "(1.85:1) en la pestaña \"DCP\"." -#: src/wx/hints_dialog.cc:96 +#: src/wx/hints_dialog.cc:101 msgid "" "All of your content is in Scope (2.39:1) but your DCP's container is Flat " "(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " @@ -169,15 +187,6 @@ msgid "" "%.1fdB." msgstr "El audio del canal %d pasará al canal %d del DCP con ganancia %.1fdB." -#: src/wx/audio_panel.cc:274 -#, c-format -msgid "Audio will be resampled from %.3fkHz to %.3fkHz." -msgstr "" - -#: src/wx/audio_panel.cc:279 -msgid "Audio will not be resampled." -msgstr "" - #: src/wx/config_dialog.cc:1022 msgid "BCC address" msgstr "Dirección CCO" @@ -203,7 +212,7 @@ msgstr "BsL" msgid "BsR" msgstr "BsR" -#: src/wx/dcp_panel.cc:551 +#: src/wx/dcp_panel.cc:561 msgid "Burn subtitles into image" msgstr "Grabar subtítulos en la imagen" @@ -264,7 +273,7 @@ msgstr "Cadena" msgid "Channel gain" msgstr "Ganancia del canal" -#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:623 +#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:633 msgid "Channels" msgstr "Canales" @@ -280,11 +289,11 @@ msgstr "Buscar actualizaciones al iniciar" msgid "Choose a file" msgstr "Elige un fichero" -#: src/wx/content_panel.cc:241 +#: src/wx/content_panel.cc:236 msgid "Choose a file or files" msgstr "Elegir un fichero o ficheros" -#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264 +#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:259 msgid "Choose a folder" msgstr "Elige una carpeta" @@ -305,7 +314,7 @@ msgstr "Conversión de color" msgid "Config|Timing" msgstr "Configuración|Tiempo" -#: src/wx/dcp_panel.cc:532 +#: src/wx/dcp_panel.cc:542 msgid "Container" msgstr "Continente" @@ -317,20 +326,10 @@ msgstr "Contenido" msgid "Content Type" msgstr "Tipo de contenido" -#: src/wx/video_panel.cc:367 -#, c-format -msgid "Content frame rate %.4f\n" -msgstr "Velocidad del contenido %.4f\n" - #: src/wx/isdcf_metadata_dialog.cc:32 msgid "Content version" msgstr "Versión del contenido" -#: src/wx/video_panel.cc:327 -#, c-format -msgid "Content video is %dx%d (%.2f:1)\n" -msgstr "El video es %dx%d (%.2f:1)\n" - #: src/wx/editable_list.h:64 msgid "Copy..." msgstr "Copiar..." @@ -339,7 +338,7 @@ msgstr "Copiar..." msgid "Could not analyse audio." msgstr "No se pudo analizar el audio." -#: src/wx/content_panel.cc:280 +#: src/wx/content_panel.cc:275 msgid "Could not find any images nor a DCP in that folder" msgstr "No se pudieron encontrar imágenes ni un DCP en esta carpeta" @@ -367,11 +366,6 @@ msgstr "País" msgid "Create in folder" msgstr "Crear en carpeta" -#: src/wx/video_panel.cc:339 -#, c-format -msgid "Cropped to %dx%d (%.2f:1)\n" -msgstr "Recortado a %dx%d (%.2f:1)\n" - #: src/wx/video_panel.cc:248 msgid "Custom" msgstr "Personalizado" @@ -463,7 +457,7 @@ msgstr "Doremi" msgid "Doremi serial numbers must have 6 digits" msgstr "Los números de serie de Doremi deben tener 6 cifras" -#: src/wx/content_panel.cc:75 +#: src/wx/content_panel.cc:84 msgid "Down" msgstr "Bajar" @@ -552,7 +546,7 @@ msgstr "Filtros" msgid "Find missing..." msgstr "Buscar ausentes..." -#: src/wx/dcp_panel.cc:538 +#: src/wx/dcp_panel.cc:548 msgid "Frame Rate" msgstr "Velocidad" @@ -654,7 +648,7 @@ msgstr "Nombre común intermedio" msgid "Interop" msgstr "Interop" -#: src/wx/dcp_panel.cc:565 +#: src/wx/dcp_panel.cc:575 msgid "JPEG2000 bandwidth" msgstr "Ancho de banda JPEG2000" @@ -674,7 +668,7 @@ msgstr "Tipo de KDM" msgid "KDM|Timing" msgstr "KDM|Tiempo" -#: src/wx/content_panel.cc:85 src/wx/timeline_dialog.cc:42 +#: src/wx/timeline_dialog.cc:42 msgid "Keep video in sequence" msgstr "Mantener el video secuencia" @@ -731,7 +725,7 @@ msgstr "Registro:" msgid "Ls" msgstr "Ls" -#: src/wx/content_panel.cc:438 +#: src/wx/content_panel.cc:432 msgid "MISSING: " msgstr "FALTA:" @@ -765,10 +759,18 @@ msgid "Maximum JPEG2000 bandwidth" msgstr "Ancho de banda JPEG2000 máximo" #: src/wx/config_dialog.cc:297 src/wx/config_dialog.cc:1137 -#: src/wx/dcp_panel.cc:569 +#: src/wx/dcp_panel.cc:579 msgid "Mbit/s" msgstr "Mbit/s" +#: src/wx/content_panel.cc:81 +msgid "Move the selected piece of content earlier in the film." +msgstr "" + +#: src/wx/content_panel.cc:85 +msgid "Move the selected piece of content later in the film." +msgstr "" + #: src/wx/video_panel.cc:315 msgid "Multiple content selected" msgstr "Varios contenidos seleccionados" @@ -777,7 +779,7 @@ msgstr "Varios contenidos seleccionados" msgid "My Documents" msgstr "Mis documentos" -#: src/wx/content_panel.cc:442 +#: src/wx/content_panel.cc:436 msgid "NEEDS KDM: " msgstr "NECESITA KDM:" @@ -800,7 +802,7 @@ msgstr "Nuevas versiones disponibles de DCP-o-matic." msgid "No audio will be passed from content channel %d to DCP channel %d." msgstr "No pasará audio del canal de origen %d al canal %d del DCP." -#: src/wx/audio_panel.cc:326 src/wx/video_panel.cc:161 +#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:161 #: src/wx/video_panel.cc:253 src/wx/video_panel.cc:262 msgid "None" msgstr "Ninguno" @@ -813,6 +815,10 @@ msgstr "Off" msgid "Open console window" msgstr "Abrir la ventana de la consola" +#: src/wx/content_panel.cc:89 +msgid "Open the timeline for the film." +msgstr "" + #: src/wx/make_signer_chain_dialog.cc:25 msgid "Organisation" msgstr "Organización" @@ -845,11 +851,6 @@ msgstr "Gamma de salida" msgid "Package Type (e.g. OV)" msgstr "Tipo de paquete (ej. OV)" -#: src/wx/video_panel.cc:360 -#, c-format -msgid "Padded with black to %dx%d (%.2f:1)\n" -msgstr "Completado con negro hasta %dx%d (%.2f:1)\n" - #: src/wx/config_dialog.cc:911 msgid "Password" msgstr "Clave" @@ -923,7 +924,7 @@ msgid "Red band" msgstr "Banda roja" #: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59 -#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68 +#: src/wx/content_panel.cc:76 src/wx/editable_list.h:68 msgid "Remove" msgstr "Quitar" @@ -935,6 +936,10 @@ msgstr "Quitar cine" msgid "Remove Screen" msgstr "Quitar pantalla" +#: src/wx/content_panel.cc:77 +msgid "Remove the selected piece of content from the film." +msgstr "" + #: src/wx/repeat_dialog.cc:26 msgid "Repeat" msgstr "Repetir" @@ -951,7 +956,7 @@ msgstr "Repetir..." msgid "Reset to default text" msgstr "Restablecer el texto par defecto" -#: src/wx/dcp_panel.cc:559 +#: src/wx/dcp_panel.cc:569 msgid "Resolution" msgstr "Resolución" @@ -987,12 +992,7 @@ msgstr "SMPTE" msgid "Scale to" msgstr "Redimensionar a" -#: src/wx/video_panel.cc:351 -#, c-format -msgid "Scaled to %dx%d (%.2f:1)\n" -msgstr "Redimensionado a %dx%d (%.2f:1)\n" - -#: src/wx/dcp_panel.cc:574 +#: src/wx/dcp_panel.cc:584 msgid "Scaler" msgstr "Escalador" @@ -1138,7 +1138,7 @@ msgstr "" "El fichero(s) especificados no es el mismo que el ausente. Puedes probar de " "nuevo con el fichero correcto o eliminar el contenido ausente." -#: src/wx/hints_dialog.cc:128 +#: src/wx/hints_dialog.cc:139 msgid "There are no hints: everything looks good!" msgstr "No hay recomendaciones: ¡todo parece bien!" @@ -1170,7 +1170,7 @@ msgstr "Tiempo" msgid "Timeline" msgstr "Línea de tiempo" -#: src/wx/content_panel.cc:77 +#: src/wx/content_panel.cc:88 msgid "Timeline..." msgstr "Linea de tiempo..." @@ -1211,7 +1211,7 @@ msgstr "Desconocido" msgid "Until" msgstr "Hasta" -#: src/wx/content_panel.cc:73 +#: src/wx/content_panel.cc:80 msgid "Up" msgstr "Subir" @@ -1227,7 +1227,7 @@ msgstr "Usar el nombre ISDCF" msgid "Use all servers" msgstr "Usar todos los servidores" -#: src/wx/dcp_panel.cc:545 +#: src/wx/dcp_panel.cc:555 msgid "Use best" msgstr "Usar la mejor" @@ -1287,7 +1287,7 @@ msgstr "Desplazamiento en Y" msgid "Y Scale" msgstr "Redimensión Y" -#: src/wx/hints_dialog.cc:121 +#: src/wx/hints_dialog.cc:132 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1296,7 +1296,7 @@ msgstr "" "Hay %d ficheros que parecen VOBs en el DVD. Deberías unirlos para asegurarte " "transiciones suaves." -#: src/wx/hints_dialog.cc:108 +#: src/wx/hints_dialog.cc:113 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1322,6 +1322,15 @@ msgstr "" "Tu DCP tiene menos de 6 canales de audio. Esto puede causar problemas con " "algunos proyectores." +#: src/wx/hints_dialog.cc:80 +#, fuzzy +msgid "" +"Your DCP has no audio channels. This is likely to cause problems on " +"playback." +msgstr "" +"Tu DCP tiene un número impar de canales de audio. Es muy probable que cause " +"problemas de reproducción." + #: src/wx/timeline.cc:229 msgid "audio" msgstr "audio" @@ -1359,6 +1368,9 @@ msgstr "veces" msgid "video" msgstr "vídeo" +#~ msgid "Add folder..." +#~ msgstr "Añadir carpeta..." + #~ msgid "1 channel" #~ msgstr "1 canal" diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po index bb3f43bac..a2cea6dde 100644 --- a/src/wx/po/fr_FR.po +++ b/src/wx/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-07-14 11:27+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" @@ -53,11 +53,11 @@ msgstr "2D" msgid "2D version of content available in 3D" msgstr "Version 2D d'un contenu aussi disponible en 3D" -#: src/wx/dcp_panel.cc:607 +#: src/wx/dcp_panel.cc:617 msgid "2K" msgstr "2K" -#: src/wx/dcp_panel.cc:555 +#: src/wx/dcp_panel.cc:565 msgid "3D" msgstr "3D" @@ -81,10 +81,17 @@ msgstr "3D droite" msgid "3D top/bottom" msgstr "3D dessus/dessous" -#: src/wx/dcp_panel.cc:608 +#: src/wx/dcp_panel.cc:618 msgid "4K" msgstr "4K" +#: src/wx/hints_dialog.cc:119 +msgid "" +"A few projectors have problems playing back very high bit-rate DCPs. It is " +"a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is " +"unlikely to have any visible effect on the image." +msgstr "" + #: src/wx/update_dialog.cc:34 msgid "A new version of DCP-o-matic is available." msgstr "Une nouvelle version de DCP-o-matic est disponible" @@ -106,20 +113,30 @@ msgstr "Ajout cinéma" msgid "Add Screen..." msgstr "Ajout une salle" -#: src/wx/content_panel.cc:67 +#: src/wx/content_panel.cc:73 +msgid "" +"Add a directory of image files which will be used as a moving image sequence." +msgstr "" + +#: src/wx/content_panel.cc:68 msgid "Add file(s)..." msgstr "Ajout fichier(s)..." +#: src/wx/content_panel.cc:72 +msgid "" +"Add image\n" +"sequence..." +msgstr "" + #: src/wx/content_panel.cc:69 -#, fuzzy -msgid "Add folder..." -msgstr "Ajout fichier(s)..." +msgid "Add video, image or sound files to the film." +msgstr "" #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62 msgid "Add..." msgstr "Ajouter..." -#: src/wx/hints_dialog.cc:102 +#: src/wx/hints_dialog.cc:107 msgid "" "All of your content is at 1.85:1 or narrower but your DCP's container is " "Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " @@ -127,7 +144,7 @@ msgid "" "\"DCP\" tab." msgstr "" -#: src/wx/hints_dialog.cc:96 +#: src/wx/hints_dialog.cc:101 msgid "" "All of your content is in Scope (2.39:1) but your DCP's container is Flat " "(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " @@ -167,16 +184,6 @@ msgstr "" "Le son du canal audio %d sera transféré au canal %d du DCP avec un gain de " "%.1fdB." -#: src/wx/audio_panel.cc:274 -#, fuzzy, c-format -msgid "Audio will be resampled from %.3fkHz to %.3fkHz." -msgstr "L'audio sera rééchantillonné de %dHz à %dHz." - -#: src/wx/audio_panel.cc:279 -#, fuzzy -msgid "Audio will not be resampled." -msgstr "L'audio sera rééchantillonné de %dHz à %dHz." - #: src/wx/config_dialog.cc:1022 #, fuzzy msgid "BCC address" @@ -203,7 +210,7 @@ msgstr "Ar.G" msgid "BsR" msgstr "Ar.D" -#: src/wx/dcp_panel.cc:551 +#: src/wx/dcp_panel.cc:561 msgid "Burn subtitles into image" msgstr "" @@ -264,7 +271,7 @@ msgstr "Chaîne" msgid "Channel gain" msgstr "Gain Canal" -#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:623 +#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:633 msgid "Channels" msgstr "Canaux" @@ -280,11 +287,11 @@ msgstr "Recherche de mises à jour au démarrage." msgid "Choose a file" msgstr "Choisissez un fichier" -#: src/wx/content_panel.cc:241 +#: src/wx/content_panel.cc:236 msgid "Choose a file or files" msgstr "Choisissez un ou plusieurs fichiers" -#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264 +#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:259 msgid "Choose a folder" msgstr "Choisissez un dossier" @@ -305,7 +312,7 @@ msgstr "Espace Couleurs" msgid "Config|Timing" msgstr "Temps" -#: src/wx/dcp_panel.cc:532 +#: src/wx/dcp_panel.cc:542 msgid "Container" msgstr "Format" @@ -317,20 +324,10 @@ msgstr "Contenu" msgid "Content Type" msgstr "Type de Contenu" -#: src/wx/video_panel.cc:367 -#, c-format -msgid "Content frame rate %.4f\n" -msgstr "Cadence du contenu %.4f\n" - #: src/wx/isdcf_metadata_dialog.cc:32 msgid "Content version" msgstr "Version du contenu" -#: src/wx/video_panel.cc:327 -#, c-format -msgid "Content video is %dx%d (%.2f:1)\n" -msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n" - #: src/wx/editable_list.h:64 msgid "Copy..." msgstr "" @@ -339,7 +336,7 @@ msgstr "" msgid "Could not analyse audio." msgstr "Analyse du son impossible" -#: src/wx/content_panel.cc:280 +#: src/wx/content_panel.cc:275 msgid "Could not find any images nor a DCP in that folder" msgstr "" @@ -367,11 +364,6 @@ msgstr "Pays" msgid "Create in folder" msgstr "Créer dans le dossier" -#: src/wx/video_panel.cc:339 -#, c-format -msgid "Cropped to %dx%d (%.2f:1)\n" -msgstr "Rognage de %dx%d (%.2f:1)\n" - #: src/wx/video_panel.cc:248 msgid "Custom" msgstr "Personnalisé" @@ -463,7 +455,7 @@ msgstr "Doremi" msgid "Doremi serial numbers must have 6 digits" msgstr "Les numéros de série Doremi doivent être composés de 6 chiffres" -#: src/wx/content_panel.cc:75 +#: src/wx/content_panel.cc:84 msgid "Down" msgstr "Descendre" @@ -552,7 +544,7 @@ msgstr "Filtres" msgid "Find missing..." msgstr "Recherche de l'élément manquant..." -#: src/wx/dcp_panel.cc:538 +#: src/wx/dcp_panel.cc:548 msgid "Frame Rate" msgstr "Cadence image" @@ -653,7 +645,7 @@ msgstr "" msgid "Interop" msgstr "MXF-Interop" -#: src/wx/dcp_panel.cc:565 +#: src/wx/dcp_panel.cc:575 msgid "JPEG2000 bandwidth" msgstr "Qualité JPEG2000" @@ -673,7 +665,7 @@ msgstr "" msgid "KDM|Timing" msgstr "Temps" -#: src/wx/content_panel.cc:85 src/wx/timeline_dialog.cc:42 +#: src/wx/timeline_dialog.cc:42 msgid "Keep video in sequence" msgstr "Conserver la vidéo dans la séquence" @@ -731,7 +723,7 @@ msgstr "" msgid "Ls" msgstr "Sr.G" -#: src/wx/content_panel.cc:438 +#: src/wx/content_panel.cc:432 msgid "MISSING: " msgstr "MANQUANT:" @@ -766,10 +758,18 @@ msgid "Maximum JPEG2000 bandwidth" msgstr "Qualité JPEG2000 Maxi" #: src/wx/config_dialog.cc:297 src/wx/config_dialog.cc:1137 -#: src/wx/dcp_panel.cc:569 +#: src/wx/dcp_panel.cc:579 msgid "Mbit/s" msgstr "Mbit/s" +#: src/wx/content_panel.cc:81 +msgid "Move the selected piece of content earlier in the film." +msgstr "" + +#: src/wx/content_panel.cc:85 +msgid "Move the selected piece of content later in the film." +msgstr "" + #: src/wx/video_panel.cc:315 msgid "Multiple content selected" msgstr "Contenus multiples sélectionnés" @@ -778,7 +778,7 @@ msgstr "Contenus multiples sélectionnés" msgid "My Documents" msgstr "Mes Documents" -#: src/wx/content_panel.cc:442 +#: src/wx/content_panel.cc:436 msgid "NEEDS KDM: " msgstr "" @@ -801,7 +801,7 @@ msgstr "De nouvelles versions de DCP-o-matic sont disponibles." msgid "No audio will be passed from content channel %d to DCP channel %d." msgstr "Aucun son ne passera du canal audio %d au canal %d du DCP." -#: src/wx/audio_panel.cc:326 src/wx/video_panel.cc:161 +#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:161 #: src/wx/video_panel.cc:253 src/wx/video_panel.cc:262 msgid "None" msgstr "Aucun" @@ -814,6 +814,10 @@ msgstr "Eteint" msgid "Open console window" msgstr "" +#: src/wx/content_panel.cc:89 +msgid "Open the timeline for the film." +msgstr "" + #: src/wx/make_signer_chain_dialog.cc:25 #, fuzzy msgid "Organisation" @@ -848,11 +852,6 @@ msgstr "Gamma de sortie" msgid "Package Type (e.g. OV)" msgstr "Type de paquet (ex. OV)" -#: src/wx/video_panel.cc:360 -#, c-format -msgid "Padded with black to %dx%d (%.2f:1)\n" -msgstr "Enveloppe noire de %dx%d (%.2f:1)\n" - #: src/wx/config_dialog.cc:911 msgid "Password" msgstr "Mot de passe" @@ -927,7 +926,7 @@ msgid "Red band" msgstr "Red Band" #: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59 -#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68 +#: src/wx/content_panel.cc:76 src/wx/editable_list.h:68 msgid "Remove" msgstr "Supprimer" @@ -939,6 +938,10 @@ msgstr "Supprimer le cinéma" msgid "Remove Screen" msgstr "Supprimer la salle" +#: src/wx/content_panel.cc:77 +msgid "Remove the selected piece of content from the film." +msgstr "" + #: src/wx/repeat_dialog.cc:26 msgid "Repeat" msgstr "Répéter" @@ -955,7 +958,7 @@ msgstr "Répéter..." msgid "Reset to default text" msgstr "texte par défaut" -#: src/wx/dcp_panel.cc:559 +#: src/wx/dcp_panel.cc:569 msgid "Resolution" msgstr "Résolution" @@ -991,12 +994,7 @@ msgstr "SMPTE" msgid "Scale to" msgstr "Mise à l'échelle" -#: src/wx/video_panel.cc:351 -#, c-format -msgid "Scaled to %dx%d (%.2f:1)\n" -msgstr "Mis à l'échelle de %dx%d (%.2f:1)\n" - -#: src/wx/dcp_panel.cc:574 +#: src/wx/dcp_panel.cc:584 msgid "Scaler" msgstr "Mise à l'échelle" @@ -1146,7 +1144,7 @@ msgstr "" "ceux détectés comme manquants. Vous pouvez réessayer avec les contenus " "corrects ou supprimer les contenus manquants." -#: src/wx/hints_dialog.cc:128 +#: src/wx/hints_dialog.cc:139 msgid "There are no hints: everything looks good!" msgstr "Il n'y a aucun avertissement: tout semble correct!" @@ -1178,7 +1176,7 @@ msgstr "Durée" msgid "Timeline" msgstr "Timeline" -#: src/wx/content_panel.cc:77 +#: src/wx/content_panel.cc:88 msgid "Timeline..." msgstr "Timeline..." @@ -1219,7 +1217,7 @@ msgstr "inconnu." msgid "Until" msgstr "Jusqu'au" -#: src/wx/content_panel.cc:73 +#: src/wx/content_panel.cc:80 msgid "Up" msgstr "Monter" @@ -1235,7 +1233,7 @@ msgstr "Utiliser le nom ISDCF" msgid "Use all servers" msgstr "Utiliser tous les serveurs" -#: src/wx/dcp_panel.cc:545 +#: src/wx/dcp_panel.cc:555 msgid "Use best" msgstr "Automatique" @@ -1298,7 +1296,7 @@ msgstr "Position verticale" msgid "Y Scale" msgstr "Mise à l'échelle" -#: src/wx/hints_dialog.cc:121 +#: src/wx/hints_dialog.cc:132 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1307,7 +1305,7 @@ msgstr "" "%d fichiers ressemblent à des fichiers VOB de DVD. Vous devriez les ajouter " "afin de vous assurer d'une jonction correcte entre vos fichiers." -#: src/wx/hints_dialog.cc:108 +#: src/wx/hints_dialog.cc:113 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1333,6 +1331,15 @@ msgstr "" "Votre DCP a moins de 6 canaux audio. Cela peut créer des problèmes de " "lecture sur certains projecteurs." +#: src/wx/hints_dialog.cc:80 +#, fuzzy +msgid "" +"Your DCP has no audio channels. This is likely to cause problems on " +"playback." +msgstr "" +"Votre DCP possède un nombre impair de canaux audio. Cela peut créer des " +"problèmes de lecture." + #: src/wx/timeline.cc:229 msgid "audio" msgstr "audio" @@ -1371,6 +1378,10 @@ msgstr "fois" msgid "video" msgstr "vidéo" +#, fuzzy +#~ msgid "Add folder..." +#~ msgstr "Ajout fichier(s)..." + #~ msgid "1 channel" #~ msgstr "1 canal" diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po index 818c7ed7a..211ddd02c 100644 --- a/src/wx/po/it_IT.po +++ b/src/wx/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-02-03 10:46+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" @@ -52,11 +52,11 @@ msgstr "" msgid "2D version of content available in 3D" msgstr "Una nuova versione di DCP-o-matic è disponibile." -#: src/wx/dcp_panel.cc:607 +#: src/wx/dcp_panel.cc:617 msgid "2K" msgstr "" -#: src/wx/dcp_panel.cc:555 +#: src/wx/dcp_panel.cc:565 msgid "3D" msgstr "" @@ -80,10 +80,17 @@ msgstr "" msgid "3D top/bottom" msgstr "" -#: src/wx/dcp_panel.cc:608 +#: src/wx/dcp_panel.cc:618 msgid "4K" msgstr "" +#: src/wx/hints_dialog.cc:119 +msgid "" +"A few projectors have problems playing back very high bit-rate DCPs. It is " +"a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is " +"unlikely to have any visible effect on the image." +msgstr "" + #: src/wx/update_dialog.cc:34 msgid "A new version of DCP-o-matic is available." msgstr "Una nuova versione di DCP-o-matic è disponibile" @@ -105,20 +112,30 @@ msgstr "Aggiungi Cinema" msgid "Add Screen..." msgstr "Aggiungi Schermo" -#: src/wx/content_panel.cc:67 +#: src/wx/content_panel.cc:73 +msgid "" +"Add a directory of image files which will be used as a moving image sequence." +msgstr "" + +#: src/wx/content_panel.cc:68 msgid "Add file(s)..." msgstr "Aggiungi File" +#: src/wx/content_panel.cc:72 +msgid "" +"Add image\n" +"sequence..." +msgstr "" + #: src/wx/content_panel.cc:69 -#, fuzzy -msgid "Add folder..." -msgstr "Aggiungi File" +msgid "Add video, image or sound files to the film." +msgstr "" #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62 msgid "Add..." msgstr "Aggiungi..." -#: src/wx/hints_dialog.cc:102 +#: src/wx/hints_dialog.cc:107 msgid "" "All of your content is at 1.85:1 or narrower but your DCP's container is " "Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " @@ -126,7 +143,7 @@ msgid "" "\"DCP\" tab." msgstr "" -#: src/wx/hints_dialog.cc:96 +#: src/wx/hints_dialog.cc:101 msgid "" "All of your content is in Scope (2.39:1) but your DCP's container is Flat " "(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " @@ -167,16 +184,6 @@ msgstr "" "L' audio sarà trasferito dal canale %d sorgente al canale %d DCP con " "guadagno di %.1fdB." -#: src/wx/audio_panel.cc:274 -#, fuzzy, c-format -msgid "Audio will be resampled from %.3fkHz to %.3fkHz." -msgstr "L'Audio sarà ricampionato da %dHz a %dHz" - -#: src/wx/audio_panel.cc:279 -#, fuzzy -msgid "Audio will not be resampled." -msgstr "L'Audio sarà ricampionato da %dHz a %dHz." - #: src/wx/config_dialog.cc:1022 #, fuzzy msgid "BCC address" @@ -203,7 +210,7 @@ msgstr "BsL" msgid "BsR" msgstr "BsR" -#: src/wx/dcp_panel.cc:551 +#: src/wx/dcp_panel.cc:561 msgid "Burn subtitles into image" msgstr "" @@ -267,7 +274,7 @@ msgstr "" msgid "Channel gain" msgstr "Guadagno audio" -#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:623 +#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:633 msgid "Channels" msgstr "Canali" @@ -283,11 +290,11 @@ msgstr "Controlla gli aggiornamentio alla partenza" msgid "Choose a file" msgstr "Scegli un file" -#: src/wx/content_panel.cc:241 +#: src/wx/content_panel.cc:236 msgid "Choose a file or files" msgstr "Scegli uno o più file" -#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264 +#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:259 msgid "Choose a folder" msgstr "Scegli una cartella" @@ -310,7 +317,7 @@ msgstr "Conversione colore" msgid "Config|Timing" msgstr "" -#: src/wx/dcp_panel.cc:532 +#: src/wx/dcp_panel.cc:542 msgid "Container" msgstr "Contenitore" @@ -322,20 +329,10 @@ msgstr "Sorgente" msgid "Content Type" msgstr "Tipo di sorgente" -#: src/wx/video_panel.cc:367 -#, c-format -msgid "Content frame rate %.4f\n" -msgstr "Freq. fotogrammi sorgente %.4f\n" - #: src/wx/isdcf_metadata_dialog.cc:32 msgid "Content version" msgstr "Tipo di sorgente" -#: src/wx/video_panel.cc:327 -#, fuzzy, c-format -msgid "Content video is %dx%d (%.2f:1)\n" -msgstr "Il video originale è %dx%d (%.2f:1)\n" - #: src/wx/editable_list.h:64 msgid "Copy..." msgstr "" @@ -344,7 +341,7 @@ msgstr "" msgid "Could not analyse audio." msgstr "Non posso analizzare l'audio." -#: src/wx/content_panel.cc:280 +#: src/wx/content_panel.cc:275 msgid "Could not find any images nor a DCP in that folder" msgstr "" @@ -372,11 +369,6 @@ msgstr "" msgid "Create in folder" msgstr "Crea nella cartella" -#: src/wx/video_panel.cc:339 -#, c-format -msgid "Cropped to %dx%d (%.2f:1)\n" -msgstr "Tagliato da %dx%d (%.2f:1)\n" - #: src/wx/video_panel.cc:248 msgid "Custom" msgstr "" @@ -472,7 +464,7 @@ msgstr "" msgid "Doremi serial numbers must have 6 digits" msgstr "" -#: src/wx/content_panel.cc:75 +#: src/wx/content_panel.cc:84 msgid "Down" msgstr "" @@ -563,7 +555,7 @@ msgstr "Filtri" msgid "Find missing..." msgstr "Trova mancante..." -#: src/wx/dcp_panel.cc:538 +#: src/wx/dcp_panel.cc:548 msgid "Frame Rate" msgstr "Frequenza fotogrammi" @@ -667,7 +659,7 @@ msgstr "" msgid "Interop" msgstr "" -#: src/wx/dcp_panel.cc:565 +#: src/wx/dcp_panel.cc:575 msgid "JPEG2000 bandwidth" msgstr "Banda passante JPEG2000" @@ -687,7 +679,7 @@ msgstr "" msgid "KDM|Timing" msgstr "" -#: src/wx/content_panel.cc:85 src/wx/timeline_dialog.cc:42 +#: src/wx/timeline_dialog.cc:42 msgid "Keep video in sequence" msgstr "Tieni i video in sequenza" @@ -745,7 +737,7 @@ msgstr "" msgid "Ls" msgstr "Ls" -#: src/wx/content_panel.cc:438 +#: src/wx/content_panel.cc:432 msgid "MISSING: " msgstr "MANCANTE:" @@ -782,10 +774,18 @@ msgid "Maximum JPEG2000 bandwidth" msgstr "Banda passante JPEG2000" #: src/wx/config_dialog.cc:297 src/wx/config_dialog.cc:1137 -#: src/wx/dcp_panel.cc:569 +#: src/wx/dcp_panel.cc:579 msgid "Mbit/s" msgstr "" +#: src/wx/content_panel.cc:81 +msgid "Move the selected piece of content earlier in the film." +msgstr "" + +#: src/wx/content_panel.cc:85 +msgid "Move the selected piece of content later in the film." +msgstr "" + #: src/wx/video_panel.cc:315 msgid "Multiple content selected" msgstr "Molteplici sorgenti selezionate" @@ -794,7 +794,7 @@ msgstr "Molteplici sorgenti selezionate" msgid "My Documents" msgstr "Documenti" -#: src/wx/content_panel.cc:442 +#: src/wx/content_panel.cc:436 msgid "NEEDS KDM: " msgstr "" @@ -817,7 +817,7 @@ msgstr "Una nuova versione di DCP-o-matic è disponibile." msgid "No audio will be passed from content channel %d to DCP channel %d." msgstr "Nessun audio sarà passato dal canale %d sorgente al canale %d del DCP" -#: src/wx/audio_panel.cc:326 src/wx/video_panel.cc:161 +#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:161 #: src/wx/video_panel.cc:253 src/wx/video_panel.cc:262 msgid "None" msgstr "Nessuno" @@ -830,6 +830,10 @@ msgstr "" msgid "Open console window" msgstr "" +#: src/wx/content_panel.cc:89 +msgid "Open the timeline for the film." +msgstr "" + #: src/wx/make_signer_chain_dialog.cc:25 #, fuzzy msgid "Organisation" @@ -865,11 +869,6 @@ msgstr "Gamma in uscita" msgid "Package Type (e.g. OV)" msgstr "Tipo di Package (es. OV)" -#: src/wx/video_panel.cc:360 -#, c-format -msgid "Padded with black to %dx%d (%.2f:1)\n" -msgstr "Riempito con nero a %dx%d (%.2f:1)\n" - #: src/wx/config_dialog.cc:911 #, fuzzy msgid "Password" @@ -944,7 +943,7 @@ msgid "Red band" msgstr "" #: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59 -#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68 +#: src/wx/content_panel.cc:76 src/wx/editable_list.h:68 msgid "Remove" msgstr "Rimuovi" @@ -956,6 +955,10 @@ msgstr "Rimuovi Cinema" msgid "Remove Screen" msgstr "Rimuovi Schermo" +#: src/wx/content_panel.cc:77 +msgid "Remove the selected piece of content from the film." +msgstr "" + #: src/wx/repeat_dialog.cc:26 msgid "Repeat" msgstr "" @@ -972,7 +975,7 @@ msgstr "" msgid "Reset to default text" msgstr "" -#: src/wx/dcp_panel.cc:559 +#: src/wx/dcp_panel.cc:569 msgid "Resolution" msgstr "Risoluzione" @@ -1008,12 +1011,7 @@ msgstr "" msgid "Scale to" msgstr "Scala a" -#: src/wx/video_panel.cc:351 -#, c-format -msgid "Scaled to %dx%d (%.2f:1)\n" -msgstr "Scalato a %dx%d (%.2f:1)\n" - -#: src/wx/dcp_panel.cc:574 +#: src/wx/dcp_panel.cc:584 msgid "Scaler" msgstr "Scaler" @@ -1168,7 +1166,7 @@ msgstr "" "Il/i file sorgenteo che hai specificato sono diversi da quelli mancanti. " "Riprova oppure rimuovi la sorgente mancante." -#: src/wx/hints_dialog.cc:128 +#: src/wx/hints_dialog.cc:139 msgid "There are no hints: everything looks good!" msgstr "Non ci sono suggerimenti: sembra tutto a posto!" @@ -1200,7 +1198,7 @@ msgstr "Tempo" msgid "Timeline" msgstr "Timeline" -#: src/wx/content_panel.cc:77 +#: src/wx/content_panel.cc:88 msgid "Timeline..." msgstr "" @@ -1243,7 +1241,7 @@ msgstr "sconosciuto" msgid "Until" msgstr "Fino a" -#: src/wx/content_panel.cc:73 +#: src/wx/content_panel.cc:80 msgid "Up" msgstr "Su" @@ -1260,7 +1258,7 @@ msgstr "Usa nome DCI" msgid "Use all servers" msgstr "Usa tutti i server" -#: src/wx/dcp_panel.cc:545 +#: src/wx/dcp_panel.cc:555 msgid "Use best" msgstr "Usa la migliore" @@ -1323,7 +1321,7 @@ msgstr "Spostamento Y" msgid "Y Scale" msgstr "Scaler" -#: src/wx/hints_dialog.cc:121 +#: src/wx/hints_dialog.cc:132 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1332,7 +1330,7 @@ msgstr "" "Ci sono %d file che sembrano essere DVD VOB. Dovresti unirli per assicurare " "una giunta senza interruzioni tra i file." -#: src/wx/hints_dialog.cc:108 +#: src/wx/hints_dialog.cc:113 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1358,6 +1356,15 @@ msgstr "" "Il vostro DCP ha meno di 6 canali audio. Questo può causare problemi su " "alcuni proiettori." +#: src/wx/hints_dialog.cc:80 +#, fuzzy +msgid "" +"Your DCP has no audio channels. This is likely to cause problems on " +"playback." +msgstr "" +"Il vostro DCP ha un numero dispari di canali audio. Questo può causare " +"problemi durante la riproduzione." + #: src/wx/timeline.cc:229 #, fuzzy msgid "audio" @@ -1398,6 +1405,13 @@ msgstr "" msgid "video" msgstr "Video" +#, fuzzy +#~ msgid "Add folder..." +#~ msgstr "Aggiungi File" + +#~ msgid "Content frame rate %.4f\n" +#~ msgstr "Freq. fotogrammi sorgente %.4f\n" + #~ msgid "1 channel" #~ msgstr "1 canale" diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po index 5e39aecdd..f8b04eca4 100644 --- a/src/wx/po/nl_NL.po +++ b/src/wx/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-09-04 20:17+0100\n" "Last-Translator: Cherif Ben Brahim \n" "Language-Team: UniversalDV \n" @@ -53,11 +53,11 @@ msgstr "2D" msgid "2D version of content available in 3D" msgstr "2D versie van 3D content beschikbaar" -#: src/wx/dcp_panel.cc:607 +#: src/wx/dcp_panel.cc:617 msgid "2K" msgstr "2K" -#: src/wx/dcp_panel.cc:555 +#: src/wx/dcp_panel.cc:565 msgid "3D" msgstr "3D" @@ -81,10 +81,17 @@ msgstr "3D enkel rechts" msgid "3D top/bottom" msgstr "3D boven/beneden" -#: src/wx/dcp_panel.cc:608 +#: src/wx/dcp_panel.cc:618 msgid "4K" msgstr "4K" +#: src/wx/hints_dialog.cc:119 +msgid "" +"A few projectors have problems playing back very high bit-rate DCPs. It is " +"a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is " +"unlikely to have any visible effect on the image." +msgstr "" + #: src/wx/update_dialog.cc:34 msgid "A new version of DCP-o-matic is available." msgstr "Een nieuwe versie van DCP-o-matic is beschikbaar." @@ -106,20 +113,30 @@ msgstr "Voeg Bioscoop toe..." msgid "Add Screen..." msgstr "Voeg Scherm toe..." -#: src/wx/content_panel.cc:67 +#: src/wx/content_panel.cc:73 +msgid "" +"Add a directory of image files which will be used as a moving image sequence." +msgstr "" + +#: src/wx/content_panel.cc:68 msgid "Add file(s)..." msgstr "Voeg bestande(n) toe..." +#: src/wx/content_panel.cc:72 +msgid "" +"Add image\n" +"sequence..." +msgstr "" + #: src/wx/content_panel.cc:69 -#, fuzzy -msgid "Add folder..." -msgstr "Voeg bestande(n) toe..." +msgid "Add video, image or sound files to the film." +msgstr "" #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62 msgid "Add..." msgstr "Toevoegen.." -#: src/wx/hints_dialog.cc:102 +#: src/wx/hints_dialog.cc:107 msgid "" "All of your content is at 1.85:1 or narrower but your DCP's container is " "Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " @@ -131,7 +148,7 @@ msgstr "" "van het beeld zullen komen. U kan best de DCP's container instellen in Flat " "(1.85:1) in de \"DCP\"tab." -#: src/wx/hints_dialog.cc:96 +#: src/wx/hints_dialog.cc:101 msgid "" "All of your content is in Scope (2.39:1) but your DCP's container is Flat " "(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " @@ -176,15 +193,6 @@ msgstr "" "Audio wordt doorgestuurd van content kanaal %d naar DCP kanaal %d met gain " "%1fdB." -#: src/wx/audio_panel.cc:274 -#, c-format -msgid "Audio will be resampled from %.3fkHz to %.3fkHz." -msgstr "" - -#: src/wx/audio_panel.cc:279 -msgid "Audio will not be resampled." -msgstr "" - #: src/wx/config_dialog.cc:1022 msgid "BCC address" msgstr "BCC adres" @@ -210,7 +218,7 @@ msgstr "BsL" msgid "BsR" msgstr "BsR" -#: src/wx/dcp_panel.cc:551 +#: src/wx/dcp_panel.cc:561 msgid "Burn subtitles into image" msgstr "" @@ -271,7 +279,7 @@ msgstr "Ketting" msgid "Channel gain" msgstr "Kanaal versterking" -#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:623 +#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:633 msgid "Channels" msgstr "Kanalen" @@ -287,11 +295,11 @@ msgstr "Selecteer voor updates controle bij startup" msgid "Choose a file" msgstr "Kies een bestand" -#: src/wx/content_panel.cc:241 +#: src/wx/content_panel.cc:236 msgid "Choose a file or files" msgstr "Kies bestand(en)" -#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264 +#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:259 msgid "Choose a folder" msgstr "Kies map" @@ -312,7 +320,7 @@ msgstr "Colour conversion" msgid "Config|Timing" msgstr "Configureer|Timing" -#: src/wx/dcp_panel.cc:532 +#: src/wx/dcp_panel.cc:542 msgid "Container" msgstr "Container" @@ -324,20 +332,10 @@ msgstr "Content" msgid "Content Type" msgstr "Content Type" -#: src/wx/video_panel.cc:367 -#, c-format -msgid "Content frame rate %.4f\n" -msgstr "Content frame rate %.4f\n" - #: src/wx/isdcf_metadata_dialog.cc:32 msgid "Content version" msgstr "Content versie" -#: src/wx/video_panel.cc:327 -#, c-format -msgid "Content video is %dx%d (%.2f:1)\n" -msgstr "Content video is %dx%d (%.2f:1)\n" - #: src/wx/editable_list.h:64 msgid "Copy..." msgstr "Kopieer..." @@ -346,7 +344,7 @@ msgstr "Kopieer..." msgid "Could not analyse audio." msgstr "Kan audio niet analyseren" -#: src/wx/content_panel.cc:280 +#: src/wx/content_panel.cc:275 msgid "Could not find any images nor a DCP in that folder" msgstr "" @@ -374,11 +372,6 @@ msgstr "Land" msgid "Create in folder" msgstr "Maak in map" -#: src/wx/video_panel.cc:339 -#, c-format -msgid "Cropped to %dx%d (%.2f:1)\n" -msgstr "Cropped naar %dx%d (%.2f:1)\n" - #: src/wx/video_panel.cc:248 msgid "Custom" msgstr "aangepast" @@ -470,7 +463,7 @@ msgstr "Doremi" msgid "Doremi serial numbers must have 6 digits" msgstr "Doremi serial numbers moeten bestaan uit 6 digits" -#: src/wx/content_panel.cc:75 +#: src/wx/content_panel.cc:84 msgid "Down" msgstr "Naar beneden" @@ -559,7 +552,7 @@ msgstr "Filters" msgid "Find missing..." msgstr "Zoek ontbrekende..." -#: src/wx/dcp_panel.cc:538 +#: src/wx/dcp_panel.cc:548 msgid "Frame Rate" msgstr "Frame Rate" @@ -660,7 +653,7 @@ msgstr "" msgid "Interop" msgstr "Interop" -#: src/wx/dcp_panel.cc:565 +#: src/wx/dcp_panel.cc:575 msgid "JPEG2000 bandwidth" msgstr "JPEG2000 bandbreedte" @@ -680,7 +673,7 @@ msgstr "soort KDM" msgid "KDM|Timing" msgstr "KDM|Timing" -#: src/wx/content_panel.cc:85 src/wx/timeline_dialog.cc:42 +#: src/wx/timeline_dialog.cc:42 msgid "Keep video in sequence" msgstr "Behoud video in tijdlijn" @@ -738,7 +731,7 @@ msgstr "" msgid "Ls" msgstr "Ls" -#: src/wx/content_panel.cc:438 +#: src/wx/content_panel.cc:432 msgid "MISSING: " msgstr "ONTBREEKT:" @@ -773,10 +766,18 @@ msgid "Maximum JPEG2000 bandwidth" msgstr "Maximum JPEG2000 bandbreedte" #: src/wx/config_dialog.cc:297 src/wx/config_dialog.cc:1137 -#: src/wx/dcp_panel.cc:569 +#: src/wx/dcp_panel.cc:579 msgid "Mbit/s" msgstr "Mbit/s" +#: src/wx/content_panel.cc:81 +msgid "Move the selected piece of content earlier in the film." +msgstr "" + +#: src/wx/content_panel.cc:85 +msgid "Move the selected piece of content later in the film." +msgstr "" + #: src/wx/video_panel.cc:315 msgid "Multiple content selected" msgstr "Meedere content geselecteerd" @@ -785,7 +786,7 @@ msgstr "Meedere content geselecteerd" msgid "My Documents" msgstr "Mijn documenten" -#: src/wx/content_panel.cc:442 +#: src/wx/content_panel.cc:436 msgid "NEEDS KDM: " msgstr "" @@ -810,7 +811,7 @@ msgstr "" "Er wordt geen audio van het content kanaal %d doorgestuurd naar DCP kanaal " "%d." -#: src/wx/audio_panel.cc:326 src/wx/video_panel.cc:161 +#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:161 #: src/wx/video_panel.cc:253 src/wx/video_panel.cc:262 msgid "None" msgstr "Geen" @@ -823,6 +824,10 @@ msgstr "Uit" msgid "Open console window" msgstr "" +#: src/wx/content_panel.cc:89 +msgid "Open the timeline for the film." +msgstr "" + #: src/wx/make_signer_chain_dialog.cc:25 msgid "Organisation" msgstr "" @@ -856,11 +861,6 @@ msgstr "Output gamma" msgid "Package Type (e.g. OV)" msgstr "Package Type (e.g. OV)" -#: src/wx/video_panel.cc:360 -#, c-format -msgid "Padded with black to %dx%d (%.2f:1)\n" -msgstr "Opgevuld met zwart tot %dx%d (%.2f:1)\n" - #: src/wx/config_dialog.cc:911 msgid "Password" msgstr "Wachtwoord" @@ -935,7 +935,7 @@ msgid "Red band" msgstr "Rode tape" #: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59 -#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68 +#: src/wx/content_panel.cc:76 src/wx/editable_list.h:68 msgid "Remove" msgstr "Verwijder" @@ -947,6 +947,10 @@ msgstr "Verwijder Bioscoop" msgid "Remove Screen" msgstr "Verwijder Scherm" +#: src/wx/content_panel.cc:77 +msgid "Remove the selected piece of content from the film." +msgstr "" + #: src/wx/repeat_dialog.cc:26 msgid "Repeat" msgstr "Herhaal" @@ -963,7 +967,7 @@ msgstr "Herhaal..." msgid "Reset to default text" msgstr "Herinstellen oorspronkelijke tekst" -#: src/wx/dcp_panel.cc:559 +#: src/wx/dcp_panel.cc:569 msgid "Resolution" msgstr "Resolutie" @@ -999,12 +1003,7 @@ msgstr "SMPTE" msgid "Scale to" msgstr "Schaal tot" -#: src/wx/video_panel.cc:351 -#, c-format -msgid "Scaled to %dx%d (%.2f:1)\n" -msgstr "Geschaald naar %dx%d (%.2f:1)\n" - -#: src/wx/dcp_panel.cc:574 +#: src/wx/dcp_panel.cc:584 msgid "Scaler" msgstr "Schaler" @@ -1153,7 +1152,7 @@ msgstr "" "ontbrekende bestanden. Probeer opnieuw met de goede content of verwijder de " "ontbrekende content. " -#: src/wx/hints_dialog.cc:128 +#: src/wx/hints_dialog.cc:139 msgid "There are no hints: everything looks good!" msgstr "Er zijn geen tips, alles lijkt goed!" @@ -1185,7 +1184,7 @@ msgstr "Tijd" msgid "Timeline" msgstr "Tijdlijn" -#: src/wx/content_panel.cc:77 +#: src/wx/content_panel.cc:88 msgid "Timeline..." msgstr "Tijdlijn..." @@ -1226,7 +1225,7 @@ msgstr "Onbekend" msgid "Until" msgstr "Totdat" -#: src/wx/content_panel.cc:73 +#: src/wx/content_panel.cc:80 msgid "Up" msgstr "Omhoog" @@ -1242,7 +1241,7 @@ msgstr "Gebruik ISDCF naam" msgid "Use all servers" msgstr "Gebruik alle servers" -#: src/wx/dcp_panel.cc:545 +#: src/wx/dcp_panel.cc:555 msgid "Use best" msgstr "Gebruik de beste" @@ -1305,7 +1304,7 @@ msgstr "Y offset" msgid "Y Scale" msgstr "Schaal" -#: src/wx/hints_dialog.cc:121 +#: src/wx/hints_dialog.cc:132 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1314,7 +1313,7 @@ msgstr "" "U hebt %d bestanden die lijken op VOB bestanden van DVD. U moet deze " "samenvoegen om soepele weergave mogelijk te maken." -#: src/wx/hints_dialog.cc:108 +#: src/wx/hints_dialog.cc:113 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1339,6 +1338,15 @@ msgstr "" "Uw DCP heeft minder dan 6 audio kanalen. This kan problemen geven op sommige " "projectors." +#: src/wx/hints_dialog.cc:80 +#, fuzzy +msgid "" +"Your DCP has no audio channels. This is likely to cause problems on " +"playback." +msgstr "" +"Uw DCP heeft een oneven aantal audio kanalen. Dit geeft hoogstwaarschijnlijk " +"problemen met weergave." + #: src/wx/timeline.cc:229 msgid "audio" msgstr "audio" @@ -1377,6 +1385,10 @@ msgstr "tijden" msgid "video" msgstr "video" +#, fuzzy +#~ msgid "Add folder..." +#~ msgstr "Voeg bestande(n) toe..." + #~ msgid "1 channel" #~ msgstr "1 channel" diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po index ebbe23748..c31a103d8 100644 --- a/src/wx/po/sv_SE.po +++ b/src/wx/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 23:31+0000\n" +"POT-Creation-Date: 2014-11-06 11:37+0000\n" "PO-Revision-Date: 2014-01-19 09:14+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" @@ -53,11 +53,11 @@ msgstr "2D" msgid "2D version of content available in 3D" msgstr "Nya versioner av DCP-o-matic finns tillgängligt." -#: src/wx/dcp_panel.cc:607 +#: src/wx/dcp_panel.cc:617 msgid "2K" msgstr "2K" -#: src/wx/dcp_panel.cc:555 +#: src/wx/dcp_panel.cc:565 msgid "3D" msgstr "3D" @@ -82,10 +82,17 @@ msgstr "3D left/right" msgid "3D top/bottom" msgstr "3D top/bottom" -#: src/wx/dcp_panel.cc:608 +#: src/wx/dcp_panel.cc:618 msgid "4K" msgstr "4K" +#: src/wx/hints_dialog.cc:119 +msgid "" +"A few projectors have problems playing back very high bit-rate DCPs. It is " +"a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is " +"unlikely to have any visible effect on the image." +msgstr "" + #: src/wx/update_dialog.cc:34 msgid "A new version of DCP-o-matic is available." msgstr "En ny version av DCP-o-matic finns tillgänglig." @@ -107,19 +114,30 @@ msgstr "Lägg till Cinema..." msgid "Add Screen..." msgstr "Lägg till Skärm..." -#: src/wx/content_panel.cc:67 +#: src/wx/content_panel.cc:73 +msgid "" +"Add a directory of image files which will be used as a moving image sequence." +msgstr "" + +#: src/wx/content_panel.cc:68 msgid "Add file(s)..." msgstr "Lägg till fil(er)..." +#: src/wx/content_panel.cc:72 +msgid "" +"Add image\n" +"sequence..." +msgstr "" + #: src/wx/content_panel.cc:69 -msgid "Add folder..." -msgstr "Lägg till folder..." +msgid "Add video, image or sound files to the film." +msgstr "" #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62 msgid "Add..." msgstr "Lägg till..." -#: src/wx/hints_dialog.cc:102 +#: src/wx/hints_dialog.cc:107 msgid "" "All of your content is at 1.85:1 or narrower but your DCP's container is " "Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) " @@ -127,7 +145,7 @@ msgid "" "\"DCP\" tab." msgstr "" -#: src/wx/hints_dialog.cc:96 +#: src/wx/hints_dialog.cc:101 msgid "" "All of your content is in Scope (2.39:1) but your DCP's container is Flat " "(1.85:1). This will letter-box your content inside a Flat (1.85:1) frame. " @@ -169,16 +187,6 @@ msgstr "" "Audio kommer att överföras från innehållskanal %d till DCP-kanal %d med " "förstärkning %.1fdB." -#: src/wx/audio_panel.cc:274 -#, fuzzy, c-format -msgid "Audio will be resampled from %.3fkHz to %.3fkHz." -msgstr "Audio kommer att samplas om från %dHz till %dHz." - -#: src/wx/audio_panel.cc:279 -#, fuzzy -msgid "Audio will not be resampled." -msgstr "Audio kommer att samplas om från %dHz till %dHz." - #: src/wx/config_dialog.cc:1022 #, fuzzy msgid "BCC address" @@ -205,7 +213,7 @@ msgstr "BsL" msgid "BsR" msgstr "BsR" -#: src/wx/dcp_panel.cc:551 +#: src/wx/dcp_panel.cc:561 msgid "Burn subtitles into image" msgstr "" @@ -270,7 +278,7 @@ msgstr "" msgid "Channel gain" msgstr "Kanalförstärkning" -#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:623 +#: src/wx/audio_dialog.cc:44 src/wx/dcp_panel.cc:633 msgid "Channels" msgstr "Kanaler" @@ -286,11 +294,11 @@ msgstr "Sök efter uppdateringar vid start" msgid "Choose a file" msgstr "Välj en fil" -#: src/wx/content_panel.cc:241 +#: src/wx/content_panel.cc:236 msgid "Choose a file or files" msgstr "Välj en fil eller filer" -#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264 +#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:259 msgid "Choose a folder" msgstr "Välj en folder" @@ -315,7 +323,7 @@ msgstr "Färgkonvertering" msgid "Config|Timing" msgstr "Tajming" -#: src/wx/dcp_panel.cc:532 +#: src/wx/dcp_panel.cc:542 msgid "Container" msgstr "Innehåll" @@ -327,20 +335,10 @@ msgstr "Innehåll" msgid "Content Type" msgstr "Innehållstyp" -#: src/wx/video_panel.cc:367 -#, c-format -msgid "Content frame rate %.4f\n" -msgstr "Innehållets bildhastighet %.4f\n" - #: src/wx/isdcf_metadata_dialog.cc:32 msgid "Content version" msgstr "Innehållsversion" -#: src/wx/video_panel.cc:327 -#, c-format -msgid "Content video is %dx%d (%.2f:1)\n" -msgstr "Original-videon är %dx%d (%.2f:1)\n" - #: src/wx/editable_list.h:64 msgid "Copy..." msgstr "" @@ -349,7 +347,7 @@ msgstr "" msgid "Could not analyse audio." msgstr "Kunde inte analysera audio." -#: src/wx/content_panel.cc:280 +#: src/wx/content_panel.cc:275 msgid "Could not find any images nor a DCP in that folder" msgstr "" @@ -377,11 +375,6 @@ msgstr "" msgid "Create in folder" msgstr "Skapa i katalog" -#: src/wx/video_panel.cc:339 -#, c-format -msgid "Cropped to %dx%d (%.2f:1)\n" -msgstr "Beskuren till %dx%d (%.2f:1)\n" - # sammanhang? #: src/wx/video_panel.cc:248 msgid "Custom" @@ -477,7 +470,7 @@ msgstr "" msgid "Doremi serial numbers must have 6 digits" msgstr "" -#: src/wx/content_panel.cc:75 +#: src/wx/content_panel.cc:84 msgid "Down" msgstr "Ner" @@ -568,7 +561,7 @@ msgstr "Filter" msgid "Find missing..." msgstr "Hitta saknade..." -#: src/wx/dcp_panel.cc:538 +#: src/wx/dcp_panel.cc:548 msgid "Frame Rate" msgstr "Bildhastighet" @@ -672,7 +665,7 @@ msgstr "" msgid "Interop" msgstr "Interop" -#: src/wx/dcp_panel.cc:565 +#: src/wx/dcp_panel.cc:575 msgid "JPEG2000 bandwidth" msgstr "JPEG2000-bandbredd" @@ -696,7 +689,7 @@ msgid "KDM|Timing" msgstr "Tajming" # "sekvens" eller "ordning"? -#: src/wx/content_panel.cc:85 src/wx/timeline_dialog.cc:42 +#: src/wx/timeline_dialog.cc:42 msgid "Keep video in sequence" msgstr "Behåll video i sekvens" @@ -754,7 +747,7 @@ msgstr "" msgid "Ls" msgstr "Vs" -#: src/wx/content_panel.cc:438 +#: src/wx/content_panel.cc:432 msgid "MISSING: " msgstr "SAKNAS:" @@ -789,10 +782,18 @@ msgid "Maximum JPEG2000 bandwidth" msgstr "JPEG2000-bandbredd" #: src/wx/config_dialog.cc:297 src/wx/config_dialog.cc:1137 -#: src/wx/dcp_panel.cc:569 +#: src/wx/dcp_panel.cc:579 msgid "Mbit/s" msgstr "" +#: src/wx/content_panel.cc:81 +msgid "Move the selected piece of content earlier in the film." +msgstr "" + +#: src/wx/content_panel.cc:85 +msgid "Move the selected piece of content later in the film." +msgstr "" + # Låter mysko #: src/wx/video_panel.cc:315 msgid "Multiple content selected" @@ -802,7 +803,7 @@ msgstr "Flera innehåll valda" msgid "My Documents" msgstr "Mina Dokument" -#: src/wx/content_panel.cc:442 +#: src/wx/content_panel.cc:436 msgid "NEEDS KDM: " msgstr "" @@ -827,7 +828,7 @@ msgstr "" "Ingen audio kommer att överföras från innehållskanalen %d till DCP-kanalen " "%d." -#: src/wx/audio_panel.cc:326 src/wx/video_panel.cc:161 +#: src/wx/audio_panel.cc:317 src/wx/video_panel.cc:161 #: src/wx/video_panel.cc:253 src/wx/video_panel.cc:262 msgid "None" msgstr "Inget" @@ -840,6 +841,10 @@ msgstr "Av" msgid "Open console window" msgstr "" +#: src/wx/content_panel.cc:89 +msgid "Open the timeline for the film." +msgstr "" + #: src/wx/make_signer_chain_dialog.cc:25 #, fuzzy msgid "Organisation" @@ -876,11 +881,6 @@ msgstr "Utdata gamma" msgid "Package Type (e.g. OV)" msgstr "Förpackningstyp (ex. OV)" -#: src/wx/video_panel.cc:360 -#, c-format -msgid "Padded with black to %dx%d (%.2f:1)\n" -msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n" - #: src/wx/config_dialog.cc:911 msgid "Password" msgstr "Lösenord" @@ -954,7 +954,7 @@ msgid "Red band" msgstr "" #: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59 -#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68 +#: src/wx/content_panel.cc:76 src/wx/editable_list.h:68 msgid "Remove" msgstr "Ta bort" @@ -967,6 +967,10 @@ msgstr "Ta bort Cinema" msgid "Remove Screen" msgstr "Ta bort Skärm" +#: src/wx/content_panel.cc:77 +msgid "Remove the selected piece of content from the film." +msgstr "" + #: src/wx/repeat_dialog.cc:26 msgid "Repeat" msgstr "Upprepa" @@ -983,7 +987,7 @@ msgstr "Upprepa..." msgid "Reset to default text" msgstr "" -#: src/wx/dcp_panel.cc:559 +#: src/wx/dcp_panel.cc:569 msgid "Resolution" msgstr "Upplösning" @@ -1019,12 +1023,7 @@ msgstr "SMPTE" msgid "Scale to" msgstr "Skala om till" -#: src/wx/video_panel.cc:351 -#, c-format -msgid "Scaled to %dx%d (%.2f:1)\n" -msgstr "Skalad till %dx%d (%.2f:1)\n" - -#: src/wx/dcp_panel.cc:574 +#: src/wx/dcp_panel.cc:584 msgid "Scaler" msgstr "Omskalare" @@ -1180,7 +1179,7 @@ msgstr "" "Innehållsfilerna du angav är inte samma som de som saknas. Försök igen med " "rätt innehållsfiler eller ta bort det saknade innehållet." -#: src/wx/hints_dialog.cc:128 +#: src/wx/hints_dialog.cc:139 msgid "There are no hints: everything looks good!" msgstr "Det finns inga råd: allt verkar bra!" @@ -1212,7 +1211,7 @@ msgstr "Tid" msgid "Timeline" msgstr "Tidslinje" -#: src/wx/content_panel.cc:77 +#: src/wx/content_panel.cc:88 msgid "Timeline..." msgstr "Tidslinje..." @@ -1258,7 +1257,7 @@ msgstr "okänt" msgid "Until" msgstr "Tills" -#: src/wx/content_panel.cc:73 +#: src/wx/content_panel.cc:80 msgid "Up" msgstr "Upp" @@ -1275,7 +1274,7 @@ msgstr "Använd DCI-namnet" msgid "Use all servers" msgstr "Använd alla servrar" -#: src/wx/dcp_panel.cc:545 +#: src/wx/dcp_panel.cc:555 msgid "Use best" msgstr "Använd bästa" @@ -1340,7 +1339,7 @@ msgstr "Undertext Förskjutning" msgid "Y Scale" msgstr "Omskalare" -#: src/wx/hints_dialog.cc:121 +#: src/wx/hints_dialog.cc:132 #, c-format msgid "" "You have %d files that look like they are VOB files from DVD. You should " @@ -1349,7 +1348,7 @@ msgstr "" "Du har %d filer som verkar vara VOB-filer från DVD. Du borde sammanfoga dom " "för att säkerställa jämna övergångar mellan filerna." -#: src/wx/hints_dialog.cc:108 +#: src/wx/hints_dialog.cc:113 #, c-format msgid "" "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) " @@ -1374,6 +1373,15 @@ msgstr "" "Din DCP har mindre än 6 audiokanaler. Detta kan medföra problem på vissa " "projektorer." +#: src/wx/hints_dialog.cc:80 +#, fuzzy +msgid "" +"Your DCP has no audio channels. This is likely to cause problems on " +"playback." +msgstr "" +"Din DCP har udda antal audiokanaler. Detta kommer troligen att ge problem " +"vid uppspelning." + #: src/wx/timeline.cc:229 msgid "audio" msgstr "audio" @@ -1413,6 +1421,13 @@ msgstr "tider" msgid "video" msgstr "video" +#~ msgid "Add folder..." +#~ msgstr "Lägg till folder..." + +#, fuzzy +#~ msgid "Audio will not be resampled." +#~ msgstr "Audio kommer att samplas om från %dHz till %dHz." + #~ msgid "1 channel" #~ msgstr "1 kanal" diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 569da6c8b..e6950f7e7 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -316,65 +316,14 @@ VideoPanel::setup_description () return; } - shared_ptr vcs = vc.front (); - - wxString d; - - int lines = 0; - - if (vcs->video_size().width && vcs->video_size().height) { - d << wxString::Format ( - _("Content video is %dx%d (%.2f:1)\n"), - vcs->video_size_after_3d_split().width, - vcs->video_size_after_3d_split().height, - vcs->video_size_after_3d_split().ratio () - ); - ++lines; - } - - Crop const crop = vcs->crop (); - if ((crop.left || crop.right || crop.top || crop.bottom) && vcs->video_size() != dcp::Size (0, 0)) { - dcp::Size cropped = vcs->video_size_after_crop (); - d << wxString::Format ( - _("Cropped to %dx%d (%.2f:1)\n"), - cropped.width, cropped.height, - cropped.ratio () - ); - ++lines; - } - - dcp::Size const container_size = _parent->film()->frame_size (); - dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size, 1); - - if (scaled != vcs->video_size_after_crop ()) { - d << wxString::Format ( - _("Scaled to %dx%d (%.2f:1)\n"), - scaled.width, scaled.height, - scaled.ratio () - ); - ++lines; - } - - if (scaled != container_size) { - d << wxString::Format ( - _("Padded with black to %dx%d (%.2f:1)\n"), - container_size.width, container_size.height, - container_size.ratio () - ); - ++lines; - } - - d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ()); - ++lines; - FrameRateChange frc (vcs->video_frame_rate(), _parent->film()->video_frame_rate ()); - d << std_to_wx (frc.description ()) << "\n"; - ++lines; + string d = vc.front()->processing_description (); + size_t lines = count (d.begin(), d.end(), '\n'); for (int i = lines; i < 6; ++i) { - d << wxT ("\n "); + d += "\n "; } - _description->SetLabel (d); + _description->SetLabel (std_to_wx (d)); _sizer->Layout (); }