Commit 663e3346 authored by Thomas's avatar Thomas
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents cbed3f1a 8bdaf8d4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@
    <string name="toast_unpin">消息不再置顶!</string>
    <string name="toast_pin">消息已置顶</string>
    <string name="staff">职员</string>
    <string name="approved">得到正式认可的</string>
    <string name="approved">已批准</string>
    <string name="approve">批准</string>
    <string name="set_unlisted_replies">不公开回复</string>
    <string name="max_indentation_thread">同主题帖子中最大缩进</string>