diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 2de21696..2886ea4c 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -86,6 +86,7 @@
     "olden_primal": "Olden Primal",
     "beast": "Beast",
     "omega": "Omega",
+    "regalia": "Regalia",
     "militis": "Militis",
     "xeno": "Xeno",
     "astral": "Astral",
@@ -101,7 +102,10 @@
     "vintage": "Vintage",
     "class_champion": "Class Champion",
     "sephira": "Sephira",
-    "new_world": "New World Foundation"
+    "new_world": "New World Foundation",
+    "revenant": "Revenant",
+    "proving": "Proving Grounds",
+    "disaster": "Disaster"
   },
   "recency": {
     "all_time": "All time",
@@ -122,6 +126,16 @@
     "about": {
       "title": "About"
     },
+    "conflict": {
+      "character": "Only one <strong>version of a character</strong> can be included in each party. Do you want to change your party members?",
+      "weapon": {
+        "generic": "Only one weapon from the <strong>{{series}} Series</strong> can be included in each party. Do you want to change your weapons?",
+        "opus-draconic": "Only one <strong>Dark Opus</strong> or <strong>Draconic Weapon</strong> can be included in each party. Do you want to change your weapons?"
+      },
+      "buttons": {
+        "confirm": "Confirm"
+      }
+    },
     "delete_team": {
       "title": "Delete team",
       "description": "Are you sure you want to permanently delete this team?",
diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json
index 7dc42e3f..22b015fe 100644
--- a/public/locales/ja/common.json
+++ b/public/locales/ja/common.json
@@ -18,7 +18,7 @@
     }
   },
   "buttons": {
-    "cancel": "キャンセルs",
+    "cancel": "キャンセル",
     "copy": "リンクをコピー",
     "delete": "編成を削除",
     "show_info": "詳細を編集",
@@ -86,6 +86,7 @@
     "olden_primal": "オールド・プライマルシリーズ",
     "beast": "四象武器",
     "omega": "マグナシリーズ",
+    "regalia": "レガリアシリーズ",
     "militis": "ミーレスシリーズ",
     "xeno": "六道武器",
     "astral": "アストラルウェポン",
@@ -101,7 +102,10 @@
     "vintage": "ヴィンテージシリーズ",
     "class_champion": "英雄武器",
     "sephira": "セフィラン・オールドウェポン",
-    "new_world": "新世界の礎"
+    "new_world": "新世界の礎",
+    "revenant": "天星器",
+    "proving": "ブレイブグラウンド",
+    "disaster": "災害シリーズ"
   },
   "recency": {
     "all_time": "全ての期間",
@@ -122,6 +126,16 @@
     "about": {
       "title": "このサイトについて"
     },
+    "conflict": {
+      "character": "<strong>同じ名前のキャラクター</strong>がパーティに編成されています。<br />以下のキャラクターを入れ替えますか？",
+      "weapon": {
+        "generic": "<strong>{{series}}</strong>の武器に装備制限があり、武器が既に装備されています。<br /><br />以下の武器を入れ替えますか？",
+        "opus-draconic": "<strong>終末の神器シリーズ</strong>と<strong>ドラコニックシリーズ</strong>から１本しか装備できない制限があり、武器が既に装備されています。<br /><br />以下の武器を入れ替えますか？"
+      },
+      "buttons": {
+        "confirm": "入れ替える"
+      }
+    },
     "delete_team": {
       "title": "編成を削除しますか",
       "description": "編成を削除する操作は取り消せません。",