diff --git a/HSTracker/HSReplay/Base.lproj/HSReplayPreferences.xib b/HSTracker/HSReplay/Base.lproj/HSReplayPreferences.xib
index a5f5ac4c6..1540b8f2f 100644
--- a/HSTracker/HSReplay/Base.lproj/HSReplayPreferences.xib
+++ b/HSTracker/HSReplay/Base.lproj/HSReplayPreferences.xib
@@ -212,7 +212,7 @@
                                     <action selector="oauthAccount:" target="-2" id="jQ7-3D-y0c"/>
                                 </connections>
                             </button>
-                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8vg-lb-UfO">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8vg-lb-UfO">
                                 <rect key="frame" x="8" y="10" width="384" height="32"/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Login to claim your replays and enable all HSReplay.net features." id="zQQ-GF-3Lg">
                                     <font key="font" metaFont="system"/>
@@ -236,7 +236,7 @@
                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pY7-IO-Y3U">
                     <rect key="frame" x="20" y="20" width="400" height="134"/>
                     <subviews>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Cho-Aw-fPX">
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Cho-Aw-fPX">
                             <rect key="frame" x="-2" y="118" width="13" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="X" id="fXm-MH-vJc">
                                 <font key="font" usesAppearanceFont="YES"/>
@@ -251,7 +251,7 @@
                         <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LJN-bu-4T2">
                             <rect key="frame" x="17" y="86" width="383" height="48"/>
                             <subviews>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jN5-VM-fr0">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jN5-VM-fr0">
                                     <rect key="frame" x="-2" y="32" width="122" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Subscription status" id="7ln-3f-To8">
                                         <font key="font" metaFont="system"/>
@@ -262,7 +262,7 @@
                                         <binding destination="-2" name="value" keyPath="self.subscriptionStatusText" id="9Zi-Rg-1Hd"/>
                                     </connections>
                                 </textField>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dVH-bb-ulp">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dVH-bb-ulp">
                                     <rect key="frame" x="-2" y="16" width="179" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Thank you for supporting us!" id="sW4-mJ-KZE">
                                         <font key="font" metaFont="system"/>
diff --git a/HSTracker/HSReplay/mul.lproj/HSReplayPreferences.xcstrings b/HSTracker/HSReplay/mul.lproj/HSReplayPreferences.xcstrings
index 2994242de..ffc5030bf 100644
--- a/HSTracker/HSReplay/mul.lproj/HSReplayPreferences.xcstrings
+++ b/HSTracker/HSReplay/mul.lproj/HSReplayPreferences.xcstrings
@@ -521,6 +521,12 @@
             "value" : "Reset Account"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "重置账号"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -1124,7 +1130,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "在连接 HSReplay 后，打开你的收藏，上传会自动进行。"
+            "value" : "登录以同步你的回放并启用HSReplay.net的所有功能。"
           }
         }
       }
diff --git a/HSTracker/UIs/DeckManager/Base.lproj/NewDeck.xib b/HSTracker/UIs/DeckManager/Base.lproj/NewDeck.xib
index dd458ba6d..645b7bcfc 100644
--- a/HSTracker/UIs/DeckManager/Base.lproj/NewDeck.xib
+++ b/HSTracker/UIs/DeckManager/Base.lproj/NewDeck.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24765" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24765"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -25,13 +25,13 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="480" height="212"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1728" height="1079"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="949"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="490" height="212"/>
+                <rect key="frame" x="0.0" y="0.0" width="486" height="212"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="440" translatesAutoresizingMaskIntoConstraints="NO" id="YM1-PJ-coX">
-                        <rect key="frame" x="18" y="186" width="454" height="16"/>
+                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="440" translatesAutoresizingMaskIntoConstraints="NO" id="YM1-PJ-coX">
+                        <rect key="frame" x="18" y="186" width="450" height="16"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="How do you want to create your new deck ?" id="bnr-YF-pLP">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -39,7 +39,7 @@
                         </textFieldCell>
                     </textField>
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="HQy-Fh-m0E">
-                        <rect key="frame" x="18" y="149" width="206" height="18"/>
+                        <rect key="frame" x="20" y="150" width="203" height="16"/>
                         <buttonCell key="cell" type="radio" title="Using HSTracker deck builder" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="N10-sK-1gZ">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
@@ -49,14 +49,14 @@
                         </connections>
                     </button>
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="Hi4-1P-a8c">
-                        <rect key="frame" x="242" y="120" width="148" height="18"/>
+                        <rect key="frame" x="243" y="105" width="143" height="32"/>
                         <buttonCell key="cell" type="check" title="Arena or Brawl deck" bezelStyle="regularSquare" imagePosition="left" inset="2" id="0dN-Ei-UM2">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                     </button>
                     <button horizontalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="CZt-Rl-BuG">
-                        <rect key="frame" x="18" y="96" width="452" height="18"/>
+                        <rect key="frame" x="20" y="81" width="446" height="16"/>
                         <buttonCell key="cell" type="radio" title="From the Clipboard" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="OSn-2r-6E8">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
@@ -66,7 +66,7 @@
                         </connections>
                     </button>
                     <button horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zId-Z2-sHp">
-                        <rect key="frame" x="375" y="47" width="102" height="32"/>
+                        <rect key="frame" x="374" y="36" width="92" height="24"/>
                         <buttonCell key="cell" type="push" title="Choose file" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="xPi-Gg-ebR">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -76,7 +76,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5rB-EX-IcR">
-                        <rect key="frame" x="424" y="13" width="53" height="32"/>
+                        <rect key="frame" x="424" y="20" width="42" height="24"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="trs-D1-mgZ">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -89,7 +89,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kOn-oh-tpj">
-                        <rect key="frame" x="352" y="13" width="76" height="32"/>
+                        <rect key="frame" x="348" y="20" width="66" height="24"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="0dg-Pr-Io8">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -102,18 +102,18 @@ Gw
                         </connections>
                     </button>
                     <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="AnM-ox-JdV">
-                        <rect key="frame" x="333" y="22" width="16" height="16"/>
+                        <rect key="frame" x="322" y="24" width="16" height="16"/>
                     </progressIndicator>
                     <popUpButton springLoaded="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mqd-Tw-L0d">
-                        <rect key="frame" x="241" y="142" width="233" height="25"/>
+                        <rect key="frame" x="243" y="146" width="223" height="24"/>
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="sXW-5w-NLm">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="message"/>
                             <menu key="menu" id="YSM-KE-dJ1"/>
                         </popUpButtonCell>
                     </popUpButton>
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="cZL-u5-ElV">
-                        <rect key="frame" x="18" y="55" width="354" height="18"/>
+                        <rect key="frame" x="20" y="40" width="344" height="16"/>
                         <buttonCell key="cell" type="radio" title="From a file" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="tHo-vJ-FwV">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
