Merge branch 'server' of https://github.com/purerosefallen/ygopro

gframe/game.cpp

@@ -149,7 +149,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Charin", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Outsider", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

strings.conf

@@ -1007,6 +1007,6 @@
 !setname 0x130 破械
 !setname 0x1130 破械神
 !setname 0x131 梦镜	Dream Mirror
-!setname 0x132 斩机
-!setname 0x133 半龙女仆
-!setname 0x134 王战
+!setname 0x132 斩机	斬機
+!setname 0x133 半龙女仆	ドラゴンメイド
+!setname 0x134 王战	ジェネレイド