diff --git a/babel/messages.pot b/babel/messages.pot
index 52dc8c9937..67cf66abc6 100644
--- a/babel/messages.pot
+++ b/babel/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-06-08 14:22+0200\n"
+"POT-Creation-Date: 2016-06-09 10:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "Target aspect ratio for treemap tiles."
 msgstr ""
 
-#: caravel/forms.py:439
+#: caravel/forms.py:439 caravel/viz.py:806 caravel/viz.py:855
 msgid "Number format"
 msgstr ""
 
@@ -1004,6 +1004,26 @@ msgstr ""
 msgid "Table View"
 msgstr ""
 
+#: caravel/viz.py:317
+msgid "GROUP BY"
+msgstr ""
+
+#: caravel/viz.py:318
+msgid "Use this section if you want a query that aggregates"
+msgstr ""
+
+#: caravel/viz.py:324
+msgid "NOT GROUPED BY"
+msgstr ""
+
+#: caravel/viz.py:325
+msgid "Use this section if you want to query atomic rows"
+msgstr ""
+
+#: caravel/viz.py:330
+msgid "Options"
+msgstr ""
+
 #: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
@@ -1020,8 +1040,9 @@ msgstr ""
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
-#: caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:734 caravel/viz.py:898
+#: caravel/viz.py:1042 caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:1622
 msgid "Chart Options"
 msgstr ""
 
@@ -1053,6 +1074,12 @@ msgstr ""
 msgid "Advanced Analytics"
 msgstr ""
 
+#: caravel/viz.py:908
+msgid ""
+"This section contains options that allow for advanced analytical post "
+"processing of query results"
+msgstr ""
+
 #: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
@@ -1077,6 +1104,10 @@ msgstr ""
 msgid "Breakdowns"
 msgstr ""
 
+#: caravel/viz.py:1140
+msgid "Defines how each series is broken down"
+msgstr ""
+
 #: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
@@ -1089,6 +1120,10 @@ msgstr ""
 msgid "The primary metric is used to define the arc segment sizes"
 msgstr ""
 
+#: caravel/viz.py:1222
+msgid "Secondary Metric"
+msgstr ""
+
 #: caravel/viz.py:1223
 msgid ""
 "This secondary metric is used to define the color as a ratio against the "
@@ -1180,6 +1215,10 @@ msgstr ""
 msgid "Heatmap"
 msgstr ""
 
+#: caravel/viz.py:1562
+msgid "Heatmap Options"
+msgstr ""
+
 #: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
diff --git a/caravel/translations/es/LC_MESSAGES/messages.po b/caravel/translations/es/LC_MESSAGES/messages.po
index d9c27c28ea..5397eb3330 100644
--- a/caravel/translations/es/LC_MESSAGES/messages.po
+++ b/caravel/translations/es/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-06-08 12:20+0200\n"
+"POT-Creation-Date: 2016-06-09 10:27+0200\n"
 "PO-Revision-Date: 2016-05-02 08:49-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: es\n"
@@ -307,7 +307,7 @@ msgstr ""
 msgid "Target aspect ratio for treemap tiles."
 msgstr ""
 
-#: caravel/forms.py:439
+#: caravel/forms.py:439 caravel/viz.py:806 caravel/viz.py:855
 msgid "Number format"
 msgstr ""
 
@@ -667,6 +667,14 @@ msgid ""
 "in the Caravel source code"
 msgstr ""
 
+#: caravel/forms.py:816 caravel/forms.py:820
+msgid "Filter 1"
+msgstr ""
+
+#: caravel/forms.py:825
+msgid "Super"
+msgstr ""
+
 #: caravel/forms.py:829
 msgid "Time"
 msgstr ""
@@ -997,6 +1005,26 @@ msgstr ""
 msgid "Table View"
 msgstr ""
 
+#: caravel/viz.py:317
+msgid "GROUP BY"
+msgstr ""
+
+#: caravel/viz.py:318
+msgid "Use this section if you want a query that aggregates"
+msgstr ""
+
+#: caravel/viz.py:324
+msgid "NOT GROUPED BY"
+msgstr ""
+
+#: caravel/viz.py:325
+msgid "Use this section if you want to query atomic rows"
+msgstr ""
+
+#: caravel/viz.py:330
+msgid "Options"
+msgstr ""
+
 #: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
@@ -1013,8 +1041,9 @@ msgstr ""
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
-#: caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:734 caravel/viz.py:898
+#: caravel/viz.py:1042 caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:1622
 msgid "Chart Options"
 msgstr ""
 
@@ -1046,6 +1075,12 @@ msgstr ""
 msgid "Advanced Analytics"
 msgstr ""
 
