From 52484c4b95cf8dac8de7a331bcf7a7b21430fade Mon Sep 17 00:00:00 2001
From: Eric Branlund <ebranlund@fastmail.com>
Date: Tue, 8 Feb 2022 19:01:54 -0800
Subject: [PATCH] English: avoid "angband" in startup failure messages. 
 Resolves https://github.com/hengband/hengband/issues/2116 .

---
 src/main-gcu.cpp | 6 ++++--
 src/main-win.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main-gcu.cpp b/src/main-gcu.cpp
index 3c4b41ecb..7193fe4e7 100644
--- a/src/main-gcu.cpp
+++ b/src/main-gcu.cpp
@@ -165,9 +165,11 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "system/angband.h"
+#include "system/angband-version.h"
 #include "system/player-type-definition.h"
 #include "term/gameterm.h"
 #include "term/term-color-types.h"
+#include "term/z-form.h"
 #include "util/angband-files.h"
 #include "view/display-map.h"
 
@@ -1260,7 +1262,7 @@ errr init_gcu(int argc, char *argv[])
     /* Hack -- Require large screen, or Quit with message */
     i = ((LINES < 24) || (COLS < 80));
     if (i)
-        quit("Angband needs an 80x24 'curses' screen");
+        quit_fmt("%s needs an 80x24 'curses' screen", std::string(VARIANT_NAME).c_str());
 
 #ifdef A_COLOR
 
@@ -1553,7 +1555,7 @@ errr init_gcu(int argc, char *argv[])
 
         /* Map Terminal */
         if (remaining.cx < MIN_TERM0_COLS || remaining.cy < MIN_TERM0_LINES)
-            quit(format("Failed: angband needs an %dx%d map screen, not %dx%d", MIN_TERM0_COLS, MIN_TERM0_LINES, remaining.cx, remaining.cy));
+            quit_fmt("Failed: %s needs an %dx%d map screen, not %dx%d", std::string(VARIANT_NAME).c_str(), MIN_TERM0_COLS, MIN_TERM0_LINES, remaining.cx, remaining.cy);
         data[0].r = remaining;
         term_data_init(&data[0]);
         angband_term[0] = Term;
diff --git a/src/main-win.cpp b/src/main-win.cpp
index e6ffd653d..8f222c4b4 100644
--- a/src/main-win.cpp
+++ b/src/main-win.cpp
@@ -1400,7 +1400,7 @@ static void init_windows(void)
     my_td = NULL;
 
     if (!td->w)
-        quit(_("メインウィンドウの作成に失敗しました", "Failed to create Angband window"));
+        quit(_("メインウィンドウの作成に失敗しました", "Failed to create main window"));
 
     /* Resize */
     td->size_hack = true;
-- 
2.11.0