diff --git a/HSTracker/UIs/DeckManager/mul.lproj/DeckManager.xcstrings b/HSTracker/UIs/DeckManager/mul.lproj/DeckManager.xcstrings
index 225638e4e..c88b19a1b 100644
--- a/HSTracker/UIs/DeckManager/mul.lproj/DeckManager.xcstrings
+++ b/HSTracker/UIs/DeckManager/mul.lproj/DeckManager.xcstrings
@@ -248,7 +248,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "使用套牌"
+            "value" : "使用卡组"
           }
         },
         "zh-Hant" : {
@@ -338,7 +338,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "使用套牌"
+            "value" : "使用卡组"
           }
         },
         "zh-Hant" : {
@@ -476,7 +476,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "新建套牌"
+            "value" : "新建卡组"
           }
         },
         "zh-Hant" : {
@@ -566,7 +566,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "新建套牌"
+            "value" : "新建卡组"
           }
         },
         "zh-Hant" : {
@@ -656,7 +656,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "删除套牌"
+            "value" : "删除卡组"
           }
         },
         "zh-Hant" : {
@@ -746,7 +746,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "删除套牌"
+            "value" : "删除卡组"
           }
         },
         "zh-Hant" : {
@@ -872,7 +872,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "修改套牌"
+            "value" : "修改卡组"
           }
         },
         "zh-Hant" : {
@@ -962,7 +962,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "修改套牌"
+            "value" : "修改卡组"
           }
         },
         "zh-Hant" : {
@@ -1946,7 +1946,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "重命名套牌"
+            "value" : "重命名卡组"
           }
         },
         "zh-Hant" : {
@@ -2036,7 +2036,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "重命名套牌"
+            "value" : "重命名卡组"
           }
         },
         "zh-Hant" : {
@@ -2126,7 +2126,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "套牌管理器"
+            "value" : "卡组管理器"
           }
         },
         "zh-Hant" : {
diff --git a/HSTracker/UIs/DeckManager/mul.lproj/EditDeck.xcstrings b/HSTracker/UIs/DeckManager/mul.lproj/EditDeck.xcstrings
index c4c1d704e..c7b7eab61 100644
--- a/HSTracker/UIs/DeckManager/mul.lproj/EditDeck.xcstrings
+++ b/HSTracker/UIs/DeckManager/mul.lproj/EditDeck.xcstrings
@@ -1466,7 +1466,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "修改套牌"
+            "value" : "修改卡组"
           }
         },
         "zh-Hant" : {
diff --git a/HSTracker/UIs/DeckManager/mul.lproj/NewDeck.xcstrings b/HSTracker/UIs/DeckManager/mul.lproj/NewDeck.xcstrings
index f182e857c..7c35cae3c 100644
--- a/HSTracker/UIs/DeckManager/mul.lproj/NewDeck.xcstrings
+++ b/HSTracker/UIs/DeckManager/mul.lproj/NewDeck.xcstrings
@@ -170,7 +170,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "竞技模式套牌"
+            "value" : "竞技模式卡组"
           }
         },
         "zh-Hant" : {
@@ -260,7 +260,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "你想如何创建新的套牌?"
+            "value" : "你想如何创建新的卡组?"
           }
         },
         "zh-Hant" : {
@@ -398,7 +398,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "使用 HSTracker 构建套牌"
+            "value" : "使用 HSTracker 构建卡组"
           }
         },
         "zh-Hant" : {
@@ -578,7 +578,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "新套牌"
+            "value" : "新卡组"
           }
         },
         "zh-Hant" : {
diff --git a/HSTracker/UIs/DeckManager/mul.lproj/SaveDeck.xcstrings b/HSTracker/UIs/DeckManager/mul.lproj/SaveDeck.xcstrings
index baa8cf5d3..f9df436e8 100644
--- a/HSTracker/UIs/DeckManager/mul.lproj/SaveDeck.xcstrings
+++ b/HSTracker/UIs/DeckManager/mul.lproj/SaveDeck.xcstrings
@@ -170,7 +170,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "套牌名称"
+            "value" : "卡组名称"
           }
         },
         "zh-Hant" : {
diff --git a/HSTracker/UIs/Preferences/mul.lproj/GamePreferences.xcstrings b/HSTracker/UIs/Preferences/mul.lproj/GamePreferences.xcstrings
index 0feb7525d..427912921 100644
--- a/HSTracker/UIs/Preferences/mul.lproj/GamePreferences.xcstrings
+++ b/HSTracker/UIs/Preferences/mul.lproj/GamePreferences.xcstrings
@@ -34,6 +34,12 @@
             "state" : "translated",
             "value" : "Escolher"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "9aT-vn-YLp.title"
+          }
         }
       }
     },
@@ -116,7 +122,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "炉石传说语言"
+            "value" : "炉石传说 语言"
           }
         },
         "zh-Hant" : {
@@ -176,7 +182,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "在每轮结束时，自动存储竞技模式套牌"
+            "value" : "每轮结束自动储存竞技模式卡组"
           }
         },
         "zh-Hant" : {
@@ -356,7 +362,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "自动导入并选择套牌"
+            "value" : "自动导入并选择卡组"
           }
         },
         "zh-Hant" : {
@@ -536,7 +542,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "炉石传说目录"
+            "value" : "炉石传说 目录"
           }
         },
         "zh-Hant" : {
@@ -580,6 +586,12 @@
             "state" : "translated",
             "value" : "Diretório de backup dos Decks"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ZIv-Kx-0sm.title"
+          }
         }
       }
     }
diff --git a/HSTracker/UIs/Preferences/mul.lproj/GeneralPreferences.xcstrings b/HSTracker/UIs/Preferences/mul.lproj/GeneralPreferences.xcstrings
index 68109fe11..8cfac51e8 100644
--- a/HSTracker/UIs/Preferences/mul.lproj/GeneralPreferences.xcstrings
+++ b/HSTracker/UIs/Preferences/mul.lproj/GeneralPreferences.xcstrings
@@ -80,7 +80,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "将套牌导入炉石传说时，优先使用金色卡牌"
+            "value" : "将卡组导入炉石传说时，优先使用金色卡牌"
           }
         },
         "zh-Hant" : {
diff --git a/HSTracker/UIs/Preferences/mul.lproj/InitialConfiguration.xcstrings b/HSTracker/UIs/Preferences/mul.lproj/InitialConfiguration.xcstrings
index 9d3e5e5c9..b81fdcb61 100644
--- a/HSTracker/UIs/Preferences/mul.lproj/InitialConfiguration.xcstrings
+++ b/HSTracker/UIs/Preferences/mul.lproj/InitialConfiguration.xcstrings
@@ -80,7 +80,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "炉石传说语言"
+            "value" : "炉石传说 语言"
           }
         },
         "zh-Hant" : {
diff --git a/HSTracker/UIs/Preferences/mul.lproj/OpponentTrackersPreferences.xcstrings b/HSTracker/UIs/Preferences/mul.lproj/OpponentTrackersPreferences.xcstrings
index e88696598..939d9ede1 100644
--- a/HSTracker/UIs/Preferences/mul.lproj/OpponentTrackersPreferences.xcstrings
+++ b/HSTracker/UIs/Preferences/mul.lproj/OpponentTrackersPreferences.xcstrings
@@ -266,7 +266,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示对手抽卡机会"
+            "value" : "显示对手抽牌机率"
           }
         },
         "zh-Hant" : {
@@ -356,7 +356,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示对手英雄和名字"
+            "value" : "显示对手职业和名字"
           }
         },
         "zh-Hant" : {
@@ -632,7 +632,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "清空对手记牌器"
+            "value" : "对局结束清空对手记牌器"
           }
         },
         "zh-Hant" : {
@@ -722,7 +722,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示场攻（包括武器）"
+            "value" : "显示场攻"
           }
         },
         "zh-Hant" : {
@@ -812,7 +812,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示对手的卡牌数"
+            "value" : "显示对手卡牌数"
           }
         },
         "zh-Hant" : {
@@ -832,6 +832,12 @@
             "state" : "new",
             "value" : "Show counters"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示计数器"
+          }
         }
       }
     },
@@ -844,6 +850,12 @@
             "state" : "new",
             "value" : "Show active effects"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示激活效果"
+          }
         }
       }
     },
@@ -856,6 +868,12 @@
             "state" : "new",
             "value" : "Show maximum Health, Mana, and Hand Size"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示血量、法力水晶和手牌数上限"
+          }
         }
       }
     },
@@ -998,7 +1016,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "鼠标进入时显示卡牌列表"
+            "value" : "鼠标悬停显示卡牌列表"
           }
         },
         "zh-Hant" : {
@@ -1108,6 +1126,12 @@
             "state" : "new",
             "value" : "Show related cards tooltip"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示相关卡牌提示信息"
+          }
         }
       }
     },
@@ -1177,67 +1201,73 @@
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Zeige gegnerischen C'Thun-Counter"
           }
         },
-        "es" : {
+        "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Show C'Thun counter"
           }
         },
+        "es" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Show C'Thun counter"
+          }
+        },
         "es-MX" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Show C'Thun counter"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Voir le compteur C'Thun"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Show C'Thun counter"
           }
         },
         "ja" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Show C'Thun counter"
           }
         },
         "ko" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "S크툰 카운터 보여주기"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Show C'Thun counter"
           }
         },
         "pt-BR" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Show C'Thun counter"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Show C'Thun counter"
           }
         },
         "th-TH" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Show C'Thun counter"
           }
         },
@@ -1249,7 +1279,7 @@
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "顯示克蘇恩計算器"
           }
         }
@@ -1324,6 +1354,12 @@
             "state" : "new",
             "value" : "Enable setting opponent deck in non-friendly matches"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "在非好友对战中启用对手卡组设置"
+          }
         }
       }
     }
diff --git a/HSTracker/UIs/Preferences/mul.lproj/PlayerTrackersPreferences.xcstrings b/HSTracker/UIs/Preferences/mul.lproj/PlayerTrackersPreferences.xcstrings
index c3bb57242..96ed33fdb 100644
--- a/HSTracker/UIs/Preferences/mul.lproj/PlayerTrackersPreferences.xcstrings
+++ b/HSTracker/UIs/Preferences/mul.lproj/PlayerTrackersPreferences.xcstrings
@@ -50,7 +50,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "鼠标进入时显示卡牌列表"
+            "value" : "鼠标悬停显示卡牌列表"
           }
         },
         "zh-Hant" : {
@@ -200,7 +200,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示你的抽卡机会"
+            "value" : "显示你的抽牌机率"
           }
         },
         "zh-Hant" : {
@@ -220,6 +220,12 @@
             "state" : "new",
             "value" : "Highlight synergies in the deck"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "高亮卡组中的配合卡牌"
+          }
         }
       }
     },
@@ -256,6 +262,12 @@
             "state" : "translated",
             "value" : "Mostrar cemitério"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "D65-CQ-243.title"
+          }
         }
       }
     },
@@ -338,7 +350,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示套牌名称"
+            "value" : "显示卡组名称"
           }
         },
         "zh-Hant" : {
@@ -358,6 +370,12 @@
             "state" : "new",
             "value" : "E.T.C.'s Band"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "精英牛头人酋长的乐队"
+          }
         }
       }
     },
@@ -370,6 +388,12 @@
             "state" : "new",
             "value" : "Show counters"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示计数器"
+          }
         }
       }
     },
@@ -542,7 +566,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "抽的卡牌在记牌器上闪烁"
+            "value" : "抽到的牌在记牌器上闪烁"
           }
         },
         "zh-Hant" : {
@@ -682,6 +706,12 @@
             "state" : "new",
             "value" : "Show related cards tooltip"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示相关卡牌提示信息"
+          }
         }
       }
     },
@@ -950,7 +980,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示记牌器"
+            "value" : "显示你的记牌器"
           }
         },
         "zh-Hant" : {
@@ -1006,6 +1036,12 @@
             "state" : "translated",
             "value" : "Mostrar percentagem vitória-derrota"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "oIi-8e-cCP.title"
+          }
         }
       }
     },
@@ -1178,7 +1214,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示场攻（包括武器）"
+            "value" : "显示场攻"
           }
         },
         "zh-Hant" : {
@@ -1432,6 +1468,12 @@
             "state" : "new",
             "value" : "Show maximum Health, Mana, and Hand Size"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示血量、法力水晶和手牌数上限"
+          }
         }
       }
     },
@@ -1444,6 +1486,12 @@
             "state" : "new",
             "value" : "Show active effects"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示激活效果"
+          }
         }
       }
     }
diff --git a/HSTracker/UIs/Preferences/mul.lproj/TrackersPreferences.xcstrings b/HSTracker/UIs/Preferences/mul.lproj/TrackersPreferences.xcstrings
index e6eafeb80..60bb3c8e8 100644
--- a/HSTracker/UIs/Preferences/mul.lproj/TrackersPreferences.xcstrings
+++ b/HSTracker/UIs/Preferences/mul.lproj/TrackersPreferences.xcstrings
@@ -98,7 +98,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "自动移动记牌器"
+            "value" : "自动设定记牌器位置"
           }
         },
         "zh-Hant" : {
@@ -419,6 +419,12 @@
             "value" : "HSTracker will be visible on all your workspace while playing"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "游戏时，记牌器会在你的所有桌面显示"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -886,6 +892,12 @@
             "state" : "new",
             "value" : "Enable Mulligan Guide"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "启用起手留牌指南"
+          }
         }
       }
     },
@@ -1058,7 +1070,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "寒冰"
+            "value" : "冰霜"
           }
         },
         "zh-Hant" : {
@@ -1262,7 +1274,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示风味文字"
+            "value" : "显示卡牌趣文"
           }
         }
       }
@@ -1310,7 +1322,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示抽卡机会"
+            "value" : "显示抽牌机率"
           }
         },
         "zh-Hant" : {
@@ -1592,7 +1604,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示构造调度建议"
+            "value" : "构筑模式中显示起手留牌指南"
           }
         }
       }
@@ -1916,7 +1928,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "鼠标悬停时显示卡牌"
+            "value" : "鼠标悬停在记牌器显示卡牌详情"
           }
         },
         "zh-Hant" : {
@@ -1960,6 +1972,12 @@
             "state" : "translated",
             "value" : "Show topdeck chance"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jj4-X9-UWO.title"
+          }
         }
       }
     },
@@ -2080,6 +2098,12 @@
             "state" : "translated",
             "value" : "Incluir cards obtidos"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ndN-hu-6Rx.title"
+          }
         }
       }
     },
@@ -2182,6 +2206,12 @@
             "state" : "new",
             "value" : "Show availability on deck selection screen"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "在卡组选择界面显示起手留牌指南可用性"
+          }
         }
       }
     },
@@ -2264,7 +2294,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "卡牌数为零时不显示该卡牌"
+            "value" : "若卡牌数为零，移除该卡牌"
           }
         },
         "zh-Hant" : {
@@ -2284,6 +2314,12 @@
             "state" : "new",
             "value" : "Show mulligan overlay at start of game"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "游戏开始时显示起手留牌窗口"
+          }
         }
       }
     },
