From b7602ca3edaec9d0333efcd33f9f50e856b6cd9f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 13 Jan 2019 20:16:12 +0000 Subject: [PATCH] Fix Gb -> GB confusion (thanks Rob van Nieuwkerk). --- src/lib/film.cc | 2 +- src/tools/dcpomatic.cc | 4 ++-- src/tools/dcpomatic_batch.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/film.cc b/src/lib/film.cc index 8080b9921..11efcc752 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1382,7 +1382,7 @@ Film::required_disk_space () const /** This method checks the disk that the Film is on and tries to decide whether or not * there will be enough space to make a DCP for it. If so, true is returned; if not, * false is returned and required and available are filled in with the amount of disk space - * required and available respectively (in Gb). + * required and available respectively (in GB). * * Note: the decision made by this method isn't, of course, 100% reliable. */ diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 7b5696a1c..2e8a595ad 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -699,9 +699,9 @@ private: if (!_film->should_be_enough_disk_space (required, available, can_hard_link)) { wxString message; if (can_hard_link) { - message = wxString::Format (_("The DCP for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. Do you want to continue anyway?"), required, available); + message = wxString::Format (_("The DCP for this film will take up about %.1f GB, and the disk that you are using only has %.1f GB available. Do you want to continue anyway?"), required, available); } else { - message = wxString::Format (_("The DCP and intermediate files for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. You would need half as much space if the filesystem supported hard links, but it does not. Do you want to continue anyway?"), required, available); + message = wxString::Format (_("The DCP and intermediate files for this film will take up about %.1f GB, and the disk that you are using only has %.1f GB available. You would need half as much space if the filesystem supported hard links, but it does not. Do you want to continue anyway?"), required, available); } if (!confirm_dialog (this, message)) { return; diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 9488f728c..2be37a387 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -196,8 +196,8 @@ public: if (!confirm_dialog ( this, wxString::Format( - _("The DCPs for this film and the films already in the queue will take up about %.1f Gb. The " - "disks that you are using only have %.1f Gb available. Do you want to add this film to the queue anyway?"), + _("The DCPs for this film and the films already in the queue will take up about %.1f GB. The " + "disks that you are using only have %.1f GB available. Do you want to add this film to the queue anyway?"), total_required, available))) { return; } -- 2.30.2