Merge branch 'terencehill/countrylist_removal' into 'master'

[xonotic/xonotic-data.pk3dir.git] / common.en_AU.po

diff --git a/common.en_AU.po b/common.en_AU.po
index 8e091de8dd59d96661ba5497a299060df80c8be6..c56c75b2120b7a4f3f780edf4b35ee353c9ab103 100644 (file)
--- a/common.en_AU.po
+++ b/common.en_AU.po
@@ -6,13 +6,14 @@
 # Laurene Albrand, 2015
 # Laurene Albrand, 2015
 # Laurene Albrand, 2015
+# Stuart Young <cefiar@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-13 21:14+0200\n"
-"PO-Revision-Date: 2015-10-13 19:02+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"POT-Creation-Date: 2019-04-28 07:23+0200\n"
+"PO-Revision-Date: 2019-04-28 05:23+0000\n"
+"Last-Translator: Stuart Young <cefiar@gmail.com>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/en_AU/)\n"
 "Language: en_AU\n"
@@ -21,1533 +22,1916 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: qcsrc/client/hud.qc:145
+#: qcsrc/client/hud/hud_config.qc:243
 #, c-format
-msgid " (-%dL)"
-msgstr "(-%dL)"
-
-#: qcsrc/client/hud.qc:150
-#, c-format
-msgid " (+%dL)"
-msgstr "(+%dL)"
-
-#: qcsrc/client/hud.qc:169
-msgid "Start line"
-msgstr "Start line"
-
-#: qcsrc/client/hud.qc:171 qcsrc/client/hud.qc:175
-msgid "Finish line"
-msgstr "Finish line"
-
-#: qcsrc/client/hud.qc:173
-#, c-format
-msgid "Intermediate %d"
-msgstr "Intermediate %d"
-
-#: qcsrc/client/hud.qc:785
-msgid "Out of ammo"
-msgstr "Out of ammo"
-
-#: qcsrc/client/hud.qc:789
-msgid "Don't have"
-msgstr "Don't have"
-
-#: qcsrc/client/hud.qc:793
-msgid "Unavailable"
-msgstr "Unavailable"
-
-#: qcsrc/client/hud.qc:1765 qcsrc/client/hud.qc:1766 qcsrc/client/hud.qc:2312
-#, c-format
-msgid "Player %d"
-msgstr "Player %d"
-
-#: qcsrc/client/hud.qc:2618
-msgid "^1Intermediate 1 (+15.42)"
-msgstr "^1Intermediate 1 (+15.42)"
+msgid "^2Successfully exported to %s! (Note: It's saved in data/data/)"
+msgstr ""
 
-#: qcsrc/client/hud.qc:2620 qcsrc/client/hud.qc:2662 qcsrc/client/hud.qc:2707
+#: qcsrc/client/hud/hud_config.qc:247
 #, c-format
-msgid "^1PENALTY: %.1f (%s)"
-msgstr "^1PENALTY: %.1f (%s)"
+msgid "^1Couldn't write to %s"
+msgstr ""
 
-#: qcsrc/client/hud.qc:2709
+#: qcsrc/client/hud/panel/centerprint.qc:140
 #, c-format
-msgid "^2PENALTY: %.1f (%s)"
-msgstr "^2PENALTY: %.1f (%s)"
-
-#: qcsrc/client/hud.qc:2729
-msgid "^1You must answer before entering hud configure mode\n"
-msgstr "^1You must answer before entering hud configure mode\n"
-
-#: qcsrc/client/hud.qc:2734
-msgid "^2Name ^7instead of \"^1Anonymous player^7\" in stats"
-msgstr "^2Name ^7instead of \"^1Anonymous player^7\" in stats"
-
-#: qcsrc/client/hud.qc:2813
-msgid "A vote has been called for:"
-msgstr "A vote has been called for:"
-
-#: qcsrc/client/hud.qc:2815
-msgid "Allow servers to store and display your name?"
-msgstr "Allow servers to store and display your name?"
-
-#: qcsrc/client/hud.qc:2819
-msgid "^1Configure the HUD"
-msgstr "^1Configure the HUD"
+msgid "^3Countdown message at time %s, seconds left: ^COUNT"
+msgstr ""
 
-#: qcsrc/client/hud.qc:2823
+#: qcsrc/client/hud/panel/centerprint.qc:142
 #, c-format
-msgid "Yes (%s): %d"
-msgstr "Yes (%s): %d"
+msgid ""
+"^1Multiline message at time %s that\n"
+"^1lasts longer than normal"
+msgstr ""
 
-#: qcsrc/client/hud.qc:2825
+#: qcsrc/client/hud/panel/centerprint.qc:144
 #, c-format
-msgid "No (%s): %d"
-msgstr "No (%s): %d"
-
-#: qcsrc/client/hud.qc:3396 qcsrc/client/hud.qc:3399 qcsrc/client/hud.qc:3401
-msgid "Personal best"
-msgstr "Personal best"
+msgid "Message at time %s"
+msgstr ""
 
-#: qcsrc/client/hud.qc:3414 qcsrc/client/hud.qc:3417 qcsrc/client/hud.qc:3419
-msgid "Server best"
-msgstr "Server best"
+#: qcsrc/client/hud/panel/centerprint.qc:149
+msgid "Generic message"
+msgstr ""
 
-#: qcsrc/client/hud.qc:3787
+#: qcsrc/client/hud/panel/chat.qc:84
 msgid "^3Player^7: This is the chat area."
 msgstr "^3Player^7: This is the chat area."
 
-#: qcsrc/client/hud.qc:3853
+#: qcsrc/client/hud/panel/engineinfo.qc:72
 #, c-format
 msgid "FPS: %.*f"
 msgstr "FPS: %.*f"
 
-#: qcsrc/client/hud.qc:3919
+#: qcsrc/client/hud/panel/infomessages.qc:89
 msgid "^1Observing"
 msgstr "^1Observing"
 
-#: qcsrc/client/hud.qc:3921
+#: qcsrc/client/hud/panel/infomessages.qc:91
 #, c-format
 msgid "^1Spectating: ^7%s"
 msgstr "^1Spectating: ^7%s"
 
-#: qcsrc/client/hud.qc:3925
+#: qcsrc/client/hud/panel/infomessages.qc:102
 #, c-format
 msgid "^1Press ^3%s^1 to spectate"
 msgstr "^1Press ^3%s^1 to spectate"
 
-#: qcsrc/client/hud.qc:3927
+#: qcsrc/client/hud/panel/infomessages.qc:102
+#: qcsrc/menu/xonotic/keybinder.qc:47
+msgid "primary fire"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:104
 #, c-format
 msgid "^1Press ^3%s^1 or ^3%s^1 for next or previous player"
 msgstr "^1Press ^3%s^1 or ^3%s^1 for next or previous player"
 
-#: qcsrc/client/hud.qc:3931
+#: qcsrc/client/hud/panel/infomessages.qc:104
+#: qcsrc/client/hud/panel/infomessages.qc:108
+msgid "next weapon"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:104
+#: qcsrc/client/hud/panel/infomessages.qc:108
+msgid "previous weapon"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:108
 #, c-format
 msgid "^1Use ^3%s^1 or ^3%s^1 to change the speed"
 msgstr "^1Use ^3%s^1 or ^3%s^1 to change the speed"
 
-#: qcsrc/client/hud.qc:3933
+#: qcsrc/client/hud/panel/infomessages.qc:110
 #, c-format
-msgid "^1Press ^3%s^1 to observe"
-msgstr "^1Press ^3%s^1 to observe"
+msgid "^1Press ^3%s^1 to observe, ^3%s^1 to change camera mode"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:110
+#: qcsrc/common/vehicles/cl_vehicles.qc:190
+msgid "drop weapon"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:110
+#: qcsrc/menu/xonotic/keybinder.qc:48
+msgid "secondary fire"
+msgstr ""
 
-#: qcsrc/client/hud.qc:3936
+#: qcsrc/client/hud/panel/infomessages.qc:113
 #, c-format
 msgid "^1Press ^3%s^1 for gamemode info"
 msgstr "^1Press ^3%s^1 for gamemode info"
 
-#: qcsrc/client/hud.qc:3944
+#: qcsrc/client/hud/panel/infomessages.qc:113
+#: qcsrc/menu/xonotic/keybinder.qc:105
+msgid "server info"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:126
 msgid "^1Match has already begun"
 msgstr "^1Match has already begun"
 
-#: qcsrc/client/hud.qc:3946
+#: qcsrc/client/hud/panel/infomessages.qc:128
 msgid "^1You have no more lives left"
 msgstr "^1You have no more lives left"
 
-#: qcsrc/client/hud.qc:3948 qcsrc/client/hud.qc:3951
+#: qcsrc/client/hud/panel/infomessages.qc:130
+#: qcsrc/client/hud/panel/infomessages.qc:133
 #, c-format
 msgid "^1Press ^3%s^1 to join"
 msgstr "^1Press ^3%s^1 to join"
 
-#: qcsrc/client/hud.qc:3959
+#: qcsrc/client/hud/panel/infomessages.qc:130
+#: qcsrc/client/hud/panel/infomessages.qc:133
+msgid "jump"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:141
 #, c-format
 msgid "^1Game starts in ^3%d^1 seconds"
 msgstr "^1Game starts in ^3%d^1 seconds"
 
-#: qcsrc/client/hud.qc:3966
+#: qcsrc/client/hud/panel/infomessages.qc:147
 msgid "^2Currently in ^1warmup^2 stage!"
 msgstr "^2Currently in ^1warmup^2 stage!"
 
-#: qcsrc/client/hud.qc:3981
+#: qcsrc/client/hud/panel/infomessages.qc:162
 #, c-format
 msgid "%sPress ^3%s%s to end warmup"
 msgstr "%sPress ^3%s%s to end warmup"
 
-#: qcsrc/client/hud.qc:3983
+#: qcsrc/client/hud/panel/infomessages.qc:162
+#: qcsrc/client/hud/panel/infomessages.qc:164
+#: qcsrc/client/hud/panel/infomessages.qc:177
+#: qcsrc/menu/xonotic/keybinder.qc:101
+msgid "ready"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:164
 #, c-format
 msgid "%sPress ^3%s%s once you are ready"
 msgstr "%sPress ^3%s%s once you are ready"
 
-#: qcsrc/client/hud.qc:3988
+#: qcsrc/client/hud/panel/infomessages.qc:169
 msgid "^2Waiting for others to ready up to end warmup..."
 msgstr "^2Waiting for others to ready up to end warmup..."
 
-#: qcsrc/client/hud.qc:3990
+#: qcsrc/client/hud/panel/infomessages.qc:171
 msgid "^2Waiting for others to ready up..."
 msgstr "^2Waiting for others to ready up..."
 
-#: qcsrc/client/hud.qc:3996
+#: qcsrc/client/hud/panel/infomessages.qc:177
 #, c-format
 msgid "^2Press ^3%s^2 to end warmup"
 msgstr "^2Press ^3%s^2 to end warmup"
 
-#: qcsrc/client/hud.qc:4017
+#: qcsrc/client/hud/panel/infomessages.qc:198
 msgid "Teamnumbers are unbalanced!"
 msgstr "Team numbers are unbalanced!"
 
-#: qcsrc/client/hud.qc:4022
+#: qcsrc/client/hud/panel/infomessages.qc:201
 #, c-format
 msgid " Press ^3%s%s to adjust"
 msgstr " Press ^3%s%s to adjust"
 
-#: qcsrc/client/hud.qc:4030
+#: qcsrc/client/hud/panel/infomessages.qc:201
+#: qcsrc/menu/xonotic/keybinder.qc:117
+msgid "team menu"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:211
+msgid "^1Spectating this player:"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:211
+msgid "^1Spectating you:"
+msgstr ""
+
+#: qcsrc/client/hud/panel/infomessages.qc:227
 msgid "^7Press ^3ESC ^7to show HUD options."
 msgstr "^7Press ^3ESC ^7to show HUD options."
 
-#: qcsrc/client/hud.qc:4032
+#: qcsrc/client/hud/panel/infomessages.qc:228
 msgid "^3Doubleclick ^7a panel for panel-specific options."
 msgstr "^3Doubleclick ^7a panel for panel-specific options."
 
-#: qcsrc/client/hud.qc:4034
+#: qcsrc/client/hud/panel/infomessages.qc:229
 msgid "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and"
 msgstr "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and"
 
-#: qcsrc/client/hud.qc:4036
+#: qcsrc/client/hud/panel/infomessages.qc:230
 msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments."
 msgstr "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments."
 
-#: qcsrc/client/hud.qc:4085
-msgid " qu/s"
-msgstr " qu/s"
-
-#: qcsrc/client/hud.qc:4089
-msgid " m/s"
-msgstr " m/s"
-
-#: qcsrc/client/hud.qc:4093
-msgid " km/h"
-msgstr " km/h"
-
-#: qcsrc/client/hud.qc:4097
-msgid " mph"
-msgstr " mph"
-
-#: qcsrc/client/hud.qc:4101
-msgid " knots"
-msgstr " knots"
-
-#: qcsrc/client/hud_config.qc:213
-#, c-format
-msgid "^2Successfully exported to %s! (Note: It's saved in data/data/)\n"
-msgstr "^2Successfully exported to %s! (Note: It's saved in data/data/)\n"
-
-#: qcsrc/client/hud_config.qc:217
-#, c-format
-msgid "^1Couldn't write to %s\n"
-msgstr "^1Couldn't write to %s\n"
-
-#: qcsrc/client/main.qc:56
-msgid "ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!"
-msgstr "ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!"
-
-#: qcsrc/client/main.qc:1340
-#, c-format
-msgid "%s (not bound)"
-msgstr "%s (not bound)"
-
-#: qcsrc/client/mapvoting.qc:49
-msgid " (1 vote)"
-msgstr " (1 vote)"
-
-#: qcsrc/client/mapvoting.qc:51
-#, c-format
-msgid " (%d votes)"
-msgstr " (%d votes)"
-
-#: qcsrc/client/mapvoting.qc:265
-msgid "Don't care"
-msgstr "Don't care"
-
-#: qcsrc/client/mapvoting.qc:359
-msgid "Decide the gametype"
-msgstr "Decide the gametype"
+#: qcsrc/client/hud/panel/modicons.qc:576
+msgid "Personal best"
+msgstr "Personal best"
 
-#: qcsrc/client/mapvoting.qc:359
-msgid "Vote for a map"
-msgstr "Vote for a map"
+#: qcsrc/client/hud/panel/modicons.qc:586
+msgid "Server best"
+msgstr "Server best"
 
-#: qcsrc/client/mapvoting.qc:378
+#: qcsrc/client/hud/panel/notify.qc:117 qcsrc/client/hud/panel/notify.qc:118
+#: qcsrc/client/hud/panel/score.qc:63
 #, c-format
-msgid "%d seconds left"
-msgstr "%d seconds left"
-
-#: qcsrc/client/mapvoting.qc:494
-msgid ""
-"mv_mapdownload: ^3You're not supposed to use this command on your own!\n"
-msgstr ""
-"mv_mapdownload: ^3You're not supposed to use this command on your own!\n"
-
-#: qcsrc/client/mapvoting.qc:504
-msgid "^1Error:^7 Couldn't find pak index.\n"
-msgstr "^1Error:^7 Couldn't find pak index.\n"
-
-#: qcsrc/client/mapvoting.qc:513
-msgid "Requesting preview...\n"
-msgstr "Requesting preview...\n"
-
-#: qcsrc/client/miscfunctions.qc:108
-msgid "Trying to remove a team which is not in the teamlist!"
-msgstr "Trying to remove a team which is not in the teamlist!"
+msgid "Player %d"
+msgstr "Player %d"
 
-#: qcsrc/client/quickmenu.qc:601 qcsrc/client/quickmenu.qc:603
+#: qcsrc/client/hud/panel/quickmenu.qc:591
+#: qcsrc/client/hud/panel/quickmenu.qc:593
 #, c-format
 msgid "Submenu%d"
-msgstr ""
+msgstr "Submenu%d"
 
-#: qcsrc/client/quickmenu.qc:608
+#: qcsrc/client/hud/panel/quickmenu.qc:598
 #, c-format
 msgid "Command%d"
-msgstr ""
+msgstr "Command%d"
 
-#: qcsrc/client/quickmenu.qc:633
+#: qcsrc/client/hud/panel/quickmenu.qc:624
 msgid "Continue..."
+msgstr "Continue..."
+
+#: qcsrc/client/hud/panel/quickmenu.qc:781
+#: qcsrc/client/hud/panel/quickmenu.qc:788
+msgid "Chat"
 msgstr ""
 
-#: qcsrc/client/quickmenu.qc:780 qcsrc/client/quickmenu.qc:784
-msgid "QMCMD^Chat"
+#: qcsrc/client/hud/panel/quickmenu.qc:782
+msgid "QMCMD^Send public message to"
 msgstr ""
 
-#: qcsrc/client/quickmenu.qc:781
+#: qcsrc/client/hud/panel/quickmenu.qc:783
 msgid "QMCMD^:-) / nice one"
-msgstr ""
+msgstr "QMCMD^:-) / nice one"
 
-#: qcsrc/client/quickmenu.qc:781
+#: qcsrc/client/hud/panel/quickmenu.qc:783
 msgid "QMCMD^nice one"
-msgstr ""
+msgstr "QMCMD^nice one"
 
-#: qcsrc/client/quickmenu.qc:782
+#: qcsrc/client/hud/panel/quickmenu.qc:784
 msgid "QMCMD^good game"
-msgstr ""
+msgstr "QMCMD^good game"
 
-#: qcsrc/client/quickmenu.qc:783
+#: qcsrc/client/hud/panel/quickmenu.qc:785
 msgid "QMCMD^hi / good luck"
-msgstr ""
+msgstr "QMCMD^hi / good luck"
 
-#: qcsrc/client/quickmenu.qc:783
+#: qcsrc/client/hud/panel/quickmenu.qc:785
 msgid "QMCMD^hi / good luck and have fun"
+msgstr "QMCMD^hi / good luck and have fun"
+
+#: qcsrc/client/hud/panel/quickmenu.qc:787
+msgid "QMCMD^Send in English"
 msgstr ""
 
-#: qcsrc/client/quickmenu.qc:788 qcsrc/client/quickmenu.qc:804
+#: qcsrc/client/hud/panel/quickmenu.qc:792
+#: qcsrc/client/hud/panel/quickmenu.qc:808
 msgid "QMCMD^Team chat"
-msgstr ""
+msgstr "QMCMD^Team chat"
 
-#: qcsrc/client/quickmenu.qc:789
+#: qcsrc/client/hud/panel/quickmenu.qc:793
 msgid "QMCMD^quad soon"
-msgstr ""
+msgstr "QMCMD^quad soon"
 
-#: qcsrc/client/quickmenu.qc:790
+#: qcsrc/client/hud/panel/quickmenu.qc:794
 msgid "QMCMD^free item %x^7 (l:%y^7)"
-msgstr ""
+msgstr "QMCMD^free item %x^7 (l:%y^7)"
 
-#: qcsrc/client/quickmenu.qc:790
+#: qcsrc/client/hud/panel/quickmenu.qc:794
 msgid "QMCMD^free item, icon"
-msgstr ""
+msgstr "QMCMD^free item, icon"
 
-#: qcsrc/client/quickmenu.qc:791
+#: qcsrc/client/hud/panel/quickmenu.qc:795
 msgid "QMCMD^took item (l:%l^7)"
-msgstr ""
+msgstr "QMCMD^took item (l:%l^7)"
 
-#: qcsrc/client/quickmenu.qc:791
+#: qcsrc/client/hud/panel/quickmenu.qc:795
 msgid "QMCMD^took item, icon"
-msgstr ""
+msgstr "QMCMD^took item, icon"
 
-#: qcsrc/client/quickmenu.qc:792
+#: qcsrc/client/hud/panel/quickmenu.qc:796
 msgid "QMCMD^negative"
-msgstr ""
+msgstr "QMCMD^negative"
 
-#: qcsrc/client/quickmenu.qc:793
+#: qcsrc/client/hud/panel/quickmenu.qc:797
 msgid "QMCMD^positive"
-msgstr ""
+msgstr "QMCMD^positive"
 
-#: qcsrc/client/quickmenu.qc:794
+#: qcsrc/client/hud/panel/quickmenu.qc:798
 msgid "QMCMD^need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
-msgstr ""
+msgstr "QMCMD^need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
 
-#: qcsrc/client/quickmenu.qc:794
+#: qcsrc/client/hud/panel/quickmenu.qc:798
 msgid "QMCMD^need help, icon"
-msgstr ""
+msgstr "QMCMD^need help, icon"
 
-#: qcsrc/client/quickmenu.qc:795
+#: qcsrc/client/hud/panel/quickmenu.qc:799
 msgid "QMCMD^enemy seen (l:%y^7)"
-msgstr ""
+msgstr "QMCMD^enemy seen (l:%y^7)"
 
-#: qcsrc/client/quickmenu.qc:795
+#: qcsrc/client/hud/panel/quickmenu.qc:799
 msgid "QMCMD^enemy seen, icon"
-msgstr ""
+msgstr "QMCMD^enemy seen, icon"
 
-#: qcsrc/client/quickmenu.qc:796
+#: qcsrc/client/hud/panel/quickmenu.qc:800
 msgid "QMCMD^flag seen (l:%y^7)"
-msgstr ""
+msgstr "QMCMD^flag seen (l:%y^7)"
 
-#: qcsrc/client/quickmenu.qc:796
+#: qcsrc/client/hud/panel/quickmenu.qc:800
 msgid "QMCMD^flag seen, icon"
-msgstr ""
+msgstr "QMCMD^flag seen, icon"
 
-#: qcsrc/client/quickmenu.qc:797
+#: qcsrc/client/hud/panel/quickmenu.qc:801
 msgid "QMCMD^defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
-msgstr ""
+msgstr "QMCMD^defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
 
-#: qcsrc/client/quickmenu.qc:797
+#: qcsrc/client/hud/panel/quickmenu.qc:801
 msgid "QMCMD^defending, icon"
-msgstr ""
+msgstr "QMCMD^defending, icon"
 
-#: qcsrc/client/quickmenu.qc:798
+#: qcsrc/client/hud/panel/quickmenu.qc:802
 msgid "QMCMD^roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
-msgstr ""
+msgstr "QMCMD^roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
 
-#: qcsrc/client/quickmenu.qc:798
+#: qcsrc/client/hud/panel/quickmenu.qc:802
 msgid "QMCMD^roaming, icon"
-msgstr ""
+msgstr "QMCMD^roaming, icon"
 
-#: qcsrc/client/quickmenu.qc:799
+#: qcsrc/client/hud/panel/quickmenu.qc:803
 msgid "QMCMD^attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
-msgstr ""
+msgstr "QMCMD^attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
 
-#: qcsrc/client/quickmenu.qc:799
+#: qcsrc/client/hud/panel/quickmenu.qc:803
 msgid "QMCMD^attacking, icon"
-msgstr ""
-
-#: qcsrc/client/quickmenu.qc:800
-msgid "QMCMD^killed flag, icon"
-msgstr ""
+msgstr "QMCMD^attacking, icon"
 
-#: qcsrc/client/quickmenu.qc:800
+#: qcsrc/client/hud/panel/quickmenu.qc:804
 msgid "QMCMD^killed flagcarrier (l:%y^7)"
+msgstr "QMCMD^killed flagcarrier (l:%y^7)"
+
+#: qcsrc/client/hud/panel/quickmenu.qc:804
+msgid "QMCMD^killed flagcarrier, icon"
 msgstr ""
 
-#: qcsrc/client/quickmenu.qc:801
+#: qcsrc/client/hud/panel/quickmenu.qc:805
 #, c-format
 msgid "QMCMD^dropped flag (l:%d^7)"
-msgstr ""
+msgstr "QMCMD^dropped flag (l:%d^7)"
 
-#: qcsrc/client/quickmenu.qc:801
+#: qcsrc/client/hud/panel/quickmenu.qc:805
 msgid "QMCMD^dropped flag, icon"
-msgstr ""
+msgstr "QMCMD^dropped flag, icon"
 
-#: qcsrc/client/quickmenu.qc:802
-msgid "QMCMD^drop gun, icon"
+#: qcsrc/client/hud/panel/quickmenu.qc:806
+msgid "QMCMD^drop weapon, icon"
 msgstr ""
 
-#: qcsrc/client/quickmenu.qc:802
-msgid "QMCMD^dropped gun %w^7 (l:%l^7)"
+#: qcsrc/client/hud/panel/quickmenu.qc:806
+msgid "QMCMD^dropped weapon %w^7 (l:%l^7)"
 msgstr ""
 
-#: qcsrc/client/quickmenu.qc:803
+#: qcsrc/client/hud/panel/quickmenu.qc:807
 msgid "QMCMD^drop flag/key, icon"
-msgstr ""
+msgstr "QMCMD^drop flag/key, icon"
 
-#: qcsrc/client/quickmenu.qc:803
+#: qcsrc/client/hud/panel/quickmenu.qc:807
 msgid "QMCMD^dropped flag/key %w^7 (l:%l^7)"
-msgstr ""
+msgstr "QMCMD^dropped flag/key %w^7 (l:%l^7)"
 
-#: qcsrc/client/quickmenu.qc:807
+#: qcsrc/client/hud/panel/quickmenu.qc:811
 msgid "QMCMD^Send private message to"
-msgstr ""
+msgstr "QMCMD^Send private message to"
 
-#: qcsrc/client/quickmenu.qc:809 qcsrc/client/quickmenu.qc:846
+#: qcsrc/client/hud/panel/quickmenu.qc:813
+#: qcsrc/client/hud/panel/quickmenu.qc:848
 msgid "QMCMD^Settings"
-msgstr ""
+msgstr "QMCMD^Settings"
 
-#: qcsrc/client/quickmenu.qc:810 qcsrc/client/quickmenu.qc:817
+#: qcsrc/client/hud/panel/quickmenu.qc:814
+#: qcsrc/client/hud/panel/quickmenu.qc:821
 msgid "QMCMD^View/HUD settings"
-msgstr ""
+msgstr "QMCMD^View/HUD settings"
 
-#: qcsrc/client/quickmenu.qc:811
+#: qcsrc/client/hud/panel/quickmenu.qc:815
 msgid "QMCMD^3rd person view"
-msgstr ""
+msgstr "QMCMD^3rd person view"
 
-#: qcsrc/client/quickmenu.qc:812
+#: qcsrc/client/hud/panel/quickmenu.qc:816
 msgid "QMCMD^Player models like mine"
-msgstr ""
+msgstr "QMCMD^Player models like mine"
 
-#: qcsrc/client/quickmenu.qc:813
+#: qcsrc/client/hud/panel/quickmenu.qc:817
 msgid "QMCMD^Names above players"
-msgstr ""
+msgstr "QMCMD^Names above players"
 
-#: qcsrc/client/quickmenu.qc:814
+#: qcsrc/client/hud/panel/quickmenu.qc:818
 msgid "QMCMD^Crosshair per weapon"
-msgstr ""
+msgstr "QMCMD^Crosshair per weapon"
 
-#: qcsrc/client/quickmenu.qc:815
+#: qcsrc/client/hud/panel/quickmenu.qc:819
 msgid "QMCMD^FPS"
-msgstr ""
+msgstr "QMCMD^FPS"
 
-#: qcsrc/client/quickmenu.qc:816
+#: qcsrc/client/hud/panel/quickmenu.qc:820
 msgid "QMCMD^Net graph"
-msgstr ""
+msgstr "QMCMD^Net graph"
 
-#: qcsrc/client/quickmenu.qc:819 qcsrc/client/quickmenu.qc:822
+#: qcsrc/client/hud/panel/quickmenu.qc:823
+#: qcsrc/client/hud/panel/quickmenu.qc:826
 msgid "QMCMD^Sound settings"
-msgstr ""
+msgstr "QMCMD^Sound settings"
 
-#: qcsrc/client/quickmenu.qc:820
+#: qcsrc/client/hud/panel/quickmenu.qc:824
 msgid "QMCMD^Hit sound"
-msgstr ""
+msgstr "QMCMD^Hit sound"
 
-#: qcsrc/client/quickmenu.qc:821
+#: qcsrc/client/hud/panel/quickmenu.qc:825
 msgid "QMCMD^Chat sound"
-msgstr ""
+msgstr "QMCMD^Chat sound"
 
-#: qcsrc/client/quickmenu.qc:826 qcsrc/client/quickmenu.qc:830
+#: qcsrc/client/hud/panel/quickmenu.qc:830
+#: qcsrc/client/hud/panel/quickmenu.qc:834
 msgid "QMCMD^Spectator camera"
-msgstr ""
+msgstr "QMCMD^Spectator camera"
 
-#: qcsrc/client/quickmenu.qc:827
+#: qcsrc/client/hud/panel/quickmenu.qc:831
 msgid "QMCMD^1st person"
-msgstr ""
+msgstr "QMCMD^1st person"
 
-#: qcsrc/client/quickmenu.qc:828
+#: qcsrc/client/hud/panel/quickmenu.qc:832
 msgid "QMCMD^3rd person around player"
-msgstr ""
+msgstr "QMCMD^3rd person around player"
 
-#: qcsrc/client/quickmenu.qc:829
+#: qcsrc/client/hud/panel/quickmenu.qc:833
 msgid "QMCMD^3rd person behind"
-msgstr ""
+msgstr "QMCMD^3rd person behind"
 
-#: qcsrc/client/quickmenu.qc:835 qcsrc/client/quickmenu.qc:840
+#: qcsrc/client/hud/panel/quickmenu.qc:839
+#: qcsrc/client/hud/panel/quickmenu.qc:844
 msgid "QMCMD^Observer camera"
-msgstr ""
+msgstr "QMCMD^Observer camera"
 
-#: qcsrc/client/quickmenu.qc:836
+#: qcsrc/client/hud/panel/quickmenu.qc:840
 msgid "QMCMD^Increase speed"
-msgstr ""
+msgstr "QMCMD^Increase speed"
 
-#: qcsrc/client/quickmenu.qc:837
+#: qcsrc/client/hud/panel/quickmenu.qc:841
 msgid "QMCMD^Decrease speed"
-msgstr ""
+msgstr "QMCMD^Decrease speed"
 
-#: qcsrc/client/quickmenu.qc:838
+#: qcsrc/client/hud/panel/quickmenu.qc:842
 msgid "QMCMD^Wall collision off"
-msgstr ""
+msgstr "QMCMD^Wall collision off"
 
-#: qcsrc/client/quickmenu.qc:839
+#: qcsrc/client/hud/panel/quickmenu.qc:843
 msgid "QMCMD^Wall collision on"
-msgstr ""
+msgstr "QMCMD^Wall collision on"
 
-#: qcsrc/client/quickmenu.qc:843
+#: qcsrc/client/hud/panel/quickmenu.qc:847
 msgid "QMCMD^Fullscreen"
-msgstr ""
+msgstr "QMCMD^Fullscreen"
 
-#: qcsrc/client/quickmenu.qc:845
-msgid "QMCMD^Translate chat messages"
-msgstr ""
-
-#: qcsrc/client/quickmenu.qc:848 qcsrc/client/quickmenu.qc:858
+#: qcsrc/client/hud/panel/quickmenu.qc:850
+#: qcsrc/client/hud/panel/quickmenu.qc:860
 msgid "QMCMD^Call a vote"
-msgstr ""
+msgstr "QMCMD^Call a vote"
 
-#: qcsrc/client/quickmenu.qc:849
+#: qcsrc/client/hud/panel/quickmenu.qc:851
 msgid "QMCMD^Restart the map"
-msgstr ""
+msgstr "QMCMD^Restart the map"
 
-#: qcsrc/client/quickmenu.qc:850
+#: qcsrc/client/hud/panel/quickmenu.qc:852
 msgid "QMCMD^End match"
-msgstr ""
+msgstr "QMCMD^End match"
 
-#: qcsrc/client/quickmenu.qc:853
+#: qcsrc/client/hud/panel/quickmenu.qc:855
 msgid "QMCMD^Reduce match time"
-msgstr ""
+msgstr "QMCMD^Reduce match time"
 
-#: qcsrc/client/quickmenu.qc:854
+#: qcsrc/client/hud/panel/quickmenu.qc:856
 msgid "QMCMD^Extend match time"
-msgstr ""
+msgstr "QMCMD^Extend match time"
 
-#: qcsrc/client/quickmenu.qc:857
+#: qcsrc/client/hud/panel/quickmenu.qc:859
 msgid "QMCMD^Shuffle teams"
+msgstr "QMCMD^Shuffle teams"
+
+#: qcsrc/client/hud/panel/racetimer.qc:54
+#, c-format
+msgid " (-%dL)"
+msgstr "(-%dL)"
+
+#: qcsrc/client/hud/panel/racetimer.qc:59
+#, c-format
+msgid " (+%dL)"
+msgstr "(+%dL)"
+
+#: qcsrc/client/hud/panel/racetimer.qc:78
+msgid "Start line"
+msgstr "Start line"
+
+#: qcsrc/client/hud/panel/racetimer.qc:80
+#: qcsrc/client/hud/panel/racetimer.qc:84
+msgid "Finish line"
+msgstr "Finish line"
+
+#: qcsrc/client/hud/panel/racetimer.qc:82
+#: qcsrc/client/hud/panel/racetimer.qc:151
+#, c-format
+msgid "Intermediate %d"
+msgstr "Intermediate %d"
+
+#: qcsrc/client/hud/panel/racetimer.qc:154
+#: qcsrc/client/hud/panel/racetimer.qc:201
+#: qcsrc/client/hud/panel/racetimer.qc:262
+#, c-format
+msgid "PENALTY: %.1f (%s)"
+msgstr ""
+
+#: qcsrc/client/hud/panel/racetimer.qc:154 qcsrc/client/main.qc:1129
+msgid "missing a checkpoint"
+msgstr ""
+
+#: qcsrc/client/hud/panel/radar.qc:373
+msgid "Click to select teleport destination"
+msgstr ""
+
+#: qcsrc/client/hud/panel/radar.qc:377
+msgid "Click to select spawn location"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:87
+msgid "Number of ball carrier kills"
 msgstr ""
 
-#: qcsrc/client/scoreboard.qc:30
+#: qcsrc/client/hud/panel/scoreboard.qc:87
 msgid "SCO^bckills"
 msgstr "SCO^bckills"
 
-#: qcsrc/client/scoreboard.qc:31
+#: qcsrc/client/hud/panel/scoreboard.qc:88
 msgid "SCO^bctime"
 msgstr "SCO^bctime"
 
-#: qcsrc/client/scoreboard.qc:32
+#: qcsrc/client/hud/panel/scoreboard.qc:88
+msgid "Total amount of time holding the ball in Keepaway"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:89
+msgid "How often a flag (CTF) or a key (KeyHunt) was captured"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:89
 msgid "SCO^caps"
 msgstr "SCO^caps"
 
-#: qcsrc/client/scoreboard.qc:33
+#: qcsrc/client/hud/panel/scoreboard.qc:90
 msgid "SCO^captime"
 msgstr "SCO^captime"
 
-#: qcsrc/client/scoreboard.qc:34
+#: qcsrc/client/hud/panel/scoreboard.qc:90
+msgid "Time of fastest capture (CTF)"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:91
+msgid "Number of deaths"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:91
 msgid "SCO^deaths"
 msgstr "SCO^deaths"
 
-#: qcsrc/client/scoreboard.qc:35
+#: qcsrc/client/hud/panel/scoreboard.qc:92
+msgid "Number of keys destroyed by pushing them into void"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:92
 msgid "SCO^destroyed"
 msgstr "SCO^destroyed"
 
-#: qcsrc/client/scoreboard.qc:36
-msgid "SCO^drops"
-msgstr "SCO^drops"
+#: qcsrc/client/hud/panel/scoreboard.qc:93
+msgid "SCO^damage"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:37
-msgid "SCO^faults"
-msgstr "SCO^faults"
+#: qcsrc/client/hud/panel/scoreboard.qc:93
+msgid "The total damage done"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:38
-msgid "SCO^fckills"
-msgstr "SCO^fckills"
+#: qcsrc/client/hud/panel/scoreboard.qc:94
+msgid "SCO^dmgtaken"
+msgstr "SCO^dmgtaken"
 
-#: qcsrc/client/scoreboard.qc:39
-msgid "SCO^goals"
-msgstr "SCO^goals"
+#: qcsrc/client/hud/panel/scoreboard.qc:94
+msgid "The total damage taken"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:40
-msgid "SCO^kckills"
-msgstr "SCO^kckills"
+#: qcsrc/client/hud/panel/scoreboard.qc:95
+msgid "Number of flag drops"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:41
-msgid "SCO^kdratio"
-msgstr "SCO^kdratio"
+#: qcsrc/client/hud/panel/scoreboard.qc:95
+msgid "SCO^drops"
+msgstr "SCO^drops"
+
+#: qcsrc/client/hud/panel/scoreboard.qc:96
+msgid "Player ELO"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:96
+msgid "SCO^elo"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:97
+msgid "SCO^fastest"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:97
+msgid "Time of fastest lap (Race/CTS)"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:98
+msgid "Number of faults committed"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:98
+msgid "SCO^faults"
+msgstr "SCO^faults"
+
+#: qcsrc/client/hud/panel/scoreboard.qc:99
+msgid "Number of flag carrier kills"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:99
+msgid "SCO^fckills"
+msgstr "SCO^fckills"
+
+#: qcsrc/client/hud/panel/scoreboard.qc:100
+msgid "FPS"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:100
+msgid "SCO^fps"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:101
+msgid "Number of kills minus suicides"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:101
+msgid "SCO^frags"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:102
+msgid "Number of goals scored"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:102
+msgid "SCO^goals"
+msgstr "SCO^goals"
 
-#: qcsrc/client/scoreboard.qc:42
+#: qcsrc/client/hud/panel/scoreboard.qc:103
+msgid "Number of keys carrier kills"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:103
+msgid "SCO^kckills"
+msgstr "SCO^kckills"
+
+#: qcsrc/client/hud/panel/scoreboard.qc:104
 msgid "SCO^k/d"
 msgstr "SCO^k/d"
 
-#: qcsrc/client/scoreboard.qc:43
-msgid "SCO^kd"
-msgstr "SCO^kd"
+#: qcsrc/client/hud/panel/scoreboard.qc:104
+#: qcsrc/client/hud/panel/scoreboard.qc:105
+#: qcsrc/client/hud/panel/scoreboard.qc:106
+msgid "The kill-death ratio"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:44
+#: qcsrc/client/hud/panel/scoreboard.qc:105
 msgid "SCO^kdr"
 msgstr "SCO^kdr"
 
-#: qcsrc/client/scoreboard.qc:45
+#: qcsrc/client/hud/panel/scoreboard.qc:106
+msgid "SCO^kdratio"
+msgstr "SCO^kdratio"
+
+#: qcsrc/client/hud/panel/scoreboard.qc:107
+msgid "Number of kills"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:107
 msgid "SCO^kills"
 msgstr "SCO^kills"
 
-#: qcsrc/client/scoreboard.qc:46
+#: qcsrc/client/hud/panel/scoreboard.qc:108
+msgid "Number of laps finished (Race/CTS)"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:108
 msgid "SCO^laps"
 msgstr "SCO^laps"
 
-#: qcsrc/client/scoreboard.qc:47
+#: qcsrc/client/hud/panel/scoreboard.qc:109
+msgid "Number of lives (LMS)"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:109
 msgid "SCO^lives"
 msgstr "SCO^lives"
 
-#: qcsrc/client/scoreboard.qc:48
+#: qcsrc/client/hud/panel/scoreboard.qc:110
+msgid "Number of times a key was lost"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:110
 msgid "SCO^losses"
 msgstr "SCO^losses"
 
-#: qcsrc/client/scoreboard.qc:49
+#: qcsrc/client/hud/panel/scoreboard.qc:111
+#: qcsrc/client/hud/panel/scoreboard.qc:112
+msgid "Player name"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:111
 msgid "SCO^name"
 msgstr "SCO^name"
 
-#: qcsrc/client/scoreboard.qc:50
-msgid "SCO^sum"
-msgstr "SCO^sum"
-
-#: qcsrc/client/scoreboard.qc:51
+#: qcsrc/client/hud/panel/scoreboard.qc:112
 msgid "SCO^nick"
 msgstr "SCO^nick"
 
-#: qcsrc/client/scoreboard.qc:52
+#: qcsrc/client/hud/panel/scoreboard.qc:113
+msgid "Number of objectives destroyed"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:113
 msgid "SCO^objectives"
 msgstr "SCO^objectives"
 
-#: qcsrc/client/scoreboard.qc:53
+#: qcsrc/client/hud/panel/scoreboard.qc:114
+msgid ""
+"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:114
 msgid "SCO^pickups"
 msgstr "SCO^pickups"
 
-#: qcsrc/client/scoreboard.qc:54
+#: qcsrc/client/hud/panel/scoreboard.qc:115
+msgid "Ping time"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:115
 msgid "SCO^ping"
 msgstr "SCO^ping"
 
-#: qcsrc/client/scoreboard.qc:55
+#: qcsrc/client/hud/panel/scoreboard.qc:116
+msgid "Packet loss"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:116
 msgid "SCO^pl"
 msgstr "SCO^pl"
 
-#: qcsrc/client/scoreboard.qc:56
+#: qcsrc/client/hud/panel/scoreboard.qc:117
+msgid "Number of players pushed into void"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:117
 msgid "SCO^pushes"
 msgstr "SCO^pushes"
 
-#: qcsrc/client/scoreboard.qc:57
+#: qcsrc/client/hud/panel/scoreboard.qc:118
+msgid "Player rank"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:118
 msgid "SCO^rank"
 msgstr "SCO^rank"
 
-#: qcsrc/client/scoreboard.qc:58
+#: qcsrc/client/hud/panel/scoreboard.qc:119
+msgid "Number of flag returns"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:119
 msgid "SCO^returns"
 msgstr "SCO^returns"
 
-#: qcsrc/client/scoreboard.qc:59
+#: qcsrc/client/hud/panel/scoreboard.qc:120
+msgid "Number of revivals"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:120
 msgid "SCO^revivals"
 msgstr "SCO^revivals"
 
-#: qcsrc/client/scoreboard.qc:60
-msgid "SCO^score"
-msgstr "SCO^score"
+#: qcsrc/client/hud/panel/scoreboard.qc:121
+msgid "Number of rounds won"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:61
-msgid "SCO^suicides"
-msgstr "SCO^suicides"
+#: qcsrc/client/hud/panel/scoreboard.qc:121
+msgid "SCO^rounds won"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:62
-msgid "SCO^takes"
-msgstr "SCO^takes"
+#: qcsrc/client/hud/panel/scoreboard.qc:122
+msgid "SCO^score"
+msgstr "SCO^score"
 
-#: qcsrc/client/scoreboard.qc:63
-msgid "SCO^ticks"
-msgstr "SCO^ticks"
+#: qcsrc/client/hud/panel/scoreboard.qc:122
+msgid "Total score"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:247
-msgid ""
-"You can modify the scoreboard using the ^2scoreboard_columns_set command.\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:123
+msgid "Number of suicides"
 msgstr ""
-"You can modify the scoreboard using the ^2scoreboard_columns_set command.\n"
 
-#: qcsrc/client/scoreboard.qc:248
-msgid "^3|---------------------------------------------------------------|\n"
-msgstr "^3|---------------------------------------------------------------|\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:123
+msgid "SCO^suicides"
+msgstr "SCO^suicides"
 
-#: qcsrc/client/scoreboard.qc:249
-msgid "Usage:\n"
-msgstr "Usage:\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:124
+msgid "Number of kills minus deaths"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:250
-msgid "^2scoreboard_columns_set default\n"
-msgstr "^2scoreboard_columns_set default\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:124
+msgid "SCO^sum"
+msgstr "SCO^sum"
 
-#: qcsrc/client/scoreboard.qc:251
-msgid "^2scoreboard_columns_set ^7field1 field2 ...\n"
-msgstr "^2scoreboard_columns_set ^7field1 field2 ...\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:125
+msgid "Number of domination points taken (Domination)"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:252
-msgid "The following field names are recognized (case insensitive):\n"
-msgstr "The following field names are recognised (case insensitive):\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:125
+msgid "SCO^takes"
+msgstr "SCO^takes"
 
-#: qcsrc/client/scoreboard.qc:253
-msgid ""
-"You can use a ^3|^7 to start the right-aligned fields.\n"
-"\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:126
+msgid "Number of teamkills"
 msgstr ""
-"You can use a ^3|^7 to start the right-aligned fields.\n"
-"\n"
 
-#: qcsrc/client/scoreboard.qc:255
-msgid "^3name^7 or ^3nick^7             Name of a player\n"
-msgstr "^3name^7 or ^3nick^7             Name of a player\n"
-
-#: qcsrc/client/scoreboard.qc:256
-msgid "^3ping^7                     Ping time\n"
-msgstr "^3ping^7                     Ping time\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:126
+msgid "SCO^teamkills"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:257
-msgid "^3pl^7                       Packet loss\n"
-msgstr "^3pl^7                       Packet loss\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:127
+msgid "Number of ticks (Domination)"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:258
-msgid "^3kills^7                    Number of kills\n"
-msgstr "^3kills^7                    Number of kills\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:127
+msgid "SCO^ticks"
+msgstr "SCO^ticks"
 
-#: qcsrc/client/scoreboard.qc:259
-msgid "^3deaths^7                   Number of deaths\n"
-msgstr "^3deaths^7                   Number of deaths\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:128
+msgid "SCO^time"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:260
-msgid "^3suicides^7                 Number of suicides\n"
-msgstr "^3suicides^7                 Number of suicides\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:128
+msgid "Total time raced (Race/CTS)"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:261
-msgid "^3frags^7                    kills - suicides\n"
-msgstr "^3frags^7                    kills - suicides\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:312
+msgid ""
+"You can modify the scoreboard using the ^2scoreboard_columns_set command."
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:262
-msgid "^3kd^7                       The kill-death ratio\n"
-msgstr "^3kd^7                       The kill-death ratio\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:313
+msgid "Usage:"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:263
-msgid "^3sum^7                      frags - deaths\n"
-msgstr "^3sum^7                      frags - deaths\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:315
+msgid "^2scoreboard_columns_set ^3field1 field2 ..."
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:264
+#: qcsrc/client/hud/panel/scoreboard.qc:316
 msgid ""
-"^3caps^7                     How often a flag (CTF) or a key (KeyHunt) was "
-"captured\n"
+"^2scoreboard_columns_set ^7without arguments reads the arguments from the "
+"cvar scoreboard_columns"
 msgstr ""
-"^3caps^7                     How often a flag (CTF) or a key (KeyHunt) was "
-"captured\n"
 
-#: qcsrc/client/scoreboard.qc:265
+#: qcsrc/client/hud/panel/scoreboard.qc:317
 msgid ""
-"^3pickups^7                  How often a flag (CTF) or a key (KeyHunt) or a "
-"ball (Keepaway) was picked up\n"
+"  ^5Note: ^7scoreboard_columns_set without arguments is executed on every "
+"map start"
 msgstr ""
-"^3pickups^7                  How often a flag (CTF) or a key (KeyHunt) or a "
-"ball (Keepaway) was picked up\n"
-
-#: qcsrc/client/scoreboard.qc:266
-msgid "^3captime^7                  Time of fastest cap (CTF)\n"
-msgstr "^3captime^7                  Time of fastest cap (CTF)\n"
-
-#: qcsrc/client/scoreboard.qc:267
-msgid "^3fckills^7                  Number of flag carrier kills\n"
-msgstr "^3fckills^7                  Number of flag carrier kills\n"
-
-#: qcsrc/client/scoreboard.qc:268
-msgid "^3returns^7                  Number of flag returns\n"
-msgstr "^3returns^7                  Number of flag returns\n"
 
-#: qcsrc/client/scoreboard.qc:269
-msgid "^3drops^7                    Number of flag drops\n"
-msgstr "^3drops^7                    Number of flag drops\n"
-
-#: qcsrc/client/scoreboard.qc:270
-msgid "^3lives^7                    Number of lives (LMS)\n"
-msgstr "^3lives^7                    Number of lives (LMS)\n"
-
-#: qcsrc/client/scoreboard.qc:271
-msgid "^3rank^7                     Player rank\n"
-msgstr "^3rank^7                     Player rank\n"
-
-#: qcsrc/client/scoreboard.qc:272
-msgid "^3pushes^7                   Number of players pushed into void\n"
-msgstr "^3pushes^7                   Number of players pushed into void\n"
-
-#: qcsrc/client/scoreboard.qc:273
+#: qcsrc/client/hud/panel/scoreboard.qc:318
 msgid ""
-"^3destroyed^7                Number of keys destroyed by pushing them into "
-"void\n"
+"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands "
+"it into the cvar scoreboard_columns so you can edit it"
 msgstr ""
-"^3destroyed^7                Number of keys destroyed by pushing them into "
-"void\n"
-
-#: qcsrc/client/scoreboard.qc:274
-msgid "^3kckills^7                  Number of keys carrier kills\n"
-msgstr "^3kckills^7                  Number of keys carrier kills\n"
-
-#: qcsrc/client/scoreboard.qc:275
-msgid "^3losses^7                   Number of times a key was lost\n"
-msgstr "^3losses^7                   Number of times a key was lost\n"
-
-#: qcsrc/client/scoreboard.qc:276
-msgid "^3laps^7                     Number of laps finished (race/cts)\n"
-msgstr "^3laps^7                     Number of laps finished (race/cts)\n"
 
-#: qcsrc/client/scoreboard.qc:277
-msgid "^3time^7                     Total time raced (race/cts)\n"
-msgstr "^3time^7                     Total time raced (race/cts)\n"
-
-#: qcsrc/client/scoreboard.qc:278
-msgid "^3fastest^7                  Time of fastest lap (race/cts)\n"
-msgstr "^3fastest^7                  Time of fastest lap (race/cts)\n"
-
-#: qcsrc/client/scoreboard.qc:279
-msgid "^3ticks^7                    Number of ticks (DOM)\n"
-msgstr "^3ticks^7                    Number of ticks (DOM)\n"
-
-#: qcsrc/client/scoreboard.qc:280
-msgid "^3takes^7                    Number of domination points taken (DOM)\n"
-msgstr "^3takes^7                    Number of domination points taken (DOM)\n"
-
-#: qcsrc/client/scoreboard.qc:281
-msgid "^3bckills^7                  Number of ball carrier kills\n"
-msgstr "^3bckills^7                  Number of ball carrier kills\n"
-
-#: qcsrc/client/scoreboard.qc:282
-msgid ""
-"^3bctime^7                   Total amount of time holding the ball in "
-"Keepaway\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:319
+msgid "You can use a ^3|^7 to start the right-aligned fields."
 msgstr ""
-"^3bctime^7                   Total amount of time holding the ball in "
-"Keepaway\n"
 
-#: qcsrc/client/scoreboard.qc:283
-msgid ""
-"^3score^7                    Total score\n"
-"\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:320
+msgid "The following field names are recognized (case insensitive):"
 msgstr ""
-"^3score^7                    Total score\n"
-"\n"
 
-#: qcsrc/client/scoreboard.qc:285
+#: qcsrc/client/hud/panel/scoreboard.qc:326
 msgid ""
 "Before a field you can put a + or - sign, then a comma separated list\n"
 "of game types, then a slash, to make the field show up only in these\n"
 "or in all but these game types. You can also specify 'all' as a\n"
-"field to show all fields available for the current game mode.\n"
-"\n"
+"field to show all fields available for the current game mode."
 msgstr ""
-"Before a field you can put a + or - sign, then a comma separated list\n"
-"of game types, then a slash, to make the field show up only in these\n"
-"or in all but these game types. You can also specify 'all' as a\n"
-"field to show all fields available for the current game mode.\n"
-"\n"
 
-#: qcsrc/client/scoreboard.qc:290
+#: qcsrc/client/hud/panel/scoreboard.qc:332
 msgid ""
 "The special game type names 'teams' and 'noteams' can be used to\n"
-"include/exclude ALL teams/noteams game modes.\n"
-"\n"
+"include/exclude ALL teams/noteams game modes."
 msgstr ""
-"The special game type names 'teams' and 'noteams' can be used to\n"
-"include/exclude ALL teams/noteams game modes.\n"
-"\n"
 
-#: qcsrc/client/scoreboard.qc:293
-msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4\n"
+#: qcsrc/client/hud/panel/scoreboard.qc:336
+msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4"
 msgstr ""
-"Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4\n"
 
-#: qcsrc/client/scoreboard.qc:294
+#: qcsrc/client/hud/panel/scoreboard.qc:337
 msgid ""
 "will display name, ping and pl aligned to the left, and the fields\n"
-"right of the vertical bar aligned to the right.\n"
+"right of the vertical bar aligned to the right."
 msgstr ""
-"will display name, ping and pl aligned to the left, and the fields\n"
-"right of the vertical bar aligned to the right.\n"
 
-#: qcsrc/client/scoreboard.qc:296
+#: qcsrc/client/hud/panel/scoreboard.qc:339
 msgid ""
 "'field3' will only be shown in CTF, and 'field4' will be shown in all\n"
-"other gamemodes except DM.\n"
-msgstr ""
-"'field3' will only be shown in CTF, and 'field4' will be shown in all\n"
-"other gamemodes except DM.\n"
-
-#: qcsrc/client/scoreboard.qc:532 qcsrc/client/scoreboard.qc:539
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:125
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:126
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:239
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:244
+"other gamemodes except DM."
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:603
+#: qcsrc/client/hud/panel/scoreboard.qc:610
+#: qcsrc/client/hud/panel/scoreboard.qc:662
+#: qcsrc/client/hud/panel/scoreboard.qc:673
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169
 msgid "N/A"
 msgstr "N/A"
 
-#: qcsrc/client/scoreboard.qc:1013
+#: qcsrc/client/hud/panel/scoreboard.qc:1188
 #, c-format
 msgid "Accuracy stats (average %d%%)"
 msgstr "Accuracy stats (average %d%%)"
 
-#: qcsrc/client/scoreboard.qc:1142
+#: qcsrc/client/hud/panel/scoreboard.qc:1336
 msgid "Map stats:"
 msgstr "Map stats:"
 
-#: qcsrc/client/scoreboard.qc:1160
+#: qcsrc/client/hud/panel/scoreboard.qc:1366
 msgid "Monsters killed:"
 msgstr "Monsters killed:"
 
-#: qcsrc/client/scoreboard.qc:1167
+#: qcsrc/client/hud/panel/scoreboard.qc:1373
 msgid "Secrets found:"
 msgstr "Secrets found:"
 
-#: qcsrc/client/scoreboard.qc:1195
+#: qcsrc/client/hud/panel/scoreboard.qc:1395
+msgid "Capture time rankings"
+msgstr ""
+
+#: qcsrc/client/hud/panel/scoreboard.qc:1395
 msgid "Rankings"
 msgstr "Rankings"
 
-#: qcsrc/client/scoreboard.qc:1291
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:52
-msgid "Scoreboard"
-msgstr "Scoreboard"
-
-#: qcsrc/client/scoreboard.qc:1343
+#: qcsrc/client/hud/panel/scoreboard.qc:1613
 #, c-format
-msgid "Speed award: %d ^7(%s^7)"
-msgstr "Speed award: %d ^7(%s^7)"
+msgid "^3%1.0f minutes"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:1347
+#: qcsrc/client/hud/panel/scoreboard.qc:1622
+#: qcsrc/client/hud/panel/scoreboard.qc:1629
 #, c-format
-msgid "All-time fastest: %d ^7(%s^7)"
-msgstr "All-time fastest: %d ^7(%s^7)"
+msgid "^5%s %s"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:1385
-msgid "Spectators"
-msgstr "Spectators"
+#: qcsrc/client/hud/panel/scoreboard.qc:1623
+#: qcsrc/client/hud/panel/scoreboard.qc:1630
+#: qcsrc/client/hud/panel/scoreboard.qc:1642
+#: qcsrc/client/hud/panel/scoreboard.qc:1649
+msgid "SCO^points"
+msgstr "SCO^points"
 
-#: qcsrc/client/scoreboard.qc:1392
-#, c-format
-msgid "playing ^3%s^7 on ^2%s^7"
-msgstr "playing ^3%s^7 on ^2%s^7"
+#: qcsrc/client/hud/panel/scoreboard.qc:1624
+#: qcsrc/client/hud/panel/scoreboard.qc:1631
+#: qcsrc/client/hud/panel/scoreboard.qc:1643
+#: qcsrc/client/hud/panel/scoreboard.qc:1650
+msgid "SCO^is beaten"
+msgstr "SCO^is beaten"
 
-#: qcsrc/client/scoreboard.qc:1399 qcsrc/client/scoreboard.qc:1404
+#: qcsrc/client/hud/panel/scoreboard.qc:1641
+#: qcsrc/client/hud/panel/scoreboard.qc:1648
 #, c-format
-msgid " for up to ^1%1.0f minutes^7"
-msgstr " for up to ^1%1.0f minutes^7"
-
-#: qcsrc/client/scoreboard.qc:1408 qcsrc/client/scoreboard.qc:1427
-msgid " or"
-msgstr " or"
+msgid "^2+%s %s"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:1411 qcsrc/client/scoreboard.qc:1418
+#: qcsrc/client/hud/panel/scoreboard.qc:1659
 #, c-format
-msgid " until ^3%s %s^7"
-msgstr " until ^3%s %s^7"
+msgid "^7Map: ^2%s"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:1412 qcsrc/client/scoreboard.qc:1419
-#: qcsrc/client/scoreboard.qc:1431 qcsrc/client/scoreboard.qc:1438
-msgid "SCO^points"
-msgstr "SCO^points"
+#: qcsrc/client/hud/panel/scoreboard.qc:1798
+#, c-format
+msgid "Speed award: %d%s ^7(%s^7)"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:1413 qcsrc/client/scoreboard.qc:1420
-#: qcsrc/client/scoreboard.qc:1432 qcsrc/client/scoreboard.qc:1439
-msgid "SCO^is beaten"
-msgstr "SCO^is beaten"
+#: qcsrc/client/hud/panel/scoreboard.qc:1802
+#, c-format
+msgid "All-time fastest: %d%s ^7(%s^7)"
+msgstr ""
 
-#: qcsrc/client/scoreboard.qc:1430 qcsrc/client/scoreboard.qc:1437
+#: qcsrc/client/hud/panel/scoreboard.qc:1818
 #, c-format
-msgid " until a lead of ^3%s %s^7"
-msgstr " until a lead of ^3%s %s^7"
+msgid "Spectators"
+msgstr "Spectators"
 
-#: qcsrc/client/scoreboard.qc:1459
+#: qcsrc/client/hud/panel/scoreboard.qc:1845
 #, c-format
 msgid "^1Respawning in ^3%s^1..."
 msgstr "^1Respawning in ^3%s^1..."
 
-#: qcsrc/client/scoreboard.qc:1469
+#: qcsrc/client/hud/panel/scoreboard.qc:1855
 #, c-format
 msgid "You are dead, wait ^3%s^7 before respawning"
 msgstr "You are dead, wait ^3%s^7 before respawning"
 
-#: qcsrc/client/scoreboard.qc:1478
+#: qcsrc/client/hud/panel/scoreboard.qc:1864
 #, c-format
 msgid "You are dead, press ^2%s^7 to respawn"
 msgstr "You are dead, press ^2%s^7 to respawn"
 
-#: qcsrc/client/view.qc:555
-msgid "Nade timer"
-msgstr "Nade timer"
+#: qcsrc/client/hud/panel/timer.qc:67
+msgid "WARMUP"
+msgstr ""
 
-#: qcsrc/client/view.qc:560
-msgid "Revival progress"
-msgstr "Revival progress"
+#: qcsrc/client/hud/panel/vote.qc:27
+msgid "^1You must answer before entering hud configure mode"
+msgstr ""
 
-#: qcsrc/common/buffs/all.inc:2
-msgid "Ammo"
-msgstr "Ammo"
+#: qcsrc/client/hud/panel/vote.qc:30
+msgid "^2Name ^7instead of \"^1Anonymous player^7\" in stats"
+msgstr "^2Name ^7instead of \"^1Anonymous player^7\" in stats"
 
-#: qcsrc/common/buffs/all.inc:11
-msgid "Resistance"
-msgstr "Resistance"
+#: qcsrc/client/hud/panel/vote.qc:116
+msgid "A vote has been called for:"
+msgstr "A vote has been called for:"
 
-#: qcsrc/common/buffs/all.inc:20
-#: qcsrc/common/mutators/mutator/instagib/items.qc:75
-msgid "Speed"
-msgstr "Speed"
+#: qcsrc/client/hud/panel/vote.qc:118
+msgid "Allow servers to store and display your name?"
+msgstr "Allow servers to store and display your name?"
 
-#: qcsrc/common/buffs/all.inc:30
-msgid "Medic"
-msgstr "Medic"
+#: qcsrc/client/hud/panel/vote.qc:122
+msgid "^1Configure the HUD"
+msgstr "^1Configure the HUD"
 
-#: qcsrc/common/buffs/all.inc:40
-msgid "Bash"
-msgstr "Bash"
+#: qcsrc/client/hud/panel/vote.qc:126 qcsrc/menu/xonotic/dialog_firstrun.qc:82
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18
+#: qcsrc/menu/xonotic/dialog_quit.qc:14
+#: qcsrc/menu/xonotic/dialog_settings_bindings_reset.qc:14
+#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:26
+#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:16
+#: qcsrc/menu/xonotic/dialog_uid2name.qc:15
+msgid "Yes"
+msgstr "Yes"
 
-#: qcsrc/common/buffs/all.inc:48
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:98
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:190
-msgid "Vampire"
-msgstr "Vampire"
+#: qcsrc/client/hud/panel/vote.qc:128 qcsrc/menu/xonotic/dialog_firstrun.qc:83
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21
+#: qcsrc/menu/xonotic/dialog_quit.qc:16
+#: qcsrc/menu/xonotic/dialog_settings_bindings_reset.qc:17
+#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:29
+#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:17
+#: qcsrc/menu/xonotic/dialog_uid2name.qc:17
+msgid "No"
+msgstr "No"
 
-#: qcsrc/common/buffs/all.inc:56
-msgid "Disability"
-msgstr "Disability"
+#: qcsrc/client/hud/panel/weapons.qc:546
+msgid "Out of ammo"
+msgstr "Out of ammo"
 
-#: qcsrc/common/buffs/all.inc:64
-msgid "Vengeance"
-msgstr "Vengeance"
+#: qcsrc/client/hud/panel/weapons.qc:550
+msgid "Don't have"
+msgstr "Don't have"
 
-#: qcsrc/common/buffs/all.inc:72
-msgid "Jump"
-msgstr "Jump"
+#: qcsrc/client/hud/panel/weapons.qc:554
+msgid "Unavailable"
+msgstr "Unavailable"
 
-#: qcsrc/common/buffs/all.inc:80
-msgid "Flight"
-msgstr "Flight"
+#: qcsrc/client/main.qc:1027
+msgid " qu/s"
+msgstr " qu/s"
 
-#: qcsrc/common/buffs/all.inc:88
-msgid "Invisible"
-msgstr "Invisible"
+#: qcsrc/client/main.qc:1029
+msgid " m/s"
+msgstr " m/s"
 
-#: qcsrc/common/buffs/all.inc:97
-msgid "Inferno"
+#: qcsrc/client/main.qc:1031
+msgid " km/h"
+msgstr " km/h"
+
+#: qcsrc/client/main.qc:1033
+msgid " mph"
+msgstr " mph"
+
+#: qcsrc/client/main.qc:1035
+msgid " knots"
+msgstr " knots"
+
+#: qcsrc/client/main.qc:1282
+#, c-format
+msgid "%s (not bound)"
+msgstr "%s (not bound)"
+
+#: qcsrc/client/mapvoting.qc:52
+msgid " (1 vote)"
+msgstr " (1 vote)"
+
+#: qcsrc/client/mapvoting.qc:54
+#, c-format
+msgid " (%d votes)"
+msgstr " (%d votes)"
+
+#: qcsrc/client/mapvoting.qc:274
+msgid "Don't care"
+msgstr "Don't care"
+
+#: qcsrc/client/mapvoting.qc:375
+msgid "Decide the gametype"
+msgstr "Decide the gametype"
+
+#: qcsrc/client/mapvoting.qc:375
+msgid "Vote for a map"
+msgstr "Vote for a map"
+
+#: qcsrc/client/mapvoting.qc:392
+#, c-format
+msgid "%d seconds left"
+msgstr "%d seconds left"
+
+#: qcsrc/client/mapvoting.qc:505
+msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!"
 msgstr ""
 
-#: qcsrc/common/buffs/all.inc:105
-msgid "Swapper"
+#: qcsrc/client/mapvoting.qc:515
+msgid "^1Error:^7 Couldn't find pak index."
 msgstr ""
 
-#: qcsrc/common/buffs/all.inc:113
-msgid "Magnet"
+#: qcsrc/client/mapvoting.qc:524
+msgid "Requesting preview..."
 msgstr ""
 
-#: qcsrc/common/command/generic.qc:171
-msgid "error creating curl handle\n"
-msgstr "error creating curl handle\n"
+#: qcsrc/client/miscfunctions.qc:111
+msgid "Trying to remove a team which is not in the teamlist!"
+msgstr "Trying to remove a team which is not in the teamlist!"
+
+#: qcsrc/client/view.qc:1518
+msgid "Nade timer"
+msgstr "Nade timer"
+
+#: qcsrc/client/view.qc:1523
+msgid "Capture progress"
+msgstr ""
+
+#: qcsrc/client/view.qc:1528
+msgid "Revival progress"
+msgstr "Revival progress"
+
+#: qcsrc/common/command/generic.qc:156
+msgid "error creating curl handle"
+msgstr ""
 
-#: qcsrc/common/command/generic.qc:419
-msgid "Notification restart command only works with cl_cmd and sv_cmd.\n"
-msgstr "Notification restart command only works with cl_cmd and sv_cmd.\n"
+#: qcsrc/common/command/generic.qc:412
+msgid "Notification restart command only works with cl_cmd and sv_cmd."
+msgstr ""
 
-#: qcsrc/common/gamemodes/gamemode/nexball/weapon.qc:8
+#: qcsrc/common/gamemodes/gamemode/nexball/weapon.qh:7
 msgid "Ball Stealer"
+msgstr "Ball Stealer"
+
+#: qcsrc/common/items/item/ammo.qh:66
+msgid "bullets"
+msgstr ""
+
+#: qcsrc/common/items/item/ammo.qh:96
+msgid "cells"
+msgstr ""
+
+#: qcsrc/common/items/item/ammo.qh:126
+msgid "plasma"
+msgstr ""
+
+#: qcsrc/common/items/item/ammo.qh:156
+msgid "rockets"
+msgstr ""
+
+#: qcsrc/common/items/item/ammo.qh:190
+msgid "shells"
+msgstr ""
+
+#: qcsrc/common/items/item/armor.qh:42
+msgid "Small armor"
+msgstr ""
+
+#: qcsrc/common/items/item/armor.qh:80
+msgid "Medium armor"
 msgstr ""
 
-#: qcsrc/common/items/item/armor.qc:56
-msgid "Large armor"
+#: qcsrc/common/items/item/armor.qh:118 qcsrc/common/items/item/armor.qh:121
+msgid "Big armor"
 msgstr ""
 
-#: qcsrc/common/items/item/armor.qc:77
+#: qcsrc/common/items/item/armor.qh:158 qcsrc/common/items/item/armor.qh:161
 msgid "Mega armor"
+msgstr "Mega armor"
+
+#: qcsrc/common/items/item/health.qh:42
+msgid "Small health"
+msgstr ""
+
+#: qcsrc/common/items/item/health.qh:80
+msgid "Medium health"
 msgstr ""
 
-#: qcsrc/common/items/item/health.qc:56
-msgid "Large health"
+#: qcsrc/common/items/item/health.qh:118 qcsrc/common/items/item/health.qh:121
+msgid "Big health"
 msgstr ""
 
-#: qcsrc/common/items/item/health.qc:77
+#: qcsrc/common/items/item/health.qh:158 qcsrc/common/items/item/health.qh:161
 msgid "Mega health"
+msgstr "Mega health"
+
+#: qcsrc/common/items/item/jetpack.qh:38 qcsrc/common/items/item/jetpack.qh:41
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:91
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:213
+msgid "Jetpack"
 msgstr ""
 
-#: qcsrc/common/items/item/jetpack.qc:20
-msgid "Jet Pack"
-msgstr "Jet Pack"
+#: qcsrc/common/items/item/jetpack.qh:71
+msgid "fuel"
+msgstr ""
+
+#: qcsrc/common/items/item/jetpack.qh:96
+msgid "Fuel regenerator"
+msgstr ""
 
-#: qcsrc/common/items/item/jetpack.qc:56
+#: qcsrc/common/items/item/jetpack.qh:99
 msgid "Fuel regen"
 msgstr "Fuel regen"
 
-#: qcsrc/common/items/item/powerup.qc:19
+#: qcsrc/common/items/item/powerup.qh:43 qcsrc/common/items/item/powerup.qh:46
 msgid "Strength"
 msgstr "Strength"
 
-#: qcsrc/common/items/item/powerup.qc:36
+#: qcsrc/common/items/item/powerup.qh:79 qcsrc/common/items/item/powerup.qh:82
 msgid "Shield"
 msgstr "Shield"
 
-#: qcsrc/common/mapinfo.qc:746
+#: qcsrc/common/mapinfo.qc:626
 #, no-c-format
 msgid "@!#%'n Tuba Throwing"
 msgstr "@!#%'n Tuba Throwing"
 
-#: qcsrc/common/mapinfo.qh:57
+#: qcsrc/common/mapinfo.qh:72 qcsrc/common/mapinfo.qh:333
+#: qcsrc/common/mapinfo.qh:528
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:105
+msgid "Frag limit:"
+msgstr "Frag limit:"
+
+#: qcsrc/common/mapinfo.qh:72 qcsrc/common/mapinfo.qh:333
+#: qcsrc/common/mapinfo.qh:528
+msgid "The amount of frags needed before the match will end"
+msgstr ""
+
+#: qcsrc/common/mapinfo.qh:114
 msgid "Deathmatch"
 msgstr "Deathmatch"
 
-#: qcsrc/common/mapinfo.qh:57
-msgid "Score as many frags as you can."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:114
+msgid "Score as many frags as you can"
+msgstr "Score as many frags as you can"
 
-#: qcsrc/common/mapinfo.qh:60
+#: qcsrc/common/mapinfo.qh:127
 msgid "Last Man Standing"
 msgstr "Last Man Standing"
 
-#: qcsrc/common/mapinfo.qh:60
-msgid "Survive and kill until the enemies have no lives left."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:127
+msgid "Survive and kill until the enemies have no lives left"
+msgstr "Survive and kill until the enemies have no lives left"
+
+#: qcsrc/common/mapinfo.qh:136
+msgid "Lives:"
+msgstr "Lives:"
 
-#: qcsrc/common/mapinfo.qh:63
+#: qcsrc/common/mapinfo.qh:148
 msgid "Race"
 msgstr "Race"
 
-#: qcsrc/common/mapinfo.qh:63
-msgid "Race against other players to the finish line."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:148
+msgid "Race against other players to the finish line"
+msgstr "Race against other players to the finish line"
+
+#: qcsrc/common/mapinfo.qh:175
+msgid "Laps:"
+msgstr "Laps:"
 
-#: qcsrc/common/mapinfo.qh:66
+#: qcsrc/common/mapinfo.qh:188
 msgid "Race CTS"
 msgstr "Race CTS"
 
-#: qcsrc/common/mapinfo.qh:66
+#: qcsrc/common/mapinfo.qh:188
 msgid "Race for fastest time."
-msgstr ""
+msgstr "Race for fastest time."
 
-#: qcsrc/common/mapinfo.qh:69
-msgid "Help your team score the most frags against the enemy team."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:205 qcsrc/common/mapinfo.qh:256
+#: qcsrc/common/mapinfo.qh:372 qcsrc/common/mapinfo.qh:415
+#: qcsrc/common/mapinfo.qh:441 qcsrc/common/mapinfo.qh:461
+#: qcsrc/common/mapinfo.qh:581
+msgid "Point limit:"
+msgstr "Point limit:"
 
-#: qcsrc/common/mapinfo.qh:69
+#: qcsrc/common/mapinfo.qh:218
+msgid "Help your team score the most frags against the enemy team"
+msgstr "Help your team score the most frags against the enemy team"
+
+#: qcsrc/common/mapinfo.qh:218
 msgid "Team Deathmatch"
 msgstr "Team Deathmatch"
 
-#: qcsrc/common/mapinfo.qh:72
+#: qcsrc/common/mapinfo.qh:256 qcsrc/common/mapinfo.qh:372
+#: qcsrc/common/mapinfo.qh:415
+msgid "The amount of points needed before the match will end"
+msgstr ""
+
+#: qcsrc/common/mapinfo.qh:270
 msgid "Capture the Flag"
 msgstr "Capture the Flag"
 
-#: qcsrc/common/mapinfo.qh:72
+#: qcsrc/common/mapinfo.qh:270
 msgid ""
 "Find and bring the enemy flag to your base to capture it, defend your base "
-"from the other team."
+"from the other team"
 msgstr ""
+"Find and bring the enemy flag to your base to capture it, defend your base "
+"from the other team"
+
+#: qcsrc/common/mapinfo.qh:288
+msgid "Capture limit:"
+msgstr "Capture limit:"
 
-#: qcsrc/common/mapinfo.qh:75
+#: qcsrc/common/mapinfo.qh:288
+msgid "The amount of captures needed before the match will end"
+msgstr ""
+
+#: qcsrc/common/mapinfo.qh:305
 msgid "Clan Arena"
 msgstr "Clan Arena"
 
-#: qcsrc/common/mapinfo.qh:75
-msgid "Kill all enemy teammates to win the round."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:305
+msgid "Kill all enemy teammates to win the round"
+msgstr "Kill all enemy teammates to win the round"
 
-#: qcsrc/common/mapinfo.qh:78
-msgid "Capture and defend all the control points to win."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:349
+msgid "Capture and defend all the control points to win"
+msgstr "Capture and defend all the control points to win"
 
-#: qcsrc/common/mapinfo.qh:78
+#: qcsrc/common/mapinfo.qh:349
 msgid "Domination"
 msgstr "Domination"
 
-#: qcsrc/common/mapinfo.qh:81
-msgid "Gather all the keys to win the round."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:387
+msgid "Gather all the keys to win the round"
+msgstr "Gather all the keys to win the round"
 
-#: qcsrc/common/mapinfo.qh:81
+#: qcsrc/common/mapinfo.qh:387
 msgid "Key Hunt"
 msgstr "Key Hunt"
 
-#: qcsrc/common/mapinfo.qh:84
+#: qcsrc/common/mapinfo.qh:427
 msgid "Assault"
 msgstr "Assault"
 
-#: qcsrc/common/mapinfo.qh:84
+#: qcsrc/common/mapinfo.qh:427
 msgid ""
 "Destroy obstacles to find and destroy the enemy power core before time runs "
-"out."
+"out"
 msgstr ""
+"Destroy obstacles to find and destroy the enemy power core before time runs "
+"out"
 
-#: qcsrc/common/mapinfo.qh:87
-msgid "Capture control points to reach and destroy the enemy generator."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:451
+msgid "Capture control points to reach and destroy the enemy generator"
+msgstr "Capture control points to reach and destroy the enemy generator"
 
-#: qcsrc/common/mapinfo.qh:87
+#: qcsrc/common/mapinfo.qh:451
 msgid "Onslaught"
 msgstr "Onslaught"
 
-#: qcsrc/common/mapinfo.qh:90
+#: qcsrc/common/mapinfo.qh:473
 msgid "Nexball"
 msgstr "Nexball"
 
-#: qcsrc/common/mapinfo.qh:90
-msgid "Shoot and kick the ball into the enemies goal, keep your goal clean."
+#: qcsrc/common/mapinfo.qh:473
+msgid "Shoot and kick the ball into the enemies goal, keep your goal clean"
+msgstr "Shoot and kick the ball into the enemies goal, keep your goal clean"
+
+#: qcsrc/common/mapinfo.qh:487
+msgid "Goals:"
+msgstr "Goals:"
+
+#: qcsrc/common/mapinfo.qh:487
+msgid "The amount of goals needed before the match will end"
 msgstr ""
 
-#: qcsrc/common/mapinfo.qh:93
+#: qcsrc/common/mapinfo.qh:500
 msgid "Freeze Tag"
 msgstr "Freeze Tag"
 
-#: qcsrc/common/mapinfo.qh:93
+#: qcsrc/common/mapinfo.qh:500
 msgid ""
-"Kill enemies to freeze them, stand next to teammates to revive them, freeze "
-"the most enemies to win."
+"Kill enemies to freeze them, stand next to frozen teammates to revive them; "
+"freeze all enemies to win"
 msgstr ""
 
-#: qcsrc/common/mapinfo.qh:96
-msgid "Hold the ball to get points for kills."
-msgstr ""
+#: qcsrc/common/mapinfo.qh:544
+msgid "Hold the ball to get points for kills"
+msgstr "Hold the ball to get points for kills"
 
-#: qcsrc/common/mapinfo.qh:96
+#: qcsrc/common/mapinfo.qh:544
 msgid "Keepaway"
 msgstr "Keepaway"
 
-#: qcsrc/common/mapinfo.qh:99
+#: qcsrc/common/mapinfo.qh:559
 msgid "Invasion"
 msgstr "Invasion"
 
-#: qcsrc/common/mapinfo.qh:99
-msgid "Survive against waves of monsters."
+#: qcsrc/common/mapinfo.qh:559
+msgid "Survive against waves of monsters"
+msgstr "Survive against waves of monsters"
+
+#: qcsrc/common/mapinfo.qh:589
+msgid "Duel"
+msgstr ""
+
+#: qcsrc/common/mapinfo.qh:589
+msgid "Fight in a one versus one arena battle to decide the winner"
 msgstr ""
 
 #: qcsrc/common/minigames/cl_minigames.qc:383
 msgid "It's your turn"
-msgstr ""
+msgstr "It's your turn"
 
-#: qcsrc/common/minigames/cl_minigames_hud.qc:324
-#: qcsrc/menu/xonotic/dialog_quit.qc:6
+#: qcsrc/common/minigames/cl_minigames_hud.qc:346
+#: qcsrc/menu/xonotic/dialog_quit.qh:6
 msgid "Quit"
 msgstr "Quit"
 
-#: qcsrc/common/minigames/cl_minigames_hud.qc:329
+#: qcsrc/common/minigames/cl_minigames_hud.qc:351
 msgid "Invite"
-msgstr ""
+msgstr "Invite"
 
-#: qcsrc/common/minigames/cl_minigames_hud.qc:371
+#: qcsrc/common/minigames/cl_minigames_hud.qc:390
 msgid "Current Game"
-msgstr ""
+msgstr "Current Game"
 
-#: qcsrc/common/minigames/cl_minigames_hud.qc:396
+#: qcsrc/common/minigames/cl_minigames_hud.qc:415
 msgid "Exit Menu"
-msgstr ""
+msgstr "Exit Menu"
 
-#: qcsrc/common/minigames/cl_minigames_hud.qc:408
-#: qcsrc/menu/xonotic/dialog_multiplayer.qc:23
+#: qcsrc/common/minigames/cl_minigames_hud.qc:427
+#: qcsrc/menu/xonotic/dialog_multiplayer.qc:16
 msgid "Create"
 msgstr "Create"
 
-#: qcsrc/common/minigames/cl_minigames_hud.qc:411
+#: qcsrc/common/minigames/cl_minigames_hud.qc:430
 msgid "Join"
 msgstr "Join"
 
-#: qcsrc/common/minigames/cl_minigames_hud.qc:481
+#: qcsrc/common/minigames/cl_minigames_hud.qc:506
 msgid "Minigames"
+msgstr "Minigames"
+
+#: qcsrc/common/minigames/cl_minigames_hud.qc:567
+msgid "Minigame message"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/c4.qc:372
-#: qcsrc/common/minigames/minigame/pp.qc:438
-#: qcsrc/common/minigames/minigame/ttt.qc:318
-msgid "Draw"
+#: qcsrc/common/minigames/minigame/bd.qc:2
+msgid "Bulldozer"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/c4.qc:377
-#: qcsrc/common/minigames/minigame/nmm.qc:602
-msgid "You lost the game!"
+#: qcsrc/common/minigames/minigame/bd.qc:1092
+#: qcsrc/common/minigames/minigame/ps.qc:421
+#: qcsrc/common/minigames/minigame/ps.qc:427
+msgid "Game over!"
+msgstr "Game over!"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1095
+msgid "Well done! Click 'Next Level' to continue"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/c4.qc:378
-#: qcsrc/common/minigames/minigame/nmm.qc:603
-#: qcsrc/common/minigames/minigame/snake.qc:739
-msgid "You win!"
+#: qcsrc/common/minigames/minigame/bd.qc:1162
+msgid "Better luck next time!"
+msgstr "Better luck next time!"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1167
+msgid "Tubular! Press \"Next Level\" to continue!"
+msgstr "Tubular! Press \"Next Level\" to continue!"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1169
+msgid "Wicked! Press \"Next Level\" to continue!"
+msgstr "Wicked! Press \"Next Level\" to continue!"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1173
+msgid "Press the space bar to change your currently selected tile"
+msgstr "Press the space bar to change your currently selected tile"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1176
+msgid "Push the boulders onto the targets"
+msgstr "Push the boulders onto the targets"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1398
+msgid "Next Level"
+msgstr "Next Level"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1399
+msgid "Restart"
+msgstr "Restart"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1400
+msgid "Editor"
+msgstr "Editor"
+
+#: qcsrc/common/minigames/minigame/bd.qc:1401
+#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:37
+msgid "Save"
+msgstr "Save"
+
+#: qcsrc/common/minigames/minigame/c4.qc:2
+msgid "Connect Four"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/c4.qc:382
+#: qcsrc/common/minigames/minigame/c4.qc:311
+#: qcsrc/common/minigames/minigame/c4.qc:317
+#: qcsrc/common/minigames/minigame/nmm.qc:491
+#: qcsrc/common/minigames/minigame/nmm.qc:497
+#: qcsrc/common/minigames/minigame/pp.qc:362
+#: qcsrc/common/minigames/minigame/pp.qc:368
+#, c-format
+msgid "%s^7 won the game!"
+msgstr ""
+
+#: qcsrc/common/minigames/minigame/c4.qc:373
+#: qcsrc/common/minigames/minigame/pp.qc:438
+#: qcsrc/common/minigames/minigame/ttt.qc:319
+msgid "Draw"
+msgstr "Draw"
+
+#: qcsrc/common/minigames/minigame/c4.qc:378
+#: qcsrc/common/minigames/minigame/nmm.qc:606
+#: qcsrc/common/minigames/minigame/pp.qc:443
+#: qcsrc/common/minigames/minigame/ttt.qc:324
+msgid "You lost the game!"
+msgstr "You lost the game!"
+
+#: qcsrc/common/minigames/minigame/c4.qc:379
 #: qcsrc/common/minigames/minigame/nmm.qc:607
+#: qcsrc/common/minigames/minigame/pp.qc:444
+#: qcsrc/common/minigames/minigame/ttt.qc:325
+msgid "You win!"
+msgstr "You win!"
+
+#: qcsrc/common/minigames/minigame/c4.qc:383
+#: qcsrc/common/minigames/minigame/nmm.qc:611
 #: qcsrc/common/minigames/minigame/pp.qc:455
-#: qcsrc/common/minigames/minigame/ttt.qc:335
+#: qcsrc/common/minigames/minigame/ttt.qc:336
 msgid "Wait for your opponent to make their move"
-msgstr ""
+msgstr "Wait for your opponent to make their move"
 
-#: qcsrc/common/minigames/minigame/c4.qc:385
-#: qcsrc/common/minigames/minigame/nmm.qc:609
+#: qcsrc/common/minigames/minigame/c4.qc:386
+#: qcsrc/common/minigames/minigame/nmm.qc:613
 #: qcsrc/common/minigames/minigame/pp.qc:458
-#: qcsrc/common/minigames/minigame/ttt.qc:338
+#: qcsrc/common/minigames/minigame/ttt.qc:339
 msgid "Click on the game board to place your piece"
+msgstr "Click on the game board to place your piece"
+
+#: qcsrc/common/minigames/minigame/nmm.qc:7
+msgid "Nine Men's Morris"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/nmm.qc:611
+#: qcsrc/common/minigames/minigame/nmm.qc:615
 msgid ""
 "You can select one of your pieces to move it in one of the surrounding places"
 msgstr ""
+"You can select one of your pieces to move it in one of the surrounding places"
 
-#: qcsrc/common/minigames/minigame/nmm.qc:613
+#: qcsrc/common/minigames/minigame/nmm.qc:617
 msgid "You can select one of your pieces to move it anywhere on the board"
-msgstr ""
+msgstr "You can select one of your pieces to move it anywhere on the board"
 
-#: qcsrc/common/minigames/minigame/nmm.qc:615
+#: qcsrc/common/minigames/minigame/nmm.qc:619
 msgid "You can take one of the opponent's pieces"
+msgstr "You can take one of the opponent's pieces"
+
+#: qcsrc/common/minigames/minigame/pong.qc:2
+msgid "Pong"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/pong.qc:569
-#: qcsrc/common/minigames/minigame/ttt.qc:298
+#: qcsrc/common/minigames/minigame/pong.qc:589
+#: qcsrc/common/minigames/minigame/ttt.qc:299
 msgid "AI"
-msgstr ""
+msgstr "AI"
 
-#: qcsrc/common/minigames/minigame/pong.qc:586
+#: qcsrc/common/minigames/minigame/pong.qc:606
 msgid "Press ^1Start Match^7 to start the match with the current players"
-msgstr ""
+msgstr "Press ^1Start Match^7 to start the match with the current players"
 
-#: qcsrc/common/minigames/minigame/pong.qc:650
+#: qcsrc/common/minigames/minigame/pong.qc:674
 msgid "Start Match"
-msgstr ""
+msgstr "Start Match"
 
-#: qcsrc/common/minigames/minigame/pong.qc:651
+#: qcsrc/common/minigames/minigame/pong.qc:675
 msgid "Add AI player"
-msgstr ""
+msgstr "Add AI player"
 
-#: qcsrc/common/minigames/minigame/pong.qc:652
+#: qcsrc/common/minigames/minigame/pong.qc:676
 msgid "Remove AI player"
-msgstr ""
+msgstr "Remove AI player"
 
-#: qcsrc/common/minigames/minigame/pp.qc:443
-#: qcsrc/common/minigames/minigame/ttt.qc:323
-msgid ""
-"You lost the game!\n"
-"Select \"^1Next Match^7\" on the menu for a rematch!"
+#: qcsrc/common/minigames/minigame/pp.qc:2
+msgid "Push-Pull"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/pp.qc:444
+#: qcsrc/common/minigames/minigame/pp.qc:443
 #: qcsrc/common/minigames/minigame/ttt.qc:324
-msgid ""
-"You win!\n"
-"Select \"^1Next Match^7\" on the menu to start a new match!"
+msgid "Select \"^1Next Match^7\" on the menu for a rematch!"
 msgstr ""
 
+#: qcsrc/common/minigames/minigame/pp.qc:444
 #: qcsrc/common/minigames/minigame/pp.qc:450
-#: qcsrc/common/minigames/minigame/ttt.qc:330
+#: qcsrc/common/minigames/minigame/ttt.qc:325
+#: qcsrc/common/minigames/minigame/ttt.qc:331
 msgid "Select \"^1Next Match^7\" on the menu to start a new match!"
-msgstr ""
+msgstr "Select \"^1Next Match^7\" on the menu to start a new match!"
 
 #: qcsrc/common/minigames/minigame/pp.qc:451
-#: qcsrc/common/minigames/minigame/ttt.qc:331
+#: qcsrc/common/minigames/minigame/ttt.qc:332
 msgid "Wait for your opponent to confirm the rematch"
-msgstr ""
+msgstr "Wait for your opponent to confirm the rematch"
 
-#: qcsrc/common/minigames/minigame/pp.qc:582
-#: qcsrc/common/minigames/minigame/ttt.qc:665
+#: qcsrc/common/minigames/minigame/pp.qc:581
+#: qcsrc/common/minigames/minigame/ttt.qc:664
 msgid "Next Match"
+msgstr "Next Match"
+
+#: qcsrc/common/minigames/minigame/ps.qc:2
+msgid "Peg Solitaire"
+msgstr ""
+
+#: qcsrc/common/minigames/minigame/ps.qc:414
+msgid "All pieces cleared!"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/ps.qc:477
+#: qcsrc/common/minigames/minigame/ps.qc:416
+msgid "Remaining pieces:"
+msgstr ""
+
+#: qcsrc/common/minigames/minigame/ps.qc:481
 #, c-format
 msgid "Pieces left: %s"
-msgstr ""
+msgstr "Pieces left: %s"
 
-#: qcsrc/common/minigames/minigame/ps.qc:487
+#: qcsrc/common/minigames/minigame/ps.qc:491
 msgid "No more valid moves"
-msgstr ""
+msgstr "No more valid moves"
 
-#: qcsrc/common/minigames/minigame/ps.qc:490
+#: qcsrc/common/minigames/minigame/ps.qc:494
 msgid "Well done, you win!"
-msgstr ""
+msgstr "Well done, you win!"
 
-#: qcsrc/common/minigames/minigame/ps.qc:493
+#: qcsrc/common/minigames/minigame/ps.qc:497
 msgid "Jump a piece over another to capture it"
-msgstr ""
+msgstr "Jump a piece over another to capture it"
 
-#: qcsrc/common/minigames/minigame/snake.qc:733
-msgid "Game over!"
+#: qcsrc/common/minigames/minigame/ttt.qc:2
+msgid "Tic Tac Toe"
 msgstr ""
 
-#: qcsrc/common/minigames/minigame/snake.qc:738
-#: qcsrc/common/minigames/minigame/snake.qc:743
-msgid "You ran out of lives!"
-msgstr ""
+#: qcsrc/common/minigames/minigame/ttt.qc:665
+msgid "Single Player"
+msgstr "Single Player"
 
-#: qcsrc/common/minigames/minigame/snake.qc:746
-msgid "Press an arrow key to begin the game"
-msgstr ""
+#: qcsrc/common/monsters/monster/mage.qh:17
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:18
+msgid "Mage"
+msgstr "Mage"
 
-#: qcsrc/common/minigames/minigame/snake.qc:750
-msgid "Avoid the snake's body, collect the mice!"
-msgstr ""
+#: qcsrc/common/monsters/monster/mage.qh:29
+msgid "Mage spike"
+msgstr "Mage spike"
 
-#: qcsrc/common/minigames/minigame/snake.qc:752
-msgid "Avoid the screen edges and the snake's body, collect the mice!"
-msgstr ""
+#: qcsrc/common/monsters/monster/shambler.qh:17
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:17
+msgid "Shambler"
+msgstr "Shambler"
 
-#: qcsrc/common/minigames/minigame/ttt.qc:666
-msgid "Single Player"
-msgstr ""
+#: qcsrc/common/monsters/monster/spider.qh:17
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:16
+msgid "Spider"
+msgstr "Spider"
 
-#: qcsrc/common/monsters/monster/mage.qc:16
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:26
-msgid "Mage"
-msgstr "Mage"
+#: qcsrc/common/monsters/monster/spider.qh:28
+msgid "Spider attack"
+msgstr "Spider attack"
+
+#: qcsrc/common/monsters/monster/wyvern.qh:17
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:19
+msgid "Wyvern"
+msgstr "Wyvern"
+
+#: qcsrc/common/monsters/monster/wyvern.qh:28
+msgid "Wyvern attack"
+msgstr "Wyvern attack"
+
+#: qcsrc/common/monsters/monster/zombie.qh:17
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:15
+msgid "Zombie"
+msgstr "Zombie"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:15
+msgid "Ammo"
+msgstr "Ammo"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:24
+msgid "Resistance"
+msgstr "Resistance"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:33
+#: qcsrc/common/mutators/mutator/instagib/items.qh:126
+#: qcsrc/common/mutators/mutator/instagib/items.qh:129
+msgid "Speed"
+msgstr "Speed"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:43
+msgid "Medic"
+msgstr "Medic"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:54
+msgid "Bash"
+msgstr "Bash"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:62
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:83
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:182
+msgid "Vampire"
+msgstr "Vampire"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:70
+msgid "Disability"
+msgstr "Disability"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:78
+msgid "Vengeance"
+msgstr "Vengeance"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:86
+msgid "Jump"
+msgstr "Jump"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:95
+msgid "Invisible"
+msgstr "Invisible"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:104
+msgid "Inferno"
+msgstr "Inferno"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:112
+msgid "Swapper"
+msgstr "Swapper"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:120
+msgid "Magnet"
+msgstr "Magnet"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:128
+msgid "Luck"
+msgstr "Luck"
+
+#: qcsrc/common/mutators/mutator/buffs/all.inc:136
+msgid "Flight"
+msgstr "Flight"
+
+#: qcsrc/common/mutators/mutator/buffs/buffs.qh:7
+msgid "Buff"
+msgstr "Buff"
 
-#: qcsrc/common/monsters/monster/mage.qc:32
-msgid "Mage spike"
-msgstr ""
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:8
+msgid "Damage text"
+msgstr "Damage text"
 
-#: qcsrc/common/monsters/monster/shambler.qc:16
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:25
-msgid "Shambler"
-msgstr "Shambler"
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:18
+msgid "Draw damage numbers"
+msgstr "Draw damage numbers"
 
-#: qcsrc/common/monsters/monster/spider.qc:16
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:24
-msgid "Spider"
-msgstr "Spider"
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:20
+msgid "Font size minimum:"
+msgstr ""
 
-#: qcsrc/common/monsters/monster/spider.qc:31
-msgid "Spider attack"
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:25
+msgid "Font size maximum:"
 msgstr ""
 
-#: qcsrc/common/monsters/monster/wyvern.qc:16
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:27
-msgid "Wyvern"
-msgstr "Wyvern"
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:30
+msgid "Accumulate range:"
+msgstr "Accumulate range:"
 
-#: qcsrc/common/monsters/monster/wyvern.qc:31
-msgid "Wyvern attack"
-msgstr ""
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:38
+msgid "Lifetime:"
+msgstr "Lifetime:"
 
-#: qcsrc/common/monsters/monster/zombie.qc:16
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:23
-msgid "Zombie"
-msgstr "Zombie"
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:43
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:53
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:55
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109
+#: qcsrc/menu/xonotic/util.qc:783
+msgid "Color:"
+msgstr "Colour:"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:14
-msgid "Draw damage dealt. 0: disabled, 1: enabled"
+#: qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc:50
+msgid "Draw damage numbers for friendly fire"
 msgstr ""
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:15
-msgid "How to format the damage text. 1$ is health, 2$ is armor, 3$ is both"
+#: qcsrc/common/mutators/mutator/instagib/items.qh:33
+msgid "Vaporizer ammo"
 msgstr ""
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:16
-msgid "Default damage text color"
-msgstr ""
+#: qcsrc/common/mutators/mutator/instagib/items.qh:59
+#: qcsrc/common/mutators/mutator/instagib/items.qh:62
+msgid "Extra life"
+msgstr "Extra life"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:17
-msgid "Damage text font size"
-msgstr ""
+#: qcsrc/common/mutators/mutator/instagib/items.qh:91
+#: qcsrc/common/mutators/mutator/instagib/items.qh:94
+msgid "Invisibility"
+msgstr "Invisibility"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:18
-msgid "Damage text initial alpha"
-msgstr ""
+#: qcsrc/common/mutators/mutator/nades/nades.inc:18
+msgid "Napalm grenade"
+msgstr "Napalm grenade"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:19
-msgid "Damage text lifetime in seconds"
-msgstr ""
+#: qcsrc/common/mutators/mutator/nades/nades.inc:26
+msgid "Ice grenade"
+msgstr "Ice grenade"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:20
-msgid "Damage text move direction"
-msgstr ""
+#: qcsrc/common/mutators/mutator/nades/nades.inc:34
+msgid "Translocate grenade"
+msgstr "Translocate grenade"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:21
-msgid "Damage text offset"
-msgstr ""
+#: qcsrc/common/mutators/mutator/nades/nades.inc:42
+msgid "Spawn grenade"
+msgstr "Spawn grenade"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:22
-msgid "Damage text spawned within this range is accumulated"
-msgstr ""
+#: qcsrc/common/mutators/mutator/nades/nades.inc:50
+msgid "Heal grenade"
+msgstr "Heal grenade"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:68
-msgid "<= 0: disabled, >= 1: spectators, >= 2: players, >= 3: all players"
-msgstr ""
+#: qcsrc/common/mutators/mutator/nades/nades.inc:58
+msgid "Monster grenade"
+msgstr "Monster grenade"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:127
-msgid "Damage text"
+#: qcsrc/common/mutators/mutator/nades/nades.inc:66
+msgid "Entrap grenade"
 msgstr ""
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:136
-msgid "Draw damage numbers"
+#: qcsrc/common/mutators/mutator/nades/nades.inc:74
+msgid "Veil grenade"
 msgstr ""
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:138
-msgid "Font size:"
-msgstr ""
+#: qcsrc/common/mutators/mutator/nades/nades.qh:34
+msgid "Grenade"
+msgstr "Grenade"
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:141
-msgid "Accumulate range:"
+#: qcsrc/common/mutators/mutator/overkill/okhmg.qh:20
+msgid "Overkill Heavy Machine Gun"
 msgstr ""
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:144
-msgid "Lifetime:"
+#: qcsrc/common/mutators/mutator/overkill/okmachinegun.qh:18
+msgid "Overkill MachineGun"
 msgstr ""
 
-#: qcsrc/common/mutators/mutator/damagetext.qc:147
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:33
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:80
-#: qcsrc/menu/xonotic/util.qc:749
-msgid "Color:"
-msgstr "Colour:"
+#: qcsrc/common/mutators/mutator/overkill/oknex.qh:19
+msgid "Overkill Nex"
+msgstr ""
 
-#: qcsrc/common/mutators/mutator/instagib/items.qc:41
-msgid "Extra life"
-msgstr "Extra life"
+#: qcsrc/common/mutators/mutator/overkill/okrpc.qh:20
+msgid "Overkill Rocket Propelled Chainsaw"
+msgstr ""
 
-#: qcsrc/common/mutators/mutator/instagib/items.qc:58
-msgid "Invisibility"
-msgstr "Invisibility"
+#: qcsrc/common/mutators/mutator/overkill/okshotgun.qh:18
+msgid "Overkill Shotgun"
+msgstr ""
 
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:3
 msgid "Waypoint"
@@ -1571,69 +1955,69 @@ msgstr "Frozen!"
 
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:10
 msgid "Item"
-msgstr ""
+msgstr "Item"
 
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:12
 msgid "Checkpoint"
 msgstr "Checkpoint"
 
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:13
-#: qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc:257
+#: qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc:240
 msgid "Finish"
 msgstr "Finish"
 
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:14
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:15
-#: qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc:257
+#: qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc:240
 msgid "Start"
 msgstr "Start"
 
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:17
-msgid "<placeholder>"
-msgstr ""
-
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:18
 msgid "Defend"
 msgstr "Defend"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:19
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:18
 msgid "Destroy"
 msgstr "Destroy"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:20
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:19
 msgid "Push"
 msgstr "Push"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:22
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:21
 msgid "Flag carrier"
 msgstr "Flag carrier"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:23
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:22
 msgid "Enemy carrier"
 msgstr "Enemy carrier"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:24
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:23
 msgid "Dropped flag"
 msgstr "Dropped flag"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:25
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:24
 msgid "White base"
-msgstr ""
+msgstr "White base"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:26
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:25
 msgid "Red base"
 msgstr "Red base"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:27
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:26
 msgid "Blue base"
 msgstr "Blue base"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:28
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:27
 msgid "Yellow base"
-msgstr ""
+msgstr "Yellow base"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:29
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:28
 msgid "Pink base"
+msgstr "Pink base"
+
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:29
+msgid "Return flag here"
 msgstr ""
 
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:31
@@ -1682,91 +2066,44 @@ msgid "Generator"
 msgstr "Generator"
 
 #: qcsrc/common/mutators/mutator/waypoints/all.inc:57
-msgid "Buff"
-msgstr ""
-
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:59
 msgid "Weapon"
-msgstr ""
+msgstr "Weapon"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:61
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:59
 msgid "Monster"
-msgstr ""
+msgstr "Monster"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:63
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:61
 msgid "Vehicle"
 msgstr "Vehicle"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:64
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:62
 msgid "Intruder!"
-msgstr ""
+msgstr "Intruder!"
 
-#: qcsrc/common/mutators/mutator/waypoints/all.inc:66
+#: qcsrc/common/mutators/mutator/waypoints/all.inc:64
 msgid "Tagged"
 msgstr "Tagged"
 
-#: qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc:658
-#: qcsrc/common/turrets/cl_turrets.qc:118
-msgid "Spam"
-msgstr "Spam"
-
-#: qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc:662
+#: qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc:695
 #, c-format
 msgid "%s needing help!"
 msgstr "%s needing help!"
 
-#: qcsrc/common/nades/all.inc:14
-msgid "Napalm grenade"
-msgstr ""
-
-#: qcsrc/common/nades/all.inc:22
-msgid "Ice grenade"
-msgstr ""
-
-#: qcsrc/common/nades/all.inc:30
-msgid "Translocate grenade"
-msgstr ""
-
-#: qcsrc/common/nades/all.inc:38
-msgid "Spawn grenade"
-msgstr ""
-
-#: qcsrc/common/nades/all.inc:46
-msgid "Heal grenade"
-msgstr ""
-
-#: qcsrc/common/nades/all.inc:54
-msgid "Monster grenade"
-msgstr ""
-
-#: qcsrc/common/nades/all.qh:31
-msgid "Grenade"
-msgstr ""
-
-#: qcsrc/common/net_notice.qc:88
+#: qcsrc/common/net_notice.qc:90
 msgid "^1Server notices:"
 msgstr "^1Server notices:"
 
-#: qcsrc/common/net_notice.qc:94
-#, c-format
-msgid "^7%s (^3%d sec left)"
-msgstr "^7%s (^3%d sec left)"
-
-#: qcsrc/common/notifications.inc:218
-#, c-format
-msgid "^BG%s^BG is connecting..."
-msgstr ""
-
-#: qcsrc/common/notifications.inc:219
+#: qcsrc/common/notifications/all.inc:239
 msgid "^F4NOTE: ^BGSpectator chat is not sent to players during the match"
 msgstr "^F4NOTE: ^BGSpectator chat is not sent to players during the match"
 
-#: qcsrc/common/notifications.inc:220
+#: qcsrc/common/notifications/all.inc:241
 #, c-format
 msgid "^BG%s^BG captured the ^TC^TT^BG flag"
 msgstr "^BG%s^BG captured the ^TC^TT^BG flag"
 
-#: qcsrc/common/notifications.inc:221
+#: qcsrc/common/notifications/all.inc:242
 #, c-format
 msgid ""
 "^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking ^BG"
@@ -1775,17 +2112,17 @@ msgstr ""
 "^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking ^BG"
 "%s^BG's previous record of ^F2%s^BG seconds"
 
-#: qcsrc/common/notifications.inc:222
+#: qcsrc/common/notifications/all.inc:243
 #, c-format
 msgid "^BG%s^BG captured the flag"
-msgstr ""
+msgstr "^BG%s^BG captured the flag"
 
-#: qcsrc/common/notifications.inc:223
+#: qcsrc/common/notifications/all.inc:244
 #, c-format
 msgid "^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds"
 msgstr "^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds"
 
-#: qcsrc/common/notifications.inc:224
+#: qcsrc/common/notifications/all.inc:245
 #, c-format
 msgid ""
 "^BG%s^BG captured the ^TC^TT^BG flag in ^F2%s^BG seconds, failing to break "
@@ -1794,31 +2131,31 @@ msgstr ""
 "^BG%s^BG captured the ^TC^TT^BG flag in ^F2%s^BG seconds, failing to break "
 "^BG%s^BG's previous record of ^F1%s^BG seconds"
 
-#: qcsrc/common/notifications.inc:225
+#: qcsrc/common/notifications/all.inc:246
 msgid "^BGThe ^TC^TT^BG flag was returned to base by its owner"
 msgstr "^BGThe ^TC^TT^BG flag was returned to base by its owner"
 
-#: qcsrc/common/notifications.inc:226
+#: qcsrc/common/notifications/all.inc:247
 msgid "^BGThe flag was returned by its owner"
-msgstr ""
+msgstr "^BGThe flag was returned by its owner"
 
-#: qcsrc/common/notifications.inc:227
+#: qcsrc/common/notifications/all.inc:248
 msgid "^BGThe ^TC^TT^BG flag was destroyed and returned to base"
 msgstr "^BGThe ^TC^TT^BG flag was destroyed and returned to base"
 
-#: qcsrc/common/notifications.inc:228
+#: qcsrc/common/notifications/all.inc:249
 msgid "^BGThe flag was destroyed and returned to base"
-msgstr ""
+msgstr "^BGThe flag was destroyed and returned to base"
 
-#: qcsrc/common/notifications.inc:229
+#: qcsrc/common/notifications/all.inc:250
 msgid "^BGThe ^TC^TT^BG flag was dropped in the base and returned itself"
 msgstr "^BGThe ^TC^TT^BG flag was dropped in the base and returned itself"
 
-#: qcsrc/common/notifications.inc:230
+#: qcsrc/common/notifications/all.inc:251
 msgid "^BGThe flag was dropped in the base and returned itself"
-msgstr ""
+msgstr "^BGThe flag was dropped in the base and returned itself"
 
-#: qcsrc/common/notifications.inc:231
+#: qcsrc/common/notifications/all.inc:252
 msgid ""
 "^BGThe ^TC^TT^BG flag fell somewhere it couldn't be reached and returned to "
 "base"
@@ -1826,11 +2163,11 @@ msgstr ""
 "^BGThe ^TC^TT^BG flag fell somewhere it couldn't be reached and returned to "
 "base"
 
-#: qcsrc/common/notifications.inc:232
+#: qcsrc/common/notifications/all.inc:253
 msgid "^BGThe flag fell somewhere it couldn't be reached and returned to base"
-msgstr ""
+msgstr "^BGThe flag fell somewhere it couldn't be reached and returned to base"
 
-#: qcsrc/common/notifications.inc:233
+#: qcsrc/common/notifications/all.inc:254
 #, c-format
 msgid ""
 "^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned "
@@ -1839,747 +2176,784 @@ msgstr ""
 "^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned "
 "itself"
 
-#: qcsrc/common/notifications.inc:234
+#: qcsrc/common/notifications/all.inc:255
 #, c-format
 msgid ""
 "^BGThe flag became impatient after ^F1%.2f^BG seconds and returned itself"
 msgstr ""
+"^BGThe flag became impatient after ^F1%.2f^BG seconds and returned itself"
 
-#: qcsrc/common/notifications.inc:235
+#: qcsrc/common/notifications/all.inc:256
 msgid "^BGThe ^TC^TT^BG flag has returned to the base"
 msgstr "^BGThe ^TC^TT^BG flag has returned to the base"
 
-#: qcsrc/common/notifications.inc:236
+#: qcsrc/common/notifications/all.inc:257
 msgid "^BGThe flag has returned to the base"
-msgstr ""
+msgstr "^BGThe flag has returned to the base"
 
-#: qcsrc/common/notifications.inc:237
+#: qcsrc/common/notifications/all.inc:258
 #, c-format
 msgid "^BG%s^BG lost the ^TC^TT^BG flag"
 msgstr "^BG%s^BG lost the ^TC^TT^BG flag"
 
-#: qcsrc/common/notifications.inc:238
+#: qcsrc/common/notifications/all.inc:259
 #, c-format
 msgid "^BG%s^BG lost the flag"
-msgstr ""
+msgstr "^BG%s^BG lost the flag"
 
-#: qcsrc/common/notifications.inc:239
+#: qcsrc/common/notifications/all.inc:260
 #, c-format
 msgid "^BG%s^BG got the ^TC^TT^BG flag"
 msgstr "^BG%s^BG got the ^TC^TT^BG flag"
 
-#: qcsrc/common/notifications.inc:240
+#: qcsrc/common/notifications/all.inc:261
 #, c-format
 msgid "^BG%s^BG got the flag"
-msgstr ""
+msgstr "^BG%s^BG got the flag"
 
-#: qcsrc/common/notifications.inc:241 qcsrc/common/notifications.inc:242
+#: qcsrc/common/notifications/all.inc:262
+#: qcsrc/common/notifications/all.inc:263
 #, c-format
 msgid "^BG%s^BG returned the ^TC^TT^BG flag"
 msgstr "^BG%s^BG returned the ^TC^TT^BG flag"
 
-#: qcsrc/common/notifications.inc:243 qcsrc/common/notifications.inc:481
+#: qcsrc/common/notifications/all.inc:265
+#: qcsrc/common/notifications/all.inc:557
 #, c-format
 msgid "^F2Throwing coin... Result: %s^F2!"
 msgstr "^F2Throwing coin... Result: %s^F2!"
 
-#: qcsrc/common/notifications.inc:244
+#: qcsrc/common/notifications/all.inc:267
 msgid "^BGYou don't have any fuel for the ^F1Jetpack"
 msgstr "^BGYou don't have any fuel for the ^F1Jetpack"
 
-#: qcsrc/common/notifications.inc:245
+#: qcsrc/common/notifications/all.inc:269
 msgid "^F2You lack a UID, superspec options will not be saved/restored"
 msgstr "^F2You lack a UID, superspec options will not be saved/restored"
 
-#: qcsrc/common/notifications.inc:246
+#: qcsrc/common/notifications/all.inc:271
 msgid "^F1Round already started, you will join the game in the next round"
 msgstr "^F1Round already started, you will join the game in the next round"
 
-#: qcsrc/common/notifications.inc:247
+#: qcsrc/common/notifications/all.inc:272
 msgid "^F2You will spectate in the next round"
 msgstr "^F2You will spectate in the next round"
 
-#: qcsrc/common/notifications.inc:248
+#: qcsrc/common/notifications/all.inc:274
 #, c-format
 msgid "^BG%s%s^K1 was killed by ^BG%s^K1's ^BG%s^K1 buff ^K1%s%s"
-msgstr ""
+msgstr "^BG%s%s^K1 was killed by ^BG%s^K1's ^BG%s^K1 buff ^K1%s%s"
 
-#: qcsrc/common/notifications.inc:248
+#: qcsrc/common/notifications/all.inc:274
 #, c-format
 msgid "^BG%s%s^K1 was scored against by ^BG%s^K1's ^BG%s^K1 buff ^K1%s%s"
-msgstr ""
+msgstr "^BG%s%s^K1 was scored against by ^BG%s^K1's ^BG%s^K1 buff ^K1%s%s"
 
-#: qcsrc/common/notifications.inc:249
+#: qcsrc/common/notifications/all.inc:275
 #, c-format
 msgid "^BG%s%s^K1 was unfairly eliminated by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was unfairly eliminated by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:250
+#: qcsrc/common/notifications/all.inc:276
 #, c-format
 msgid "^BG%s%s^K1 was drowned by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was drowned by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:251
+#: qcsrc/common/notifications/all.inc:277
 #, c-format
 msgid "^BG%s%s^K1 was grounded by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was grounded by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:252
+#: qcsrc/common/notifications/all.inc:278
 #, c-format
 msgid "^BG%s%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s%s"
 msgstr "^BG%s%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s%s"
 
-#: qcsrc/common/notifications.inc:252
+#: qcsrc/common/notifications/all.inc:278
 #, c-format
 msgid "^BG%s%s^K1 was burnt up into a crisp by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was burnt up into a crisp by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:253
+#: qcsrc/common/notifications/all.inc:279
 #, c-format
 msgid "^BG%s%s^K1 was cooked by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was cooked by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:254
+#: qcsrc/common/notifications/all.inc:280
 #, c-format
-msgid "^BG%s%s^K1 was pushed infront of a monster by ^BG%s^K1%s%s"
-msgstr "^BG%s%s^K1 was pushed in front of a monster by ^BG%s^K1%s%s"
+msgid "^BG%s%s^K1 was pushed in front of a monster by ^BG%s^K1%s%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:255
+#: qcsrc/common/notifications/all.inc:281
 #, c-format
 msgid "^BG%s%s^K1 was blown up by ^BG%s^K1's Nade%s%s"
 msgstr "^BG%s%s^K1 was blown up by ^BG%s^K1's Nade%s%s"
 
-#: qcsrc/common/notifications.inc:256
+#: qcsrc/common/notifications/all.inc:282
 #, c-format
 msgid "^BG%s%s^K1 got too close to a napalm explosion%s%s"
 msgstr "^BG%s%s^K1 got too close to a napalm explosion%s%s"
 
-#: qcsrc/common/notifications.inc:256
+#: qcsrc/common/notifications/all.inc:282
 #, c-format
 msgid "^BG%s%s^K1 was burned to death by ^BG%s^K1's Napalm Nade%s%s"
 msgstr "^BG%s%s^K1 was burnt to death by ^BG%s^K1's Napalm Nade%s%s"
 
-#: qcsrc/common/notifications.inc:257
+#: qcsrc/common/notifications/all.inc:283
 #, c-format
 msgid "^BG%s%s^K1 was blown up by ^BG%s^K1's Ice Nade%s%s"
 msgstr "^BG%s%s^K1 was blown up by ^BG%s^K1's Ice Nade%s%s"
 
-#: qcsrc/common/notifications.inc:258
+#: qcsrc/common/notifications/all.inc:284
 #, c-format
 msgid "^BG%s%s^K1 was frozen to death by ^BG%s^K1's Ice Nade%s%s"
 msgstr "^BG%s%s^K1 was frozen to death by ^BG%s^K1's Ice Nade%s%s"
 
-#: qcsrc/common/notifications.inc:259
+#: qcsrc/common/notifications/all.inc:285
 #, c-format
 msgid "^BG%s%s^K1 has not been healed by ^BG%s^K1's Healing Nade%s%s"
 msgstr "^BG%s%s^K1 has not been healed by ^BG%s^K1's Healing Nade%s%s"
 
-#: qcsrc/common/notifications.inc:260
+#: qcsrc/common/notifications/all.inc:286
 #, c-format
 msgid "^BG%s%s^K1 was shot into space by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was shot into space by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:261
+#: qcsrc/common/notifications/all.inc:287
 #, c-format
 msgid "^BG%s%s^K1 was slimed by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was slimed by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:262
+#: qcsrc/common/notifications/all.inc:288
 #, c-format
 msgid "^BG%s%s^K1 was preserved by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was preserved by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:263
+#: qcsrc/common/notifications/all.inc:289
 #, c-format
 msgid "^BG%s%s^K1 tried to occupy ^BG%s^K1's teleport destination space%s%s"
 msgstr "^BG%s%s^K1 tried to occupy ^BG%s^K1's teleport destination space%s%s"
 
-#: qcsrc/common/notifications.inc:263
+#: qcsrc/common/notifications/all.inc:289
 #, c-format
 msgid "^BG%s%s^K1 was telefragged by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was telefragged by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:264
+#: qcsrc/common/notifications/all.inc:290
 #, c-format
 msgid "^BG%s%s^K1 died in an accident with ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 died in an accident with ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:265
+#: qcsrc/common/notifications/all.inc:291
 #, c-format
 msgid ""
 "^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Bumblebee exploded%s%s"
 msgstr ""
 "^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Bumblebee exploded%s%s"
 
-#: qcsrc/common/notifications.inc:266
+#: qcsrc/common/notifications/all.inc:292
 #, c-format
 msgid "^BG%s%s^K1 saw the pretty lights of ^BG%s^K1's Bumblebee gun%s%s"
 msgstr "^BG%s%s^K1 saw the pretty lights of ^BG%s^K1's Bumblebee gun%s%s"
 
-#: qcsrc/common/notifications.inc:267
+#: qcsrc/common/notifications/all.inc:293
 #, c-format
 msgid "^BG%s%s^K1 was crushed by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was crushed by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:268
+#: qcsrc/common/notifications/all.inc:294
 #, c-format
 msgid "^BG%s%s^K1 was cluster bombed by ^BG%s^K1's Raptor%s%s"
 msgstr "^BG%s%s^K1 was cluster bombed by ^BG%s^K1's Raptor%s%s"
 
-#: qcsrc/common/notifications.inc:269
+#: qcsrc/common/notifications/all.inc:295
 #, c-format
 msgid "^BG%s%s^K1 couldn't resist ^BG%s^K1's purple blobs%s%s"
 msgstr "^BG%s%s^K1 couldn't resist ^BG%s^K1's purple blobs%s%s"
 
-#: qcsrc/common/notifications.inc:270
+#: qcsrc/common/notifications/all.inc:296
 #, c-format
 msgid "^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Raptor exploded%s%s"
 msgstr "^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Raptor exploded%s%s"
 
-#: qcsrc/common/notifications.inc:271
+#: qcsrc/common/notifications/all.inc:297
 #, c-format
 msgid ""
 "^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Spiderbot exploded%s%s"
 msgstr ""
 "^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Spiderbot exploded%s%s"
 
-#: qcsrc/common/notifications.inc:272
+#: qcsrc/common/notifications/all.inc:298
 #, c-format
 msgid "^BG%s%s^K1 got shredded by ^BG%s^K1's Spiderbot%s%s"
 msgstr "^BG%s%s^K1 got shredded by ^BG%s^K1's Spiderbot%s%s"
 
-#: qcsrc/common/notifications.inc:273
+#: qcsrc/common/notifications/all.inc:299
 #, c-format
 msgid "^BG%s%s^K1 was blasted to bits by ^BG%s^K1's Spiderbot%s%s"
 msgstr "^BG%s%s^K1 was blasted to bits by ^BG%s^K1's Spiderbot%s%s"
 
-#: qcsrc/common/notifications.inc:274
+#: qcsrc/common/notifications/all.inc:300
 #, c-format
 msgid "^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Racer exploded%s%s"
 msgstr "^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Racer exploded%s%s"
 
-#: qcsrc/common/notifications.inc:275
+#: qcsrc/common/notifications/all.inc:301
 #, c-format
 msgid "^BG%s%s^K1 was bolted down by ^BG%s^K1's Racer%s%s"
 msgstr "^BG%s%s^K1 was bolted down by ^BG%s^K1's Racer%s%s"
 
-#: qcsrc/common/notifications.inc:276
+#: qcsrc/common/notifications/all.inc:302
 #, c-format
 msgid "^BG%s%s^K1 couldn't find shelter from ^BG%s^K1's Racer%s%s"
 msgstr "^BG%s%s^K1 couldn't find shelter from ^BG%s^K1's Racer%s%s"
 
-#: qcsrc/common/notifications.inc:277
+#: qcsrc/common/notifications/all.inc:303
 #, c-format
 msgid "^BG%s%s^K1 was thrown into a world of hurt by ^BG%s^K1%s%s"
 msgstr "^BG%s%s^K1 was thrown into a world of hurt by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:278
+#: qcsrc/common/notifications/all.inc:305
 #, c-format
 msgid "^BG%s^K1 was moved into the %s%s"
 msgstr "^BG%s^K1 was moved into the %s%s"
 
-#: qcsrc/common/notifications.inc:279
+#: qcsrc/common/notifications/all.inc:306
 #, c-format
 msgid "^BG%s^K1 became enemies with the Lord of Teamplay%s%s"
 msgstr "^BG%s^K1 became enemies with the Lord of Teamplay%s%s"
 
-#: qcsrc/common/notifications.inc:280
+#: qcsrc/common/notifications/all.inc:307
 #, c-format
 msgid "^BG%s^K1 thought they found a nice camping ground%s%s"
 msgstr "^BG%s^K1 thought they found a nice camping ground%s%s"
 
-#: qcsrc/common/notifications.inc:281
+#: qcsrc/common/notifications/all.inc:308
 #, c-format
 msgid "^BG%s^K1 unfairly eliminated themself%s%s"
 msgstr "^BG%s^K1 unfairly eliminated themselves%s%s"
 
-#: qcsrc/common/notifications.inc:283
+#: qcsrc/common/notifications/all.inc:310
 #, c-format
 msgid "^BG%s^K1 couldn't catch their breath%s%s"
 msgstr "^BG%s^K1 couldn't catch their breath%s%s"
 
-#: qcsrc/common/notifications.inc:283
+#: qcsrc/common/notifications/all.inc:310
 #, c-format
 msgid "^BG%s^K1 was in the water for too long%s%s"
 msgstr "^BG%s^K1 was in the water for too long%s%s"
 
-#: qcsrc/common/notifications.inc:284
+#: qcsrc/common/notifications/all.inc:311
 #, c-format
 msgid "^BG%s^K1 hit the ground with a bit too much force%s%s"
 msgstr "^BG%s^K1 hit the ground with a bit too much force%s%s"
 
-#: qcsrc/common/notifications.inc:284
+#: qcsrc/common/notifications/all.inc:311
 #, c-format
 msgid "^BG%s^K1 hit the ground with a crunch%s%s"
 msgstr "^BG%s^K1 hit the ground with a crunch%s%s"
 
-#: qcsrc/common/notifications.inc:285
+#: qcsrc/common/notifications/all.inc:312
 #, c-format
 msgid "^BG%s^K1 became a bit too crispy%s%s"
 msgstr "^BG%s^K1 became a bit too crispy%s%s"
 
-#: qcsrc/common/notifications.inc:285
+#: qcsrc/common/notifications/all.inc:312
 #, c-format
 msgid "^BG%s^K1 felt a little hot%s%s"
 msgstr "^BG%s^K1 felt a little hot%s%s"
 
-#: qcsrc/common/notifications.inc:286
+#: qcsrc/common/notifications/all.inc:313
 #, c-format
 msgid "^BG%s^K1 died%s%s"
 msgstr "^BG%s^K1 died%s%s"
 
-#: qcsrc/common/notifications.inc:287
+#: qcsrc/common/notifications/all.inc:314
 #, c-format
 msgid "^BG%s^K1 found a hot place%s%s"
 msgstr "^BG%s^K1 found a hot place%s%s"
 
-#: qcsrc/common/notifications.inc:287
+#: qcsrc/common/notifications/all.inc:314
 #, c-format
 msgid "^BG%s^K1 turned into hot slag%s%s"
 msgstr "^BG%s^K1 turned into hot slag%s%s"
 
-#: qcsrc/common/notifications.inc:288
+#: qcsrc/common/notifications/all.inc:315
 #, c-format
 msgid "^BG%s^K1 was exploded by a Mage%s%s"
 msgstr "^BG%s^K1 was exploded by a Mage%s%s"
 
-#: qcsrc/common/notifications.inc:289
+#: qcsrc/common/notifications/all.inc:316
 #, c-format
 msgid "^BG%s^K1's innards became outwards by a Shambler%s%s"
 msgstr "^BG%s^K1's innards became outwards by a Shambler%s%s"
 
-#: qcsrc/common/notifications.inc:290
+#: qcsrc/common/notifications/all.inc:317
 #, c-format
 msgid "^BG%s^K1 was smashed by a Shambler%s%s"
 msgstr "^BG%s^K1 was smashed by a Shambler%s%s"
 
-#: qcsrc/common/notifications.inc:291
+#: qcsrc/common/notifications/all.inc:318
 #, c-format
 msgid "^BG%s^K1 was zapped to death by a Shambler%s%s"
 msgstr "^BG%s^K1 was zapped to death by a Shambler%s%s"
 
-#: qcsrc/common/notifications.inc:292
+#: qcsrc/common/notifications/all.inc:319
 #, c-format
 msgid "^BG%s^K1 was bitten by a Spider%s%s"
 msgstr "^BG%s^K1 was bitten by a Spider%s%s"
 
-#: qcsrc/common/notifications.inc:293
+#: qcsrc/common/notifications/all.inc:320
 #, c-format
 msgid "^BG%s^K1 was fireballed by a Wyvern%s%s"
 msgstr "^BG%s^K1 was fireballed by a Wyvern%s%s"
 
-#: qcsrc/common/notifications.inc:294
+#: qcsrc/common/notifications/all.inc:321
 #, c-format
 msgid "^BG%s^K1 joins the Zombies%s%s"
 msgstr "^BG%s^K1 joins the Zombies%s%s"
 
-#: qcsrc/common/notifications.inc:295
+#: qcsrc/common/notifications/all.inc:322
 #, c-format
 msgid "^BG%s^K1 was given kung fu lessons by a Zombie%s%s"
 msgstr "^BG%s^K1 was given kung fu lessons by a Zombie%s%s"
 
-#: qcsrc/common/notifications.inc:296 qcsrc/common/notifications.inc:298
+#: qcsrc/common/notifications/all.inc:323
+#: qcsrc/common/notifications/all.inc:325
 #, c-format
 msgid "^BG%s^K1 mastered the art of self-nading%s%s"
 msgstr "^BG%s^K1 mastered the art of self-nading%s%s"
 
-#: qcsrc/common/notifications.inc:297
+#: qcsrc/common/notifications/all.inc:324
 #, c-format
 msgid ""
 "^BG%s^K1 decided to take a look at the results of their napalm explosion%s%s"
 msgstr ""
 "^BG%s^K1 decided to take a look at the results of their napalm explosion%s%s"
 
-#: qcsrc/common/notifications.inc:297
+#: qcsrc/common/notifications/all.inc:324
 #, c-format
 msgid "^BG%s^K1 was burned to death by their own Napalm Nade%s%s"
 msgstr "^BG%s^K1 was burnt to death by their own Napalm Nade%s%s"
 
-#: qcsrc/common/notifications.inc:299
+#: qcsrc/common/notifications/all.inc:326
 #, c-format
 msgid "^BG%s^K1 felt a little chilly%s%s"
 msgstr "^BG%s^K1 felt a little chilly%s%s"
 
-#: qcsrc/common/notifications.inc:299
+#: qcsrc/common/notifications/all.inc:326
 #, c-format
 msgid "^BG%s^K1 was frozen to death by their own Ice Nade%s%s"
 msgstr "^BG%s^K1 was frozen to death by their own Ice Nade%s%s"
 
-#: qcsrc/common/notifications.inc:300
+#: qcsrc/common/notifications/all.inc:327
 #, c-format
 msgid "^BG%s^K1's Healing Nade didn't quite heal them%s%s"
 msgstr "^BG%s^K1's Healing Nade didn't quite heal them%s%s"
 
-#: qcsrc/common/notifications.inc:301
+#: qcsrc/common/notifications/all.inc:328
 #, c-format
 msgid "^BG%s^K1 died%s%s. What's the point of living without ammo?"
 msgstr "^BG%s^K1 died%s%s. What's the point of living without ammo?"
 
-#: qcsrc/common/notifications.inc:301
+#: qcsrc/common/notifications/all.inc:328
 #, c-format
 msgid "^BG%s^K1 ran out of ammo%s%s"
 msgstr "^BG%s^K1 ran out of ammo%s%s"
 
-#: qcsrc/common/notifications.inc:302
+#: qcsrc/common/notifications/all.inc:329
 #, c-format
 msgid "^BG%s^K1 rotted away%s%s"
 msgstr "^BG%s^K1 rotted away%s%s"
 
-#: qcsrc/common/notifications.inc:303
+#: qcsrc/common/notifications/all.inc:330
 #, c-format
 msgid "^BG%s^K1 became a shooting star%s%s"
 msgstr "^BG%s^K1 became a shooting star%s%s"
 
-#: qcsrc/common/notifications.inc:304
+#: qcsrc/common/notifications/all.inc:331
 #, c-format
 msgid "^BG%s^K1 was slimed%s%s"
 msgstr "^BG%s^K1 was slimed%s%s"
 
-#: qcsrc/common/notifications.inc:305
+#: qcsrc/common/notifications/all.inc:332
 #, c-format
 msgid "^BG%s^K1 couldn't take it anymore%s%s"
 msgstr "^BG%s^K1 couldn't take it anymore%s%s"
 
-#: qcsrc/common/notifications.inc:306
+#: qcsrc/common/notifications/all.inc:333
 #, c-format
 msgid "^BG%s^K1 is now preserved for centuries to come%s%s"
 msgstr "^BG%s^K1 is now preserved for centuries to come%s%s"
 
-#: qcsrc/common/notifications.inc:307
+#: qcsrc/common/notifications/all.inc:334
 #, c-format
 msgid "^BG%s^K1 switched to the %s%s"
 msgstr "^BG%s^K1 switched to the %s%s"
 
-#: qcsrc/common/notifications.inc:308
+#: qcsrc/common/notifications/all.inc:335
 #, c-format
 msgid "^BG%s^K1 died in an accident%s%s"
 msgstr "^BG%s^K1 died in an accident%s%s"
 
-#: qcsrc/common/notifications.inc:309
+#: qcsrc/common/notifications/all.inc:336
 #, c-format
 msgid "^BG%s^K1 ran into a turret%s%s"
 msgstr "^BG%s^K1 ran into a turret%s%s"
 
-#: qcsrc/common/notifications.inc:310
+#: qcsrc/common/notifications/all.inc:337
 #, c-format
 msgid "^BG%s^K1 was blasted away by an eWheel turret%s%s"
 msgstr "^BG%s^K1 was blasted away by an eWheel turret%s%s"
 
-#: qcsrc/common/notifications.inc:311
+#: qcsrc/common/notifications/all.inc:338
 #, c-format
 msgid "^BG%s^K1 got caught up in the FLAC turret fire%s%s"
 msgstr "^BG%s^K1 got caught up in the FLAC turret fire%s%s"
 
-#: qcsrc/common/notifications.inc:312
+#: qcsrc/common/notifications/all.inc:339
 #, c-format
 msgid "^BG%s^K1 was blasted away by a Hellion turret%s%s"
 msgstr "^BG%s^K1 was blasted away by a Hellion turret%s%s"
 
-#: qcsrc/common/notifications.inc:313
+#: qcsrc/common/notifications/all.inc:340
 #, c-format
 msgid "^BG%s^K1 could not hide from the Hunter turret%s%s"
 msgstr "^BG%s^K1 could not hide from the Hunter turret%s%s"
 
-#: qcsrc/common/notifications.inc:314
+#: qcsrc/common/notifications/all.inc:341
 #, c-format
 msgid "^BG%s^K1 was riddled full of holes by a Machinegun turret%s%s"
 msgstr "^BG%s^K1 was riddled full of holes by a Machinegun turret%s%s"
 
-#: qcsrc/common/notifications.inc:315
+#: qcsrc/common/notifications/all.inc:342
 #, c-format
 msgid "^BG%s^K1 got turned into smoldering gibs by an MLRS turret%s%s"
 msgstr "^BG%s^K1 got turned into smoldering gibs by an MLRS turret%s%s"
 
-#: qcsrc/common/notifications.inc:316
+#: qcsrc/common/notifications/all.inc:343
 #, c-format
 msgid "^BG%s^K1 was phased out by a turret%s%s"
 msgstr "^BG%s^K1 was phased out by a turret%s%s"
 
-#: qcsrc/common/notifications.inc:317
+#: qcsrc/common/notifications/all.inc:344
 #, c-format
 msgid "^BG%s^K1 got served some superheated plasma from a turret%s%s"
 msgstr "^BG%s^K1 got served some superheated plasma from a turret%s%s"
 
-#: qcsrc/common/notifications.inc:318
+#: qcsrc/common/notifications/all.inc:345
 #, c-format
 msgid "^BG%s^K1 was electrocuted by a Tesla turret%s%s"
 msgstr "^BG%s^K1 was electrocuted by a Tesla turret%s%s"
 
-#: qcsrc/common/notifications.inc:319
+#: qcsrc/common/notifications/all.inc:346
 #, c-format
 msgid "^BG%s^K1 got served a lead enrichment by a Walker turret%s%s"
 msgstr "^BG%s^K1 got served a lead enrichment by a Walker turret%s%s"
 
-#: qcsrc/common/notifications.inc:320
+#: qcsrc/common/notifications/all.inc:347
 #, c-format
 msgid "^BG%s^K1 was impaled by a Walker turret%s%s"
 msgstr "^BG%s^K1 was impaled by a Walker turret%s%s"
 
-#: qcsrc/common/notifications.inc:321
+#: qcsrc/common/notifications/all.inc:348
 #, c-format
 msgid "^BG%s^K1 was blasted away by a Walker turret%s%s"
 msgstr "^BG%s^K1 was blasted away by a Walker turret%s%s"
 
-#: qcsrc/common/notifications.inc:322
+#: qcsrc/common/notifications/all.inc:349
 #, c-format
 msgid "^BG%s^K1 got caught in the blast of a Bumblebee explosion%s%s"
 msgstr "^BG%s^K1 got caught in the blast of a Bumblebee explosion%s%s"
 
-#: qcsrc/common/notifications.inc:323
+#: qcsrc/common/notifications/all.inc:350
 #, c-format
 msgid "^BG%s^K1 was crushed by a vehicle%s%s"
 msgstr "^BG%s^K1 was crushed by a vehicle%s%s"
 
-#: qcsrc/common/notifications.inc:324
+#: qcsrc/common/notifications/all.inc:351
 #, c-format
 msgid "^BG%s^K1 was caught in a Raptor cluster bomb%s%s"
 msgstr "^BG%s^K1 was caught in a Raptor cluster bomb%s%s"
 
-#: qcsrc/common/notifications.inc:325
+#: qcsrc/common/notifications/all.inc:352
 #, c-format
 msgid "^BG%s^K1 got caught in the blast of a Raptor explosion%s%s"
 msgstr "^BG%s^K1 got caught in the blast of a Raptor explosion%s%s"
 
-#: qcsrc/common/notifications.inc:326
+#: qcsrc/common/notifications/all.inc:353
 #, c-format
 msgid "^BG%s^K1 got caught in the blast of a Spiderbot explosion%s%s"
 msgstr "^BG%s^K1 got caught in the blast of a Spiderbot explosion%s%s"
 
-#: qcsrc/common/notifications.inc:327
+#: qcsrc/common/notifications/all.inc:354
 #, c-format
 msgid "^BG%s^K1 was blasted to bits by a Spiderbot rocket%s%s"
 msgstr "^BG%s^K1 was blasted to bits by a Spiderbot rocket%s%s"
 
-#: qcsrc/common/notifications.inc:328
+#: qcsrc/common/notifications/all.inc:355
 #, c-format
 msgid "^BG%s^K1 got caught in the blast of a Racer explosion%s%s"
 msgstr "^BG%s^K1 got caught in the blast of a Racer explosion%s%s"
 
-#: qcsrc/common/notifications.inc:329
+#: qcsrc/common/notifications/all.inc:356
 #, c-format
 msgid "^BG%s^K1 couldn't find shelter from a Racer rocket%s%s"
 msgstr "^BG%s^K1 couldn't find shelter from a Racer rocket%s%s"
 
-#: qcsrc/common/notifications.inc:331
+#: qcsrc/common/notifications/all.inc:359
 #, c-format
 msgid "^BG%s^K1 was betrayed by ^BG%s^K1%s%s"
 msgstr "^BG%s^K1 was betrayed by ^BG%s^K1%s%s"
 
-#: qcsrc/common/notifications.inc:332
+#: qcsrc/common/notifications/all.inc:361
 #, c-format
-msgid "^BG%s^BG%s^BG (%s points every %s seconds)"
-msgstr "^BG%s^BG%s^BG (%s points every %s seconds)"
+msgid "^BG%s^BG%s^BG (%s %s every %s seconds)"
+msgstr "^BG%s^BG%s^BG (%s %s every %s seconds)"
 
-#: qcsrc/common/notifications.inc:333
+#: qcsrc/common/notifications/all.inc:363
 #, c-format
 msgid "^BG%s^K1 was frozen by ^BG%s"
 msgstr "^BG%s^K1 was frozen by ^BG%s"
 
-#: qcsrc/common/notifications.inc:334
+#: qcsrc/common/notifications/all.inc:364
 #, c-format
 msgid "^BG%s^K3 was revived by ^BG%s"
 msgstr "^BG%s^K3 was revived by ^BG%s"
 
-#: qcsrc/common/notifications.inc:335
+#: qcsrc/common/notifications/all.inc:365
 #, c-format
 msgid "^BG%s^K3 was revived by falling"
 msgstr "^BG%s^K3 was revived by falling"
 
-#: qcsrc/common/notifications.inc:336
+#: qcsrc/common/notifications/all.inc:366
 #, c-format
 msgid "^BG%s^K3 was revived by their Nade explosion"
 msgstr "^BG%s^K3 was revived by their Nade explosion"
 
-#: qcsrc/common/notifications.inc:337
+#: qcsrc/common/notifications/all.inc:367
 #, c-format
 msgid "^BG%s^K3 was automatically revived after %s second(s)"
 msgstr "^BG%s^K3 was automatically revived after %s second(s)"
 
-#: qcsrc/common/notifications.inc:338 qcsrc/common/notifications.inc:572
+#: qcsrc/common/notifications/all.inc:368
+#, c-format
+msgid "^BG%s^K1 froze themself"
+msgstr "^BG%s^K1 froze themselves"
+
+#: qcsrc/common/notifications/all.inc:370
+#: qcsrc/common/notifications/all.inc:688
 msgid "^TC^TT^BG team wins the round"
 msgstr "^TC^TT^BG team wins the round"
 
-#: qcsrc/common/notifications.inc:339 qcsrc/common/notifications.inc:573
+#: qcsrc/common/notifications/all.inc:371
+#: qcsrc/common/notifications/all.inc:689
 #, c-format
 msgid "^BG%s^BG wins the round"
 msgstr "^BG%s^BG wins the round"
 
-#: qcsrc/common/notifications.inc:340 qcsrc/common/notifications.inc:478
+#: qcsrc/common/notifications/all.inc:372
+#: qcsrc/common/notifications/all.inc:552
 msgid "^BGRound tied"
 msgstr "^BGRound tied"
 
-#: qcsrc/common/notifications.inc:341 qcsrc/common/notifications.inc:479
+#: qcsrc/common/notifications/all.inc:373
+#: qcsrc/common/notifications/all.inc:553
 msgid "^BGRound over, there's no winner"
 msgstr "^BGRound over, there's no winner"
 
-#: qcsrc/common/notifications.inc:342
-#, c-format
-msgid "^BG%s^K1 froze themself"
-msgstr "^BG%s^K1 froze themselves"
-
-#: qcsrc/common/notifications.inc:343
+#: qcsrc/common/notifications/all.inc:375
 #, c-format
 msgid "^BGGodmode saved you %s units of damage, cheater!"
 msgstr "^BGGodmode saved you %s units of damage, cheater!"
 
-#: qcsrc/common/notifications.inc:344
+#: qcsrc/common/notifications/all.inc:377
 #, c-format
 msgid "^BG%s^BG got the %s^BG buff!"
 msgstr "^BG%s^BG got the %s^BG buff!"
 
-#: qcsrc/common/notifications.inc:345
+#: qcsrc/common/notifications/all.inc:378
 #, c-format
 msgid "^BG%s^BG lost the %s^BG buff!"
 msgstr "^BG%s^BG lost the %s^BG buff!"
 
-#: qcsrc/common/notifications.inc:346 qcsrc/common/notifications.inc:577
+#: qcsrc/common/notifications/all.inc:379
+#: qcsrc/common/notifications/all.inc:696
 #, c-format
 msgid "^BGYou dropped the %s^BG buff!"
 msgstr "^BGYou dropped the %s^BG buff!"
 
-#: qcsrc/common/notifications.inc:347 qcsrc/common/notifications.inc:578
+#: qcsrc/common/notifications/all.inc:380
+#: qcsrc/common/notifications/all.inc:697
 #, c-format
 msgid "^BGYou got the %s^BG buff!"
 msgstr "^BGYou got the %s^BG buff!"
 
-#: qcsrc/common/notifications.inc:348 qcsrc/common/notifications.inc:579
+#: qcsrc/common/notifications/all.inc:382
+#: qcsrc/common/notifications/all.inc:700
 #, c-format
 msgid "^BGYou do not have the ^F1%s"
 msgstr "^BGYou do not have the ^F1%s"
 
-#: qcsrc/common/notifications.inc:349 qcsrc/common/notifications.inc:580
+#: qcsrc/common/notifications/all.inc:383
+#: qcsrc/common/notifications/all.inc:701
 #, c-format
 msgid "^BGYou dropped the ^F1%s^BG%s"
 msgstr "^BGYou dropped the ^F1%s^BG%s"
 
-#: qcsrc/common/notifications.inc:350 qcsrc/common/notifications.inc:581
+#: qcsrc/common/notifications/all.inc:384
+#: qcsrc/common/notifications/all.inc:702
 #, c-format
 msgid "^BGYou got the ^F1%s"
 msgstr "^BGYou got the ^F1%s"
 
-#: qcsrc/common/notifications.inc:351 qcsrc/common/notifications.inc:582
+#: qcsrc/common/notifications/all.inc:385
+#: qcsrc/common/notifications/all.inc:703
 #, c-format
 msgid "^BGYou don't have enough ammo for the ^F1%s"
 msgstr "^BGYou don't have enough ammo for the ^F1%s"
 
-#: qcsrc/common/notifications.inc:352 qcsrc/common/notifications.inc:583
+#: qcsrc/common/notifications/all.inc:386
+#: qcsrc/common/notifications/all.inc:704
 #, c-format
 msgid "^F1%s %s^BG is unable to fire, but its ^F1%s^BG can"
 msgstr "^F1%s %s^BG is unable to fire, but its ^F1%s^BG can"
 
-#: qcsrc/common/notifications.inc:353 qcsrc/common/notifications.inc:584
+#: qcsrc/common/notifications/all.inc:387
+#: qcsrc/common/notifications/all.inc:705
 #, c-format
 msgid "^F1%s^BG is ^F4not available^BG on this map"
 msgstr "^F1%s^BG is ^F4not available^BG on this map"
 
-#: qcsrc/common/notifications.inc:354
+#: qcsrc/common/notifications/all.inc:389
 #, c-format
-msgid "^BG%s^F3 connected%s"
-msgstr "^BG%s^F3 connected%s"
+msgid "^BG%s^BG is connecting..."
+msgstr "^BG%s^BG is connecting..."
 
-#: qcsrc/common/notifications.inc:355
+#: qcsrc/common/notifications/all.inc:390
 #, c-format
-msgid "^BG%s^F3 connected and joined the ^TC^TT team"
-msgstr "^BG%s^F3 connected and joined the ^TC^TT team"
+msgid "^BG%s^F3 connected"
+msgstr "^BG%s^F3 connected"
 
-#: qcsrc/common/notifications.inc:356
+#: qcsrc/common/notifications/all.inc:391
 #, c-format
 msgid "^BG%s^F3 is now playing"
 msgstr "^BG%s^F3 is now playing"
 
-#: qcsrc/common/notifications.inc:357 qcsrc/common/notifications.inc:587
+#: qcsrc/common/notifications/all.inc:392
+#, c-format
+msgid "^BG%s^F3 is now playing on the ^TC^TT team"
+msgstr "^BG%s^F3 is now playing on the ^TC^TT team"
+
+#: qcsrc/common/notifications/all.inc:394
+#: qcsrc/common/notifications/all.inc:710
 #, c-format
 msgid "^BG%s^BG has dropped the ball!"
 msgstr "^BG%s^BG has dropped the ball!"
 
-#: qcsrc/common/notifications.inc:358 qcsrc/common/notifications.inc:588
+#: qcsrc/common/notifications/all.inc:395
+#: qcsrc/common/notifications/all.inc:711
 #, c-format
 msgid "^BG%s^BG has picked up the ball!"
 msgstr "^BG%s^BG has picked up the ball!"
 
-#: qcsrc/common/notifications.inc:359
+#: qcsrc/common/notifications/all.inc:397
 #, c-format
 msgid "^BG%s^BG captured the keys for the ^TC^TT team"
 msgstr "^BG%s^BG captured the keys for the ^TC^TT team"
 
-#: qcsrc/common/notifications.inc:360
+#: qcsrc/common/notifications/all.inc:398
 #, c-format
 msgid "^BG%s^BG dropped the ^TC^TT Key"
 msgstr "^BG%s^BG dropped the ^TC^TT Key"
 
-#: qcsrc/common/notifications.inc:361
+#: qcsrc/common/notifications/all.inc:399
 #, c-format
 msgid "^BG%s^BG lost the ^TC^TT Key"
 msgstr "^BG%s^BG lost the ^TC^TT Key"
 
-#: qcsrc/common/notifications.inc:362
+#: qcsrc/common/notifications/all.inc:400
+#, c-format
+msgid "^BG%s^BG pushed %s^BG causing the ^TC^TT Key ^BGdestruction"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:401
+#, c-format
+msgid "^BG%s^BG destroyed the ^TC^TT Key"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:402
 #, c-format
 msgid "^BG%s^BG picked up the ^TC^TT Key"
 msgstr "^BG%s^BG picked up the ^TC^TT Key"
 
-#: qcsrc/common/notifications.inc:363
+#: qcsrc/common/notifications/all.inc:404
 #, c-format
 msgid "^BG%s^F3 forfeited"
 msgstr "^BG%s^F3 forfeited"
 
-#: qcsrc/common/notifications.inc:364
+#: qcsrc/common/notifications/all.inc:405
 #, c-format
 msgid "^BG%s^F3 has no more lives left"
 msgstr "^BG%s^F3 has no more lives left"
 
-#: qcsrc/common/notifications.inc:365
+#: qcsrc/common/notifications/all.inc:407
 msgid "^BGMonsters are currently disabled"
 msgstr "^BGMonsters are currently disabled"
 
-#: qcsrc/common/notifications.inc:366
+#: qcsrc/common/notifications/all.inc:409
+msgid "^BGThe ^TC^TT^BG team held the ball for too long"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:411
 #, c-format
 msgid "^BG%s^BG captured %s^BG control point"
-msgstr ""
+msgstr "^BG%s^BG captured %s^BG control point"
 
-#: qcsrc/common/notifications.inc:367
+#: qcsrc/common/notifications/all.inc:412
 #, c-format
 msgid "^TC^TT^BG team %s^BG control point has been destroyed by %s"
-msgstr ""
+msgstr "^TC^TT^BG team %s^BG control point has been destroyed by %s"
 
-#: qcsrc/common/notifications.inc:368
+#: qcsrc/common/notifications/all.inc:413
 msgid "^TC^TT^BG generator has been destroyed"
-msgstr ""
+msgstr "^TC^TT^BG generator has been destroyed"
 
-#: qcsrc/common/notifications.inc:369
+#: qcsrc/common/notifications/all.inc:414
 msgid "^TC^TT^BG generator spontaneously combusted due to overtime!"
-msgstr ""
+msgstr "^TC^TT^BG generator spontaneously combusted due to overtime!"
 
-#: qcsrc/common/notifications.inc:370
+#: qcsrc/common/notifications/all.inc:416
 #, c-format
 msgid "^BG%s^K1 picked up Invisibility"
 msgstr "^BG%s^K1 picked up Invisibility"
 
-#: qcsrc/common/notifications.inc:371
+#: qcsrc/common/notifications/all.inc:417
 #, c-format
 msgid "^BG%s^K1 picked up Shield"
 msgstr "^BG%s^K1 picked up Shield"
 
-#: qcsrc/common/notifications.inc:372
+#: qcsrc/common/notifications/all.inc:418
 #, c-format
 msgid "^BG%s^K1 picked up Speed"
 msgstr "^BG%s^K1 picked up Speed"
 
-#: qcsrc/common/notifications.inc:373
+#: qcsrc/common/notifications/all.inc:419
 #, c-format
 msgid "^BG%s^K1 picked up Strength"
 msgstr "^BG%s^K1 picked up Strength"
 
-#: qcsrc/common/notifications.inc:374
+#: qcsrc/common/notifications/all.inc:421
 #, c-format
 msgid "^BG%s^F3 disconnected"
 msgstr "^BG%s^F3 disconnected"
 
-#: qcsrc/common/notifications.inc:375
+#: qcsrc/common/notifications/all.inc:422
 #, c-format
 msgid "^BG%s^F3 was kicked for idling"
 msgstr "^BG%s^F3 was kicked for idling"
 
-#: qcsrc/common/notifications.inc:376
+#: qcsrc/common/notifications/all.inc:423
 msgid ""
 "^F2You were kicked from the server because you are a spectator and "
 "spectators aren't allowed at the moment."
@@ -2587,42 +2961,47 @@ msgstr ""
 "^F2You were kicked from the server because you are a spectator and "
 "spectators aren't allowed at the moment."
 
-#: qcsrc/common/notifications.inc:377
+#: qcsrc/common/notifications/all.inc:424
+#, c-format
+msgid "^BG%s^F3 was kicked for excessive teamkilling"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:425
 #, c-format
 msgid "^BG%s^F3 is now spectating"
 msgstr "^BG%s^F3 is now spectating"
 
-#: qcsrc/common/notifications.inc:378
+#: qcsrc/common/notifications/all.inc:427
 #, c-format
 msgid "^BG%s^BG has abandoned the race"
 msgstr "^BG%s^BG has abandoned the race"
 
-#: qcsrc/common/notifications.inc:379
+#: qcsrc/common/notifications/all.inc:428
 #, c-format
 msgid "^BG%s^BG couldn't break their %s%s^BG place record of %s%s %s"
 msgstr "^BG%s^BG couldn't break their %s%s^BG place record of %s%s %s"
 
-#: qcsrc/common/notifications.inc:380
+#: qcsrc/common/notifications/all.inc:429
 #, c-format
 msgid "^BG%s^BG couldn't break the %s%s^BG place record of %s%s %s"
 msgstr "^BG%s^BG couldn't break the %s%s^BG place record of %s%s %s"
 
-#: qcsrc/common/notifications.inc:381
+#: qcsrc/common/notifications/all.inc:430
 #, c-format
 msgid "^BG%s^BG has finished the race"
 msgstr "^BG%s^BG has finished the race"
 
-#: qcsrc/common/notifications.inc:382
+#: qcsrc/common/notifications/all.inc:431
 #, c-format
 msgid "^BG%s^BG broke %s^BG's %s%s^BG place record with %s%s %s"
 msgstr "^BG%s^BG broke %s^BG's %s%s^BG place record with %s%s %s"
 
-#: qcsrc/common/notifications.inc:383
+#: qcsrc/common/notifications/all.inc:432
 #, c-format
 msgid "^BG%s^BG improved their %s%s^BG place record with %s%s %s"
 msgstr "^BG%s^BG improved their %s%s^BG place record with %s%s %s"
 
-#: qcsrc/common/notifications.inc:384
+#: qcsrc/common/notifications/all.inc:433
 #, c-format
 msgid ""
 "^BG%s^BG scored a new record with ^F2%s^BG, but unfortunately lacks a UID "
@@ -2631,23 +3010,32 @@ msgstr ""
 "^BG%s^BG scored a new record with ^F2%s^BG, but unfortunately lacks a UID "
 "and will be lost."
 
-#: qcsrc/common/notifications.inc:385
+#: qcsrc/common/notifications/all.inc:434
+#, c-format
+msgid ""
+"^BG%s^BG scored a new record with ^F2%s^BG, but is anonymous and will be "
+"lost."
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:435
 #, c-format
 msgid "^BG%s^BG set the %s%s^BG place record with %s%s"
 msgstr "^BG%s^BG set the %s%s^BG place record with %s%s"
 
-#: qcsrc/common/notifications.inc:386
+#: qcsrc/common/notifications/all.inc:437
 #, c-format
 msgid ""
 "^F4You have been invited by ^BG%s^F4 to join their game of ^F2%s^F4 "
 "(^F1%s^F4)"
 msgstr ""
+"^F4You have been invited by ^BG%s^F4 to join their game of ^F2%s^F4 "
+"(^F1%s^F4)"
 
-#: qcsrc/common/notifications.inc:387
+#: qcsrc/common/notifications/all.inc:439
 msgid "^TC^TT ^BGteam scores!"
 msgstr "^TC^TT ^BGteam scores!"
 
-#: qcsrc/common/notifications.inc:388
+#: qcsrc/common/notifications/all.inc:441
 #, c-format
 msgid ""
 "^F2You have to become a player within the next %s, otherwise you will be "
@@ -2656,20 +3044,20 @@ msgstr ""
 "^F2You have to become a player within the next %s, otherwise you will be "
 "kicked, because spectating isn't allowed at this time!"
 
-#: qcsrc/common/notifications.inc:389
+#: qcsrc/common/notifications/all.inc:443
 #, c-format
 msgid "^BG%s^K1 picked up a Superweapon"
 msgstr "^BG%s^K1 picked up a Superweapon"
 
-#: qcsrc/common/notifications.inc:390
+#: qcsrc/common/notifications/all.inc:445
 msgid "^BGYou cannot change to a larger team"
 msgstr "^BGYou cannot change to a larger team"
 
-#: qcsrc/common/notifications.inc:391
+#: qcsrc/common/notifications/all.inc:446
 msgid "^BGYou are not allowed to change teams"
 msgstr "^BGYou are not allowed to change teams"
 
-#: qcsrc/common/notifications.inc:392
+#: qcsrc/common/notifications/all.inc:448
 #, c-format
 msgid ""
 "^F4NOTE: ^BGThe server is running ^F1Xonotic %s (beta)^BG, you have "
@@ -2678,14 +3066,14 @@ msgstr ""
 "^F4NOTE: ^BGThe server is running ^F1Xonotic %s (beta)^BG, you have "
 "^F2Xonotic %s"
 
-#: qcsrc/common/notifications.inc:393
+#: qcsrc/common/notifications/all.inc:449
 #, c-format
 msgid ""
 "^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s"
 msgstr ""
 "^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s"
 
-#: qcsrc/common/notifications.inc:394
+#: qcsrc/common/notifications/all.inc:450
 #, c-format
 msgid ""
 "^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get "
@@ -2694,339 +3082,371 @@ msgstr ""
 "^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get "
 "the update from ^F3http://www.xonotic.org/^BG!"
 
-#: qcsrc/common/notifications.inc:395
+#: qcsrc/common/notifications/all.inc:452
 #, c-format
 msgid "^F3SVQC Build information: ^F4%s"
 msgstr "^F3SVQC Build information: ^F4%s"
 
-#: qcsrc/common/notifications.inc:396
+#: qcsrc/common/notifications/all.inc:454
 #, c-format
 msgid ""
 "^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s%s"
 msgstr ""
 "^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s%s"
 
-#: qcsrc/common/notifications.inc:397
+#: qcsrc/common/notifications/all.inc:455
 #, c-format
 msgid "^BG%s^K1 hurt their own ears with the @!#%%'n Accordeon%s%s"
 msgstr "^BG%s^K1 hurt their own ears with the @!#%%'n Accordeon%s%s"
 
-#: qcsrc/common/notifications.inc:398
+#: qcsrc/common/notifications/all.inc:456
 #, c-format
 msgid "^BG%s%s^K1 was electrocuted by ^BG%s^K1's Arc%s%s"
 msgstr "^BG%s%s^K1 was electrocuted by ^BG%s^K1's Arc%s%s"
 
-#: qcsrc/common/notifications.inc:399
+#: qcsrc/common/notifications/all.inc:457
+#, c-format
+msgid "^BG%s%s^K1 was blasted by ^BG%s^K1's Arc bolts%s%s"
+msgstr "^BG%s%s^K1 was blasted by ^BG%s^K1's Arc bolts%s%s"
+
+#: qcsrc/common/notifications/all.inc:458
 #, c-format
 msgid "^BG%s%s^K1 was shot to death by ^BG%s^K1's Blaster%s%s"
 msgstr "^BG%s%s^K1 was shot to death by ^BG%s^K1's Blaster%s%s"
 
-#: qcsrc/common/notifications.inc:400
+#: qcsrc/common/notifications/all.inc:459
 #, c-format
 msgid "^BG%s^K1 shot themself to hell with their Blaster%s%s"
 msgstr "^BG%s^K1 shot themselves to hell with their Blaster%s%s"
 
-#: qcsrc/common/notifications.inc:401
+#: qcsrc/common/notifications/all.inc:460
 #, c-format
 msgid "^BG%s%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s%s"
 msgstr "^BG%s%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s%s"
 
-#: qcsrc/common/notifications.inc:402
+#: qcsrc/common/notifications/all.inc:461
 #, c-format
 msgid "^BG%s^K1 felt the strong pull of their Crylink%s%s"
 msgstr "^BG%s^K1 felt the strong pull of their Crylink%s%s"
 
-#: qcsrc/common/notifications.inc:403
+#: qcsrc/common/notifications/all.inc:462
 #, c-format
 msgid "^BG%s%s^K1 ate ^BG%s^K1's rocket%s%s"
 msgstr "^BG%s%s^K1 ate ^BG%s^K1's rocket%s%s"
 
-#: qcsrc/common/notifications.inc:404
+#: qcsrc/common/notifications/all.inc:463
 #, c-format
-msgid "^BG%s%s^K1 got too close ^BG%s^K1's rocket%s%s"
-msgstr "^BG%s%s^K1 got too close ^BG%s^K1's rocket%s%s"
+msgid "^BG%s%s^K1 got too close to ^BG%s^K1's rocket%s%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:405
+#: qcsrc/common/notifications/all.inc:464
 #, c-format
 msgid "^BG%s^K1 blew themself up with their Devastator%s%s"
 msgstr "^BG%s^K1 blew themselves up with their Devastator%s%s"
 
-#: qcsrc/common/notifications.inc:406
+#: qcsrc/common/notifications/all.inc:465
 #, c-format
 msgid "^BG%s%s^K1 was blasted by ^BG%s^K1's Electro bolt%s%s"
 msgstr "^BG%s%s^K1 was blasted by ^BG%s^K1's Electro bolt%s%s"
 
-#: qcsrc/common/notifications.inc:407
+#: qcsrc/common/notifications/all.inc:466
 #, c-format
 msgid "^BG%s%s^K1 felt the electrifying air of ^BG%s^K1's Electro combo%s%s"
 msgstr "^BG%s%s^K1 felt the electrifying air of ^BG%s^K1's Electro combo%s%s"
 
-#: qcsrc/common/notifications.inc:408
+#: qcsrc/common/notifications/all.inc:467
 #, c-format
 msgid "^BG%s%s^K1 got too close to ^BG%s^K1's Electro orb%s%s"
 msgstr "^BG%s%s^K1 got too close to ^BG%s^K1's Electro orb%s%s"
 
-#: qcsrc/common/notifications.inc:409
+#: qcsrc/common/notifications/all.inc:468
 #, c-format
 msgid "^BG%s^K1 played with Electro bolts%s%s"
 msgstr "^BG%s^K1 played with Electro bolts%s%s"
 
-#: qcsrc/common/notifications.inc:410
+#: qcsrc/common/notifications/all.inc:469
 #, c-format
 msgid "^BG%s^K1 could not remember where they put their Electro orb%s%s"
 msgstr "^BG%s^K1 could not remember where they put their Electro orb%s%s"
 
-#: qcsrc/common/notifications.inc:411
+#: qcsrc/common/notifications/all.inc:470
 #, c-format
 msgid "^BG%s%s^K1 got too close to ^BG%s^K1's fireball%s%s"
 msgstr "^BG%s%s^K1 got too close to ^BG%s^K1's fireball%s%s"
 
-#: qcsrc/common/notifications.inc:412
+#: qcsrc/common/notifications/all.inc:471
 #, c-format
 msgid "^BG%s%s^K1 got burnt by ^BG%s^K1's firemine%s%s"
 msgstr "^BG%s%s^K1 got burnt by ^BG%s^K1's firemine%s%s"
 
-#: qcsrc/common/notifications.inc:413
+#: qcsrc/common/notifications/all.inc:472
 #, c-format
 msgid "^BG%s^K1 should have used a smaller gun%s%s"
 msgstr "^BG%s^K1 should have used a smaller gun%s%s"
 
-#: qcsrc/common/notifications.inc:414
+#: qcsrc/common/notifications/all.inc:473
 #, c-format
 msgid "^BG%s^K1 forgot about their firemine%s%s"
 msgstr "^BG%s^K1 forgot about their firemine%s%s"
 
-#: qcsrc/common/notifications.inc:415
+#: qcsrc/common/notifications/all.inc:474
 #, c-format
 msgid "^BG%s%s^K1 was pummeled by a burst of ^BG%s^K1's Hagar rockets%s%s"
 msgstr "^BG%s%s^K1 was pummelled by a burst of ^BG%s^K1's Hagar rockets%s%s"
 
-#: qcsrc/common/notifications.inc:416
+#: qcsrc/common/notifications/all.inc:475
 #, c-format
 msgid "^BG%s%s^K1 was pummeled by ^BG%s^K1's Hagar rockets%s%s"
 msgstr "^BG%s%s^K1 was pummelled by ^BG%s^K1's Hagar rockets%s%s"
 
-#: qcsrc/common/notifications.inc:417
+#: qcsrc/common/notifications/all.inc:476
 #, c-format
 msgid "^BG%s^K1 played with tiny Hagar rockets%s%s"
 msgstr "^BG%s^K1 played with tiny Hagar rockets%s%s"
 
-#: qcsrc/common/notifications.inc:418
+#: qcsrc/common/notifications/all.inc:477
 #, c-format
 msgid "^BG%s%s^K1 was cut down with ^BG%s^K1's HLAC%s%s"
 msgstr "^BG%s%s^K1 was cut down with ^BG%s^K1's HLAC%s%s"
 
-#: qcsrc/common/notifications.inc:419
+#: qcsrc/common/notifications/all.inc:478
 #, c-format
 msgid "^BG%s^K1 got a little jumpy with their HLAC%s%s"
 msgstr "^BG%s^K1 got a little jumpy with their HLAC%s%s"
 
-#: qcsrc/common/notifications.inc:420
-#, c-format
-msgid "^BG%s%s^K1 was sniped by ^BG%s^K1's Heavy Machine Gun%s%s"
-msgstr "^BG%s%s^K1 was sniped by ^BG%s^K1's Heavy Machine Gun%s%s"
-
-#: qcsrc/common/notifications.inc:421
-#, c-format
-msgid "^BG%s%s^K1 was torn to bits by ^BG%s^K1's Heavy Machine Gun%s%s"
-msgstr "^BG%s%s^K1 was torn to bits by ^BG%s^K1's Heavy Machine Gun%s%s"
-
-#: qcsrc/common/notifications.inc:422
+#: qcsrc/common/notifications/all.inc:479
 #, c-format
 msgid "^BG%s%s^K1 was caught in ^BG%s^K1's Hook gravity bomb%s%s"
 msgstr "^BG%s%s^K1 was caught in ^BG%s^K1's Hook gravity bomb%s%s"
 
-#: qcsrc/common/notifications.inc:423
+#: qcsrc/common/notifications/all.inc:480
 #, c-format
 msgid ""
 "^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Klein Bottle%s%s"
 msgstr ""
 "^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Klein Bottle%s%s"
 
-#: qcsrc/common/notifications.inc:424
+#: qcsrc/common/notifications/all.inc:481
 #, c-format
 msgid "^BG%s^K1 hurt their own ears with the @!#%%'n Klein Bottle%s%s"
 msgstr "^BG%s^K1 hurt their own ears with the @!#%%'n Klein Bottle%s%s"
 
-#: qcsrc/common/notifications.inc:425
+#: qcsrc/common/notifications/all.inc:482
 #, c-format
 msgid "^BG%s%s^K1 was sniped by ^BG%s^K1's Machine Gun%s%s"
 msgstr "^BG%s%s^K1 was sniped by ^BG%s^K1's Machine Gun%s%s"
 
-#: qcsrc/common/notifications.inc:426
+#: qcsrc/common/notifications/all.inc:483
 #, c-format
 msgid "^BG%s%s^K1 was riddled full of holes by ^BG%s^K1's Machine Gun%s%s"
 msgstr "^BG%s%s^K1 was riddled full of holes by ^BG%s^K1's Machine Gun%s%s"
 
-#: qcsrc/common/notifications.inc:427 qcsrc/common/notifications.inc:650
+#: qcsrc/common/notifications/all.inc:484
+#: qcsrc/common/notifications/all.inc:794
 #, c-format
 msgid "^BGYou cannot place more than ^F2%s^BG mines at a time"
 msgstr "^BGYou cannot place more than ^F2%s^BG mines at a time"
 
-#: qcsrc/common/notifications.inc:428
+#: qcsrc/common/notifications/all.inc:485
 #, c-format
 msgid "^BG%s%s^K1 got too close to ^BG%s^K1's mine%s%s"
 msgstr "^BG%s%s^K1 got too close to ^BG%s^K1's mine%s%s"
 
-#: qcsrc/common/notifications.inc:429
+#: qcsrc/common/notifications/all.inc:486
 #, c-format
 msgid "^BG%s^K1 forgot about their mine%s%s"
 msgstr "^BG%s^K1 forgot about their mine%s%s"
 
-#: qcsrc/common/notifications.inc:430
+#: qcsrc/common/notifications/all.inc:487
 #, c-format
 msgid "^BG%s%s^K1 got too close to ^BG%s^K1's Mortar grenade%s%s"
 msgstr "^BG%s%s^K1 got too close to ^BG%s^K1's Mortar grenade%s%s"
 
-#: qcsrc/common/notifications.inc:431
+#: qcsrc/common/notifications/all.inc:488
 #, c-format
 msgid "^BG%s%s^K1 ate ^BG%s^K1's Mortar grenade%s%s"
 msgstr "^BG%s%s^K1 ate ^BG%s^K1's Mortar grenade%s%s"
 
-#: qcsrc/common/notifications.inc:432
+#: qcsrc/common/notifications/all.inc:489
 #, c-format
 msgid "^BG%s^K1 didn't see their own Mortar grenade%s%s"
 msgstr "^BG%s^K1 didn't see their own Mortar grenade%s%s"
 
-#: qcsrc/common/notifications.inc:433
+#: qcsrc/common/notifications/all.inc:490
 #, c-format
 msgid "^BG%s^K1 blew themself up with their own Mortar%s%s"
 msgstr "^BG%s^K1 blew themselves up with their own Mortar%s%s"
 
-#: qcsrc/common/notifications.inc:434
+#: qcsrc/common/notifications/all.inc:491
 #, c-format
-msgid "^BG%s%s^K1 was sniped with a Rifle by ^BG%s^K1%s%s"
-msgstr "^BG%s%s^K1 was sniped with a Rifle by ^BG%s^K1%s%s"
+msgid "^BG%s%s^K1 was sniped by ^BG%s^K1's Overkill Heavy Machine Gun%s%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:435
+#: qcsrc/common/notifications/all.inc:492
 #, c-format
-msgid "^BG%s%s^K1 died in ^BG%s^K1's Rifle bullet hail%s%s"
-msgstr "^BG%s%s^K1 died in ^BG%s^K1's Rifle bullet hail%s%s"
+msgid ""
+"^BG%s%s^K1 was torn to bits by ^BG%s^K1's Overkill Heavy Machine Gun%s%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:436
+#: qcsrc/common/notifications/all.inc:493
 #, c-format
-msgid "^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s%s"
-msgstr "^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s%s"
+msgid ""
+"^BG%s%s^K1 was riddled full of holes by ^BG%s^K1's Overkill Machine Gun%s%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:437
+#: qcsrc/common/notifications/all.inc:494
 #, c-format
-msgid "^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle%s%s"
-msgstr "^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle%s%s"
+msgid "^BG%s%s^K1 has been vaporized by ^BG%s^K1's Overkill Nex%s%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:438
+#: qcsrc/common/notifications/all.inc:495
 #, c-format
-msgid "^BG%s%s^K1 was sawn in half by ^BG%s^K1's Rocket Propelled Chainsaw%s%s"
+msgid ""
+"^BG%s%s^K1 was sawn in half by ^BG%s^K1's Overkill Rocket Propelled Chainsaw"
+"%s%s"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:496
+#, c-format
+msgid ""
+"^BG%s%s^K1 almost dodged ^BG%s^K1's Overkill Rocket Propelled Chainsaw%s%s"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:497
+#, c-format
+msgid ""
+"^BG%s^K1 was sawn in half by their own Overkill Rocket Propelled Chainsaw%s%s"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:498
+#, c-format
+msgid ""
+"^BG%s^K1 blew themself up with their Overkill Rocket Propelled Chainsaw%s%s"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:500
+#, c-format
+msgid "^BG%s%s^K1 was gunned down by ^BG%s^K1's Overkill Shotgun%s%s"
 msgstr ""
-"^BG%s%s^K1 was sawn in half by ^BG%s^K1's Rocket Propelled Chainsaw%s%s"
 
-#: qcsrc/common/notifications.inc:439
+#: qcsrc/common/notifications/all.inc:501
 #, c-format
-msgid "^BG%s%s^K1 almost dodged ^BG%s^K1's Rocket Propelled Chainsaw%s%s"
-msgstr "^BG%s%s^K1 almost dodged ^BG%s^K1's Rocket Propelled Chainsaw%s%s"
+msgid "^BG%s%s^K1 was sniped with a Rifle by ^BG%s^K1%s%s"
+msgstr "^BG%s%s^K1 was sniped with a Rifle by ^BG%s^K1%s%s"
+
+#: qcsrc/common/notifications/all.inc:502
+#, c-format
+msgid "^BG%s%s^K1 died in ^BG%s^K1's Rifle bullet hail%s%s"
+msgstr "^BG%s%s^K1 died in ^BG%s^K1's Rifle bullet hail%s%s"
 
-#: qcsrc/common/notifications.inc:440
+#: qcsrc/common/notifications/all.inc:503
 #, c-format
-msgid "^BG%s^K1 was sawn in half by their own Rocket Propelled Chainsaw%s%s"
-msgstr "^BG%s^K1 was sawn in half by their own Rocket Propelled Chainsaw%s%s"
+msgid "^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s%s"
+msgstr "^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s%s"
 
-#: qcsrc/common/notifications.inc:441
+#: qcsrc/common/notifications/all.inc:504
 #, c-format
-msgid "^BG%s^K1 blew themself up with their Rocket Propelled Chainsaw%s%s"
-msgstr "^BG%s^K1 blew themselves up with their Rocket Propelled Chainsaw%s%s"
+msgid "^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle%s%s"
+msgstr "^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle%s%s"
 
-#: qcsrc/common/notifications.inc:442
+#: qcsrc/common/notifications/all.inc:505
 #, c-format
 msgid "^BG%s%s^K1 was pummeled by ^BG%s^K1's Seeker rockets%s%s"
 msgstr "^BG%s%s^K1 was pummelled by ^BG%s^K1's Seeker rockets%s%s"
 
-#: qcsrc/common/notifications.inc:443
+#: qcsrc/common/notifications/all.inc:506
 #, c-format
 msgid "^BG%s%s^K1 was tagged by ^BG%s^K1's Seeker%s%s"
 msgstr "^BG%s%s^K1 was tagged by ^BG%s^K1's Seeker%s%s"
 
-#: qcsrc/common/notifications.inc:444
+#: qcsrc/common/notifications/all.inc:507
 #, c-format
 msgid "^BG%s^K1 played with tiny Seeker rockets%s%s"
 msgstr "^BG%s^K1 played with tiny Seeker rockets%s%s"
 
-#: qcsrc/common/notifications.inc:445
+#: qcsrc/common/notifications/all.inc:508
 #, c-format
 msgid "^BG%s%s^K1 was gunned down by ^BG%s^K1's Shockwave%s%s"
 msgstr "^BG%s%s^K1 was gunned down by ^BG%s^K1's Shockwave%s%s"
 
-#: qcsrc/common/notifications.inc:446
+#: qcsrc/common/notifications/all.inc:509
 #, c-format
 msgid "^BG%s%s^K1 slapped ^BG%s^K1 around a bit with a large Shockwave%s%s"
 msgstr "^BG%s%s^K1 slapped ^BG%s^K1 around a bit with a large Shockwave%s%s"
 
-#: qcsrc/common/notifications.inc:447
+#: qcsrc/common/notifications/all.inc:510
 #, c-format
 msgid "^BG%s%s^K1 was gunned down by ^BG%s^K1's Shotgun%s%s"
 msgstr "^BG%s%s^K1 was gunned down by ^BG%s^K1's Shotgun%s%s"
 
-#: qcsrc/common/notifications.inc:448
+#: qcsrc/common/notifications/all.inc:511
 #, c-format
 msgid "^BG%s%s^K1 slapped ^BG%s^K1 around a bit with a large Shotgun%s%s"
 msgstr "^BG%s%s^K1 slapped ^BG%s^K1 around a bit with a large Shotgun%s%s"
 
-#: qcsrc/common/notifications.inc:449
+#: qcsrc/common/notifications/all.inc:512
 #, c-format
 msgid "^BG%s^K1 is now thinking with portals%s%s"
 msgstr "^BG%s^K1 is now thinking with portals%s%s"
 
-#: qcsrc/common/notifications.inc:450
+#: qcsrc/common/notifications/all.inc:513
 #, c-format
 msgid "^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Tuba%s%s"
 msgstr "^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Tuba%s%s"
 
-#: qcsrc/common/notifications.inc:451
+#: qcsrc/common/notifications/all.inc:514
 #, c-format
 msgid "^BG%s^K1 hurt their own ears with the @!#%%'n Tuba%s%s"
 msgstr "^BG%s^K1 hurt their own ears with the @!#%%'n Tuba%s%s"
 
-#: qcsrc/common/notifications.inc:452
+#: qcsrc/common/notifications/all.inc:515
 #, c-format
 msgid "^BG%s%s^K1 has been sublimated by ^BG%s^K1's Vaporizer%s%s"
 msgstr "^BG%s%s^K1 has been sublimated by ^BG%s^K1's Vaporizer%s%s"
 
-#: qcsrc/common/notifications.inc:453
+#: qcsrc/common/notifications/all.inc:516
 #, c-format
 msgid "^BG%s%s^K1 has been vaporized by ^BG%s^K1's Vortex%s%s"
 msgstr "^BG%s%s^K1 has been vaporised by ^BG%s^K1's Vortex%s%s"
 
-#: qcsrc/common/notifications.inc:471
+#: qcsrc/common/notifications/all.inc:541
 msgid "^F4You are now alone!"
 msgstr "^F4You are now alone!"
 
-#: qcsrc/common/notifications.inc:472
+#: qcsrc/common/notifications/all.inc:543
 msgid "^BGYou are attacking!"
 msgstr "^BGYou are attacking!"
 
-#: qcsrc/common/notifications.inc:473
+#: qcsrc/common/notifications/all.inc:544
 msgid "^BGYou are defending!"
 msgstr "^BGYou are defending!"
 
-#: qcsrc/common/notifications.inc:474
+#: qcsrc/common/notifications/all.inc:545
+#, c-format
+msgid "^BGObjective destroyed in ^F4%s^BG!"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:547
 msgid "^F4Begin!"
 msgstr "^F4Begin!"
 
-#: qcsrc/common/notifications.inc:475
+#: qcsrc/common/notifications/all.inc:548
 msgid "^F4Game starts in ^COUNT"
 msgstr "^F4Game starts in ^COUNT"
 
-#: qcsrc/common/notifications.inc:476
+#: qcsrc/common/notifications/all.inc:549
 msgid "^F4Round starts in ^COUNT"
 msgstr "^F4Round starts in ^COUNT"
 
-#: qcsrc/common/notifications.inc:477
+#: qcsrc/common/notifications/all.inc:550
 msgid "^F4Round cannot start"
 msgstr "^F4Round cannot start"
 
-#: qcsrc/common/notifications.inc:480
+#: qcsrc/common/notifications/all.inc:555
 msgid "^F2Don't camp!"
 msgstr "^F2Don't camp!"
 
-#: qcsrc/common/notifications.inc:482
+#: qcsrc/common/notifications/all.inc:559
 msgid ""
 "^BGYou are now free.\n"
 "^BGFeel free to ^F2try to capture^BG the flag again\n"
@@ -3036,239 +3456,231 @@ msgstr ""
 "^BGFeel free to ^F2try to capture^BG the flag again\n"
 "^BGif you think you will succeed."
 
-#: qcsrc/common/notifications.inc:483
+#: qcsrc/common/notifications/all.inc:560
 msgid "^BGThis flag is currently inactive"
-msgstr ""
+msgstr "^BGThis flag is currently inactive"
 
-#: qcsrc/common/notifications.inc:484
+#: qcsrc/common/notifications/all.inc:561
 msgid ""
 "^BGYou are now ^F1shielded^BG from the flag(s)\n"
 "^BGfor ^F2too many unsuccessful attempts^BG to capture.\n"
 "^BGMake some defensive scores before trying again."
 msgstr ""
+"^BGYou are now ^F1shielded^BG from the flag(s)\n"
+"^BGfor ^F2too many unsuccessful attempts^BG to capture.\n"
+"^BGMake some defensive scores before trying again."
 
-#: qcsrc/common/notifications.inc:485
+#: qcsrc/common/notifications/all.inc:562
 msgid "^BGYou captured the ^TC^TT^BG flag!"
 msgstr "^BGYou captured the ^TC^TT^BG flag!"
 
-#: qcsrc/common/notifications.inc:486
+#: qcsrc/common/notifications/all.inc:563
 msgid "^BGYou captured the flag!"
-msgstr ""
+msgstr "^BGYou captured the flag!"
 
-#: qcsrc/common/notifications.inc:487
+#: qcsrc/common/notifications/all.inc:564
 #, c-format
 msgid "^BGToo many flag throws! Throwing disabled for %s."
 msgstr "^BGToo many flag throws! Throwing disabled for %s."
 
-#: qcsrc/common/notifications.inc:488
+#: qcsrc/common/notifications/all.inc:565
 #, c-format
 msgid "^BG%s^BG passed the ^TC^TT^BG flag to %s"
 msgstr "^BG%s^BG passed the ^TC^TT^BG flag to %s"
 
-#: qcsrc/common/notifications.inc:489
+#: qcsrc/common/notifications/all.inc:566
 #, c-format
 msgid "^BG%s^BG passed the flag to %s"
-msgstr ""
+msgstr "^BG%s^BG passed the flag to %s"
 
-#: qcsrc/common/notifications.inc:490
+#: qcsrc/common/notifications/all.inc:567
 #, c-format
 msgid "^BGYou received the ^TC^TT^BG flag from %s"
 msgstr "^BGYou received the ^TC^TT^BG flag from %s"
 
-#: qcsrc/common/notifications.inc:491
+#: qcsrc/common/notifications/all.inc:568
 #, c-format
 msgid "^BGYou received the flag from %s"
-msgstr ""
+msgstr "^BGYou received the flag from %s"
 
-#: qcsrc/common/notifications.inc:492
+#: qcsrc/common/notifications/all.inc:569
 #, c-format
-msgid "^BG%s^BG requests you to pass the flag%s"
-msgstr "^BG%s^BG requests you to pass the flag%s"
+msgid "^BGPress ^F2%s^BG to receive the flag from %s^BG"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:493
+#: qcsrc/common/notifications/all.inc:570
 #, c-format
 msgid "^BGRequesting %s^BG to pass you the flag"
 msgstr "^BGRequesting %s^BG to pass you the flag"
 
-#: qcsrc/common/notifications.inc:494
+#: qcsrc/common/notifications/all.inc:571
 #, c-format
 msgid "^BGYou passed the ^TC^TT^BG flag to %s"
 msgstr "^BGYou passed the ^TC^TT^BG flag to %s"
 
-#: qcsrc/common/notifications.inc:495
+#: qcsrc/common/notifications/all.inc:572
 #, c-format
 msgid "^BGYou passed the flag to %s"
-msgstr ""
+msgstr "^BGYou passed the flag to %s"
 
-#: qcsrc/common/notifications.inc:496
+#: qcsrc/common/notifications/all.inc:573
 msgid "^BGYou got the ^TC^TT^BG flag!"
 msgstr "^BGYou got the ^TC^TT^BG flag!"
 
-#: qcsrc/common/notifications.inc:497
+#: qcsrc/common/notifications/all.inc:574
 msgid "^BGYou got the flag!"
-msgstr ""
+msgstr "^BGYou got the flag!"
 
-#: qcsrc/common/notifications.inc:498
+#: qcsrc/common/notifications/all.inc:575
 #, c-format
 msgid "^BGYou got your %steam^BG's flag, return it!"
-msgstr ""
+msgstr "^BGYou got your %steam^BG's flag, return it!"
 
-#: qcsrc/common/notifications.inc:499
+#: qcsrc/common/notifications/all.inc:576
 #, c-format
 msgid "^BGYou got the %senemy^BG's flag, return it!"
-msgstr ""
+msgstr "^BGYou got the %senemy^BG's flag, return it!"
 
-#: qcsrc/common/notifications.inc:500
+#: qcsrc/common/notifications/all.inc:577
 #, c-format
 msgid "^BGThe %senemy^BG got your flag! Retrieve it!"
 msgstr "^BGThe %senemy^BG got your flag! Retrieve it!"
 
-#: qcsrc/common/notifications.inc:501
+#: qcsrc/common/notifications/all.inc:578
 #, c-format
 msgid "^BGThe %senemy (^BG%s%s)^BG got your flag! Retrieve it!"
 msgstr "^BGThe %senemy (^BG%s%s)^BG got your flag! Retrieve it!"
 
-#: qcsrc/common/notifications.inc:502
+#: qcsrc/common/notifications/all.inc:579
 #, c-format
 msgid "^BGThe %senemy^BG got the flag! Retrieve it!"
-msgstr ""
+msgstr "^BGThe %senemy^BG got the flag! Retrieve it!"
 
-#: qcsrc/common/notifications.inc:503
+#: qcsrc/common/notifications/all.inc:580
 #, c-format
 msgid "^BGThe %senemy (^BG%s%s)^BG got the flag! Retrieve it!"
-msgstr ""
+msgstr "^BGThe %senemy (^BG%s%s)^BG got the flag! Retrieve it!"
 
-#: qcsrc/common/notifications.inc:504
+#: qcsrc/common/notifications/all.inc:581
 #, c-format
 msgid "^BGThe %senemy^BG got their flag! Retrieve it!"
-msgstr ""
+msgstr "^BGThe %senemy^BG got their flag! Retrieve it!"
 
-#: qcsrc/common/notifications.inc:505
+#: qcsrc/common/notifications/all.inc:582
 #, c-format
 msgid "^BGThe %senemy (^BG%s%s)^BG got their flag! Retrieve it!"
-msgstr ""
+msgstr "^BGThe %senemy (^BG%s%s)^BG got their flag! Retrieve it!"
 
-#: qcsrc/common/notifications.inc:506
+#: qcsrc/common/notifications/all.inc:583
 #, c-format
 msgid "^BGYour %steam mate^BG got the ^TC^TT^BG flag! Protect them!"
-msgstr ""
+msgstr "^BGYour %steam mate^BG got the ^TC^TT^BG flag! Protect them!"
 
-#: qcsrc/common/notifications.inc:507
+#: qcsrc/common/notifications/all.inc:584
 #, c-format
 msgid "^BGYour %steam mate (^BG%s%s)^BG got the ^TC^TT^BG flag! Protect them!"
-msgstr ""
+msgstr "^BGYour %steam mate (^BG%s%s)^BG got the ^TC^TT^BG flag! Protect them!"
 
-#: qcsrc/common/notifications.inc:508
+#: qcsrc/common/notifications/all.inc:585
 #, c-format
 msgid "^BGYour %steam mate^BG got the flag! Protect them!"
 msgstr "^BGYour %steam mate^BG got the flag! Protect them!"
 
-#: qcsrc/common/notifications.inc:509
+#: qcsrc/common/notifications/all.inc:586
 #, c-format
 msgid "^BGYour %steam mate (^BG%s%s)^BG got the flag! Protect them!"
 msgstr "^BGYour %steam mate (^BG%s%s)^BG got the flag! Protect them!"
 
-#: qcsrc/common/notifications.inc:510
+#: qcsrc/common/notifications/all.inc:587
+msgid "^BGEnemies can now see you on radar!"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:588
 msgid "^BGYou returned the ^TC^TT^BG flag!"
 msgstr "^BGYou returned the ^TC^TT^BG flag!"
 
-#: qcsrc/common/notifications.inc:511
+#: qcsrc/common/notifications/all.inc:589
 msgid "^BGStalemate! Enemies can now see you on radar!"
 msgstr "^BGStalemate! Enemies can now see you on radar!"
 
-#: qcsrc/common/notifications.inc:512
+#: qcsrc/common/notifications/all.inc:590
 msgid "^BGStalemate! Flag carriers can now be seen by enemies on radar!"
 msgstr "^BGStalemate! Flag carriers can now be seen by enemies on radar!"
 
-#: qcsrc/common/notifications.inc:513
+#: qcsrc/common/notifications/all.inc:594
 #, c-format
 msgid "^K3%sYou fragged ^BG%s"
 msgstr "^K3%sYou fragged ^BG%s"
 
-#: qcsrc/common/notifications.inc:513
+#: qcsrc/common/notifications/all.inc:595
+#: qcsrc/common/notifications/all.inc:604
+#: qcsrc/common/notifications/all.inc:613
 #, c-format
 msgid "^K3%sYou scored against ^BG%s"
 msgstr "^K3%sYou scored against ^BG%s"
 
-#: qcsrc/common/notifications.inc:514
+#: qcsrc/common/notifications/all.inc:596
 #, c-format
 msgid "^K1%sYou were fragged by ^BG%s"
 msgstr "^K1%sYou were fragged by ^BG%s"
 
-#: qcsrc/common/notifications.inc:514
+#: qcsrc/common/notifications/all.inc:597
+#: qcsrc/common/notifications/all.inc:606
+#: qcsrc/common/notifications/all.inc:615
 #, c-format
 msgid "^K1%sYou were scored against by ^BG%s"
 msgstr "^K1%sYou were scored against by ^BG%s"
 
-#: qcsrc/common/notifications.inc:515
-#, c-format
-msgid "^K1%sYou were fragged by ^BG%s^BG%s"
-msgstr "^K1%sYou were fragged by ^BG%s^BG%s"
-
-#: qcsrc/common/notifications.inc:515
+#: qcsrc/common/notifications/all.inc:603
 #, c-format
-msgid "^K1%sYou were scored against by ^BG%s^BG%s"
-msgstr "^K1%sYou were scored against by ^BG%s^BG%s"
+msgid "^K3%sYou burned ^BG%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:516
+#: qcsrc/common/notifications/all.inc:605
 #, c-format
-msgid "^K3%sYou fragged ^BG%s^BG%s"
-msgstr "^K3%sYou fragged ^BG%s^BG%s"
+msgid "^K1%sYou were burned by ^BG%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:516
+#: qcsrc/common/notifications/all.inc:612
 #, c-format
-msgid "^K3%sYou scored against ^BG%s^BG%s"
-msgstr "^K3%sYou scored against ^BG%s^BG%s"
+msgid "^K3%sYou froze ^BG%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:517
+#: qcsrc/common/notifications/all.inc:614
 #, c-format
-msgid "^K1%sYou scored against ^BG%s^K1 while they were typing"
-msgstr "^K1%sYou scored against ^BG%s^K1 while they were typing"
+msgid "^K1%sYou were frozen by ^BG%s"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:517
+#: qcsrc/common/notifications/all.inc:621
 #, c-format
 msgid "^K1%sYou typefragged ^BG%s"
 msgstr "^K1%sYou typefragged ^BG%s"
 
-#: qcsrc/common/notifications.inc:518
+#: qcsrc/common/notifications/all.inc:622
 #, c-format
-msgid "^K1%sYou were scored against by ^BG%s^K1 while typing!"
-msgstr "^K1%sYou were scored against by ^BG%s^K1 while typing!"
+msgid "^K1%sYou scored against ^BG%s^K1 while they were typing"
+msgstr "^K1%sYou scored against ^BG%s^K1 while they were typing"
 
-#: qcsrc/common/notifications.inc:518
+#: qcsrc/common/notifications/all.inc:623
 #, c-format
 msgid "^K1%sYou were typefragged by ^BG%s"
-msgstr "^K1%sYou were typefragged by ^BG%s"
-
-#: qcsrc/common/notifications.inc:519
-#, c-format
-msgid "^K1%sYou were scored against by ^BG%s^K1 while typing^BG%s"
-msgstr "^K1%sYou were scored against by ^BG%s^K1 while typing^BG%s"
-
-#: qcsrc/common/notifications.inc:519
-#, c-format
-msgid "^K1%sYou were typefragged by ^BG%s^BG%s"
-msgstr "^K1%sYou were typefragged by ^BG%s^BG%s"
+msgstr "^K1%sYou were typefragged by ^BG%s"
 
-#: qcsrc/common/notifications.inc:520
+#: qcsrc/common/notifications/all.inc:624
 #, c-format
-msgid "^K1%sYou scored against ^BG%s^K1 while they were typing^BG%s"
-msgstr "^K1%sYou scored against ^BG%s^K1 while they were typing^BG%s"
+msgid "^K1%sYou were scored against by ^BG%s^K1 while typing"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:520
+#: qcsrc/common/notifications/all.inc:630
 #, c-format
-msgid "^K1%sYou typefragged ^BG%s^BG%s"
-msgstr "^K1%sYou typefragged ^BG%s^BG%s"
-
-#: qcsrc/common/notifications.inc:521
-msgid "^BGPress ^F2DROPWEAPON^BG again to toss the nade!"
-msgstr "^BGPress ^F2DROPWEAPON^BG again to toss the nade!"
+msgid "^BGPress ^F2%s^BG again to toss the nade!"
+msgstr ""
 
-#: qcsrc/common/notifications.inc:522
+#: qcsrc/common/notifications/all.inc:631
 msgid "^F2You got a ^K1BONUS GRENADE^F2!"
 msgstr "^F2You got a ^K1BONUS GRENADE^F2!"
 
-#: qcsrc/common/notifications.inc:523
+#: qcsrc/common/notifications/all.inc:633
 #, c-format
 msgid ""
 "^BGYou have been moved into a different team\n"
@@ -3277,217 +3689,217 @@ msgstr ""
 "^BGYou have been moved into a different team\n"
 "You are now on: %s"
 
-#: qcsrc/common/notifications.inc:524
+#: qcsrc/common/notifications/all.inc:634
 msgid "^K1Don't go against your team mates!"
 msgstr "^K1Don't go against your team mates!"
 
-#: qcsrc/common/notifications.inc:524
+#: qcsrc/common/notifications/all.inc:634
 msgid "^K1Don't shoot your team mates!"
 msgstr "^K1Don't shoot your team mates!"
 
-#: qcsrc/common/notifications.inc:525
+#: qcsrc/common/notifications/all.inc:635
 msgid "^K1Die camper!"
 msgstr "^K1Die camper!"
 
-#: qcsrc/common/notifications.inc:525
+#: qcsrc/common/notifications/all.inc:635
 msgid "^K1Reconsider your tactics, camper!"
 msgstr "^K1Reconsider your tactics, camper!"
 
-#: qcsrc/common/notifications.inc:526
+#: qcsrc/common/notifications/all.inc:636
 msgid "^K1You unfairly eliminated yourself!"
 msgstr "^K1You unfairly eliminated yourself!"
 
-#: qcsrc/common/notifications.inc:527
+#: qcsrc/common/notifications/all.inc:637
 #, c-format
 msgid "^K1You were %s"
 msgstr "^K1You were %s"
 
-#: qcsrc/common/notifications.inc:528
+#: qcsrc/common/notifications/all.inc:638
 msgid "^K1You couldn't catch your breath!"
 msgstr "^K1You couldn't catch your breath!"
 
-#: qcsrc/common/notifications.inc:529
+#: qcsrc/common/notifications/all.inc:639
 msgid "^K1You hit the ground with a crunch!"
 msgstr "^K1You hit the ground with a crunch!"
 
-#: qcsrc/common/notifications.inc:530
+#: qcsrc/common/notifications/all.inc:640
 msgid "^K1You felt a little too hot!"
 msgstr "^K1You felt a little too hot!"
 
-#: qcsrc/common/notifications.inc:530
+#: qcsrc/common/notifications/all.inc:640
 msgid "^K1You got a little bit too crispy!"
 msgstr "^K1You got a little bit too crispy!"
 
-#: qcsrc/common/notifications.inc:531
+#: qcsrc/common/notifications/all.inc:641
 msgid "^K1You killed your own dumb self!"
 msgstr "^K1You killed your own dumb self!"
 
-#: qcsrc/common/notifications.inc:531
+#: qcsrc/common/notifications/all.inc:641
 msgid "^K1You need to be more careful!"
 msgstr "^K1You need to be more careful!"
 
-#: qcsrc/common/notifications.inc:532
+#: qcsrc/common/notifications/all.inc:642
 msgid "^K1You couldn't stand the heat!"
 msgstr "^K1You couldn't stand the heat!"
 
-#: qcsrc/common/notifications.inc:533
+#: qcsrc/common/notifications/all.inc:643
 msgid "^K1You need to watch out for monsters!"
 msgstr "^K1You need to watch out for monsters!"
 
-#: qcsrc/common/notifications.inc:533
+#: qcsrc/common/notifications/all.inc:643
 msgid "^K1You were killed by a monster!"
 msgstr "^K1You were killed by a monster!"
 
-#: qcsrc/common/notifications.inc:534
+#: qcsrc/common/notifications/all.inc:644
 msgid "^K1Tastes like chicken!"
 msgstr "^K1Tastes like chicken!"
 
-#: qcsrc/common/notifications.inc:534
+#: qcsrc/common/notifications/all.inc:644
 msgid "^K1You forgot to put the pin back in!"
 msgstr "^K1You forgot to put the pin back in!"
 
-#: qcsrc/common/notifications.inc:535
+#: qcsrc/common/notifications/all.inc:645
 msgid "^K1Hanging around a napalm explosion is bad!"
 msgstr "^K1Hanging around a napalm explosion is bad!"
 
-#: qcsrc/common/notifications.inc:536
+#: qcsrc/common/notifications/all.inc:646
 msgid "^K1You felt a little chilly!"
 msgstr "^K1You felt a little chilly!"
 
-#: qcsrc/common/notifications.inc:536
+#: qcsrc/common/notifications/all.inc:646
 msgid "^K1You got a little bit too cold!"
 msgstr "^K1You got a little bit too cold!"
 
-#: qcsrc/common/notifications.inc:537
+#: qcsrc/common/notifications/all.inc:647
 msgid "^K1Your Healing Nade is a bit defective"
 msgstr "^K1Your Healing Nade is a bit defective"
 
-#: qcsrc/common/notifications.inc:538
+#: qcsrc/common/notifications/all.inc:648
 msgid "^K1You are respawning for running out of ammo..."
 msgstr "^K1You are respawning for running out of ammo..."
 
-#: qcsrc/common/notifications.inc:538
+#: qcsrc/common/notifications/all.inc:648
 msgid "^K1You were killed for running out of ammo..."
 msgstr "^K1You were killed for running out of ammo..."
 
-#: qcsrc/common/notifications.inc:539
+#: qcsrc/common/notifications/all.inc:649
 msgid "^K1You grew too old without taking your medicine"
 msgstr "^K1You grew too old without taking your medicine"
 
-#: qcsrc/common/notifications.inc:539
+#: qcsrc/common/notifications/all.inc:649
 msgid "^K1You need to preserve your health"
 msgstr "^K1You need to preserve your health"
 
-#: qcsrc/common/notifications.inc:540
+#: qcsrc/common/notifications/all.inc:650
 msgid "^K1You became a shooting star!"
 msgstr "^K1You became a shooting star!"
 
-#: qcsrc/common/notifications.inc:541
+#: qcsrc/common/notifications/all.inc:651
 msgid "^K1You melted away in slime!"
 msgstr "^K1You melted away in slime!"
 
-#: qcsrc/common/notifications.inc:542
+#: qcsrc/common/notifications/all.inc:652
 msgid "^K1You committed suicide!"
 msgstr "^K1You committed suicide!"
 
-#: qcsrc/common/notifications.inc:542
+#: qcsrc/common/notifications/all.inc:652
 msgid "^K1You ended it all!"
 msgstr "^K1You ended it all!"
 
-#: qcsrc/common/notifications.inc:543
+#: qcsrc/common/notifications/all.inc:653
 msgid "^K1You got stuck in a swamp!"
 msgstr "^K1You got stuck in a swamp!"
 
-#: qcsrc/common/notifications.inc:544
+#: qcsrc/common/notifications/all.inc:654
 #, c-format
 msgid "^BGYou are now on: %s"
 msgstr "^BGYou are now on: %s"
 
-#: qcsrc/common/notifications.inc:545
+#: qcsrc/common/notifications/all.inc:655
 msgid "^K1You died in an accident!"
 msgstr "^K1You died in an accident!"
 
-#: qcsrc/common/notifications.inc:546
+#: qcsrc/common/notifications/all.inc:656
 msgid "^K1You had an unfortunate run in with a turret!"
 msgstr "^K1You had an unfortunate run in with a turret!"
 
-#: qcsrc/common/notifications.inc:546
+#: qcsrc/common/notifications/all.inc:656
 msgid "^K1You were fragged by a turret!"
 msgstr "^K1You were fragged by a turret!"
 
-#: qcsrc/common/notifications.inc:547
+#: qcsrc/common/notifications/all.inc:657
 msgid "^K1You had an unfortunate run in with an eWheel turret!"
 msgstr "^K1You had an unfortunate run in with an eWheel turret!"
 
-#: qcsrc/common/notifications.inc:547
+#: qcsrc/common/notifications/all.inc:657
 msgid "^K1You were fragged by an eWheel turret!"
 msgstr "^K1You were fragged by an eWheel turret!"
 
-#: qcsrc/common/notifications.inc:548
+#: qcsrc/common/notifications/all.inc:658
 msgid "^K1You had an unfortunate run in with a Walker turret!"
 msgstr "^K1You had an unfortunate run in with a Walker turret!"
 
-#: qcsrc/common/notifications.inc:548
+#: qcsrc/common/notifications/all.inc:658
 msgid "^K1You were fragged by a Walker turret!"
 msgstr "^K1You were fragged by a Walker turret!"
 
-#: qcsrc/common/notifications.inc:549
+#: qcsrc/common/notifications/all.inc:659
 msgid "^K1You got caught in the blast of a Bumblebee explosion!"
 msgstr "^K1You got caught in the blast of a Bumblebee explosion!"
 
-#: qcsrc/common/notifications.inc:550
+#: qcsrc/common/notifications/all.inc:660
 msgid "^K1You were crushed by a vehicle!"
 msgstr "^K1You were crushed by a vehicle!"
 
-#: qcsrc/common/notifications.inc:551
+#: qcsrc/common/notifications/all.inc:661
 msgid "^K1You were caught in a Raptor cluster bomb!"
 msgstr "^K1You were caught in a Raptor cluster bomb!"
 
-#: qcsrc/common/notifications.inc:552
+#: qcsrc/common/notifications/all.inc:662
 msgid "^K1You got caught in the blast of a Raptor explosion!"
 msgstr "^K1You got caught in the blast of a Raptor explosion!"
 
-#: qcsrc/common/notifications.inc:553
+#: qcsrc/common/notifications/all.inc:663
 msgid "^K1You got caught in the blast of a Spiderbot explosion!"
 msgstr "^K1You got caught in the blast of a Spiderbot explosion!"
 
-#: qcsrc/common/notifications.inc:554
+#: qcsrc/common/notifications/all.inc:664
 msgid "^K1You were blasted to bits by a Spiderbot rocket!"
 msgstr "^K1You were blasted to bits by a Spiderbot rocket!"
 
-#: qcsrc/common/notifications.inc:555
+#: qcsrc/common/notifications/all.inc:665
 msgid "^K1You got caught in the blast of a Racer explosion!"
 msgstr "^K1You got caught in the blast of a Racer explosion!"
 
-#: qcsrc/common/notifications.inc:556
+#: qcsrc/common/notifications/all.inc:666
 msgid "^K1You couldn't find shelter from a Racer rocket!"
 msgstr "^K1You couldn't find shelter from a Racer rocket!"
 
-#: qcsrc/common/notifications.inc:557
+#: qcsrc/common/notifications/all.inc:667
 msgid "^K1Watch your step!"
 msgstr "^K1Watch your step!"
 
-#: qcsrc/common/notifications.inc:558
+#: qcsrc/common/notifications/all.inc:669
 #, c-format
 msgid "^K1Moron! You fragged ^BG%s^K1, a team mate!"
 msgstr "^K1Moron! You fragged ^BG%s^K1, a team mate!"
 
-#: qcsrc/common/notifications.inc:558
+#: qcsrc/common/notifications/all.inc:669
 #, c-format
 msgid "^K1Moron! You went against ^BG%s^K1, a team mate!"
 msgstr "^K1Moron! You went against ^BG%s^K1, a team mate!"
 
-#: qcsrc/common/notifications.inc:559
+#: qcsrc/common/notifications/all.inc:670
 #, c-format
 msgid "^K1You were fragged by ^BG%s^K1, a team mate"
 msgstr "^K1You were fragged by ^BG%s^K1, a team mate"
 
-#: qcsrc/common/notifications.inc:559
+#: qcsrc/common/notifications/all.inc:670
 #, c-format
 msgid "^K1You were scored against by ^BG%s^K1, a team mate"
 msgstr "^K1You were scored against by ^BG%s^K1, a team mate"
 
-#: qcsrc/common/notifications.inc:560
+#: qcsrc/common/notifications/all.inc:672
 msgid ""
 "^K1Stop idling!\n"
 "^BGDisconnecting in ^COUNT..."
@@ -3495,71 +3907,73 @@ msgstr ""
 "^K1Stop idling!\n"
 "^BGDisconnecting in ^COUNT..."
 
-#: qcsrc/common/notifications.inc:561
+#: qcsrc/common/notifications/all.inc:674
 #, c-format
 msgid "^BGYou need %s^BG!"
 msgstr "^BGYou need %s^BG!"
 
-#: qcsrc/common/notifications.inc:562
+#: qcsrc/common/notifications/all.inc:675
 #, c-format
 msgid "^BGYou also need %s^BG!"
 msgstr "^BGYou also need %s^BG!"
 
-#: qcsrc/common/notifications.inc:563
+#: qcsrc/common/notifications/all.inc:676
 msgid "^BGDoor unlocked!"
 msgstr "^BGDoor unlocked!"
 
-#: qcsrc/common/notifications.inc:564
+#: qcsrc/common/notifications/all.inc:678
 msgid "^F2You picked up some extra lives"
 msgstr "^F2You picked up some extra lives"
 
-#: qcsrc/common/notifications.inc:565
-#, c-format
-msgid "^K3You froze ^BG%s"
-msgstr "^K3You froze ^BG%s"
-
-#: qcsrc/common/notifications.inc:566
-#, c-format
-msgid "^K1You were frozen by ^BG%s"
-msgstr "^K1You were frozen by ^BG%s"
-
-#: qcsrc/common/notifications.inc:567
+#: qcsrc/common/notifications/all.inc:680
 #, c-format
 msgid "^K3You revived ^BG%s"
 msgstr "^K3You revived ^BG%s"
 
-#: qcsrc/common/notifications.inc:568
+#: qcsrc/common/notifications/all.inc:681
 msgid "^K3You revived yourself"
 msgstr "^K3You revived yourself"
 
-#: qcsrc/common/notifications.inc:569
+#: qcsrc/common/notifications/all.inc:682
 #, c-format
 msgid "^K3You were revived by ^BG%s"
 msgstr "^K3You were revived by ^BG%s"
 
-#: qcsrc/common/notifications.inc:570
+#: qcsrc/common/notifications/all.inc:683
 #, c-format
 msgid "^K3You were automatically revived after %s second(s)"
 msgstr "^K3You were automatically revived after %s second(s)"
 
-#: qcsrc/common/notifications.inc:571
+#: qcsrc/common/notifications/all.inc:685
 msgid "^BGThe generator is under attack!"
+msgstr "^BGThe generator is under attack!"
+
+#: qcsrc/common/notifications/all.inc:687
+msgid "^TC^TT^BG team loses the round"
 msgstr ""
 
-#: qcsrc/common/notifications.inc:574
+#: qcsrc/common/notifications/all.inc:691
 msgid "^K1You froze yourself"
 msgstr "^K1You froze yourself"
 
-#: qcsrc/common/notifications.inc:575
+#: qcsrc/common/notifications/all.inc:692
 msgid "^K1Round already started, you spawn as frozen"
 msgstr "^K1Round already started, you spawn as frozen"
 
-#: qcsrc/common/notifications.inc:576
+#: qcsrc/common/notifications/all.inc:694
 #, c-format
 msgid "^K1A %s has arrived!"
 msgstr "^K1A %s has arrived!"
 
-#: qcsrc/common/notifications.inc:585
+#: qcsrc/common/notifications/all.inc:698
+msgid "^BGYou got the ^F1Fuel regenerator"
+msgstr "^BGYou got the ^F1Fuel regenerator"
+
+#: qcsrc/common/notifications/all.inc:699
+msgid "^BGYou got the ^F1Jetpack"
+msgstr ""
+
+#: qcsrc/common/notifications/all.inc:707
 msgid ""
 "^K1No spawnpoints available!\n"
 "Hope your team can fix it..."
@@ -3567,7 +3981,7 @@ msgstr ""
 "^K1No spawnpoints available!\n"
 "Hope your team can fix it..."
 
-#: qcsrc/common/notifications.inc:586
+#: qcsrc/common/notifications/all.inc:708
 msgid ""
 "^K1You may not join the game at this time.\n"
 "The player limit reached maximum capacity."
@@ -3575,15 +3989,15 @@ msgstr ""
 "^K1You may not join the game at this time.\n"
 "The player limit reached maximum capacity."
 
-#: qcsrc/common/notifications.inc:589
+#: qcsrc/common/notifications/all.inc:712
 msgid "^BGYou picked up the ball"
 msgstr "^BGYou picked up the ball"
 
-#: qcsrc/common/notifications.inc:590
+#: qcsrc/common/notifications/all.inc:713
 msgid "^BGKilling people while you don't have the ball gives no points!"
 msgstr "^BGKilling people while you don't have the ball gives no points!"
 
-#: qcsrc/common/notifications.inc:591
+#: qcsrc/common/notifications/all.inc:715
 msgid ""
 "^BGAll keys are in your team's hands!\n"
 "Help the key carriers to meet!"
@@ -3591,7 +4005,7 @@ msgstr ""
 "^BGAll keys are in your team's hands!\n"
 "Help the key carriers to meet!"
 
-#: qcsrc/common/notifications.inc:592
+#: qcsrc/common/notifications/all.inc:716
 msgid ""
 "^BGAll keys are in ^TC^TT team^BG's hands!\n"
 "Interfere ^F4NOW^BG!"
@@ -3599,7 +4013,7 @@ msgstr ""
 "^BGAll keys are in ^TC^TT team^BG's hands!\n"
 "Interfere ^F4NOW^BG!"
 
-#: qcsrc/common/notifications.inc:593
+#: qcsrc/common/notifications/all.inc:717
 msgid ""
 "^BGAll keys are in your team's hands!\n"
 "Meet the other key carriers ^F4NOW^BG!"
@@ -3607,23 +4021,23 @@ msgstr ""
 "^BGAll keys are in your team's hands!\n"
 "Meet the other key carriers ^F4NOW^BG!"
 
-#: qcsrc/common/notifications.inc:594
+#: qcsrc/common/notifications/all.inc:718
 msgid "^F4Round will start in ^COUNT"
 msgstr "^F4Round will start in ^COUNT"
 
-#: qcsrc/common/notifications.inc:595
+#: qcsrc/common/notifications/all.inc:719
 msgid "^BGScanning frequency range..."
 msgstr "^BGScanning frequency range..."
 
-#: qcsrc/common/notifications.inc:596
+#: qcsrc/common/notifications/all.inc:720
 msgid "^BGYou are starting with the ^TC^TT Key"
 msgstr "^BGYou are starting with the ^TC^TT Key"
 
-#: qcsrc/common/notifications.inc:597
+#: qcsrc/common/notifications/all.inc:722
 msgid "^BGYou have no lives left, you must wait until the next match"
 msgstr "^BGYou have no lives left, you must wait until the next match"
 
-#: qcsrc/common/notifications.inc:598
+#: qcsrc/common/notifications/all.inc:724
 #, c-format
 msgid ""
 "^BGWaiting for players to join...\n"
@@ -3632,33 +4046,33 @@ msgstr ""
 "^BGWaiting for players to join...\n"
 "Need active players for: %s"
 
-#: qcsrc/common/notifications.inc:599
+#: qcsrc/common/notifications/all.inc:725
 #, c-format
 msgid "^BGWaiting for %s player(s) to join..."
 msgstr "^BGWaiting for %s player(s) to join..."
 
-#: qcsrc/common/notifications.inc:600
+#: qcsrc/common/notifications/all.inc:727
 msgid "^BGYour weapon has been downgraded until you find some ammo!"
-msgstr ""
+msgstr "^BGYour weapon has been downgraded until you find some ammo!"
 
-#: qcsrc/common/notifications.inc:601
+#: qcsrc/common/notifications/all.inc:728
 msgid "^F4^COUNT^BG left to find some ammo!"
 msgstr "^F4^COUNT^BG left to find some ammo!"
 
-#: qcsrc/common/notifications.inc:602
+#: qcsrc/common/notifications/all.inc:729
 msgid "^BGGet some ammo or you'll be dead in ^F4^COUNT^BG!"
 msgstr "^BGGet some ammo or you'll be dead in ^F4^COUNT^BG!"
 
-#: qcsrc/common/notifications.inc:602
+#: qcsrc/common/notifications/all.inc:729
 msgid "^BGGet some ammo! ^F4^COUNT^BG left!"
 msgstr "^BGGet some ammo! ^F4^COUNT^BG left!"
 
-#: qcsrc/common/notifications.inc:603
+#: qcsrc/common/notifications/all.inc:730
 #, c-format
 msgid "^F2Extra lives remaining: ^K1%s"
 msgstr "^F2Extra lives remaining: ^K1%s"
 
-#: qcsrc/common/notifications.inc:605
+#: qcsrc/common/notifications/all.inc:734
 #, c-format
 msgid ""
 "^F2^COUNT^BG until weapon change...\n"
@@ -3667,56 +4081,56 @@ msgstr ""
 "^F2^COUNT^BG until weapon change...\n"
 "Next weapon: ^F1%s"
 
-#: qcsrc/common/notifications.inc:606
+#: qcsrc/common/notifications/all.inc:735
 #, c-format
 msgid "^F2Active weapon: ^F1%s"
 msgstr "^F2Active weapon: ^F1%s"
 
-#: qcsrc/common/notifications.inc:607
-msgid "^BGPress ^F2DROPWEAPON^BG again to toss the grenade!"
-msgstr "^BGPress ^F2DROPWEAPON^BG again to toss the grenade!"
-
-#: qcsrc/common/notifications.inc:608
+#: qcsrc/common/notifications/all.inc:737
 #, c-format
 msgid "^BGYou captured %s^BG control point"
-msgstr ""
+msgstr "^BGYou captured %s^BG control point"
 
-#: qcsrc/common/notifications.inc:609
+#: qcsrc/common/notifications/all.inc:738
 #, c-format
 msgid "^TC^TT^BG team captured %s^BG control point"
-msgstr ""
+msgstr "^TC^TT^BG team captured %s^BG control point"
 
-#: qcsrc/common/notifications.inc:610
+#: qcsrc/common/notifications/all.inc:739
 msgid "^BGThis control point currently cannot be captured"
-msgstr ""
+msgstr "^BGThis control point currently cannot be captured"
 
-#: qcsrc/common/notifications.inc:611
+#: qcsrc/common/notifications/all.inc:740
 msgid ""
 "^BGThe enemy generator cannot be destroyed yet\n"
 "^F2Capture some control points to unshield it"
 msgstr ""
+"^BGThe enemy generator cannot be destroyed yet\n"
+"^F2Capture some control points to unshield it"
 
-#: qcsrc/common/notifications.inc:612
+#: qcsrc/common/notifications/all.inc:741
 msgid "^BGThe ^TCenemy^BG generator is no longer shielded!"
-msgstr ""
+msgstr "^BGThe ^TCenemy^BG generator is no longer shielded!"
 
-#: qcsrc/common/notifications.inc:613
+#: qcsrc/common/notifications/all.inc:742
 msgid ""
 "^K1Your generator is NOT shielded!\n"
 "^BGRe-capture control points to shield it!"
 msgstr ""
+"^K1Your generator is NOT shielded!\n"
+"^BGRe-capture control points to shield it!"
 
-#: qcsrc/common/notifications.inc:614
+#: qcsrc/common/notifications/all.inc:743
 #, c-format
-msgid "^BGPress ^F2DROPFLAG%s^BG to teleport"
+msgid "^BGPress ^F2%s^BG to teleport"
 msgstr ""
 
-#: qcsrc/common/notifications.inc:615
+#: qcsrc/common/notifications/all.inc:744
 #, c-format
 msgid "^BGTeleporting disabled for %s"
-msgstr ""
+msgstr "^BGTeleporting disabled for %s"
 
-#: qcsrc/common/notifications.inc:616
+#: qcsrc/common/notifications/all.inc:746
 msgid ""
 "^F2Now playing ^F4OVERTIME^F2!\n"
 "Keep fragging until we have a winner!"
@@ -3724,7 +4138,7 @@ msgstr ""
 "^F2Now playing ^F4OVERTIME^F2!\n"
 "Keep fragging until we have a winner!"
 
-#: qcsrc/common/notifications.inc:616
+#: qcsrc/common/notifications/all.inc:746
 msgid ""
 "^F2Now playing ^F4OVERTIME^F2!\n"
 "Keep scoring until we have a winner!"
@@ -3732,7 +4146,7 @@ msgstr ""
 "^F2Now playing ^F4OVERTIME^F2!\n"
 "Keep scoring until we have a winner!"
 
-#: qcsrc/common/notifications.inc:617
+#: qcsrc/common/notifications/all.inc:747
 msgid ""
 "^F2Now playing ^F4OVERTIME^F2!\n"
 "\n"
@@ -3746,7 +4160,7 @@ msgstr ""
 "The more control points your team holds,\n"
 "the faster the enemy generator decays"
 
-#: qcsrc/common/notifications.inc:618
+#: qcsrc/common/notifications/all.inc:748
 #, c-format
 msgid ""
 "^F2Now playing ^F4OVERTIME^F2!\n"
@@ -3755,273 +4169,280 @@ msgstr ""
 "^F2Now playing ^F4OVERTIME^F2!\n"
 "^BGAdded ^F4%s^BG to the game!"
 
-#: qcsrc/common/notifications.inc:619
+#: qcsrc/common/notifications/all.inc:750
 msgid "^K1In^BG-portal created"
 msgstr "^K1In^BG-portal created"
 
-#: qcsrc/common/notifications.inc:620
+#: qcsrc/common/notifications/all.inc:751
 msgid "^F3Out^BG-portal created"
 msgstr "^F3Out^BG-portal created"
 
-#: qcsrc/common/notifications.inc:621
+#: qcsrc/common/notifications/all.inc:752
 msgid "^F1Portal creation failed"
-msgstr ""
+msgstr "^F1Portal creation failed"
 
-#: qcsrc/common/notifications.inc:622
-msgid "^F2Invisibility has worn off"
-msgstr "^F2Invisibility has worn off"
-
-#: qcsrc/common/notifications.inc:623
-msgid "^F2Shield has worn off"
-msgstr "^F2Shield has worn off"
-
-#: qcsrc/common/notifications.inc:624
-msgid "^F2Speed has worn off"
-msgstr "^F2Speed has worn off"
+#: qcsrc/common/notifications/all.inc:754
+msgid "^F2Strength infuses your weapons with devastating power"
+msgstr "^F2Strength infuses your weapons with devastating power"
 
-#: qcsrc/common/notifications.inc:625
+#: qcsrc/common/notifications/all.inc:755
 msgid "^F2Strength has worn off"
 msgstr "^F2Strength has worn off"
 
-#: qcsrc/common/notifications.inc:626
-msgid "^F2You are invisible"
-msgstr "^F2You are invisible"
-
-#: qcsrc/common/notifications.inc:627
+#: qcsrc/common/notifications/all.inc:757
 msgid "^F2Shield surrounds you"
 msgstr "^F2Shield surrounds you"
 
-#: qcsrc/common/notifications.inc:628
+#: qcsrc/common/notifications/all.inc:758
+msgid "^F2Shield has worn off"
+msgstr "^F2Shield has worn off"
+
+#: qcsrc/common/notifications/all.inc:760
 msgid "^F2You are on speed"
 msgstr "^F2You are on speed"
 
-#: qcsrc/common/notifications.inc:629
-msgid "^F2Strength infuses your weapons with devastating power"
-msgstr "^F2Strength infuses your weapons with devastating power"
+#: qcsrc/common/notifications/all.inc:761
+msgid "^F2Speed has worn off"
+msgstr "^F2Speed has worn off"
+
+#: qcsrc/common/notifications/all.inc:763
+msgid "^F2You are invisible"
+msgstr "^F2You are invisible"
+
+#: qcsrc/common/notifications/all.inc:764
+msgid "^F2Invisibility has worn off"
+msgstr "^F2Invisibility has worn off"
 
-#: qcsrc/common/notifications.inc:630
+#: qcsrc/common/notifications/all.inc:766
 msgid "^F2The race is over, finish your lap!"
 msgstr "^F2The race is over, finish your lap!"
 
-#: qcsrc/common/notifications.inc:631
+#: qcsrc/common/notifications/all.inc:768
 msgid "^BGSecondary fire inflicts no damage!"
 msgstr "^BGSecondary fire inflicts no damage!"
 
-#: qcsrc/common/notifications.inc:632
+#: qcsrc/common/notifications/all.inc:770
 msgid "^BGSequence completed!"
 msgstr "^BGSequence completed!"
 
-#: qcsrc/common/notifications.inc:633
+#: qcsrc/common/notifications/all.inc:771
 msgid "^BGThere are more to go..."
 msgstr "^BGThere are more to go..."
 
-#: qcsrc/common/notifications.inc:634
+#: qcsrc/common/notifications/all.inc:772
 #, c-format
 msgid "^BGOnly %s^BG more to go..."
 msgstr "^BGOnly %s^BG more to go..."
 
-#: qcsrc/common/notifications.inc:635
+#: qcsrc/common/notifications/all.inc:774
 msgid "^F2Superweapons have broken down"
 msgstr "^F2Superweapons have broken down"
 
-#: qcsrc/common/notifications.inc:636
+#: qcsrc/common/notifications/all.inc:775
 msgid "^F2Superweapons have been lost"
 msgstr "^F2Superweapons have been lost"
 
-#: qcsrc/common/notifications.inc:637
+#: qcsrc/common/notifications/all.inc:776
 msgid "^F2You now have a superweapon"
 msgstr "^F2You now have a superweapon"
 
-#: qcsrc/common/notifications.inc:638
+#: qcsrc/common/notifications/all.inc:778
 msgid "^K1Changing to ^TC^TT^K1 in ^COUNT"
 msgstr "^K1Changing to ^TC^TT^K1 in ^COUNT"
 
-#: qcsrc/common/notifications.inc:639
+#: qcsrc/common/notifications/all.inc:779
 msgid "^K1Changing team in ^COUNT"
 msgstr "^K1Changing team in ^COUNT"
 
-#: qcsrc/common/notifications.inc:640
+#: qcsrc/common/notifications/all.inc:780
 msgid "^K1Spectating in ^COUNT"
 msgstr "^K1Spectating in ^COUNT"
 
-#: qcsrc/common/notifications.inc:641
+#: qcsrc/common/notifications/all.inc:781
 msgid "^K1Suicide in ^COUNT"
 msgstr "^K1Suicide in ^COUNT"
 
-#: qcsrc/common/notifications.inc:642
+#: qcsrc/common/notifications/all.inc:783
 msgid "^F4Timeout begins in ^COUNT"
 msgstr "^F4Timeout begins in ^COUNT"
 
-#: qcsrc/common/notifications.inc:643
+#: qcsrc/common/notifications/all.inc:784
 msgid "^F4Timeout ends in ^COUNT"
 msgstr "^F4Timeout ends in ^COUNT"
 
-#: qcsrc/common/notifications.inc:644
+#: qcsrc/common/notifications/all.inc:786
 msgid "^K1Cannot join given minigame session!"
-msgstr ""
+msgstr "^K1Cannot join given minigame session!"
 
-#: qcsrc/common/notifications.inc:645
+#: qcsrc/common/notifications/all.inc:788
 #, c-format
-msgid "^BGPress ^F2DROPFLAG%s^BG to enter/exit the vehicle"
+msgid "^BGPress ^F2%s^BG to enter/exit the vehicle"
 msgstr ""
 
-#: qcsrc/common/notifications.inc:646
+#: qcsrc/common/notifications/all.inc:789
 #, c-format
-msgid "^BGPress ^F2DROPFLAG%s^BG to enter the vehicle gunner"
+msgid "^BGPress ^F2%s^BG to enter the vehicle gunner"
 msgstr ""
 
-#: qcsrc/common/notifications.inc:647
+#: qcsrc/common/notifications/all.inc:790
 #, c-format
-msgid "^BGPress ^F2DROPFLAG%s^BG to steal this vehicle"
+msgid "^BGPress ^F2%s^BG to steal this vehicle"
 msgstr ""
 
-#: qcsrc/common/notifications.inc:648
+#: qcsrc/common/notifications/all.inc:791
 msgid ""
 "^F2The enemy is stealing one of your vehicles!\n"
 "^F4Stop them!"
 msgstr ""
+"^F2The enemy is stealing one of your vehicles!\n"
+"^F4Stop them!"
 
-#: qcsrc/common/notifications.inc:649
-msgid ""
-"^F2You have stolen the enemy's vehicle, you are now visible on their radar!"
+#: qcsrc/common/notifications/all.inc:792
+msgid "^F2Intruder detected, disabling shields!"
 msgstr ""
 
-#: qcsrc/common/notifications.qh:122
-msgid "Notification dump command only works with cl_cmd and sv_cmd.\n"
-msgstr "Notification dump command only works with cl_cmd and sv_cmd.\n"
+#: qcsrc/common/notifications/all.qh:194
+msgid "Notification dump command only works with cl_cmd and sv_cmd."
+msgstr ""
 
-#: qcsrc/common/notifications.qh:293 qcsrc/common/notifications.qh:294
+#: qcsrc/common/notifications/all.qh:405 qcsrc/common/notifications/all.qh:406
 #, c-format
 msgid " (near %s)"
 msgstr " (near %s)"
 
-#: qcsrc/common/notifications.qh:301 qcsrc/common/notifications.qh:302
+#: qcsrc/common/notifications/all.qh:413 qcsrc/common/notifications/all.qh:414
 msgid "primary"
 msgstr "primary"
 
-#: qcsrc/common/notifications.qh:301 qcsrc/common/notifications.qh:302
+#: qcsrc/common/notifications/all.qh:413 qcsrc/common/notifications/all.qh:414
 msgid "secondary"
 msgstr "secondary"
 
-#: qcsrc/common/notifications.qh:312
-#, c-format
-msgid " ^F1(Press %s)"
-msgstr " ^F1(Press %s)"
+#: qcsrc/common/notifications/all.qh:416
+msgid "point"
+msgstr "point"
 
-#: qcsrc/common/notifications.qh:323
-#, c-format
-msgid " with %s"
-msgstr " with %s"
+#: qcsrc/common/notifications/all.qh:416
+msgid "points"
+msgstr "points"
+
+#: qcsrc/common/notifications/all.qh:425
+msgid "drop flag"
+msgstr ""
+
+#: qcsrc/common/notifications/all.qh:426
+msgid "throw nade"
+msgstr ""
 
-#: qcsrc/common/notifications.qh:336
+#: qcsrc/common/notifications/all.qh:451
 #, c-format
 msgid "%s^K1 made a TRIPLE FRAG! %s^BG"
 msgstr "%s^K1 made a TRIPLE FRAG! %s^BG"
 
-#: qcsrc/common/notifications.qh:336
+#: qcsrc/common/notifications/all.qh:451
 #, c-format
 msgid "%s^K1 made a TRIPLE SCORE! %s^BG"
 msgstr "%s^K1 made a TRIPLE SCORE! %s^BG"
 
-#: qcsrc/common/notifications.qh:336
+#: qcsrc/common/notifications/all.qh:451
 msgid "TRIPLE FRAG! "
 msgstr "TRIPLE FRAG! "
 
-#: qcsrc/common/notifications.qh:337
+#: qcsrc/common/notifications/all.qh:452
 #, c-format
 msgid "%s^K1 made FIVE SCORES IN A ROW! %s^BG"
 msgstr "%s^K1 made FIVE SCORES IN A ROW! %s^BG"
 
-#: qcsrc/common/notifications.qh:337
+#: qcsrc/common/notifications/all.qh:452
 #, c-format
 msgid "%s^K1 unlocked RAGE! %s^BG"
 msgstr "%s^K1 unlocked RAGE! %s^BG"
 
-#: qcsrc/common/notifications.qh:337
+#: qcsrc/common/notifications/all.qh:452
 msgid "RAGE! "
 msgstr "RAGE! "
 
-#: qcsrc/common/notifications.qh:338
+#: qcsrc/common/notifications/all.qh:453
 #, c-format
 msgid "%s^K1 made TEN SCORES IN A ROW! %s^BG"
 msgstr "%s^K1 made TEN SCORES IN A ROW! %s^BG"
 
-#: qcsrc/common/notifications.qh:338
+#: qcsrc/common/notifications/all.qh:453
 #, c-format
 msgid "%s^K1 started a MASSACRE! %s^BG"
 msgstr "%s^K1 started a MASSACRE! %s^BG"
 
-#: qcsrc/common/notifications.qh:338
+#: qcsrc/common/notifications/all.qh:453
 msgid "MASSACRE! "
 msgstr "MASSACRE! "
 
-#: qcsrc/common/notifications.qh:339
+#: qcsrc/common/notifications/all.qh:454
 #, c-format
 msgid "%s^K1 executed MAYHEM! %s^BG"
 msgstr "%s^K1 executed MAYHEM! %s^BG"
 
-#: qcsrc/common/notifications.qh:339
+#: qcsrc/common/notifications/all.qh:454
 #, c-format
 msgid "%s^K1 made FIFTEEN SCORES IN A ROW! %s^BG"
 msgstr "%s^K1 made FIFTEEN SCORES IN A ROW! %s^BG"
 
-#: qcsrc/common/notifications.qh:339
+#: qcsrc/common/notifications/all.qh:454
 msgid "MAYHEM! "
 msgstr "MAYHEM! "
 
-#: qcsrc/common/notifications.qh:340
+#: qcsrc/common/notifications/all.qh:455
 #, c-format
 msgid "%s^K1 is a BERSERKER! %s^BG"
 msgstr "%s^K1 is a BERSERKER! %s^BG"
 
-#: qcsrc/common/notifications.qh:340
+#: qcsrc/common/notifications/all.qh:455
 #, c-format
 msgid "%s^K1 made TWENTY SCORES IN A ROW! %s^BG"
 msgstr "%s^K1 made TWENTY SCORES IN A ROW! %s^BG"
 
-#: qcsrc/common/notifications.qh:340
+#: qcsrc/common/notifications/all.qh:455
 msgid "BERSERKER! "
 msgstr "BERSERKER! "
 
-#: qcsrc/common/notifications.qh:341
+#: qcsrc/common/notifications/all.qh:456
 #, c-format
 msgid "%s^K1 inflicts CARNAGE! %s^BG"
 msgstr "%s^K1 inflicts CARNAGE! %s^BG"
 
-#: qcsrc/common/notifications.qh:341
+#: qcsrc/common/notifications/all.qh:456
 #, c-format
 msgid "%s^K1 made TWENTY FIVE SCORES IN A ROW! %s^BG"
 msgstr "%s^K1 made TWENTY FIVE SCORES IN A ROW! %s^BG"
 
-#: qcsrc/common/notifications.qh:341
+#: qcsrc/common/notifications/all.qh:456
 msgid "CARNAGE! "
 msgstr "CARNAGE! "
 
-#: qcsrc/common/notifications.qh:342
+#: qcsrc/common/notifications/all.qh:457
 #, c-format
 msgid "%s^K1 made THIRTY SCORES IN A ROW! %s^BG"
 msgstr "%s^K1 made THIRTY SCORES IN A ROW! %s^BG"
 
-#: qcsrc/common/notifications.qh:342
+#: qcsrc/common/notifications/all.qh:457
 #, c-format
 msgid "%s^K1 unleashes ARMAGEDDON! %s^BG"
 msgstr "%s^K1 unleashes ARMAGEDDON! %s^BG"
 
-#: qcsrc/common/notifications.qh:342
+#: qcsrc/common/notifications/all.qh:457
 msgid "ARMAGEDDON! "
 msgstr "ARMAGEDDON! "
 
-#: qcsrc/common/notifications.qh:348
+#: qcsrc/common/notifications/all.qh:464
 #, c-format
 msgid "%s(^F1Bot^BG)"
 msgstr "%s(^F1Bot^BG)"
 
-#: qcsrc/common/notifications.qh:350
+#: qcsrc/common/notifications/all.qh:466
 #, c-format
 msgid "%s(Ping ^F1%d^BG)"
 msgstr "%s(Ping ^F1%d^BG)"
 
-#: qcsrc/common/notifications.qh:356
+#: qcsrc/common/notifications/all.qh:473
 #, c-format
 msgid ""
 "\n"
@@ -4030,7 +4451,7 @@ msgstr ""
 "\n"
 "(Health ^1%d^BG / Armour ^2%d^BG)%s"
 
-#: qcsrc/common/notifications.qh:358
+#: qcsrc/common/notifications/all.qh:475
 #, c-format
 msgid ""
 "\n"
@@ -4039,352 +4460,761 @@ msgstr ""
 "\n"
 "(^F4Dead^BG)%s"
 
-#: qcsrc/common/notifications.qh:395 qcsrc/common/notifications.qh:408
+#: qcsrc/common/notifications/all.qh:496 qcsrc/common/notifications/all.qh:509
 #, c-format
 msgid "%d score spree! "
 msgstr "%d score spree! "
 
-#: qcsrc/common/notifications.qh:407
+#: qcsrc/common/notifications/all.qh:508
 #, c-format
 msgid "%d frag spree! "
 msgstr "%d frag spree! "
 
-#: qcsrc/common/notifications.qh:420
+#: qcsrc/common/notifications/all.qh:521
 msgid "First blood! "
 msgstr "First blood! "
 
-#: qcsrc/common/notifications.qh:420
+#: qcsrc/common/notifications/all.qh:521
 msgid "First score! "
 msgstr "First score! "
 
-#: qcsrc/common/notifications.qh:424
+#: qcsrc/common/notifications/all.qh:525
 msgid "First casualty! "
 msgstr "First casualty! "
 
-#: qcsrc/common/notifications.qh:424
+#: qcsrc/common/notifications/all.qh:525
 msgid "First victim! "
 msgstr "First victim! "
 
-#: qcsrc/common/notifications.qh:465
+#: qcsrc/common/notifications/all.qh:566
 #, c-format
 msgid "%s^K1 has %d frags in a row! %s^BG"
 msgstr "%s^K1 has %d frags in a row! %s^BG"
 
-#: qcsrc/common/notifications.qh:466
+#: qcsrc/common/notifications/all.qh:567
 #, c-format
 msgid "%s^K1 made %d scores in a row! %s^BG"
 msgstr "%s^K1 made %d scores in a row! %s^BG"
 
-#: qcsrc/common/notifications.qh:484
+#: qcsrc/common/notifications/all.qh:585
 #, c-format
 msgid "%s^K1 drew first blood! %s^BG"
 msgstr "%s^K1 drew first blood! %s^BG"
 
-#: qcsrc/common/notifications.qh:485
+#: qcsrc/common/notifications/all.qh:586
 #, c-format
 msgid "%s^K1 got the first score! %s^BG"
 msgstr "%s^K1 got the first score! %s^BG"
 
-#: qcsrc/common/notifications.qh:501
+#: qcsrc/common/notifications/all.qh:602
 #, c-format
 msgid ", ending their %d frag spree"
 msgstr ", ending their %d frag spree"
 
-#: qcsrc/common/notifications.qh:502
+#: qcsrc/common/notifications/all.qh:603
 #, c-format
 msgid ", ending their %d score spree"
 msgstr ", ending their %d score spree"
 
-#: qcsrc/common/notifications.qh:516
+#: qcsrc/common/notifications/all.qh:617
 #, c-format
 msgid ", losing their %d frag spree"
 msgstr ", losing their %d frag spree"
 
-#: qcsrc/common/notifications.qh:517
+#: qcsrc/common/notifications/all.qh:618
 #, c-format
 msgid ", losing their %d score spree"
 msgstr ", losing their %d score spree"
 
-#: qcsrc/common/teams.qh:29
-msgid "Red"
-msgstr "Red"
-
-#: qcsrc/common/teams.qh:30
-msgid "Blue"
-msgstr "Blue"
+#: qcsrc/common/notifications/all.qh:643
+#, c-format
+msgid " with %d %s"
+msgstr ""
 
 #: qcsrc/common/teams.qh:31
-msgid "Yellow"
-msgstr "Yellow"
+msgid "TEAM^Red"
+msgstr "TEAM^Red"
 
 #: qcsrc/common/teams.qh:32
-msgid "Pink"
-msgstr "Pink"
+msgid "TEAM^Blue"
+msgstr "TEAM^Blue"
+
+#: qcsrc/common/teams.qh:33
+msgid "TEAM^Yellow"
+msgstr "TEAM^Yellow"
+
+#: qcsrc/common/teams.qh:34
+msgid "TEAM^Pink"
+msgstr "TEAM^Pink"
+
+#: qcsrc/common/teams.qh:35
+msgid "Team"
+msgstr "Team"
+
+#: qcsrc/common/teams.qh:36
+msgid "Neutral"
+msgstr "Neutral"
+
+#: qcsrc/common/teams.qh:39
+msgid "KEY^Red"
+msgstr "KEY^Red"
+
+#: qcsrc/common/teams.qh:40
+msgid "KEY^Blue"
+msgstr "KEY^Blue"
+
+#: qcsrc/common/teams.qh:41
+msgid "KEY^Yellow"
+msgstr "KEY^Yellow"
+
+#: qcsrc/common/teams.qh:42
+msgid "KEY^Pink"
+msgstr "KEY^Pink"
+
+#: qcsrc/common/teams.qh:43
+msgid "FLAG^Red"
+msgstr "FLAG^Red"
+
+#: qcsrc/common/teams.qh:44
+msgid "FLAG^Blue"
+msgstr "FLAG^Blue"
+
+#: qcsrc/common/teams.qh:45
+msgid "FLAG^Yellow"
+msgstr "FLAG^Yellow"
+
+#: qcsrc/common/teams.qh:46
+msgid "FLAG^Pink"
+msgstr "FLAG^Pink"
+
+#: qcsrc/common/teams.qh:47
+msgid "GENERATOR^Red"
+msgstr "GENERATOR^Red"
+
+#: qcsrc/common/teams.qh:48
+msgid "GENERATOR^Blue"
+msgstr "GENERATOR^Blue"
+
+#: qcsrc/common/teams.qh:49
+msgid "GENERATOR^Yellow"
+msgstr "GENERATOR^Yellow"
+
+#: qcsrc/common/teams.qh:50
+msgid "GENERATOR^Pink"
+msgstr "GENERATOR^Pink"
+
+#: qcsrc/common/turrets/all.qh:94
+msgid "Turrets dump command only works with sv_cmd."
+msgstr ""
+
+#: qcsrc/common/turrets/cl_turrets.qc:125
+#, c-format
+msgid "%s under attack!"
+msgstr "%s under attack!"
+
+#: qcsrc/common/turrets/turret.qh:11
+msgid "Turret"
+msgstr "Turret"
+
+#: qcsrc/common/turrets/turret/ewheel.qh:15
+msgid "eWheel Turret"
+msgstr "eWheel Turret"
+
+#: qcsrc/common/turrets/turret/ewheel_weapon.qh:7
+msgid "eWheel"
+msgstr "eWheel"
+
+#: qcsrc/common/turrets/turret/flac.qh:13
+msgid "FLAC Cannon"
+msgstr "FLAC Cannon"
+
+#: qcsrc/common/turrets/turret/flac_weapon.qh:9
+msgid "FLAC"
+msgstr "FLAC"
+
+#: qcsrc/common/turrets/turret/fusionreactor.qh:11
+msgid "Fusion Reactor"
+msgstr "Fusion Reactor"
+
+#: qcsrc/common/turrets/turret/hellion.qh:13
+msgid "Hellion Missile Turret"
+msgstr "Hellion Missile Turret"
+
+#: qcsrc/common/turrets/turret/hellion_weapon.qh:7
+msgid "Hellion"
+msgstr "Hellion"
+
+#: qcsrc/common/turrets/turret/hk.qh:15
+msgid "Hunter-Killer Turret"
+msgstr "Hunter-Killer Turret"
+
+#: qcsrc/common/turrets/turret/hk_weapon.qh:7
+msgid "Hunter-Killer"
+msgstr "Hunter-Killer"
+
+#: qcsrc/common/turrets/turret/machinegun.qh:13
+msgid "Machinegun Turret"
+msgstr "Machinegun Turret"
+
+#: qcsrc/common/turrets/turret/machinegun_weapon.qh:7
+msgid "Machinegun"
+msgstr "Machinegun"
+
+#: qcsrc/common/turrets/turret/mlrs.qh:13
+msgid "MLRS Turret"
+msgstr "MLRS Turret"
+
+#: qcsrc/common/turrets/turret/mlrs_weapon.qh:7
+msgid "MLRS"
+msgstr "MLRS"
+
+#: qcsrc/common/turrets/turret/phaser.qh:13
+msgid "Phaser Cannon"
+msgstr "Phaser Cannon"
+
+#: qcsrc/common/turrets/turret/phaser_weapon.qh:7
+msgid "Phaser"
+msgstr "Phaser"
+
+#: qcsrc/common/turrets/turret/plasma.qh:13
+msgid "Plasma Cannon"
+msgstr "Plasma Cannon"
+
+#: qcsrc/common/turrets/turret/plasma_dual.qh:8
+msgid "Dual plasma"
+msgstr "Dual plasma"
+
+#: qcsrc/common/turrets/turret/plasma_dual.qh:20
+msgid "Dual Plasma Cannon"
+msgstr "Dual Plasma Cannon"
+
+#: qcsrc/common/turrets/turret/plasma_weapon.qh:7
+msgid "Plasma"
+msgstr "Plasma"
+
+#: qcsrc/common/turrets/turret/tesla.qh:13
+#: qcsrc/common/turrets/turret/tesla_weapon.qh:7
+msgid "Tesla Coil"
+msgstr "Tesla Coil"
+
+#: qcsrc/common/turrets/turret/walker.qh:15
+msgid "Walker Turret"
+msgstr "Walker Turret"
+
+#: qcsrc/common/turrets/turret/walker_weapon.qh:7
+msgid "Walker"
+msgstr "Walker"
+
+#: qcsrc/common/util.qc:1403
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:163
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:173
+msgid "Male"
+msgstr "Male"
+
+#: qcsrc/common/util.qc:1404
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:162
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:172
+msgid "Female"
+msgstr "Female"
+
+#: qcsrc/common/util.qc:1405
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:161
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:174
+msgid "Undisclosed"
+msgstr "Undisclosed"
+
+#: qcsrc/common/util.qc:1452
+msgid "<KEY NOT FOUND>"
+msgstr ""
+
+#: qcsrc/common/util.qc:1453
+msgid "<UNKNOWN KEYNUM>"
+msgstr ""
+
+#: qcsrc/common/util.qc:1458
+msgid "TAB"
+msgstr ""
+
+#: qcsrc/common/util.qc:1459 qcsrc/common/util.qc:1530
+#, c-format
+msgid "ENTER"
+msgstr ""
+
+#: qcsrc/common/util.qc:1460
+msgid "ESCAPE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1461
+msgid "SPACE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1463
+msgid "BACKSPACE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1464 qcsrc/common/util.qc:1521
+#, c-format
+msgid "UPARROW"
+msgstr ""
+
+#: qcsrc/common/util.qc:1465 qcsrc/common/util.qc:1516
+#, c-format
+msgid "DOWNARROW"
+msgstr ""
+
+#: qcsrc/common/util.qc:1466 qcsrc/common/util.qc:1518
+#, c-format
+msgid "LEFTARROW"
+msgstr ""
+
+#: qcsrc/common/util.qc:1467 qcsrc/common/util.qc:1519
+#, c-format
+msgid "RIGHTARROW"
+msgstr ""
+
+#: qcsrc/common/util.qc:1469
+msgid "ALT"
+msgstr ""
+
+#: qcsrc/common/util.qc:1470
+msgid "CTRL"
+msgstr ""
+
+#: qcsrc/common/util.qc:1471
+msgid "SHIFT"
+msgstr ""
+
+#: qcsrc/common/util.qc:1473 qcsrc/common/util.qc:1514
+#, c-format
+msgid "INS"
+msgstr ""
+
+#: qcsrc/common/util.qc:1474 qcsrc/common/util.qc:1524
+#, c-format
+msgid "DEL"
+msgstr ""
+
+#: qcsrc/common/util.qc:1475 qcsrc/common/util.qc:1517
+#, c-format
+msgid "PGDN"
+msgstr ""
+
+#: qcsrc/common/util.qc:1476 qcsrc/common/util.qc:1522
+#, c-format
+msgid "PGUP"
+msgstr ""
+
+#: qcsrc/common/util.qc:1477 qcsrc/common/util.qc:1520
+#, c-format
+msgid "HOME"
+msgstr ""
+
+#: qcsrc/common/util.qc:1478 qcsrc/common/util.qc:1515
+#, c-format
+msgid "END"
+msgstr ""
+
+#: qcsrc/common/util.qc:1480
+msgid "PAUSE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1482
+msgid "NUMLOCK"
+msgstr ""
+
+#: qcsrc/common/util.qc:1483
+msgid "CAPSLOCK"
+msgstr ""
+
+#: qcsrc/common/util.qc:1484
+msgid "SCROLLOCK"
+msgstr ""
+
+#: qcsrc/common/util.qc:1486
+msgid "SEMICOLON"
+msgstr ""
+
+#: qcsrc/common/util.qc:1487
+msgid "TILDE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1488
+msgid "BACKQUOTE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1489
+msgid "QUOTE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1490
+msgid "APOSTROPHE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1491
+msgid "BACKSLASH"
+msgstr ""
+
+#: qcsrc/common/util.qc:1499
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: qcsrc/common/util.qc:1509
+#, c-format
+msgid "KP_%d"
+msgstr ""
+
+#: qcsrc/common/util.qc:1514 qcsrc/common/util.qc:1515
+#: qcsrc/common/util.qc:1516 qcsrc/common/util.qc:1517
+#: qcsrc/common/util.qc:1518 qcsrc/common/util.qc:1519
+#: qcsrc/common/util.qc:1520 qcsrc/common/util.qc:1521
+#: qcsrc/common/util.qc:1522 qcsrc/common/util.qc:1523
+#: qcsrc/common/util.qc:1524 qcsrc/common/util.qc:1525
+#: qcsrc/common/util.qc:1526 qcsrc/common/util.qc:1527
+#: qcsrc/common/util.qc:1528 qcsrc/common/util.qc:1529
+#: qcsrc/common/util.qc:1530 qcsrc/common/util.qc:1531
+#, c-format
+msgid "KP_%s"
+msgstr ""
+
+#: qcsrc/common/util.qc:1523
+#, c-format
+msgid "PERIOD"
+msgstr ""
+
+#: qcsrc/common/util.qc:1525
+#, c-format
+msgid "DIVIDE"
+msgstr ""
+
+#: qcsrc/common/util.qc:1526
+#, c-format
+msgid "SLASH"
+msgstr ""
+
+#: qcsrc/common/util.qc:1527
+#, c-format
+msgid "MULTIPLY"
+msgstr ""
+
+#: qcsrc/common/util.qc:1528
+#, c-format
+msgid "MINUS"
+msgstr ""
+
+#: qcsrc/common/util.qc:1529
+#, c-format
+msgid "PLUS"
+msgstr ""
+
+#: qcsrc/common/util.qc:1531
+#, c-format
+msgid "EQUALS"
+msgstr ""
+
+#: qcsrc/common/util.qc:1536
+msgid "PRINTSCREEN"
+msgstr ""
+
+#: qcsrc/common/util.qc:1539
+#, c-format
+msgid "MOUSE%d"
+msgstr ""
+
+#: qcsrc/common/util.qc:1541
+msgid "MWHEELUP"
+msgstr ""
+
+#: qcsrc/common/util.qc:1542
+msgid "MWHEELDOWN"
+msgstr ""
 
-#: qcsrc/common/teams.qh:33
-msgid "Team"
-msgstr "Team"
+#: qcsrc/common/util.qc:1545
+#, c-format
+msgid "JOY%d"
+msgstr ""
 
-#: qcsrc/common/teams.qh:34
-msgid "Neutral"
-msgstr "Neutral"
+#: qcsrc/common/util.qc:1548
+#, c-format
+msgid "AUX%d"
+msgstr ""
 
-#: qcsrc/common/turrets/all.qh:49
-msgid "Turrets dump command only works with sv_cmd.\n"
+#: qcsrc/common/util.qc:1555
+#, c-format
+msgid "DPAD_UP"
 msgstr ""
 
-#: qcsrc/common/turrets/cl_turrets.qc:127
+#: qcsrc/common/util.qc:1555 qcsrc/common/util.qc:1556
+#: qcsrc/common/util.qc:1557 qcsrc/common/util.qc:1558
+#: qcsrc/common/util.qc:1559 qcsrc/common/util.qc:1560
+#: qcsrc/common/util.qc:1561 qcsrc/common/util.qc:1562
+#: qcsrc/common/util.qc:1563 qcsrc/common/util.qc:1564
+#: qcsrc/common/util.qc:1565 qcsrc/common/util.qc:1566
+#: qcsrc/common/util.qc:1567 qcsrc/common/util.qc:1568
+#: qcsrc/common/util.qc:1569 qcsrc/common/util.qc:1570
+#: qcsrc/common/util.qc:1571 qcsrc/common/util.qc:1572
+#: qcsrc/common/util.qc:1573 qcsrc/common/util.qc:1574
 #, c-format
-msgid "%s under attack!"
-msgstr "%s under attack!"
+msgid "X360_%s"
+msgstr ""
 
-#: qcsrc/common/turrets/turret.qh:12
-msgid "Turret"
+#: qcsrc/common/util.qc:1556
+#, c-format
+msgid "DPAD_DOWN"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/ewheel.qc:16
-msgid "eWheel Turret"
+#: qcsrc/common/util.qc:1557
+#, c-format
+msgid "DPAD_LEFT"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/ewheel_weapon.qc:8
-msgid "eWheel"
+#: qcsrc/common/util.qc:1558
+#, c-format
+msgid "DPAD_RIGHT"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/flac.qc:14
-msgid "FLAC Cannon"
+#: qcsrc/common/util.qc:1559
+#, c-format
+msgid "START"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/flac_weapon.qc:8
-msgid "FLAC"
+#: qcsrc/common/util.qc:1560
+#, c-format
+msgid "BACK"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/fusionreactor.qc:12
-msgid "Fusion Reactor"
+#: qcsrc/common/util.qc:1561
+#, c-format
+msgid "LEFT_THUMB"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/hellion.qc:14
-msgid "Hellion Missile Turret"
+#: qcsrc/common/util.qc:1562
+#, c-format
+msgid "RIGHT_THUMB"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/hellion_weapon.qc:8
-msgid "Hellion"
+#: qcsrc/common/util.qc:1563
+#, c-format
+msgid "LEFT_SHOULDER"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/hk.qc:16
-msgid "Hunter-Killer Turret"
+#: qcsrc/common/util.qc:1564
+#, c-format
+msgid "RIGHT_SHOULDER"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/hk_weapon.qc:8
-msgid "Hunter-Killer"
+#: qcsrc/common/util.qc:1565
+#, c-format
+msgid "LEFT_TRIGGER"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/machinegun.qc:14
-msgid "Machinegun Turret"
+#: qcsrc/common/util.qc:1566
+#, c-format
+msgid "RIGHT_TRIGGER"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/machinegun_weapon.qc:8
-msgid "Machinegun"
+#: qcsrc/common/util.qc:1567
+#, c-format
+msgid "LEFT_THUMB_UP"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/mlrs.qc:14
-msgid "MLRS Turret"
+#: qcsrc/common/util.qc:1568
+#, c-format
+msgid "LEFT_THUMB_DOWN"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/mlrs_weapon.qc:8
-msgid "MLRS"
+#: qcsrc/common/util.qc:1569
+#, c-format
+msgid "LEFT_THUMB_LEFT"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/phaser.qc:14
-msgid "Phaser Cannon"
+#: qcsrc/common/util.qc:1570
+#, c-format
+msgid "LEFT_THUMB_RIGHT"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/phaser_weapon.qc:8
-msgid "Phaser"
+#: qcsrc/common/util.qc:1571
+#, c-format
+msgid "RIGHT_THUMB_UP"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/plasma.qc:14
-msgid "Plasma Cannon"
+#: qcsrc/common/util.qc:1572
+#, c-format
+msgid "RIGHT_THUMB_DOWN"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/plasma_dual.qc:6
-msgid "Dual plasma"
+#: qcsrc/common/util.qc:1573
+#, c-format
+msgid "RIGHT_THUMB_LEFT"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/plasma_dual.qc:18
-msgid "Dual Plasma Cannon"
+#: qcsrc/common/util.qc:1574
+#, c-format
+msgid "RIGHT_THUMB_RIGHT"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/plasma_weapon.qc:8
-msgid "Plasma"
+#: qcsrc/common/util.qc:1584 qcsrc/common/util.qc:1585
+#: qcsrc/common/util.qc:1586 qcsrc/common/util.qc:1587
+#, c-format
+msgid "JOY_%s"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/tesla.qc:14
-#: qcsrc/common/turrets/turret/tesla_weapon.qc:8
-msgid "Tesla Coil"
+#: qcsrc/common/util.qc:1584
+#, c-format
+msgid "UP"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/walker.qc:16
-msgid "Walker Turret"
+#: qcsrc/common/util.qc:1585
+#, c-format
+msgid "DOWN"
 msgstr ""
 
-#: qcsrc/common/turrets/turret/walker_weapon.qc:8
-msgid "Walker"
+#: qcsrc/common/util.qc:1586
+#, c-format
+msgid "LEFT"
 msgstr ""
 
-#: qcsrc/common/util.qc:338
+#: qcsrc/common/util.qc:1587
 #, c-format
-msgid "%d days, %02d:%02d:%02d"
-msgstr "%d days, %02d:%02d:%02d"
+msgid "RIGHT"
+msgstr ""
 
-#: qcsrc/common/util.qc:340
+#: qcsrc/common/util.qc:1593
 #, c-format
-msgid "%02d:%02d:%02d"
-msgstr "%02d:%02d:%02d"
+msgid "MIDINOTE%d"
+msgstr ""
 
-#: qcsrc/common/vehicles/cl_vehicles.qc:172
+#: qcsrc/common/vehicles/cl_vehicles.qc:190
 #, c-format
 msgid "Press %s"
-msgstr ""
+msgstr "Press %s"
 
-#: qcsrc/common/vehicles/cl_vehicles.qc:308
+#: qcsrc/common/vehicles/vehicle/bumblebee.qc:947
 msgid "No right gunner!"
 msgstr "No right gunner!"
 
-#: qcsrc/common/vehicles/cl_vehicles.qc:314
+#: qcsrc/common/vehicles/vehicle/bumblebee.qc:953
 msgid "No left gunner!"
 msgstr "No left gunner!"
 
-#: qcsrc/common/vehicles/vehicle/bumblebee.qc:19
+#: qcsrc/common/vehicles/vehicle/bumblebee.qh:19
 msgid "Bumblebee"
-msgstr ""
+msgstr "Bumblebee"
 
-#: qcsrc/common/vehicles/vehicle/racer.qc:18
+#: qcsrc/common/vehicles/vehicle/racer.qh:19
 msgid "Racer"
-msgstr ""
+msgstr "Racer"
 
-#: qcsrc/common/vehicles/vehicle/racer_weapon.qc:10
+#: qcsrc/common/vehicles/vehicle/racer_weapon.qh:9
 msgid "Racer cannon"
-msgstr ""
+msgstr "Racer cannon"
 
-#: qcsrc/common/vehicles/vehicle/raptor.qc:19
+#: qcsrc/common/vehicles/vehicle/raptor.qh:19
 msgid "Raptor"
-msgstr ""
+msgstr "Raptor"
 
-#: qcsrc/common/vehicles/vehicle/raptor_weapons.qc:10
+#: qcsrc/common/vehicles/vehicle/raptor_weapons.qh:9
 msgid "Raptor cannon"
-msgstr ""
+msgstr "Raptor cannon"
 
-#: qcsrc/common/vehicles/vehicle/raptor_weapons.qc:18
+#: qcsrc/common/vehicles/vehicle/raptor_weapons.qh:17
 msgid "Raptor bomb"
-msgstr ""
+msgstr "Raptor bomb"
 
-#: qcsrc/common/vehicles/vehicle/raptor_weapons.qc:26
+#: qcsrc/common/vehicles/vehicle/raptor_weapons.qh:25
 msgid "Raptor flare"
-msgstr ""
+msgstr "Raptor flare"
 
-#: qcsrc/common/vehicles/vehicle/spiderbot.qc:18
+#: qcsrc/common/vehicles/vehicle/spiderbot.qh:19
 msgid "Spiderbot"
-msgstr ""
+msgstr "Spiderbot"
 
 #: qcsrc/common/weapons/all.qh:77
-msgid "Weapons dump command only works with sv_cmd.\n"
-msgstr "Weapons dump command only works with sv_cmd.\n"
-
-#: qcsrc/common/weapons/all.qh:164
-#, c-format
-msgid "Impulse limit exceeded, weapon will not be directly accessible: %s\n"
+msgid "Weapons dump command only works with sv_cmd."
 msgstr ""
 
-#: qcsrc/common/weapons/weapon/arc.qc:16
+#: qcsrc/common/weapons/weapon/arc.qh:18
 msgid "Arc"
 msgstr "Arc"
 
-#: qcsrc/common/weapons/weapon/blaster.qc:16
+#: qcsrc/common/weapons/weapon/blaster.qh:18
 msgid "Blaster"
 msgstr "Blaster"
 
-#: qcsrc/common/weapons/weapon/crylink.qc:16
+#: qcsrc/common/weapons/weapon/crylink.qh:18
 msgid "Crylink"
 msgstr "Crylink"
 
-#: qcsrc/common/weapons/weapon/devastator.qc:16
+#: qcsrc/common/weapons/weapon/devastator.qh:18
 msgid "Devastator"
 msgstr "Devastator"
 
-#: qcsrc/common/weapons/weapon/electro.qc:16
+#: qcsrc/common/weapons/weapon/electro.qh:18
 msgid "Electro"
 msgstr "Electro"
 
-#: qcsrc/common/weapons/weapon/fireball.qc:16
+#: qcsrc/common/weapons/weapon/fireball.qh:18
 msgid "Fireball"
 msgstr "Fireball"
 
-#: qcsrc/common/weapons/weapon/hagar.qc:16
+#: qcsrc/common/weapons/weapon/hagar.qh:18
 msgid "Hagar"
 msgstr "Hagar"
 
-#: qcsrc/common/weapons/weapon/hlac.qc:16
+#: qcsrc/common/weapons/weapon/hlac.qh:18
 msgid "Heavy Laser Assault Cannon"
 msgstr "Heavy Laser Assault Cannon"
 
-#: qcsrc/common/weapons/weapon/hmg.qc:16
-msgid "Heavy Machine Gun"
-msgstr "Heavy Machine Gun"
-
-#: qcsrc/common/weapons/weapon/hook.qc:16
+#: qcsrc/common/weapons/weapon/hook.qh:18
 msgid "Grappling Hook"
 msgstr "Grappling Hook"
 
-#: qcsrc/common/weapons/weapon/machinegun.qc:16
+#: qcsrc/common/weapons/weapon/machinegun.qh:18
 msgid "MachineGun"
-msgstr ""
+msgstr "MachineGun"
 
-#: qcsrc/common/weapons/weapon/minelayer.qc:16
+#: qcsrc/common/weapons/weapon/minelayer.qh:18
 msgid "Mine Layer"
 msgstr "Mine Layer"
 
-#: qcsrc/common/weapons/weapon/mortar.qc:16
+#: qcsrc/common/weapons/weapon/mortar.qh:18
 msgid "Mortar"
 msgstr "Mortar"
 
-#: qcsrc/common/weapons/weapon/porto.qc:16
+#: qcsrc/common/weapons/weapon/porto.qh:18
 msgid "Port-O-Launch"
 msgstr "Port-O-Launch"
 
-#: qcsrc/common/weapons/weapon/rifle.qc:16
+#: qcsrc/common/weapons/weapon/rifle.qh:19
 msgid "Rifle"
 msgstr "Rifle"
 
-#: qcsrc/common/weapons/weapon/rpc.qc:16
-msgid "Rocket Propelled Chainsaw"
-msgstr "Rocket Propelled Chainsaw"
-
-#: qcsrc/common/weapons/weapon/seeker.qc:16
+#: qcsrc/common/weapons/weapon/seeker.qh:18
 msgid "T.A.G. Seeker"
 msgstr "T.A.G. Seeker"
 
-#: qcsrc/common/weapons/weapon/shockwave.qc:16
+#: qcsrc/common/weapons/weapon/shockwave.qh:18
 msgid "Shockwave"
 msgstr "Shockwave"
 
-#: qcsrc/common/weapons/weapon/shotgun.qc:16
+#: qcsrc/common/weapons/weapon/shotgun.qh:18
 msgid "Shotgun"
 msgstr "Shotgun"
 
-#: qcsrc/common/weapons/weapon/tuba.qc:17
+#: qcsrc/common/weapons/weapon/tuba.qh:18
 #, no-c-format
 msgid "@!#%'n Tuba"
 msgstr "@!#%'n Tuba"
 
-#: qcsrc/common/weapons/weapon/vaporizer.qc:16
+#: qcsrc/common/weapons/weapon/vaporizer.qh:19
 msgid "Vaporizer"
 msgstr "Vaporiser"
 
-#: qcsrc/common/weapons/weapon/vortex.qc:16
+#: qcsrc/common/weapons/weapon/vortex.qh:19
 msgid "Vortex"
 msgstr "Vortex"
 
-#: qcsrc/lib/counting.qh:10
+#: qcsrc/lib/counting.qh:9
 #, c-format
 msgid "CI_DEC^%s years"
 msgstr "CI_DEC^%s years"
@@ -4419,266 +5249,451 @@ msgstr "CI_MUL^%d years"
 msgid "CI_DEC^%s weeks"
 msgstr "CI_DEC^%s weeks"
 
-#: qcsrc/lib/counting.qh:20
+#: qcsrc/lib/counting.qh:21
 #, c-format
 msgid "CI_ZER^%d weeks"
 msgstr "CI_ZER^%d weeks"
 
-#: qcsrc/lib/counting.qh:21
+#: qcsrc/lib/counting.qh:22
 #, c-format
 msgid "CI_FIR^%d week"
 msgstr "CI_FIR^%d week"
 
-#: qcsrc/lib/counting.qh:22
+#: qcsrc/lib/counting.qh:23
 #, c-format
 msgid "CI_SEC^%d weeks"
 msgstr "CI_SEC^%d weeks"
 
-#: qcsrc/lib/counting.qh:23
+#: qcsrc/lib/counting.qh:24
 #, c-format
 msgid "CI_THI^%d weeks"
 msgstr "CI_THI^%d weeks"
 
-#: qcsrc/lib/counting.qh:24
+#: qcsrc/lib/counting.qh:25
 #, c-format
 msgid "CI_MUL^%d weeks"
 msgstr "CI_MUL^%d weeks"
 
-#: qcsrc/lib/counting.qh:26
+#: qcsrc/lib/counting.qh:27
 #, c-format
 msgid "CI_DEC^%s days"
 msgstr "CI_DEC^%s days"
 
-#: qcsrc/lib/counting.qh:28
+#: qcsrc/lib/counting.qh:30
 #, c-format
 msgid "CI_ZER^%d days"
 msgstr "CI_ZER^%d days"
 
-#: qcsrc/lib/counting.qh:29
+#: qcsrc/lib/counting.qh:31
 #, c-format
 msgid "CI_FIR^%d day"
 msgstr "CI_FIR^%d day"
 
-#: qcsrc/lib/counting.qh:30
+#: qcsrc/lib/counting.qh:32
 #, c-format
 msgid "CI_SEC^%d days"
 msgstr "CI_SEC^%d days"
 
-#: qcsrc/lib/counting.qh:31
+#: qcsrc/lib/counting.qh:33
 #, c-format
 msgid "CI_THI^%d days"
 msgstr "CI_THI^%d days"
 
-#: qcsrc/lib/counting.qh:32
+#: qcsrc/lib/counting.qh:34
 #, c-format
 msgid "CI_MUL^%d days"
 msgstr "CI_MUL^%d days"
 
-#: qcsrc/lib/counting.qh:34
+#: qcsrc/lib/counting.qh:36
 #, c-format
 msgid "CI_DEC^%s hours"
 msgstr "CI_DEC^%s hours"
 
-#: qcsrc/lib/counting.qh:36
+#: qcsrc/lib/counting.qh:39
 #, c-format
 msgid "CI_ZER^%d hours"
 msgstr "CI_ZER^%d hours"
 
-#: qcsrc/lib/counting.qh:37
+#: qcsrc/lib/counting.qh:40
 #, c-format
 msgid "CI_FIR^%d hour"
 msgstr "CI_FIR^%d hour"
 
-#: qcsrc/lib/counting.qh:38
+#: qcsrc/lib/counting.qh:41
 #, c-format
 msgid "CI_SEC^%d hours"
 msgstr "CI_SEC^%d hours"
 
-#: qcsrc/lib/counting.qh:39
+#: qcsrc/lib/counting.qh:42
 #, c-format
 msgid "CI_THI^%d hours"
 msgstr "CI_THI^%d hours"
 
-#: qcsrc/lib/counting.qh:40
+#: qcsrc/lib/counting.qh:43
 #, c-format
 msgid "CI_MUL^%d hours"
 msgstr "CI_MUL^%d hours"
 
-#: qcsrc/lib/counting.qh:43
+#: qcsrc/lib/counting.qh:46
 #, c-format
 msgid "CI_DEC^%s minutes"
 msgstr "CI_DEC^%s minutes"
 
-#: qcsrc/lib/counting.qh:45
+#: qcsrc/lib/counting.qh:49
 #, c-format
 msgid "CI_ZER^%d minutes"
 msgstr "CI_ZER^%d minutes"
 
-#: qcsrc/lib/counting.qh:46
+#: qcsrc/lib/counting.qh:50
 #, c-format
 msgid "CI_FIR^%d minute"
 msgstr "CI_FIR^%d minute"
 
-#: qcsrc/lib/counting.qh:47
+#: qcsrc/lib/counting.qh:51
 #, c-format
 msgid "CI_SEC^%d minutes"
 msgstr "CI_SEC^%d minutes"
 
-#: qcsrc/lib/counting.qh:48
+#: qcsrc/lib/counting.qh:52
 #, c-format
 msgid "CI_THI^%d minutes"
 msgstr "CI_THI^%d minutes"
 
-#: qcsrc/lib/counting.qh:49
+#: qcsrc/lib/counting.qh:53
 #, c-format
 msgid "CI_MUL^%d minutes"
 msgstr "CI_MUL^%d minutes"
 
-#: qcsrc/lib/counting.qh:51
+#: qcsrc/lib/counting.qh:55
 #, c-format
 msgid "CI_DEC^%s seconds"
 msgstr "CI_DEC^%s seconds"
 
-#: qcsrc/lib/counting.qh:53
+#: qcsrc/lib/counting.qh:58
 #, c-format
 msgid "CI_ZER^%d seconds"
 msgstr "CI_ZER^%d seconds"
 
-#: qcsrc/lib/counting.qh:54
+#: qcsrc/lib/counting.qh:59
 #, c-format
 msgid "CI_FIR^%d second"
 msgstr "CI_FIR^%d second"
 
-#: qcsrc/lib/counting.qh:55
+#: qcsrc/lib/counting.qh:60
 #, c-format
 msgid "CI_SEC^%d seconds"
 msgstr "CI_SEC^%d seconds"
 
-#: qcsrc/lib/counting.qh:56
+#: qcsrc/lib/counting.qh:61
 #, c-format
 msgid "CI_THI^%d seconds"
 msgstr "CI_THI^%d seconds"
 
-#: qcsrc/lib/counting.qh:57
+#: qcsrc/lib/counting.qh:62
 #, c-format
 msgid "CI_MUL^%d seconds"
 msgstr "CI_MUL^%d seconds"
 
-#: qcsrc/lib/counting.qh:73
+#: qcsrc/lib/counting.qh:79
 #, c-format
 msgid "%dst"
 msgstr "%dst"
 
-#: qcsrc/lib/counting.qh:74
+#: qcsrc/lib/counting.qh:80
 #, c-format
 msgid "%dnd"
 msgstr "%dnd"
 
-#: qcsrc/lib/counting.qh:75
+#: qcsrc/lib/counting.qh:81
 #, c-format
 msgid "%drd"
 msgstr "%drd"
 
-#: qcsrc/lib/counting.qh:76 qcsrc/lib/counting.qh:79
+#: qcsrc/lib/counting.qh:82 qcsrc/lib/counting.qh:85
 #, c-format
 msgid "%dth"
 msgstr "%dth"
 
-#: qcsrc/lib/oo.qh:136
+#: qcsrc/lib/oo.qh:330
 msgid "No description"
-msgstr ""
+msgstr "No description"
 
-#: qcsrc/lib/spawnfunc.qh:40
+#: qcsrc/lib/spawnfunc.qh:240
 #, c-format
 msgid ""
 "Entity field %s.%s (%s) is not whitelisted. If you believe this is an error, "
-"please file an issue.\n"
+"please file an issue."
 msgstr ""
 
-#: qcsrc/menu/command/menu_cmd.qc:46
-msgid "Usage: menu_cmd command..., where possible commands are:\n"
-msgstr "Usage: menu_cmd command..., where possible commands are:\n"
+#: qcsrc/lib/string.qh:81
+#, c-format
+msgid "%d days, %02d:%02d:%02d"
+msgstr "%d days, %02d:%02d:%02d"
 
-#: qcsrc/menu/command/menu_cmd.qc:47
-msgid "  sync - reloads all cvars on the current menu page\n"
-msgstr "  sync - reloads all cvars on the current menu page\n"
+#: qcsrc/lib/string.qh:82
+#, c-format
+msgid "%02d:%02d:%02d"
+msgstr "%02d:%02d:%02d"
 
 #: qcsrc/menu/command/menu_cmd.qc:48
-msgid "  directmenu ITEM - select a menu item as main item\n"
-msgstr "  directmenu ITEM - select a menu item as main item\n"
+msgid "Usage: menu_cmd command..., where possible commands are:"
+msgstr ""
+
+#: qcsrc/menu/command/menu_cmd.qc:49
+msgid "  sync - reloads all cvars on the current menu page"
+msgstr ""
+
+#: qcsrc/menu/command/menu_cmd.qc:50
+msgid "  directmenu ITEM - select a menu item as main item"
+msgstr ""
+
+#: qcsrc/menu/command/menu_cmd.qc:51
+msgid "  dumptree - dump the state of the menu as a tree to the console"
+msgstr ""
 
-#: qcsrc/menu/command/menu_cmd.qc:79
-msgid "Available options:\n"
-msgstr "Available options:\n"
+#: qcsrc/menu/command/menu_cmd.qc:81
+msgid "Available options:"
+msgstr ""
 
-#: qcsrc/menu/command/menu_cmd.qc:133
-msgid "Invalid command. For a list of supported commands, try menu_cmd help.\n"
+#: qcsrc/menu/command/menu_cmd.qc:130
+msgid "Invalid command. For a list of supported commands, try menu_cmd help."
 msgstr ""
-"Invalid command. For a list of supported commands, try menu_cmd help.\n"
 
-#: qcsrc/menu/item/listbox.qc:491
+#: qcsrc/menu/item/listbox.qc:413
 #, c-format
 msgid "Item %d"
 msgstr "Item %d"
 
-#: qcsrc/menu/item/textslider.qc:35 qcsrc/menu/item/textslider.qc:37
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:43
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:74
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:120
+#: qcsrc/menu/item/textslider.qc:11 qcsrc/menu/item/textslider.qc:12
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:37
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:68
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:115
 msgid "Custom"
 msgstr "Custom"
 
-#: qcsrc/menu/xonotic/campaign.qc:286
+#: qcsrc/menu/xonotic/campaign.qc:235
 #, c-format
 msgid "Level %d: %s"
 msgstr "Level %d: %s"
 
-#: qcsrc/menu/xonotic/cvarlist.qc:75
+#: qcsrc/menu/xonotic/credits.qc:4
+msgid "Core Team"
+msgstr "Core Team"
+
+#: qcsrc/menu/xonotic/credits.qc:16
+msgid "Extended Team"
+msgstr "Extended Team"
+
+#: qcsrc/menu/xonotic/credits.qc:48
+msgid "Website"
+msgstr "Website"
+
+#: qcsrc/menu/xonotic/credits.qc:53
+msgid "Stats"
+msgstr "Stats"
+
+#: qcsrc/menu/xonotic/credits.qc:57
+msgid "Art"
+msgstr "Art"
+
+#: qcsrc/menu/xonotic/credits.qc:65
+msgid "Animation"
+msgstr "Animation"
+
+#: qcsrc/menu/xonotic/credits.qc:69
+msgid "Level Design"
+msgstr "Level Design"
+
+#: qcsrc/menu/xonotic/credits.qc:92
+msgid "Music / Sound FX"
+msgstr "Music / Sound FX"
+
+#: qcsrc/menu/xonotic/credits.qc:108
+msgid "Game Code"
+msgstr "Game Code"
+
+#: qcsrc/menu/xonotic/credits.qc:116
+msgid "Marketing / PR"
+msgstr "Marketing / PR"
+
+#: qcsrc/menu/xonotic/credits.qc:122
+msgid "Legal"
+msgstr "Legal"
+
+#: qcsrc/menu/xonotic/credits.qc:127
+msgid "Game Engine"
+msgstr "Game Engine"
+
+#: qcsrc/menu/xonotic/credits.qc:131
+msgid "Engine Additions"
+msgstr "Engine Additions"
+
+#: qcsrc/menu/xonotic/credits.qc:136
+msgid "Compiler"
+msgstr "Compiler"
+
+#: qcsrc/menu/xonotic/credits.qc:142
+msgid "Other Active Contributors"
+msgstr "Other Active Contributors"
+
+#: qcsrc/menu/xonotic/credits.qc:149
+msgid "Translators"
+msgstr "Translators"
+
+#: qcsrc/menu/xonotic/credits.qc:151
+msgid "Asturian"
+msgstr "Asturian"
+
+#: qcsrc/menu/xonotic/credits.qc:156
+msgid "Belarusian"
+msgstr "Belarusian"
+
+#: qcsrc/menu/xonotic/credits.qc:159
+msgid "Bulgarian"
+msgstr "Bulgarian"
+
+#: qcsrc/menu/xonotic/credits.qc:166
+msgid "Chinese (China)"
+msgstr "Chinese (China)"
+
+#: qcsrc/menu/xonotic/credits.qc:172
+msgid "Chinese (Taiwan)"
+msgstr ""
+
+#: qcsrc/menu/xonotic/credits.qc:177
+msgid "Cornish"
+msgstr ""
+
+#: qcsrc/menu/xonotic/credits.qc:180
+msgid "Czech"
+msgstr "Czech"
+
+#: qcsrc/menu/xonotic/credits.qc:185
+msgid "Dutch"
+msgstr "Dutch"
+
+#: qcsrc/menu/xonotic/credits.qc:192
+msgid "English (Australia)"
+msgstr "English (Australia)"
+
+#: qcsrc/menu/xonotic/credits.qc:197
+msgid "Finnish"
+msgstr "Finnish"
+
+#: qcsrc/menu/xonotic/credits.qc:202
+msgid "French"
+msgstr "French"
+
+#: qcsrc/menu/xonotic/credits.qc:210
+msgid "German"
+msgstr "German"
+
+#: qcsrc/menu/xonotic/credits.qc:221
+msgid "Greek"
+msgstr "Greek"
+
+#: qcsrc/menu/xonotic/credits.qc:227
+msgid "Hungarian"
+msgstr "Hungarian"
+
+#: qcsrc/menu/xonotic/credits.qc:231
+msgid "Irish"
+msgstr ""
+
+#: qcsrc/menu/xonotic/credits.qc:234
+msgid "Italian"
+msgstr "Italian"
+
+#: qcsrc/menu/xonotic/credits.qc:240
+msgid "Kazakh"
+msgstr ""
+
+#: qcsrc/menu/xonotic/credits.qc:243
+msgid "Korean"
+msgstr ""
+
+#: qcsrc/menu/xonotic/credits.qc:247
+msgid "Polish"
+msgstr "Polish"
+
+#: qcsrc/menu/xonotic/credits.qc:255
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: qcsrc/menu/xonotic/credits.qc:261
+msgid "Romanian"
+msgstr "Romanian"
+
+#: qcsrc/menu/xonotic/credits.qc:268
+msgid "Russian"
+msgstr "Russian"
+
+#: qcsrc/menu/xonotic/credits.qc:279
+msgid "Scottish Gaelic"
+msgstr ""
+
+#: qcsrc/menu/xonotic/credits.qc:282
+msgid "Serbian"
+msgstr "Serbian"
+
+#: qcsrc/menu/xonotic/credits.qc:288
+msgid "Spanish"
+msgstr "Spanish"
+
+#: qcsrc/menu/xonotic/credits.qc:299
+msgid "Swedish"
+msgstr "Swedish"
+
+#: qcsrc/menu/xonotic/credits.qc:303
+msgid "Ukrainian"
+msgstr "Ukrainian"
+
+#: qcsrc/menu/xonotic/credits.qc:310
+msgid "Past Contributors"
+msgstr "Past Contributors"
+
+#: qcsrc/menu/xonotic/cvarlist.qc:73
 msgid "forced to be saved to config.cfg"
 msgstr "forced to be saved to config.cfg"
 
-#: qcsrc/menu/xonotic/cvarlist.qc:81 qcsrc/menu/xonotic/cvarlist.qc:91
+#: qcsrc/menu/xonotic/cvarlist.qc:79 qcsrc/menu/xonotic/cvarlist.qc:89
 msgid "will not be saved"
 msgstr "will not be saved"
 
-#: qcsrc/menu/xonotic/cvarlist.qc:86
+#: qcsrc/menu/xonotic/cvarlist.qc:84
 msgid "will be saved to config.cfg"
 msgstr "will be saved to config.cfg"
 
-#: qcsrc/menu/xonotic/cvarlist.qc:95
+#: qcsrc/menu/xonotic/cvarlist.qc:93
 msgid "private"
 msgstr "private"
 
-#: qcsrc/menu/xonotic/cvarlist.qc:97
+#: qcsrc/menu/xonotic/cvarlist.qc:95
 msgid "engine setting"
 msgstr "engine setting"
 
-#: qcsrc/menu/xonotic/cvarlist.qc:99
+#: qcsrc/menu/xonotic/cvarlist.qc:97
 msgid "read only"
 msgstr "read only"
 
-#: qcsrc/menu/xonotic/dialog_credits.qc:7
+#: qcsrc/menu/xonotic/dialog_credits.qc:13
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:38
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:298
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:85
+#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:75
+#: qcsrc/menu/xonotic/dialog_singleplayer_winner.qc:14
+msgid "OK"
+msgstr "OK"
+
+#: qcsrc/menu/xonotic/dialog_credits.qh:7
 msgid "Credits"
 msgstr "Credits"
 
-#: qcsrc/menu/xonotic/dialog_credits.qc:8
+#: qcsrc/menu/xonotic/dialog_credits.qh:8
 msgid "The Xonotic credits"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_credits.qc:24
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:46
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:300
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:92
-#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:83
-#: qcsrc/menu/xonotic/dialog_singleplayer_winner.qc:24
-msgid "OK"
-msgstr "OK"
-
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:6
-msgid "Welcome"
-msgstr "Welcome"
+msgstr "The Xonotic credits"
 
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:48
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:39
 msgid ""
 "Welcome to Xonotic, please select your language preference and enter your "
 "player name to get started.  You can change these options later through the "
@@ -4688,1275 +5703,1187 @@ msgstr ""
 "player name to get started.  You can change these options later through the "
 "menu system."
 
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:54
-#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:41
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:45
+#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28
 msgid "Name:"
 msgstr "Name:"
 
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:62
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:53
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:53
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:60
 msgid "Name under which you will appear in the game"
-msgstr ""
+msgstr "Name under which you will appear in the game"
 
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:78
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:69
 msgid "Text language:"
 msgstr "Text language:"
 
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:87
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:78
 msgid "Allow player statistics to use your nickname at stats.xonotic.org?"
 msgstr "Allow player statistics to use your nickname at stats.xonotic.org?"
 
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:91
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:26
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:26
-#: qcsrc/menu/xonotic/dialog_quit.qc:24
-#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:35
-#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:25
-msgid "Yes"
-msgstr "Yes"
-
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:92
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:29
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:29
-#: qcsrc/menu/xonotic/dialog_quit.qc:26
-#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:38
-#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:26
-msgid "No"
-msgstr "No"
-
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:93
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:84
 msgid "Undecided"
-msgstr ""
+msgstr "Undecided"
 
-#: qcsrc/menu/xonotic/dialog_firstrun.qc:97
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:88
 msgid "Save settings"
 msgstr "Save settings"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:6
-msgid "Ammo Panel"
-msgstr "Ammo Panel"
+#: qcsrc/menu/xonotic/dialog_firstrun.qh:6
+msgid "Welcome"
+msgstr "Welcome"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:18
 msgid "Ammunition display:"
 msgstr "Ammunition display:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:21
 msgid "Show only current ammo type"
 msgstr "Show only current ammo type"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:31
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:51
+#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:24
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:46
 msgid "Noncurrent alpha:"
-msgstr ""
+msgstr "Noncurrent alpha:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:35
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:55
+#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:50
 msgid "Noncurrent scale:"
-msgstr ""
+msgstr "Noncurrent scale:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:39
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:31
+#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:32
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:24
 msgid "Align icon:"
 msgstr "Align icon:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:40
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:39
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:31
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:43
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:32
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:31
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:43
-#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:27
+#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:33
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:32
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:37
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:23
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:35
+#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:21
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:57
 msgid "Left"
 msgstr "Left"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:41
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:41
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:33
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:44
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:33
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:33
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:44
-#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:29
+#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc:34
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:34
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:27
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:38
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:26
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:36
+#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:23
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:59
 msgid "Right"
 msgstr "Right"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:6
-msgid "Centerprint Panel"
-msgstr "Centreprint Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_ammo.qh:6
+msgid "Ammo Panel"
+msgstr "Ammo Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:26
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:19
 msgid "Message duration:"
 msgstr "Message duration:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:30
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:23
 msgid "Fade time:"
 msgstr "Fade time:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:34
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:27
 msgid "Flip messages order"
 msgstr "Flip messages order"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:36
-#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:24
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:29
+#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:18
 msgid "Text alignment:"
 msgstr "Text alignment:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:40
-#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:28
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:69
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:33
+#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:22
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:71
 msgid "Center"
 msgstr "Centre"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:44
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:37
 msgid "Font scale:"
 msgstr "Font scale:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:6
-msgid "Chat Panel"
-msgstr "Chat Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh:6
+msgid "Centerprint Panel"
+msgstr "Centreprint Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:17
 msgid "Chat entries:"
 msgstr "Chat entries:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:20
 msgid "Chat size:"
 msgstr "Chat size:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:32
+#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:24
 msgid "Chat lifetime:"
 msgstr "Chat lifetime:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:36
+#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qc:28
 msgid "Chat beep sound"
 msgstr "Chat beep sound"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc:6
-msgid "Engine Info Panel"
-msgstr "Engine Info Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_chat.qh:6
+msgid "Chat Panel"
+msgstr "Chat Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc:16
 msgid "Engine info:"
 msgstr "Engine info:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc:19
 msgid "Use an averaging algorithm for fps"
 msgstr "Use an averaging algorithm for fps"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:6
-msgid "Health/Armor Panel"
-msgstr "Health/Armour Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qh:6
+msgid "Engine Info Panel"
+msgstr "Engine Info Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:25
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:35
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:17
+msgid "Combine health and armor"
+msgstr "Combine health and armor"
+
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:19
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:17
 msgid "Enable status bar"
 msgstr "Enable status bar"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:27
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:27
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:21
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:19
 msgid "Status bar alignment:"
 msgstr "Status bar alignment:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:35
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:45
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:35
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:45
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:29
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:39
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:27
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:37
 msgid "Inward"
 msgstr "Inwards"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:37
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:46
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:37
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:46
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:31
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:40
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:29
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:38
 msgid "Outward"
 msgstr "Outwards"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:40
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:40
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:34
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:32
 msgid "Icon alignment:"
 msgstr "Icon alignment:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:48
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc:42
 msgid "Flip health and armor positions"
 msgstr "Flip health and armour positions"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc:6
-msgid "Info Messages Panel"
-msgstr "Info Messages Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qh:6
+msgid "Health/Armor Panel"
+msgstr "Health/Armour Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc:16
 msgid "Info messages:"
 msgstr "Info messages:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc:19
 msgid "Flip align"
 msgstr "Flip align"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:6
-msgid "Items Time Panel"
-msgstr ""
+#: qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qh:6
+msgid "Info Messages Panel"
+msgstr "Info Messages Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:23
-msgid "PNL^Disabled"
-msgstr ""
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15
+#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116
+#: qcsrc/menu/xonotic/util.qc:778 qcsrc/menu/xonotic/util.qc:794
+#: qcsrc/menu/xonotic/util.qc:811
+msgid "Disable"
+msgstr "Disable"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:24
-msgid "PNL^Enabled spectating"
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17
+#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15
+msgid "Enable spectating"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:25
-msgid "PNL^Enabled even playing in warmup"
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:18
+msgid "Enable even playing in warmup"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:36
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:29
 msgid "Reduced"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:39
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:32
 msgid "Text/icon ratio:"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:42
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:35
 msgid "Hide spawned items"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:44
-msgid "Hide large armor and health"
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:37
+msgid "Hide big armor and health"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:46
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:39
 msgid "Dynamic size"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc:6
+#: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qh:6
+msgid "Items Time Panel"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_hudpanel_modicons.qh:6
 msgid "Mod Icons Panel"
 msgstr "Mod Icons Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:6
-msgid "Notification Panel"
-msgstr "Notification Panel"
-
-#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:17
 msgid "Notifications:"
 msgstr "Notifications:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:20
 msgid "Also print notifications to the console"
 msgstr "Also print notifications to the console"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:31
+#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:23
 msgid "Flip notify order"
 msgstr "Flip notify order"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:34
+#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:26
 msgid "Entry lifetime:"
 msgstr "Entry lifetime:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:38
+#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qc:30
 msgid "Entry fadetime:"
 msgstr "Entry fadetime:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:6
-msgid "Physics Panel"
-msgstr "Physics Panel"
-
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:25
-#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:24
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:24
-msgid "Panel disabled"
-msgstr "Panel disabled"
+#: qcsrc/menu/xonotic/dialog_hudpanel_notification.qh:6
+msgid "Notification Panel"
+msgstr "Notification Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:26
-msgid "Panel enabled"
-msgstr "Panel enabled"
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16
+#: qcsrc/menu/xonotic/util.qc:766
+msgid "Enable"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:27
-msgid "Panel enabled even observing"
-msgstr "Panel enabled even observing"
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:17
+msgid "Enable even observing"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:28
-msgid "Panel enabled only in Race/CTS"
-msgstr "Panel enabled only in Race/CTS"
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:18
+msgid "Enable only in Race/CTS"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:34
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:24
 msgid "Status bar"
 msgstr "Status bar"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:36
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:66
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:26
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:68
 msgid "Left align"
 msgstr "Left align"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:37
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:72
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:27
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:74
 msgid "Right align"
 msgstr "Right align"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:38
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:28
 msgid "Inward align"
 msgstr "Inward align"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:39
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:29
 msgid "Outward align"
 msgstr "Outward align"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:43
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:33
 msgid "Flip speed/acceleration positions"
 msgstr "Flip speed/acceleration positions"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:47
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:37
 msgid "Speed:"
 msgstr "Speed:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:48
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:38
 msgid "Include vertical speed"
 msgstr "Include vertical speed"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:59
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:49
 msgid "Speed unit:"
 msgstr "Speed unit:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:61
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51
 msgid "qu/s"
 msgstr "qu/s"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:62
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52
 msgid "m/s"
 msgstr "m/s"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:63
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53
 msgid "km/h"
 msgstr "km/h"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:64
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54
 msgid "mph"
 msgstr "mph"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:65
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55
 msgid "knots"
 msgstr "knots"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:67
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:57
 msgid "Show"
 msgstr "Show"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:70
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:60
 msgid "Top speed"
 msgstr "Top speed"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:76
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:66
 msgid "Acceleration:"
 msgstr "Acceleration:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:77
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:67
 msgid "Include vertical acceleration"
 msgstr "Include vertical acceleration"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc:6
+#: qcsrc/menu/xonotic/dialog_hudpanel_physics.qh:6
+msgid "Physics Panel"
+msgstr "Physics Panel"
+
+#: qcsrc/menu/xonotic/dialog_hudpanel_powerups.qh:6
 msgid "Powerups Panel"
 msgstr "Powerups Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:6
-msgid "Pressed Keys Panel"
-msgstr "Pressed Keys Panel"
-
-#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:25
-msgid "Panel enabled when spectating"
-msgstr "Panel enabled when spectating"
-
-#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:26
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:26
-msgid "Panel always enabled"
-msgstr "Panel always enabled"
+#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17
+msgid "Always enable"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:33
+#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23
 msgid "Forced aspect:"
 msgstr "Forced aspect:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc:6
+#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qh:6
+msgid "Pressed Keys Panel"
+msgstr "Pressed Keys Panel"
+
+#: qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qh:6
 msgid "Quick Menu Panel"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc:6
+#: qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qh:6
 msgid "Race Timer Panel"
 msgstr "Race Timer Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:6
-msgid "Radar Panel"
-msgstr "Radar Panel"
-
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:25
-msgid "Panel enabled in teamgames"
-msgstr "Panel enabled in teamgames"
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:16
+msgid "Enable in team games"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:32
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23
 msgid "Radar:"
 msgstr "Radar:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:35
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:46
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:85
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:78
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:129
-#: qcsrc/menu/xonotic/util.qc:766
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:26
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:68
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:107
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:54
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:87
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:103
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124
+#: qcsrc/menu/xonotic/util.qc:800
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:39
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:30
 msgid "Rotation:"
 msgstr "Rotation:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:41
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:32
 msgid "Forward"
 msgstr "Forward"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:42
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:33
 msgid "West"
 msgstr "West"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:43
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:34
 msgid "South"
 msgstr "South"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:44
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:35
 msgid "East"
 msgstr "East"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:45
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:36
 msgid "North"
 msgstr "North"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:49
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:40
 msgid "Scale:"
 msgstr "Scale:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:53
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:44
 msgid "Zoom mode:"
 msgstr "Zoom mode:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:55
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:46
 msgid "Zoomed in"
 msgstr "Zoomed in"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:56
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:47
 msgid "Zoomed out"
 msgstr "Zoomed out"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:57
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:48
 msgid "Always zoomed"
 msgstr "Always zoomed"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:58
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:49
 msgid "Never zoomed"
 msgstr "Never zoomed"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:6
-msgid "Score Panel"
-msgstr "Score Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qh:6
+msgid "Radar Panel"
+msgstr "Radar Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:17
 msgid "Score:"
 msgstr "Score:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:20
 msgid "Rankings:"
 msgstr "Rankings:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:29
+#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:21
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:58
 msgid "Off"
 msgstr "Off"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:30
+#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:22
 msgid "And me"
 msgstr "And me"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:31
+#: qcsrc/menu/xonotic/dialog_hudpanel_score.qc:23
 msgid "Pure"
 msgstr "Pure"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:6
-msgid "Timer Panel"
-msgstr "Timer Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_score.qh:6
+msgid "Score Panel"
+msgstr "Score Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16
 msgid "Timer:"
 msgstr "Timer:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:28
+#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19
 msgid "Show elapsed time"
 msgstr "Show elapsed time"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_vote.qc:6
-msgid "Vote Panel"
-msgstr "Vote Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6
+msgid "Timer Panel"
+msgstr "Timer Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_vote.qc:25
+#: qcsrc/menu/xonotic/dialog_hudpanel_vote.qc:17
 msgid "Alpha after voting:"
 msgstr "Alpha after voting:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:6
-msgid "Weapons Panel"
-msgstr "Weapons Panel"
+#: qcsrc/menu/xonotic/dialog_hudpanel_vote.qh:6
+msgid "Vote Panel"
+msgstr "Vote Panel"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:27
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:22
 msgid "Fade out after:"
 msgstr "Fade out after:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:29
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:166
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:150
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:24
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:167
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:145
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:55
 msgid "Never"
 msgstr "Never"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:31
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:26
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:35
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:30
 msgid "Fade effect:"
 msgstr "Fade effect:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:38
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:33
 msgid "EF^None"
 msgstr "EF^None"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:39
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:34
 msgid "Alpha"
 msgstr "Alpha"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:40
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:35
 msgid "Slide"
 msgstr "Slide"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:41
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:36
 msgid "EF^Both"
 msgstr "EF^Both"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:45
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:40
 msgid "Weapon icons:"
 msgstr "Weapon icons:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:48
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:43
 msgid "Show only owned weapons"
 msgstr "Show only owned weapons"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:59
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:54
 msgid "Show weapon ID as:"
 msgstr "Show weapon ID as:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:60
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:55
 msgid "SHOWAS^None"
 msgstr "SHOWAS^None"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:61
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:56
 msgid "Number"
 msgstr "Number"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:62
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:57
 msgid "Bind"
 msgstr "Bind"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:65
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:60
 msgid "Weapon ID scale:"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:70
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:66
 msgid "Show Accuracy"
 msgstr "Show Accuracy"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:71
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:67
 msgid "Show Ammo"
 msgstr "Show Ammo"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:74
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:70
 msgid "Ammo bar alpha:"
 msgstr "Ammo bar alpha:"
 
-#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:79
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc:76
 msgid "Ammo bar color:"
 msgstr "Ammo bar colour:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:6
-msgid "Panel HUD Setup"
-msgstr "Panel HUD Setup"
+#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.qh:6
+msgid "Weapons Panel"
+msgstr "Weapons Panel"
+
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:19
+msgid "HUD skins"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:22
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:173
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:32
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:42
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:25
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc:33
+msgid "Filter:"
+msgstr "Filter:"
+
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:30
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:54
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:49
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc:42
+msgid "Refresh"
+msgstr "Refresh"
+
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:33
+#: qcsrc/menu/xonotic/dialog_settings_user.qc:30
+msgid "Set skin"
+msgstr "Set skin"
+
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:37
+msgid "Save current skin"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:24
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:46
 msgid "Panel background defaults:"
 msgstr "Panel background defaults:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:26
-#: qcsrc/menu/xonotic/util.qc:741
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48
+#: qcsrc/menu/xonotic/util.qc:775
 msgid "Background:"
 msgstr "Background:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:28
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:40
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:55
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:94
-#: qcsrc/menu/xonotic/util.qc:744 qcsrc/menu/xonotic/util.qc:760
-#: qcsrc/menu/xonotic/util.qc:777
-msgid "Disable"
-msgstr "Disable"
-
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:38
-#: qcsrc/menu/xonotic/util.qc:757
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60
+#: qcsrc/menu/xonotic/util.qc:791
 msgid "Border size:"
 msgstr "Border size:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:53
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:92
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:75
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:114
 msgid "Team color:"
 msgstr "Team colour:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:61
-#: qcsrc/menu/xonotic/util.qc:783
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83
+#: qcsrc/menu/xonotic/util.qc:817
 msgid "Test team color in configure mode"
 msgstr "Test team colour in configure mode"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:64
-#: qcsrc/menu/xonotic/util.qc:786
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86
+#: qcsrc/menu/xonotic/util.qc:820
 msgid "Padding:"
 msgstr "Padding:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:71
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:93
 msgid "HUD Dock:"
 msgstr "HUD Dock:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:73
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:95
 msgid "DOCK^Disabled"
 msgstr "DOCK^Disabled"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:74
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:96
 msgid "DOCK^Small"
 msgstr "DOCK^Small"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:75
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:97
 msgid "DOCK^Medium"
 msgstr "DOCK^Medium"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:76
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:98
 msgid "DOCK^Large"
 msgstr "DOCK^Large"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:99
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:121
 msgid "Grid settings:"
 msgstr "Grid settings:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:124
 msgid "Snap panels to grid"
 msgstr "Snap panels to grid"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:105
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:127
 msgid "Grid size:"
 msgstr "Grid size:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:106
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:129
 msgid "X:"
 msgstr "X:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:112
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:136
 msgid "Y:"
 msgstr "Y:"
 
-#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:120
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:145
 msgid "Exit setup"
 msgstr "Exit setup"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:6
-msgid "Monster Tools"
-msgstr "Monster Tools"
+#: qcsrc/menu/xonotic/dialog_hudsetup_exit.qh:6
+msgid "Panel HUD Setup"
+msgstr "Panel HUD Setup"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:21
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:13
 msgid "Monster:"
 msgstr "Monster:"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:30
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:27
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:22
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:20
 msgid "Spawn"
 msgstr "Spawn"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:31
-#: qcsrc/menu/xonotic/serverlist.qc:439
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:23
+#: qcsrc/menu/xonotic/serverlist.qc:262
 msgid "Remove"
 msgstr "Remove"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:33
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:25
 msgid "Move target:"
 msgstr "Move target:"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:34
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:26
 msgid "Follow"
 msgstr "Follow"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:35
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:27
 msgid "Wander"
 msgstr "Wander"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:36
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:28
 msgid "Spawnpoint"
 msgstr "Spawnpoint"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:37
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:29
 msgid "No moving"
 msgstr "No moving"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:39
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:31
 msgid "Colors:"
 msgstr "Colours:"
 
-#: qcsrc/menu/xonotic/dialog_monstertools.qc:41
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:46
+#: qcsrc/menu/xonotic/dialog_monstertools.qc:33
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:39
 msgid "Set skin:"
 msgstr "Set skin:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer.qc:6
-msgid "Multiplayer"
-msgstr "Multiplayer"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer.qc:7
-msgid ""
-"Play online, against your friends in LAN, view demos or change player "
-"settings"
-msgstr ""
+#: qcsrc/menu/xonotic/dialog_monstertools.qh:6
+msgid "Monster Tools"
+msgstr "Monster Tools"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer.qc:21
+#: qcsrc/menu/xonotic/dialog_multiplayer.qc:14
 msgid "Servers"
 msgstr "Servers"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer.qc:22
+#: qcsrc/menu/xonotic/dialog_multiplayer.qc:15
 msgid "Find servers to play on"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer.qc:24
+#: qcsrc/menu/xonotic/dialog_multiplayer.qc:17
 msgid "Host your own game"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer.qc:25
+#: qcsrc/menu/xonotic/dialog_multiplayer.qc:18
 msgid "Media"
 msgstr "Media"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer.qc:26
+#: qcsrc/menu/xonotic/dialog_multiplayer.qc:19
 msgid "Profile"
 msgstr "Profile"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:46
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:107
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:190
-#: qcsrc/menu/xonotic/skinlist.qc:123 qcsrc/menu/xonotic/util.qc:743
-#: qcsrc/menu/xonotic/util.qc:759 qcsrc/menu/xonotic/util.qc:768
-#: qcsrc/menu/xonotic/util.qc:776 qcsrc/menu/xonotic/util.qc:788
+#: qcsrc/menu/xonotic/dialog_multiplayer.qh:6
+msgid "Multiplayer"
+msgstr "Multiplayer"
+
+#: qcsrc/menu/xonotic/dialog_multiplayer.qh:7
+msgid ""
+"Play online, against your friends in LAN, view demos or change player "
+"settings"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111
+#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:777
+#: qcsrc/menu/xonotic/util.qc:793 qcsrc/menu/xonotic/util.qc:802
+#: qcsrc/menu/xonotic/util.qc:810 qcsrc/menu/xonotic/util.qc:822
 msgid "Default"
 msgstr "Default"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:48
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:40
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:64
 msgid "Unlimited"
 msgstr "Unlimited"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:72
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:74
 msgid "Gametype"
 msgstr "Gametype"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:77
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:79
 msgid "Time limit:"
 msgstr "Time limit:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:79
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:81
 msgid "Timelimit in minutes that when hit, will end the match"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:80
-msgid "TIMLIM^Default"
-msgstr "TIMLIM^Default"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:81
-msgid "TIMLIM^1 minute"
-msgstr "TIMLIM^1 minute"
-
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:82
-msgid "TIMLIM^2 minutes"
-msgstr "TIMLIM^2 minutes"
+#, c-format
+msgid "%d minutes"
+msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:83
-msgid "TIMLIM^3 minutes"
-msgstr "TIMLIM^3 minutes"
+msgid "TIMLIM^Default"
+msgstr "TIMLIM^Default"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:84
-msgid "TIMLIM^4 minutes"
-msgstr "TIMLIM^4 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:85
-msgid "TIMLIM^5 minutes"
-msgstr "TIMLIM^5 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:86
-msgid "TIMLIM^6 minutes"
-msgstr "TIMLIM^6 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:87
-msgid "TIMLIM^7 minutes"
-msgstr "TIMLIM^7 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:88
-msgid "TIMLIM^8 minutes"
-msgstr "TIMLIM^8 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:89
-msgid "TIMLIM^9 minutes"
-msgstr "TIMLIM^9 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:90
-msgid "TIMLIM^10 minutes"
-msgstr "TIMLIM^10 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:91
-msgid "TIMLIM^15 minutes"
-msgstr "TIMLIM^15 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:92
-msgid "TIMLIM^20 minutes"
-msgstr "TIMLIM^20 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:93
-msgid "TIMLIM^25 minutes"
-msgstr "TIMLIM^25 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:94
-msgid "TIMLIM^30 minutes"
-msgstr "TIMLIM^30 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:95
-msgid "TIMLIM^40 minutes"
-msgstr "TIMLIM^40 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:96
-msgid "TIMLIM^50 minutes"
-msgstr "TIMLIM^50 minutes"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:97
-msgid "TIMLIM^60 minutes"
-msgstr "TIMLIM^60 minutes"
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:159
+msgid "1 minute"
+msgstr "1 minute"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:98
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:101
 msgid "TIMLIM^Infinite"
 msgstr "TIMLIM^Infinite"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:101
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:233
-msgid "Frag limit:"
-msgstr "Frag limit:"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:105
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:109
 msgid "Teams:"
 msgstr "Teams:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:108
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:112
 msgid "2 teams"
 msgstr "2 teams"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:109
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:113
 msgid "3 teams"
 msgstr "3 teams"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:110
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:114
 msgid "4 teams"
 msgstr "4 teams"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:113
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:117
 msgid "Player slots:"
 msgstr "Player slots:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:115
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:119
 msgid ""
 "The maximum amount of players or bots that can be connected to your server "
 "at once"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:117
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:121
 msgid "Number of bots:"
 msgstr "Number of bots:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:119
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:123
 msgid "Amount of bots on your server"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:121
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:125
 msgid "Bot skill:"
 msgstr "Bot skill:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:124
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:128
 msgid "Specify how experienced the bots will be"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:125
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:129
 msgid "Botlike"
 msgstr "Botlike"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:126
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:130
 msgid "Beginner"
 msgstr "Beginner"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:127
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:131
 msgid "You will win"
 msgstr "You will win"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:128
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:132
 msgid "You can win"
 msgstr "You can win"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:129
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:133
 msgid "You might win"
 msgstr "You might win"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:130
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:134
 msgid "Advanced"
 msgstr "Advanced"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:131
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:135
 msgid "Expert"
 msgstr "Expert"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:132
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:136
 msgid "Pro"
 msgstr "Pro"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:133
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:137
 msgid "Assassin"
 msgstr "Assassin"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:134
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:138
 msgid "Unhuman"
 msgstr "Unhuman"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:135
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:139
 msgid "Godlike"
 msgstr "Godlike"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:151
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:155
 msgid "Mutators..."
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:152
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:156
 msgid "Mutators and weapon arenas"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:161
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:165
 msgid "Maplist"
 msgstr "Maplist"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:169
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:29
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:49
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:29
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc:43
-msgid "Filter:"
-msgstr "Filter:"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:171
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:175
 msgid ""
-"Click here or Ctrl-F to provide a keyword to narrow down the maplist above. "
-"Ctrl-Delete to clear; Enter when done."
+"Click here or Ctrl-F to provide a keyword to narrow down the map list. Ctrl-"
+"Delete to clear; Enter when done."
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:181
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:184
 msgid "Add shown"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:182
-msgid "Add the maps shown in Maplist above to your selection"
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:185
+msgid "Add the maps shown in the list to your selection"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:185
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:188
 msgid "Remove shown"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:186
-msgid "Remove the maps shown in Maplist above from your selection"
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:189
+msgid "Remove the maps shown in the list from your selection"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:191
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:194
 msgid "Add all"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:192
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:195
 msgid "Add every available map to your selection"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:195
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:198
 msgid "Remove all"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:196
-msgid "Remove all the maps from your selection"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:203
-msgid "Start Multiplayer!"
-msgstr "Start Multiplayer!"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:222
-msgid "Capture limit:"
-msgstr "Capture limit:"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:223
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:224
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:228
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:229
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:230
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:231
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:232
-msgid "Point limit:"
-msgstr "Point limit:"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:225
-msgid "Lives:"
-msgstr "Lives:"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:226
-msgid "Laps:"
-msgstr "Laps:"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:227
-msgid "Goals:"
-msgstr "Goals:"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:233
-msgid "The amount of frags needed before the match will end"
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:199
+msgid "Remove all the maps from your selection"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:7
-msgid "Map Information"
-msgstr "Map Information"
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:206
+msgid "Start Multiplayer!"
+msgstr "Start Multiplayer!"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:80
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:50
 msgid "Title:"
 msgstr "Title:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:86
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:56
 msgid "Author:"
 msgstr "Author:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:92
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:62
 msgid "Game types:"
 msgstr "Game types:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:115
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:332
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257
 msgid "Close"
 msgstr "Close"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:118
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:88
 msgid "MAP^Play"
 msgstr "MAP^Play"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:11
-msgid "Mutators"
-msgstr "Mutators"
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qh:7
+msgid "Map Information"
+msgstr "Map Information"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:37
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:28
 msgid "All Weapons Arena"
 msgstr "All Weapons Arena"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:39
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:30
 msgid "Most Weapons Arena"
 msgstr "Most Weapons Arena"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:60
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:46
 #, c-format
 msgid "%s Arena"
 msgstr "%s Arena"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:67
-#: qcsrc/server/mutators/mutator_hook.qc:1
-msgid ""
-"let players spawn with the grappling hook which allows them to pull "
-"themselves up"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:74
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:172
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:57
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:163
 msgid "Dodging"
 msgstr "Dodging"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:76
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:280
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:59
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:278
 msgid "InstaGib"
 msgstr "InstaGib"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:78
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:229
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:61
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:221
 msgid "New Toys"
 msgstr "New Toys"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:80
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:285
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:63
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:283
 msgid "NIX"
 msgstr "NIX"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:82
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:233
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:65
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:225
 msgid "Rocket Flying"
 msgstr "Rocket Flying"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:84
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:225
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:67
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:217
 msgid "Invincible Projectiles"
 msgstr "Invincible Projectiles"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:88
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:295
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:71
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:293
 msgid "No start weapons"
 msgstr "No start weapons"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:90
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:208
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:73
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:200
 msgid "Low gravity"
 msgstr "Low gravity"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:92
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:179
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:75
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:170
 msgid "Cloaked"
 msgstr "Cloaked"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:94
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:77
 msgid "Hook"
 msgstr "Hook"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:96
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:186
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:79
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:178
 msgid "Midair"
 msgstr "Midair"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:100
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:237
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:81
+msgid "Melee only"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:85
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:229
 msgid "Piñata"
 msgstr "Piñata"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:102
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:242
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:87
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:234
 msgid "Weapons stay"
 msgstr "Weapons stay"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:104
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:197
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:89
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:189
 msgid "Blood loss"
 msgstr "Blood loss"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:106
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:221
-msgid "Jet pack"
-msgstr "Jet pack"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:108
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:183
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:93
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:174
 msgid "Buffs"
 msgstr "Buffs"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:110
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:95
 msgid "Overkill"
 msgstr "Overkill"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:112
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:97
 msgid "No powerups"
 msgstr "No powerups"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:114
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:99
 msgid "Powerups"
 msgstr "Powerups"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:116
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:176
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:101
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:167
 msgid "Touch explode"
 msgstr "Touch explode"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:118
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:103
+msgid "Wall jumping"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:105
 msgid "MUT^None"
 msgstr "MUT^None"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:169
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:160
 msgid "Gameplay mutators:"
 msgstr "Gameplay mutators:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:173
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:164
 msgid "Enable dodging"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:180
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:171
 msgid "All players are almost invisible"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:187
-msgid "Only possible to inflict damage on your enemy while he's airborne"
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:179
+msgid "Only possible to inflict damage on your enemy while they're airborne"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:191
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:183
 msgid "Damage done to your enemy gets added to your own health"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:196
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:188
 msgid ""
 "Amount of health below which your player gets stunned because of blood loss"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:205
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:197
 msgid "Make things fall to the ground slower, lower value means lower gravity"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:214
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:206
 msgid "Weapon & item mutators:"
 msgstr "Weapon & item mutators:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:217
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:209
 msgid "Grappling hook"
 msgstr "Grappling hook"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:218
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:210
 msgid "Players spawn with the grappling hook"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:222
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:214
 msgid "Players spawn with the jetpack"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:238
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:230
 msgid "Players will drop all weapons they possessed when they are killed"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:243
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:235
 msgid "Weapons stay after they are picked up"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:248
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:240
 msgid "Regular (no arena)"
 msgstr "Regular (no arena)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:250
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:241
+msgid ""
+"Players will be given a set of weapons at spawn as well as unlimited ammo, "
+"without weapon pickups"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:243
 msgid "Weapon arenas:"
 msgstr "Weapon arenas:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:251
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:269
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:274
-msgid ""
-"Selecting a weapon arena will give all players that weapon at spawn as well "
-"as unlimited ammo, and disable all other weapon pickups."
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:246
+msgid "Custom weapons"
 msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:268
 msgid "Most weapons"
 msgstr "Most weapons"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:273
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:272
 msgid "All weapons"
 msgstr "All weapons"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:277
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:275
 msgid "Special arenas:"
 msgstr "Special arenas:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:281
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:279
 msgid ""
 "Players will be given only one weapon, which can instantly kill the opponent "
 "with a single shot. If the player runs out of ammo, he will have 10 seconds "
@@ -5964,557 +6891,538 @@ msgid ""
 "does not inflict any damage but is good for doing trickjumps."
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:286
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:284
 msgid ""
 "No items Xonotic - instead of pickup items, everyone plays with the same "
 "weapon. After some time, a countdown will start, after which everyone will "
 "switch to another weapon."
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:290
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:288
 msgid "with blaster"
 msgstr "with blaster"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:291
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:289
 msgid "Always carry the blaster as an additional weapon in Nix"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:36
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qh:9
+msgid "Mutators"
+msgstr "Mutators"
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:39
 msgid "SRVS^Categories"
 msgstr "SRVS^Categories"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:39
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:42
 msgid "SRVS^Empty"
 msgstr "SRVS^Empty"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:40
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:43
 msgid "Show empty servers"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:44
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:47
 msgid "SRVS^Full"
 msgstr "SRVS^Full"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:45
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:48
 msgid "Show full servers that have no slots available"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:49
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:52
 msgid "Pause"
 msgstr "Pause"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:50
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:53
 msgid ""
 "Pause updating the server list to prevent servers from \"jumping around\""
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:62
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:259
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:54
+msgid "Reload the server list"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:68
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184
 msgid "Address:"
 msgstr "Address:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:73
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:79
 msgid "Info..."
 msgstr "Info..."
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:80
 msgid "Show more information about the currently highlighted server"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:79
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:339
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:85
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qh:6
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qh:6
+msgid "Disconnect"
+msgstr "Disconnect"
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:86
+msgid "Disconnect from the server"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:88
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264
 msgid "Join!"
 msgstr "Join!"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:9
-msgid "Server Information"
-msgstr "Server Information"
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114
+#: qcsrc/menu/xonotic/serverlist.qc:1044
+msgid "MOD^Default"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121
 #, c-format
 msgid "%d modified"
 msgstr "%d modified"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121
 msgid "Official"
 msgstr "Official"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:205
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129
 msgid "N/A (auth library missing, can't connect)"
 msgstr "N/A (auth library missing, can't connect)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131
 msgid "N/A (auth library missing)"
 msgstr "N/A (auth library missing)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137
 msgid "Not supported (can't connect)"
 msgstr "Not supported (can't connect)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:215
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139
 msgid "Not supported (won't encrypt)"
 msgstr "Not supported (won't encrypt)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143
 msgid "Supported (will encrypt)"
 msgstr "Supported (will encrypt)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:221
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145
 msgid "Supported (won't encrypt)"
 msgstr "Supported (won't encrypt)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:225
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149
 msgid "Requested (will encrypt)"
 msgstr "Requested (will encrypt)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151
 msgid "Requested (won't encrypt)"
 msgstr "Requested (won't encrypt)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:231
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155
 msgid "Required (can't connect)"
 msgstr "Required (can't connect)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:233
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157
 msgid "Required (will encrypt)"
 msgstr "Required (will encrypt)"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:253
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161
+msgid "Use the `crypto_aeslevel` cvar to change your preferences"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:267
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192
 msgid "Gametype:"
 msgstr "Gametype:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:272
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197
 msgid "Map:"
 msgstr "Map:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:277
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202
 msgid "Mod:"
 msgstr "Mod:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:282
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207
 msgid "Version:"
 msgstr "Version:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:287
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212
 msgid "Settings:"
 msgstr "Settings:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:294
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:326
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251
 msgid "Players:"
 msgstr "Players:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:299
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224
 msgid "Bots:"
 msgstr "Bots:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:304
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229
 msgid "Free slots:"
 msgstr "Free slots:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:310
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235
 msgid "Encryption:"
 msgstr "Encryption:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:315
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240
 msgid "ID:"
 msgstr "ID:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:320
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245
 msgid "Key:"
 msgstr "Key:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media.qc:28
+#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7
+msgid "Server Information"
+msgstr "Server Information"
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_media.qc:25
 msgid "Demos"
 msgstr "Demos"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media.qc:29
-msgid "Browse and view demos"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_media.qc:30
+#: qcsrc/menu/xonotic/dialog_multiplayer_media.qc:26
 msgid "Screenshots"
 msgstr "Screenshots"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media.qc:31
+#: qcsrc/menu/xonotic/dialog_multiplayer_media.qc:27
 msgid "Music Player"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:56
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:48
 msgid "Auto record demos"
 msgstr "Auto record demos"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:57
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc:52
-msgid "Refresh"
-msgstr "Refresh"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:65
 msgid "Timedemo"
 msgstr "Timedemo"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:66
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:58
 msgid "Benchmark how fast your computer can run the highlighted demo"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:70
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc:62
 msgid "DEMO^Play"
 msgstr "DEMO^Play"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:6
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:6
-msgid "Disconnect"
-msgstr "Disconnect"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:13
 msgid "Playing a demo will disconnect you from the current match."
 msgstr "Playing a demo will disconnect you from the current match."
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:23
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:23
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:15
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:15
 msgid "Do you really wish to disconnect now?"
 msgstr "Do you really wish to disconnect now?"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:13
 msgid "Timing a demo will disconnect you from the current match."
 msgstr "Timing a demo will disconnect you from the current match."
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:42
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:37
 msgid "MUSICPL^Add"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:45
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:40
 msgid "MUSICPL^Add all"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:49
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:44
 msgid "Set as menu track"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:53
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:48
 msgid "Reset default menu track"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:59
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:54
 msgid "Playlist:"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:60
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:55
 msgid "Random order"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:65
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:60
 msgid "MUSICPL^Stop"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:68
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:63
 msgid "MUSICPL^Play"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:71
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:66
 msgid "MUSICPL^Pause"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:74
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:69
 msgid "MUSICPL^Prev"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:77
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:72
 msgid "MUSICPL^Next"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:81
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:76
 msgid "MUSICPL^Remove"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:84
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:79
 msgid "MUSICPL^Remove all"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc:51
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc:41
 msgid "Auto screenshot scoreboard"
 msgstr "Auto screenshot scoreboard"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc:71
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc:61
 msgid "Open in the viewer"
 msgstr "Open in the viewer"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc:155
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc:137
 msgid "Reset"
 msgstr "Reset"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc:160
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc:142
 msgid "Previous"
 msgstr "Previous"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc:163
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc:145
 msgid "Next"
 msgstr "Next"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc:168
+#: qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc:150
 msgid "Slide show"
 msgstr "Slide show"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:41
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:34
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:21
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:37
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:25
+#: qcsrc/menu/xonotic/dialog_settings_user.qc:20
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:21
+msgid "Apply immediately"
+msgstr "Apply immediately"
+
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:48
 msgid "Name"
 msgstr "Name"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:69
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:77
 msgid "Model"
 msgstr "Model"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:86
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:96
 msgid "Glowing color"
 msgstr "Glowing colour"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:95
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:106
 msgid "Detail color"
 msgstr "Detail colour"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:109
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:121
 msgid "Statistics"
 msgstr "Statistics"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:113
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:125
 msgid "Allow player statistics to track your client"
 msgstr "Allow player statistics to track your client"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:116
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:129
 msgid "Allow player statistics to use your nickname"
 msgstr "Allow player statistics to use your nickname"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:131
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:145
 msgid "Country"
 msgstr "Country"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:145
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:159
 msgid "Gender:"
 msgstr "Gender:"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:147
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:160
-msgid "Undisclosed"
-msgstr "Undisclosed"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:148
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:158
-msgid "Female"
-msgstr "Female"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:149
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:159
-msgid "Male"
-msgstr "Male"
-
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:152
+#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:166
 msgid "Gender"
 msgstr "Gender"
 
-#: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:164
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:178
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:237
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:166
-msgid "Apply immediately"
-msgstr "Apply immediately"
-
-#: qcsrc/menu/xonotic/dialog_quit.qc:7
-msgid "Quit the game"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_quit.qc:21
+#: qcsrc/menu/xonotic/dialog_quit.qc:11
 msgid "Are you sure you want to quit?"
 msgstr "Are you sure you want to quit?"
 
-#: qcsrc/menu/xonotic/dialog_quit.qc:25
+#: qcsrc/menu/xonotic/dialog_quit.qc:15
 msgid "Back to work..."
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_quit.qc:27
+#: qcsrc/menu/xonotic/dialog_quit.qc:17
 msgid "I got some more fragging to do!"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:6
-msgid "Sandbox Tools"
-msgstr "Sandbox Tools"
+#: qcsrc/menu/xonotic/dialog_quit.qh:7
+msgid "Quit the game"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:22
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:15
 msgid "Model:"
 msgstr "Model:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:28
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:21
 msgid "Remove *"
 msgstr "Remove *"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:30
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:23
 msgid "Copy *"
 msgstr "Copy *"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:31
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:24
 msgid "Paste"
 msgstr "Paste"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:33
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:26
 msgid "Bone:"
 msgstr "Bone:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:38
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:31
 msgid "Set * as child"
 msgstr "Set * as child"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:39
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:32
 msgid "Attach to *"
 msgstr "Attach to *"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:41
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:34
 msgid "Detach from *"
 msgstr "Detach from *"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:44
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:37
 msgid "Visual object properties for *:"
 msgstr "Visual object properties for *:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:48
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:41
 msgid "Set alpha:"
 msgstr "Set alpha:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:51
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:44
 msgid "Set color main:"
 msgstr "Set colour main:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:53
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:46
 msgid "Set color glow:"
 msgstr "Set colour glow:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:57
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:50
 msgid "Set frame:"
 msgstr "Set frame:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:61
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:54
 msgid "Physical object properties for *:"
 msgstr "Physical object properties for *:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:63
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:56
 msgid "Set material:"
 msgstr "Set material:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:69
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:62
 msgid "Set solidity:"
 msgstr "Set solidity:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:70
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:63
 msgid "Non-solid"
 msgstr "Non-solid"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:71
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:64
 msgid "Solid"
 msgstr "Solid"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:72
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:65
 msgid "Set physics:"
 msgstr "Set physics:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:73
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:66
 msgid "Static"
 msgstr "Static"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:74
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:67
 msgid "Movable"
 msgstr "Movable"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:75
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:68
 msgid "Physical"
 msgstr "Physical"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:77
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:70
 msgid "Set scale:"
 msgstr "Set scale:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:79
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:72
 msgid "Set force:"
 msgstr "Set force:"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:83
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:76
 msgid "Claim *"
 msgstr "Claim *"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:85
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:78
 msgid "* object info"
 msgstr "* object info"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:86
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:79
 msgid "* mesh info"
 msgstr "* mesh info"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:87
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:80
 msgid "* attachment info"
 msgstr "* attachment info"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:88
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:81
 msgid "Show help"
 msgstr "Show help"
 
-#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:89
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qc:82
 msgid "* is the object you are facing"
 msgstr "* is the object you are facing"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:6
-msgid "Settings"
-msgstr "Settings"
-
-#: qcsrc/menu/xonotic/dialog_settings.qc:7
-msgid "Change the game settings"
-msgstr ""
+#: qcsrc/menu/xonotic/dialog_sandboxtools.qh:6
+msgid "Sandbox Tools"
+msgstr "Sandbox Tools"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:21
+#: qcsrc/menu/xonotic/dialog_settings.qc:18
 msgid "Video"
 msgstr "Video"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:21
-msgid "Video settings"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_settings.qc:22
+#: qcsrc/menu/xonotic/dialog_settings.qc:19
 msgid "Effects"
 msgstr "Effects"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:22
-msgid "Effects settings"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_settings.qc:23
+#: qcsrc/menu/xonotic/dialog_settings.qc:20
 msgid "Audio"
 msgstr "Audio"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:23
-msgid "Audio settings"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_settings.qc:25
+#: qcsrc/menu/xonotic/dialog_settings.qc:22
 msgid "Game"
 msgstr "Game"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:26
+#: qcsrc/menu/xonotic/dialog_settings.qc:23
 msgid "Input"
 msgstr "Input"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:26
-msgid "Input settings"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_settings.qc:27
+#: qcsrc/menu/xonotic/dialog_settings.qc:24
 msgid "User"
 msgstr "User"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:28
+#: qcsrc/menu/xonotic/dialog_settings.qc:25
+#: qcsrc/menu/xonotic/keybinder.qc:121
 msgid "Misc"
 msgstr "Misc"
 
-#: qcsrc/menu/xonotic/dialog_settings.qc:28
-msgid "Misc settings"
+#: qcsrc/menu/xonotic/dialog_settings.qh:6
+msgid "Settings"
+msgstr "Settings"
+
+#: qcsrc/menu/xonotic/dialog_settings.qh:7
+msgid "Change the game settings"
 msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:29
@@ -6561,1056 +7469,1098 @@ msgstr "Weapons:"
 msgid "New style sound attenuation"
 msgstr "New style sound attenuation"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:101
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:102
 msgid "Mute sounds when not active"
 msgstr "Mute sounds when not active"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:104
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:105
 msgid "Frequency:"
 msgstr "Frequency:"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:106
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:107
 msgid "Sound output frequency"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:107
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:108
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:108
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:109
 msgid "11.025 kHz"
 msgstr "11.025 kHz"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:109
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:110
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:110
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:111
 msgid "22.05 kHz"
 msgstr "22.05 kHz"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:111
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:112
 msgid "24 kHz"
 msgstr "24 kHz"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:112
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:113
 msgid "32 kHz"
 msgstr "32 kHz"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:113
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:114
 msgid "44.1 kHz"
 msgstr "44.1 kHz"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:114
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:115
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:117
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:119
 msgid "Channels:"
 msgstr "Channels:"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:119
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:121
 msgid "Number of channels for the sound output"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:120
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:122
 msgid "Mono"
 msgstr "Mono"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:121
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:123
 msgid "Stereo"
 msgstr "Stereo"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:122
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:124
 msgid "2.1"
 msgstr "2.1"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:123
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:125
 msgid "4"
 msgstr "4"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:124
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:126
 msgid "5"
 msgstr "5"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:125
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:127
 msgid "5.1"
 msgstr "5.1"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:126
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:128
 msgid "6.1"
 msgstr "6.1"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:127
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:129
 msgid "7.1"
 msgstr "7.1"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:131
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:134
 msgid "Swap stereo output channels"
 msgstr "Swap stereo output channels"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:132
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:135
 msgid "Swap left/right channels"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:135
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:138
 msgid "Headphone friendly mode"
 msgstr "Headphone friendly mode"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:136
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:139
 msgid ""
 "Enable spatialization (blend the right and left channel slightly to decrease "
 "stereo separation a bit for headphones)"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:140
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:143
 msgid "Hit indication sound"
 msgstr "Hit indication sound"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:141
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:144
 msgid "Play a hit indicator sound when your shot hits an enemy"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:144
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:147
 msgid "Chat message sound"
 msgstr "Chat message sound"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:147
-msgid "Play sounds when clicking or hovering over menu items"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:148
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:149
 msgid "Menu sounds"
 msgstr "Menu sounds"
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:150
+msgid "Play sounds when clicking menu items"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:151
 msgid "Focus sounds"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:155
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:152
+msgid "Play sounds when hovering over menu items too"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:156
 msgid "Time announcer:"
 msgstr "Time announcer:"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:157
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:158
 msgid "WRN^Disabled"
 msgstr "WRN^Disabled"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:158
-msgid "1 minute"
-msgstr "1 minute"
-
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:159
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:160
 msgid "5 minutes"
 msgstr "5 minutes"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:160
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:161
 msgid "WRN^Both"
 msgstr "WRN^Both"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:163
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:164
 msgid "Automatic taunts:"
 msgstr "Automatic taunts:"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:165
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:166
 msgid "Automatically taunt enemies after fragging them"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:167
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:168
 msgid "Sometimes"
 msgstr "Sometimes"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:168
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:169
 msgid "Often"
 msgstr "Often"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:169
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:152
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:170
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:147
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:57
 msgid "Always"
 msgstr "Always"
 
-#: qcsrc/menu/xonotic/dialog_settings_audio.qc:175
+#: qcsrc/menu/xonotic/dialog_settings_audio.qc:176
 msgid "Debug info about sounds"
 msgstr "Debug info about sounds"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:38
+#: qcsrc/menu/xonotic/dialog_settings_bindings_reset.qc:11
+msgid "Are you sure you want to reset all key bindings?"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_bindings_reset.qh:6
+msgid "Reset key bindings"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:41
 msgid "Quality preset:"
 msgstr "Quality preset:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:41
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:45
 msgid "PRE^OMG!"
 msgstr "PRE^OMG!"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:42
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:48
 msgid "PRE^Low"
 msgstr "PRE^Low"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:43
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:50
 msgid "PRE^Medium"
 msgstr "PRE^Medium"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:44
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:52
 msgid "PRE^Normal"
 msgstr "PRE^Normal"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:45
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:54
 msgid "PRE^High"
 msgstr "PRE^High"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:46
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:56
 msgid "PRE^Ultra"
 msgstr "PRE^Ultra"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:48
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:60
 msgid "PRE^Ultimate"
 msgstr "PRE^Ultimate"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:51
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:65
 msgid "Geometry detail:"
 msgstr "Geometry detail:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:53
-msgid "Change the smoothness of the curves on the map (default: normal)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:67
+msgid "Change the smoothness of the curves on the map"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:54
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:68
 msgid "DET^Lowest"
 msgstr "DET^Lowest"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:55
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:69
 msgid "DET^Low"
 msgstr "DET^Low"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:56
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:70
 msgid "DET^Normal"
 msgstr "DET^Normal"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:57
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:71
 msgid "DET^Good"
 msgstr "DET^Good"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:58
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:72
 msgid "DET^Best"
 msgstr "DET^Best"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:59
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:73
 msgid "DET^Insane"
 msgstr "DET^Insane"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:62
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:77
 msgid "Player detail:"
 msgstr "Player detail:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:64
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:79
 msgid "PDET^Low"
 msgstr "PDET^Low"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:65
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:80
 msgid "PDET^Medium"
 msgstr "PDET^Medium"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:66
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:81
 msgid "PDET^Normal"
 msgstr "PDET^Normal"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:67
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:82
 msgid "PDET^Good"
 msgstr "PDET^Good"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:68
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:83
 msgid "PDET^Best"
 msgstr "PDET^Best"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:71
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:87
 msgid "Texture resolution:"
 msgstr "Texture resolution:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:75
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:91
 msgid "RES^Leet"
 msgstr "RES^Leet"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:76
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:92
 msgid "RES^Lowest"
 msgstr "RES^Lowest"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:77
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:93
 msgid "RES^Very low"
 msgstr "RES^Very low"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:78
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:94
 msgid "RES^Low"
 msgstr "RES^Low"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:79
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:95
 msgid "RES^Normal"
 msgstr "RES^Normal"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:80
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:96
 msgid "RES^Good"
 msgstr "RES^Good"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:81
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:97
 msgid "RES^Best"
 msgstr "RES^Best"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:93
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:97
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:101
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:110
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:115
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:120
 msgid "Avoid lossy texture compression"
 msgstr "Avoid lossy texture compression"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:111
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:131
 msgid "Show surfaces"
 msgstr "Show surfaces"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:112
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:132
 msgid ""
 "Disable textures completely for very slow hardware. This gives a huge "
-"performance boost, but looks very ugly. (default: disabled)"
+"performance boost, but looks very ugly."
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:115
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:135
 msgid "Use lightmaps"
 msgstr "Use lightmaps"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:116
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:136
 msgid ""
 "Use high resolution lightmaps, which will look pretty but use up some extra "
-"video memory (default: enabled)"
+"video memory"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:117
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:138
 msgid "Deluxe mapping"
 msgstr "Deluxe mapping"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:118
-msgid "Use per-pixel lighting effects (default: enabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:139
+msgid "Use per-pixel lighting effects"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:120
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:141
 msgid "Gloss"
 msgstr "Gloss"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:121
-msgid ""
-"Enable the use of glossmaps on textures supporting it (default: enabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:142
+msgid "Enable the use of glossmaps on textures supporting it"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:124
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:145
 msgid "Offset mapping"
 msgstr "Offset mapping"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:125
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:146
 msgid ""
 "Offset mapping effect that will make textures with bumpmaps appear like they "
-"\"pop out\" of the flat 2D surface (default: disabled)"
+"\"pop out\" of the flat 2D surface"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:127
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:148
 msgid "Relief mapping"
 msgstr "Relief mapping"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:128
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:149
 msgid ""
-"Higher quality offset mapping, which also has a huge impact on performance "
-"(default: disabled)"
+"Higher quality offset mapping, which also has a huge impact on performance"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:131
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:152
 msgid "Reflections:"
 msgstr "Reflections:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:132
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:153
 msgid ""
 "Reflection and refraction quality, has a huge impact on performance on maps "
-"with reflecting surfaces (default: disabled)"
+"with reflecting surfaces"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:135
-msgid "Resolution of reflections/refractions (default: good)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:156
+msgid "Resolution of reflections/refractions"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:136
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:157
 msgid "Blurred"
 msgstr "Blurred"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:137
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:158
 msgid "REFL^Good"
 msgstr "REFL^Good"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:138
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:159
 msgid "Sharp"
 msgstr "Sharp"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:142
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:163
 msgid "Decals"
 msgstr "Decals"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:143
-msgid "Enable decals (bullet holes and blood) (default: enabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:164
+msgid "Enable decals (bullet holes and blood)"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:144
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:165
 msgid "Decals on models"
 msgstr "Decals on models"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:148
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:230
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:169
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:253
 msgid "Distance:"
 msgstr "Distance:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:151
-msgid "Decals further away than this will not be drawn (default: 300)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:172
+msgid "Decals further away than this will not be drawn"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:155
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:176
 msgid "Time:"
 msgstr "Time:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:158
-msgid "Time in seconds before decals fade away (default: 2)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:179
+msgid "Time in seconds before decals fade away"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:162
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:183
 msgid "Damage effects:"
 msgstr "Damage effects:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:164
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:185
 msgid "DMGFX^Disabled"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:165
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:186
 msgid "Skeletal"
 msgstr "Skeletal"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:166
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:187
 msgid "DMGFX^All"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:170
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:191
 msgid "No dynamic lighting"
 msgstr "No dynamic lighting"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:171
-msgid "Enable corona flares around certain lights (default: enabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:192
+msgid "Enable corona flares around certain lights"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:173
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:194
 msgid "Fake corona lighting"
 msgstr "Fake corona lighting"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:174
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:195
 msgid ""
 "Enable faster but uglier dynamic lights by rendering bright coronas instead "
-"of real dynamic lights (default: disabled)"
+"of real dynamic lights"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:177
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:198
 msgid "Realtime dynamic lighting"
 msgstr "Realtime dynamic lighting"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:178
-msgid ""
-"Enable rendering of dynamic lights such as explosions and rocket lights "
-"(default: enabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:199
+msgid "Enable rendering of dynamic lights such as explosions and rocket lights"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:180
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:186
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:201
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:207
 msgid "Shadows"
 msgstr "Shadows"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:181
-msgid "Enable rendering of shadows from dynamic lights (default: disabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:202
+msgid "Enable rendering of shadows from dynamic lights"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:184
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:205
 msgid "Realtime world lighting"
 msgstr "Realtime world lighting"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:185
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:206
 msgid ""
 "Enable rendering of full realtime world lighting on maps that support it. "
-"Note that this might have a big impact on performance. (default: disabled)"
+"Note that this might have a big impact on performance."
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:187
-msgid ""
-"Enable rendering of shadows from realtime world lights (default: disabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:208
+msgid "Enable rendering of shadows from realtime world lights"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:191
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:212
 msgid "Use normal maps"
 msgstr "Use normal maps"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:192
-msgid "Enable use of directional shading on textures (default: enabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:213
+msgid "Enable use of directional shading on textures"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:194
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:215
 msgid "Soft shadows"
 msgstr "Soft shadows"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:198
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:219
 msgid "Fade corona according to visibility"
 msgstr "Fade corona according to visibility"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:199
-msgid "Fade coronas according to visibility (default: enabled)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:220
+msgid "Fade coronas according to visibility"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:203
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:224
 msgid "Bloom"
 msgstr "Bloom"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:204
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:225
 msgid ""
 "Enable bloom effect, which brightens the neighboring pixels of very bright "
-"pixels. Has a big impact on performance. (default: disabled)"
+"pixels. Has a big impact on performance."
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:205
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:226
 msgid "Extra postprocessing effects"
 msgstr "Extra postprocessing effects"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:206
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:227
 msgid ""
 "Enables special postprocessing effects for when damaged or under water or "
-"using a powerup (default: disabled)"
+"using a powerup"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:211
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:232
 msgid "Motion blur strength - 0.4 recommended"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:212
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:233
 msgid "Motion blur:"
 msgstr "Motion blur:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:218
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:239
 msgid "Particles"
 msgstr "Particles"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:219
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:240
 msgid "Spawnpoint effects"
 msgstr "Spawnpoint effects"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:224
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:241
+msgid "Particles effects at all spawn points and whenever a player spawns"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:246
 msgid "Quality:"
 msgstr "Quality:"
 
-#: qcsrc/menu/xonotic/dialog_settings_effects.qc:233
-msgid "Particles further away than this will not be drawn (default: 1000)"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:249
+#: qcsrc/menu/xonotic/slider_particles.qc:13
+msgid ""
+"Multiplier for amount of particles. Less means less particles, which in turn "
+"gives for better performance"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:7
-msgid "Crosshair"
-msgstr "Crosshair"
+#: qcsrc/menu/xonotic/dialog_settings_effects.qc:256
+msgid "Particles further away than this will not be drawn"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:37
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:31
 msgid "No crosshair"
 msgstr "No crosshair"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:39
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:68
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:33
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:62
 msgid "Per weapon"
 msgstr "Per weapon"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:40
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:34
 msgid ""
 "Set a different crosshair for each weapon, good if you play without weapon "
 "models"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:54
-msgid "Crosshair size:"
-msgstr "Crosshair size:"
-
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60
-msgid "Crosshair alpha:"
-msgstr "Crosshair alpha:"
-
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:66
-msgid "Crosshair color:"
-msgstr "Crosshair color:"
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:48
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:81
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:97
+msgid "Size:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:70
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:64
 msgid "By health"
 msgstr "By health"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:82
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:76
 msgid "Use rings to indicate weapon status"
 msgstr "Use rings to indicate weapon status"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:92
-msgid "Ring alpha:"
-msgstr "Ring alpha:"
-
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:98
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:93
 msgid "Enable center crosshair dot"
 msgstr "Enable centre crosshair dot"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:102
-msgid "Dot size:"
-msgstr "Dot size:"
-
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:108
-msgid "Dot alpha:"
-msgstr "Dot alpha:"
-
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:114
-msgid "Dot color:"
-msgstr "Dot colour:"
-
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:116
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:111
 msgid "Use normal crosshair color"
 msgstr "Use normal crosshair colour"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:127
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:122
 msgid "Smooth effects of crosshairs"
 msgstr "Smooth effects of crosshairs"
 
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:125
+msgid "Hit testing:"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:128
+msgid ""
+"None: do not do hit tests for the crosshair; TrueAim: blur the crosshair "
+"when there's an obstacle between your gun and the target; Enemies: also "
+"enlarge the crosshair when you would hit an enemy"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:129
+msgid "HTTST^Disabled"
+msgstr ""
+
 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:130
+msgid "HTTST^TrueAim"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:131
+msgid "HTTST^Enemies"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:136
 msgid "Blur crosshair if the shot is obstructed"
 msgstr "Blur crosshair if the shot is obstructed"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:133
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:140
 msgid "Enlarge crosshair if targeting an enemy"
 msgstr "Enlarge crosshair if targeting an enemy"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:136
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:143
 msgid "Animate crosshair when hitting an enemy"
 msgstr "Animate crosshair when hitting an enemy"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:139
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:146
 msgid "Animate crosshair when picking up an item"
 msgstr "Animate crosshair when picking up an item"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:7
-msgid "HUD"
-msgstr "HUD"
+#: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh:7
+msgid "Crosshair"
+msgstr "Crosshair"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:57
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43
+msgid "Scoreboard"
+msgstr "Scoreboard"
+
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:48
 msgid "Fading speed:"
 msgstr "Fading speed:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:60
-msgid "Side padding:"
-msgstr "Side padding:"
-
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:66
-msgid "Show decimals in respawn countdown"
-msgstr "Show decimals in respawn countdown"
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:51
+msgid "Enable rows / columns highlighting"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:68
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:53
 msgid "Show accuracy underneath scoreboard"
 msgstr "Show accuracy underneath scoreboard"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:72
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:55
+msgid "Show team sizes:"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:56
+msgid ""
+"Team size position: Off=do not show; Left=on the left side of the scoreboard "
+"and move team scores to the right; Right=on the right of the scoreboard"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:64
 msgid "Waypoints"
 msgstr "Waypoints"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:74
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:66
 msgid "Display waypoint markers for objectives on the map"
 msgstr "Display waypoint markers for objectives on the map"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:75
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:67
 msgid "Show various gametype specific waypoints"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:81
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:73
 msgid "Control transparency of the waypoints"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:85
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:135
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:77
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:130
 msgid "Fontsize:"
 msgstr "Fontsize:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:91
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:83
 msgid "Edge offset:"
 msgstr "Edge offset:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:100
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:91
 msgid "Fade when near the crosshair"
 msgstr "Fade when near the crosshair"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:105
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:95
+msgid "Display names instead of icons"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:100
 msgid "Damage"
 msgstr "Damage"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:107
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:102
 msgid "Overlay:"
 msgstr "Overlay:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:110
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:105
 msgid "Factor:"
 msgstr "Factor:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:115
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:110
 msgid "Fade rate:"
 msgstr "Fade rate:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:123
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:118
 msgid "Player Names"
 msgstr "Player Names"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:125
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:120
 msgid "Show names above players"
 msgstr "Show names above players"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:141
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:136
 msgid "Max distance:"
 msgstr "Max distance:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:147
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:142
 msgid "Decolorize:"
 msgstr "Decolourise:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:151
-#: qcsrc/menu/xonotic/keybinder.qc:130
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:146
+#: qcsrc/menu/xonotic/keybinder.qc:114
 msgid "Teamplay"
 msgstr "Teamplay"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:159
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:154
 msgid "Only when near crosshair"
 msgstr "Only when near crosshair"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:163
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:158
 msgid "Display health and armor"
 msgstr "Display health and armour"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:168
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:163
 msgid "Damage overlay:"
 msgstr "Damage overlay:"
 
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:166
+msgid "Dynamic HUD"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:167
+msgid "HUD moves around following player's movement"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:169
+msgid "Shake the HUD when hurt"
+msgstr ""
+
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:173
-#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:6
+#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh:6
 msgid "Enter HUD editor"
 msgstr "Enter HUD editor"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:30
+#: qcsrc/menu/xonotic/dialog_settings_game_hud.qh:7
+msgid "HUD"
+msgstr "HUD"
+
+#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:21
 msgid "In order for the HUD editor to show, you must first be in game."
 msgstr "In order for the HUD editor to show, you must first be in game."
 
-#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:32
+#: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:23
 msgid "Do you wish to start a local game to set up the HUD?"
 msgstr "Do you wish to start a local game to set up the HUD?"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:7
-msgid "Messages"
-msgstr "Messages"
-
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:36
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:24
 msgid "Frag Information"
 msgstr "Frag Information"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:38
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:26
 msgid "Display information about killing sprees"
 msgstr "Display information about killing sprees"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:41
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:29
 msgid "Only display sprees if they are achievements"
 msgstr "Only display sprees if they are achievements"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:46
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:34
 msgid "Show spree information in centerprints"
 msgstr "Show spree information in centreprints"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:50
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:38
 msgid "Show spree information in death messages"
 msgstr "Show spree information in death messages"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:55
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:43
 msgid "Sprees in info messages:"
 msgstr "Sprees in info messages:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:58
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:46
 msgid "SPREES^Disabled"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:59
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:47
 msgid "Target"
 msgstr "Target"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:60
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:48
 msgid "Attacker"
 msgstr "Attacker"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:61
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:49
 msgid "SPREES^Both"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:67
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:55
 msgid "Print on a seperate line"
 msgstr "Print on a separate line"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:70
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:58
 msgid "Add extra frag information to centerprint when available"
 msgstr "Add extra frag information to centreprint when available"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:74
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:62
 msgid "Add frag location to death messages when available"
 msgstr "Add frag location to death messages when available"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:77
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:65
 msgid "Gamemode Settings"
 msgstr "Gamemode Settings"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:79
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:67
 msgid "Display capture times in Capture The Flag"
 msgstr "Display capture times in Capture The Flag"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:83
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:71
 msgid "Display name of flag stealer in Capture The Flag"
 msgstr "Display name of flag stealer in Capture The Flag"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:88
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:76
 #: qcsrc/menu/xonotic/dialog_settings_input.qc:92
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:127
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:133
 msgid "Other"
 msgstr "Other"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:90
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:78
 msgid "Display console messages in the top left corner"
 msgstr "Display console messages in the top left corner"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:92
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:80
 msgid "Display all info messages in the chatbox"
 msgstr "Display all info messages in the chatbox"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:94
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:82
 msgid "Display player statuses in the chatbox"
 msgstr "Display player statuses in the chatbox"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:98
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:86
 msgid "Powerup notifications"
 msgstr "Powerup notifications"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:101
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:89
 msgid "Weapon centerprint notifications"
 msgstr "Weapon centreprint notifications"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:104
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:92
 msgid "Weapon info message notifications"
 msgstr "Weapon info message notifications"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:108
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:96
 msgid "Announcers"
 msgstr "Announcers"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:112
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:98
 msgid "Respawn countdown sounds"
 msgstr "Respawn countdown sounds"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:116
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:101
 msgid "Killstreak sounds"
 msgstr "Killstreak sounds"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:119
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:104
 msgid "Achievement sounds"
 msgstr "Achievement sounds"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:7
-msgid "Models"
-msgstr "Models"
+#: qcsrc/menu/xonotic/dialog_settings_game_messages.qh:7
+msgid "Messages"
+msgstr "Messages"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:40
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:30
 msgid "Items"
 msgstr "Items"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:42
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:32
 msgid "Use simple 2D images instead of item models"
 msgstr "Use simple 2D images instead of item models"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:44
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:34
 msgid "Unavailable alpha:"
 msgstr "Unavailable alpha:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:47
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:37
 msgid "Unavailable color:"
 msgstr "Unavailable colour:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:49
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:39
 msgid "GHOITEMS^Black"
 msgstr "GHOITEMS^Black"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:50
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:40
 msgid "GHOITEMS^Dark"
 msgstr "GHOITEMS^Dark"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:51
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:41
 msgid "GHOITEMS^Tinted"
 msgstr "GHOITEMS^Tinted"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:52
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:42
 msgid "GHOITEMS^Normal"
 msgstr "GHOITEMS^Normal"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:53
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:43
 msgid "GHOITEMS^Blue"
 msgstr "GHOITEMS^Blue"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:59
-#: qcsrc/menu/xonotic/serverlist.qc:948
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:49
+#: qcsrc/menu/xonotic/serverlist.qc:751
 msgid "Players"
 msgstr "Players"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:61
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:51
 msgid "Force player models to mine"
 msgstr "Force player models to mine"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:63
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:53
 msgid "Force player colors to mine"
 msgstr "Force player colours to mine"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:65
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:56
+msgid "In non teamplay modes only"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:60
 msgid "Body fading:"
 msgstr "Body fading:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:68
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:63
 msgid "Gibs:"
 msgstr "Gibs:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:70
-msgid "Reduce the amount of gibs or remove them completely (default: lots)"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:71
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:65
 msgid "GIBS^None"
 msgstr "GIBS^None"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:72
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:66
 msgid "GIBS^Few"
 msgstr "GIBS^Few"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:73
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:67
 msgid "GIBS^Many"
 msgstr "GIBS^Many"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:74
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qc:68
 msgid "GIBS^Lots"
 msgstr "GIBS^Lots"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:7
-#: qcsrc/menu/xonotic/keybinder.qc:109
-msgid "View"
-msgstr "View"
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qh:7
+msgid "Models"
+msgstr "Models"
+
+#: qcsrc/menu/xonotic/dialog_settings_game_model.qh:8
+msgid "Customize how players and items are displayed in game"
+msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:35
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:26
 msgid "1st person perspective"
 msgstr "1st person perspective"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:39
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:30
 msgid "Slide to third person upon death"
 msgstr "Slide to third person upon death"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:43
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:34
 msgid "Smooth the view when landing from a jump"
 msgstr "Smooth the view when landing from a jump"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:47
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:38
 msgid "Smooth the view while crouching"
 msgstr "Smooth the view while crouching"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:51
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:42
 msgid "View waving while idle"
 msgstr "View waving while idle"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:55
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:46
 msgid "View bobbing while walking around"
 msgstr "View bobbing while walking around"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:60
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:51
 msgid "3rd person perspective"
 msgstr "3rd person perspective"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:64
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:55
 msgid "Back distance"
 msgstr "Back distance"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:70
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:61
 msgid "Up distance"
 msgstr "Up distance"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:76
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:67
 msgid "Allow passing through walls while spectating"
 msgstr "Allow passing through walls while spectating"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:79
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:70
 msgid "Field of view:"
 msgstr "Field of view:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:81
-msgid "Field of vision in degrees from 60 to 130, default is 90"
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:72
+msgid "Field of vision in degrees"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:85
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:76
 msgid "ZOOM^Zoom factor:"
 msgstr "ZOOM^Zoom factor:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:87
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:78
 msgid "How big the zoom factor is when the zoom button is pressed"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:90
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:81
 msgid "ZOOM^Zoom speed:"
 msgstr "ZOOM^Zoom speed:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:92
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:83
 msgid "How fast the view will be zoomed, disable to zoom instantly"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:101
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:92
 msgid "ZOOM^Instant"
 msgstr "ZOOM^Instant"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:105
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:96
 msgid "ZOOM^Zoom sensitivity:"
 msgstr "ZOOM^Zoom sensitivity:"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:107
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:98
 msgid ""
 "How zoom changes sensitivity, from 0 (lower sensitivity) to 1 (no "
 "sensitivity change)"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:110
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:101
 msgid "Velocity zoom"
 msgstr "Velocity zoom"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:111
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:102
 msgid "Forward movement only"
 msgstr "Forward movement only"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:115
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:106
 msgid "VZOOM^Factor"
 msgstr "VZOOM^Factor"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:122
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:113
 msgid "Display reticle 2D overlay while zooming"
 msgstr "Display reticle 2D overlay while zooming"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:125
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:116
 msgid "Release zoom when you die or respawn"
 msgstr "Release zoom when you die or respawn"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:129
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qc:120
 msgid "Release zoom when you switch weapons"
 msgstr "Release zoom when you switch weapons"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:7
-msgid "Weapons"
-msgstr "Weapons"
+#: qcsrc/menu/xonotic/dialog_settings_game_view.qh:7
+#: qcsrc/menu/xonotic/keybinder.qc:85
+msgid "View"
+msgstr "View"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:37
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:34
 msgid "Weapon Priority List (* = mutator weapon)"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:42
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:40
 msgid "Up"
 msgstr "Up"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:45
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:44
 msgid "Down"
 msgstr "Down"
 
@@ -7627,42 +8577,47 @@ msgstr ""
 msgid "Cycle through only usable weapon selections"
 msgstr "Cycle through only usable weapon selections"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:56
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:57
 msgid "Auto switch weapons on pickup"
 msgstr "Auto switch weapons on pickup"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:57
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:58
 msgid ""
 "Automatically switch to newly picked up weapons if they are better than what "
 "you are carrying"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:59
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:61
 msgid "Release attack buttons when you switch weapons"
 msgstr "Release attack buttons when you switch weapons"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:62
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:64
 msgid "Draw 1st person weapon model"
 msgstr "Draw 1st person weapon model"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:63
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:65
 msgid "Draw the weapon model"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:67
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:70
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:73
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:69
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:72
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:75
 msgid "Position of the weapon model; requires reconnect"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:78
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:80
 msgid "Gun model swaying"
 msgstr "Gun model swaying"
 
-#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:83
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:85
 msgid "Gun model bobbing"
 msgstr "Gun model bobbing"
 
+#: qcsrc/menu/xonotic/dialog_settings_game_weapons.qh:7
+#: qcsrc/menu/xonotic/keybinder.qc:51
+msgid "Weapons"
+msgstr "Weapons"
+
 #: qcsrc/menu/xonotic/dialog_settings_input.qc:34
 msgid "Key Bindings"
 msgstr "Key Bindings"
@@ -7763,26 +8718,37 @@ msgstr ""
 msgid "Use joystick input"
 msgstr "Use joystick input"
 
-#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:7
-msgid "User defined key bind"
-msgstr "User defined key bind"
-
-#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:44
+#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:31
 msgid "Command when pressed:"
 msgstr "Command when pressed:"
 
-#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:47
+#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:34
 msgid "Command when released:"
 msgstr "Command when released:"
 
-#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:50
-msgid "Save"
-msgstr "Save"
-
-#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:53
+#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:40
 msgid "Cancel"
 msgstr "Cancel"
 
+#: qcsrc/menu/xonotic/dialog_settings_input_userbind.qh:7
+msgid "User defined key bind"
+msgstr "User defined key bind"
+
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:11
+#, c-format
+msgid "%d fps"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:12
+#, c-format
+msgid "%d KB/s"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:13
+#, c-format
+msgid "%d MB/s"
+msgstr ""
+
 #: qcsrc/menu/xonotic/dialog_settings_misc.qc:27
 msgid "Network"
 msgstr "Network"
@@ -7800,7 +8766,7 @@ msgid "Bandwidth:"
 msgstr "Bandwidth:"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc.qc:36
-msgid "Specify your network speed with this slider"
+msgid "Specify your network speed"
 msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_settings_misc.qc:37
@@ -7843,1145 +8809,1052 @@ msgstr "Downloads:"
 msgid "Maximum number of concurrent HTTP/FTP downloads"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:57
-msgid "Speed (kB/s):"
-msgstr "Speed (kB/s):"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:59
-msgid "Maximum download speed"
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:56
+msgid "Download speed:"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:63
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:69
 msgid "Local latency:"
 msgstr "Local latency:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:67
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:73
 msgid "Show netgraph"
 msgstr "Show netgraph"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:68
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:74
 msgid "Show a graph of packet sizes and other information"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:70
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:76
 msgid "Client-side movement prediction"
 msgstr "Client-side movement prediction"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:71
-msgid "Enable clientside movement prediction"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:73
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:78
 msgid "Movement error compensation"
 msgstr "Movement error compensation"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:77
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:82
 msgid "Use encryption (AES) when available"
 msgstr "Use encryption (AES) when available"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:80
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:85
 msgid "Framerate"
 msgstr "Framerate"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:82
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:87
 msgid "Maximum:"
 msgstr "Maximum:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:84
-msgid "MAXFPS^5 fps"
-msgstr "MAXFPS^5 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:85
-msgid "MAXFPS^10 fps"
-msgstr "MAXFPS^10 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:86
-msgid "MAXFPS^20 fps"
-msgstr "MAXFPS^20 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:87
-msgid "MAXFPS^30 fps"
-msgstr "MAXFPS^30 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:88
-msgid "MAXFPS^40 fps"
-msgstr "MAXFPS^40 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:89
-msgid "MAXFPS^50 fps"
-msgstr "MAXFPS^50 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:90
-msgid "MAXFPS^60 fps"
-msgstr "MAXFPS^60 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:91
-msgid "MAXFPS^70 fps"
-msgstr "MAXFPS^70 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:92
-msgid "MAXFPS^100 fps"
-msgstr "MAXFPS^100 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:93
-msgid "MAXFPS^125 fps"
-msgstr "MAXFPS^125 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:94
-msgid "MAXFPS^200 fps"
-msgstr "MAXFPS^200 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:95
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:99
 msgid "MAXFPS^Unlimited"
 msgstr "MAXFPS^Unlimited"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:98
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:102
 msgid "Target:"
 msgstr "Target:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:100
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:104
 msgid "TRGT^Disabled"
 msgstr "TRGT^Disabled"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:101
-msgid "TRGT^30 fps"
-msgstr "TRGT^30 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:102
-msgid "TRGT^40 fps"
-msgstr "TRGT^40 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:103
-msgid "TRGT^50 fps"
-msgstr "TRGT^50 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:104
-msgid "TRGT^60 fps"
-msgstr "TRGT^60 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:105
-msgid "TRGT^100 fps"
-msgstr "TRGT^100 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:106
-msgid "TRGT^125 fps"
-msgstr "TRGT^125 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:107
-msgid "TRGT^200 fps"
-msgstr "TRGT^200 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:110
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:116
 msgid "Idle limit:"
 msgstr "Idle limit:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:112
-msgid "IDLFPS^10 fps"
-msgstr "IDLFPS^10 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:113
-msgid "IDLFPS^20 fps"
-msgstr "IDLFPS^20 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:114
-msgid "IDLFPS^30 fps"
-msgstr "IDLFPS^30 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:115
-msgid "IDLFPS^60 fps"
-msgstr "IDLFPS^60 fps"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:116
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:122
 msgid "IDLFPS^Unlimited"
 msgstr "IDLFPS^Unlimited"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:120
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:126
 msgid "Save processing time for other apps"
 msgstr "Save processing time for other apps"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:123
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:129
 msgid "Show frames per second"
 msgstr "Show frames per second"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:124
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:130
 msgid "Show your rendered frames per second"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:129
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:135
 msgid "Menu tooltips:"
 msgstr "Menu tooltips:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:131
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:137
 msgid ""
 "Menu tooltips: disabled, standard or advanced (also shows cvar or console "
 "command bound to the menu item)"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:132
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:138
 msgid "TLTIP^Disabled"
 msgstr "TLTIP^Disabled"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:133
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:139
 msgid "TLTIP^Standard"
 msgstr "TLTIP^Standard"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:134
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:140
 msgid "TLTIP^Advanced"
 msgstr "TLTIP^Advanced"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:137
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:143
 msgid "Show current date and time"
 msgstr "Show current date and time"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:138
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:144
 msgid "Show current date and time of day, useful on screenshots"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:141
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:147
 msgid "Enable developer mode"
 msgstr "Enable developer mode"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:145
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:151
 msgid "Advanced settings..."
 msgstr "Advanced settings..."
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:146
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:152
 msgid "Advanced settings where you can tweak every single variable of the game"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_misc.qc:151
-#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:6
+#: qcsrc/menu/xonotic/dialog_settings_misc.qc:157
+#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qh:6
 msgid "Factory reset"
 msgstr "Factory reset"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:7
-msgid "Advanced settings"
-msgstr "Advanced settings"
-
-#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:37
+#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:31
 msgid "Cvar filter:"
 msgstr "Cvar filter:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:50
+#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:38
+msgid "Modified cvars only"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:45
 msgid "Setting:"
 msgstr "Setting:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:54
+#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:49
 msgid "Type:"
 msgstr "Type:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:58
+#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:53
 msgid "Value:"
 msgstr "Value:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:78
+#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc:70
 msgid "Description:"
 msgstr "Description:"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:20
+#: qcsrc/menu/xonotic/dialog_settings_misc_cvars.qh:7
+msgid "Advanced settings"
+msgstr "Advanced settings"
+
+#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:11
 msgid "Are you sure you want to reset all settings?"
 msgstr "Are you sure you want to reset all settings?"
 
-#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:22
+#: qcsrc/menu/xonotic/dialog_settings_misc_reset.qc:13
 msgid "This will create a backup config in your data directory"
 msgstr "This will create a backup config in your data directory"
 
-#: qcsrc/menu/xonotic/dialog_settings_user.qc:29
+#: qcsrc/menu/xonotic/dialog_settings_user.qc:25
 msgid "Menu Skins"
 msgstr "Menu Skins"
 
-#: qcsrc/menu/xonotic/dialog_settings_user.qc:34
-msgid "Set skin"
-msgstr "Set skin"
-
-#: qcsrc/menu/xonotic/dialog_settings_user.qc:68
+#: qcsrc/menu/xonotic/dialog_settings_user.qc:64
 msgid "Text Language"
 msgstr "Text Language"
 
-#: qcsrc/menu/xonotic/dialog_settings_user.qc:73
+#: qcsrc/menu/xonotic/dialog_settings_user.qc:69
 msgid "Set language"
 msgstr "Set language"
 
-#: qcsrc/menu/xonotic/dialog_settings_user.qc:78
+#: qcsrc/menu/xonotic/dialog_settings_user.qc:74
 msgid "Disable gore effects and harsh language"
 msgstr "Disable gore effects and harsh language"
 
-#: qcsrc/menu/xonotic/dialog_settings_user.qc:79
-msgid ""
-"Replace blood and gibs with content that does not have any gore effects "
-"(default: disabled)"
+#: qcsrc/menu/xonotic/dialog_settings_user.qc:75
+msgid "Replace blood and gibs with content that does not have any gore effects"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:6
-msgid "Warning"
-msgstr "Warning"
-
-#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:19
+#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:10
 msgid "While connected language changes will be applied only to the menu,"
 msgstr "While connected language changes will be applied only to the menu,"
 
-#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:21
+#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:12
 msgid "full language changes will take effect starting from the next game"
 msgstr "full language changes will take effect starting from the next game"
 
-#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:25
+#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:16
 msgid "Disconnect now"
 msgstr "Disconnect now"
 
-#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:26
+#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:17
 msgid "Switch language"
 msgstr "Switch language"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:27
+#: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qh:6
+msgid "Warning"
+msgstr "Warning"
+
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:33
 msgid "Resolution:"
 msgstr "Resolution:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:30
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:37
 msgid "Font/UI size:"
 msgstr "Font/UI size:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:32
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:39
 msgid "SZ^Unreadable"
 msgstr "SZ^Unreadable"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:33
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:40
 msgid "SZ^Tiny"
 msgstr "SZ^Tiny"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:34
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:41
 msgid "SZ^Little"
 msgstr "SZ^Little"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:35
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:42
 msgid "SZ^Small"
 msgstr "SZ^Small"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:36
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:43
 msgid "SZ^Medium"
 msgstr "SZ^Medium"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:37
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:44
 msgid "SZ^Large"
 msgstr "SZ^Large"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:38
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:45
 msgid "SZ^Huge"
 msgstr "SZ^Huge"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:39
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:46
 msgid "SZ^Gigantic"
 msgstr "SZ^Gigantic"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:40
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:47
 msgid "SZ^Colossal"
 msgstr "SZ^Colossal"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:43
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:51
 msgid "Color depth:"
 msgstr "Colour depth:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:45
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:53
 msgid "How many bits per pixel (BPP) to render at, 32 is recommended"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:46
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:54
 msgid "16bit"
 msgstr "16bit"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:47
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:55
 msgid "32bit"
 msgstr "32bit"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:50
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:59
 msgid "Full screen"
 msgstr "Full screen"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:51
-msgid "Enable fullscreen mode (default: enabled)"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:52
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:61
 msgid "Vertical Synchronization"
 msgstr "Vertical Synchronization"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:53
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:62
 msgid ""
 "Enable vertical synchronization to prevent tearing, will cap your fps to the "
-"screen refresh rate (default: disabled)"
+"screen refresh rate"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:58
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:67
 msgid "Flip view horizontally"
 msgstr "Flip view horizontally"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:59
-msgid "Poor man's left handed mode (default: off)"
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:68
+msgid "Poor man's left handed mode"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:62
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:71
 msgid "Anisotropy:"
 msgstr "Anisotropy:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:64
-msgid "Anisotropic filtering quality (default: 1x)"
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:73
+msgid "Anisotropic filtering quality"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:65
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:74
 msgid "ANISO^Disabled"
 msgstr "ANISO^Disabled"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:66
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:77
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:75
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:86
 msgid "2x"
 msgstr "2x"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:67
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:78
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:76
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:87
 msgid "4x"
 msgstr "4x"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:68
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:77
 msgid "8x"
 msgstr "8x"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:69
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:78
 msgid "16x"
 msgstr "16x"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:72
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:81
 msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:75
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:84
 msgid ""
 "Enable antialiasing, which smooths the edges of 3D geometry. Note that it "
-"might decrease performance by quite a lot (default: disabled)"
+"might decrease performance by quite a lot"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:76
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:85
 msgid "AA^Disabled"
 msgstr "AA^Disabled"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:82
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:92
 msgid "High-quality frame buffer"
 msgstr "High-quality frame buffer"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:87
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:97
 msgid "Depth first:"
 msgstr "Depth first:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:89
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:99
 msgid ""
 "Eliminate overdraw by rendering a depth-only version of the scene before the "
-"normal rendering starts (default: disabled)"
+"normal rendering starts"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:90
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:100
 msgid "DF^Disabled"
 msgstr "DF^Disabled"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:91
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:101
 msgid "DF^World"
 msgstr "DF^World"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:92
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:102
 msgid "DF^All"
 msgstr "DF^All"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:95
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:105
 msgid "Vertex Buffer Objects (VBOs)"
 msgstr "Vertex Buffer Objects (VBOs)"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:98
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:108
 msgid "VBO^Off"
 msgstr "VBO^Off"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:99
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:101
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:105
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:107
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:109
+msgid "Vertices, some Tris (compatible)"
+msgstr "Vertices, some Tris (compatible)"
+
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:110
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:114
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:116
 msgid ""
 "Make use of Vertex Buffer Objects to store static geometry in video memory "
-"for faster rendering (default: Vertex and Triangles)"
+"for faster rendering"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:100
-msgid "Vertices, some Tris (compatible)"
-msgstr "Vertices, some Tris (compatible)"
-
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:104
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:113
 msgid "Vertices"
 msgstr "Vertices"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:106
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:115
 msgid "Vertices and Triangles"
 msgstr "Vertices and Triangles"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:110
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:119
 msgid "Brightness:"
 msgstr "Brightness:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:112
-msgid "Brightness of black (default: 0)"
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:121
+msgid "Brightness of black"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:114
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:123
 msgid "Contrast:"
 msgstr "Contrast:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:116
-msgid "Brightness of white (default: 1)"
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:125
+msgid "Brightness of white"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:118
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:127
 msgid "Gamma:"
 msgstr "Gamma:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:121
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:130
 msgid ""
 "Inverse gamma correction value, a brightness effect that does not affect "
-"white or black (default: 1.125)"
+"white or black"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:124
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:133
 msgid "Contrast boost:"
 msgstr "Contrast boost:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:127
-msgid "By how much to multiply the contrast in dark areas (default: 1)"
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:136
+msgid "By how much to multiply the contrast in dark areas"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:130
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:139
 msgid "Saturation:"
 msgstr "Saturation:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:133
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:142
 msgid ""
 "Saturation adjustment (0 = grayscale, 1 = normal, 2 = oversaturated), "
-"requires GLSL color control (default: 1)"
+"requires GLSL color control"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:137
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:146
 msgid "LIT^Ambient:"
 msgstr "LIT^Ambient:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:139
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:148
 msgid ""
 "Ambient lighting, if set too high it tends to make light on maps look dull "
-"and flat (default: 4)"
+"and flat"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:141
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:150
 msgid "Intensity:"
 msgstr "Intensity:"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:143
-msgid "Global rendering brightness (default: 1)"
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:152
+msgid "Global rendering brightness"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:146
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:155
 msgid "Wait for GPU to finish each frame"
 msgstr "Wait for GPU to finish each frame"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:147
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:156
 msgid ""
 "Make the CPU wait for the GPU to finish each frame, can help with some "
-"strange input or video lag on some machines (default: disabled)"
+"strange input or video lag on some machines"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:149
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:158
 msgid "Use OpenGL 2.0 shaders (GLSL)"
 msgstr "Use OpenGL 2.0 shaders (GLSL)"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:152
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:162
 msgid "Use GLSL to handle color control"
 msgstr "Use GLSL to handle colour control"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:153
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:163
 msgid ""
 "Enable use of GLSL to apply gamma correction, note that it might decrease "
-"performance by a lot (default: disabled)"
+"performance by a lot"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:158
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:168
 msgid "Psycho coloring (easter egg)"
 msgstr "Psycho colouring (Easter egg)"
 
-#: qcsrc/menu/xonotic/dialog_settings_video.qc:161
+#: qcsrc/menu/xonotic/dialog_settings_video.qc:171
 msgid "Trippy vertices (easter egg)"
 msgstr "Trippy vertices (Easter egg)"
 
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:6
-msgid "Singleplayer"
-msgstr "Singleplayer"
-
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:7
-msgid "Play the singleplayer campaign or instant action matches against bots"
-msgstr ""
-
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:119
+#: qcsrc/menu/xonotic/dialog_singleplayer.qc:110
 msgid "Instant action! (random map with bots)"
 msgstr "Instant action! (random map with bots)"
 
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:126
+#: qcsrc/menu/xonotic/dialog_singleplayer.qc:117
 msgid "???"
 msgstr "???"
 
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:139
+#: qcsrc/menu/xonotic/dialog_singleplayer.qc:130
 msgid "Campaign Difficulty:"
 msgstr "Campaign Difficulty:"
 
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:140
+#: qcsrc/menu/xonotic/dialog_singleplayer.qc:131
 msgid "CSKL^Easy"
 msgstr "CSKL^Easy"
 
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:141
+#: qcsrc/menu/xonotic/dialog_singleplayer.qc:132
 msgid "CSKL^Medium"
 msgstr "CSKL^Medium"
 
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:142
+#: qcsrc/menu/xonotic/dialog_singleplayer.qc:133
 msgid "CSKL^Hard"
 msgstr "CSKL^Hard"
 
-#: qcsrc/menu/xonotic/dialog_singleplayer.qc:144
+#: qcsrc/menu/xonotic/dialog_singleplayer.qc:135
 msgid "Start Singleplayer!"
 msgstr "Start Singleplayer!"
 
-#: qcsrc/menu/xonotic/dialog_singleplayer_winner.qc:7
+#: qcsrc/menu/xonotic/dialog_singleplayer.qh:6
+msgid "Singleplayer"
+msgstr "Singleplayer"
+
+#: qcsrc/menu/xonotic/dialog_singleplayer.qh:7
+msgid "Play the singleplayer campaign or instant action matches against bots"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_singleplayer_winner.qh:7
 msgid "Winner"
 msgstr "Winner"
 
-#: qcsrc/menu/xonotic/dialog_teamselect.qc:7
-msgid "Team Selection"
-msgstr "Team Selection"
-
-#: qcsrc/menu/xonotic/dialog_teamselect.qc:48
+#: qcsrc/menu/xonotic/dialog_teamselect.qc:32
 msgid "join 'best' team (auto-select)"
 msgstr "join 'best' team (auto-select)"
 
-#: qcsrc/menu/xonotic/dialog_teamselect.qc:49
+#: qcsrc/menu/xonotic/dialog_teamselect.qc:33
 msgid "Autoselect team (recommended)"
 msgstr ""
 
-#: qcsrc/menu/xonotic/dialog_teamselect.qc:53
+#: qcsrc/menu/xonotic/dialog_teamselect.qc:37
 msgid "red"
 msgstr "red"
 
-#: qcsrc/menu/xonotic/dialog_teamselect.qc:54
+#: qcsrc/menu/xonotic/dialog_teamselect.qc:38
 msgid "blue"
 msgstr "blue"
 
-#: qcsrc/menu/xonotic/dialog_teamselect.qc:55
+#: qcsrc/menu/xonotic/dialog_teamselect.qc:39
 msgid "yellow"
 msgstr "yellow"
 
-#: qcsrc/menu/xonotic/dialog_teamselect.qc:56
+#: qcsrc/menu/xonotic/dialog_teamselect.qc:40
 msgid "pink"
 msgstr "pink"
 
-#: qcsrc/menu/xonotic/dialog_teamselect.qc:59
+#: qcsrc/menu/xonotic/dialog_teamselect.qc:43
 msgid "spectate"
 msgstr "spectate"
 
-#: qcsrc/menu/xonotic/gametypelist.qc:99
+#: qcsrc/menu/xonotic/dialog_teamselect.qh:7
+msgid "Team Selection"
+msgstr "Team Selection"
+
+#: qcsrc/menu/xonotic/dialog_uid2name.qc:10
+msgid "Allow player statistics to use your nickname?"
+msgstr ""
+
+#: qcsrc/menu/xonotic/dialog_uid2name.qc:12
+msgid "Answering \"No\" you will appear as \"Anonymous player\""
+msgstr ""
+
+#: qcsrc/menu/xonotic/gametypelist.qc:87
 msgid "teamplay"
 msgstr "teamplay"
 
-#: qcsrc/menu/xonotic/gametypelist.qc:101
+#: qcsrc/menu/xonotic/gametypelist.qc:89
 msgid "free for all"
 msgstr "free for all"
 
-#: qcsrc/menu/xonotic/keybinder.qc:58
+#: qcsrc/menu/xonotic/keybinder.qc:35
 msgid "Moving"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:59
+#: qcsrc/menu/xonotic/keybinder.qc:36
 msgid "forward"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:60
+#: qcsrc/menu/xonotic/keybinder.qc:37
 msgid "backpedal"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:61
+#: qcsrc/menu/xonotic/keybinder.qc:38
 msgid "strafe left"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:62
+#: qcsrc/menu/xonotic/keybinder.qc:39
 msgid "strafe right"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:63
+#: qcsrc/menu/xonotic/keybinder.qc:40
 msgid "jump / swim"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:64
+#: qcsrc/menu/xonotic/keybinder.qc:41
 msgid "crouch / sink"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:65
+#: qcsrc/menu/xonotic/keybinder.qc:42
 msgid "off-hand hook"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:66
-msgid "jet pack"
+#: qcsrc/menu/xonotic/keybinder.qc:43
+msgid "jetpack"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:68
+#: qcsrc/menu/xonotic/keybinder.qc:46
 msgid "Attacking"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:69
-msgid "primary fire"
-msgstr ""
-
-#: qcsrc/menu/xonotic/keybinder.qc:70
-msgid "secondary fire"
-msgstr ""
-
-#: qcsrc/menu/xonotic/keybinder.qc:72
-msgid "Weapon switching"
+#: qcsrc/menu/xonotic/keybinder.qc:52
+msgid "WEAPON^previous"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:73
-msgid "previous"
+#: qcsrc/menu/xonotic/keybinder.qc:53
+msgid "WEAPON^next"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:74
-msgid "next"
+#: qcsrc/menu/xonotic/keybinder.qc:54
+msgid "WEAPON^previously used"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:75
-msgid "previously used"
+#: qcsrc/menu/xonotic/keybinder.qc:55
+msgid "WEAPON^best"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:76
-msgid "best"
+#: qcsrc/menu/xonotic/keybinder.qc:56
+msgid "reload"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:77
-msgid "reload"
+#: qcsrc/menu/xonotic/keybinder.qc:57
+msgid "drop weapon / throw nade"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:110
+#: qcsrc/menu/xonotic/keybinder.qc:86
 msgid "hold zoom"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:111
+#: qcsrc/menu/xonotic/keybinder.qc:87
 msgid "toggle zoom"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:112
+#: qcsrc/menu/xonotic/keybinder.qc:88
 msgid "show scores"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:113
+#: qcsrc/menu/xonotic/keybinder.qc:89
 msgid "screen shot"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:114
+#: qcsrc/menu/xonotic/keybinder.qc:90
 msgid "maximize radar"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:116
+#: qcsrc/menu/xonotic/keybinder.qc:91
+msgid "3rd person view"
+msgstr ""
+
+#: qcsrc/menu/xonotic/keybinder.qc:92
+msgid "enter spectator mode"
+msgstr ""
+
+#: qcsrc/menu/xonotic/keybinder.qc:95
 msgid "Communicate"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:117
+#: qcsrc/menu/xonotic/keybinder.qc:96
 msgid "public chat"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:118 qcsrc/menu/xonotic/keybinder.qc:131
+#: qcsrc/menu/xonotic/keybinder.qc:97 qcsrc/menu/xonotic/keybinder.qc:115
 msgid "team chat"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:119
+#: qcsrc/menu/xonotic/keybinder.qc:98
 msgid "show chat history"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:120
+#: qcsrc/menu/xonotic/keybinder.qc:99
 msgid "vote YES"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:121
+#: qcsrc/menu/xonotic/keybinder.qc:100
 msgid "vote NO"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:122
-msgid "ready"
-msgstr ""
-
-#: qcsrc/menu/xonotic/keybinder.qc:124
+#: qcsrc/menu/xonotic/keybinder.qc:104
 msgid "Client"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:125
-msgid "server info"
-msgstr ""
-
-#: qcsrc/menu/xonotic/keybinder.qc:126
+#: qcsrc/menu/xonotic/keybinder.qc:108
 msgid "enter console"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:127
+#: qcsrc/menu/xonotic/keybinder.qc:110
 msgid "disconnect"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:128
+#: qcsrc/menu/xonotic/keybinder.qc:111
 msgid "quit"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:132
+#: qcsrc/menu/xonotic/keybinder.qc:116
 msgid "auto-join team"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:133
-msgid "team menu"
-msgstr ""
-
-#: qcsrc/menu/xonotic/keybinder.qc:134
-msgid "sandbox menu"
+#: qcsrc/menu/xonotic/keybinder.qc:118
+msgid "drop key / drop flag"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:135
-msgid "enter spectator mode"
+#: qcsrc/menu/xonotic/keybinder.qc:122
+msgid "respawn"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:136
-msgid "drop weapon"
+#: qcsrc/menu/xonotic/keybinder.qc:123
+msgid "quick menu"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:137
-msgid "drop key / drop flag"
+#: qcsrc/menu/xonotic/keybinder.qc:124
+msgid "sandbox menu"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:138
+#: qcsrc/menu/xonotic/keybinder.qc:125
 msgid "drag object"
 msgstr ""
 
-#: qcsrc/menu/xonotic/keybinder.qc:139
-msgid "3rd person view"
-msgstr ""
-
-#: qcsrc/menu/xonotic/keybinder.qc:141
+#: qcsrc/menu/xonotic/keybinder.qc:128
 msgid "User defined"
 msgstr ""
 
-#: qcsrc/menu/xonotic/mainwindow.qc:42 qcsrc/menu/xonotic/mainwindow.qc:45
+#: qcsrc/menu/xonotic/mainwindow.qc:65 qcsrc/menu/xonotic/mainwindow.qc:68
 msgid "Do not press this button again!"
 msgstr "Do not press this button again!"
 
-#: qcsrc/menu/xonotic/maplist.qc:343
+#: qcsrc/menu/xonotic/maplist.qc:288
 msgid ""
-"Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n"
+"Huh? Can't play this (m is NULL). Refiltering so this won't happen again."
 msgstr ""
-"Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n"
 
-#: qcsrc/menu/xonotic/maplist.qc:351
+#: qcsrc/menu/xonotic/maplist.qc:296
 #, c-format
 msgid "%s's Xonotic Server"
 msgstr "%s's Xonotic Server"
 
-#: qcsrc/menu/xonotic/maplist.qc:356
+#: qcsrc/menu/xonotic/maplist.qc:301
 msgid ""
 "Huh? Can't play this (invalid game type). Refiltering so this won't happen "
-"again.\n"
+"again."
 msgstr ""
-"Huh? Can't play this (invalid game type). Refiltering so this won't happen "
-"again.\n"
 
-#: qcsrc/menu/xonotic/playerlist.qc:122 qcsrc/menu/xonotic/playerlist.qc:132
+#: qcsrc/menu/xonotic/playerlist.qc:102 qcsrc/menu/xonotic/playerlist.qc:112
 msgid "spectator"
 msgstr "spectator"
 
-#: qcsrc/menu/xonotic/playermodel.qc:189
+#: qcsrc/menu/xonotic/playermodel.qc:161
 msgid "<no model found>"
 msgstr "<no model found>"
 
-#: qcsrc/menu/xonotic/serverlist.qc:149
+#: qcsrc/menu/xonotic/serverlist.qc:267
+msgid "Favorite"
+msgstr "Favourite"
+
+#: qcsrc/menu/xonotic/serverlist.qc:268
+msgid ""
+"Bookmark the currently highlighted server so that it's faster to find in the "
+"future"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:747
+msgid "Ping"
+msgstr "Ping"
+
+#: qcsrc/menu/xonotic/serverlist.qc:748
+msgid "Hostname"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:749
+msgid "Map"
+msgstr "Map"
+
+#: qcsrc/menu/xonotic/serverlist.qc:750
+msgid "Type"
+msgstr "Type"
+
+#: qcsrc/menu/xonotic/serverlist.qc:1043
+#, c-format
+msgid "AES level %d"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:1043
+msgid "ENC^none"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:1043
+msgid "encryption:"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:1044
+#, c-format
+msgid "mod: %s"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:1046
+#, c-format
+msgid "modified settings"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:1046
+#, c-format
+msgid "official settings"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:1048
+msgid "stats disabled"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qc:1048
+msgid "stats enabled"
+msgstr ""
+
+#: qcsrc/menu/xonotic/serverlist.qh:152
 msgid "SLCAT^Favorites"
 msgstr "SLCAT^Favourites"
 
-#: qcsrc/menu/xonotic/serverlist.qc:150
+#: qcsrc/menu/xonotic/serverlist.qh:153
 msgid "SLCAT^Recommended"
 msgstr "SLCAT^Recommended"
 
-#: qcsrc/menu/xonotic/serverlist.qc:151
+#: qcsrc/menu/xonotic/serverlist.qh:154
 msgid "SLCAT^Normal Servers"
 msgstr "SLCAT^Normal Servers"
 
-#: qcsrc/menu/xonotic/serverlist.qc:152
+#: qcsrc/menu/xonotic/serverlist.qh:155
 msgid "SLCAT^Servers"
 msgstr "SLCAT^Servers"
 
-#: qcsrc/menu/xonotic/serverlist.qc:153
+#: qcsrc/menu/xonotic/serverlist.qh:156
 msgid "SLCAT^Competitive Mode"
 msgstr "SLCAT^Competitive Mode"
 
-#: qcsrc/menu/xonotic/serverlist.qc:154
+#: qcsrc/menu/xonotic/serverlist.qh:157
 msgid "SLCAT^Modified Servers"
 msgstr "SLCAT^Modified Servers"
 
-#: qcsrc/menu/xonotic/serverlist.qc:155
-msgid "SLCAT^Overkill Mode"
-msgstr "SLCAT^Overkill Mode"
+#: qcsrc/menu/xonotic/serverlist.qh:158
+msgid "SLCAT^Overkill"
+msgstr ""
 
-#: qcsrc/menu/xonotic/serverlist.qc:156
-msgid "SLCAT^InstaGib Mode"
-msgstr "SLCAT^InstaGib Mode"
+#: qcsrc/menu/xonotic/serverlist.qh:159
+msgid "SLCAT^InstaGib"
+msgstr ""
 
-#: qcsrc/menu/xonotic/serverlist.qc:157
+#: qcsrc/menu/xonotic/serverlist.qh:160
 msgid "SLCAT^Defrag Mode"
 msgstr "SLCAT^Defrag Mode"
 
-#: qcsrc/menu/xonotic/serverlist.qc:444
-msgid "Favorite"
-msgstr "Favourite"
-
-#: qcsrc/menu/xonotic/serverlist.qc:445
-msgid ""
-"Bookmark the currently highlighted server so that it's faster to find in the "
-"future"
-msgstr ""
-
-#: qcsrc/menu/xonotic/serverlist.qc:944
-msgid "Ping"
-msgstr "Ping"
-
-#: qcsrc/menu/xonotic/serverlist.qc:945
-msgid "Host name"
-msgstr "Host name"
-
-#: qcsrc/menu/xonotic/serverlist.qc:946
-msgid "Map"
-msgstr "Map"
-
-#: qcsrc/menu/xonotic/serverlist.qc:947
-msgid "Type"
-msgstr "Type"
-
-#: qcsrc/menu/xonotic/skinlist.qc:105
+#: qcsrc/menu/xonotic/skinlist.qc:70
 msgid "<TITLE>"
 msgstr "<TITLE>"
 
-#: qcsrc/menu/xonotic/skinlist.qc:106
+#: qcsrc/menu/xonotic/skinlist.qc:71
 msgid "<AUTHOR>"
 msgstr "<AUTHOR>"
 
-#: qcsrc/menu/xonotic/slider_decibels.qc:84
+#: qcsrc/menu/xonotic/slider_decibels.qc:72
 msgid "VOL^MAX"
 msgstr "VOL^MAX"
 
-#: qcsrc/menu/xonotic/slider_decibels.qc:86
+#: qcsrc/menu/xonotic/slider_decibels.qc:74
 msgid "VOL^OFF"
 msgstr "VOL^OFF"
 
-#: qcsrc/menu/xonotic/slider_decibels.qc:94
+#: qcsrc/menu/xonotic/slider_decibels.qc:82
 #, c-format
 msgid "%s dB"
 msgstr "%s dB"
 
-#: qcsrc/menu/xonotic/slider_particles.qc:23
-msgid ""
-"Multiplier for amount of particles. Less means less particles, which in turn "
-"gives for better performance (default: 1)"
-msgstr ""
-
-#: qcsrc/menu/xonotic/slider_particles.qc:24
+#: qcsrc/menu/xonotic/slider_particles.qc:14
 msgid "PART^OMG"
 msgstr "PART^OMG"
 
-#: qcsrc/menu/xonotic/slider_particles.qc:25
+#: qcsrc/menu/xonotic/slider_particles.qc:15
 msgid "PART^Low"
 msgstr "PART^Low"
 
-#: qcsrc/menu/xonotic/slider_particles.qc:26
+#: qcsrc/menu/xonotic/slider_particles.qc:16
 msgid "PART^Medium"
 msgstr "PART^Medium"
 
-#: qcsrc/menu/xonotic/slider_particles.qc:27
-#: qcsrc/menu/xonotic/slider_sbfadetime.qc:24
+#: qcsrc/menu/xonotic/slider_particles.qc:17
+#: qcsrc/menu/xonotic/slider_sbfadetime.qc:14
 msgid "PART^Normal"
 msgstr "PART^Normal"
 
-#: qcsrc/menu/xonotic/slider_particles.qc:28
+#: qcsrc/menu/xonotic/slider_particles.qc:18
 msgid "PART^High"
 msgstr "PART^High"
 
-#: qcsrc/menu/xonotic/slider_particles.qc:29
+#: qcsrc/menu/xonotic/slider_particles.qc:19
 msgid "PART^Ultra"
 msgstr "PART^Ultra"
 
-#: qcsrc/menu/xonotic/slider_particles.qc:30
+#: qcsrc/menu/xonotic/slider_particles.qc:20
 msgid "PART^Ultimate"
 msgstr "PART^Ultimate"
 
-#: qcsrc/menu/xonotic/slider_picmip.qc:24
+#: qcsrc/menu/xonotic/slider_picmip.qc:13
 msgid ""
 "Change the sharpness of the textures. Lowering it will effectively reduce "
-"texture memory usage, but make the textures appear very blurry. (default: "
-"good)"
+"texture memory usage, but make the textures appear very blurry."
 msgstr ""
 
-#: qcsrc/menu/xonotic/slider_resolution.qc:124
-#, c-format
-msgid "%dx%d (%d:%d)"
-msgstr "%dx%d (%d:%d)"
-
-#: qcsrc/menu/xonotic/slider_resolution.qc:127
-#, c-format
-msgid "%dx%d"
-msgstr "%dx%d"
-
-#: qcsrc/menu/xonotic/slider_resolution.qc:133
+#: qcsrc/menu/xonotic/slider_resolution.qc:115
 msgid "Screen resolution"
 msgstr ""
 
-#: qcsrc/menu/xonotic/slider_sbfadetime.qc:23
+#: qcsrc/menu/xonotic/slider_sbfadetime.qc:13
 msgid "PART^Slow"
 msgstr "PART^Slow"
 
-#: qcsrc/menu/xonotic/slider_sbfadetime.qc:25
+#: qcsrc/menu/xonotic/slider_sbfadetime.qc:15
 msgid "PART^Fast"
 msgstr "PART^Fast"
 
-#: qcsrc/menu/xonotic/slider_sbfadetime.qc:26
+#: qcsrc/menu/xonotic/slider_sbfadetime.qc:16
 msgid "PART^Instant"
 msgstr "PART^Instant"
 
-#: qcsrc/menu/xonotic/statslist.qc:59
+#: qcsrc/menu/xonotic/statslist.qc:29
 msgid "January"
 msgstr "January"
 
-#: qcsrc/menu/xonotic/statslist.qc:60
+#: qcsrc/menu/xonotic/statslist.qc:30
 msgid "February"
 msgstr "February"
 
-#: qcsrc/menu/xonotic/statslist.qc:61
+#: qcsrc/menu/xonotic/statslist.qc:31
 msgid "March"
 msgstr "March"
 
-#: qcsrc/menu/xonotic/statslist.qc:62
+#: qcsrc/menu/xonotic/statslist.qc:32
 msgid "April"
 msgstr "April"
 
-#: qcsrc/menu/xonotic/statslist.qc:63
+#: qcsrc/menu/xonotic/statslist.qc:33
 msgid "May"
 msgstr "May"
 
-#: qcsrc/menu/xonotic/statslist.qc:64
+#: qcsrc/menu/xonotic/statslist.qc:34
 msgid "June"
 msgstr "June"
 
-#: qcsrc/menu/xonotic/statslist.qc:65
+#: qcsrc/menu/xonotic/statslist.qc:35
 msgid "July"
 msgstr "July"
 
-#: qcsrc/menu/xonotic/statslist.qc:66
+#: qcsrc/menu/xonotic/statslist.qc:36
 msgid "August"
 msgstr "August"
 
-#: qcsrc/menu/xonotic/statslist.qc:67
+#: qcsrc/menu/xonotic/statslist.qc:37
 msgid "September"
 msgstr "September"
 
-#: qcsrc/menu/xonotic/statslist.qc:68
+#: qcsrc/menu/xonotic/statslist.qc:38
 msgid "October"
 msgstr "October"
 
-#: qcsrc/menu/xonotic/statslist.qc:69
+#: qcsrc/menu/xonotic/statslist.qc:39
 msgid "November"
 msgstr "November"
 
-#: qcsrc/menu/xonotic/statslist.qc:70
+#: qcsrc/menu/xonotic/statslist.qc:40
 msgid "December"
 msgstr "December"
 
-#: qcsrc/menu/xonotic/statslist.qc:126
+#: qcsrc/menu/xonotic/statslist.qc:96
 msgid "Joined:"
 msgstr "Joined:"
 
-#: qcsrc/menu/xonotic/statslist.qc:133
-msgid "Last_Seen:"
-msgstr "Last_Seen:"
+#: qcsrc/menu/xonotic/statslist.qc:103
+msgid "Last match:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/statslist.qc:140
-msgid "Time_Played:"
-msgstr "Time_Played:"
+#: qcsrc/menu/xonotic/statslist.qc:110
+msgid "Time played:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/statslist.qc:147
-msgid "Favorite_Map:"
-msgstr "Favourite_Map:"
+#: qcsrc/menu/xonotic/statslist.qc:117 qcsrc/menu/xonotic/statslist.qc:230
+msgid "Favorite map:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/statslist.qc:231 qcsrc/menu/xonotic/statslist.qc:275
+#: qcsrc/menu/xonotic/statslist.qc:149 qcsrc/menu/xonotic/statslist.qc:201
+#: qcsrc/menu/xonotic/statslist.qc:244
 #, c-format
-msgid "%s_Matches:"
-msgstr "%s_Matches:"
+msgid "Matches:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/statslist.qc:238
+#: qcsrc/menu/xonotic/statslist.qc:154
 #, c-format
-msgid "%s_ELO:"
-msgstr "%s_ELO:"
+msgid "Wins/Losses:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/statslist.qc:245
+#: qcsrc/menu/xonotic/statslist.qc:155
 #, c-format
-msgid "%s_Rank:"
-msgstr "%s_Rank:"
+msgid "Win percentage:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/statslist.qc:252
+#: qcsrc/menu/xonotic/statslist.qc:166
 #, c-format
-msgid "%s_Percentile:"
-msgstr "%s_Percentile:"
+msgid "Kills/Deaths:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/statslist.qc:261
+#: qcsrc/menu/xonotic/statslist.qc:172
 #, c-format
-msgid "%s_Favorite_Map:"
-msgstr "%s_Favourite_Map:"
+msgid "Kill ratio:"
+msgstr ""
+
+#: qcsrc/menu/xonotic/statslist.qc:207
+msgid "ELO:"
+msgstr ""
 
-#: qcsrc/menu/xonotic/statslist.qc:276
+#: qcsrc/menu/xonotic/statslist.qc:214
+msgid "Rank:"
+msgstr ""
+
+#: qcsrc/menu/xonotic/statslist.qc:221
+msgid "Percentile:"
+msgstr ""
+
+#: qcsrc/menu/xonotic/statslist.qc:246
 #, c-format
 msgid "%d (unranked)"
 msgstr "%d (unranked)"
 
-#: qcsrc/menu/xonotic/util.qc:409
-#, c-format
-msgid ""
-"Update can be downloaded at:\n"
-"%s\n"
+#: qcsrc/menu/xonotic/util.qc:417
+msgid "Update can be downloaded at:"
 msgstr ""
-"Update can be downloaded at:\n"
-"%s\n"
 
-#: qcsrc/menu/xonotic/util.qc:509
+#: qcsrc/menu/xonotic/util.qc:525
 msgid "Autogenerating mapinfo for newly added maps..."
 msgstr "Autogenerating mapinfo for newly added maps..."
 
-#: qcsrc/menu/xonotic/util.qc:538
+#: qcsrc/menu/xonotic/util.qc:554
 #, c-format
 msgid "^1%s TEST BUILD"
 msgstr "^1%s TEST BUILD"
 
-#: qcsrc/menu/xonotic/util.qc:555
+#: qcsrc/menu/xonotic/util.qc:574
 #, c-format
 msgid "Update to %s now!"
 msgstr "Update to %s now!"
 
-#: qcsrc/menu/xonotic/util.qc:640
+#: qcsrc/menu/xonotic/util.qc:658
 msgid ""
 "^1ERROR: Texture compression is required but not supported.\n"
-"^1Expect visual problems.\n"
+"^1Expect visual problems."
 msgstr ""
-"^1ERROR: Texture compression is required but not supported.\n"
-"^1Expect visual problems.\n"
 
-#: qcsrc/menu/xonotic/util.qc:754
+#: qcsrc/menu/xonotic/util.qc:788
 msgid "Use default"
 msgstr "Use default"
 
-#: qcsrc/menu/xonotic/util.qc:774
+#: qcsrc/menu/xonotic/util.qc:808
 msgid "Team Color:"
 msgstr "Team Colour:"
-
-#: qcsrc/menu/xonotic/util.qh:46
-msgid "Enable panel"
-msgstr "Enable panel"