Merge branch 'develop'

EhPanda/App/zh-Hans.lproj/Localizable.strings

@@ -171,7 +171,7 @@
 "Any client" = "所有客户端";
 "Default port clients only" = "仅使用默认端口的客户端";
 "LOAD_THROUGH_HATH_NO" = "否";
-"You appear to be browsing the site from **PLACEHOLDER** or use a VPN or proxy in this country, which means the site will try to load images from Hath clients in this general geographic region. If this is incorrect, or if you want to use a different region for any reason (like if you are using a split tunneling VPN), you can select a different country below." = "你似乎正在 **%lld** 浏览此网页，或是使用了一个来自这个国家的VPN或代理，这意味着网站将尝试通过在此区域的Hath客户端加载图片。如果该结果不正确，或你想通过其它地区的Hath客户端加载图片（例如你正在使用分割隧道 VPN），你可以在下方选择另一个国家。";
+"You appear to be browsing the site from **PLACEHOLDER** or use a VPN or proxy in this country, which means the site will try to load images from Hath clients in this general geographic region. If this is incorrect, or if you want to use a different region for any reason (like if you are using a split tunneling VPN), you can select a different country below." = "你似乎正在 **PLACEHOLDER** 浏览此网页，或是使用了一个来自这个国家的VPN或代理，这意味着网站将尝试通过在此区域的Hath客户端加载图片。如果该结果不正确，或你想通过其它地区的Hath客户端加载图片（例如你正在使用分割隧道 VPN），你可以在下方选择另一个国家。";
 "Browsing country" = "浏览国家";
 
 "Image Size Settings" = "图片尺寸设置";