mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Rename: Loopback -> Offline (#6300)

pull/6313/head
Eric Robinson 3 years ago committed by GitHub
parent
8e7c29ecd3
commit
074a1f2e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 71 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Source/DiabloUI/multi/selconn.cpp
  2. 6
      Source/automap.cpp
  3. 2
      Source/dvlnet/loopback.cpp
  4. 1
      Source/multi.cpp
  5. 1
      Source/multi.h
  6. 5
      Translations/bg.po
  7. 5
      Translations/cs.po
  8. 7
      Translations/da.po
  9. 5
      Translations/de.po
  10. 4
      Translations/devilutionx.pot
  11. 5
      Translations/el.po
  12. 7
      Translations/es.po
  13. 5
      Translations/fr.po
  14. 5
      Translations/hr.po
  15. 5
      Translations/it.po
  16. 7
      Translations/ja.po
  17. 5
      Translations/ko.po
  18. 5
      Translations/pl.po
  19. 5
      Translations/pt_BR.po
  20. 5
      Translations/ro.po
  21. 5
      Translations/ru.po
  22. 5
      Translations/sv.po
  23. 5
      Translations/uk.po
  24. 5
      Translations/zh_CN.po
  25. 5
      Translations/zh_TW.po

2
Source/DiabloUI/multi/selconn.cpp
Unescape View File

@ -12,7 +12,7 @@ int provider;
const char *ConnectionNames[] {
"ZeroTier",
N_("Client-Server (TCP)"),
N_("Loopback"),
N_("Offline"),
};
namespace {

6
Source/automap.cpp
Unescape View File

@ -719,7 +719,7 @@ void DrawAutomapText(const Surface &out)
Point linePosition { 8, 8 };
if (gbIsMultiplayer) {
if (GameName != "0.0.0.0") {
if (GameName != "0.0.0.0" && !IsLoopback) {
std::string description = std::string(_("Game: "));
description.append(GameName);
DrawString(out, description, linePosition);
@ -727,7 +727,9 @@ void DrawAutomapText(const Surface &out)
}
std::string description;
if (!PublicGame) {
if (IsLoopback) {
description = std::string(_("Offline Game"));
} else if (!PublicGame) {
description = std::string(_("Password: "));
description.append(GamePassword);
} else {

2
Source/dvlnet/loopback.cpp
Unescape View File

@ -12,6 +12,7 @@ namespace net {
int loopback::create(std::string /*addrstr*/)
{
IsLoopback = true;
return plr_single;
}
@ -87,6 +88,7 @@ bool loopback::SNetUnregisterEventHandler(event_type /*evtype*/)
bool loopback::SNetLeaveGame(int /*type*/)
{
IsLoopback = false;
return true;
}

1
Source/multi.cpp
Unescape View File

@ -62,6 +62,7 @@ uint8_t gbDeltaSender;
bool sgbNetInited;
uint32_t player_state[MAX_PLRS];
Uint32 playerInfoTimers[MAX_PLRS];
bool IsLoopback;
/**
* Contains the set of supported event types supported by the multiplayer

1
Source/multi.h
Unescape View File

@ -53,6 +53,7 @@ extern std::string GamePassword;
extern bool PublicGame;
extern uint8_t gbDeltaSender;
extern uint32_t player_state[MAX_PLRS];
extern bool IsLoopback;
void InitGameInfo();
void NetSendLoPri(int playerId, const byte *data, size_t size);

5
Translations/bg.po
Unescape View File

@ -368,7 +368,8 @@ msgid "Client-Server (TCP)"
msgstr "Клиент-сървър (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Обратна връзка"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1469,7 +1470,7 @@ msgstr "{} трудност"
msgid "In Menu"
msgstr "В меню"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "Обратна връзка"

5
Translations/cs.po
Unescape View File

@ -367,7 +367,8 @@ msgid "Client-Server (TCP)"
msgstr "Klient-Server (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Smyčka"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1467,7 +1468,7 @@ msgstr "{} obtížnost"
msgid "In Menu"
msgstr "V Menu"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "zpětná vazba"

7
Translations/da.po
Unescape View File

@ -393,7 +393,8 @@ msgid "Client-Server (TCP)"
msgstr "Klient-server (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Loopback"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1607,9 +1608,9 @@ msgstr "Vælg sværhedsgrad"
msgid "In Menu"
msgstr "Forrige menu"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
#, fuzzy
#| msgid "Loopback"
#| msgid "loopback"
msgid "loopback"
msgstr "Loopback"

5
Translations/de.po
Unescape View File

@ -368,7 +368,8 @@ msgid "Client-Server (TCP)"
msgstr "Client-Server (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Loopback"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1475,7 +1476,7 @@ msgstr "Schwierigkeitsgrad: {}"
msgid "In Menu"
msgstr "Im Hauptmenü"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "Loopback"

4
Translations/devilutionx.pot
Unescape View File

@ -362,7 +362,7 @@ msgid "Client-Server (TCP)"
msgstr ""
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
msgid "Offline"
msgstr ""
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1374,7 +1374,7 @@ msgstr ""
msgid "In Menu"
msgstr ""
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr ""

5
Translations/el.po
Unescape View File

@ -495,7 +495,8 @@ msgid "Client-Server (TCP)"
msgstr "Διακομιστή-πελάτη (TCP)"
#: Source/DiabloUI/multi/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Βρόχος επιστροφής"
#: Source/DiabloUI/multi/selconn.cpp:56 Source/DiabloUI/multi/selgame.cpp:647
@ -1783,7 +1784,7 @@ msgstr "Δυσκολία {}"
msgid "In Menu"
msgstr "Στο Μενού"
#: Source/dvlnet/loopback.cpp:116
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "βρόχος επιστροφής"

7
Translations/es.po
Unescape View File

@ -370,7 +370,8 @@ msgid "Client-Server (TCP)"
msgstr "Cliente-Servidor (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Loopback"
#: Source/DiabloUI/selconn.cpp:56 Source/DiabloUI/selgame.cpp:645
@ -1744,8 +1745,8 @@ msgstr "{} dificultad"
msgid "In Menu"
msgstr "En Menú"
#: Source/dvlnet/loopback.cpp:114
msgid "loopback"
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "loopback"
#: Source/dvlnet/tcp_client.cpp:65

5
Translations/fr.po
Unescape View File

@ -367,7 +367,8 @@ msgid "Client-Server (TCP)"
msgstr "Client-Serveur (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Rebouclage (Loopback)"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1475,7 +1476,7 @@ msgstr "Difficulté {}"
msgid "In Menu"
msgstr "Dans le Menu"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "rebouclage (loopback)"

5
Translations/hr.po
Unescape View File

@ -369,7 +369,8 @@ msgid "Client-Server (TCP)"
msgstr "Klijent-Poslužitelj (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Izvanmrežno"
#: Source/DiabloUI/selconn.cpp:56 Source/DiabloUI/selgame.cpp:634
@ -1468,7 +1469,7 @@ msgstr "{} težina"
msgid "In Menu"
msgstr "U izbornik"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "izvanmrežno"

5
Translations/it.po
Unescape View File

@ -508,7 +508,8 @@ msgid "Client-Server (TCP)"
msgstr "Client-Server (TCP)"
#: Source/DiabloUI/multi/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Loopback"
#: Source/DiabloUI/multi/selconn.cpp:56 Source/DiabloUI/multi/selgame.cpp:645
@ -1783,7 +1784,7 @@ msgstr "Difficoltà {}"
msgid "In Menu"
msgstr "Nel Menu"
#: Source/dvlnet/loopback.cpp:114
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "loopback"

7
Translations/ja.po
Unescape View File

@ -366,7 +366,8 @@ msgid "Client-Server (TCP)"
msgstr "クライアント - サーバー (​TCP​)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "ループ​バック"
#: Source/DiabloUI/selconn.cpp:56 Source/DiabloUI/selgame.cpp:638
@ -1705,8 +1706,8 @@ msgstr "{} 難易度"
msgid "In Menu"
msgstr "メニュー​に​ある"
#: Source/dvlnet/loopback.cpp:114
msgid "loopback"
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "loopback"
#: Source/dvlnet/tcp_client.cpp:65

5
Translations/ko.po
Unescape View File

@ -498,7 +498,8 @@ msgid "Client-Server (TCP)"
msgstr "클라이언트-서버 (TCP)"
#: Source/DiabloUI/multi/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "루프백"
#: Source/DiabloUI/multi/selconn.cpp:56 Source/DiabloUI/multi/selgame.cpp:647
@ -1764,7 +1765,7 @@ msgstr "{} 난이도"
msgid "In Menu"
msgstr "메뉴"
#: Source/dvlnet/loopback.cpp:116
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "루프백"

5
Translations/pl.po
Unescape View File

@ -370,7 +370,8 @@ msgid "Client-Server (TCP)"
msgstr "Klient-Serwer (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Loopback"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1475,7 +1476,7 @@ msgstr "{} Poziom Trudności"
msgid "In Menu"
msgstr "W Menu"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "loopback"

5
Translations/pt_BR.po
Unescape View File

@ -370,7 +370,8 @@ msgid "Client-Server (TCP)"
msgstr "Cliente-Servidor (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Loopback"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1473,7 +1474,7 @@ msgstr "Dificuldade {}"
msgid "In Menu"
msgstr "No Menu"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "loopback"

5
Translations/ro.po
Unescape View File

@ -367,7 +367,8 @@ msgid "Client-Server (TCP)"
msgstr "Client-Server (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Local"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1544,7 +1545,7 @@ msgstr "Sel. dificultate"
msgid "In Menu"
msgstr "Meniu"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "local"

5
Translations/ru.po
Unescape View File

@ -377,7 +377,8 @@ msgid "Client-Server (TCP)"
msgstr "Клиент-сервер (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Петля"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1498,7 +1499,7 @@ msgstr "{} сложность"
msgid "In Menu"
msgstr "В меню"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "петля"

5
Translations/sv.po
Unescape View File

@ -367,7 +367,8 @@ msgid "Client-Server (TCP)"
msgstr "Klient-Server (TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Loopback"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1466,7 +1467,7 @@ msgstr "{} svårighetsgrad"
msgid "In Menu"
msgstr "I Menyn"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "loopback"

5
Translations/uk.po
Unescape View File

@ -505,7 +505,8 @@ msgid "Client-Server (TCP)"
msgstr "Клієнт-Сервер (TCP)"
#: Source/DiabloUI/multi/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "Петльова адреса"
#: Source/DiabloUI/multi/selconn.cpp:56 Source/DiabloUI/multi/selgame.cpp:647
@ -1785,7 +1786,7 @@ msgstr "{} Складність"
msgid "In Menu"
msgstr "В Меню"
#: Source/dvlnet/loopback.cpp:116
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "петльова адреса"

5
Translations/zh_CN.po
Unescape View File

@ -368,7 +368,8 @@ msgid "Client-Server (TCP)"
msgstr "客户​端​-​服务器​(​TCP)"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "回环"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1448,7 +1449,7 @@ msgstr "难度​：​{}"
msgid "In Menu"
msgstr "菜​单​中"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "环回"

5
Translations/zh_TW.po
Unescape View File

@ -370,7 +370,8 @@ msgid "Client-Server (TCP)"
msgstr "客​戶端伺服器​（​TCP​）"
#: Source/DiabloUI/selconn.cpp:15
msgid "Loopback"
#, fuzzy
msgid "Offline"
msgstr "環​回"
#: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604
@ -1549,7 +1550,7 @@ msgstr "選​擇​難度"
msgid "In Menu"
msgstr "主​菜單"
#: Source/dvlnet/loopback.cpp:113
#: Source/dvlnet/loopback.cpp:118
msgid "loopback"
msgstr "環​回"

Write Preview
Loading…
Cancel
Save