+#: caravel/viz.py:908
+msgid ""
+"This section contains options that allow for advanced analytical post "
+"processing of query results"
+msgstr ""
+
 #: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
@@ -1070,6 +1105,10 @@ msgstr ""
 msgid "Breakdowns"
 msgstr ""
 
+#: caravel/viz.py:1140
+msgid "Defines how each series is broken down"
+msgstr ""
+
 #: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
@@ -1082,6 +1121,10 @@ msgstr ""
 msgid "The primary metric is used to define the arc segment sizes"
 msgstr ""
 
+#: caravel/viz.py:1222
+msgid "Secondary Metric"
+msgstr ""
+
 #: caravel/viz.py:1223
 msgid ""
 "This secondary metric is used to define the color as a ratio against the "
@@ -1173,6 +1216,10 @@ msgstr ""
 msgid "Heatmap"
 msgstr ""
 
+#: caravel/viz.py:1562
+msgid "Heatmap Options"
+msgstr ""
+
 #: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
@@ -1293,18 +1340,3 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#~ msgid "Tables"
-#~ msgstr ""
-
-#~ msgid "Druid Clusters"
-#~ msgstr ""
-
-#~ msgid "Borker Port"
-#~ msgstr ""
-
-#~ msgid "The datasource seems to have been deleted"
-#~ msgstr ""
-
-#~ msgid "You don't seem to have access to this datasource"
-#~ msgstr ""
-
diff --git a/caravel/translations/fr/LC_MESSAGES/messages.po b/caravel/translations/fr/LC_MESSAGES/messages.po
index 767b253cdd..02da245d92 100644
--- a/caravel/translations/fr/LC_MESSAGES/messages.po
+++ b/caravel/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-06-08 12:20+0200\n"
+"POT-Creation-Date: 2016-06-09 10:27+0200\n"
 "PO-Revision-Date: 2016-05-01 23:07-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -307,7 +307,7 @@ msgstr ""
 msgid "Target aspect ratio for treemap tiles."
 msgstr ""
 
-#: caravel/forms.py:439
+#: caravel/forms.py:439 caravel/viz.py:806 caravel/viz.py:855
 msgid "Number format"
 msgstr ""
 
@@ -667,6 +667,14 @@ msgid ""
 "in the Caravel source code"
 msgstr ""
 
+#: caravel/forms.py:816 caravel/forms.py:820
+msgid "Filter 1"
+msgstr ""
+
+#: caravel/forms.py:825
+msgid "Super"
+msgstr ""
+
 #: caravel/forms.py:829
 msgid "Time"
 msgstr ""
@@ -693,11 +701,11 @@ msgstr ""
 
 #: caravel/views.py:167 caravel/views.py:195
 msgid "Column"
-msgstr "Colonne"
+msgstr ""
 
 #: caravel/views.py:168 caravel/views.py:228 caravel/views.py:257
 msgid "Verbose Name"
-msgstr "Nom Complet"
+msgstr ""
 
 #: caravel/views.py:169 caravel/views.py:227 caravel/views.py:256
 #: caravel/views.py:440 caravel/views.py:581
@@ -710,7 +718,7 @@ msgstr ""
 
 #: caravel/views.py:171 caravel/views.py:199
 msgid "Filterable"
-msgstr "Filtrable"
+msgstr ""
 
 #: caravel/views.py:172 caravel/views.py:231 caravel/views.py:343
 #: caravel/views.py:446
@@ -723,7 +731,7 @@ msgstr ""
 
 #: caravel/views.py:174 caravel/views.py:201
 msgid "Sum"
-msgstr "Somme"
+msgstr ""
 
 #: caravel/views.py:175 caravel/views.py:202
 msgid "Min"
@@ -739,7 +747,7 @@ msgstr ""
 
 #: caravel/views.py:178
 msgid "Is temporal"
-msgstr "Est temporel"
+msgstr ""
 
 #: caravel/views.py:196 caravel/views.py:229 caravel/views.py:258
 #: caravel/views.py:468
@@ -748,7 +756,7 @@ msgstr ""
 
 #: caravel/views.py:197 caravel/views.py:439
 msgid "Datasource"
-msgstr "Source de données"
+msgstr ""
 
 #: caravel/views.py:230
 msgid "SQL Expression"
@@ -760,23 +768,23 @@ msgstr ""
 
 #: caravel/views.py:260
 msgid "Druid Datasource"
-msgstr "Source de données Druid"
+msgstr ""
 
 #: caravel/views.py:291 caravel/views.py:345
 msgid "Database"
-msgstr "Base de données"
+msgstr ""
 
 #: caravel/views.py:292
 msgid "SQL link"
