# HG changeset patch # User Wuzzy # Date 1534866977 -7200 # Node ID d3a4cbba060ef6878d09a727f0d191a15aa1dd49 # Parent 3f6fae745f8499e7ff4f6b43aa96ce03c52abac6 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). diff -r 3f6fae745f84 -r d3a4cbba060e QTfrontend/binds.cpp --- 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}, diff -r 3f6fae745f84 -r d3a4cbba060e README.md --- 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 diff -r 3f6fae745f84 -r d3a4cbba060e share/hedgewars/Data/Locale/en.txt --- 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