Merge remote-tracking branch 'origin/master'

2017-03-31 04:15:04 +09:00 · 2017-03-31 04:15:04 +09:00 · f48dc2a4bf
commit f48dc2a4bf
parent 4a70af8b62 8b1e56957d
3 changed files with 8 additions and 4 deletions
--- a/locales/ja.yml
+++ b/locales/ja.yml
@ -70,7 +70,7 @@ desktop:
    mk-post-form-window:
      post: "新規投稿"
      reply: "返信"
-      attaches: "添付:}メディア"
+      attaches: "添付: {}メディア"
      uploading-media: "{}個のメディアをアップロード中"

    mk-timeline-post: