Merge branch 'master' into server

gframe/client_card.cpp

@@ -125,6 +125,8 @@ void ClientCard::UpdateInfo(char* buf) {
 		base_defense = BufferIO::ReadInt32(buf);
 	if(flag & QUERY_REASON)
 		reason = BufferIO::ReadInt32(buf);
+	if(flag & QUERY_REASON_CARD)
+		BufferIO::ReadInt32(buf);
 	if(flag & QUERY_EQUIP_CARD) {
 		int c = BufferIO::ReadInt8(buf);
 		int l = BufferIO::ReadInt8(buf);

gframe/game.cpp

@@ -1088,7 +1088,6 @@ void Game::RefreshSingleplay() {
 void Game::RefreshLocales() {
 	cbLocale->clear();
 	cbLocale->addItem(L"default");
-	cbLocale->clear();
 	FileSystem::TraversalDir(L"./locales", [this](const wchar_t* name, bool isdir) {
 		if(isdir && wcscmp(name, L".") && wcscmp(name, L".."))
 			cbLocale->addItem(name);

script @ 7329a586

-Subproject commit beb61ff9ab0e46a62e6d88cd6d23da7aa55ad8e1
+Subproject commit 7329a586f49de069af12f3fb1656ee6adfd3fd76

strings.conf

@@ -939,3 +939,4 @@
 !setname 0x121 魔妖
 !setname 0x122 女武神	Valkyrie
 !setname 0x123 蔷薇龙	ローズ・ドラゴン
+!setname 0x124 机械天使	機械天使