Merge branch 'origin/master' into Weblate.

extensions/wikidata/module/langs/translation-jp.json

@@ -160,5 +160,10 @@
     "import-wikibase-schema/import": "インポート",
     "wikidata-schema/copy-reference": "コピー",
     "wikidata-schema/paste-reference": "参照貼り付け",
-    "wikidata-schema/reference-copied": "コピー済み"
+    "wikidata-schema/reference-copied": "コピー済み",
+    "wikidata-schema/label-if-new": "ラベル（上書き不可）",
+    "wikidata-schema/label-override": "ラベル（存在すれば上書き）",
+    "wikidata-schema/description-if-new": "説明（上書き不可）",
+    "wikidata-schema/description-override": "説明（存在すれば上書き）",
+    "wikidata-schema/override-term": "存在すれば上書き"
 }

main/webapp/modules/core/langs/translation-jp.json

@@ -83,7 +83,7 @@
     "core-index-import/parsing-options": "解析オプションの設定",
     "core-index-import/data-package": "データパッケージ（JSON URL）",
     "core-index-import/char-encoding": "文字コード",
-    "core-index-import/mime-type": "MIME type",
+    "core-index-import/mime-type": "Media type",
     "core-index-import/creating-proj": "プロジェクト作成中…",
     "core-index-import/comma-separated": "カンマ区切りの数値",
     "core-index-import/error": "エラー:",