Merge branch 'master' of github.com:moecube/ygopro-database

locales/en-US/strings.conf

@@ -138,7 +138,7 @@
 !system 571 Select the zone to move to
 !system 572 Select a card to place counter
 !system 573 Select a card to negate
-!system 573 Select a card for operation
+!system 574 Select a card for operation
 !system 1000 Deck
 !system 1001 Hand
 !system 1002 Monster Zone
@@ -338,8 +338,8 @@
 !system 1285 Large
 !system 1286 Extra large
 !system 1287 Show Chain 1
-!system 1288 Language
-!system 1289 Default
+!system 1288 Ban List
+!system 1289 Language
 !system 1290 Mute Opponent
 !system 1290 Disable Chatting
 !system 1291 Mute spectators
@@ -476,11 +476,11 @@
 !system 1441 Zoom in
 !system 1442 Zoom out
 !system 1443 Restore size
-!system 1450 Pack Showcase
-!system 1451 AI Decks
+!system 1450 Packs list
+!system 1451 Bot deck
 !system 1452 Uncategorized
 !system 1453 --------
-!system 1460 Deck Management
+!system 1460 Deck Manage
 !system 1461 New Category
 !system 1462 Rename Category
 !system 1463 Delete Category
@@ -490,19 +490,19 @@
 !system 1467 Move to Category
 !system 1468 Copy to Category
 !system 1469 Category Name:
-!system 1470 Deleting the category and all decks under it, proceed?
-!system 1471 Please Enter Deck Name：
-!system 1472 Please choose category to move to：
-!system 1473 Please choose category to copy to：
-!system 1474 A category with the same name already exists.
-!system 1475 A deck with the same name already exists.
-!system 1476 Deletion failed
+!system 1470 Are you sure to delete this category and ALL DECKS under it?
+!system 1471 Deck name:
+!system 1472 Please select category to move to:
+!system 1473 Please select category to copy to:
+!system 1474 There is already a category with this name.
+!system 1475 There is already a deck with this name.
+!system 1476 Delete failed.
 !system 1500 The duel ended.
 !system 1501 Replay ended.
 !system 1502 Connection has been lost.
-!system 1510 Your choice:[%ls]
-!system 1511 Opponent declared:[%ls]
-!system 1512 Choice of opponent:[%d]
+!system 1510 Your choice: [%ls]
+!system 1511 Player declared: [%ls]
+!system 1512 Choice of player: [%d]
 !system 1600 Card position changed
 !system 1601 Set a card
 !system 1602 Change a card
@@ -639,6 +639,7 @@
 !counter 0x58 Counter(Nezumihanabi)
 !counter 0x59 Otoshidamashii Counters
 !counter 0x5a Counter(War Rock Ordeal)
+!counter 0x5b Counter(Ursarctic Big Dipper)
 #setnames, using tab for comment
 !setname 0x1 Ally of Justice
 !setname 0x2 Genex
@@ -1092,3 +1093,6 @@
 !setname 0x15e RDM
 !setname 0x15f War Rock
 !setname 0x160 Materiactor
+!setname 0x161 Abhyss
+!setname 0x162 Doremichord
+!setname 0x163 Ursarctic	

locales/zh-CN/strings.conf

@@ -338,8 +338,8 @@
 !system 1285 大
 !system 1286 特大
 !system 1287 只有连锁1也显示连锁动画
-!system 1288 语言（重启后生效）
-!system 1289 默认
+!system 1288 禁限卡表
+!system 1289 语言（重启后生效）
 !system 1290 忽略对方发言
 !system 1291 忽略观战者发言
 !system 1292 忽略时点
@@ -404,7 +404,7 @@
 !system 1352 主要信息：
 !system 1353 播放起始于回合：
 !system 1355 是否确定盖放[%ls]？
-!system 1356 是否要放弃对卡组的修改？
+!system 1356 此操作将放弃对当前卡组的修改，是否继续？
 !system 1357 不提示保留对卡组的修改
 !system 1358 键入关键字后自动进行搜索
 !system 1359 是否确定投降？
@@ -635,6 +635,7 @@
 !counter 0x58 指示物（祢须三破鸣比）
 !counter 0x59 落魂指示物
 !counter 0x5a 指示物（岩战之试炼）
+!counter 0x5b 指示物（北极天熊北斗星）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1095,3 +1096,6 @@
 !setname 0x15e 降阶魔法	RDM
 !setname 0x15f 岩战	War Rock
 !setname 0x160 源质兽	Materiactor
+!setname 0x161 溟界
+!setname 0x162 七音服	ドレミコード
+!setname 0x163 北极天熊	ベアルクティ