aboutsummaryrefslogtreecommitdiff
path: root/src/aoapplication.cpp
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2020-05-22 19:17:55 -0500
committeroldmud0 <oldmud0@users.noreply.github.com>2020-05-22 19:17:55 -0500
commitfd1855b8d0ecaa56ae3165ad5d8f3bd65ff77a64 (patch)
tree9c27d658dd8f19e649e1742b0fd39104a50a3ca6 /src/aoapplication.cpp
parent8928aa2718378bc42d20d5bbe6c17be68d65d6f3 (diff)
parent4617e3135ed14a28c4129154486022947fda9d82 (diff)
Merge KFO source unconditionally into AO2
Diffstat (limited to 'src/aoapplication.cpp')
-rw-r--r--src/aoapplication.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp
index 9bed218..e1e9e7f 100644
--- a/src/aoapplication.cpp
+++ b/src/aoapplication.cpp
@@ -126,7 +126,7 @@ void AOApplication::add_favorite_server(int p_server)
void AOApplication::server_disconnected()
{
if (courtroom_constructed) {
- call_notice("Disconnected from server.");
+ call_notice(tr("Disconnected from server."));
construct_lobby();
destruct_courtroom();
}
@@ -149,18 +149,19 @@ void AOApplication::ms_connect_finished(bool connected, bool will_retry)
if (will_retry) {
if (lobby_constructed)
w_lobby->append_error(
- "Error connecting to master server. Will try again in " +
- QString::number(net_manager->ms_reconnect_delay) + " seconds.");
+ tr("Error connecting to master server. Will try again in %1 "
+ "seconds.")
+ .arg(QString::number(net_manager->ms_reconnect_delay)));
}
else {
- call_error("There was an error connecting to the master server.\n"
- "We deploy multiple master servers to mitigate any possible "
- "downtime, "
- "but the client appears to have exhausted all possible "
- "methods of finding "
- "and connecting to one.\n"
- "Please check your Internet connection and firewall, and "
- "please try again.");
+ call_error(tr("There was an error connecting to the master server.\n"
+ "We deploy multiple master servers to mitigate any "
+ "possible downtime, "
+ "but the client appears to have exhausted all possible "
+ "methods of finding "
+ "and connecting to one.\n"
+ "Please check your Internet connection and firewall, and "
+ "please try again."));
}
}
}