@@ -2546,7 +2582,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "显示弃掉的卡牌"
+            "value" : "高亮弃掉的卡牌"
           }
         },
         "zh-Hant" : {
diff --git a/HSTracker/UIs/StatsManager/Base.lproj/LadderTab.xib b/HSTracker/UIs/StatsManager/Base.lproj/LadderTab.xib
index 5bc6bfdef..fd126ba0a 100644
--- a/HSTracker/UIs/StatsManager/Base.lproj/LadderTab.xib
+++ b/HSTracker/UIs/StatsManager/Base.lproj/LadderTab.xib
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24765" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24765"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="LadderTab" customModule="HSTracker" customModuleProvider="target">
@@ -17,11 +19,11 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="360"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="362"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="k40-CQ-gHN">
-                    <rect key="frame" x="28" y="323" width="35" height="17"/>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="k40-CQ-gHN">
+                    <rect key="frame" x="28" y="326" width="35" height="16"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Rank" id="BEu-Gw-K2h">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -29,21 +31,21 @@
                     </textFieldCell>
                 </textField>
                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="otx-43-LQs">
-                    <rect key="frame" x="18" y="297" width="55" height="26"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="50" id="GyL-2j-4FT"/>
-                    </constraints>
+                    <rect key="frame" x="20" y="300" width="50" height="24"/>
                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="AeF-xW-qsK">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
+                        <font key="font" metaFont="message"/>
                         <menu key="menu" id="0PJ-Hh-rRq"/>
                     </popUpButtonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="50" id="GyL-2j-4FT"/>
+                    </constraints>
                     <connections>
                         <action selector="rankChanged:" target="-2" id="kUi-Y9-FNe"/>
                     </connections>
                 </popUpButton>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dp9-H3-e8w">
-                    <rect key="frame" x="102" y="323" width="36" height="17"/>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dp9-H3-e8w">
+                    <rect key="frame" x="102" y="326" width="36" height="16"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Stars" id="TJK-Hp-ofq">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -51,21 +53,21 @@
                     </textFieldCell>
                 </textField>
                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jig-hk-LmM">
-                    <rect key="frame" x="93" y="297" width="55" height="26"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="50" id="714-IJ-JfD"/>
-                    </constraints>
+                    <rect key="frame" x="95" y="300" width="50" height="24"/>
                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="F68-tp-HkU">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
+                        <font key="font" metaFont="message"/>
                         <menu key="menu" id="NGU-bp-rMB"/>
                     </popUpButtonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="50" id="714-IJ-JfD"/>
+                    </constraints>
                     <connections>
                         <action selector="starsChanged:" target="-2" id="Urs-iN-UEv"/>
                     </connections>
                 </popUpButton>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="Meh-T7-BSm">
-                    <rect key="frame" x="168" y="301" width="134" height="18"/>
+                    <rect key="frame" x="170" y="304" width="130" height="16"/>
                     <buttonCell key="cell" type="check" title="Win Streak" bezelStyle="regularSquare" imagePosition="left" inset="2" id="dza-9B-OL5">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -77,19 +79,18 @@
                 <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oaG-xx-Sk3">
                     <rect key="frame" x="20" y="160" width="280" height="120"/>
                     <clipView key="contentView" id="oIv-NG-msa">
-                        <rect key="frame" x="1" y="0.0" width="278" height="119"/>
+                        <rect key="frame" x="1" y="1" width="278" height="118"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="ypz-Yo-SdF" viewBased="YES" id="X4X-nL-5d2">
-                                <rect key="frame" x="0.0" y="0.0" width="279" height="96"/>
-                                <autoresizingMask key="autoresizingMask"/>
+                                <rect key="frame" x="0.0" y="0.0" width="288" height="95"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
                                     <tableColumn width="60" minWidth="60" maxWidth="300" id="dyI-Te-1C6">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Rank">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -101,11 +102,12 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="LadderGRankCellID" id="v7E-Wu-7LG">
-                                                <rect key="frame" x="1" y="1" width="60" height="17"/>
+                                                <rect key="frame" x="1" y="1" width="65" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Jt-Ep-gKf">
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Jt-Ep-gKf">
                                                         <rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="BmD-wK-Rmz">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -121,7 +123,6 @@
                                     </tableColumn>
                                     <tableColumn width="110" minWidth="110" maxWidth="300" id="hkD-WH-kOa">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="Games to Rank">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -133,11 +134,12 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="LadderGToRankCellID" id="adY-PT-C5R">
-                                                <rect key="frame" x="64" y="1" width="110" height="17"/>
+                                                <rect key="frame" x="69" y="1" width="110" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7OL-eJ-hxz">
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7OL-eJ-hxz">
                                                         <rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="ZV9-tA-MmI">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -151,9 +153,8 @@
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
-                                    <tableColumn identifier="" width="100" minWidth="100" maxWidth="300" id="4Yb-5T-nV4">
+                                    <tableColumn width="100" minWidth="100" maxWidth="300" id="4Yb-5T-nV4">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="90% CI">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
@@ -165,11 +166,12 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="LadderG90CICellID" id="kve-RS-nDs">
-                                                <rect key="frame" x="177" y="1" width="100" height="17"/>
+                                                <rect key="frame" x="182" y="1" width="104" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3HZ-rv-W79">
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3HZ-rv-W79">
                                                         <rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Bgg-4P-izh">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -186,40 +188,38 @@
                                 </tableColumns>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
                     <constraints>
                         <constraint firstAttribute="height" constant="120" id="Swc-0J-3EY"/>
                     </constraints>
-                    <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="ORX-6d-IzA">
-                        <rect key="frame" x="1" y="103" width="278" height="16"/>
+                    <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ORX-6d-IzA">
+                        <rect key="frame" x="1" y="102" width="278" height="17"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
-                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="JiA-iu-28o">
+                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="JiA-iu-28o">
                         <rect key="frame" x="224" y="17" width="15" height="102"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
-                    <tableHeaderView key="headerView" id="ypz-Yo-SdF">
-                        <rect key="frame" x="0.0" y="0.0" width="279" height="23"/>
+                    <tableHeaderView key="headerView" wantsLayer="YES" id="ypz-Yo-SdF">
+                        <rect key="frame" x="0.0" y="0.0" width="288" height="23"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
                 <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vp2-te-5TJ">
                     <rect key="frame" x="20" y="20" width="280" height="120"/>
                     <clipView key="contentView" id="PLv-LO-dHz">
-                        <rect key="frame" x="1" y="0.0" width="278" height="119"/>
+                        <rect key="frame" x="1" y="1" width="278" height="118"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="cjn-8a-d5W" viewBased="YES" id="L4i-bg-Yvc">
-                                <rect key="frame" x="0.0" y="0.0" width="279" height="96"/>
-                                <autoresizingMask key="autoresizingMask"/>
+                                <rect key="frame" x="0.0" y="0.0" width="288" height="95"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
                                     <tableColumn width="60" minWidth="60" maxWidth="300" id="e1h-FZ-9MU">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Rank">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -231,11 +231,12 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="LadderTRankCellID" id="2eq-EJ-bsv">
-                                                <rect key="frame" x="1" y="1" width="60" height="17"/>
+                                                <rect key="frame" x="1" y="1" width="65" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ueG-Ws-pR0">
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ueG-Ws-pR0">
                                                         <rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="e6j-KR-Pnw">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -251,7 +252,6 @@
                                     </tableColumn>
                                     <tableColumn width="110" minWidth="110" maxWidth="300" id="xS7-7X-Aef">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="Time to Rank (h)">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -263,11 +263,12 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="LadderTToRankCellID" id="sz6-0c-LX1">
-                                                <rect key="frame" x="64" y="1" width="110" height="17"/>
+                                                <rect key="frame" x="69" y="1" width="110" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hHy-6j-DnQ">
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hHy-6j-DnQ">
                                                         <rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="fql-pG-Qnh">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -281,9 +282,8 @@
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
-                                    <tableColumn identifier="" width="100" minWidth="100" maxWidth="300" id="IWm-LF-igL">
+                                    <tableColumn width="100" minWidth="100" maxWidth="300" id="IWm-LF-igL">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="90% CI">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
@@ -295,11 +295,12 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="LadderT90CICellID" id="lg0-6t-kls">
-                                                <rect key="frame" x="177" y="1" width="100" height="17"/>
+                                                <rect key="frame" x="182" y="1" width="104" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4B2-cq-w8m">
+                                                    <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4B2-cq-w8m">
                                                         <rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="obB-aM-PZF">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -316,21 +317,20 @@
                                 </tableColumns>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
                     <constraints>
                         <constraint firstAttribute="height" constant="120" id="1ZN-bC-6MS"/>
                     </constraints>
-                    <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="OX8-0R-MgB">
-                        <rect key="frame" x="1" y="103" width="278" height="16"/>
+                    <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="OX8-0R-MgB">
+                        <rect key="frame" x="1" y="102" width="278" height="17"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
-                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="Cl9-Lm-MBX">
+                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Cl9-Lm-MBX">
                         <rect key="frame" x="224" y="17" width="15" height="102"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
-                    <tableHeaderView key="headerView" id="cjn-8a-d5W">
-                        <rect key="frame" x="0.0" y="0.0" width="279" height="23"/>
+                    <tableHeaderView key="headerView" wantsLayer="YES" id="cjn-8a-d5W">
+                        <rect key="frame" x="0.0" y="0.0" width="288" height="23"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
diff --git a/HSTracker/UIs/StatsManager/mul.lproj/LadderTab.xcstrings b/HSTracker/UIs/StatsManager/mul.lproj/LadderTab.xcstrings
index e3e109b28..419cfe0c0 100644
--- a/HSTracker/UIs/StatsManager/mul.lproj/LadderTab.xcstrings
+++ b/HSTracker/UIs/StatsManager/mul.lproj/LadderTab.xcstrings
@@ -131,6 +131,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -269,6 +275,12 @@
             "value" : "Table View Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Table View Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -317,6 +329,12 @@
             "value" : "Table View Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Table View Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -545,6 +563,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -683,6 +707,12 @@
             "value" : "Table View Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Table View Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -731,6 +761,12 @@
             "value" : "Table View Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Table View Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -779,6 +815,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -1007,6 +1049,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -1055,6 +1103,12 @@
             "value" : "Table View Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Table View Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -1103,6 +1157,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -1241,6 +1301,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -1379,6 +1445,12 @@
             "value" : "Table View Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Table View Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
diff --git a/HSTracker/UIs/StatsManager/mul.lproj/Statistics.xcstrings b/HSTracker/UIs/StatsManager/mul.lproj/Statistics.xcstrings
index ec8ab829e..4b474a66a 100644
--- a/HSTracker/UIs/StatsManager/mul.lproj/Statistics.xcstrings
+++ b/HSTracker/UIs/StatsManager/mul.lproj/Statistics.xcstrings
@@ -170,7 +170,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "套牌统计"
+            "value" : "卡组统计"
           }
         },
         "zh-Hant" : {
@@ -260,7 +260,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "没有选择套牌"
+            "value" : "尚未选择卡组"
           }
         },
         "zh-Hant" : {
diff --git a/HSTracker/UIs/StatsManager/mul.lproj/StatsTab.xcstrings b/HSTracker/UIs/StatsManager/mul.lproj/StatsTab.xcstrings
index b7b471271..64cc680be 100644
--- a/HSTracker/UIs/StatsManager/mul.lproj/StatsTab.xcstrings
+++ b/HSTracker/UIs/StatsManager/mul.lproj/StatsTab.xcstrings
@@ -80,7 +80,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "对手英雄"
+            "value" : "对手职业"
           }
         },
         "zh-Hant" : {
@@ -131,6 +131,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -269,6 +275,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -317,6 +329,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
@@ -455,6 +473,12 @@
             "value" : "Text Cell"
           }
         },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Text Cell"
