diff --git a/server/i18n/all.pot b/server/i18n/all.pot
index 0d27e02e2f..d321235e43 100644
--- a/server/i18n/all.pot
+++ b/server/i18n/all.pot
@@ -277,6 +277,10 @@ msgstr "Rate of associate degree attainment by gender"
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "Rate of bachelor's degree attainment by gender"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 #. The category for a group of statistical charts.
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "Crime"
@@ -285,6 +289,10 @@ msgstr "Crime"
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "Demographics"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 #. The category for a group of statistical charts.
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "Economics"
@@ -293,6 +301,10 @@ msgstr "Economics"
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "Education"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 #. The category for a group of statistical charts.
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
@@ -313,10 +325,26 @@ msgstr "Health"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "Housing"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 #. The category for a group of statistical charts.
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "Overview"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 #. Title of a place chart: Number of children who are employed
 msgid "CHART_TITLE-Children_employed"
 msgstr "Children in employment"
diff --git a/server/i18n/de/LC_MESSAGES/all.po b/server/i18n/de/LC_MESSAGES/all.po
index 3240a2a960..76a0e8546a 100644
--- a/server/i18n/de/LC_MESSAGES/all.po
+++ b/server/i18n/de/LC_MESSAGES/all.po
@@ -211,18 +211,27 @@ msgstr "Anteil der Personen mit College-Abschluss nach Geschlecht"
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "Anteil der Personen mit Bachelor-Abschluss nach Geschlecht"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "Kriminalität"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "Demografie"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "Wirtschaft"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "Ausbildung"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
 
@@ -238,9 +247,21 @@ msgstr "Gesundheit"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "Wohnen"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "Übersicht"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 msgid "CHART_TITLE-Children_employed"
 msgstr "Kinder in Beschäftigungsverhältnissen"
 
diff --git a/server/i18n/en/LC_MESSAGES/all.po b/server/i18n/en/LC_MESSAGES/all.po
index 1acf4eae5c..533afeafdb 100644
--- a/server/i18n/en/LC_MESSAGES/all.po
+++ b/server/i18n/en/LC_MESSAGES/all.po
@@ -276,6 +276,10 @@ msgstr "Rate of associate degree attainment by gender"
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "Rate of bachelor's degree attainment by gender"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 #. The category for a group of statistical charts.
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "Crime"
@@ -284,6 +288,10 @@ msgstr "Crime"
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "Demographics"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 #. The category for a group of statistical charts.
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "Economics"
@@ -292,6 +300,10 @@ msgstr "Economics"
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "Education"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 #. The category for a group of statistical charts.
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
@@ -312,10 +324,26 @@ msgstr "Health"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "Housing"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 #. The category for a group of statistical charts.
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "Overview"
 
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+#. The category for a group of statistical charts.
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 #. Title of a place chart: Number of children who are employed
 msgid "CHART_TITLE-Children_employed"
 msgstr "Children in employment"
diff --git a/server/i18n/es/LC_MESSAGES/all.po b/server/i18n/es/LC_MESSAGES/all.po
index c8a3f4f7f2..816ecfe558 100644
--- a/server/i18n/es/LC_MESSAGES/all.po
+++ b/server/i18n/es/LC_MESSAGES/all.po
@@ -211,18 +211,27 @@ msgstr "Tasa de diplomados por sexo"
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "Tasa de personas con grados por sexo"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "Criminalidad"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "Demografía"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "Economía"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "Educación"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
 
@@ -238,9 +247,21 @@ msgstr "Salud"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "Vivienda"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "Descripción general"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 msgid "CHART_TITLE-Children_employed"
 msgstr "Niños trabajadores"
 
diff --git a/server/i18n/fr/LC_MESSAGES/all.po b/server/i18n/fr/LC_MESSAGES/all.po
index f782cb82d2..a440e369d6 100644
--- a/server/i18n/fr/LC_MESSAGES/all.po
+++ b/server/i18n/fr/LC_MESSAGES/all.po
@@ -211,18 +211,27 @@ msgstr "Taux d'obtention d'un diplôme d'associé par sexe"
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "Taux d'obtention d'une licence par sexe"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "Crimes"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "Données démographiques"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "Économie"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "Éducation"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
 
@@ -238,9 +247,21 @@ msgstr "Santé"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "Logement"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "Aperçu"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 msgid "CHART_TITLE-Children_employed"
 msgstr "Enfants qui travaillent"
 
diff --git a/server/i18n/hi/LC_MESSAGES/all.po b/server/i18n/hi/LC_MESSAGES/all.po
index 3bfc78a241..e5dce91ffe 100644
--- a/server/i18n/hi/LC_MESSAGES/all.po
+++ b/server/i18n/hi/LC_MESSAGES/all.po
@@ -211,18 +211,27 @@ msgstr "लिंग के हिसाब से असोसिएट डि
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "लिंग के हिसाब से ऐसे लोगों की दर जो स्नातक हैं"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "अपराध"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "लोगों की जानकारी, जैसे कि उम्र, लिंग, आय, शिक्षा वगैरह"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "अर्थशास्त्र"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "शिक्षा"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
 
