From 1df440a90e87856d6f9e5853d3ce104b2a924d2f Mon Sep 17 00:00:00 2001 From: chucky-n-ice Date: Fri, 28 Jun 2024 21:42:16 +0200 Subject: [PATCH] Fix: admin join; update: several language strings --- src/citymania/cm_commands_gui.cpp | 28 ++++---- src/lang/english.txt | 63 ++++++++++-------- src/lang/german.txt | 107 ++++++++++++++++++++++++------ src/lang/russian.txt | 35 +++------- src/toolbar_gui.cpp | 4 +- 5 files changed, 146 insertions(+), 91 deletions(-) diff --git a/src/citymania/cm_commands_gui.cpp b/src/citymania/cm_commands_gui.cpp index 410d569c..43a31594 100644 --- a/src/citymania/cm_commands_gui.cpp +++ b/src/citymania/cm_commands_gui.cpp @@ -1082,7 +1082,7 @@ struct AdminCompanyButtonsWindow : Window { virtual void OnClick([[maybe_unused]] Point pt, int widget,[[maybe_unused]] int click_count) { - if(!_networking) return; + int _company = this->window_number; switch (widget) { case ACB_COMPANY_EMPTY: @@ -1157,7 +1157,7 @@ struct AdminCompanyButtonsWindow : Window { MarkWholeScreenDirty(); break; case ACB_COMPANY_JOIN2: - NetworkClientSendChatToServer(fmt::format("!move #{} {}",_network_own_client_id ,_company)); + NetworkClientSendChatToServer(fmt::format("!move #{} {}",_network_own_client_id, _company)); MarkWholeScreenDirty(); break; case ACB_COMPANY_LEAVE: @@ -1424,12 +1424,12 @@ static const NWidgetPart _nested_login_window_widgets[] = { NWidget(WWT_TEXT, COLOUR_BROWN, LWW_USERNAME), SetDataTip(CM_STR_LOGIN_WINDOW_USERNAME, 0), NWidget(NWID_SPACER), SetMinimalSize(5, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, LWW_USER_NAME), SetMinimalSize(100, 15), SetFill(1, 1), - SetDataTip(CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_HELPTEXT), + SetDataTip(CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(20, 0), NWidget(WWT_TEXT, COLOUR_BROWN, LWW_PASSWORD), SetDataTip(CM_STR_LOGIN_WINDOW_PASSWORD, 0), NWidget(NWID_SPACER), SetMinimalSize(5, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, LWW_USER_PW), SetMinimalSize(50, 15), SetFill(1, 1), - SetDataTip(CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_HELPTEXT), + SetDataTip(CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(45, 0), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(0, 20), @@ -1437,10 +1437,10 @@ static const NWidgetPart _nested_login_window_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(NWID_SPACER), SetMinimalSize(105, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, LWW_USER_LOGIN), SetMinimalSize(40, 20), SetAlignment(SA_CENTER), SetFill(1, 1), - SetDataTip(CM_STR_TOOLBAR_COMMANDS_LOGIN_CAPTION, CM_STR_TOOLBAR_COMMANDS_LOGIN_TOOLTIP), + SetDataTip(CM_STR_LOGIN_WINDOW_LOGIN, CM_STR_LOGIN_WINDOW_LOGIN_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(10, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, LWW_USER_LOGOUT), SetMinimalSize(40, 20), SetAlignment(SA_CENTER), SetFill(1, 1), - SetDataTip(CM_STR_TOOLBAR_COMMANDS_LOGOUT_CAPTION, CM_STR_TOOLBAR_COMMANDS_LOGOUT_TOOLTIP), + SetDataTip(CM_STR_LOGIN_WINDOW_LOGOUT, CM_STR_LOGIN_WINDOW_LOGOUT_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(105, 0), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(0, 10), @@ -1468,17 +1468,17 @@ static const NWidgetPart _nested_admin_window_widgets[] = { NWidget(WWT_TEXT, COLOUR_BROWN, LWW_USERNAME), SetDataTip(CM_STR_LOGIN_WINDOW_USERNAME, 0), NWidget(NWID_SPACER), SetMinimalSize(5, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, LWW_USER_NAME), SetMinimalSize(100, 15), SetFill(1, 1), - SetDataTip(CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_HELPTEXT), + SetDataTip(CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(10, 0), NWidget(WWT_TEXT, COLOUR_BROWN, LWW_PASSWORD), SetDataTip(CM_STR_LOGIN_WINDOW_PASSWORD, 0), NWidget(NWID_SPACER), SetMinimalSize(5, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, LWW_USER_PW), SetMinimalSize(50, 15), SetFill(1, 1), - SetDataTip(CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_HELPTEXT), + SetDataTip(CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(10, 0), NWidget(WWT_TEXT, COLOUR_BROWN, LWW_ADMIN_PW), SetDataTip(CM_STR_LOGIN_WINDOW_ADMIN_PASSWORD, 0), NWidget(NWID_SPACER), SetMinimalSize(5, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, LWW_ADMIN_PW), SetMinimalSize(50, 15), SetFill(1, 1), - SetDataTip(CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_HELPTEXT), + SetDataTip(CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY, CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(15, 0), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(0, 20), @@ -1486,16 +1486,16 @@ static const NWidgetPart _nested_admin_window_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(NWID_SPACER), SetMinimalSize(15, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, LWW_USER_LOGIN), SetMinimalSize(40, 20), SetAlignment(SA_CENTER), SetFill(1, 1), - SetDataTip(CM_STR_TOOLBAR_COMMANDS_LOGIN_CAPTION, CM_STR_TOOLBAR_COMMANDS_LOGIN_TOOLTIP), + SetDataTip(CM_STR_LOGIN_WINDOW_LOGIN, CM_STR_LOGIN_WINDOW_LOGIN_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(10, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, LWW_USER_LOGOUT), SetMinimalSize(40, 20), SetAlignment(SA_CENTER), SetFill(1, 1), - SetDataTip(CM_STR_TOOLBAR_COMMANDS_LOGOUT_CAPTION, CM_STR_TOOLBAR_COMMANDS_LOGOUT_TOOLTIP), + SetDataTip(CM_STR_LOGIN_WINDOW_LOGOUT, CM_STR_LOGIN_WINDOW_LOGOUT_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(10, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, LWW_ADMIN_LOGIN), SetMinimalSize(40, 20), SetAlignment(SA_CENTER), SetFill(1, 1), - SetDataTip(CM_STR_LOGIN_WINDOW_ADMIN_LOGIN, CM_STR_TOOLBAR_COMMANDS_LOGIN_TOOLTIP), + SetDataTip(CM_STR_LOGIN_WINDOW_ADMIN_LOGIN, CM_STR_LOGIN_WINDOW_ADMIN_LOGIN_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(10, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, LWW_ADMIN_LOGOUT), SetMinimalSize(40, 20), SetAlignment(SA_CENTER), SetFill(1, 1), - SetDataTip(CM_STR_LOGIN_WINDOW_ADMIN_LOGOUT, CM_STR_TOOLBAR_COMMANDS_LOGOUT_TOOLTIP), + SetDataTip(CM_STR_LOGIN_WINDOW_ADMIN_LOGOUT, CM_STR_LOGIN_WINDOW_ADMIN_LOGOUT_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(15, 0), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(0, 10), @@ -1545,7 +1545,7 @@ static const NWidgetPart _nested_last_server_widgets[] = { NWidget(WWT_PANEL, COLOUR_BROWN), SetFill(0, 1), NWidget(NWID_HORIZONTAL), SetPadding(WidgetDimensions::unscaled.sparse), NWidget(NWID_SPACER), SetMinimalSize(81, 0), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, LSW_BUTTON), SetMinimalSize(242, 15), SetAlignment(SA_CENTER), SetDataTip(STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST, CM_STR_SB_NETWORK_DIRECT_JOIN_TOOLTIP), SetFill(1, 1), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, LSW_BUTTON), SetMinimalSize(242, 15), SetAlignment(SA_CENTER), SetDataTip(CM_STR_SB_LAST_SERVER, CM_STR_SB_NETWORK_DIRECT_JOIN_TOOLTIP), SetFill(1, 1), NWidget(NWID_SPACER), SetMinimalSize(81, 0), SetFill(1, 0), EndContainer(), EndContainer(), diff --git a/src/lang/english.txt b/src/lang/english.txt index ea8dea57..a4596c95 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -6199,29 +6199,6 @@ CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_HELPTEXT :Main background CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_BLACK :Black CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_GREY :Light grey -# Community login window -CM_STR_LOGIN_WINDOW_CAPTION :{BLACK}Login Window -CM_STR_LOGIN_WINDOW_CITYMANIA :{BLACK}CityMania -CM_STR_LOGIN_WINDOW_NICE :{BLACK}N-ice -CM_STR_LOGIN_WINDOW_BTPRO :{BLACK}BTPro -CM_STR_LOGIN_ERROR_SIGN_IN_FAILED :{WHITE}Failed to connect -CM_STR_LOGIN_ERROR_BAD_INPUT :{WHITE}Bad username or password -CM_STR_LOGIN_WINDOW_USERNAME :{WHITE}Username: -CM_STR_LOGIN_WINDOW_PASSWORD :{WHITE}Password: -CM_STR_LOGIN_WINDOW_ADMIN_LOGIN :{BLACK}A-Login -CM_STR_LOGIN_WINDOW_ADMIN_LOGOUT :{BLACK}A-Logout -CM_STR_LOGIN_WINDOW_ADMIN_PASSWORD :{WHITE}Admin: -CM_STR_LOGIN_WINDOW_SET :{WHITE}Set -CM_STR_LOGIN_WINDOW_NOT_SET :{WHITE}Not Set -CM_STR_LOGIN_WINDOW_CHANGE_USERNAME :{WHITE}Change username -CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD :{WHITE}Change password -CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_HELPTEXT :{BLACK}Change username -CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_HELPTEXT :{BLACK}Change password -CM_STR_LOGIN_WINDOW_SIGN_IN_HELPTEXT :{BLACK}Sign in (you must be on the correct community server) -CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY :{WHITE}{RAW_STRING} -CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY :{WHITE}{STRING} -CM_STR_LOGIN_WINDOW_WELCOME :{BLACK}Welcome to {STRING} community ! - CM_STR_NETWORK_COMPANY_LIST_NEW_COMPANY :New company CM_STR_NETWORK_COMPANY_LIST_SPECTATE :Spectate @@ -6303,7 +6280,6 @@ CM_STR_CONFIG_SETTING_TYPE_DROPDOWN_CITYMANIA :CityMania patch CM_BUILDING_PREVIEW_COST_ENOUGH :Cost CM_STR_NO_BLUEPRINT_IN_SLOT :{WHITE}No blueprint in slot {NUM} -CM_STR_ABOUT_MENU_LOGIN_WINDOW :Community tools CM_STR_BUILD_INFO_OVERLAY_COST_OK :{WHITE}Cost: {CURRENCY_LONG} CM_STR_BUILD_INFO_OVERLAY_COST_NO_MONEY :{RED}Cost: {CURRENCY_LONG} CM_STR_BUILD_INFO_OVERLAY_STATION_ACCEPTS :{WHITE}Accepts: @@ -6323,10 +6299,38 @@ CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE :{BLACK}Show hid CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP :{BLACK}Show hidden ({NUM}) CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT :{BLACK}Show hidden ({NUM}) -### Admin Company Buttons ### -CM_STR_ACB_COMPANY_ADMIN_CAPTION :{WHITE}Admin buttons #{NUM} -CM_STR_ACB_COMPANY_ADMIN_BUTTON :{WHITE}Admin buttons -CM_STR_ACB_COMPANY_ADMIN_BUTTON_TOOLTIP :{BLACK}Show / hide the admin buttons. +### Community login window +CM_STR_LOGIN_WINDOW_CAPTION :Login Window +CM_STR_LOGIN_WINDOW_CITYMANIA :{BLACK}CityMania +CM_STR_LOGIN_WINDOW_NICE :{BLACK}N-ice +CM_STR_LOGIN_WINDOW_BTPRO :{BLACK}BTPro +CM_STR_LOGIN_ERROR_SIGN_IN_FAILED :{WHITE}Failed to connect +CM_STR_LOGIN_ERROR_BAD_INPUT :{WHITE}Bad username or password +CM_STR_LOGIN_WINDOW_USERNAME :{WHITE}Username: +CM_STR_LOGIN_WINDOW_PASSWORD :{WHITE}Password: +CM_STR_LOGIN_WINDOW_LOGIN :{BLACK}Login +CM_STR_LOGIN_WINDOW_LOGIN_TOOLTIP :Send login to server +CM_STR_LOGIN_WINDOW_LOGOUT :{BLACK}Logout +CM_STR_LOGIN_WINDOW_LOGOUT_TOOLTIP :Send logout to server +CM_STR_LOGIN_WINDOW_ADMIN_LOGIN :{BLACK}A-Login +CM_STR_LOGIN_WINDOW_ADMIN_LOGIN_TOOLTIP :Send admin login to server +CM_STR_LOGIN_WINDOW_ADMIN_LOGOUT :{BLACK}A-Logout +CM_STR_LOGIN_WINDOW_ADMIN_LOGOUT_TOOLTIP :Send admin logout to server +CM_STR_LOGIN_WINDOW_ADMIN_PASSWORD :{WHITE}Admin: +CM_STR_LOGIN_WINDOW_SET :{WHITE}Set +CM_STR_LOGIN_WINDOW_NOT_SET :{WHITE}Not Set +CM_STR_LOGIN_WINDOW_CHANGE_USERNAME :{WHITE}Change username +CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD :{WHITE}Change password +CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_TOOLTIP :Enter your username here +CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_TOOLTIP :Enter your password here +CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY :{WHITE}{RAW_STRING} +CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY :{WHITE}{STRING} +CM_STR_LOGIN_WINDOW_WELCOME :{BLACK}Welcome to {STRING} server ! + +### Admin company buttons +CM_STR_ACB_COMPANY_ADMIN_CAPTION :{WHITE}Admin commands #{NUM} +CM_STR_ACB_COMPANY_ADMIN_BUTTON :{WHITE}Admin commands +CM_STR_ACB_COMPANY_ADMIN_BUTTON_TOOLTIP :{BLACK}Show / hide the admin commands. CM_STR_ACB_LOCK :{BLACK}Lock CM_STR_ACB_LOCK_TOOLTIP :{BLACK}Lock Company. All players on it will be sent to spectators. CM_STR_ACB_UNLOCK :{BLACK}Unlock @@ -6371,7 +6375,7 @@ CM_STR_ACB_COMPANY_NEWSTICKET :{BLACK}Type mes CM_STR_ACB_COMPANY_JOIN2 :{BLACK}A. Join CM_STR_ACB_COMPANY_JOIN2_TOOLTIP :{BLACK}Join as an admin -### Server buttons ### +### Server buttons CM_STR_SB_SELECT_NICE :{BLACK}N-ice CM_STR_SB_SELECT_BTPRO :{BLACK}BTPro CM_STR_SB_SELECT_CITYMANIA :{BLACK}Citymania @@ -6380,3 +6384,4 @@ CM_STR_SB_SERVER_DISABLED :{WHITE}Server i CM_STR_SB_SERVER_LIST_ERROR_FILE :{WHITE}Error on getting servers file CM_STR_SB_NETWORK_DIRECT_JOIN_GAME :{BLACK}{RAW_STRING} CM_STR_SB_NETWORK_DIRECT_JOIN_TOOLTIP :{BLACK}Hold CTRL and click for joining with new company. +CM_STR_SB_LAST_SERVER :{BLACK}Join the server you played last time diff --git a/src/lang/german.txt b/src/lang/german.txt index 53e1eea9..e1108931 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -6193,25 +6193,6 @@ CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_HELPTEXT :Haupt-Hintergru CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_BLACK :Schwarz CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_GREY :Hellgrau -# Community login window -CM_STR_LOGIN_WINDOW_CAPTION :{WHITE}Login-Fenster -CM_STR_LOGIN_WINDOW_CITYMANIA :{BLACK}CityMania -CM_STR_LOGIN_WINDOW_NICE :{BLACK}N-ice -CM_STR_LOGIN_WINDOW_BTPRO :{BLACK}BTPro -CM_STR_LOGIN_ERROR_SIGN_IN_FAILED :{WHITE}Verbindung fehlgeschlagen -CM_STR_LOGIN_ERROR_BAD_INPUT :{WHITE}Falscher Benutzername oder Passwort -CM_STR_LOGIN_WINDOW_USERNAME :{WHITE}Benutzername -CM_STR_LOGIN_WINDOW_PASSWORD :{WHITE}Passwort -CM_STR_LOGIN_WINDOW_SET :{WHITE}Gesetzt -CM_STR_LOGIN_WINDOW_NOT_SET :{WHITE}Nicht gesetzt -CM_STR_LOGIN_WINDOW_CHANGE_USERNAME :{WHITE}Benutzernamen ändern -CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD :{WHITE}Passwort ändern -CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_HELPTEXT :{BLACK}Benutzernamen ändern -CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_HELPTEXT :{BLACK}Passwort ändern -CM_STR_LOGIN_WINDOW_SIGN_IN_HELPTEXT :{BLACK}Login abschicken (Sie müssen auf dem richtigen Community-Server sein) -CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY :{WHITE}{STRING} -CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY :{WHITE}{STRING} - CM_STR_NETWORK_COMPANY_LIST_NEW_COMPANY :Neue Firma CM_STR_NETWORK_COMPANY_LIST_SPECTATE :Zuschauen @@ -6289,4 +6270,90 @@ CM_STR_INDUSTRY_TYPE_WITH_ID :{STRING} {SILVE CM_STR_CONFIG_SETTING_TYPE_DROPDOWN_CITYMANIA :CityMania-Patchpack-Einstellungen CM_BUILDING_PREVIEW_COST_ENOUGH :Kosten -CM_STR_ABOUT_MENU_LOGIN_WINDOW :CityMania-Serverlogin + +### Community login window +CM_STR_LOGIN_WINDOW_CAPTION :Serveranmeldung +CM_STR_LOGIN_WINDOW_CITYMANIA :{BLACK}CityMania +CM_STR_LOGIN_WINDOW_NICE :{BLACK}N-ice +CM_STR_LOGIN_WINDOW_BTPRO :{BLACK}BTPro +CM_STR_LOGIN_ERROR_SIGN_IN_FAILED :{WHITE}Verbindung fehlgeschlagen +CM_STR_LOGIN_ERROR_BAD_INPUT :{WHITE}Falscher Benutzername oder Passwort +CM_STR_LOGIN_WINDOW_USERNAME :{WHITE}Benutzername +CM_STR_LOGIN_WINDOW_PASSWORD :{WHITE}Passwort +CM_STR_LOGIN_WINDOW_LOGIN :{BLACK}Anmelden +CM_STR_LOGIN_WINDOW_LOGIN_TOOLTIP :beim Server anmelden +CM_STR_LOGIN_WINDOW_LOGOUT :{BLACK}Abmelden +CM_STR_LOGIN_WINDOW_LOGOUT_TOOLTIP :beim Server abmelden +CM_STR_LOGIN_WINDOW_ADMIN_LOGIN :{BLACK}A-Anmelden +CM_STR_LOGIN_WINDOW_ADMIN_LOGIN_TOOLTIP :als Admin beim Server anmelden +CM_STR_LOGIN_WINDOW_ADMIN_LOGOUT :{BLACK}A-Abmelden +CM_STR_LOGIN_WINDOW_ADMIN_LOGOUT_TOOLTIP :als Admin beim Server abmelden +CM_STR_LOGIN_WINDOW_ADMIN_PASSWORD :{WHITE}Admin: +CM_STR_LOGIN_WINDOW_SET :{WHITE}Gesetzt +CM_STR_LOGIN_WINDOW_NOT_SET :{WHITE}Nicht gesetzt +CM_STR_LOGIN_WINDOW_CHANGE_USERNAME :{WHITE}Benutzernamen ändern +CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD :{WHITE}Passwort ändern +CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_TOOLTIP :{BLACK}Benutzernamen hier eingeben +CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_TOOLTIP :{BLACK}Passwort hier eingeben +CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY :{WHITE}{STRING} +CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY :{WHITE}{STRING} +CM_STR_LOGIN_WINDOW_WELCOME :{BLACK}Willkommen beim {STRING} Server ! + +### Admin company buttons +CM_STR_ACB_COMPANY_ADMIN_CAPTION :{WHITE}Adminbefehle #{NUM} +CM_STR_ACB_COMPANY_ADMIN_BUTTON :{WHITE}Adminbefehle +CM_STR_ACB_COMPANY_ADMIN_BUTTON_TOOLTIP :{BLACK}Zeige / verstecke die Adminbefehle. +CM_STR_ACB_LOCK :{BLACK}Lock +CM_STR_ACB_LOCK_TOOLTIP :{BLACK}Sperre eine Firma, alle Spiele werden Zuschauer. +CM_STR_ACB_UNLOCK :{BLACK}Unlock +CM_STR_ACB_UNLOCK_TOOLTIP :{BLACK}Entsperre eine Firma, Spieler können wieder beitreten. +CM_STR_ACB_KNOWN :{BLACK}Known +CM_STR_ACB_KNOWN_TOOLTIP :{BLACK}Zeige die Liste der bekannten Spieler der Firma. +CM_STR_ACB_RESET_KNOWN :{BLACK}Reset Known +CM_STR_ACB_RESET_KNOWN_TOOLTIP :{BLACK}Lösche die List der bekannten Spieler der Firma. +CM_STR_ACB_MOVE_PLAYER_TO :{BLACK}Move to ... +CM_STR_ACB_MOVE_PLAYER_TO_TOOLTIP :{BLACK}Verschiebe Spieler (#123 oder Name) zur Firma +CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON :{BLACK}News +CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON_TOOLTIP :{BLACK}Erstelle eine Zeitungsnachricht mit den Namen der Firma. +CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON_COMP :{BLACK}News (P. C.) +CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON_COMP_TOOLTIP :{BLACK}Erstelle eine Zeitungsnachricht nur für die Firma. +CM_STR_ACB_SUSPEND :{BLACK}Suspend +CM_STR_ACB_SUSPEND_TOOLTIP :{BLACK}Deaktiviere alle Handlungen der Firma. +CM_STR_ACB_UNSUSPEND :{BLACK}Unsuspend +CM_STR_ACB_UNSUSPEND_TOOLTIP :{BLACK}Aktiviere alle Handlungen der Firma. +CM_STR_ACB_EMPTY :{BLACK}Empty +CM_STR_ACB_EMPTY_TOOLTIP :{BLACK}Mache alle Spieler der Firma zu Zuschauer +CM_STR_ACB_RESET :{BLACK}Reset +CM_STR_ACB_RESET_TOOLTIP :{BLACK}Lösche die Firma. Es dürfen keine Spieler in der Firma sein. +CM_STR_ACB_RESET_SPEC :{BLACK}Reset Spec +CM_STR_ACB_RESET_SPEC_TOOLTIP :{BLACK}Lösche die Firma und mache alle Spieler zu Zuschauer. +CM_STR_ACB_RESET_KICK :{BLACK}Reset Kick +CM_STR_ACB_RESET_KICK_TOOLTIP :{BLACK}Lösche die Firma und kicke die Spieler aus den Server. +CM_STR_ACB_RESET_TIMER_120 :{BLACK}Reset T. 2m +CM_STR_ACB_RESET_TIMER_120_TOOLTIP :{BLACK}Starte einen Countdown über 2 Minuten für die Löschung der Firma. +CM_STR_ACB_RESET_TIMER :{BLACK}Reset T.... +CM_STR_ACB_RESET_TIMER_TOOLTIP :{BLACK}Starte einen Countdown der eingebenen Minuten für die Löschung der Firma. +CM_STR_ACB_RESET_TIMER_VALUE :{BLACK}Time to Reset (seconds): +CM_STR_ACB_RESET_TIMER_CANCEL :{BLACK}Cancel Reset +CM_STR_ACB_RESET_TIMER_CANCEL_TOOLTIP :{BLACK}Abbruch des Countdowns. +CM_STR_ACB_AWARNING :{BLACK}Warning +CM_STR_ACB_AWARNING_TOOLTIP :{BLACK}Sende eine Nachricht zum Spieler, dass ein Admin eine Antwort erwartet. +CM_STR_ACB_RESET_COMP :{BLACK}RESET Company +CM_STR_ACB_RESET_COMP_SURE :{WHITE}Die Firma wirklich löschen? +CM_STR_ACB_RESET_SPEC_SURE :{WHITE}Die Firma wirklich löschen und alle Spieler zu Zuschauer machen? +CM_STR_ACB_RESET_KICK_SURE :{WHITE}Die Firma wirklich löschen und alle Spieler rauswerfen? +CM_STR_ACB_PLAYER_NEWSTICKET :{BLACK}Tippe die Nachricht an den Spieler ein +CM_STR_ACB_COMPANY_NEWSTICKET :{BLACK}Tippe die Nachricht an die Firma ein +CM_STR_ACB_COMPANY_JOIN2 :{BLACK}A. Join +CM_STR_ACB_COMPANY_JOIN2_TOOLTIP :{BLACK}als Admin anmelden + +### Server buttons +CM_STR_SB_SELECT_NICE :{BLACK}N-ice +CM_STR_SB_SELECT_BTPRO :{BLACK}BTPro +CM_STR_SB_SELECT_CITYMANIA :{BLACK}Citymania +CM_STR_SB_SERVER_LIST_UNREACHABLE :{WHITE}Serverliste nicht erreichbar +CM_STR_SB_SERVER_DISABLED :{WHITE}Server ist nicht erreichbar +CM_STR_SB_SERVER_LIST_ERROR_FILE :{WHITE}Fehler in der Serverliste +CM_STR_SB_NETWORK_DIRECT_JOIN_GAME :{BLACK}{RAW_STRING} +CM_STR_SB_NETWORK_DIRECT_JOIN_TOOLTIP :{BLACK}Halte STRG und klicke, um mit neuer Firma zu beginnen +CM_STR_SB_LAST_SERVER :{BLACK}Den zuletzt gespielten Server beitreten diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 667b01ce..e5c406a4 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -6420,25 +6420,6 @@ CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_HELPTEXT :Основно CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_BLACK :Черный CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_GREY :Светло-серый -# Community login window -CM_STR_LOGIN_WINDOW_CAPTION :{WHITE}Login Window -CM_STR_LOGIN_WINDOW_CITYMANIA :{BLACK}CityMania -CM_STR_LOGIN_WINDOW_NICE :{BLACK}N-ice -CM_STR_LOGIN_WINDOW_BTPRO :{BLACK}BTPro -CM_STR_LOGIN_ERROR_SIGN_IN_FAILED :{WHITE}Failed to connect -CM_STR_LOGIN_ERROR_BAD_INPUT :{WHITE}Bad username or password -CM_STR_LOGIN_WINDOW_USERNAME :{WHITE}Username -CM_STR_LOGIN_WINDOW_PASSWORD :{WHITE}Password -CM_STR_LOGIN_WINDOW_SET :{WHITE}Set -CM_STR_LOGIN_WINDOW_NOT_SET :{WHITE}Not Set -CM_STR_LOGIN_WINDOW_CHANGE_USERNAME :{WHITE}Change username -CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD :{WHITE}Change password -CM_STR_LOGIN_WINDOW_CHANGE_USERNAME_HELPTEXT :{BLACK}Change username -CM_STR_LOGIN_WINDOW_CHANGE_PASSWORD_HELPTEXT :{BLACK}Change password -CM_STR_LOGIN_WINDOW_SIGN_IN_HELPTEXT :{BLACK}Sign in (you must be on the correct community server) -CM_STR_LOGIN_WINDOW_USERNAME_DISPLAY :{WHITE}{STRING} -CM_STR_LOGIN_WINDOW_PASSWORD_DISPLAY :{WHITE}{STRING} - CM_STR_NETWORK_COMPANY_LIST_NEW_COMPANY :Новая компания CM_STR_NETWORK_COMPANY_LIST_SPECTATE :Стать зрителем @@ -6520,7 +6501,6 @@ CM_STR_CONFIG_SETTING_TYPE_DROPDOWN_CITYMANIA :Настрой CM_BUILDING_PREVIEW_COST_ENOUGH :Стоимость CM_STR_NO_BLUEPRINT_IN_SLOT :{WHITE}Нет чертежа в слоте {NUM} -CM_STR_ABOUT_MENU_LOGIN_WINDOW :Аутентификация на сервере CityMania CM_STR_BUILD_INFO_OVERLAY_COST_OK :{WHITE}Стоимость: {CURRENCY_LONG} CM_STR_BUILD_INFO_OVERLAY_COST_NO_MONEY :{RED}Стоимость: {CURRENCY_LONG} CM_STR_BUILD_INFO_OVERLAY_STATION_ACCEPTS :{WHITE}Принимается: @@ -6531,11 +6511,14 @@ CM_STR_BUILD_INFO_OVERLAY_ERROR_UNKNOWN :{RED}Неизв CM_STR_VEHICLE_INFO_BUILT_VALUE_WITH_ID :{LTBLUE}{ENGINE} {BLACK}Построен в {LTBLUE}{NUM} г.{BLACK} Стоимость: {LTBLUE}{CURRENCY_LONG}{BLACK} ID: {LTBLUE}{NUM} -CM_STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_CLOSE :Активировать выпадающие меню при отпускании клавиши: {STRING} -CM_STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_CLOSE_HELPTEXT :Контролирует, активируют ли выпадающие меню основной панели инструментов свою стандартную функцию при отпускании кнопки мыши. Если выключено, то выпадающее меню останется открытым, чтобы можно было сделать выбор. +CM_STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_CLOSE :Активировать выпадающие меню при отпускании клавиши: {STRING} +CM_STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_CLOSE_HELPTEXT :Контролирует, активируют ли выпадающие меню основной панели инструментов свою стандартную функцию при отпускании кнопки мыши. Если выключено, то выпадающее меню останется открытым, чтобы можно было сделать выбор. ###length VEHICLE_TYPES -CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN :{BLACK}Показать скрытые ({NUM}) -CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE :{BLACK}Показать скрытые ({NUM}) -CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP :{BLACK}Показать скрытые ({NUM}) -CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT :{BLACK}Показать скрытые ({NUM}) +CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN :{BLACK}Показать скрытые ({NUM}) +CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE :{BLACK}Показать скрытые ({NUM}) +CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP :{BLACK}Показать скрытые ({NUM}) +CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT :{BLACK}Показать скрытые ({NUM}) + +### Community login window +CM_STR_LOGIN_WINDOW_CAPTION :Аутентификация на сервере diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index c83a8235..92cde70e 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1112,13 +1112,13 @@ static CallBackFunction ToolbarHelpClick(Window *w) { if (_settings_client.gui.newgrf_developer_tools) { PopupMainToolbarMenu(w, _game_mode == GM_EDITOR ? (WidgetID)WID_TE_HELP : (WidgetID)WID_TN_HELP, {STR_ABOUT_MENU_LAND_BLOCK_INFO, - CM_STR_ABOUT_MENU_LOGIN_WINDOW, STR_ABOUT_MENU_HELP, STR_NULL, STR_ABOUT_MENU_TOGGLE_CONSOLE, STR_ABOUT_MENU_AI_DEBUG, + CM_STR_LOGIN_WINDOW_CAPTION, STR_ABOUT_MENU_HELP, STR_NULL, STR_ABOUT_MENU_TOGGLE_CONSOLE, STR_ABOUT_MENU_AI_DEBUG, STR_ABOUT_MENU_SCREENSHOT, STR_ABOUT_MENU_SHOW_FRAMERATE, STR_ABOUT_MENU_ABOUT_OPENTTD, STR_ABOUT_MENU_SPRITE_ALIGNER, STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES, STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS, STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES}); } else { PopupMainToolbarMenu(w, _game_mode == GM_EDITOR ? (WidgetID)WID_TE_HELP : (WidgetID)WID_TN_HELP, {STR_ABOUT_MENU_LAND_BLOCK_INFO, - CM_STR_ABOUT_MENU_LOGIN_WINDOW, STR_ABOUT_MENU_HELP, STR_NULL, STR_ABOUT_MENU_TOGGLE_CONSOLE, STR_ABOUT_MENU_AI_DEBUG, + CM_STR_LOGIN_WINDOW_CAPTION, STR_ABOUT_MENU_HELP, STR_NULL, STR_ABOUT_MENU_TOGGLE_CONSOLE, STR_ABOUT_MENU_AI_DEBUG, STR_ABOUT_MENU_SCREENSHOT, STR_ABOUT_MENU_SHOW_FRAMERATE, STR_ABOUT_MENU_ABOUT_OPENTTD}); } return CBF_NONE;