+          }
+        },
         "zh-Hant" : {
           "stringUnit" : {
             "state" : "translated",
diff --git a/HSTracker/UIs/mul.lproj/MainMenu.xcstrings b/HSTracker/UIs/mul.lproj/MainMenu.xcstrings
index 136234dc4..cb550d958 100644
--- a/HSTracker/UIs/mul.lproj/MainMenu.xcstrings
+++ b/HSTracker/UIs/mul.lproj/MainMenu.xcstrings
@@ -10,6 +10,12 @@
             "state" : "new",
             "value" : "Decks"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "卡组"
+          }
         }
       }
     },
@@ -22,6 +28,12 @@
             "state" : "new",
             "value" : "HSTracker"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "HSTracker"
+          }
         }
       }
     },
@@ -34,6 +46,12 @@
             "state" : "new",
             "value" : "Bug report..."
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "报告问题..."
+          }
         }
       }
     },
@@ -46,6 +64,12 @@
             "state" : "new",
             "value" : "Quit HSTracker"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "退出 HSTracker"
+          }
         }
       }
     },
@@ -58,6 +82,12 @@
             "state" : "new",
             "value" : "Check for Updates..."
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "检查更新..."
+          }
         }
       }
     },
@@ -70,6 +100,12 @@
             "state" : "new",
             "value" : "About HSTracker"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "关于 HSTracker"
+          }
         }
       }
     },
@@ -82,6 +118,12 @@
             "state" : "new",
             "value" : "Edit"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "编辑"
+          }
         }
       }
     },
@@ -94,6 +136,12 @@
             "state" : "new",
             "value" : "Redo"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "重做"
+          }
         }
       }
     },
@@ -106,6 +154,12 @@
             "state" : "new",
             "value" : "Decks"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "卡组"
+          }
         }
       }
     },
@@ -118,6 +172,12 @@
             "state" : "new",
             "value" : "Lock windows"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "锁定窗口"
+          }
         }
       }
     },
@@ -130,6 +190,12 @@
             "state" : "new",
             "value" : "Open logs directory..."
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "打开日志目录..."
+          }
         }
       }
     },
@@ -142,6 +208,12 @@
             "state" : "new",
             "value" : "Window"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "窗口"
+          }
         }
       }
     },
@@ -154,6 +226,12 @@
             "state" : "new",
             "value" : "Main Menu"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "主菜单"
+          }
         }
       }
     },
@@ -166,6 +244,12 @@
             "state" : "new",
             "value" : "Preferences…"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "设置…"
+          }
         }
       }
     },
@@ -178,6 +262,12 @@
             "state" : "new",
             "value" : "Close"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "关闭"
