diff options
| -rw-r--r-- | gtk2_ardour/bundle_env_cocoa.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/bundle_env_mingw.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 2 | ||||
| -rwxr-xr-x | tools/linux_packaging/build | 2 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc index f8b84091ed..eea289fce6 100644 --- a/gtk2_ardour/bundle_env_cocoa.cc +++ b/gtk2_ardour/bundle_env_cocoa.cc @@ -187,7 +187,7 @@ void load_custom_fonts() kCFStringEncodingUTF8, FALSE); fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, ttf, kCFURLPOSIXPathStyle, TRUE); if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) { - cerr << _("Cannot load ArdourSerif TrueType font.") << endl; + cerr << _("Cannot load ArdourSans TrueType font.") << endl; } } #endif diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc index e979b8ac82..926e4cdcae 100644 --- a/gtk2_ardour/bundle_env_mingw.cc +++ b/gtk2_ardour/bundle_env_mingw.cc @@ -98,7 +98,7 @@ unload_custom_fonts() if (find_file (ardour_data_search_path(), "ArdourMono.ttf", font_file)) { RemoveFontResource(font_file.c_str()); } - if (find_file (ardour_data_search_path(), "ArdourSerif.ttf", font_file)) { + if (find_file (ardour_data_search_path(), "ArdourSans.ttf", font_file)) { RemoveFontResource(font_file.c_str()); } } diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index a2d75c3c68..e49ea3ec3e 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -919,7 +919,7 @@ def build(bld): # Icons/Images bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png')) bld.install_files(bld.env['DATADIR'], 'ArdourMono.ttf') - bld.install_files(bld.env['DATADIR'], 'ArdourSerif.ttf') + bld.install_files(bld.env['DATADIR'], 'ArdourSans.ttf') # Application/Product specific resources (icon, splash) pgmname = bld.env['PROGRAM_NAME'] diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index afc2fe12b8..83e2e3b7ec 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -647,7 +647,7 @@ cp ../../system_config $Etc/system_config cp ../../gtk2_ardour/icons/*.png ${Shared}/icons cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/ cp ../../gtk2_ardour/ArdourMono.ttf $Shared -cp ../../gtk2_ardour/ArdourSerif.ttf $Shared +cp ../../gtk2_ardour/ArdourSans.ttf $Shared cp ../../gtk2_ardour/resources/${APPNAME}-* ${Shared}/resources/ # Themes: only install those named for this app diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 117aec56d5..f890cfe971 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -509,7 +509,7 @@ cp ../../system_config $Resources/system_config cp ../../gtk2_ardour/icons/*.png ${Resources}/icons/ cp -r ../../gtk2_ardour/icons/cursor_* ${Resources}/icons/ cp ../../gtk2_ardour/ArdourMono.ttf $Shared -cp ../../gtk2_ardour/ArdourSerif.ttf $Shared +cp ../../gtk2_ardour/ArdourSans.ttf $Shared cp ../../gtk2_ardour/resources/${PRODUCT_PKG_DIR}-* ${Resources}/resources/ |