diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/config.h | 4 | ||||
| -rw-r--r-- | src/lib/film.cc | 35 | ||||
| -rw-r--r-- | src/lib/po/fr_FR.po | 2 | ||||
| -rw-r--r-- | src/lib/util.cc | 5 | ||||
| -rw-r--r-- | src/tools/po/it_IT.po | 12 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 27 | ||||
| -rw-r--r-- | src/wx/config_dialog.h | 3 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 14 | ||||
| -rw-r--r-- | src/wx/po/fr_FR.po | 6 | ||||
| -rw-r--r-- | src/wx/po/it_IT.po | 120 | ||||
| -rw-r--r-- | src/wx/properties_dialog.cc | 2 |
11 files changed, 131 insertions, 99 deletions
diff --git a/src/lib/config.h b/src/lib/config.h index ee46166e6..011ca716f 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -165,6 +165,10 @@ public: void set_language (std::string l) { _language = l; } + + void unset_language () { + _language = boost::none; + } void write () const; diff --git a/src/lib/film.cc b/src/lib/film.cc index c84042451..bd11c1eb5 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -755,70 +755,67 @@ Film::dci_name (bool if_created_now) const fixed_name = fixed_name.substr (0, 14); } - d << fixed_name << "_"; + d << fixed_name; if (dcp_content_type()) { - d << dcp_content_type()->dci_name() << "_"; + d << "_" << dcp_content_type()->dci_name(); } if (format()) { - d << format()->dci_name() << "_"; + d << "_" << format()->dci_name(); } DCIMetadata const dm = dci_metadata (); if (!dm.audio_language.empty ()) { - d << dm.audio_language; - if (!dm.subtitle_language.empty() && with_subtitles()) { + d << "_" << dm.audio_language; + if (!dm.subtitle_language.empty()) { d << "-" << dm.subtitle_language; } else { d << "-XX"; } - - d << "_"; } if (!dm.territory.empty ()) { - d << dm.territory; + d << "_" << dm.territory; if (!dm.rating.empty ()) { d << "-" << dm.rating; } - d << "_"; } switch (audio_channels()) { case 1: - d << "10_"; + d << "_10"; break; case 2: - d << "20_"; + d << "_20"; break; case 6: - d << "51_"; + d << "_51"; break; case 8: - d << "71_"; + d << "_71"; break; } - d << "2K_"; + d << "_2K"; if (!dm.studio.empty ()) { - d << dm.studio << "_"; + d << "_" << dm.studio; } if (if_created_now) { - d << boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ()) << "_"; + d << "_" << boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ()); } else { - d << boost::gregorian::to_iso_string (_dci_date) << "_"; + d << "_" << boost::gregorian::to_iso_string (_dci_date); } if (!dm.facility.empty ()) { - d << dm.facility << "_"; + d << "_" << dm.facility; } if (!dm.package_type.empty ()) { - d << dm.package_type; + d << "_" << dm.package_type; } return d.str (); diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index 895afcabe..7832e4223 100644 --- a/src/lib/po/fr_FR.po +++ b/src/lib/po/fr_FR.po @@ -225,7 +225,7 @@ msgstr "Débruiteur 3D haute qualité" #: src/lib/filter.cc:68 msgid "Horizontal deblocking filter" -msgstr "Filtre débloc horizontal" +msgstr "Filtre dé-bloc horizontal" #: src/lib/filter.cc:70 msgid "Horizontal deblocking filter A" diff --git a/src/lib/util.cc b/src/lib/util.cc index 593d0e760..2e4671251 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -271,7 +271,10 @@ dvdomatic_setup_i18n (string lang) putenv (e.c_str()); bindtextdomain ("libdvdomatic", mo_path().string().c_str()); -#endif +#else + /* Hack to silence warning */ + lang.clear (); +#endif #ifdef DVDOMATIC_POSIX bindtextdomain ("libdvdomatic", POSIX_LOCALE_PREFIX); diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po index 89385047b..23574ee41 100644 --- a/src/tools/po/it_IT.po +++ b/src/tools/po/it_IT.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-20 13:37+0000\n" -"PO-Revision-Date: 2013-03-20 12:03+0100\n" +"POT-Creation-Date: 2013-03-15 08:39+0000\n" +"PO-Revision-Date: 2013-03-22 18:03+0100\n" "Last-Translator: Maci <macibro@gmail.com>\n" "Language-Team: \n" -"Language: Italiano\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.5\n" +"Language: Italiano\n" #: src/tools/dvdomatic.cc:177 msgid "&Analyse audio" @@ -75,7 +75,7 @@ msgstr "" msgid "About" msgstr "Informazioni" -#: src/tools/dvdomatic.cc:500 +#: src/tools/dvdomatic.cc:497 msgid "Could not load film %1 (%2)" msgstr "Non posso caricare il film %1 (%2)" @@ -85,7 +85,7 @@ msgid "Could not open film at %s (%s)" msgstr "Non posso aprire il film in %s (%s)" #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402 -#: src/tools/dvdomatic.cc:504 +#: src/tools/dvdomatic.cc:501 msgid "DVD-o-matic" msgstr "DVD-o-matic" @@ -112,4 +112,4 @@ msgstr "Seleziona il film da aprire" #: src/tools/dvdomatic.cc:303 #, c-format msgid "The directory %s already exists." -msgstr "La directory %s esiste già." +msgstr "La directory %s esiste gia'." diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index ea1a7319e..364336114 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -46,7 +46,8 @@ ConfigDialog::ConfigDialog (wxWindow* parent) wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6); table->AddGrowableCol (1, 1); - add_label_to_sizer (table, this, _("User interface language")); + _set_language = new wxCheckBox (this, wxID_ANY, _("Set language")); + table->Add (_set_language, 1, wxEXPAND); _language = new wxChoice (this, wxID_ANY); _language->Append (wxT ("English")); _language->Append (wxT ("Français")); @@ -149,6 +150,8 @@ ConfigDialog::ConfigDialog (wxWindow* parent) Config* config = Config::instance (); + _set_language->SetValue (config->language ()); + if (config->language().get_value_or ("") == "fr") { _language->SetSelection (1); } else if (config->language().get_value_or ("") == "it") { @@ -158,7 +161,10 @@ ConfigDialog::ConfigDialog (wxWindow* parent) } else { _language->SetSelection (0); } - + + setup_language_sensitivity (); + + _set_language->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (ConfigDialog::set_language_changed), 0, this); _language->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::language_changed), 0, this); _tms_ip->SetValue (std_to_wx (config->tms_ip ())); _tms_ip->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_ip_changed), 0, this); @@ -371,3 +377,20 @@ ConfigDialog::edit_default_dci_metadata_clicked (wxCommandEvent &) Config::instance()->set_default_dci_metadata (d->dci_metadata ()); d->Destroy (); } + +void +ConfigDialog::set_language_changed (wxCommandEvent& ev) +{ + setup_language_sensitivity (); + if (_set_language->GetValue ()) { + language_changed (ev); + } else { + Config::instance()->unset_language (); + } +} + +void +ConfigDialog::setup_language_sensitivity () +{ + _language->Enable (_set_language->GetValue ()); +} diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h index 8a3c81ec9..f6f3b3707 100644 --- a/src/wx/config_dialog.h +++ b/src/wx/config_dialog.h @@ -39,6 +39,7 @@ public: ConfigDialog (wxWindow *); private: + void set_language_changed (wxCommandEvent &); void language_changed (wxCommandEvent &); void tms_ip_changed (wxCommandEvent &); void tms_path_changed (wxCommandEvent &); @@ -56,7 +57,9 @@ private: void server_selection_changed (wxListEvent &); void add_server_to_control (ServerDescription *); + void setup_language_sensitivity (); + wxCheckBox* _set_language; wxChoice* _language; wxTextCtrl* _tms_ip; wxTextCtrl* _tms_path; diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 2553d0bd5..ec99f4d9d 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -687,9 +687,11 @@ FilmEditor::film_changed (Film::Property p) break; case Film::LENGTH: if (_film->source_frame_rate() > 0 && _film->length()) { - s << _film->length().get() << " " << _("frames") << "; " << seconds_to_hms (_film->length().get() / _film->source_frame_rate()); + s << _film->length().get() << " " + << wx_to_std (_("frames")) << "; " << seconds_to_hms (_film->length().get() / _film->source_frame_rate()); } else if (_film->length()) { - s << _film->length().get() << " " << _("frames"); + s << _film->length().get() << " " + << wx_to_std (_("frames")); } _length->SetLabel (std_to_wx (s.str ())); if (_film->length()) { @@ -842,7 +844,7 @@ FilmEditor::set_film (shared_ptr<Film> f) if (_film) { FileChanged (_film->directory ()); } else { - FileChanged (wx_to_std (N_(""))); + FileChanged (""); } if (_audio_dialog) { @@ -1226,11 +1228,11 @@ FilmEditor::setup_audio_details () } else { stringstream s; if (_film->audio_stream()->channels() == 1) { - s << _("1 channel"); + s << wx_to_std (_("1 channel")); } else { - s << _film->audio_stream()->channels () << " " << _("channels"); + s << _film->audio_stream()->channels () << " " << wx_to_std (_("channels")); } - s << ", " << _film->audio_stream()->sample_rate() << _("Hz"); + s << ", " << _film->audio_stream()->sample_rate() << wx_to_std (_("Hz")); _audio->SetLabel (std_to_wx (s.str ())); } } diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po index a36d07776..669283aa6 100644 --- a/src/wx/po/fr_FR.po +++ b/src/wx/po/fr_FR.po @@ -236,7 +236,7 @@ msgstr "Découpe gauche" #: src/wx/film_editor.cc:164 msgid "Length" -msgstr "Longueur" +msgstr "Longueur durée" #: src/wx/film_editor.cc:339 msgid "MBps" @@ -296,7 +296,7 @@ msgstr "Filtres de référence pour A/B" #: src/wx/config_dialog.cc:88 msgid "Reference scaler for A/B" -msgstr "Échelle de référence pour A7B" +msgstr "Échelle de référence pour A/B" #: src/wx/config_dialog.cc:128 msgid "Remove" @@ -328,7 +328,7 @@ msgstr "Serveur" #: src/wx/film_editor.cc:364 msgid "Show Audio..." -msgstr "Montrer le son..." +msgstr "Analyser le son..." #: src/wx/audio_dialog.cc:71 msgid "Smoothing" diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po index 89ae9efec..5f6b62fb2 100644 --- a/src/wx/po/it_IT.po +++ b/src/wx/po/it_IT.po @@ -7,25 +7,25 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-20 13:37+0000\n" -"PO-Revision-Date: 2013-03-20 11:50+0100\n" +"POT-Creation-Date: 2013-03-15 08:39+0000\n" +"PO-Revision-Date: 2013-03-22 18:10+0100\n" "Last-Translator: Maci <macibro@gmail.com>\n" "Language-Team: \n" -"Language: Italiano\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.5\n" +"Language: Italiano\n" -#: src/wx/film_editor.cc:440 +#: src/wx/film_editor.cc:441 msgid "%" msgstr "%" -#: src/wx/film_editor.cc:1229 +#: src/wx/film_editor.cc:1230 msgid "1 channel" msgstr "Canale 1" -#: src/wx/film_editor.cc:184 +#: src/wx/film_editor.cc:185 msgid "A/B" msgstr "A/B" @@ -33,15 +33,15 @@ msgstr "A/B" msgid "Add" msgstr "Aggiungi" -#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77 +#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:78 msgid "Audio" msgstr "Audio" -#: src/wx/film_editor.cc:381 +#: src/wx/film_editor.cc:382 msgid "Audio Delay" msgstr "Ritardo dell'audio" -#: src/wx/film_editor.cc:369 +#: src/wx/film_editor.cc:370 msgid "Audio Gain" msgstr "Guadagno dell'audio" @@ -54,7 +54,7 @@ msgstr "Lingua dell'audio (es. EN)" msgid "Bad setting for %s (%s)" msgstr "Valore sbagliato per %s (%s)" -#: src/wx/film_editor.cc:296 +#: src/wx/film_editor.cc:297 msgid "Bottom crop" msgstr "Taglio in basso" @@ -64,9 +64,9 @@ msgstr "Sfoglia..." #: src/wx/gain_calculator_dialog.cc:36 msgid "But I have to use fader" -msgstr "Ma devo usare il fader" +msgstr "Ma dovrò riprodurre con il fader a" -#: src/wx/film_editor.cc:374 +#: src/wx/film_editor.cc:375 msgid "Calculate..." msgstr "Calcola..." @@ -74,15 +74,15 @@ msgstr "Calcola..." msgid "Channels" msgstr "Canali" -#: src/wx/film_editor.cc:325 +#: src/wx/film_editor.cc:326 msgid "Colour look-up table" msgstr "Tabella per ricerca del colore" -#: src/wx/film_editor.cc:120 +#: src/wx/film_editor.cc:121 msgid "Content" msgstr "Contenuto" -#: src/wx/film_editor.cc:130 +#: src/wx/film_editor.cc:131 msgid "Content Type" msgstr "Tipo di contenuto" @@ -101,7 +101,7 @@ msgstr "Non posso creare il DCP: %s" msgid "Could not open content file (%s)" msgstr "Non posso aprire il file del contenuto (%s)" -#: src/wx/film_editor.cc:504 +#: src/wx/film_editor.cc:505 #, c-format msgid "Could not set content: %s" msgstr "Non posso regolare il contenuto: %s" @@ -114,11 +114,11 @@ msgstr "Crea nella cartella" msgid "DCI name" msgstr "Nome del DCP" -#: src/wx/film_editor.cc:141 +#: src/wx/film_editor.cc:142 msgid "DCP Frame Rate" msgstr "Frequenza fotogrammi del DCP" -#: src/wx/film_editor.cc:109 +#: src/wx/film_editor.cc:110 msgid "DCP Name" msgstr "Nome del DCP" @@ -142,7 +142,7 @@ msgstr "Dettagli del nome di default DCI" msgid "Default directory for new films" msgstr "Directory di default per i nuovi films" -#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:88 +#: src/wx/film_editor.cc:117 src/wx/job_manager_view.cc:88 msgid "Details..." msgstr "Dettagli" @@ -150,7 +150,7 @@ msgstr "Dettagli" msgid "Disk space required" msgstr "Spazio su disco rischiesto" -#: src/wx/film_editor.cc:191 +#: src/wx/film_editor.cc:192 msgid "Duration" msgstr "Durata" @@ -159,7 +159,7 @@ msgid "Edit" msgstr "Modifica" #: src/wx/config_dialog.cc:84 src/wx/config_dialog.cc:103 -#: src/wx/film_editor.cc:308 +#: src/wx/film_editor.cc:309 msgid "Edit..." msgstr "Modifica..." @@ -167,7 +167,7 @@ msgstr "Modifica..." msgid "Encoding Servers" msgstr "Servers di codifica" -#: src/wx/film_editor.cc:176 +#: src/wx/film_editor.cc:177 msgid "End" msgstr "Fine" @@ -175,7 +175,7 @@ msgstr "Fine" msgid "Facility (e.g. DLA)" msgstr "Facility (es. DLA)" -#: src/wx/film_editor.cc:73 +#: src/wx/film_editor.cc:74 msgid "Film" msgstr "Film" @@ -187,11 +187,11 @@ msgstr "Proprietà del film" msgid "Film name" msgstr "Nome del film" -#: src/wx/film_editor.cc:303 src/wx/filter_dialog.cc:32 +#: src/wx/film_editor.cc:304 src/wx/filter_dialog.cc:32 msgid "Filters" msgstr "Filtri" -#: src/wx/film_editor.cc:268 +#: src/wx/film_editor.cc:269 msgid "Format" msgstr "Formato" @@ -205,7 +205,7 @@ msgstr "Fotogrammi già codificati" #: src/wx/gain_calculator_dialog.cc:27 msgid "Gain Calculator" -msgstr "Calcolatore del guadagno" +msgstr "Calcola il guadagno audio" #: src/wx/properties_dialog.cc:59 msgid "Gb" @@ -215,31 +215,31 @@ msgstr "Gb" msgid "Host name or IP address" msgstr "Nome dell'Host o indirizzo IP" -#: src/wx/film_editor.cc:1233 +#: src/wx/film_editor.cc:1234 msgid "Hz" msgstr "Hz" #: src/wx/gain_calculator_dialog.cc:32 msgid "I want to play this back at fader" -msgstr "Voglio riprodurrlo back at fader" +msgstr "Sto usando il fader a" #: src/wx/config_dialog.cc:113 msgid "IP address" msgstr "Indirizzo IP" -#: src/wx/film_editor.cc:335 +#: src/wx/film_editor.cc:336 msgid "JPEG2000 bandwidth" msgstr "Banda passante JPEG2000" -#: src/wx/film_editor.cc:281 +#: src/wx/film_editor.cc:282 msgid "Left crop" msgstr "Taglio a sinistra" -#: src/wx/film_editor.cc:164 +#: src/wx/film_editor.cc:165 msgid "Length" msgstr "Lunghezza" -#: src/wx/film_editor.cc:339 +#: src/wx/film_editor.cc:340 msgid "MBps" msgstr "MBps" @@ -247,7 +247,7 @@ msgstr "MBps" msgid "My Documents" msgstr "Documenti" -#: src/wx/film_editor.cc:104 +#: src/wx/film_editor.cc:105 msgid "Name" msgstr "Nome" @@ -255,15 +255,15 @@ msgstr "Nome" msgid "New Film" msgstr "Nuovo Film" -#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:664 +#: src/wx/film_editor.cc:306 src/wx/film_editor.cc:665 msgid "None" msgstr "Nessuno" -#: src/wx/film_editor.cc:135 +#: src/wx/film_editor.cc:136 msgid "Original Frame Rate" msgstr "Frequenza fotogrammi originale" -#: src/wx/film_editor.cc:159 +#: src/wx/film_editor.cc:160 msgid "Original Size" msgstr "Dimensione Originale" @@ -303,7 +303,7 @@ msgstr "Scalatura di riferimento A/B" msgid "Remove" msgstr "Rimuovi" -#: src/wx/film_editor.cc:286 +#: src/wx/film_editor.cc:287 msgid "Right crop" msgstr "Taglio a destra" @@ -311,15 +311,15 @@ msgstr "Taglio a destra" msgid "Running" msgstr "In corso" -#: src/wx/film_editor.cc:315 +#: src/wx/film_editor.cc:316 msgid "Scaler" msgstr "Scaler" -#: src/wx/film_editor.cc:407 +#: src/wx/film_editor.cc:408 msgid "Select Audio File" -msgstr "Seleziona File Audio" +msgstr "Seleziona file audio" -#: src/wx/film_editor.cc:121 +#: src/wx/film_editor.cc:122 msgid "Select Content File" msgstr "Seleziona il file con il contenuto" @@ -327,7 +327,7 @@ msgstr "Seleziona il file con il contenuto" msgid "Server" msgstr "Server" -#: src/wx/film_editor.cc:364 +#: src/wx/film_editor.cc:365 msgid "Show Audio..." msgstr "Mostra Audio..." @@ -335,7 +335,7 @@ msgstr "Mostra Audio..." msgid "Smoothing" msgstr "Levigatura" -#: src/wx/film_editor.cc:173 +#: src/wx/film_editor.cc:174 msgid "Start" msgstr "Inizio" @@ -347,15 +347,15 @@ msgstr "Studio (es. TCF)" msgid "Subtitle Language (e.g. FR)" msgstr "Lingua dei Sottotitoli (es. FR)" -#: src/wx/film_editor.cc:431 +#: src/wx/film_editor.cc:432 msgid "Subtitle Offset" msgstr "Sfalsamento dei Sottotitoli" -#: src/wx/film_editor.cc:436 +#: src/wx/film_editor.cc:437 msgid "Subtitle Scale" msgstr "Scala dei Sottotitoli" -#: src/wx/film_editor.cc:79 +#: src/wx/film_editor.cc:80 msgid "Subtitles" msgstr "Sottotitoli" @@ -395,15 +395,15 @@ msgstr "Threads da usare per codificare su questo host" msgid "Time" msgstr "Tempo" -#: src/wx/film_editor.cc:291 +#: src/wx/film_editor.cc:292 msgid "Top crop" msgstr "Taglio in alto" -#: src/wx/film_editor.cc:171 +#: src/wx/film_editor.cc:172 msgid "Trim frames" msgstr "Taglia fotogrammi" -#: src/wx/film_editor.cc:125 +#: src/wx/film_editor.cc:126 msgid "Trust content's header" msgstr "Conferma l'intestazione del contenuto" @@ -411,31 +411,31 @@ msgstr "Conferma l'intestazione del contenuto" msgid "Type" msgstr "Tipo" -#: src/wx/film_editor.cc:114 +#: src/wx/film_editor.cc:115 msgid "Use DCI name" msgstr "Usa nome DCI" -#: src/wx/film_editor.cc:145 +#: src/wx/film_editor.cc:146 msgid "Use best" msgstr "Usa la migliore" -#: src/wx/film_editor.cc:391 +#: src/wx/film_editor.cc:392 msgid "Use content's audio" msgstr "Usa l'audio del contenuto" -#: src/wx/film_editor.cc:401 +#: src/wx/film_editor.cc:402 msgid "Use external audio" msgstr "Usa l'audio esterno" -#: src/wx/film_editor.cc:75 +#: src/wx/film_editor.cc:76 msgid "Video" msgstr "Video" -#: src/wx/film_editor.cc:424 +#: src/wx/film_editor.cc:425 msgid "With Subtitles" msgstr "Con Sottotitoli" -#: src/wx/film_editor.cc:1231 +#: src/wx/film_editor.cc:1232 msgid "channels" msgstr "canali" @@ -443,21 +443,21 @@ msgstr "canali" msgid "counting..." msgstr "conteggio..." -#: src/wx/film_editor.cc:373 +#: src/wx/film_editor.cc:374 msgid "dB" msgstr "dB" -#: src/wx/film_editor.cc:690 src/wx/film_editor.cc:692 +#: src/wx/film_editor.cc:691 src/wx/film_editor.cc:693 msgid "frames" msgstr "fotogrammi" #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time -#: src/wx/film_editor.cc:386 +#: src/wx/film_editor.cc:387 msgid "ms" msgstr "ms" #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time -#: src/wx/film_editor.cc:197 +#: src/wx/film_editor.cc:198 msgid "s" msgstr "s" diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc index f4acb6b1a..02f848c01 100644 --- a/src/wx/properties_dialog.cc +++ b/src/wx/properties_dialog.cc @@ -56,7 +56,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film) int const dcp_length = _film->length().get() * frc.factor(); double const disk = ((double) _film->j2k_bandwidth() / 8) * dcp_length / (_film->dcp_frame_rate() * 1073741824); stringstream s; - s << fixed << setprecision (1) << disk << _("Gb"); + s << fixed << setprecision (1) << disk << wx_to_std (_("Gb")); _disk->SetLabel (std_to_wx (s.str ())); } else { _frames->SetLabel (_("unknown")); |