+          }
         }
       }
     },
@@ -190,6 +280,12 @@
             "state" : "new",
             "value" : "Last replays"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "最近回放"
+          }
         }
       }
     },
@@ -202,6 +298,12 @@
             "state" : "new",
             "value" : "Undo"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "撤销"
+          }
         }
       }
     },
@@ -214,6 +316,12 @@
             "state" : "new",
             "value" : "Replays"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "回放"
+          }
         }
       }
     },
@@ -226,6 +334,12 @@
             "state" : "new",
             "value" : "Help"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "帮助"
+          }
         }
       }
     },
@@ -238,6 +352,12 @@
             "state" : "new",
             "value" : "Window positions"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "窗口位置"
+          }
         }
       }
     },
@@ -250,6 +370,12 @@
             "state" : "new",
             "value" : "HSTracker Help"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "HSTracker 帮助"
+          }
         }
       }
     },
@@ -262,6 +388,12 @@
             "state" : "new",
             "value" : "Last replays"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "最近回放"
+          }
         }
       }
     },
@@ -274,6 +406,12 @@
             "state" : "new",
             "value" : "Paste"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "粘贴"
+          }
         }
       }
     },
@@ -286,6 +424,12 @@
             "state" : "new",
             "value" : "Debug"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "调试"
+          }
         }
       }
     },
@@ -298,6 +442,12 @@
             "state" : "new",
             "value" : "Debug"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "调试"
+          }
         }
       }
     },
@@ -310,6 +460,12 @@
             "state" : "new",
             "value" : "Show All"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示全部"
+          }
         }
       }
     },
@@ -322,6 +478,12 @@
             "state" : "new",
             "value" : "Deck Manager"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "卡组管理"
+          }
         }
       }
     },
@@ -334,6 +496,12 @@
             "state" : "new",
             "value" : "Hide HSTracker"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "隐藏 HSTracker"
+          }
         }
       }
     },
@@ -346,6 +514,12 @@
             "state" : "new",
             "value" : "Minimize"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "最小化"
+          }
         }
       }
     },
@@ -358,6 +532,12 @@
             "state" : "new",
             "value" : "Delete"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "删除"
+          }
         }
       }
     },
@@ -370,6 +550,12 @@
             "state" : "new",
             "value" : "Replays"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "回放"
+          }
         }
       }
     },
@@ -382,6 +568,12 @@
             "state" : "new",
             "value" : "Select All"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "选择全部"
+          }
         }
       }
     },
@@ -394,6 +586,12 @@
             "state" : "new",
             "value" : "Clear trackers"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "清空记牌器"
+          }
         }
       }
     },
@@ -406,6 +604,12 @@
             "state" : "new",
             "value" : "Window"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "窗口"
+          }
         }
       }
     },
@@ -418,6 +622,12 @@
             "state" : "new",
             "value" : "HSTracker"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "HSTracker"
+          }
         }
       }
     },
@@ -430,6 +640,12 @@
             "state" : "new",
             "value" : "Cut"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "剪切"
+          }
         }
       }
     },
@@ -442,6 +658,12 @@
             "state" : "new",
             "value" : "Hide Others"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "隐藏 其他"
+          }
         }
       }
     },
@@ -454,6 +676,12 @@
             "state" : "new",
             "value" : "Edit"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "编辑"
+          }
         }
       }
     },
@@ -466,6 +694,12 @@
             "state" : "new",
             "value" : "Delete cached images..."
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "删除缓存图片..."
+          }
         }
       }
     },
@@ -478,6 +712,12 @@
             "state" : "new",
             "value" : "Help"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "帮助"
+          }
         }
       }
     },
@@ -490,6 +730,12 @@
             "state" : "new",
             "value" : "Copy"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "复制"
+          }
         }
       }
     }
diff --git a/Translations/macOS/Localizable.xcstrings b/Translations/macOS/Localizable.xcstrings
index 3b68895c6..4a37379d9 100644
--- a/Translations/macOS/Localizable.xcstrings
+++ b/Translations/macOS/Localizable.xcstrings
@@ -138,7 +138,15 @@
     },
     "%lld" : {
       "comment" : "A label displaying the value of a resource. The first argument is the name of the resource. The second argument is the value of the resource.",
-      "isCommentAutoGenerated" : true
+      "isCommentAutoGenerated" : true,
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%lld"
+          }
+        }
+      }
     },
     "A new update is available" : {
       "extractionState" : "manual",
@@ -443,7 +451,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "所有英雄"
+            "value" : "所有职业"
           }
         },
         "zh-Hant" : {
@@ -1121,7 +1129,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "确定要退出吗？您的修改将不会被保存。"
+            "value" : "确定要退出吗？你的修改将不会被保存。"
           }
         },
         "zh-Hant" : {
@@ -1642,7 +1650,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "竞技场 %@ %@"
+            "value" : "竞技模式 %@ %@"
           }
         },
         "zh-Hant" : {
@@ -1796,6 +1804,12 @@
             "state" : "translated",
             "value" : "Festival of Legends"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "传奇音乐节"
+          }
         }
       }
     },
@@ -1807,6 +1821,12 @@
             "state" : "translated",
             "value" : "Battlegrounds"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "酒馆战棋"
+          }
         }
       }
     },
@@ -2652,7 +2672,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "通过点击“重置”，将清除你的最近对局记录，并使起始MMR与当前MMR相同。"
+            "value" : "通过点击“重置”，你将清除最近对局记录，并使起始MMR与当前MMR相同。"
           }
         }
       }
@@ -2932,6 +2952,12 @@
             "state" : "translated",
             "value" : "Created by %@"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "由 %@ 制作"
+          }
         }
       }
     },
@@ -2943,6 +2969,12 @@
             "state" : "translated",
             "value" : "Cataclysm"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "大地的裂变"
+          }
         }
       }
     },
@@ -3658,6 +3690,12 @@
             "state" : "translated",
             "value" : "%@ Cost"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%@ 费"
+          }
         }
       }
     },
@@ -3670,6 +3708,12 @@
             "state" : "translated",
             "value" : "Asteroid Damage"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "小行星伤害"
+          }
         }
       }
     },
@@ -3681,6 +3725,12 @@
             "state" : "translated",
             "value" : "%@ Damage"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%@ 点伤害"
+          }
         }
       }
     },
@@ -3692,6 +3742,12 @@
             "state" : "translated",
             "value" : "Cards Drawn This Turn"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "本回合抽到的卡牌"
+          }
         }
       }
     },
@@ -3703,6 +3759,12 @@
             "state" : "translated",
             "value" : "Deathwing Discount"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "死亡之翼减费"
+          }
         }
       }
     },
@@ -3747,6 +3809,12 @@
             "state" : "translated",
             "value" : "Common"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "普通"
+          }
         }
       }
     },
@@ -3758,6 +3826,12 @@
             "state" : "translated",
             "value" : "Rare"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "稀有"
+          }
         }
       }
     },
@@ -3769,6 +3843,12 @@
             "state" : "translated",
             "value" : "Epic"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "史诗"
+          }
         }
       }
     },
@@ -3780,6 +3860,12 @@
             "state" : "translated",
             "value" : "Legendary"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "传说"
+          }
         }
       }
     },
@@ -3791,6 +3877,12 @@
             "state" : "translated",
             "value" : "Excavate Tier"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "发掘等级"
