Normalize user-visible messages to use 8-bit, 16-bit, 24-bit, 32-bit and 64-bit

This commit is contained in:
Alexandre Prokoudine 2015-12-06 01:00:20 +01:00 committed by Robin Gareus
parent 9fa4d3c77f
commit 10b715d1ff
5 changed files with 25 additions and 25 deletions

View file

@ -593,17 +593,17 @@ About::About ()
} }
#if defined __x86_64__ || defined _M_X64 #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 #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__ #elif defined __ppc__ && defined __LP64__
const std::string cpu_arch = _("PowerPC 64bit"); const std::string cpu_arch = _("PowerPC 64-bit");
#elif defined __ppc__ #elif defined __ppc__
const std::string cpu_arch = _("PowerPC 32bit"); const std::string cpu_arch = _("PowerPC 32-bit");
#elif defined __LP64__ #elif defined __LP64__
const std::string cpu_arch = _("64bit"); const std::string cpu_arch = _("64-bit");
#else #else
const std::string cpu_arch = _("32bit"); // ARM, ALPHA,.. const std::string cpu_arch = _("32-bit"); // ARM, ALPHA,..
#endif #endif
std::string codename = CODENAME; std::string codename = CODENAME;
if (ARDOUR::Profile->get_mixbus() || ARDOUR::Profile->get_trx()) { if (ARDOUR::Profile->get_mixbus() || ARDOUR::Profile->get_trx()) {

View file

@ -740,13 +740,13 @@ SessionDialog::redisplay_recent_sessions ()
row[recent_session_columns.sample_rate] = rate_as_string (sr); row[recent_session_columns.sample_rate] = rate_as_string (sr);
switch (sf) { switch (sf) {
case FormatFloat: case FormatFloat:
row[recent_session_columns.disk_format] = _("32 bit float"); row[recent_session_columns.disk_format] = _("32-bit float");
break; break;
case FormatInt24: case FormatInt24:
row[recent_session_columns.disk_format] = _("24 bit"); row[recent_session_columns.disk_format] = _("24-bit");
break; break;
case FormatInt16: case FormatInt16:
row[recent_session_columns.disk_format] = _("16 bit"); row[recent_session_columns.disk_format] = _("16-bit");
break; break;
} }
} else { } else {
@ -787,13 +787,13 @@ SessionDialog::redisplay_recent_sessions ()
child_row[recent_session_columns.sample_rate] = rate_as_string (sr); child_row[recent_session_columns.sample_rate] = rate_as_string (sr);
switch (sf) { switch (sf) {
case FormatFloat: case FormatFloat:
child_row[recent_session_columns.disk_format] = _("32 bit float"); child_row[recent_session_columns.disk_format] = _("32-bit float");
break; break;
case FormatInt24: case FormatInt24:
child_row[recent_session_columns.disk_format] = _("24 bit"); child_row[recent_session_columns.disk_format] = _("24-bit");
break; break;
case FormatInt16: case FormatInt16:
child_row[recent_session_columns.disk_format] = _("16 bit"); child_row[recent_session_columns.disk_format] = _("16-bit");
break; break;
} }
} else { } else {

View file

@ -156,19 +156,19 @@ HasSampleFormat::get_sample_format_name (ExportFormatBase::SampleFormat format)
{ {
switch (format) { switch (format) {
case ExportFormatBase::SF_8: case ExportFormatBase::SF_8:
return _("8bit"); return _("8-bit");
case ExportFormatBase::SF_16: case ExportFormatBase::SF_16:
return _("16bit"); return _("16-bit");
case ExportFormatBase::SF_24: case ExportFormatBase::SF_24:
return _("24bit"); return _("24-bit");
case ExportFormatBase::SF_32: case ExportFormatBase::SF_32:
return _("32bit"); return _("32-bit");
case ExportFormatBase::SF_Float: case ExportFormatBase::SF_Float:
return _("float"); return _("float");
case ExportFormatBase::SF_Double: case ExportFormatBase::SF_Double:
return _("double"); return _("double");
case ExportFormatBase::SF_U8: case ExportFormatBase::SF_U8:
return _("8bit unsigned"); return _("8-bit unsigned");
case ExportFormatBase::SF_Vorbis: case ExportFormatBase::SF_Vorbis:
return _("Vorbis sample format"); return _("Vorbis sample format");
case ExportFormatBase::SF_None: case ExportFormatBase::SF_None:

View file

@ -831,13 +831,13 @@ static std::string dll_info (std::string path) {
type = *((uint16_t*) &buf[4]); type = *((uint16_t*) &buf[4]);
switch (type) { switch (type) {
case 0x014c: case 0x014c:
rv = _("i386 (32bit)"); rv = _("i386 (32-bit)");
break; break;
case 0x0200: case 0x0200:
rv = _("Itanium"); rv = _("Itanium");
break; break;
case 0x8664: case 0x8664:
rv = _("x64 (64bit)"); rv = _("x64 (64-bit)");
break; break;
case 0: case 0:
rv = _("Native Architecture"); rv = _("Native Architecture");

View file

@ -34,7 +34,7 @@ const char * const sndfile_header_formats_strings[SNDFILE_HEADER_FORMATS+1] = {
N_("WAV"), N_("WAV"),
N_("AIFF"), N_("AIFF"),
N_("CAF"), N_("CAF"),
N_("W64 (64 bit WAV)"), N_("W64 (64-bit WAV)"),
N_("FLAC"), N_("FLAC"),
N_("Ogg/Vorbis"), N_("Ogg/Vorbis"),
N_("raw (no header)"), 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] = { const char * const sndfile_bitdepth_formats_strings[SNDFILE_BITDEPTH_FORMATS+1] = {
N_("Signed 16 bit PCM"), N_("Signed 16-bit PCM"),
N_("Signed 24 bit PCM"), N_("Signed 24-bit PCM"),
N_("Signed 32 bit PCM"), N_("Signed 32-bit PCM"),
N_("Signed 8 bit PCM"), N_("Signed 8-bit PCM"),
N_("32 bit float"), N_("32-bit float"),
0 0
}; };