diff --git a/Resources/Locales/pot/openspades.pot b/Resources/Locales/pot/openspades.pot
index 989296d1..38601df9 100644
--- a/Resources/Locales/pot/openspades.pot
+++ b/Resources/Locales/pot/openspades.pot
@@ -28,7 +28,14 @@ msgctxt "Client"
 msgid "Saving map failed: "
 msgstr ""
 
-#: Sources/Client/Client.cpp:627
+#. ! Prefix added to global chat messages.
+#. !
+#. ! Example: [Global] playername (Red) blah blah
+#. !
+#. ! Crowdin warns that this string shouldn't be translated,
+#. ! but it actually can be.
+#. ! The extra whitespace is not a typo.
+#: Sources/Client/Client.cpp:633
 msgctxt "Client"
 msgid "[Global] "
 msgstr ""
@@ -207,135 +214,140 @@ msgctxt "Client"
 msgid "Shotgun"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:848
+#. ! A cause of death shown in the kill feed.
+#: Sources/Client/Client_Update.cpp:849
 msgctxt "Client"
 msgid "Fall"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:851
+#. ! A cause of death shown in the kill feed.
+#: Sources/Client/Client_Update.cpp:853
 msgctxt "Client"
 msgid "Melee"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:854
+#: Sources/Client/Client_Update.cpp:856
 msgctxt "Client"
 msgid "Grenade"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:857
+#. ! A cause of death shown in the kill feed.
+#: Sources/Client/Client_Update.cpp:860
 msgctxt "Client"
 msgid "Headshot"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:860
+#. ! A cause of death shown in the kill feed.
+#: Sources/Client/Client_Update.cpp:864
 msgctxt "Client"
 msgid "Team Change"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:863
+#. ! A cause of death shown in the kill feed.
+#: Sources/Client/Client_Update.cpp:868
 msgctxt "Client"
 msgid "Weapon Change"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:902
+#: Sources/Client/Client_Update.cpp:907
 msgctxt "Client"
 msgid "You have killed {0}"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:904
+#: Sources/Client/Client_Update.cpp:909
 msgctxt "Client"
 msgid "You were killed by {0}"
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:1216
+#: Sources/Client/Client_Update.cpp:1225
 msgctxt "Client"
 msgid "Insufficient blocks."
 msgstr ""
 
-#: Sources/Client/Client_Update.cpp:1219
+#: Sources/Client/Client_Update.cpp:1228
 msgctxt "Client"
 msgid "You cannot place a block there."
 msgstr ""
 
-#: Sources/Client/LimboView.cpp:78
+#: Sources/Client/LimboView.cpp:79
 msgctxt "Client"
 msgid "Spawn"
 msgstr ""
 
-#: Sources/Client/LimboView.cpp:182
+#: Sources/Client/LimboView.cpp:183
 msgctxt "Client"
 msgid "Select Team:"
 msgstr ""
 
-#: Sources/Client/LimboView.cpp:190
+#: Sources/Client/LimboView.cpp:191
 msgctxt "Client"
 msgid "Select Weapon:"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:377
+#: Sources/Client/NetClient.cpp:422
 msgctxt "NetClient"
 msgid "Connecting to the server"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:389
+#: Sources/Client/NetClient.cpp:434
 msgctxt "NetClient"
 msgid "Not connected"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:453
+#: Sources/Client/NetClient.cpp:498
 msgctxt "NetClient"
 msgid "Awaiting for state"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:463 Sources/Client/NetClient.cpp:1232
+#: Sources/Client/NetClient.cpp:508 Sources/Client/NetClient.cpp:1277
 msgctxt "NetClient"
 msgid "Loading snapshot"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:478
+#: Sources/Client/NetClient.cpp:523
 msgctxt "NetClient"
 msgid "Loading snapshot ({0}/{1})"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:483 Sources/Client/NetClient.cpp:517
+#: Sources/Client/NetClient.cpp:528 Sources/Client/NetClient.cpp:562
 msgctxt "NetClient"
 msgid "Connected"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:495 Sources/Client/NetClient.cpp:530
-#: Sources/Client/NetClient.cpp:582
+#: Sources/Client/NetClient.cpp:540 Sources/Client/NetClient.cpp:575
+#: Sources/Client/NetClient.cpp:627
 msgctxt "NetClient"
 msgid "Still loading..."
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:498 Sources/Client/NetClient.cpp:504
-#: Sources/Client/NetClient.cpp:534 Sources/Client/NetClient.cpp:539
-#: Sources/Client/NetClient.cpp:586 Sources/Client/NetClient.cpp:591
+#: Sources/Client/NetClient.cpp:543 Sources/Client/NetClient.cpp:549
+#: Sources/Client/NetClient.cpp:579 Sources/Client/NetClient.cpp:584
+#: Sources/Client/NetClient.cpp:631 Sources/Client/NetClient.cpp:636
 msgctxt "NetClient"
 msgid "Error"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:657