+          }
         }
       }
     },
@@ -3802,6 +3894,12 @@
             "state" : "translated",
             "value" : "Fatigue"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "疲劳"
+          }
         }
       }
     },
@@ -3824,6 +3922,12 @@
             "state" : "translated",
             "value" : "Friendly Minions That Died"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "死亡的友方随从"
+          }
         }
       }
     },
@@ -3846,6 +3950,12 @@
             "state" : "translated",
             "value" : "Herald"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "兆示"
+          }
         }
       }
     },
@@ -3857,6 +3967,12 @@
             "state" : "translated",
             "value" : "Imbue"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "灌注"
+          }
         }
       }
     },
@@ -3868,6 +3984,12 @@
             "state" : "translated",
             "value" : "Libram Cost Reduction"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "圣契减费"
+          }
         }
       }
     },
@@ -3879,6 +4001,12 @@
             "state" : "translated",
             "value" : "Cost: %@"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "费用：%@"
+          }
         }
       }
     },
@@ -3901,6 +4029,12 @@
             "state" : "translated",
             "value" : "Played Dragons"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "打出过的龙"
+          }
         }
       }
     },
@@ -3912,6 +4046,12 @@
             "state" : "translated",
             "value" : "Played Spells"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "打出过的法术"
+          }
         }
       }
     },
@@ -3923,6 +4063,12 @@
             "state" : "translated",
             "value" : "Played Spell Schools"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "打出过的法术派系"
+          }
         }
       }
     },
@@ -3934,6 +4080,12 @@
             "state" : "translated",
             "value" : "Protoss Minions Cost Reduction"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "星灵随从减费"
+          }
         }
       }
     },
@@ -3967,6 +4119,12 @@
             "state" : "translated",
             "value" : "Self Damage"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "自伤"
+          }
         }
       }
     },
@@ -3978,6 +4136,12 @@
             "state" : "translated",
             "value" : "Silver Hand Recruit Buff"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "报告兵强化"
+          }
         }
       }
     },
@@ -3990,6 +4154,12 @@
             "state" : "translated",
             "value" : "None"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "无"
+          }
         }
       }
     },
@@ -4001,6 +4171,12 @@
             "state" : "translated",
             "value" : "Summoned Dragons"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "召唤过的龙"
+          }
         }
       }
     },
@@ -4671,6 +4847,12 @@
             "state" : "translated",
             "value" : "E.T.C.'s Band"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "精英牛头人酋长的乐队"
+          }
         }
       }
     },
@@ -4693,7 +4875,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "全部"
+            "value" : "全部模式"
           }
         }
       }
@@ -4716,7 +4898,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "竞技场"
+            "value" : "竞技模式"
           }
         }
       }
@@ -4739,7 +4921,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "经典"
+            "value" : "经典模式"
           }
         }
       }
@@ -4762,7 +4944,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "对决"
+            "value" : "对决模式"
           }
         }
       }
@@ -4785,7 +4967,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "地下城"
+            "value" : "地下城冒险"
           }
         }
       }
@@ -4808,7 +4990,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "标准"
+            "value" : "标准模式"
           }
         }
       }
@@ -4821,6 +5003,12 @@
             "state" : "translated",
             "value" : "Twist"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "幻变模式"
+          }
         }
       }
     },
@@ -4842,7 +5030,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "狂野"
+            "value" : "狂野模式"
           }
         }
       }
@@ -5491,7 +5679,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "你是否愿意发送一个匿名的崩溃报告以帮助我们修复这个问题?"
+            "value" : "您是否愿意发送一个匿名的崩溃报告以帮助我们修复这个问题?"
           }
         },
         "zh-Hant" : {
@@ -5806,6 +5994,12 @@
             "state" : "translated",
             "value" : "Draenei"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "德莱尼"
+          }
         }
       }
     },
@@ -6196,6 +6390,12 @@
             "state" : "translated",
             "value" : "Into the Emerald Dream"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "漫游翡翠梦境"
+          }
         }
       }
     },
@@ -6296,6 +6496,12 @@
             "state" : "translated",
             "value" : "Escape from Violet Hold"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "逃离紫罗兰监狱"
+          }
         }
       }
     },
@@ -6460,7 +6666,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "从 \n 获取卡组失败"
+            "value" : "从 \n 导入卡组失败"
           }
         },
         "zh-Hant" : {
@@ -6479,6 +6685,12 @@
             "state" : "translated",
             "value" : "Failed to import deck from the Clipboard"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "从剪贴板导入卡组失败"
+          }
         }
       }
     },
@@ -6718,7 +6930,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "疲劳: "
+            "value" : "疲劳："
           }
         },
         "zh-Hant" : {
@@ -6737,6 +6949,12 @@
             "state" : "translated",
             "value" : "Final Combat"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "最终战斗"
+          }
         }
       }
     },
@@ -7572,6 +7790,12 @@
             "state" : "translated",
             "value" : "Hearthstone restart required!"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "需要重启炉石传说！"
+          }
         }
       }
     },
@@ -7583,6 +7807,12 @@
             "state" : "translated",
             "value" : "HSReplay"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "HSReplay"
+          }
         }
       }
     },
@@ -7604,7 +7834,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "HSReplay.net - 调度建议"
+            "value" : "HSReplay.net - 起手留牌指南"
           }
         },
         "zh-Hant" : {
@@ -8098,6 +8328,12 @@
             "state" : "translated",
             "value" : "Perils in Paradise"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "胜地历险记"
+          }
         }
       }
     },
@@ -8368,6 +8604,9 @@
         }
       }
     },
+    "Key" : {
+      "extractionState" : "manual"
+    },
     "Last replays" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -8376,6 +8615,12 @@
             "state" : "translated",
             "value" : "Last replays"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "最近回放"
+          }
         }
       }
     },
@@ -8515,7 +8760,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "在剪贴板中没有找到有效的卡组代码"
+            "value" : "剪贴板中没有找到有效的卡组代码"
           }
         }
       }
@@ -8617,6 +8862,12 @@
             "state" : "translated",
             "value" : "Loading Arena card tiers"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "载入竞技模式卡牌排行"
+          }
         }
       }
     },
@@ -8806,6 +9057,12 @@
             "state" : "translated",
             "value" : "Loading remote configuration"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "载入远程配置"
+          }
         }
       }
     },
@@ -8995,6 +9252,12 @@
             "state" : "translated",
             "value" : "Logged in to HSReplay.net as %@. Open your collection and it will be automatically uploaded."
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "账号：%@ 已登录HSReplay.net。打开你的收藏，内容会自动上传。"
+          }
         }
       }
     },
@@ -9006,6 +9269,12 @@
             "state" : "translated",
             "value" : "Logged in to HSReplay.net. Open your collection and it will be automatically uploaded."
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "已登录HSReplay.net。打开你的收藏，内容会自动上传。"
+          }
         }
       }
     },
@@ -9106,6 +9375,12 @@
             "state" : "translated",
             "value" : "Login to claim your replays and enable all HSReplay.net features."
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "登录以同步你的回放并启用HSReplay.net的所有功能。"
+          }
         }
       }
     },
@@ -9117,6 +9392,12 @@
             "state" : "translated",
             "value" : "Login to HSReplay.net"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "登录HSReplay.net"
+          }
         }
       }
     },
