Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Consistently rename "team chat" to "clan chat" (except chat command)
authorWuzzy <Wuzzy2@mail.ru>
Tue, 21 Aug 2018 17:56:17 +0200
changeset 13680 d3a4cbba060e
parent 13679 3f6fae745f84
child 13681 05fde8e30041
Consistently rename "team chat" to "clan chat" (except chat command) Only change in strings, no functional change. "Team" and "clan" have defined meanings in HW, but "team chat" oddly broke this convention. This feature allows chat with your clan, not with your team, so is now called "clan chat". /team command unchanged to avoid disruption (for now).
QTfrontend/binds.cpp file | annotate | diff | comparison | revisions
README.md file | annotate | diff | comparison | revisions
share/hedgewars/Data/Locale/en.txt file | annotate | diff | comparison | revisions 
--- a/QTfrontend/binds.cpp	Tue Aug 21 15:46:34 2018 +0200
+++ b/QTfrontend/binds.cpp	Tue Aug 21 17:56:17 2018 +0200
@@ -56,8 +56,8 @@
     {"zoomin",    "wheelup",    QT_TRANSLATE_NOOP("binds", "zoom in"),         NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Modify the camera's zoom level:")},
     {"zoomout",   "wheeldown",  QT_TRANSLATE_NOOP("binds", "zoom out"),        NULL, NULL},
     {"zoomreset", "mousem",     QT_TRANSLATE_NOOP("binds", "reset zoom"),      NULL, NULL},
-    {"chat",      "t",          QT_TRANSLATE_NOOP("binds", "chat"),            QT_TRANSLATE_NOOP("binds (categories)", "Miscellaneous"), QT_TRANSLATE_NOOP("binds (descriptions)", "Talk to your team or all participants:")},
-    {"chat team", "u",          QT_TRANSLATE_NOOP("binds", "team chat"),       NULL, NULL},
+    {"chat",      "t",          QT_TRANSLATE_NOOP("binds", "chat"),            QT_TRANSLATE_NOOP("binds (categories)", "Miscellaneous"), QT_TRANSLATE_NOOP("binds (descriptions)", "Talk to your clan or all participants:")},
+    {"chat team", "u",          QT_TRANSLATE_NOOP("binds", "clan chat"),       NULL, NULL},
     {"history",   "`",          QT_TRANSLATE_NOOP("binds", "chat history"),    NULL, NULL},
     {"pause",     "p",          QT_TRANSLATE_NOOP("binds", "pause / auto skip"),NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Pause, continue or leave your game:")},
     {"quit",      "escape",     QT_TRANSLATE_NOOP("binds", "quit"),            NULL, NULL},
--- a/README.md	Tue Aug 21 15:46:34 2018 +0200
+++ b/README.md	Tue Aug 21 17:56:17 2018 +0200
@@ -67,7 +67,7 @@
 * P: Pause, when playing offline, toggle automatic turn skipping when online
 * Esc: Quit with prompt
 * T: Chat
-* U: Team chat
+* U: Clan chat
 
 ### Default controller controls
 Hedgewars also supports controllers. By default, Hedgewars sets up a few
--- a/share/hedgewars/Data/Locale/en.txt	Tue Aug 21 15:46:34 2018 +0200
+++ b/share/hedgewars/Data/Locale/en.txt	Tue Aug 21 17:56:17 2018 +0200
@@ -112,8 +112,8 @@
 01:44=%1×
 ; Chat. %1 = player, %2 = message
 01:45=%1: %2
-; Team chat. %1 = player, %2 = message
-01:46=[Team] %1: %2
+; Clan chat. %1 = player, %2 = message
+01:46=[Clan] %1: %2
 ; Hedgehog chat. %1 = hog name, %2 = message
 01:47=[%1]: %2
sheepy-clone