Merge commit '13.0-RC1~2'

2023-02-25 04:49:57 +00:00
parent bd87d86093 5e22788664
commit a9d56369a0
603 changed files with 26913 additions and 18390 deletions
--- a/src/widgets/network_widget.h
+++ b/src/widgets/network_widget.h
@@ -95,8 +95,9 @@ enum ClientListWidgets {

 /** Widgets of the #NetworkJoinStatusWindow class. */
 enum NetworkJoinStatusWidgets {
-	WID_NJS_BACKGROUND, ///< Background of the window.
-	WID_NJS_CANCELOK,   ///< Cancel / OK button.
+	WID_NJS_PROGRESS_BAR,  ///< Simple progress bar.
+	WID_NJS_PROGRESS_TEXT, ///< Text explaining what is happening.
+	WID_NJS_CANCELOK,      ///< Cancel / OK button.
 };

 /** Widgets of the #NetworkCompanyPasswordWindow class. */