diff --git a/public/locales/da/calendar.json b/public/locales/da/calendar.json
index 8c127e55b..c3e871b93 100644
--- a/public/locales/da/calendar.json
+++ b/public/locales/da/calendar.json
@@ -36,10 +36,9 @@
   "forms.errors.duplicatePlayer": "Man kan ikke have den samme spiller på samme hold 2 gange.",
   "forms.errors.emptyTeam": "Alle hold skal have mindst en spiller.",
 
-  "week.this": "Denne",
-  "week.next": "Næste",
-  "week.last": "Sidste",
-  "week.week": "Uge",
+  "week.this": "Denne Uge",
+  "week.next": "Næste Uge",
+  "week.last": "Sidste Uge",
 
   "tag.desc.BADGE": "Vinderne af denne begivenhed får et sendou.ink-mærke.",
   "tag.desc.SPECIAL": "Regelsættet afviger fra standardreglerne.",
diff --git a/public/locales/da/weapons.json b/public/locales/da/weapons.json
index ba45a035a..c97cd67a1 100644
--- a/public/locales/da/weapons.json
+++ b/public/locales/da/weapons.json
@@ -1,55 +1,86 @@
 {
-  "0": "Sploosh-o-matic",
-  "10": "Splattershot Jr.",
-  "20": "Splash-o-matic",
-  "30": "Aerospray MG",
-  "40": "Splattershot",
-  "50": ".52 Gal",
-  "60": "N-ZAP '85",
-  "70": "Splattershot Pro",
-  "80": ".96 Gal",
-  "90": "Jet Squelcher",
-  "200": "Luna Blaster",
-  "210": "Blaster",
-  "220": "Range Blaster",
-  "230": "Clash Blaster",
-  "240": "Rapid Blaster",
-  "250": "Rapid Blaster Pro",
-  "300": "L-3 Nozzlenose",
-  "310": "H-3 Nozzlenose",
-  "400": "Squeezer",
-  "1000": "Carbon Roller",
-  "1010": "Splat Roller",
-  "1020": "Dynamo Roller",
-  "1030": "Flingza Roller",
-  "1100": "Inkbrush",
-  "1110": "Octobrush",
-  "2000": "Classic Squiffer",
-  "2010": "Splat Charger",
-  "2020": "Splatterscope",
-  "2030": "E-liter 4K",
-  "2040": "E-liter 4K Scope",
-  "2050": "Bamboozler 14 Mk I",
-  "2060": "Goo Tuber",
-  "3000": "Slosher",
-  "3010": "Tri-Slosher",
-  "3020": "Sloshing Machine",
-  "3030": "Bloblobber",
-  "3040": "Explosher",
-  "4000": "Mini Splatling",
-  "4010": "Heavy Splatling",
-  "4020": "Hydra Splatling",
-  "4030": "Ballpoint Splatling",
-  "4040": "Nautilus 47",
-  "5000": "Dapple Dualies",
-  "5010": "Splat Dualies",
-  "5020": "Glooga Dualies",
-  "5030": "Dualie Squelchers",
-  "5040": "Dark Tetra Dualies",
-  "6000": "Splat Brella",
-  "6010": "Tenta Brella",
-  "6020": "Undercover Brella",
-  "7010": "Tri-Stringer",
-  "8000": "Splatana Stamper",
-  "8010": "Splatana Wiper"
+  "MAIN_250": "Rapid Blaster Pro",
+  "MAIN_230": "Clash Blaster",
+  "MAIN_240": "Rapid Blaster",
+  "MAIN_220": "Range Blaster",
+  "MAIN_210": "Blaster",
+  "MAIN_200": "Luna Blaster",
+  "MAIN_1100": "Inkbrush",
+  "MAIN_1110": "Octobrush",
+  "MAIN_2060": "Goo Tuber",
+  "MAIN_2050": "Bamboozler 14 Mk I",
+  "MAIN_2040": "E-liter 4K Scope",
+  "MAIN_2030": "E-liter 4K",
+  "MAIN_2020": "Splatterscope",
+  "MAIN_2010": "Splat Charger",
+  "MAIN_2000": "Classic Squiffer",
+  "MAIN_5030": "Dualie Squelchers",
+  "MAIN_5020": "Glooga Dualies",
+  "MAIN_5010": "Splat Dualies",
+  "MAIN_5000": "Dapple Dualies",
+  "MAIN_5040": "Dark Tetra Dualies",
+  "MAIN_1000": "Carbon Roller",
+  "MAIN_1020": "Dynamo Roller",
+  "MAIN_1030": "Flingza Roller",
+  "MAIN_1010": "Splat Roller",
+  "MAIN_8010": "Splatana Wiper",
+  "MAIN_8000": "Splatana Stamper",
+  "MAIN_6020": "Undercover Brella",
+  "MAIN_6000": "Splat Brella",
+  "MAIN_6010": "Tenta Brella",
+  "MAIN_30": "Aerospray MG",
+  "MAIN_70": "Splattershot Pro",
+  "MAIN_10": "Splattershot Jr.",
+  "MAIN_400": "Squeezer",
+  "MAIN_50": ".52 Gal",
+  "MAIN_80": ".96 Gal",
+  "MAIN_90": "Jet Squelcher",
+  "MAIN_40": "Splattershot",
+  "MAIN_45": "Hero Shot Replica",
+  "MAIN_20": "Splash-o-matic",
+  "MAIN_60": "N-ZAP '85",
+  "MAIN_0": "Sploosh-o-matic",
+  "MAIN_310": "H-3 Nozzlenose",
+  "MAIN_300": "L-3 Nozzlenose",
+  "MAIN_3030": "Bloblobber",
+  "MAIN_3010": "Tri-Slosher",
+  "MAIN_3020": "Sloshing Machine",
+  "MAIN_3000": "Slosher",
+  "MAIN_3040": "Explosher",
+  "MAIN_4030": "Ballpoint Splatling",
+  "MAIN_4020": "Hydra Splatling",
+  "MAIN_4000": "Mini Splatling",
+  "MAIN_4040": "Nautilus 47",
+  "MAIN_4010": "Heavy Splatling",
+  "MAIN_7010": "Tri-Stringer",
+  "MAIN_7020": "REEF-LUX 450",
+  "SUB_8": "Squid Beakon",
+  "SUB_6": "Curling Bomb",
+  "SUB_5": "Fizzy Bomb",
+  "SUB_2": "Burst Bomb",
+  "SUB_7": "Autobomb",
+  "SUB_0": "Splat Bomb",
+  "SUB_1": "Suction Bomb",
+  "SUB_13": "Torpedo",
+  "SUB_12": "Angle Shooter",
+  "SUB_9": "Point Sensor",
+  "SUB_11": "Toxic Mist",
+  "SUB_4": "Splash Wall",
+  "SUB_3": "Sprinkler",
+  "SUB_10": "Ink Mine",
+  "SPECIAL_8": "Ink Vac",
+  "SPECIAL_12": "Crab Tank",
+  "SPECIAL_15": "Tacticooler",
+  "SPECIAL_2": "Big Bubbler",
+  "SPECIAL_5": "Ink Storm",
+  "SPECIAL_10": "Inkjet",
+  "SPECIAL_9": "Killer Wail 5.1",
+  "SPECIAL_4": "Tenta Missiles",
+  "SPECIAL_6": "Booyah Bomb",
+  "SPECIAL_7": "Wave Breaker",
+  "SPECIAL_13": "Reefslider",
+  "SPECIAL_3": "Zipcaster",
+  "SPECIAL_14": "Triple Inkstrike",
+  "SPECIAL_1": "Trizooka",
+  "SPECIAL_11": "Ultra Stamp"
 }