-msgstr "Lien SQL"
+msgstr ""
 
 #: caravel/views.py:293 caravel/views.py:437 caravel/views.py:503
 msgid "Creator"
-msgstr "Createur"
+msgstr ""
 
 #: caravel/views.py:294 caravel/views.py:346
 msgid "Last Changed"
-msgstr "Modifié"
+msgstr ""
 
 #: caravel/views.py:295
 msgid "SQLAlchemy URI"
@@ -793,7 +801,7 @@ msgstr ""
 
 #: caravel/views.py:313
 msgid "Databases"
-msgstr "Base de Données"
+msgstr ""
 
 #: caravel/views.py:316 caravel/views.py:375 caravel/views.py:409
 #: caravel/views.py:603 caravel/views.py:1098 caravel/views.py:1116
@@ -880,21 +888,21 @@ msgstr ""
 
 #: caravel/views.py:444 caravel/views.py:469
 msgid "Slice"
-msgstr "Graphique"
+msgstr ""
 
 #: caravel/views.py:445
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 #: caravel/views.py:447 caravel/views.py:470
 msgid "Visualization Type"
-msgstr "Type de visualization"
+msgstr ""
 
 #: caravel/foo/templates/caravel/welcome.html:46
 #: caravel/templates/caravel/welcome.html:46 caravel/views.py:456
 #: caravel/views.py:501
 msgid "Slices"
-msgstr "Graphiques"
+msgstr ""
 
 #: caravel/views.py:485
 msgid ""
@@ -915,11 +923,11 @@ msgstr ""
 
 #: caravel/views.py:498
 msgid "Dashboard"
-msgstr "Tableau de Bord"
+msgstr ""
 
 #: caravel/views.py:499
 msgid "Title"
-msgstr "Titre"
+msgstr ""
 
 #: caravel/views.py:500
 msgid "Slug"
@@ -927,7 +935,7 @@ msgstr ""
 
 #: caravel/views.py:504
 msgid "Modified"
-msgstr "Modifié"
+msgstr ""
 
 #: caravel/views.py:505
 msgid "Position JSON"
@@ -943,7 +951,7 @@ msgstr ""
 
 #: caravel/views.py:545
 msgid "User"
-msgstr "Utilisateur"
+msgstr ""
 
 #: caravel/views.py:546
 msgid "Action"
@@ -959,7 +967,7 @@ msgstr ""
 
 #: caravel/views.py:556
 msgid "Security"
-msgstr "Securité"
+msgstr ""
 
 #: caravel/views.py:573
 msgid "Timezone offset (in hours) for this datasource"
@@ -967,15 +975,15 @@ msgstr ""
 
 #: caravel/views.py:579
 msgid "Data Source"
-msgstr "Source de Données"
+msgstr ""
 
 #: caravel/views.py:582
 msgid "Owner"
-msgstr "Propriétair"
+msgstr ""
 
 #: caravel/views.py:584
 msgid "Is Hidden"
-msgstr "Caché"
+msgstr ""
 
 #: caravel/views.py:586
 msgid "Time Offset"
@@ -983,7 +991,7 @@ msgstr ""
 
 #: caravel/views.py:601
 msgid "Druid Datasources"
-msgstr "Source de données Druid"
+msgstr ""
 
 #: caravel/views.py:1016
 msgid "This view requires the `all_datasource_access` permission"
@@ -997,6 +1005,26 @@ msgstr ""
 msgid "Table View"
 msgstr ""
 
+#: caravel/viz.py:317
+msgid "GROUP BY"
+msgstr ""
+
+#: caravel/viz.py:318
+msgid "Use this section if you want a query that aggregates"
+msgstr ""
+
+#: caravel/viz.py:324
+msgid "NOT GROUPED BY"
+msgstr ""
+
+#: caravel/viz.py:325
+msgid "Use this section if you want to query atomic rows"
+msgstr ""
+
+#: caravel/viz.py:330
+msgid "Options"
+msgstr ""
+
 #: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
@@ -1007,14 +1035,15 @@ msgstr ""
 
 #: caravel/viz.py:470
 msgid "Word Cloud"
-msgstr "Nuage de Mots"
+msgstr ""
 
 #: caravel/viz.py:502
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
-#: caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:734 caravel/viz.py:898
+#: caravel/viz.py:1042 caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:1622
 msgid "Chart Options"
 msgstr ""
 
@@ -1028,7 +1057,7 @@ msgstr ""
 
 #: caravel/viz.py:724
 msgid "Bubble Chart"
-msgstr "Graphique en Bulles"
+msgstr ""
 
 #: caravel/viz.py:792
 msgid "Big Number with Trendline"
