Merge branch 'wstest_3_28' into main

parts/language/lang_en.lua

@@ -75,7 +75,6 @@ return{
 	needUpdate="Newer version required!",
 	notFinished="Coming soon!",
 
-	httpCode="HTTP status code",
 	jsonError="JSON error",
 
 	noUsername="Please specify a username.",
@@ -90,10 +89,8 @@ return{
 	accessFailed="Access Denied.",
 	wsSuccessed="WebSocket: Connected.",
 	wsFailed="WebSocket: Connection Failed.",
-	wsDisconnected="WebSocket: Disconnected.",
-	wsNoConn="WebSocket: Not Connected.",
 	wsClose="WebSocket Closed: ",
-	waitNetTask="Connecting. Please wait...",
+	netTimeout="Network connection timeout",
 
 	createRoomTooFast="Hold on there! We can't handle this fast!",
 	createRoomSuccessed="Room successfully created!",
@@ -106,7 +103,6 @@ return{
 	chatStart="------Beginning of log------",
 	chatHistory="------New messages below------",
 
-	noRooms="Such emptiness much void, come back later?",
 	roomsCreateFailed="Failed to create room.",
 	roomsFetchFailed="Failed to fetch room list.",
 
@@ -252,7 +248,9 @@ return{
 			chat="Chat",
 		},
 		net_rooms={
-			fresh="Reresh",
+			refreshing="Refreshing Rooms",
+			noRoom="Such emptiness much void, come back later?",
+			refresh="Refresh",
 			new="New Room",
 			join="Join",
 			up="↑",

parts/language/lang_fr.lua

@@ -76,7 +76,6 @@ return{
 	-- needUpdate="Newer version required!",
 	-- notFinished="Coming soon!",
 
-	httpCode="Code de statut Http",
 	jsonError="Erreur json",
 
 	noUsername="Entrez votre nom d'utilisateur",
@@ -91,10 +90,8 @@ return{
 	accessFailed="Autorisation échouée",
 	wsSuccessed="WebSocket: connecté",
 	wsFailed="WebSocket: connection échouée",
-	wsDisconnected="WebSocket: déconnecté",
-	wsNoConn="WebSocket: vous n'êtes pas connecté",
-	wsError="Erreur WebSocket : ",
-	waitNetTask="Connexion, veuillez patienter",
+	-- wsClose="WebSocket Closed: ",
+	-- netTimeout="Network connection timeout",
 
 	createRoomTooFast="Vous avez créé un salon trop rapidement !",
 	createRoomSuccessed="Salon créé avec succès !",
@@ -107,7 +104,6 @@ return{
 	chatStart="--------Début des logs--------",
 	chatHistory="-Nouveaux messages en dessous-",
 
-	noRooms="Aucun salon actuellement",
 	roomsCreateFailed="Echec de la création du salon",
 	roomsFetchFailed="Echec de la récupération des salons",
 
@@ -186,7 +182,7 @@ return{
 		simple-love-lights [dylhunn]
 	]],
 	support="Aider le créateur",
-	group="Groupe QQ officiel (si non piraté) : 913154753",
+	group="Groupe QQ officiel : 913154753",
 	WidgetText={
 		main={
 			-- offline="Solo",
@@ -225,8 +221,9 @@ return{
 			chat="Chat",
 		},
 		net_rooms={
-			fresh="Fresh",
-			new="Nouveau salon",
+			-- refreshing="Refreshing Rooms",
+			noRoom="Aucun salon actuellement",
+			-- refresh="Refresh",
 			join="Rejoindre",
 			up="↑",
 			down="↓",

parts/language/lang_pt.lua

@@ -75,7 +75,6 @@ return{
 	-- needUpdate="Newer version required!",
 	-- notFinished="Coming soon!",
 
-	-- httpCode="Http status code",
 	jsonError="Json error",
 
 	noUsername="Insira seu nome de usuário",
@@ -90,10 +89,8 @@ return{
 	accessFailed="Falha na autorização",
 	wsSuccessed="WebSocket: conectado",
 	wsFailed="WebSocket: falha na conexão",
-	wsDisconnected="WebSocket: desconectado",
-	wsNoConn="WebSocket: você não está conectado",
 	wsClose="WebSocket closed: ",
-	waitNetTask="Conectando, aguarde",
+	-- netTimeout="Network connection timeout",
 
 	-- createRoomTooFast="Create room too fast!",
 	-- createRoomSuccessed="Room successfully created!",
@@ -106,7 +103,6 @@ return{
 	chatStart="------Começo do log------",
 	chatHistory="------Novas mensagens abaixo------",
 
-	noRooms="Nenhuma sala agora",
 	-- roomsCreateFailed="Failed to create room",
 	roomsFetchFailed="Falha ao buscar salas",
 
@@ -252,7 +248,9 @@ return{
 			chat="Chat",
 		},
 		net_rooms={
-			fresh="Fresh",
+			-- refreshing="Refreshing Rooms",
+			noRoom="Nenhuma sala agora",
+			-- refresh="Refresh",
 			-- new="New room",
 			-- join="Join",
 			up="↑",

parts/language/lang_sp.lua

@@ -76,11 +76,9 @@ return{
 	-- needUpdate="Newer version required!",
 	-- notFinished="Coming soon!",
 
-	-- httpCode="Http status code",
 	-- jsonError="Json error",
 
 	noUsername="Por favor ingresa un nombre de usuario",
-
 	-- wrongEmail="Wrong email address",
 	noPassword="Por favor ingresa una contraseña",
 	diffPassword="Las contraseñas no coinciden",
@@ -92,10 +90,8 @@ return{
 	-- accessFailed="Authorization failed",
 	-- wsSuccessed="WebSocket: connected",
 	-- wsFailed="WebSocket: connection failed",
-	-- wsDisconnected="WebSocket: disconnected",
-	-- wsNoConn="WebSocket: you are not connected",
 	-- wsClose="WebSocket closed: ",
-	-- waitNetTask="Connecting, please wait",
+	-- netTimeout="Network connection timeout",
 
 	-- createRoomTooFast="Create room too fast!",
 	-- createRoomSuccessed="Room successfully created!",
@@ -108,7 +104,6 @@ return{
 	-- chatStart="------Beginning of log------",
 	-- chatHistory="------New messages below------",
 
-	-- noRooms="No Rooms Now",
 	-- roomsCreateFailed="Failed to create room",
 	-- roomsFetchFailed="Failed to fetch rooms",
 
@@ -188,7 +183,7 @@ return{
 		simple-love-lights [dylhunn]
 	]],
 	support="Apoyen al Autor",
-	group="Grupo Oficial de QQ (si no lo hackean) : 913154753",
+	group="Grupo Oficial de QQ : 913154753",
 	WidgetText={
 		main={
 			-- offline="Single",
@@ -231,7 +226,9 @@ return{
 			-- chat="Chat",
 		},
 		net_rooms={
-			-- fresh="Fresh",
+			-- refreshing="Refreshing Rooms",
+			-- noRoom="No Rooms Now",
+			-- refresh="Refresh",
 			-- new="New room",
 			-- join="Join",
 			up="↑",

parts/language/lang_symbol.lua

@@ -83,11 +83,12 @@ return{
 		"□!!~~~,□□□□X",
 		"□!!==*/*/*/*~",
 		"",
-		"bug reports/suggestions, sent to the author's testing group or email ~",
-		"This is a free download available only through discord.gg/f9pUvkh",
-		"The game downloaded from other sources may contain viruses,",
-		"and only vibration & networking permissions are needed for mobile versions!",
-		"The author is not responsible for any losses from modifying the game.",
+		"Powered by LÖVE/love2d",
+		"Any suggestions or bug reports are appreciated!",
+		"Make sure to only obtain the game from official sources;",
+		"We can't make sure you're safe if you got it elsewhere.",
+		"The author is not responsible for any modified binaries.",
+		"While the game is free, donations are appreciated."
 	},
 	WidgetText={
 		main={

parts/language/lang_zh.lua

@@ -75,7 +75,6 @@ return{
 	needUpdate="此功能需要更新游戏!",
 	notFinished="暂未完成,敬请期待!",
 
-	httpCode="Http码",
 	jsonError="json错误",
 
 	noUsername="请填写用户名",
@@ -90,10 +89,8 @@ return{
 	accessFailed="身份验证失败",
 	wsSuccessed="WS连接成功",
 	wsFailed="WS连接失败",
-	wsDisconnected="WS连接断开",
-	wsNoConn="WS未连接",
 	wsClose="WS被断开: ",
-	waitNetTask="正在连接,请稍候",
+	netTimeout="网络连接超时",
 
 	createRoomTooFast="创建房间太快啦,等等吧",
 	createRoomSuccessed="创建房间成功!",
@@ -106,7 +103,6 @@ return{
 	chatStart="------消息的开头------",
 	chatHistory="------以上是历史消息------",
 
-	noRooms="一个房间都没有哎...",
 	roomsCreateFailed="创建房间失败",
 	roomsFetchFailed="拉取房间列表失败",
 
@@ -177,7 +173,7 @@ return{
 		"",
 		"使用LOVE2D引擎",
 		"错误或者建议请附带截图发送到内测群或者作者邮箱~",
-		"仅通过内测群1127702001进行免费下载/更新",
+		"仅通过内测qq群/discord群进行免费下载/更新",
 		"其他渠道获得游戏皆有被修改/加广告/植入病毒的风险,程序只申请了振动&联网权限!",
 		"若由于被修改的本游戏产生的各种损失作者不负责(我怎么负责啊跟我有啥关系)",
 		"请从正规途径获得最新版,游戏现为免费,不过有打赏当然感谢啦~",
@@ -209,7 +205,7 @@ return{
 		simple-love-lights [dylhunn]
 	]],
 	support="支持作者",
-	group="官方QQ群(如果没有被暗改的话就是这个):913154753",
+	group="官方QQ群:913154753",
 	WidgetText={
 		main={
 			offline="单机游戏",
@@ -252,7 +248,9 @@ return{
 			chat="聊天室",
 		},
 		net_rooms={
-			fresh="刷新",
+			refreshing="刷新房间列表中",
+			noRoom="一个房间都没有哎...",
+			refresh="刷新",
 			new="创建房间",
 			join="加入",
 			up="↑",