Merge remote-tracking branch 'upstream/master'

mastodon/src/main/res/values-zh-rCN/strings.xml

@@ -3,9 +3,7 @@
 	<string name="get_started">开始使用</string>
 	<string name="log_in">登录</string>
 	<string name="next">下一步</string>
-	<string name="loading_instance">正在获取实例信息…</string>
 	<string name="error">错误</string>
-	<string name="not_a_mastodon_instance">%s 似乎不是Mastodon实例。</string>
 	<string name="ok">确定</string>
 	<string name="preparing_auth">正在准备身份验证…</string>
 	<string name="finishing_auth">正在完成身份认证…</string>