@@ -1036,7 +1065,7 @@ msgstr ""
 
 #: caravel/viz.py:842
 msgid "Big Number"
-msgstr "Gros Chiffre"
+msgstr ""
 
 #: caravel/viz.py:888
 msgid "Time Series - Line Chart"
@@ -1046,6 +1075,12 @@ msgstr ""
 msgid "Advanced Analytics"
 msgstr ""
 
+#: caravel/viz.py:908
+msgid ""
+"This section contains options that allow for advanced analytical post "
+"processing of query results"
+msgstr ""
+
 #: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
@@ -1070,6 +1105,10 @@ msgstr ""
 msgid "Breakdowns"
 msgstr ""
 
+#: caravel/viz.py:1140
+msgid "Defines how each series is broken down"
+msgstr ""
+
 #: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
@@ -1082,6 +1121,10 @@ msgstr ""
 msgid "The primary metric is used to define the arc segment sizes"
 msgstr ""
 
+#: caravel/viz.py:1222
+msgid "Secondary Metric"
+msgstr ""
+
 #: caravel/viz.py:1223
 msgid ""
 "This secondary metric is used to define the color as a ratio against the "
@@ -1118,7 +1161,7 @@ msgstr ""
 
 #: caravel/viz.py:1373
 msgid "World Map"
-msgstr "Carte du monde"
+msgstr ""
 
 #: caravel/viz.py:1384
 msgid "Bubbles"
@@ -1151,7 +1194,7 @@ msgstr ""
 #: caravel/foo/templates/caravel/explore.html:137
 #: caravel/templates/caravel/explore.html:137 caravel/viz.py:1447
 msgid "Filters"
-msgstr "Filtres"
+msgstr ""
 
 #: caravel/viz.py:1459
 msgid "Filter fields"
@@ -1173,6 +1216,10 @@ msgstr ""
 msgid "Heatmap"
 msgstr ""
 
+#: caravel/viz.py:1562
+msgid "Heatmap Options"
+msgstr ""
+
 #: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
@@ -1286,25 +1333,10 @@ msgstr ""
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:13
 msgid "Welcome!"
-msgstr "Bienvenue!"
+msgstr ""
 
 #: caravel/foo/templates/caravel/models/database/macros.html:4
 #: caravel/templates/caravel/models/database/macros.html:4
 msgid "Test Connection"
 msgstr ""
 
-#~ msgid "Tables"
-#~ msgstr ""
-
-#~ msgid "Druid Clusters"
-#~ msgstr ""
-
-#~ msgid "Borker Port"
-#~ msgstr ""
-
-#~ msgid "The datasource seems to have been deleted"
-#~ msgstr "Cette source semble seche"
-
-#~ msgid "You don't seem to have access to this datasource"
-#~ msgstr "Vous n'avez pas acces a cette source de donnees"
-
diff --git a/caravel/translations/it/LC_MESSAGES/messages.po b/caravel/translations/it/LC_MESSAGES/messages.po
index 51ca4d10a1..67acf5032e 100644
--- a/caravel/translations/it/LC_MESSAGES/messages.po
+++ b/caravel/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-06-08 12:20+0200\n"
+"POT-Creation-Date: 2016-06-09 10:27+0200\n"
 "PO-Revision-Date: 2016-05-19 16:43+0200\n"
 "Last-Translator: Riccardo Magliocchetti "
 "<riccardo.magliocchetti@gmail.com>\n"
@@ -308,7 +308,7 @@ msgstr ""
 msgid "Target aspect ratio for treemap tiles."
 msgstr ""
 
-#: caravel/forms.py:439
+#: caravel/forms.py:439 caravel/viz.py:806 caravel/viz.py:855
 msgid "Number format"
 msgstr ""
 
@@ -668,6 +668,14 @@ msgid ""
 "in the Caravel source code"
 msgstr ""
 
+#: caravel/forms.py:816 caravel/forms.py:820
+msgid "Filter 1"
+msgstr ""
+
+#: caravel/forms.py:825
+msgid "Super"
+msgstr ""
+
 #: caravel/forms.py:829
 msgid "Time"
 msgstr ""
@@ -681,20 +689,16 @@ msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
 msgstr ""
-"La colonna di tipo datetime non è stata fornita nella configurazione "
-"della tabella ma richiesta da questo tipo di grafico"
 
 #: caravel/models.py:1255
 msgid "No data was returned."
-msgstr "Nessun dato disponibile."
+msgstr ""
 
 #: caravel/views.py:158
 msgid ""
 "Whether to make this column available as a [Time Granularity] option, "
 "column has to be DATETIME or DATETIME-like"
 msgstr ""