+#: Sources/Client/NetClient.cpp:702
 msgctxt "NetClient"
 msgid "You are banned from this server."
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:662 Sources/Client/NetClient.cpp:665
+#: Sources/Client/NetClient.cpp:707 Sources/Client/NetClient.cpp:710
 msgctxt "NetClient"
 msgid "You were kicked from this server."
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:663
+#: Sources/Client/NetClient.cpp:708
 msgctxt "NetClient"
 msgid "Incompatible client protocol version."
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:664
+#: Sources/Client/NetClient.cpp:709
 msgctxt "NetClient"
 msgid "Server full"
 msgstr ""
 
-#: Sources/Client/NetClient.cpp:666
+#: Sources/Client/NetClient.cpp:711
 msgctxt "NetClient"
 msgid "Unknown Reason"
 msgstr ""
@@ -1012,7 +1024,7 @@ msgid "System Info"
 msgstr ""
 
 #: Resources/Scripts/Gui/StartupScreen.as:215
-#: Resources/Scripts/Gui/StartupScreen.as:1678
+#: Resources/Scripts/Gui/StartupScreen.as:1679
 msgctxt "StartupScreen"
 msgid "Advanced"
 msgstr ""
@@ -1369,23 +1381,24 @@ msgid ""
 "dynamics compressor, HRTF-based 3D audio, and high quality reverb."
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1522
+#. ! The name of audio driver that outputs no audio.
+#: Resources/Scripts/Gui/StartupScreen.as:1523
 msgctxt "StartupScreen"
 msgid "Null"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1526
+#: Resources/Scripts/Gui/StartupScreen.as:1527
 msgctxt "StartupScreen"
 msgid "Disables audio output."
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1537
-#: Resources/Scripts/Gui/StartupScreen.as:1561
+#: Resources/Scripts/Gui/StartupScreen.as:1538
+#: Resources/Scripts/Gui/StartupScreen.as:1562
 msgctxt "StartupScreen"
 msgid "Polyphonics"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1538
+#: Resources/Scripts/Gui/StartupScreen.as:1539
 msgctxt "StartupScreen"
 msgid ""
 "Specifies how many sounds can be played simultaneously. Higher value needs "
@@ -1393,110 +1406,110 @@ msgid ""
 "(especially with a software emulation)."
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1545
+#: Resources/Scripts/Gui/StartupScreen.as:1546
 msgctxt "StartupScreen"
 msgid "EAX"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1546
+#: Resources/Scripts/Gui/StartupScreen.as:1547
 msgctxt "StartupScreen"
 msgid ""
 "Enables extended features provided by the OpenAL driver to create more "
 "ambience."
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1562
+#: Resources/Scripts/Gui/StartupScreen.as:1563
 msgctxt "StartupScreen"
 msgid ""
 "Specifies how many sounds can be played simultaneously. No matter what value "
 "is set, YSR might reduce the number of sounds when an overload is detected."
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1622
+#: Resources/Scripts/Gui/StartupScreen.as:1623
 msgctxt "StartupScreen"
 msgid "Language"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1634
+#: Resources/Scripts/Gui/StartupScreen.as:1635
 msgctxt "StartupScreen"
 msgid "Tools"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1637
+#: Resources/Scripts/Gui/StartupScreen.as:1638
 msgctxt "StartupScreen"
 msgid "Reset All Settings"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1646
+#: Resources/Scripts/Gui/StartupScreen.as:1647
 msgctxt "StartupScreen"
 msgid "Open Config Folder in Explorer"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1648
+#: Resources/Scripts/Gui/StartupScreen.as:1649
 msgctxt "StartupScreen"
 msgid "Reveal Config Folder in Finder"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1650
+#: Resources/Scripts/Gui/StartupScreen.as:1651
 msgctxt "StartupScreen"
 msgid "Browse Config Folder"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1667
+#: Resources/Scripts/Gui/StartupScreen.as:1668
 msgctxt "StartupScreen"
 msgid "An unknown error has occurred while opening the config directory."
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1673
+#: Resources/Scripts/Gui/StartupScreen.as:1674
 msgctxt "StartupScreen"
 msgid ""
 "Are you sure to reset all settings? They include (but are not limited to):"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1674
+#: Resources/Scripts/Gui/StartupScreen.as:1675
 msgctxt "StartupScreen"
 msgid "All graphics/audio settings"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1675
+#: Resources/Scripts/Gui/StartupScreen.as:1676
 msgctxt "StartupScreen"
 msgid "All key bindings"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1676
+#: Resources/Scripts/Gui/StartupScreen.as:1677
 msgctxt "StartupScreen"
 msgid "Your player name"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1677
+#: Resources/Scripts/Gui/StartupScreen.as:1678
 msgctxt "StartupScreen"
 msgid ""
 "Other advanced settings only accessible through '{0}' tab and in-game "
 "commands"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1747
+#: Resources/Scripts/Gui/StartupScreen.as:1748
 msgctxt "StartupScreen"
 msgid "Unknown ({0})"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1749
-#: Resources/Scripts/Gui/StartupScreen.as:1763
+#: Resources/Scripts/Gui/StartupScreen.as:1750
+#: Resources/Scripts/Gui/StartupScreen.as:1764
 msgctxt "StartupScreen"
 msgid "System default"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1812