@@ -238,9 +247,21 @@ msgstr "स्वास्थ्य"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "घर"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "खास जानकारी"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 msgid "CHART_TITLE-Children_employed"
 msgstr "नौकरी करने वाले बच्चों की संख्या"
 
diff --git a/server/i18n/it/LC_MESSAGES/all.po b/server/i18n/it/LC_MESSAGES/all.po
index 6ee1e53260..1a518a729b 100644
--- a/server/i18n/it/LC_MESSAGES/all.po
+++ b/server/i18n/it/LC_MESSAGES/all.po
@@ -211,18 +211,27 @@ msgstr "Tasso di conseguimento di diplomi universitari per sesso"
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "Tasso di conseguimento della laurea per sesso"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "Criminalità"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "Dati demografici"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "Aspetti economici"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "Istruzione"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
 
@@ -238,9 +247,21 @@ msgstr "Salute"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "Abitazioni"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "Panoramica"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 msgid "CHART_TITLE-Children_employed"
 msgstr "Bambini che lavorano"
 
diff --git a/server/i18n/ja/LC_MESSAGES/all.po b/server/i18n/ja/LC_MESSAGES/all.po
index ac3b131973..46261bfe10 100644
--- a/server/i18n/ja/LC_MESSAGES/all.po
+++ b/server/i18n/ja/LC_MESSAGES/all.po
@@ -211,18 +211,27 @@ msgstr "準学士号の取得率（性別ごと）"
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "学士号の取得率（性別ごと）"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "犯罪"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "人口統計"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "経済"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "学歴"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
 
@@ -238,9 +247,21 @@ msgstr "健康"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "住宅"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "概要"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 msgid "CHART_TITLE-Children_employed"
 msgstr "就労している児童"
 
diff --git a/server/i18n/ko/LC_MESSAGES/all.po b/server/i18n/ko/LC_MESSAGES/all.po
index 92d3c69d6d..f4110af49f 100644
--- a/server/i18n/ko/LC_MESSAGES/all.po
+++ b/server/i18n/ko/LC_MESSAGES/all.po
@@ -211,18 +211,27 @@ msgstr "성별에 따른 2년제 학위 취득률"
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "성별에 따른 학사 학위 취득률"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "범죄"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "인구통계"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "경제학"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "교육"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
 
@@ -238,9 +247,21 @@ msgstr "건강"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "주택"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "개요"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 msgid "CHART_TITLE-Children_employed"
 msgstr "고용 아동 수"
 
diff --git a/server/i18n/ru/LC_MESSAGES/all.po b/server/i18n/ru/LC_MESSAGES/all.po
index 5636b913c3..9756210ff9 100644
--- a/server/i18n/ru/LC_MESSAGES/all.po
+++ b/server/i18n/ru/LC_MESSAGES/all.po
@@ -211,18 +211,27 @@ msgstr "Процент людей с неоконченным высшим об
 msgid "CHART_TITLE-Bachelors_degree_rate_gender"
 msgstr "Процент имеющих степень бакалавра людей по полу"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Air"
+msgstr "Air"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Crime"
 msgstr "Преступления"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Demographics"
 msgstr "Демография"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Disasters"
+msgstr "Disasters"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Economics"
 msgstr "Экономика"
 
 msgid "CHART_TITLE-CHART_CATEGORY-Education"
 msgstr "Образование"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Emissions"
+msgstr "Emissions"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Energy"
 msgstr "Energy"
 
@@ -238,9 +247,21 @@ msgstr "Здоровье"
 msgid "CHART_TITLE-CHART_CATEGORY-Housing"
 msgstr "Жилье"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Income"
+msgstr "Income"
+
 msgid "CHART_TITLE-CHART_CATEGORY-Overview"
 msgstr "Обзор"
 
+msgid "CHART_TITLE-CHART_CATEGORY-Poverty"
+msgstr "Poverty"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Temperature"
+msgstr "Temperature"
+
+msgid "CHART_TITLE-CHART_CATEGORY-Water"
+msgstr "Water"
+
 msgid "CHART_TITLE-Children_employed"
 msgstr "Количество работающих детей"
 
diff --git a/tools/i18n/chart_config_extractor.py b/tools/i18n/chart_config_extractor.py
index ebf35575cd..4e85a7ff6d 100755
--- a/tools/i18n/chart_config_extractor.py
+++ b/tools/i18n/chart_config_extractor.py
@@ -63,6 +63,8 @@ def main():
   # Extract strings from each chart
   for conf in chart_config:
     categories.add(conf['category'])
+    if 'topic' in conf:
+      categories.add(conf['topic'])
     (id, message) = extract_message_from_chart(conf)
     maybe_add_message(messages, id, message)
     if conf.get('relatedChart', {}).get('scale', False):