-"Rendi questa colonna disponibile come una opzione [Time Granularity], la "
-"colonna deve essere DATATIME o DATETIME-like"
 
 #: caravel/views.py:167 caravel/views.py:195
 msgid "Column"
@@ -798,12 +802,12 @@ msgstr ""
 
 #: caravel/views.py:313
 msgid "Databases"
-msgstr "Database"
+msgstr ""
 
 #: caravel/views.py:316 caravel/views.py:375 caravel/views.py:409
 #: caravel/views.py:603 caravel/views.py:1098 caravel/views.py:1116
 msgid "Sources"
-msgstr "Sorgenti"
+msgstr ""
 
 #: caravel/views.py:344
 msgid "Changed By"
@@ -869,7 +873,7 @@ msgstr ""
 #: caravel/templates/caravel/welcome.html:25 caravel/views.py:438
 #: caravel/views.py:524
 msgid "Dashboards"
-msgstr "Dashboard"
+msgstr ""
 
 #: caravel/views.py:441
 msgid "Last Modified"
@@ -899,7 +903,7 @@ msgstr ""
 #: caravel/templates/caravel/welcome.html:46 caravel/views.py:456
 #: caravel/views.py:501
 msgid "Slices"
-msgstr "Slice"
+msgstr ""
 
 #: caravel/views.py:485
 msgid ""
@@ -907,17 +911,12 @@ msgid ""
 "dashboard. It is dynamically generated when adjusting the widgets size "
 "and positions by using drag & drop in the dashboard view"
 msgstr ""
-"Questo oggetto json descrive il posizionamento dei widget nella "
-"dashboard.E` generata dinamicamente quando vengono cambiate la dimensioni"
-" dei widget o laposizione tramite il drag&drop nella vista dashboard."
 
 #: caravel/views.py:490
 msgid ""
 "The css for individual dashboards can be altered here, or in the "
 "dashboard view where changes are immediately visible"
 msgstr ""
-"Il css per ogni dashboard può essere modificato qui o nella vistdashboard"
-" dove i cambiamenti sono visibili immediatamente"
 
 #: caravel/views.py:494
 msgid "To get a readable URL for your dashboard"
@@ -965,11 +964,11 @@ msgstr ""
 
 #: caravel/views.py:554
 msgid "Action Log"
-msgstr "Log delle azioni"
+msgstr ""
 
 #: caravel/views.py:556
 msgid "Security"
-msgstr "Sicurezza"
+msgstr ""
 
 #: caravel/views.py:573
 msgid "Timezone offset (in hours) for this datasource"
@@ -993,20 +992,40 @@ msgstr ""
 
 #: caravel/views.py:601
 msgid "Druid Datasources"
-msgstr "Datasource Druid"
+msgstr ""
 
 #: caravel/views.py:1016
 msgid "This view requires the `all_datasource_access` permission"
-msgstr "Questa vista richiede il permesso `all_datasource_access`"
+msgstr ""
 
 #: caravel/views.py:1113
 msgid "CSS Templates"
-msgstr "Template CSS"
+msgstr ""
 
 #: caravel/viz.py:314
 msgid "Table View"
 msgstr ""
 
+#: caravel/viz.py:317
+msgid "GROUP BY"
+msgstr ""
+
+#: caravel/viz.py:318
+msgid "Use this section if you want a query that aggregates"
+msgstr ""
+
+#: caravel/viz.py:324
+msgid "NOT GROUPED BY"
+msgstr ""
+
+#: caravel/viz.py:325
+msgid "Use this section if you want to query atomic rows"
+msgstr ""
+
+#: caravel/viz.py:330
+msgid "Options"
+msgstr ""
+
 #: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
@@ -1023,8 +1042,9 @@ msgstr ""
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
-#: caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:734 caravel/viz.py:898
+#: caravel/viz.py:1042 caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:1622
 msgid "Chart Options"
 msgstr ""
 
@@ -1056,6 +1076,12 @@ msgstr ""
 msgid "Advanced Analytics"
 msgstr ""
 
+#: caravel/viz.py:908
+msgid ""
+"This section contains options that allow for advanced analytical post "
+"processing of query results"
+msgstr ""
+
 #: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
@@ -1080,6 +1106,10 @@ msgstr ""
 msgid "Breakdowns"
 msgstr ""
 
+#: caravel/viz.py:1140
+msgid "Defines how each series is broken down"
+msgstr ""
+
 #: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
@@ -1092,6 +1122,10 @@ msgstr ""
 msgid "The primary metric is used to define the arc segment sizes"
 msgstr ""
 