+#: Resources/Scripts/Gui/StartupScreen.as:1813
 msgctxt "StartupScreen"
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1848
+#: Resources/Scripts/Gui/StartupScreen.as:1849
 msgctxt "StartupScreen"
 msgid "Advanced Settings"
 msgstr ""
 
-#: Resources/Scripts/Gui/StartupScreen.as:1857
+#: Resources/Scripts/Gui/StartupScreen.as:1858
 msgctxt "StartupScreen"
 msgid "Filter"
 msgstr ""
diff --git a/Resources/Scripts/Gui/StartupScreen.as b/Resources/Scripts/Gui/StartupScreen.as
index ce08c736..3ad70568 100644
--- a/Resources/Scripts/Gui/StartupScreen.as
+++ b/Resources/Scripts/Gui/StartupScreen.as
@@ -1519,6 +1519,7 @@ namespace spades {
 			}
 			{
 				spades::ui::RadioButton e(Manager);
+				//! The name of audio driver that outputs no audio.
 				e.Caption = _Tr("StartupScreen", "Null");
 				e.Bounds = AABB2(320.f, 0.f, 100.f, 24.f);
 				e.GroupName = "driver";
diff --git a/Sources/Client/Client.cpp b/Sources/Client/Client.cpp
index 54cac71a..929e730d 100644
--- a/Sources/Client/Client.cpp
+++ b/Sources/Client/Client.cpp
@@ -623,7 +623,13 @@ namespace spades {
 			{
 				std::string s;
 				if (global)
-					/// prefix added to global chat messages.
+					//! Prefix added to global chat messages.
+					//!
+					//! Example: [Global] playername (Red) blah blah
+					//!
+					//! Crowdin warns that this string shouldn't be translated,
+					//! but it actually can be.
+					//! The extra whitespace is not a typo.
 					s = _Tr("Client", "[Global] ");
 				s += ChatWindow::TeamColorMessage(p->GetName(), p->GetTeamId());
 				s += ": ";
diff --git a/Sources/Client/Client_Update.cpp b/Sources/Client/Client_Update.cpp
index 5165da1d..ee6d59b3 100644
--- a/Sources/Client/Client_Update.cpp
+++ b/Sources/Client/Client_Update.cpp
@@ -845,21 +845,26 @@ namespace spades {
 					}
 					break;
 				case KillTypeFall:
+					//! A cause of death shown in the kill feed.
 					cause += _Tr("Client", "Fall");
 					break;
 				case KillTypeMelee:
+					//! A cause of death shown in the kill feed.
 					cause += _Tr("Client", "Melee");
 					break;
 				case KillTypeGrenade:
 					cause += _Tr("Client", "Grenade");
 					break;
 				case KillTypeHeadshot:
+					//! A cause of death shown in the kill feed.
 					cause += _Tr("Client", "Headshot");
 					break;
 				case KillTypeTeamChange:
+					//! A cause of death shown in the kill feed.
 					cause += _Tr("Client", "Team Change");
 					break;
 				case KillTypeClassChange:
+					//! A cause of death shown in the kill feed.
 					cause += _Tr("Client", "Weapon Change");
 					break;
 				default:
diff --git a/Sources/Client/LimboView.cpp b/Sources/Client/LimboView.cpp
index 4120c938..793ac555 100644
--- a/Sources/Client/LimboView.cpp
+++ b/Sources/Client/LimboView.cpp
@@ -73,6 +73,7 @@ namespace spades {
 			                         AABB2(weapX, firstY + rowHeight * 2.f, menuWidth, menuHeight),
 			                         _Tr("Client", "Shotgun")));
 
+			//! The "Spawn" button that you press when you're ready to "spawn".
 			items.push_back(MenuItem(MenuSpawn,
 			                         AABB2(left + contentsWidth - 266.f, firstY + 4.f, 256.f, 64.f),
 			                         _Tr("Client", "Spawn")));
diff --git a/update-pot.sh b/update-pot.sh
index 261e23d7..279730a1 100755
--- a/update-pot.sh
+++ b/update-pot.sh
@@ -13,7 +13,8 @@ echo $FILES| tr " " "\n" > .translate.this # Convert spaces to newlines
 OPTIONS_OUTPUT="-o Resources/Locales/pot/openspades.pot"
 OPTIONS_CPP="--c++"
 OPTIONS_KEYWORD="-k_Tr:2,1c -k_TrN:2,1c,3" # Have no idea how this works
-OPTIONS="-j ${OPTIONS_OUTPUT} ${OPTIONS_CPP} ${OPTIONS_KEYWORD}"
+OPTIONS_COMMENTS="-c!" # comments for translators
+OPTIONS="-j ${OPTIONS_OUTPUT} ${OPTIONS_CPP} ${OPTIONS_KEYWORD} ${OPTIONS_COMMENTS}"
 
 META_PKG="--package-name=OpenSpades"
 META_COPYRIGHT="--copyright-holder=yvt"