diff --git a/public/locales/es/common.json b/public/locales/es/common.json
index f8918b6f2..f47f3310d 100644
--- a/public/locales/es/common.json
+++ b/public/locales/es/common.json
@@ -6,7 +6,7 @@
   "pages.calendar": "Calendario",
   "pages.faq": "FAQ",
   "pages.builds": "Builds",
-  "pages.buildAnalyzer": "Analizador the builds",
+  "pages.analyzer": "Analizador the builds",
 
   "header.profile": "Perfil",
   "header.logout": "Cerrar sesión",
diff --git a/public/locales/ja/calendar.json b/public/locales/ja/calendar.json
index d9f7db64c..9e135f717 100644
--- a/public/locales/ja/calendar.json
+++ b/public/locales/ja/calendar.json
@@ -39,7 +39,6 @@
   "week.this": "今週",
   "week.next": "次週",
   "week.last": "先週",
-  "week.week": "週",
 
   "tag.desc.BADGE": "このイベントの勝者は sendou.ink のバッジがもらえます。",
   "tag.desc.SPECIAL": "通常とは異なるルール(ブキ縛り)が適用される場合があります。",
diff --git a/public/locales/ko/calendar.json b/public/locales/ko/calendar.json
index 357080be7..2cd9d5282 100644
--- a/public/locales/ko/calendar.json
+++ b/public/locales/ko/calendar.json
@@ -31,10 +31,9 @@
   "forms.errors.uniqueTeamName": "각 팀은 다른 이름을 가져야 합니다.",
   "forms.errors.duplicatePlayer": "같은 팀에 같은 선수를 두 번 넣을 수 없습니다.",
   "forms.errors.emptyTeam": "모든 팀은 최소한 한 명의 플레이어가 필요합니다.",
-  "week.this": "이번",
-  "week.next": "다음",
-  "week.last": "지난",
-  "week.week": "주",
+  "week.this": "이번 주",
+  "week.next": "다음 주",
+  "week.last": "지난 주",
   "tag.desc.BADGE": "이 이벤트의 우승자는 sendou.ink 배지를 받습니다.",
   "tag.desc.SPECIAL": "기본과 다른 특수한 규칙 ex) 사용 가능한 무기 제한.",
   "tag.desc.ART": "이 대회에 참가함으로써 그림을 받을 수 있습니다.",
diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json
index 9966fb5a6..484d593ce 100644
--- a/public/locales/nl/common.json
+++ b/public/locales/nl/common.json
@@ -6,7 +6,7 @@
   "pages.calendar": "Kalender",
   "pages.faq": "FAQ",
   "pages.builds": "Uitrusting",
-  "pages.buildAnalyzer": "Uitrusting Analyseren",
+  "pages.analyzer": "Uitrusting Analyseren",
 
   "header.profile": "Profiel",
   "header.logout": "Log uit",