+#: caravel/viz.py:1222
+msgid "Secondary Metric"
+msgstr ""
+
 #: caravel/viz.py:1223
 msgid ""
 "This secondary metric is used to define the color as a ratio against the "
@@ -1183,6 +1217,10 @@ msgstr ""
 msgid "Heatmap"
 msgstr ""
 
+#: caravel/viz.py:1562
+msgid "Heatmap Options"
+msgstr ""
+
 #: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
@@ -1195,17 +1233,17 @@ msgstr ""
 #: caravel/foo/templates/appbuilder/navbar_right.html:34
 #: caravel/templates/appbuilder/navbar_right.html:34
 msgid "Profile"
-msgstr "Profilo"
+msgstr ""
 
 #: caravel/foo/templates/appbuilder/navbar_right.html:35
 #: caravel/templates/appbuilder/navbar_right.html:35
 msgid "Logout"
-msgstr "Logout"
+msgstr ""
 
 #: caravel/foo/templates/appbuilder/navbar_right.html:40
 #: caravel/templates/appbuilder/navbar_right.html:40
 msgid "Login"
-msgstr "Login"
+msgstr ""
 
 #: caravel/foo/templates/caravel/explore.html:58
 #: caravel/templates/caravel/explore.html:58
@@ -1296,25 +1334,9 @@ msgstr ""
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:13
 msgid "Welcome!"
-msgstr "Benvenuto!"
+msgstr ""
 
 #: caravel/foo/templates/caravel/models/database/macros.html:4
 #: caravel/templates/caravel/models/database/macros.html:4
 msgid "Test Connection"
 msgstr ""
-
-#~ msgid "Tables"
-#~ msgstr "Tabelle"
-
-#~ msgid "Druid Clusters"
-#~ msgstr "Cluster Druid"
-
-#~ msgid "Borker Port"
-#~ msgstr ""
-
-#~ msgid "The datasource seems to have been deleted"
-#~ msgstr "Sembra che il datasource sia stato eliminato"
-
-#~ msgid "You don't seem to have access to this datasource"
-#~ msgstr "Non hai i permessi per accedere a questo datasource"
-
diff --git a/caravel/translations/zh/LC_MESSAGES/messages.po b/caravel/translations/zh/LC_MESSAGES/messages.po
index e41181601d..376642e3ed 100644
--- a/caravel/translations/zh/LC_MESSAGES/messages.po
+++ b/caravel/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-06-08 12:20+0200\n"
+"POT-Creation-Date: 2016-06-09 10:27+0200\n"
 "PO-Revision-Date: 2016-05-01 23:07-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -307,7 +307,7 @@ msgstr ""
 msgid "Target aspect ratio for treemap tiles."
 msgstr ""
 
-#: caravel/forms.py:439
+#: caravel/forms.py:439 caravel/viz.py:806 caravel/viz.py:855
 msgid "Number format"
 msgstr ""
 
@@ -667,6 +667,14 @@ msgid ""
 "in the Caravel source code"
 msgstr ""
 
+#: caravel/forms.py:816 caravel/forms.py:820
+msgid "Filter 1"
+msgstr ""
+
+#: caravel/forms.py:825
+msgid "Super"
+msgstr ""
+
 #: caravel/forms.py:829
 msgid "Time"
 msgstr ""
@@ -679,17 +687,17 @@ msgstr ""
 msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
-msgstr "所选表格需要日期时间但在表格配置文件中没有被提供"
+msgstr ""
 
 #: caravel/models.py:1255
 msgid "No data was returned."
-msgstr "所选数据为空"
+msgstr ""
 
 #: caravel/views.py:158
 msgid ""
 "Whether to make this column available as a [Time Granularity] option, "
 "column has to be DATETIME or DATETIME-like"
-msgstr "是否要让这列接受[Time Granularity]的选项，这列必须是DATETIME或DATETIME-like"
+msgstr ""
 
 #: caravel/views.py:167 caravel/views.py:195
 msgid "Column"
@@ -793,12 +801,12 @@ msgstr ""
 
 #: caravel/views.py:313
 msgid "Databases"
-msgstr "数据库"
+msgstr ""
 
 #: caravel/views.py:316 caravel/views.py:375 caravel/views.py:409
 #: caravel/views.py:603 caravel/views.py:1098 caravel/views.py:1116
 msgid "Sources"
-msgstr "源"
+msgstr ""
 
 #: caravel/views.py:344
 msgid "Changed By"
@@ -864,7 +872,7 @@ msgstr ""
 #: caravel/templates/caravel/welcome.html:25 caravel/views.py:438
 #: caravel/views.py:524
 msgid "Dashboards"
-msgstr "仪表盘"
+msgstr ""
 
 #: caravel/views.py:441
 msgid "Last Modified"
