From 10b715d1ffa24e81eba7f6fe3d4fa98fc637e002 Mon Sep 17 00:00:00 2001 From: Alexandre Prokoudine Date: Sun, 6 Dec 2015 01:00:20 +0100 Subject: [PATCH] Normalize user-visible messages to use 8-bit, 16-bit, 24-bit, 32-bit and 64-bit --- gtk2_ardour/about.cc | 12 ++++++------ gtk2_ardour/session_dialog.cc | 12 ++++++------ libs/ardour/export_formats.cc | 10 +++++----- libs/ardour/plugin_manager.cc | 4 ++-- libs/ardour/sndfile_helpers.cc | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index bcaf84e956..2fdd36607b 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -593,17 +593,17 @@ About::About () } #if defined __x86_64__ || defined _M_X64 - const std::string cpu_arch = _("Intel 64 bit"); + const std::string cpu_arch = _("Intel 64-bit"); #elif defined __i386__ || defined _M_IX86 - const std::string cpu_arch = _("Intel 32 bit"); + const std::string cpu_arch = _("Intel 32-bit"); #elif defined __ppc__ && defined __LP64__ - const std::string cpu_arch = _("PowerPC 64bit"); + const std::string cpu_arch = _("PowerPC 64-bit"); #elif defined __ppc__ - const std::string cpu_arch = _("PowerPC 32bit"); + const std::string cpu_arch = _("PowerPC 32-bit"); #elif defined __LP64__ - const std::string cpu_arch = _("64bit"); + const std::string cpu_arch = _("64-bit"); #else - const std::string cpu_arch = _("32bit"); // ARM, ALPHA,.. + const std::string cpu_arch = _("32-bit"); // ARM, ALPHA,.. #endif std::string codename = CODENAME; if (ARDOUR::Profile->get_mixbus() || ARDOUR::Profile->get_trx()) { diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc index 22023f75bf..9ba479eb54 100644 --- a/gtk2_ardour/session_dialog.cc +++ b/gtk2_ardour/session_dialog.cc @@ -740,13 +740,13 @@ SessionDialog::redisplay_recent_sessions () row[recent_session_columns.sample_rate] = rate_as_string (sr); switch (sf) { case FormatFloat: - row[recent_session_columns.disk_format] = _("32 bit float"); + row[recent_session_columns.disk_format] = _("32-bit float"); break; case FormatInt24: - row[recent_session_columns.disk_format] = _("24 bit"); + row[recent_session_columns.disk_format] = _("24-bit"); break; case FormatInt16: - row[recent_session_columns.disk_format] = _("16 bit"); + row[recent_session_columns.disk_format] = _("16-bit"); break; } } else { @@ -787,13 +787,13 @@ SessionDialog::redisplay_recent_sessions () child_row[recent_session_columns.sample_rate] = rate_as_string (sr); switch (sf) { case FormatFloat: - child_row[recent_session_columns.disk_format] = _("32 bit float"); + child_row[recent_session_columns.disk_format] = _("32-bit float"); break; case FormatInt24: - child_row[recent_session_columns.disk_format] = _("24 bit"); + child_row[recent_session_columns.disk_format] = _("24-bit"); break; case FormatInt16: - child_row[recent_session_columns.disk_format] = _("16 bit"); + child_row[recent_session_columns.disk_format] = _("16-bit"); break; } } else { diff --git a/libs/ardour/export_formats.cc b/libs/ardour/export_formats.cc index 463a09468a..47f68fe464 100644 --- a/libs/ardour/export_formats.cc +++ b/libs/ardour/export_formats.cc @@ -156,19 +156,19 @@ HasSampleFormat::get_sample_format_name (ExportFormatBase::SampleFormat format) { switch (format) { case ExportFormatBase::SF_8: - return _("8bit"); + return _("8-bit"); case ExportFormatBase::SF_16: - return _("16bit"); + return _("16-bit"); case ExportFormatBase::SF_24: - return _("24bit"); + return _("24-bit"); case ExportFormatBase::SF_32: - return _("32bit"); + return _("32-bit"); case ExportFormatBase::SF_Float: return _("float"); case ExportFormatBase::SF_Double: return _("double"); case ExportFormatBase::SF_U8: - return _("8bit unsigned"); + return _("8-bit unsigned"); case ExportFormatBase::SF_Vorbis: return _("Vorbis sample format"); case ExportFormatBase::SF_None: diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 55c758cb5e..2e1b21e4ef 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -831,13 +831,13 @@ static std::string dll_info (std::string path) { type = *((uint16_t*) &buf[4]); switch (type) { case 0x014c: - rv = _("i386 (32bit)"); + rv = _("i386 (32-bit)"); break; case 0x0200: rv = _("Itanium"); break; case 0x8664: - rv = _("x64 (64bit)"); + rv = _("x64 (64-bit)"); break; case 0: rv = _("Native Architecture"); diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc index 08c57bfec2..1b69ca2d0a 100644 --- a/libs/ardour/sndfile_helpers.cc +++ b/libs/ardour/sndfile_helpers.cc @@ -34,7 +34,7 @@ const char * const sndfile_header_formats_strings[SNDFILE_HEADER_FORMATS+1] = { N_("WAV"), N_("AIFF"), N_("CAF"), - N_("W64 (64 bit WAV)"), + N_("W64 (64-bit WAV)"), N_("FLAC"), N_("Ogg/Vorbis"), N_("raw (no header)"), @@ -63,11 +63,11 @@ int sndfile_header_formats[SNDFILE_HEADER_FORMATS] = { }; const char * const sndfile_bitdepth_formats_strings[SNDFILE_BITDEPTH_FORMATS+1] = { - N_("Signed 16 bit PCM"), - N_("Signed 24 bit PCM"), - N_("Signed 32 bit PCM"), - N_("Signed 8 bit PCM"), - N_("32 bit float"), + N_("Signed 16-bit PCM"), + N_("Signed 24-bit PCM"), + N_("Signed 32-bit PCM"), + N_("Signed 8-bit PCM"), + N_("32-bit float"), 0 }; -- 2.30.2