summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/commandline.cpp2
-rw-r--r--src/fs/files.cpp2
-rw-r--r--src/gui/windows/maileditwindow.cpp2
-rw-r--r--src/gui/windows/mailwindow.cpp3
-rw-r--r--src/utils/gettexthelper.cpp6
5 files changed, 7 insertions, 8 deletions
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 4270d6322..2d8d48254 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -51,7 +51,7 @@ static void printHelp()
_(" used to set custom parameters") <<
std::endl <<
// TRANSLATORS: command line help
- _(" to the manaplus client.") <<
+ _(" to the manaverse client.") <<
std::endl << std::endl <<
// TRANSLATORS: command line help
_("Options:") <<
diff --git a/src/fs/files.cpp b/src/fs/files.cpp
index 59fd31f11..5134520ce 100644
--- a/src/fs/files.cpp
+++ b/src/fs/files.cpp
@@ -60,7 +60,7 @@ void Files::extractLocale()
const std::string dir = pathJoin("locale", *i);
if (VirtFs::isDirectory(dir))
{
- const std::string moFile = dir + "/LC_MESSAGES/manaplus.mo";
+ const std::string moFile = dir + "/LC_MESSAGES/manaverse.mo";
if (VirtFs::exists((moFile)))
{
const std::string localFile = pathJoin(localDir, moFile);
diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp
index e7fad6aab..bd47710dc 100644
--- a/src/gui/windows/maileditwindow.cpp
+++ b/src/gui/windows/maileditwindow.cpp
@@ -67,7 +67,7 @@ MailEditWindow::MailEditWindow() :
// TRANSLATORS: mail edit window label
mMoneyLabel(new Label(this, _("Money:"))),
// TRANSLATORS: mail edit window label
- mItemLabel(new Label(this, _("Item:"))),
+ mItemLabel(new Label(this, _("Items:"))),
// TRANSLATORS: mail edit window label
mMessageLabel(new Label(this, _("Message:"))),
mToField(new TextField(this, std::string(), LoseFocusOnTab_true,
diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp
index 2879f592b..cd3c8c6cf 100644
--- a/src/gui/windows/mailwindow.cpp
+++ b/src/gui/windows/mailwindow.cpp
@@ -92,8 +92,6 @@ MailWindow::MailWindow() :
if (setupWindow != nullptr)
setupWindow->registerWindowForReset(this);
- center();
-
// use line wrapping of mail subjects, instead.
mListScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
// set reasonable minimum width for calculations below
@@ -125,6 +123,7 @@ MailWindow::MailWindow() :
setMinWidth(getWidth());
setMinHeight(getHeight());
setDefaultSize(getWidth(), getHeight(), ImagePosition::CENTER, 0, 0);
+ center();
loadWindowState();
enableVisibleSound(true);
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp
index 08934a944..84a6e8602 100644
--- a/src/utils/gettexthelper.cpp
+++ b/src/utils/gettexthelper.cpp
@@ -124,8 +124,8 @@ void GettextHelper::initLang()
else
logger->log("locale empty");
}
- bind_textdomain_codeset("manaplus", "UTF-8");
- textdomain("manaplus");
+ bind_textdomain_codeset("manaverse", "UTF-8");
+ textdomain("manaverse");
#elif defined(ENABLE_CUSTOMNLS)
mainTranslator = new PoDict("en");
setLangEnv();
@@ -135,7 +135,7 @@ void GettextHelper::initLang()
#ifdef ENABLE_NLS
void GettextHelper::bindTextDomain(const char *const path)
{
- const char *const dir = bindtextdomain("manaplus", path);
+ const char *const dir = bindtextdomain("manaverse", path);
if (dir)
logger->log("bindtextdomain: %s", dir);
else