diff --git a/NETWORKING.md b/NETWORKING.md index 90770de7e..ba27e3183 100644 --- a/NETWORKING.md +++ b/NETWORKING.md @@ -168,7 +168,7 @@ By default STK servers use port `2759`. For example, in Ubuntu based distributio You may also need to handle the server discovery port `2757` for connecting your WAN server in LAN / localhost. -Notice: You don't need to make any firewall or router configuration changes if you connect to our trusted servers. +Notice: You don't need to make any firewall or router configuration changes if you connect to the recommended servers (marked with β˜†β˜…STKβ˜…β˜†). ### Hosting LAN (local internet) server Everything is basically the same as WAN one, except you don't need an stk online account, just do: diff --git a/data/gui/screens/help7.stkgui b/data/gui/screens/help7.stkgui index 85cdea60c..461e27225 100644 --- a/data/gui/screens/help7.stkgui +++ b/data/gui/screens/help7.stkgui @@ -33,7 +33,7 @@ + text="First, select the 'online' icon in the main menu. Choose either local networking, or global networking (requires internet to be enabled in the options). Then, you can either create your own server with custom options, or search among a list of existing servers to join. Some of them are recommended servers with optionally ranked races."/>
diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot index a80a99c52..24a03adec 100644 --- a/data/po/supertuxkart.pot +++ b/data/po/supertuxkart.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: supertuxkart\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-07 10:22+0800\n" +"POT-Creation-Date: 2019-04-11 13:33+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1526,8 +1526,8 @@ msgid "" "First, select the 'online' icon in the main menu. Choose either local " "networking, or global networking (requires internet to be enabled in the " "options). Then, you can either create your own server with custom options, " -"or search among a list of existing servers to join. Some of them are trusted " -"servers with optionally ranked races." +"or search among a list of existing servers to join. Some of them are " +"recommended servers with optionally ranked races." msgstr "" #. I18N: ./data/gui/screens/help7.stkgui @@ -3323,11 +3323,11 @@ msgid_plural "%i spare tire karts have been spawned!" msgstr[0] "" msgstr[1] "" -#: src/modes/world.cpp:1301 +#: src/modes/world.cpp:1303 msgid "You have been eliminated!" msgstr "" -#: src/modes/world.cpp:1308 +#: src/modes/world.cpp:1310 #, c-format msgid "'%s' has been eliminated." msgstr "" @@ -3502,7 +3502,7 @@ msgstr "" msgid "No quick play server available." msgstr "" -#: src/network/protocols/connect_to_server.cpp:283 +#: src/network/protocols/connect_to_server.cpp:290 #, c-format msgid "Cannot connect to server %s." msgstr "" @@ -3532,19 +3532,6 @@ msgstr "" msgid "Capture The Flag" msgstr "" -#. I18N: Official means this server is hosted by STK team -#: src/network/server.cpp:110 -msgid "Official" -msgstr "" - -#. I18N: Trusted means this server is trusted by team to not -#. doing any modification on server side, so players playing -#. in this server will not meet cheaters, and trusted server -#. will optionally host a ranked matching game -#: src/network/server.cpp:122 -msgid "Trusted" -msgstr "" - #: src/online/online_player_profile.cpp:434 #, c-format msgid "%s is now online." @@ -4610,11 +4597,11 @@ msgstr "" msgid "You completed a challenge!" msgstr "" -#: src/states_screens/grand_prix_win.cpp:320 +#: src/states_screens/grand_prix_win.cpp:319 msgid "You won the Grand Prix!" msgstr "" -#: src/states_screens/grand_prix_win.cpp:321 +#: src/states_screens/grand_prix_win.cpp:320 msgid "You completed the Grand Prix!" msgstr "" @@ -4772,7 +4759,7 @@ msgstr "" #. I18N: In kart screen, show before the voting period in network ends. #: src/states_screens/online/network_kart_selection.cpp:183 -#: src/states_screens/online/tracks_screen.cpp:847 +#: src/states_screens/online/tracks_screen.cpp:856 #, c-format msgid "Remaining time: %d" msgstr "" diff --git a/src/network/server.cpp b/src/network/server.cpp index 5092b5558..779b6167d 100644 --- a/src/network/server.cpp +++ b/src/network/server.cpp @@ -104,23 +104,8 @@ Server::Server(const XMLNode& server_info) : m_supports_encrytion(true) xml.get("official", &m_official); if (m_official) { - // TODO: I'll leave this string in so that we don't lose - // the translations already done, to be fixed as part of #3691 - // I18N: Official means this server is hosted by STK team - m_server_owner_name = _("Official"); - - // TODO: temporary work around for #3691: for now call all - // 'official' server 'trusted' (since most trusted servers are - // not operated by us). #3691 will introduce the various states - // required to properly distinguish between trusted, ranked, - // and official servers. - - // I18N: Trusted means this server is trusted by team to not - // doing any modification on server side, so players playing - // in this server will not meet cheaters, and trusted server - // will optionally host a ranked matching game - m_server_owner_name = _("Trusted"); - m_server_owner_lower_case_name = "trusted"; + m_server_owner_name = L"\u2606\u2605STK\u2605\u2606"; + m_server_owner_lower_case_name = "stk"; return; }