@@ -9198,7 +9479,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "注销"
+            "value" : "退出登录"
           }
         },
         "zh-Hant" : {
@@ -9846,7 +10127,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "竞技场模式"
+            "value" : "竞技模式"
           }
         },
         "zh-Hant" : {
@@ -10136,7 +10417,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "友好模式"
+            "value" : "好友对战"
           }
         },
         "zh-Hant" : {
@@ -11225,7 +11506,7 @@
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Gegnerischer Tracker"
           }
         },
@@ -11237,73 +11518,73 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Opponent tracker"
           }
         },
         "es-MX" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Opponent tracker"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Tracker adversaire"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Opponent tracker"
           }
         },
         "ja" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Opponent tracker"
           }
         },
         "ko" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "상대방 트래커"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Opponent tracker"
           }
         },
         "pt-BR" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Rastreador do oponente"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Трекер противника"
           }
         },
         "th-TH" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Opponent tracker"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "对手的记牌器"
+            "state" : "needs_review",
+            "value" : "对手记牌器"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "對手的記牌器"
           }
         }
@@ -11553,7 +11834,7 @@
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Eigener Tracker"
           }
         },
@@ -11565,73 +11846,73 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Player tracker"
           }
         },
         "es-MX" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Player tracker"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Tracker joueur"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Player tracker"
           }
         },
         "ja" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Player tracker"
           }
         },
         "ko" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "플레이어 트래커"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Player tracker"
           }
         },
         "pt-BR" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Rastreador do jogador"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Трекер игрока"
           }
         },
         "th-TH" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Player tracker"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "你的记牌器"
           }
         },
         "zh-Hant" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "你的記牌器"
           }
         }
@@ -11645,6 +11926,12 @@
             "state" : "translated",
             "value" : "Please restart Hearthstone"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "请重启炉石传说"
+          }
         }
       }
     },
@@ -12208,6 +12495,12 @@
             "state" : "translated",
             "value" : "Related Cards"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "相关卡牌"
+          }
         }
       }
     },
@@ -12397,6 +12690,12 @@
             "state" : "translated",
             "value" : "Replays"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "回放"
+          }
         }
       }
     },
@@ -12649,6 +12948,12 @@
             "state" : "translated",
             "value" : "Save"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "保存"
+          }
         }
       }
     },
@@ -12724,7 +13029,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "保存竞技场卡组"
+            "value" : "保存竞技模式卡组"
           }
         }
       }
@@ -13407,6 +13712,12 @@
             "state" : "translated",
             "value" : "Show Final Combat"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示最终战斗"
+          }
         }
       }
     },
@@ -13501,6 +13812,12 @@
             "state" : "translated",
             "value" : "Great Dark Beyond"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "深暗领域"
+          }
         }
       }
     },
@@ -13601,6 +13918,12 @@
             "state" : "translated",
             "value" : "Arcane"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "奥术"
+          }
         }
       }
     },
@@ -13612,6 +13935,12 @@
             "state" : "translated",
             "value" : "Fel"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "邪能"
+          }
         }
       }
     },
@@ -13623,6 +13952,12 @@
             "state" : "translated",
             "value" : "Fire"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "火焰"
+          }
         }
       }
     },
@@ -13634,6 +13969,12 @@
             "state" : "translated",
             "value" : "Frost"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "冰霜"
+          }
         }
       }
     },
@@ -13645,6 +13986,12 @@
             "state" : "translated",
             "value" : "Holy"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "神圣"
+          }
         }
       }
     },
@@ -13656,6 +14003,12 @@
             "state" : "translated",
             "value" : "Nature"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "自然"
+          }
         }
       }
     },
@@ -13667,6 +14020,12 @@
             "state" : "translated",
             "value" : "Attack"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "无"
+          }
         }
       }
     },
@@ -13678,6 +14037,12 @@
             "state" : "translated",
             "value" : "Shadow"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "暗影"
+          }
         }
       }
     },
@@ -13689,6 +14054,12 @@
             "state" : "translated",
             "value" : "Spells"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "法术"
+          }
         }
       }
     },
@@ -14173,6 +14544,12 @@
             "state" : "translated",
             "value" : "The Lost City"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "安戈洛龟途"
+          }
         }
       }
     },
@@ -14277,7 +14654,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "出了一些问题，你的竞技场卡组没有保存。请尝试重启炉石传说和重新保存卡组。"
+            "value" : "您的竞技模式卡组因为某个问题没有保存。请尝试重启炉石传说，点击竞技模式，然后重新保存。"
           }
         },
         "zh-Hant" : {
@@ -14296,6 +14673,12 @@
             "state" : "translated",
             "value" : "Across the Timeways"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "穿越时间流"
+          }
         }
       }
     },
@@ -14307,6 +14690,12 @@
             "state" : "translated",
             "value" : "Titans"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "泰坦诸神"
+          }
         }
       }
     },
@@ -14388,7 +14777,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "如果想将本卡组导出到炉石传说中, 请创建一个与卡组英雄对应的新卡组, 然后点击 OK 并切换到炉石传说。\n。在导入过程中，请不要使用鼠标或键盘。\n警告, 这只是一个测试功能!"
+            "value" : "若想将本卡组导出到炉石传说中, 请创建一个同一职业的新卡组, 然后点击 OK 并切换到炉石传说。\n。在导入过程中，请不要使用鼠标或键盘。\n警告，这只是一个测试功能！"
           }
         },
         "zh-Hant" : {
@@ -14499,7 +14888,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "下一抽抽中概率:"
+            "value" : "下一抽抽中概率："
           }
         },
         "zh-Hant" : {
@@ -14759,7 +15148,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "回合 %d"
+            "value" : "第 %d 回合"
           }
         }
       }
@@ -15911,7 +16300,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "我应该保留什么?"
+            "value" : "我应该留下哪张牌?"
           }
         },
         "zh-Hant" : {
@@ -15930,6 +16319,12 @@
             "state" : "translated",
             "value" : "Whizbang's Workshop"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "威兹班的工坊"
+          }
         }
       }
     },
@@ -15941,6 +16336,12 @@
             "state" : "translated",
             "value" : "Showdown in the Badlands"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "决战荒芜之地"
+          }
         }
       }
     },
@@ -16219,6 +16620,12 @@
             "state" : "translated",
             "value" : "Caverns of Time"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "时光之穴"
+          }
         }
       }
     },
@@ -16323,7 +16730,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "您已连接到 Hearthstats"
+            "value" : "你已连接到 Hearthstats"
           }
         },
         "zh-Hant" : {
@@ -16382,7 +16789,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "您已连接到 Track-o-Bot"
+            "value" : "你已连接到 Track-o-Bot"
           }
         }
       }
@@ -16583,7 +16990,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "必须重启 HSTracker 使语言设置生效"
+            "value" : "您必须重启 HSTracker 使语言设置生效"
           }
         },
         "zh-Hant" : {
@@ -16672,7 +17079,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "竞技场卡组已有 30 张卡, 要保存吗?"
+            "value" : "竞技模式卡组已有 30 张卡, 要保存吗?"
           }
         },
         "zh-Hant" : {
@@ -16986,7 +17393,7 @@
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "你的游戏录像已上传至 HSReplay"
+            "value" : "你的回放已上传至 HSReplay"
           }
         },
         "zh-Hant" : {