@@ -894,20 +902,20 @@ msgstr ""
 #: caravel/templates/caravel/welcome.html:46 caravel/views.py:456
 #: caravel/views.py:501
 msgid "Slices"
-msgstr "切片"
+msgstr ""
 
 #: caravel/views.py:485
 msgid ""
 "This json object describes the positioning of the widgets in the "
 "dashboard. It is dynamically generated when adjusting the widgets size "
 "and positions by using drag & drop in the dashboard view"
-msgstr "这个json描述了部件在面板中的位置。 当通过拖拽来改变窗口大小和位子的时候，它会被自动生成。"
+msgstr ""
 
 #: caravel/views.py:490
 msgid ""
 "The css for individual dashboards can be altered here, or in the "
 "dashboard view where changes are immediately visible"
-msgstr "单独面板的css可以在此变更，或者在面板视窗（立即生效）"
+msgstr ""
 
 #: caravel/views.py:494
 msgid "To get a readable URL for your dashboard"
@@ -955,11 +963,11 @@ msgstr ""
 
 #: caravel/views.py:554
 msgid "Action Log"
-msgstr "行动记录"
+msgstr ""
 
 #: caravel/views.py:556
 msgid "Security"
-msgstr "权限"
+msgstr ""
 
 #: caravel/views.py:573
 msgid "Timezone offset (in hours) for this datasource"
@@ -983,20 +991,40 @@ msgstr ""
 
 #: caravel/views.py:601
 msgid "Druid Datasources"
-msgstr "Druid数据源"
+msgstr ""
 
 #: caravel/views.py:1016
 msgid "This view requires the `all_datasource_access` permission"
-msgstr "此视图需要`all_datasource_access`权限"
+msgstr ""
 
 #: caravel/views.py:1113
 msgid "CSS Templates"
-msgstr "CSS模板"
+msgstr ""
 
 #: caravel/viz.py:314
 msgid "Table View"
 msgstr ""
 
+#: caravel/viz.py:317
+msgid "GROUP BY"
+msgstr ""
+
+#: caravel/viz.py:318
+msgid "Use this section if you want a query that aggregates"
+msgstr ""
+
+#: caravel/viz.py:324
+msgid "NOT GROUPED BY"
+msgstr ""
+
+#: caravel/viz.py:325
+msgid "Use this section if you want to query atomic rows"
+msgstr ""
+
+#: caravel/viz.py:330
+msgid "Options"
+msgstr ""
+
 #: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
@@ -1013,8 +1041,9 @@ msgstr ""
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
-#: caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:734 caravel/viz.py:898
+#: caravel/viz.py:1042 caravel/viz.py:1069 caravel/viz.py:1124
+#: caravel/viz.py:1622
 msgid "Chart Options"
 msgstr ""
 
@@ -1046,6 +1075,12 @@ msgstr ""
 msgid "Advanced Analytics"
 msgstr ""
 
+#: caravel/viz.py:908
+msgid ""
+"This section contains options that allow for advanced analytical post "
+"processing of query results"
+msgstr ""
+
 #: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
@@ -1070,6 +1105,10 @@ msgstr ""
 msgid "Breakdowns"
 msgstr ""
 
+#: caravel/viz.py:1140
+msgid "Defines how each series is broken down"
+msgstr ""
+
 #: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
@@ -1082,6 +1121,10 @@ msgstr ""
 msgid "The primary metric is used to define the arc segment sizes"
 msgstr ""
 
+#: caravel/viz.py:1222
+msgid "Secondary Metric"
+msgstr ""
+
 #: caravel/viz.py:1223
 msgid ""
 "This secondary metric is used to define the color as a ratio against the "
@@ -1173,6 +1216,10 @@ msgstr ""
 msgid "Heatmap"
 msgstr ""
 
+#: caravel/viz.py:1562
+msgid "Heatmap Options"
+msgstr ""
+
 #: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
@@ -1185,17 +1232,17 @@ msgstr ""
 #: caravel/foo/templates/appbuilder/navbar_right.html:34
 #: caravel/templates/appbuilder/navbar_right.html:34
 msgid "Profile"
-msgstr "个人资料"
+msgstr ""
 
 #: caravel/foo/templates/appbuilder/navbar_right.html:35
 #: caravel/templates/appbuilder/navbar_right.html:35
 msgid "Logout"
-msgstr "登出"
+msgstr ""
 
 #: caravel/foo/templates/appbuilder/navbar_right.html:40
 #: caravel/templates/appbuilder/navbar_right.html:40
 msgid "Login"
-msgstr "登录"
+msgstr ""
 
 #: caravel/foo/templates/caravel/explore.html:58
 #: caravel/templates/caravel/explore.html:58
@@ -1286,25 +1333,9 @@ msgstr ""
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:13
 msgid "Welcome!"
-msgstr "欢迎"
+msgstr ""
 
 #: caravel/foo/templates/caravel/models/database/macros.html:4
 #: caravel/templates/caravel/models/database/macros.html:4
 msgid "Test Connection"
 msgstr ""
-
-#~ msgid "Tables"
-#~ msgstr "表格"
-
-#~ msgid "Druid Clusters"
-#~ msgstr "Druid簇"
-
-#~ msgid "Borker Port"
-#~ msgstr ""
-
-#~ msgid "The datasource seems to have been deleted"
-#~ msgstr "此数据源好像已被删除"
-
-#~ msgid "You don't seem to have access to this datasource"
-#~ msgstr "看来您不能读取此数据源"
-
diff --git a/caravel/viz.py b/caravel/viz.py
index d17e445a30..74c30e000c 100644
--- a/caravel/viz.py
+++ b/caravel/viz.py
@@ -314,20 +314,20 @@ class TableViz(BaseViz):
     verbose_name = _("Table View")
     credits = 'a <a href="https://github.com/airbnb/caravel">Caravel</a> original'
     fieldsets = ({
-        'label': "GROUP BY",
-        'description': 'Use this section if you want a query that aggregates',
+        'label': _("GROUP BY"),
+        'description': _('Use this section if you want a query that aggregates'),
         'fields': (
             'groupby',
             'metrics',
         )
     }, {
-        'label': "NOT GROUPED BY",
-        'description': 'Use this section if you want to query atomic rows',
+        'label': _("NOT GROUPED BY"),
+        'description': _('Use this section if you want to query atomic rows'),
         'fields': (
             'all_columns',
         )
     }, {
-        'label': "Options",
+        'label': _("Options"),
         'fields': (
             'table_timestamp_format',
             'row_limit',
@@ -731,7 +731,7 @@ class BubbleViz(NVD3Viz):
             'size', 'limit',
         )
     }, {
-        'label': 'Chart Options',
+        'label': _('Chart Options'),
         'fields': (
             ('x_log_scale', 'y_log_scale'),
             ('show_legend', None),
@@ -803,7 +803,7 @@ class BigNumberViz(BaseViz):
     },)
     form_overrides = {
         'y_axis_format': {
-            'label': 'Number format',
+            'label': _('Number format'),
         }
     }
 
@@ -852,7 +852,7 @@ class BigNumberTotalViz(BaseViz):
     },)
     form_overrides = {
         'y_axis_format': {
-            'label': 'Number format',
+            'label': _('Number format'),
         }
     }
 
@@ -905,7 +905,7 @@ class NVD3TimeSeriesViz(NVD3Viz):
         ),
     }, {
         'label': _('Advanced Analytics'),
-        'description': (
+        'description': _(
             "This section contains options "
             "that allow for advanced analytical post processing "
             "of query results"),
@@ -1137,7 +1137,7 @@ class DistributionBarViz(DistributionPieViz):
         },
         'columns': {
             'label': _('Breakdowns'),
-            'description': "Defines how each series is broken down",
+            'description': _("Defines how each series is broken down"),
         },
     }
 
@@ -1219,7 +1219,7 @@ class SunburstViz(BaseViz):
                 "define the arc segment sizes"),
         },
         'secondary_metric': {
-            'label': 'Secondary Metric',
+            'label': _('Secondary Metric'),
             'description': _(
                 "This secondary metric is used to "
                 "define the color as a ratio against the primary metric. "
@@ -1348,7 +1348,7 @@ class DirectedForceViz(BaseViz):
     form_overrides = {
         'groupby': {
             'label': _('Source / Target'),
-            'description':_( "Choose a source and a target"),
+            'description': _("Choose a source and a target"),
         },
     }
 
@@ -1559,7 +1559,7 @@ class HeatmapViz(BaseViz):
             'metric',
         )
     }, {
-        'label': 'Heatmap Options',
+        'label': _('Heatmap Options'),
         'fields': (
             'linear_color_scheme',
             ('xscale_interval', 'yscale_interval'),
@@ -1619,7 +1619,7 @@ class HorizonViz(NVD3TimeSeriesViz):
         '<a href="https://www.npmjs.com/package/d3-horizon-chart">'
         'd3-horizon-chart</a>')
     fieldsets = [NVD3TimeSeriesViz.fieldsets[0]] + [{
-        'label': 'Chart Options',
+        'label': _('Chart Options'),
         'fields': (
             ('series_height', 'horizon_color_scale'),
         ), }]