diff --git a/babel/messages.pot b/babel/messages.pot
index 28a096d93cc27..52dc8c9937605 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-05-25 12:39+0200\n"
+"POT-Creation-Date: 2016-06-08 14:22+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"
@@ -17,429 +17,1286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: caravel/models.py:607
+#: caravel/forms.py:135
+msgid "Viz"
+msgstr ""
+
+#: caravel/forms.py:138
+msgid "The type of visualization to display"
+msgstr ""
+
+#: caravel/forms.py:141
+msgid "Metrics"
+msgstr ""
+
+#: caravel/forms.py:144
+msgid "One or many metrics to display"
+msgstr ""
+
+#: caravel/forms.py:147 caravel/views.py:226 caravel/views.py:255
+msgid "Metric"
+msgstr ""
+
+#: caravel/forms.py:150
+msgid "Choose the metric"
+msgstr ""
+
+#: caravel/forms.py:153
+msgid "Chart Style"
+msgstr ""
+
+#: caravel/forms.py:159
+msgid "Color Scheme"
+msgstr ""
+
+#: caravel/forms.py:167
+msgid "Normalize Across"
+msgstr ""
+
+#: caravel/forms.py:171
+msgid ""
+"Color will be rendered based on a ratio of the cell against the sum of "
+"across this criteria"
+msgstr ""
+
+#: caravel/forms.py:177
+msgid "Color Scale"
+msgstr ""
+
+#: caravel/forms.py:180
+msgid "Defines how the color are attributed."
+msgstr ""
+
+#: caravel/forms.py:183
+msgid "Rendering"
+msgstr ""
+
+#: caravel/forms.py:185
+msgid "pixelated (Sharp)"
+msgstr ""
+
+#: caravel/forms.py:186
+msgid "auto (Smooth)"
+msgstr ""
+
+#: caravel/forms.py:189
+msgid ""
+"image-rendering CSS attribute of the canvas object that defines how the "
+"browser scales up the image"
+msgstr ""
+
+#: caravel/forms.py:194
+msgid "XScale Interval"
+msgstr ""
+
+#: caravel/forms.py:197
+msgid "Number of step to take between ticks when printing the x scale"
+msgstr ""
+
+#: caravel/forms.py:202
+msgid "YScale Interval"
+msgstr ""
+
+#: caravel/forms.py:205
+msgid "Number of step to take between ticks when printing the y scale"
+msgstr ""
+
+#: caravel/forms.py:210
+msgid "Stacked Bars"
+msgstr ""
+
+#: caravel/forms.py:215
+msgid "Include Series"
+msgstr ""
+
+#: caravel/forms.py:217
+msgid "Include series name as an axis"
+msgstr ""
+
+#: caravel/forms.py:220
+msgid "Color Metric"
+msgstr ""
+
+#: caravel/forms.py:223
+msgid "A metric to use for color"
+msgstr ""
+
+#: caravel/forms.py:226
+msgid "Country Field Type"
+msgstr ""
+
+#: caravel/forms.py:229
+msgid "Full name"
+msgstr ""
+
+#: caravel/forms.py:230
+msgid "code International Olympic Committee (cioc)"
+msgstr ""
+
+#: caravel/forms.py:231
+msgid "code ISO 3166-1 alpha-2 (cca2)"
+msgstr ""
+
+#: caravel/forms.py:232
+msgid "code ISO 3166-1 alpha-3 (cca3)"
+msgstr ""
+
+#: caravel/forms.py:234
+msgid ""
+"The country code standard that Caravel should expect to find in the "
+"[country] column"
+msgstr ""
+
+#: caravel/forms.py:239
+msgid "Group by"
+msgstr ""
+
+#: caravel/forms.py:241
+msgid "One or many fields to group by"
+msgstr ""
+
+#: caravel/forms.py:244 caravel/forms.py:249
+msgid "Columns"
+msgstr ""
+
+#: caravel/forms.py:246
+msgid "One or many fields to pivot as columns"
+msgstr ""
+
+#: caravel/forms.py:251 caravel/forms.py:256 caravel/forms.py:261
+msgid "Columns to display"
+msgstr ""
+
+#: caravel/forms.py:254
+msgid "X"
+msgstr ""
+
+#: caravel/forms.py:259
+msgid "Y"
+msgstr ""
+
+#: caravel/forms.py:264
+msgid "Origin"
+msgstr ""
+
+#: caravel/forms.py:266
+msgid "default"
+msgstr ""
+
+#: caravel/forms.py:267
+msgid "now"
+msgstr ""
+
+#: caravel/forms.py:270
+msgid ""
+"Defines the origin where time buckets start, accepts natural dates as in "
+"'now', 'sunday' or '1970-01-01'"
+msgstr ""
+
+#: caravel/forms.py:275
+msgid "Time Granularity"
+msgstr ""
+
+#: caravel/forms.py:288
+msgid ""
+"The time granularity for the visualization. Note that you can type and "
+"use simple natural language as in '10 seconds', '1 day' or '56 weeks'"
+msgstr ""
+
+#: caravel/forms.py:294
+msgid "Domain"
+msgstr ""
+
+#: caravel/forms.py:303
+msgid "The time unit used for the grouping of blocks"
+msgstr ""
+
+#: caravel/forms.py:307
+msgid "Subdomain"
+msgstr ""
+
+#: caravel/forms.py:316
+msgid ""
+"The time unit for each block. Should be a smaller unit than "
+"domain_granularity. Should be larger or equal to Time Grain"
+msgstr ""
+
+#: caravel/forms.py:321
+msgid "Link Length"
+msgstr ""
+
+#: caravel/forms.py:333
+msgid "Link length in the force layout"
+msgstr ""
+
+#: caravel/forms.py:336
+msgid "Charge"
+msgstr ""
+
+#: caravel/forms.py:350
+msgid "Charge in the force layout"
+msgstr ""
+
+#: caravel/forms.py:353
+msgid "Time Column"
+msgstr ""
+
+#: caravel/forms.py:356
+msgid ""
+"The time column for the visualization. Note that you can define arbitrary"
+" expression that return a DATETIME column in the table editor. Also note "
+"that the filter bellow is applied against this column or expression"
+msgstr ""
+
+#: caravel/forms.py:364
+msgid "Resample Rule"
+msgstr ""
+
+#: caravel/forms.py:367
+msgid "Pandas resample rule"
+msgstr ""
+
+#: caravel/forms.py:370
+msgid "Resample How"
+msgstr ""
+
+#: caravel/forms.py:373
+msgid "Pandas resample how"
+msgstr ""
+
+#: caravel/forms.py:376
+msgid "Resample Fill Method"
+msgstr ""
+
+#: caravel/forms.py:379
+msgid "Pandas resample fill method"
+msgstr ""
+
+#: caravel/forms.py:382
+msgid "Since"
+msgstr ""
+
+#: caravel/forms.py:393
+msgid ""
+"Timestamp from filter. This supports free form typing and natural "
+"language as in '1 day ago', '28 days' or '3 years'"
+msgstr ""
+
+#: caravel/forms.py:398
+msgid "Until"
+msgstr ""
+
+#: caravel/forms.py:409
+msgid "Max Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:422
+msgid "Whisker/outlier options"
+msgstr ""
+
+#: caravel/forms.py:424
+msgid "Determines how whiskers and outliers are calculated."
+msgstr ""
+
+#: caravel/forms.py:434
+msgid "Ratio"
+msgstr ""
+
+#: caravel/forms.py:436
+msgid "Target aspect ratio for treemap tiles."
+msgstr ""
+
+#: caravel/forms.py:439
+msgid "Number format"
+msgstr ""
+
+#: caravel/forms.py:449
+msgid ""
+"D3 format syntax for numbers https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:454
+msgid "Row limit"
+msgstr ""
+
+#: caravel/forms.py:460
+msgid "Series limit"
+msgstr ""
+
+#: caravel/forms.py:463
+msgid "Limits the number of time series that get displayed"
+msgstr ""
+
+#: caravel/forms.py:467
+msgid "Rolling"
+msgstr ""
+
+#: caravel/forms.py:470
+msgid ""
+"Defines a rolling window function to apply, works along with the "
+"[Periods] text box"
+msgstr ""
+
+#: caravel/forms.py:475
+msgid "Periods"
+msgstr ""
+
+#: caravel/forms.py:477
+msgid ""
+"Defines the size of the rolling window function, relative to the time "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:482 caravel/viz.py:1136
+msgid "Series"
+msgstr ""
+
+#: caravel/forms.py:485
+msgid ""
+"Defines the grouping of entities. Each serie is shown as a specific color"
+" on the chart and has a legend toggle"
+msgstr ""
+
+#: caravel/forms.py:491
+msgid "Entity"
+msgstr ""
+
+#: caravel/forms.py:494
+msgid "This define the element to be plotted on the chart"
+msgstr ""
+
+#: caravel/forms.py:497
+msgid "X Axis"
+msgstr ""
+
+#: caravel/forms.py:500
+msgid "Metric assigned to the [X] axis"
+msgstr ""
+
+#: caravel/forms.py:503
+msgid "Y Axis"
+msgstr ""
+
+#: caravel/forms.py:506
+msgid "Metric assigned to the [Y] axis"
+msgstr ""
+
+#: caravel/forms.py:509
+msgid "Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:514
+msgid "URL"
+msgstr ""
+
+#: caravel/forms.py:515
+msgid ""
+"The URL, this field is templated, so you can integrate {{ width }} and/or"
+" {{ height }} in your URL string."
+msgstr ""
+
+#: caravel/forms.py:522
+msgid "Custom WHERE clause"
+msgstr ""
+
+#: caravel/forms.py:524
+msgid ""
+"The text in this box gets included in your query's WHERE clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:531
+msgid "Custom HAVING clause"
+msgstr ""
+
+#: caravel/forms.py:533
+msgid ""
+"The text in this box gets included in your query's HAVING clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:540
+msgid "Comparison Period Lag"
+msgstr ""
+
+#: caravel/forms.py:541
+msgid "Based on granularity, number of time periods to compare against"
+msgstr ""
+
+#: caravel/forms.py:546
+msgid "Comparison suffix"
+msgstr ""
+
+#: caravel/forms.py:547
+msgid "Suffix to apply after the percentage display"
+msgstr ""
+
+#: caravel/forms.py:550
+msgid "Table Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:553
+msgid "Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:556
+msgid "Series Height"
+msgstr ""
+
+#: caravel/forms.py:559
+msgid "Pixel height of each series"
+msgstr ""
+
+#: caravel/forms.py:562
+msgid "X axis format"
+msgstr ""
+
+#: caravel/forms.py:565 caravel/forms.py:580
+msgid ""
+"D3 format syntax for y axis https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:570
+msgid "Y axis format"
+msgstr ""
+
+#: caravel/forms.py:585
+msgid "Markup Type"
+msgstr ""
+
+#: caravel/forms.py:588
+msgid "Pick your favorite markup language"
+msgstr ""
+
+#: caravel/forms.py:591
+msgid "Rotation"
+msgstr ""
+
+#: caravel/forms.py:594
+msgid "Rotation to apply to words in the cloud"
+msgstr ""
+
+#: caravel/forms.py:597
+msgid "Line Style"
+msgstr ""
+
+#: caravel/forms.py:602
+msgid "Line interpolation as defined by d3.js"
+msgstr ""
+
+#: caravel/forms.py:605
+msgid "Code"
+msgstr ""
+
+#: caravel/forms.py:606
+msgid "Put your code here"
+msgstr ""
+
+#: caravel/forms.py:610
+msgid "Aggregation function"
+msgstr ""
+
+#: caravel/forms.py:614
+msgid ""
+"Aggregate function to apply when pivoting and computing the total rows "
+"and columns"
+msgstr ""
+
+#: caravel/forms.py:619
+msgid "Font Size From"
+msgstr ""
+
+#: caravel/forms.py:621
+msgid "Font size for the smallest value in the list"
+msgstr ""
+
+#: caravel/forms.py:624
+msgid "Font Size To"
+msgstr ""
+
+#: caravel/forms.py:626
+msgid "Font size for the biggest value in the list"
+msgstr ""
+
+#: caravel/forms.py:629
+msgid "Range Filter"
+msgstr ""
+
+#: caravel/forms.py:631
+msgid "Whether to display the time range interactive selector"
+msgstr ""
+
+#: caravel/forms.py:635
+msgid "Data Table"
+msgstr ""
+
+#: caravel/forms.py:637
+msgid "Whether to display the interactive data table"
+msgstr ""
+
+#: caravel/forms.py:640
+msgid "Search Box"
+msgstr ""
+
+#: caravel/forms.py:642
+msgid "Whether to include a client side search box"
+msgstr ""
+
+#: caravel/forms.py:646
+msgid "Show Bubbles"
+msgstr ""
+
+#: caravel/forms.py:648
+msgid "Whether to display bubbles on top of countries"
+msgstr ""
+
+#: caravel/forms.py:652
+msgid "Legend"
+msgstr ""
+
+#: caravel/forms.py:654
+msgid "Whether to display the legend (toggles)"
+msgstr ""
+
+#: caravel/forms.py:657
+msgid "X bounds"
+msgstr ""
+
+#: caravel/forms.py:659
+msgid "Whether to display the min and max values of the X axis"
+msgstr ""
+
+#: caravel/forms.py:663
+msgid "Rich Tooltip"
+msgstr ""
+
+#: caravel/forms.py:665
+msgid "The rich tooltip shows a list of all series for that point in time"
+msgstr ""
+
+#: caravel/forms.py:670
+msgid "Y Axis Zero"
+msgstr ""
+
+#: caravel/forms.py:672
+msgid "Force the Y axis to start at 0 instead of the minimum value"
+msgstr ""
+
+#: caravel/forms.py:677
+msgid "Y Log"
+msgstr ""
+
+#: caravel/forms.py:679
+msgid "Use a log scale for the Y axis"
+msgstr ""
+
+#: caravel/forms.py:682
+msgid "X Log"
+msgstr ""
+
+#: caravel/forms.py:684
+msgid "Use a log scale for the X axis"
+msgstr ""
+
+#: caravel/forms.py:687
+msgid "Donut"
+msgstr ""
+
+#: caravel/forms.py:689
+msgid "Do you want a donut or a pie?"
+msgstr ""
+
+#: caravel/forms.py:692
+msgid "Contribution"
+msgstr ""
+
+#: caravel/forms.py:694
+msgid "Compute the contribution to the total"
+msgstr ""
+
+#: caravel/forms.py:697
+msgid "Period Ratio"
+msgstr ""
+
+#: caravel/forms.py:700
+msgid ""
+"[integer] Number of period to compare against, this is relative to the "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:705
+msgid "Time Shift"
+msgstr ""
+
+#: caravel/forms.py:707
+msgid ""
+"Overlay a timeseries from a relative time period. Expects relative time "
+"delta in natural language (example:  24 hours, 7 days, 56 weeks, 365 days"
+msgstr ""
+
+#: caravel/forms.py:714
+msgid "Subheader"
+msgstr ""
+
+#: caravel/forms.py:715
+msgid "Description text that shows up below your Big Number"
+msgstr ""
+
+#: caravel/forms.py:778
+msgid "SQL"
+msgstr ""
+
+#: caravel/forms.py:780
+msgid "This section exposes ways to include snippets of SQL in your query"
+msgstr ""
+
+#: caravel/forms.py:790
+msgid "Time Grain"
+msgstr ""
+
+#: caravel/forms.py:793
+msgid ""
+"The time granularity for the visualization. This applies a date "
+"transformation to alter your time column and defines a new time "
+"granularity.The options here are defined on a per database engine basis "
+"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 ""
+
+#: caravel/forms.py:834
+msgid "Time related form attributes"
+msgstr ""
+
+#: caravel/models.py:615
 msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
 msgstr ""
 
-#: caravel/models.py:1247
+#: caravel/models.py:1255
 msgid "No data was returned."
 msgstr ""
 
-#: caravel/views.py:123
+#: 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 ""
 
-#: caravel/views.py:132 caravel/views.py:160
+#: caravel/views.py:167 caravel/views.py:195
 msgid "Column"
 msgstr ""
 
-#: caravel/views.py:133 caravel/views.py:193 caravel/views.py:222
+#: caravel/views.py:168 caravel/views.py:228 caravel/views.py:257
 msgid "Verbose Name"
 msgstr ""
 
-#: caravel/views.py:134 caravel/views.py:192 caravel/views.py:221
-#: caravel/views.py:399 caravel/views.py:534
+#: caravel/views.py:169 caravel/views.py:227 caravel/views.py:256
+#: caravel/views.py:440 caravel/views.py:581
 msgid "Description"
 msgstr ""
 
-#: caravel/views.py:135 caravel/views.py:163
+#: caravel/views.py:170 caravel/views.py:198
 msgid "Groupable"
 msgstr ""
 
-#: caravel/views.py:136 caravel/views.py:164
+#: caravel/views.py:171 caravel/views.py:199
 msgid "Filterable"
 msgstr ""
 
-#: caravel/views.py:137 caravel/views.py:196 caravel/views.py:307
-#: caravel/views.py:405
+#: caravel/views.py:172 caravel/views.py:231 caravel/views.py:343
+#: caravel/views.py:446
 msgid "Table"
 msgstr ""
 
-#: caravel/views.py:138 caravel/views.py:165
+#: caravel/views.py:173 caravel/views.py:200
 msgid "Count Distinct"
 msgstr ""
 
-#: caravel/views.py:139 caravel/views.py:166
+#: caravel/views.py:174 caravel/views.py:201
 msgid "Sum"
 msgstr ""
 
-#: caravel/views.py:140 caravel/views.py:167
+#: caravel/views.py:175 caravel/views.py:202
 msgid "Min"
 msgstr ""
 
-#: caravel/views.py:141 caravel/views.py:168
+#: caravel/views.py:176 caravel/views.py:203
 msgid "Max"
 msgstr ""
 
-#: caravel/views.py:142
+#: caravel/views.py:177
 msgid "Expression"
 msgstr ""
 
-#: caravel/views.py:143
+#: caravel/views.py:178
 msgid "Is temporal"
 msgstr ""
 
-#: caravel/views.py:161 caravel/views.py:194 caravel/views.py:223
-#: caravel/views.py:423
+#: caravel/views.py:196 caravel/views.py:229 caravel/views.py:258
+#: caravel/views.py:468
 msgid "Type"
 msgstr ""
 
-#: caravel/views.py:162 caravel/views.py:398
+#: caravel/views.py:197 caravel/views.py:439
 msgid "Datasource"
 msgstr ""
 
-#: caravel/views.py:191 caravel/views.py:220
-msgid "Metric"
-msgstr ""
-
-#: caravel/views.py:195
+#: caravel/views.py:230
 msgid "SQL Expression"
 msgstr ""
 
-#: caravel/views.py:224 caravel/views.py:502
+#: caravel/views.py:259 caravel/views.py:548
 msgid "JSON"
 msgstr ""
 
-#: caravel/views.py:225
+#: caravel/views.py:260
 msgid "Druid Datasource"
 msgstr ""
 
-#: caravel/views.py:256 caravel/views.py:309
+#: caravel/views.py:291 caravel/views.py:345
 msgid "Database"
 msgstr ""
 
-#: caravel/views.py:257
+#: caravel/views.py:292
 msgid "SQL link"
 msgstr ""
 
-#: caravel/views.py:258 caravel/views.py:396 caravel/views.py:458
+#: caravel/views.py:293 caravel/views.py:437 caravel/views.py:503
 msgid "Creator"
 msgstr ""
 
-#: caravel/views.py:259 caravel/views.py:310
+#: caravel/views.py:294 caravel/views.py:346
 msgid "Last Changed"
 msgstr ""
 
-#: caravel/views.py:260
+#: caravel/views.py:295
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: caravel/views.py:261 caravel/views.py:316 caravel/views.py:395
-#: caravel/views.py:540
+#: caravel/views.py:296 caravel/views.py:352 caravel/views.py:436
+#: caravel/views.py:587
 msgid "Cache Timeout"
 msgstr ""
 
-#: caravel/views.py:262
+#: caravel/views.py:297
 msgid "Extra"
 msgstr ""
 
-#: caravel/views.py:278
+#: caravel/views.py:313
 msgid "Databases"
 msgstr ""
 
-#: caravel/views.py:280 caravel/views.py:336 caravel/views.py:368
+#: 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 ""
 
-#: caravel/views.py:308
+#: caravel/views.py:344
 msgid "Changed By"
 msgstr ""
 
-#: caravel/views.py:311
+#: caravel/views.py:347
 msgid "SQL Editor"
 msgstr ""
 
-#: caravel/views.py:312 caravel/views.py:536
+#: caravel/views.py:348 caravel/views.py:583
 msgid "Is Featured"
 msgstr ""
 
-#: caravel/views.py:313
+#: caravel/views.py:349
 msgid "Schema"
 msgstr ""
 
-#: caravel/views.py:314 caravel/views.py:538
+#: caravel/views.py:350 caravel/views.py:585
 msgid "Default Endpoint"
 msgstr ""
 
-#: caravel/views.py:315
+#: caravel/views.py:351
 msgid "Offset"
 msgstr ""
 
-#: caravel/views.py:353 caravel/views.py:533
+#: caravel/views.py:373
+msgid "Tables"
+msgstr ""
+
+#: caravel/views.py:392 caravel/views.py:580
 msgid "Cluster"
 msgstr ""
 
-#: caravel/views.py:354
+#: caravel/views.py:393
 msgid "Coordinator Host"
 msgstr ""
 
-#: caravel/views.py:355
+#: caravel/views.py:394
 msgid "Coordinator Port"
 msgstr ""
 
-#: caravel/views.py:356
+#: caravel/views.py:395
 msgid "Coordinator Endpoint"
 msgstr ""
 
-#: caravel/views.py:357
+#: caravel/views.py:396
 msgid "Broker Host"
 msgstr ""
 
-#: caravel/views.py:358
+#: caravel/views.py:397
 msgid "Broker Port"
 msgstr ""
 
-#: caravel/views.py:359
+#: caravel/views.py:398
 msgid "Broker Endpoint"
 msgstr ""
 
-#: caravel/views.py:397 caravel/views.py:478
+#: caravel/views.py:406
+msgid "Druid Clusters"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:25
+#: caravel/templates/caravel/welcome.html:25 caravel/views.py:438
+#: caravel/views.py:524
 msgid "Dashboards"
 msgstr ""
 
-#: caravel/views.py:400
+#: caravel/views.py:441
 msgid "Last Modified"
 msgstr ""
 
-#: caravel/views.py:401 caravel/views.py:457
+#: caravel/views.py:442 caravel/views.py:502
 msgid "Owners"
 msgstr ""
 
-#: caravel/views.py:402
+#: caravel/views.py:443
 msgid "Parameters"
 msgstr ""
 
-#: caravel/views.py:403 caravel/views.py:424
+#: caravel/views.py:444 caravel/views.py:469
 msgid "Slice"
 msgstr ""
 
-#: caravel/views.py:404
+#: caravel/views.py:445
 msgid "Name"
 msgstr ""
 
-#: caravel/views.py:406 caravel/views.py:425
+#: caravel/views.py:447 caravel/views.py:470
 msgid "Visualization Type"
 msgstr ""
 
-#: caravel/views.py:440
+#: caravel/foo/templates/caravel/welcome.html:46
+#: caravel/templates/caravel/welcome.html:46 caravel/views.py:456
+#: caravel/views.py:501
+msgid "Slices"
+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 ""
 
-#: caravel/views.py:445
+#: 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 ""
 
-#: caravel/views.py:449
+#: caravel/views.py:494
 msgid "To get a readable URL for your dashboard"
 msgstr ""
 
-#: caravel/views.py:453
+#: caravel/views.py:498
 msgid "Dashboard"
 msgstr ""
 
-#: caravel/views.py:454
+#: caravel/views.py:499
 msgid "Title"
 msgstr ""
 
-#: caravel/views.py:455
+#: caravel/views.py:500
 msgid "Slug"
 msgstr ""
 
-#: caravel/views.py:456
-msgid "Slices"
-msgstr ""
-
-#: caravel/views.py:459
+#: caravel/views.py:504
 msgid "Modified"
 msgstr ""
 
-#: caravel/views.py:460
+#: caravel/views.py:505
 msgid "Position JSON"
 msgstr ""
 
-#: caravel/views.py:461
+#: caravel/views.py:506
 msgid "CSS"
 msgstr ""
 
-#: caravel/views.py:462
+#: caravel/views.py:507
 msgid "JSON Metadata"
 msgstr ""
 
-#: caravel/views.py:499
+#: caravel/views.py:545
 msgid "User"
 msgstr ""
 
-#: caravel/views.py:500
+#: caravel/views.py:546
 msgid "Action"
 msgstr ""
 
-#: caravel/views.py:501
+#: caravel/views.py:547
 msgid "dttm"
 msgstr ""
 
-#: caravel/views.py:508
+#: caravel/views.py:554
 msgid "Action Log"
 msgstr ""
 
-#: caravel/views.py:509
+#: caravel/views.py:556
 msgid "Security"
 msgstr ""
 
-#: caravel/views.py:526
+#: caravel/views.py:573
 msgid "Timezone offset (in hours) for this datasource"
 msgstr ""
 
-#: caravel/views.py:532
+#: caravel/views.py:579
 msgid "Data Source"
 msgstr ""
 
-#: caravel/views.py:535
+#: caravel/views.py:582
 msgid "Owner"
 msgstr ""
 
-#: caravel/views.py:537
+#: caravel/views.py:584
 msgid "Is Hidden"
 msgstr ""
 
-#: caravel/views.py:539
+#: caravel/views.py:586
 msgid "Time Offset"
 msgstr ""
 
-#: caravel/views.py:554
+#: caravel/views.py:601
 msgid "Druid Datasources"
 msgstr ""
 
-#: caravel/views.py:969
+#: caravel/views.py:1016
 msgid "This view requires the `all_datasource_access` permission"
 msgstr ""
 
-#: caravel/views.py:1064
+#: caravel/views.py:1113
 msgid "CSS Templates"
 msgstr ""
 
-#: caravel/viz.py:324
+#: caravel/viz.py:314
 msgid "Table View"
 msgstr ""
 
-#: caravel/viz.py:385
+#: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
 
-#: caravel/viz.py:447
+#: caravel/viz.py:442
 msgid "Markup"
 msgstr ""
 
-#: caravel/viz.py:475
+#: caravel/viz.py:470
 msgid "Word Cloud"
 msgstr ""
 
-#: caravel/viz.py:507
+#: caravel/viz.py:502
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:551
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
+#: caravel/viz.py:1069 caravel/viz.py:1124
+msgid "Chart Options"
+msgstr ""
+
+#: caravel/viz.py:546
 msgid "Calender Heatmap"
 msgstr ""
 
-#: caravel/viz.py:622
+#: caravel/viz.py:617
 msgid "Box Plot"
 msgstr ""
 
-#: caravel/viz.py:729
+#: caravel/viz.py:724
 msgid "Bubble Chart"
 msgstr ""
 
-#: caravel/viz.py:797
+#: caravel/viz.py:792
 msgid "Big Number with Trendline"
 msgstr ""
 
-#: caravel/viz.py:847
+#: caravel/viz.py:842
 msgid "Big Number"
 msgstr ""
 
-#: caravel/viz.py:893
+#: caravel/viz.py:888
 msgid "Time Series - Line Chart"
 msgstr ""
 
-#: caravel/viz.py:1045
+#: caravel/viz.py:907
+msgid "Advanced Analytics"
+msgstr ""
+
+#: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1063
+#: caravel/viz.py:1058
 msgid "Time Series - Percent Change"
 msgstr ""
 
-#: caravel/viz.py:1071
+#: caravel/viz.py:1066
 msgid "Time Series - Stacked"
 msgstr ""
 
-#: caravel/viz.py:1090
+#: caravel/viz.py:1085
 msgid "Distribution - NVD3 - Pie Chart"
 msgstr ""
 
-#: caravel/viz.py:1126
+#: caravel/viz.py:1121
 msgid "Distribution - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1206
+#: caravel/viz.py:1139
+msgid "Breakdowns"
+msgstr ""
+
+#: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
 
-#: caravel/viz.py:1272
+#: caravel/viz.py:1216
+msgid "Primary Metric"
+msgstr ""
+
+#: caravel/viz.py:1217
+msgid "The primary metric is used to define the arc segment sizes"
+msgstr ""
+
+#: caravel/viz.py:1223
+msgid ""
+"This secondary metric is used to define the color as a ratio against the "
+"primary metric. If the two metrics match, color is mapped level groups"
+msgstr ""
+
+#: caravel/viz.py:1229
+msgid "Hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1230
+msgid "This defines the level of the hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1267
 msgid "Sankey"
 msgstr ""
 
-#: caravel/viz.py:1336
+#: caravel/viz.py:1280 caravel/viz.py:1350
+msgid "Source / Target"
+msgstr ""
+
+#: caravel/viz.py:1281 caravel/viz.py:1351
+msgid "Choose a source and a target"
+msgstr ""
+
+#: caravel/viz.py:1331
 msgid "Directed Force Layout"
 msgstr ""
 
-#: caravel/viz.py:1378
+#: caravel/viz.py:1342
+msgid "Force Layout"
+msgstr ""
+
+#: caravel/viz.py:1373
 msgid "World Map"
 msgstr ""
 
-#: caravel/viz.py:1452
+#: caravel/viz.py:1384
+msgid "Bubbles"
+msgstr ""
+
+#: caravel/viz.py:1393
+msgid "Country Field"
+msgstr ""
+
+#: caravel/viz.py:1394
+msgid "3 letter code of the country"
+msgstr ""
+
+#: caravel/viz.py:1397
+msgid "Metric for color"
+msgstr ""
+
+#: caravel/viz.py:1398
+msgid "Metric that defines the color of the country"
+msgstr ""
+
+#: caravel/viz.py:1401
+msgid "Bubble size"
+msgstr ""
+
+#: caravel/viz.py:1402
+msgid "Metric that defines the size of the bubble"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:137
+#: caravel/templates/caravel/explore.html:137 caravel/viz.py:1447
 msgid "Filters"
 msgstr ""
 
-#: caravel/viz.py:1500
+#: caravel/viz.py:1459
+msgid "Filter fields"
+msgstr ""
+
+#: caravel/viz.py:1460
+msgid "The fields you want to filter on"
+msgstr ""
+
+#: caravel/viz.py:1495
 msgid "iFrame"
 msgstr ""
 
-#: caravel/viz.py:1518
+#: caravel/viz.py:1513
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: caravel/viz.py:1554
+#: caravel/viz.py:1549
 msgid "Heatmap"
 msgstr ""
 
-#: caravel/viz.py:1622
+#: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar.html:24
+#: caravel/templates/appbuilder/navbar.html:24
+msgid "Documentation"
+msgstr ""
+
+#: caravel/foo/templates/appbuilder/navbar_right.html:34
 #: caravel/templates/appbuilder/navbar_right.html:34
 msgid "Profile"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:35
 #: caravel/templates/appbuilder/navbar_right.html:35
 msgid "Logout"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:40
 #: caravel/templates/appbuilder/navbar_right.html:40
 msgid "Login"
 msgstr ""
 
+#: caravel/foo/templates/caravel/explore.html:58
+#: caravel/templates/caravel/explore.html:58
+msgid "Force refresh"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:63
+#: caravel/templates/caravel/explore.html:63
+msgid "Short URL"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:65
+#: caravel/templates/caravel/explore.html:65
+msgid "Standalone version, use to embed anywhere"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:68
+#: caravel/templates/caravel/explore.html:68
+msgid "Export to .json"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:72
+#: caravel/templates/caravel/explore.html:72
+msgid "Export to .csv format"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:75
+#: caravel/templates/caravel/explore.html:75
+msgid "0 sec"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:77
+#: caravel/templates/caravel/explore.html:77
+msgid "query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:86
+#: caravel/foo/templates/caravel/explore.html:192
+#: caravel/templates/caravel/explore.html:86
+#: caravel/templates/caravel/explore.html:192
+msgid "Query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:90
+#: caravel/templates/caravel/explore.html:90
+msgid "Overwrite"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:94
+#: caravel/templates/caravel/explore.html:94
+msgid "Save as"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:140
+#: caravel/templates/caravel/explore.html:140
+msgid "Filters are defined using comma delimited strings as in 'US,FR,Other'"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:158
+#: caravel/templates/caravel/explore.html:158
+msgid "Add filter"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:198
+#: caravel/foo/templates/caravel/explore.html:216
+#: caravel/templates/caravel/explore.html:198
+#: caravel/templates/caravel/explore.html:216
+msgid "Close"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:210
+#: caravel/templates/caravel/explore.html:210
+msgid "Datasource Description"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:11
+#: caravel/templates/caravel/sql.html:11
+msgid "Run!"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:12
+#: caravel/templates/caravel/sql.html:12
+msgid "Create View"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:8
+#: caravel/foo/templates/caravel/welcome.html:13
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:13
 msgid "Welcome!"
 msgstr ""
 
+#: caravel/foo/templates/caravel/models/database/macros.html:4
+#: caravel/templates/caravel/models/database/macros.html:4
+msgid "Test Connection"
+msgstr ""
+
diff --git a/caravel/forms.py b/caravel/forms.py
index d7c77439ce69c..0a17a2db31f0f 100644
--- a/caravel/forms.py
+++ b/caravel/forms.py
@@ -8,6 +8,7 @@
 from copy import copy
 import math
 
+from flask_babelpkg import lazy_gettext as _
 from wtforms import (
     Form, SelectMultipleField, SelectField, TextField, TextAreaField,
     BooleanField, IntegerField, HiddenField, DecimalField)
@@ -131,31 +132,31 @@ def __init__(self, viz):
         # Pool of all the fields that can be used in Caravel
         field_data = {
             'viz_type': (SelectField, {
-                "label": "Viz",
+                "label": _("Viz"),
                 "default": 'table',
                 "choices": [(k, v.verbose_name) for k, v in viz_types.items()],
-                "description": "The type of visualization to display"
+                "description": _("The type of visualization to display")
             }),
             'metrics': (SelectMultipleSortableField, {
-                "label": "Metrics",
+                "label": _("Metrics"),
                 "choices": datasource.metrics_combo,
                 "default": [default_metric],
-                "description": "One or many metrics to display"
+                "description": _("One or many metrics to display")
             }),
             'metric': (SelectField, {
-                "label": "Metric",
+                "label": _("Metric"),
                 "choices": datasource.metrics_combo,
                 "default": default_metric,
-                "description": "Choose the metric"
+                "description": _("Choose the metric")
             }),
             'stacked_style': (SelectField, {
-                "label": "Chart Style",
+                "label": _("Chart Style"),
                 "choices": self.choicify(['stack', 'stream', 'expand']),
                 "default": 'stack',
                 "description": ""
             }),
             'linear_color_scheme': (SelectField, {
-                "label": "Color Scheme",
+                "label": _("Color Scheme"),
                 "choices": self.choicify([
                     'fire', 'blue_white_yellow', 'white_black',
                     'black_white']),
@@ -163,115 +164,115 @@ def __init__(self, viz):
                 "description": ""
             }),
             'normalize_across': (SelectField, {
-                "label": "Normalize Across",
+                "label": _("Normalize Across"),
                 "choices": self.choicify([
                     'heatmap', 'x', 'y']),
                 "default": 'heatmap',
-                "description": (
+                "description": _(
                     "Color will be rendered based on a ratio "
                     "of the cell against the sum of across this "
                     "criteria")
             }),
             'horizon_color_scale': (SelectField, {
-                "label": "Color Scale",
+                "label": _("Color Scale"),
                 "choices": self.choicify(['series', 'overall', 'change']),
                 "default": 'series',
-                "description": "Defines how the color are attributed."
+                "description": _("Defines how the color are attributed.")
             }),
             'canvas_image_rendering': (SelectField, {
-                "label": "Rendering",
+                "label": _("Rendering"),
                 "choices": (
-                    ('pixelated', 'pixelated (Sharp)'),
-                    ('auto', 'auto (Smooth)'),
+                    ('pixelated', _('pixelated (Sharp)')),
+                    ('auto', _('auto (Smooth)')),
                 ),
                 "default": 'pixelated',
-                "description": (
+                "description": _(
                     "image-rendering CSS attribute of the canvas object that "
                     "defines how the browser scales up the image")
             }),
             'xscale_interval': (SelectField, {
-                "label": "XScale Interval",
+                "label": _("XScale Interval"),
                 "choices": self.choicify(range(1, 50)),
                 "default": '1',
-                "description": (
+                "description": _(
                     "Number of step to take between ticks when "
                     "printing the x scale")
             }),
             'yscale_interval': (SelectField, {
-                "label": "YScale Interval",
+                "label": _("YScale Interval"),
                 "choices": self.choicify(range(1, 50)),
                 "default": '1',
-                "description": (
+                "description": _(
                     "Number of step to take between ticks when "
                     "printing the y scale")
             }),
             'bar_stacked': (BetterBooleanField, {
-                "label": "Stacked Bars",
+                "label": _("Stacked Bars"),
                 "default": False,
                 "description": ""
             }),
             'include_series': (BetterBooleanField, {
-                "label": "Include Series",
+                "label": _("Include Series"),
                 "default": False,
-                "description": "Include series name as an axis"
+                "description": _("Include series name as an axis")
             }),
             'secondary_metric': (SelectField, {
-                "label": "Color Metric",
+                "label": _("Color Metric"),
                 "choices": datasource.metrics_combo,
                 "default": default_metric,
-                "description": "A metric to use for color"
+                "description": _("A metric to use for color")
             }),
             'country_fieldtype': (SelectField, {
-                "label": "Country Field Type",
+                "label": _("Country Field Type"),
                 "default": 'cca2',
                 "choices": (
-                    ('name', 'Full name'),
-                    ('cioc', 'code International Olympic Committee (cioc)'),
-                    ('cca2', 'code ISO 3166-1 alpha-2 (cca2)'),
-                    ('cca3', 'code ISO 3166-1 alpha-3 (cca3)'),
+                    ('name', _('Full name')),
+                    ('cioc', _('code International Olympic Committee (cioc)')),
+                    ('cca2', _('code ISO 3166-1 alpha-2 (cca2)')),
+                    ('cca3', _('code ISO 3166-1 alpha-3 (cca3)')),
                 ),
-                "description": (
+                "description": _(
                     "The country code standard that Caravel should expect "
                     "to find in the [country] column")
             }),
             'groupby': (SelectMultipleSortableField, {
-                "label": "Group by",
+                "label": _("Group by"),
                 "choices": self.choicify(datasource.groupby_column_names),
-                "description": "One or many fields to group by"
+                "description": _("One or many fields to group by")
             }),
             'columns': (SelectMultipleSortableField, {
-                "label": "Columns",
+                "label": _("Columns"),
                 "choices": self.choicify(datasource.groupby_column_names),
-                "description": "One or many fields to pivot as columns"
+                "description": _("One or many fields to pivot as columns")
             }),
             'all_columns': (SelectMultipleSortableField, {
-                "label": "Columns",
+                "label": _("Columns"),
                 "choices": self.choicify(datasource.column_names),
-                "description": "Columns to display"
+                "description": _("Columns to display")
             }),
             'all_columns_x': (SelectField, {
-                "label": "X",
+                "label": _("X"),
                 "choices": self.choicify(datasource.column_names),
-                "description": "Columns to display"
+                "description": _("Columns to display")
             }),
             'all_columns_y': (SelectField, {
-                "label": "Y",
+                "label": _("Y"),
                 "choices": self.choicify(datasource.column_names),
-                "description": "Columns to display"
+                "description": _("Columns to display")
             }),
             'druid_time_origin': (FreeFormSelectField, {
-                "label": "Origin",
+                "label": _( "Origin"),
                 "choices": (
-                    ('', 'default'),
-                    ('now', 'now'),
+                    ('', _('default')),
+                    ('now', _('now')),
                 ),
                 "default": '',
-                "description": (
+                "description": _(
                     "Defines the origin where time buckets start, "
                     "accepts natural dates as in 'now', 'sunday' or '1970-01-01'")
             }),
             'granularity': (FreeFormSelectField, {
-                "label": "Time Granularity",
+                "label": _("Time Granularity"),
                 "default": "one day",
                 "choices": self.choicify([
                     'all',
@@ -284,13 +285,13 @@ def __init__(self, viz):
                     '1 day',
                     '7 days',
                 ]),
-                "description": (
+                "description": _(
                     "The time granularity for the visualization. Note that you "
                     "can type and use simple natural language as in '10 seconds', "
                     "'1 day' or '56 weeks'")
             }),
             'domain_granularity': (SelectField, {
-                "label": "Domain",
+                "label": _("Domain"),
                 "default": "month",
                 "choices": self.choicify([
                     'hour',
@@ -299,11 +300,11 @@ def __init__(self, viz):
                     'month',
                     'year',
                 ]),
-                "description": (
+                "description": _(
                     "The time unit used for the grouping of blocks")
             }),
             'subdomain_granularity': (SelectField, {
-                "label": "Subdomain",
+                "label": _("Subdomain"),
                 "default": "day",
                 "choices": self.choicify([
                     'min',
@@ -312,12 +313,12 @@ def __init__(self, viz):
                     'week',
                     'month',
                 ]),
-                "description": (
+                "description": _(
                     "The time unit for each block. Should be a smaller unit than "
                     "domain_granularity. Should be larger or equal to Time Grain")
             }),
             'link_length': (FreeFormSelectField, {
-                "label": "Link Length",
+                "label": _("Link Length"),
                 "default": "200",
                 "choices": self.choicify([
                     '10',
@@ -329,10 +330,10 @@ def __init__(self, viz):
                     '200',
                     '250',
                 ]),
-                "description": "Link length in the force layout"
+                "description": _("Link length in the force layout")
             }),
             'charge': (FreeFormSelectField, {
-                "label": "Charge",
+                "label": _("Charge"),
                 "default": "-500",
                 "choices": self.choicify([
                     '-50',
@@ -346,13 +347,13 @@ def __init__(self, viz):
                     '-2500',
                     '-5000',
                 ]),
-                "description": "Charge in the force layout"
+                "description": _("Charge in the force layout")
             }),
             'granularity_sqla': (SelectField, {
-                "label": "Time Column",
+                "label": _("Time Column"),
                 "default": datasource.main_dttm_col or datasource.any_dttm_col,
                 "choices": self.choicify(datasource.dttm_cols),
-                "description": (
+                "description": _(
                     "The time column for the visualization. Note that you "
                     "can define arbitrary expression that return a DATETIME "
                     "column in the table editor. Also note that the "
@@ -360,25 +361,25 @@ def __init__(self, viz):
                     "expression")
             }),
             'resample_rule': (FreeFormSelectField, {
-                "label": "Resample Rule",
+                "label": _("Resample Rule"),
                 "default": '',
                 "choices": self.choicify(('1T', '1H', '1D', '7D', '1M', '1AS')),
-                "description": ("Pandas resample rule")
+                "description": _("Pandas resample rule")
             }),
             'resample_how': (FreeFormSelectField, {
-                "label": "Resample How",
+                "label": _("Resample How"),
                 "default": '',
                 "choices": self.choicify(('', 'mean', 'sum', 'median')),
-                "description": ("Pandas resample how")
+                "description": _("Pandas resample how")
             }),
             'resample_fillmethod': (FreeFormSelectField, {
-                "label": "Resample Fill Method",
+                "label": _("Resample Fill Method"),
                 "default": '',
                 "choices": self.choicify(('', 'ffill', 'bfill')),
-                "description": ("Pandas resample fill method")
+                "description": _("Pandas resample fill method")
             }),
             'since': (FreeFormSelectField, {
-                "label": "Since",
+                "label": _("Since"),
                 "default": "7 days ago",
                 "choices": self.choicify([
                     '1 hour ago',
@@ -389,12 +390,12 @@ def __init__(self, viz):
                     '90 days ago',
                     '1 year ago'
                 ]),
-                "description": (
+                "description": _(
                     "Timestamp from filter. This supports free form typing and "
                     "natural language as in '1 day ago', '28 days' or '3 years'")
             }),
             'until': (FreeFormSelectField, {
-                "label": "Until",
+                "label": _("Until"),
                 "default": "now",
                 "choices": self.choicify([
                     'now',
@@ -405,7 +406,7 @@ def __init__(self, viz):
                     '1 year ago'])
             }),
             'max_bubble_size': (FreeFormSelectField, {
-                "label": "Max Bubble Size",
+                "label": _("Max Bubble Size"),
                 "default": "25",
                 "choices": self.choicify([
                     '5',
@@ -418,9 +419,9 @@ def __init__(self, viz):
                 ])
             }),
             'whisker_options': (FreeFormSelectField, {
-                "label": "Whisker/outlier options",
+                "label": _("Whisker/outlier options"),
                 "default": "Tukey",
-                "description": (
+                "description": _(
                     "Determines how whiskers and outliers are calculated."),
                 "choices": self.choicify([
                     'Tukey',
@@ -430,12 +431,12 @@ def __init__(self, viz):
                 ])
             }),
             'treemap_ratio': (DecimalField, {
-                "label": "Ratio",
+                "label": _("Ratio"),
                 "default": 0.5 * (1 + math.sqrt(5)),  # d3 default, golden ratio
-                "description": 'Target aspect ratio for treemap tiles.',
+                "description": _('Target aspect ratio for treemap tiles.'),
             }),
             'number_format': (FreeFormSelectField, {
-                "label": "Number format",
+                "label": _("Number format"),
                 "default": '.3s',
                 "choices": [
                     ('.3s', '".3s" | 12.3k'),
@@ -445,128 +446,128 @@ def __init__(self, viz):
                     ('+,', '"+," | +12,345.4321'),
                     ('$,.2f', '"$,.2f" | $12,345.43'),
                 ],
-                "description": "D3 format syntax for numbers "
+                "description": _("D3 format syntax for numbers "
                             "https: //github.com/mbostock/\n"
-                            "d3/wiki/Formatting"
+                            "d3/wiki/Formatting")
             }),
             'row_limit': (FreeFormSelectField, {
-                "label": 'Row limit',
+                "label": _('Row limit'),
                 "default": config.get("ROW_LIMIT"),
                 "choices": self.choicify(
                     [10, 50, 100, 250, 500, 1000, 5000, 10000, 50000])
             }),
             'limit': (FreeFormSelectField, {
-                "label": 'Series limit',
+                "label": _('Series limit'),
                 "choices": self.choicify(self.series_limits),
                 "default": 50,
-                "description": (
+                "description": _(
                     "Limits the number of time series that get displayed")
             }),
             'rolling_type': (SelectField, {
-                "label": "Rolling",
+                "label": _("Rolling"),
                 "default": 'None',
                 "choices": [(s, s) for s in ['None', 'mean', 'sum', 'std', 'cumsum']],
-                "description": (
+                "description": _(
                     "Defines a rolling window function to apply, works along "
                     "with the [Periods] text box")
             }),
             'rolling_periods': (IntegerField, {
-                "label": "Periods",
+                "label": _("Periods"),
                 "validators": [validators.optional()],
-                "description": (
+                "description": _(
                     "Defines the size of the rolling window function, "
                     "relative to the time granularity selected")
             }),
             'series': (SelectField, {
-                "label": "Series",
+                "label": _("Series"),
                 "choices": group_by_choices,
                 "default": default_groupby,
-                "description": (
+                "description": _(
                     "Defines the grouping of entities. "
                     "Each serie is shown as a specific color on the chart and "
                     "has a legend toggle")
             }),
             'entity': (SelectField, {
-                "label": "Entity",
+                "label": _("Entity"),
                 "choices": group_by_choices,
                 "default": default_groupby,
-                "description": "This define the element to be plotted on the chart"
+                "description": _("This define the element to be plotted on the chart")
             }),
             'x': (SelectField, {
-                "label": "X Axis",
+                "label": _("X Axis"),
                 "choices": datasource.metrics_combo,
                 "default": default_metric,
-                "description": "Metric assigned to the [X] axis"
+                "description": _("Metric assigned to the [X] axis")
             }),
             'y': (SelectField, {
-                "label": "Y Axis",
+                "label": _("Y Axis"),
                 "choices": datasource.metrics_combo,
                 "default": default_metric,
-                "description": "Metric assigned to the [Y] axis"
+                "description": _("Metric assigned to the [Y] axis")
             }),
             'size': (SelectField, {
-                "label": 'Bubble Size',
+                "label": _('Bubble Size'),
                 "default": default_metric,
                 "choices": datasource.metrics_combo
             }),
             'url': (TextField, {
-                "label": "URL",
-                "description": (
+                "label": _("URL"),
+                "description": _(
                     "The URL, this field is templated, so you can integrate "
                     "{{ width }} and/or {{ height }} in your URL string."
                 ),
                 "default": 'https: //www.youtube.com/embed/JkI5rg_VcQ4',
             }),
             'where': (TextField, {
-                "label": "Custom WHERE clause",
+                "label": _("Custom WHERE clause"),
                 "default": '',
-                "description": (
+                "description": _(
                     "The text in this box gets included in your query's WHERE "
                     "clause, as an AND to other criteria. You can include "
                     "complex expression, parenthesis and anything else "
                     "supported by the backend it is directed towards.")
             }),
             'having': (TextField, {
-                "label": "Custom HAVING clause",
+                "label": _("Custom HAVING clause"),
                 "default": '',
-                "description": (
+                "description": _(
                     "The text in this box gets included in your query's HAVING"
                     " clause, as an AND to other criteria. You can include "
                     "complex expression, parenthesis and anything else "
                     "supported by the backend it is directed towards.")
             }),
             'compare_lag': (TextField, {
-                "label": "Comparison Period Lag",
-                "description": (
+                "label": _("Comparison Period Lag"),
+                "description": _(
                     "Based on granularity, number of time periods to "
                     "compare against")
             }),
             'compare_suffix': (TextField, {
-                "label": "Comparison suffix",
-                "description": "Suffix to apply after the percentage display"
+                "label": _("Comparison suffix"),
+                "description": _("Suffix to apply after the percentage display")
             }),
             'table_timestamp_format': (FreeFormSelectField, {
-                "label": "Table Timestamp Format",
+                "label": _("Table Timestamp Format"),
                 "default": 'smart_date',
                 "choices": TIMESTAMP_CHOICES,
-                "description": "Timestamp Format"
+                "description": _("Timestamp Format")
             }),
             'series_height': (FreeFormSelectField, {
-                "label": "Series Height",
+                "label": _("Series Height"),
                 "default": 25,
                 "choices": self.choicify([10, 25, 40, 50, 75, 100, 150, 200]),
-                "description": "Pixel height of each series"
+                "description": _("Pixel height of each series")
             }),
             'x_axis_format': (FreeFormSelectField, {
-                "label": "X axis format",
+                "label": _("X axis format"),
                 "default": 'smart_date',
                 "choices": TIMESTAMP_CHOICES,
-                "description": "D3 format syntax for y axis "
+                "description": _("D3 format syntax for y axis "
                             "https: //github.com/mbostock/\n"
-                            "d3/wiki/Formatting"
+                            "d3/wiki/Formatting")
             }),
             'y_axis_format': (FreeFormSelectField, {
-                "label": "Y axis format",
+                "label": _("Y axis format"),
                 "default": '.3s',
                 "choices": [
                     ('.3s', '".3s" | 12.3k'),
@@ -576,142 +577,142 @@ def __init__(self, viz):
                     ('+,', '"+," | +12,345.4321'),
                     ('$,.2f', '"$,.2f" | $12,345.43'),
                 ],
-                "description": "D3 format syntax for y axis "
+                "description": _("D3 format syntax for y axis "
                             "https: //github.com/mbostock/\n"
-                            "d3/wiki/Formatting"
+                            "d3/wiki/Formatting")
             }),
             'markup_type': (SelectField, {
-                "label": "Markup Type",
+                "label": _("Markup Type"),
                 "choices": self.choicify(['markdown', 'html']),
                 "default": "markdown",
-                "description": "Pick your favorite markup language"
+                "description": _("Pick your favorite markup language")
             }),
             'rotation': (SelectField, {
-                "label": "Rotation",
+                "label": _("Rotation"),
                 "choices": [(s, s) for s in ['random', 'flat', 'square']],
                 "default": "random",
-                "description": "Rotation to apply to words in the cloud"
+                "description": _("Rotation to apply to words in the cloud")
             }),
             'line_interpolation': (SelectField, {
-                "label": "Line Style",
+                "label": _("Line Style"),
                 "choices": self.choicify([
                     'linear', 'basis', 'cardinal', 'monotone',
                     'step-before', 'step-after']),
                 "default": 'linear',
-                "description": "Line interpolation as defined by d3.js"
+                "description": _("Line interpolation as defined by d3.js")
             }),
             'code': (TextAreaField, {
-                "label": "Code",
-                "description": "Put your code here",
+                "label": _("Code"),
+                "description": _("Put your code here"),
                 "default": ''
             }),
             'pandas_aggfunc': (SelectField, {
-                "label": "Aggregation function",
+                "label": _("Aggregation function"),
                 "choices": self.choicify([
                     'sum', 'mean', 'min', 'max', 'median', 'stdev', 'var']),
                 "default": 'sum',
-                "description": (
+                "description": _(
                     "Aggregate function to apply when pivoting and "
                     "computing the total rows and columns")
             }),
             'size_from': (TextField, {
-                "label": "Font Size From",
+                "label": _("Font Size From"),
                 "default": "20",
-                "description": "Font size for the smallest value in the list"
+                "description": _("Font size for the smallest value in the list")
             }),
             'size_to': (TextField, {
-                "label": "Font Size To",
+                "label": _("Font Size To"),
                 "default": "150",
-                "description": "Font size for the biggest value in the list"
+                "description": _("Font size for the biggest value in the list")
             }),
             'show_brush': (BetterBooleanField, {
-                "label": "Range Filter",
+                "label": _("Range Filter"),
                 "default": False,
-                "description": (
+                "description": _(
                     "Whether to display the time range interactive selector")
             }),
             'show_datatable': (BetterBooleanField, {
-                "label": "Data Table",
+                "label": _("Data Table"),
                 "default": False,
-                "description": "Whether to display the interactive data table"
+                "description": _("Whether to display the interactive data table")
             }),
             'include_search': (BetterBooleanField, {
-                "label": "Search Box",
+                "label": _("Search Box"),
                 "default": False,
-                "description": (
+                "description": _(
                     "Whether to include a client side search box")
             }),
             'show_bubbles': (BetterBooleanField, {
-                "label": "Show Bubbles",
+                "label": _("Show Bubbles"),
                 "default": False,
-                "description": (
+                "description": _(
                     "Whether to display bubbles on top of countries")
             }),
             'show_legend': (BetterBooleanField, {
-                "label": "Legend",
+                "label": _("Legend"),
                 "default": True,
-                "description": "Whether to display the legend (toggles)"
+                "description": _("Whether to display the legend (toggles)")
             }),
             'x_axis_showminmax': (BetterBooleanField, {
-                "label": "X bounds",
+                "label": _("X bounds"),
                 "default": True,
-                "description": (
+                "description": _(
                     "Whether to display the min and max values of the X axis")
             }),
             'rich_tooltip': (BetterBooleanField, {
-                "label": "Rich Tooltip",
+                "label": _("Rich Tooltip"),
                 "default": True,
-                "description": (
+                "description": _(
                     "The rich tooltip shows a list of all series for that"
                     " point in time")
             }),
             'y_axis_zero': (BetterBooleanField, {
-                "label": "Y Axis Zero",
+                "label": _("Y Axis Zero"),
                 "default": False,
-                "description": (
+                "description": _(
                     "Force the Y axis to start at 0 instead of the minimum "
                     "value")
             }),
             'y_log_scale': (BetterBooleanField, {
-                "label": "Y Log",
+                "label": _("Y Log"),
                 "default": False,
-                "description": "Use a log scale for the Y axis"
+                "description": _("Use a log scale for the Y axis")
             }),
             'x_log_scale': (BetterBooleanField, {
-                "label": "X Log",
+                "label": _("X Log"),
                 "default": False,
-                "description": "Use a log scale for the X axis"
+                "description": _("Use a log scale for the X axis")
             }),
             'donut': (BetterBooleanField, {
-                "label": "Donut",
+                "label": _("Donut"),
                 "default": False,
-                "description": "Do you want a donut or a pie?"
+                "description": _("Do you want a donut or a pie?")
             }),
             'contribution': (BetterBooleanField, {
-                "label": "Contribution",
+                "label": _("Contribution"),
                 "default": False,
-                "description": "Compute the contribution to the total"
+                "description": _("Compute the contribution to the total")
             }),
             'num_period_compare': (IntegerField, {
-                "label": "Period Ratio",
+                "label": _("Period Ratio"),
                 "default": None,
                 "validators": [validators.optional()],
-                "description": (
+                "description": _(
                     "[integer] Number of period to compare against, "
                     "this is relative to the granularity selected")
             }),
             'time_compare': (TextField, {
-                "label": "Time Shift",
+                "label": _("Time Shift"),
                 "default": "",
-                "description": (
+                "description": _(
                     "Overlay a timeseries from a "
                     "relative time period. Expects relative time delta "
                     "in natural language (example:  24 hours, 7 days, "
                     "56 weeks, 365 days")
             }),
             'subheader': (TextField, {
-                "label": "Subheader",
-                "description": (
+                "label": _("Subheader"),
+                "description": _(
                     "Description text that shows up below your Big "
                     "Number")
             }),
@@ -774,9 +775,9 @@ def add_to_form(attrs):
         time_fields = None
         if datasource_classname == 'SqlaTable':
             QueryForm.fieldsets += ({
-                'label': 'SQL',
+                'label': _('SQL'),
                 'fields': ['where', 'having'],
-                'description': (
+                'description': _(
                     "This section exposes ways to include snippets of "
                     "SQL in your query"),
             },)
@@ -786,10 +787,10 @@ def add_to_form(attrs):
             if grains:
                 time_fields = ('granularity_sqla', 'time_grain_sqla')
                 self.field_dict['time_grain_sqla'] = SelectField(
-                    'Time Grain',
+                    _('Time Grain'),
                     choices=self.choicify((grain.name for grain in grains)),
                     default="Time Column",
-                    description=(
+                    description=_(
                         "The time granularity for the visualization. This "
                         "applies a date transformation to alter "
                         "your time column and defines a new time granularity."
@@ -812,24 +813,24 @@ def add_to_form(attrs):
         filter_cols = viz.datasource.filterable_column_names or ['']
         for i in range(10):
             setattr(QueryForm, 'flt_col_' + str(i), SelectField(
-                'Filter 1',
+                _('Filter 1'),
                 default=filter_cols[0],
                 choices=self.choicify(filter_cols)))
             setattr(QueryForm, 'flt_op_' + str(i), SelectField(
-                'Filter 1',
+                _('Filter 1'),
                 default='in',
                 choices=filter_choices))
             setattr(
                 QueryForm, 'flt_eq_' + str(i),
-                TextField("Super", default=''))
+                TextField(_("Super"), default=''))
 
         if time_fields:
             QueryForm.fieldsets = ({
-                'label': 'Time',
+                'label': _('Time'),
                 'fields': (
                     time_fields,
                     ('since', 'until'),
                 ),
-                'description': "Time related form attributes",
+                'description': _("Time related form attributes"),
             },) + tuple(QueryForm.fieldsets)
         return QueryForm
diff --git a/caravel/templates/appbuilder/navbar.html b/caravel/templates/appbuilder/navbar.html
index 90cd397497d9e..a495c50b52edf 100644
--- a/caravel/templates/appbuilder/navbar.html
+++ b/caravel/templates/appbuilder/navbar.html
@@ -21,7 +21,7 @@
         {% include 'appbuilder/navbar_menu.html' %}
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="http://airbnb.io/caravel"><i class="fa fa-book"></i> Documentation</a></li>
+        <li><a href="http://airbnb.io/caravel"><i class="fa fa-book"></i> {{_("Documentation") }}</a></li>
         {% include 'appbuilder/navbar_right.html' %}
       </ul>
     </div>
diff --git a/caravel/templates/caravel/explore.html b/caravel/templates/caravel/explore.html
index 5e12efeba199a..1510f8d80c222 100644
--- a/caravel/templates/caravel/explore.html
+++ b/caravel/templates/caravel/explore.html
@@ -55,26 +55,26 @@
             </span>
           {% endif %}
           <div class="pull-right">
-            <span id="is_cached" class="label label-default" title="Force refresh" data-toggle="tooltip">
+            <span id="is_cached" class="label label-default" title={{_("Force refresh")}} data-toggle="tooltip">
               cached
             </span>
             <div class="btn-group results" role="group">
               <a role="button" tabindex="0" class="btn btn-default" id="shortner" data-toggle="popover" data-trigger="focus">
-                <i class="fa fa-link" data-toggle="tooltip" title="Short URL"></i>&nbsp;
+                <i class="fa fa-link" data-toggle="tooltip" title={{_("Short URL")}}></i>&nbsp;
               </a>
-              <span class="btn btn-default" id="standalone" title="Standalone version, use to embed anywhere" data-toggle="tooltip">
+              <span class="btn btn-default" id="standalone" title={{ _("Standalone version, use to embed anywhere") }} data-toggle="tooltip">
                 <i class="fa fa-code"></i>&nbsp;
               </span>
-              <span class="btn btn-default " id="json" title="Export to .json" data-toggle="tooltip">
+              <span class="btn btn-default " id="json" title={{ _("Export to .json")}} data-toggle="tooltip">
                 <i class="fa fa-file-code-o"></i>
                 .json
               </span>
-              <span class="btn btn-default {{ "disabled disabledButton" if not can_download }}" id="csv" title="Export to .csv format" data-toggle="tooltip">
+              <span class="btn btn-default {{ "disabled disabledButton" if not can_download }}" id="csv" title={{ _("Export to .csv format") }} data-toggle="tooltip">
                 <i class="fa fa-file-text-o"></i>.csv
               </span>
-              <span class="btn btn-warning notbtn" id="timer">0 sec</span>
+              <span class="btn btn-warning notbtn" id="timer">{{ _("0 sec") }}</span>
               <span class="btn btn-info disabled query"
-                data-toggle="modal" data-target="#query_modal">query</span>
+                data-toggle="modal" data-target="#query_modal">{{ _("query") }}</span>
             </div>
           </div>
         <hr/>
@@ -83,15 +83,15 @@
           <div class="row center-block">
             <div class="btn-group query-and-save">
               <button type="button" class="btn btn-primary query">
-                <i class="fa fa-bolt"></i>Query
+                <i class="fa fa-bolt"></i>{{ _("Query") }}
               </button>
               {% if viz.form_data.slice_id %}
                   <button type="button" class="btn btn-default {{ "disabled disabledButton" if not can_edit }}" id="btn_overwrite">
-                  <i class="fa fa-save"></i>Overwrite
+                  <i class="fa fa-save"></i>{{  _("Overwrite") }}
                   </button>
               {% endif %}
                   <button type="button" class="btn btn-default {{ "disabled disabledButton" if not can_add }}" id="btn_save">
-                  <i class="fa fa-plus-circle"></i>Save as
+                  <i class="fa fa-plus-circle"></i>{{ _("Save as") }}
                   </button>
             </div>
           </div>
@@ -134,10 +134,10 @@
             {% endfor %}
             <div class="panel panel-default">
               <div class="panel-heading">
-                <span class="legend_label">Filters</span>
+                <span class="legend_label">{{ _("Filters") }}</span>
                 <i  class="fa fa-info-circle" data-toggle="tooltip"
                     data-placement="bottom"
-                    title="Filters are defined using comma delimited strings as in 'US,FR,Other'"></i>
+                    title={{_("Filters are defined using comma delimited strings as in 'US,FR,Other'")}}></i>
                 <span class="collapser"> [-]</span>
               </div>
               <div class="panel-body">
@@ -155,7 +155,7 @@
                 <div id="filters"></div>
                 <button type="button" id="plus" class="btn btn-default btn-sm" aria-label="Add a filter">
                   <span class="fa fa-plus" aria-hidden="true"></span>
-                  <span>Add filter</span>
+                  <span>{{ _("Add filter") }}</span>
                 </button>
               </div>
             </div>
@@ -189,13 +189,13 @@
               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
               </button>
-              <h4 class="modal-title">Query</h4>
+              <h4 class="modal-title">{{ _("Query") }}</h4>
             </div>
             <div class="modal-body">
               <pre id="query_container"></pre>
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+              <button type="button" class="btn btn-default" data-dismiss="modal">{{ _("Close") }}</button>
             </div>
           </div>
         </div>
@@ -207,13 +207,13 @@ <h4 class="modal-title">Query</h4>
               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
               </button>
-              <h4 class="modal-title">Datasource Description</h4>
+              <h4 class="modal-title">{{ _("Datasource Description") }}</h4>
             </div>
             <div class="modal-body">
               {{ datasource.description_markeddown | safe }}
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+              <button type="button" class="btn btn-default" data-dismiss="modal">{{ _("Close") }}</button>
             </div>
           </div>
         </div>
diff --git a/caravel/templates/caravel/models/database/macros.html b/caravel/templates/caravel/models/database/macros.html
index 7a074cb33f6c1..3da83e403e180 100644
--- a/caravel/templates/caravel/models/database/macros.html
+++ b/caravel/templates/caravel/models/database/macros.html
@@ -1,7 +1,7 @@
 {% macro testconn() %}
   <script>
     $("#sqlalchemy_uri").parent()
-      .append('<button id="testconn" class="btn">Test Connection</button>');
+      .append('<button id="testconn" class="btn">{{ _("Test Connection") }}</button>');
     $("#testconn").click(function(e) {
       e.preventDefault();
       var url = "/caravel/testconn";
diff --git a/caravel/templates/caravel/sql.html b/caravel/templates/caravel/sql.html
index f40477b022a25..a60127b1c527c 100644
--- a/caravel/templates/caravel/sql.html
+++ b/caravel/templates/caravel/sql.html
@@ -8,8 +8,8 @@ <h3>db: [{{ db }}]</h3>
     <div class="row interactions">
       <div class="col-xs-7">
         <input type="hidden" id="database_id" value="{{ db.id }}">
-        <button class="btn btn-primary" id="run">Run!</button>
-        <button class="btn btn-default" id="create_view">Create View</button>
+        <button class="btn btn-primary" id="run">{{_("Run!")}}</button>
+        <button class="btn btn-default" id="create_view">{{_("Create View")}}</button>
       </div>
       <div class="col-xs-5">
         <select id="dbtable">
diff --git a/caravel/templates/caravel/welcome.html b/caravel/templates/caravel/welcome.html
index 492876268ddaa..362b1af151f90 100644
--- a/caravel/templates/caravel/welcome.html
+++ b/caravel/templates/caravel/welcome.html
@@ -22,7 +22,7 @@ <h3>{{ _("Welcome!") }}</h3>
           <div class="row">
             <div class="col-md-12">
               <span class="pull-left">
-                <h5><i class="fa fa-dashboard"></i> Dashboards</h5>
+                <h5><i class="fa fa-dashboard"></i> {{ _("Dashboards") }}</h5>
               </span>
               <span class="search pull-right"></span>
               <span class="pull-right">
@@ -43,7 +43,7 @@ <h5><i class="fa fa-search"></i></h5>
           <div class="row">
             <div class="col-md-12">
               <span class="pull-left">
-                <h5><i class="fa fa-bar-chart"></i> Slices</h5>
+                <h5><i class="fa fa-bar-chart"></i> {{ _("Slices") }}</h5>
               </span>
               <span class="search pull-right"></span>
               <span class="pull-right">
diff --git a/caravel/translations/es/LC_MESSAGES/messages.po b/caravel/translations/es/LC_MESSAGES/messages.po
index ccd7c5e9ef373..d9c27c28eafe7 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-05-20 20:30-0700\n"
+"POT-Creation-Date: 2016-06-08 12:20+0200\n"
 "PO-Revision-Date: 2016-05-02 08:49-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: es\n"
@@ -18,443 +18,1293 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: caravel/models.py:607
+#: caravel/forms.py:135
+msgid "Viz"
+msgstr ""
+
+#: caravel/forms.py:138
+msgid "The type of visualization to display"
+msgstr ""
+
+#: caravel/forms.py:141
+msgid "Metrics"
+msgstr ""
+
+#: caravel/forms.py:144
+msgid "One or many metrics to display"
+msgstr ""
+
+#: caravel/forms.py:147 caravel/views.py:226 caravel/views.py:255
+msgid "Metric"
+msgstr ""
+
+#: caravel/forms.py:150
+msgid "Choose the metric"
+msgstr ""
+
+#: caravel/forms.py:153
+msgid "Chart Style"
+msgstr ""
+
+#: caravel/forms.py:159
+msgid "Color Scheme"
+msgstr ""
+
+#: caravel/forms.py:167
+msgid "Normalize Across"
+msgstr ""
+
+#: caravel/forms.py:171
+msgid ""
+"Color will be rendered based on a ratio of the cell against the sum of "
+"across this criteria"
+msgstr ""
+
+#: caravel/forms.py:177
+msgid "Color Scale"
+msgstr ""
+
+#: caravel/forms.py:180
+msgid "Defines how the color are attributed."
+msgstr ""
+
+#: caravel/forms.py:183
+msgid "Rendering"
+msgstr ""
+
+#: caravel/forms.py:185
+msgid "pixelated (Sharp)"
+msgstr ""
+
+#: caravel/forms.py:186
+msgid "auto (Smooth)"
+msgstr ""
+
+#: caravel/forms.py:189
+msgid ""
+"image-rendering CSS attribute of the canvas object that defines how the "
+"browser scales up the image"
+msgstr ""
+
+#: caravel/forms.py:194
+msgid "XScale Interval"
+msgstr ""
+
+#: caravel/forms.py:197
+msgid "Number of step to take between ticks when printing the x scale"
+msgstr ""
+
+#: caravel/forms.py:202
+msgid "YScale Interval"
+msgstr ""
+
+#: caravel/forms.py:205
+msgid "Number of step to take between ticks when printing the y scale"
+msgstr ""
+
+#: caravel/forms.py:210
+msgid "Stacked Bars"
+msgstr ""
+
+#: caravel/forms.py:215
+msgid "Include Series"
+msgstr ""
+
+#: caravel/forms.py:217
+msgid "Include series name as an axis"
+msgstr ""
+
+#: caravel/forms.py:220
+msgid "Color Metric"
+msgstr ""
+
+#: caravel/forms.py:223
+msgid "A metric to use for color"
+msgstr ""
+
+#: caravel/forms.py:226
+msgid "Country Field Type"
+msgstr ""
+
+#: caravel/forms.py:229
+msgid "Full name"
+msgstr ""
+
+#: caravel/forms.py:230
+msgid "code International Olympic Committee (cioc)"
+msgstr ""
+
+#: caravel/forms.py:231
+msgid "code ISO 3166-1 alpha-2 (cca2)"
+msgstr ""
+
+#: caravel/forms.py:232
+msgid "code ISO 3166-1 alpha-3 (cca3)"
+msgstr ""
+
+#: caravel/forms.py:234
+msgid ""
+"The country code standard that Caravel should expect to find in the "
+"[country] column"
+msgstr ""
+
+#: caravel/forms.py:239
+msgid "Group by"
+msgstr ""
+
+#: caravel/forms.py:241
+msgid "One or many fields to group by"
+msgstr ""
+
+#: caravel/forms.py:244 caravel/forms.py:249
+msgid "Columns"
+msgstr ""
+
+#: caravel/forms.py:246
+msgid "One or many fields to pivot as columns"
+msgstr ""
+
+#: caravel/forms.py:251 caravel/forms.py:256 caravel/forms.py:261
+msgid "Columns to display"
+msgstr ""
+
+#: caravel/forms.py:254
+msgid "X"
+msgstr ""
+
+#: caravel/forms.py:259
+msgid "Y"
+msgstr ""
+
+#: caravel/forms.py:264
+msgid "Origin"
+msgstr ""
+
+#: caravel/forms.py:266
+msgid "default"
+msgstr ""
+
+#: caravel/forms.py:267
+msgid "now"
+msgstr ""
+
+#: caravel/forms.py:270
+msgid ""
+"Defines the origin where time buckets start, accepts natural dates as in "
+"'now', 'sunday' or '1970-01-01'"
+msgstr ""
+
+#: caravel/forms.py:275
+msgid "Time Granularity"
+msgstr ""
+
+#: caravel/forms.py:288
+msgid ""
+"The time granularity for the visualization. Note that you can type and "
+"use simple natural language as in '10 seconds', '1 day' or '56 weeks'"
+msgstr ""
+
+#: caravel/forms.py:294
+msgid "Domain"
+msgstr ""
+
+#: caravel/forms.py:303
+msgid "The time unit used for the grouping of blocks"
+msgstr ""
+
+#: caravel/forms.py:307
+msgid "Subdomain"
+msgstr ""
+
+#: caravel/forms.py:316
+msgid ""
+"The time unit for each block. Should be a smaller unit than "
+"domain_granularity. Should be larger or equal to Time Grain"
+msgstr ""
+
+#: caravel/forms.py:321
+msgid "Link Length"
+msgstr ""
+
+#: caravel/forms.py:333
+msgid "Link length in the force layout"
+msgstr ""
+
+#: caravel/forms.py:336
+msgid "Charge"
+msgstr ""
+
+#: caravel/forms.py:350
+msgid "Charge in the force layout"
+msgstr ""
+
+#: caravel/forms.py:353
+msgid "Time Column"
+msgstr ""
+
+#: caravel/forms.py:356
+msgid ""
+"The time column for the visualization. Note that you can define arbitrary"
+" expression that return a DATETIME column in the table editor. Also note "
+"that the filter bellow is applied against this column or expression"
+msgstr ""
+
+#: caravel/forms.py:364
+msgid "Resample Rule"
+msgstr ""
+
+#: caravel/forms.py:367
+msgid "Pandas resample rule"
+msgstr ""
+
+#: caravel/forms.py:370
+msgid "Resample How"
+msgstr ""
+
+#: caravel/forms.py:373
+msgid "Pandas resample how"
+msgstr ""
+
+#: caravel/forms.py:376
+msgid "Resample Fill Method"
+msgstr ""
+
+#: caravel/forms.py:379
+msgid "Pandas resample fill method"
+msgstr ""
+
+#: caravel/forms.py:382
+msgid "Since"
+msgstr ""
+
+#: caravel/forms.py:393
+msgid ""
+"Timestamp from filter. This supports free form typing and natural "
+"language as in '1 day ago', '28 days' or '3 years'"
+msgstr ""
+
+#: caravel/forms.py:398
+msgid "Until"
+msgstr ""
+
+#: caravel/forms.py:409
+msgid "Max Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:422
+msgid "Whisker/outlier options"
+msgstr ""
+
+#: caravel/forms.py:424
+msgid "Determines how whiskers and outliers are calculated."
+msgstr ""
+
+#: caravel/forms.py:434
+msgid "Ratio"
+msgstr ""
+
+#: caravel/forms.py:436
+msgid "Target aspect ratio for treemap tiles."
+msgstr ""
+
+#: caravel/forms.py:439
+msgid "Number format"
+msgstr ""
+
+#: caravel/forms.py:449
+msgid ""
+"D3 format syntax for numbers https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:454
+msgid "Row limit"
+msgstr ""
+
+#: caravel/forms.py:460
+msgid "Series limit"
+msgstr ""
+
+#: caravel/forms.py:463
+msgid "Limits the number of time series that get displayed"
+msgstr ""
+
+#: caravel/forms.py:467
+msgid "Rolling"
+msgstr ""
+
+#: caravel/forms.py:470
+msgid ""
+"Defines a rolling window function to apply, works along with the "
+"[Periods] text box"
+msgstr ""
+
+#: caravel/forms.py:475
+msgid "Periods"
+msgstr ""
+
+#: caravel/forms.py:477
+msgid ""
+"Defines the size of the rolling window function, relative to the time "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:482 caravel/viz.py:1136
+msgid "Series"
+msgstr ""
+
+#: caravel/forms.py:485
+msgid ""
+"Defines the grouping of entities. Each serie is shown as a specific color"
+" on the chart and has a legend toggle"
+msgstr ""
+
+#: caravel/forms.py:491
+msgid "Entity"
+msgstr ""
+
+#: caravel/forms.py:494
+msgid "This define the element to be plotted on the chart"
+msgstr ""
+
+#: caravel/forms.py:497
+msgid "X Axis"
+msgstr ""
+
+#: caravel/forms.py:500
+msgid "Metric assigned to the [X] axis"
+msgstr ""
+
+#: caravel/forms.py:503
+msgid "Y Axis"
+msgstr ""
+
+#: caravel/forms.py:506
+msgid "Metric assigned to the [Y] axis"
+msgstr ""
+
+#: caravel/forms.py:509
+msgid "Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:514
+msgid "URL"
+msgstr ""
+
+#: caravel/forms.py:515
+msgid ""
+"The URL, this field is templated, so you can integrate {{ width }} and/or"
+" {{ height }} in your URL string."
+msgstr ""
+
+#: caravel/forms.py:522
+msgid "Custom WHERE clause"
+msgstr ""
+
+#: caravel/forms.py:524
+msgid ""
+"The text in this box gets included in your query's WHERE clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:531
+msgid "Custom HAVING clause"
+msgstr ""
+
+#: caravel/forms.py:533
+msgid ""
+"The text in this box gets included in your query's HAVING clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:540
+msgid "Comparison Period Lag"
+msgstr ""
+
+#: caravel/forms.py:541
+msgid "Based on granularity, number of time periods to compare against"
+msgstr ""
+
+#: caravel/forms.py:546
+msgid "Comparison suffix"
+msgstr ""
+
+#: caravel/forms.py:547
+msgid "Suffix to apply after the percentage display"
+msgstr ""
+
+#: caravel/forms.py:550
+msgid "Table Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:553
+msgid "Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:556
+msgid "Series Height"
+msgstr ""
+
+#: caravel/forms.py:559
+msgid "Pixel height of each series"
+msgstr ""
+
+#: caravel/forms.py:562
+msgid "X axis format"
+msgstr ""
+
+#: caravel/forms.py:565 caravel/forms.py:580
+msgid ""
+"D3 format syntax for y axis https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:570
+msgid "Y axis format"
+msgstr ""
+
+#: caravel/forms.py:585
+msgid "Markup Type"
+msgstr ""
+
+#: caravel/forms.py:588
+msgid "Pick your favorite markup language"
+msgstr ""
+
+#: caravel/forms.py:591
+msgid "Rotation"
+msgstr ""
+
+#: caravel/forms.py:594
+msgid "Rotation to apply to words in the cloud"
+msgstr ""
+
+#: caravel/forms.py:597
+msgid "Line Style"
+msgstr ""
+
+#: caravel/forms.py:602
+msgid "Line interpolation as defined by d3.js"
+msgstr ""
+
+#: caravel/forms.py:605
+msgid "Code"
+msgstr ""
+
+#: caravel/forms.py:606
+msgid "Put your code here"
+msgstr ""
+
+#: caravel/forms.py:610
+msgid "Aggregation function"
+msgstr ""
+
+#: caravel/forms.py:614
+msgid ""
+"Aggregate function to apply when pivoting and computing the total rows "
+"and columns"
+msgstr ""
+
+#: caravel/forms.py:619
+msgid "Font Size From"
+msgstr ""
+
+#: caravel/forms.py:621
+msgid "Font size for the smallest value in the list"
+msgstr ""
+
+#: caravel/forms.py:624
+msgid "Font Size To"
+msgstr ""
+
+#: caravel/forms.py:626
+msgid "Font size for the biggest value in the list"
+msgstr ""
+
+#: caravel/forms.py:629
+msgid "Range Filter"
+msgstr ""
+
+#: caravel/forms.py:631
+msgid "Whether to display the time range interactive selector"
+msgstr ""
+
+#: caravel/forms.py:635
+msgid "Data Table"
+msgstr ""
+
+#: caravel/forms.py:637
+msgid "Whether to display the interactive data table"
+msgstr ""
+
+#: caravel/forms.py:640
+msgid "Search Box"
+msgstr ""
+
+#: caravel/forms.py:642
+msgid "Whether to include a client side search box"
+msgstr ""
+
+#: caravel/forms.py:646
+msgid "Show Bubbles"
+msgstr ""
+
+#: caravel/forms.py:648
+msgid "Whether to display bubbles on top of countries"
+msgstr ""
+
+#: caravel/forms.py:652
+msgid "Legend"
+msgstr ""
+
+#: caravel/forms.py:654
+msgid "Whether to display the legend (toggles)"
+msgstr ""
+
+#: caravel/forms.py:657
+msgid "X bounds"
+msgstr ""
+
+#: caravel/forms.py:659
+msgid "Whether to display the min and max values of the X axis"
+msgstr ""
+
+#: caravel/forms.py:663
+msgid "Rich Tooltip"
+msgstr ""
+
+#: caravel/forms.py:665
+msgid "The rich tooltip shows a list of all series for that point in time"
+msgstr ""
+
+#: caravel/forms.py:670
+msgid "Y Axis Zero"
+msgstr ""
+
+#: caravel/forms.py:672
+msgid "Force the Y axis to start at 0 instead of the minimum value"
+msgstr ""
+
+#: caravel/forms.py:677
+msgid "Y Log"
+msgstr ""
+
+#: caravel/forms.py:679
+msgid "Use a log scale for the Y axis"
+msgstr ""
+
+#: caravel/forms.py:682
+msgid "X Log"
+msgstr ""
+
+#: caravel/forms.py:684
+msgid "Use a log scale for the X axis"
+msgstr ""
+
+#: caravel/forms.py:687
+msgid "Donut"
+msgstr ""
+
+#: caravel/forms.py:689
+msgid "Do you want a donut or a pie?"
+msgstr ""
+
+#: caravel/forms.py:692
+msgid "Contribution"
+msgstr ""
+
+#: caravel/forms.py:694
+msgid "Compute the contribution to the total"
+msgstr ""
+
+#: caravel/forms.py:697
+msgid "Period Ratio"
+msgstr ""
+
+#: caravel/forms.py:700
+msgid ""
+"[integer] Number of period to compare against, this is relative to the "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:705
+msgid "Time Shift"
+msgstr ""
+
+#: caravel/forms.py:707
+msgid ""
+"Overlay a timeseries from a relative time period. Expects relative time "
+"delta in natural language (example:  24 hours, 7 days, 56 weeks, 365 days"
+msgstr ""
+
+#: caravel/forms.py:714
+msgid "Subheader"
+msgstr ""
+
+#: caravel/forms.py:715
+msgid "Description text that shows up below your Big Number"
+msgstr ""
+
+#: caravel/forms.py:778
+msgid "SQL"
+msgstr ""
+
+#: caravel/forms.py:780
+msgid "This section exposes ways to include snippets of SQL in your query"
+msgstr ""
+
+#: caravel/forms.py:790
+msgid "Time Grain"
+msgstr ""
+
+#: caravel/forms.py:793
+msgid ""
+"The time granularity for the visualization. This applies a date "
+"transformation to alter your time column and defines a new time "
+"granularity.The options here are defined on a per database engine basis "
+"in the Caravel source code"
+msgstr ""
+
+#: caravel/forms.py:829
+msgid "Time"
+msgstr ""
+
+#: caravel/forms.py:834
+msgid "Time related form attributes"
+msgstr ""
+
+#: caravel/models.py:615
 msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
 msgstr ""
 
-#: caravel/models.py:1243
+#: caravel/models.py:1255
 msgid "No data was returned."
 msgstr ""
 
-#: caravel/views.py:124
+#: 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 ""
 
-#: caravel/views.py:133 caravel/views.py:161
+#: caravel/views.py:167 caravel/views.py:195
 msgid "Column"
 msgstr ""
 
-#: caravel/views.py:134 caravel/views.py:194 caravel/views.py:223
+#: caravel/views.py:168 caravel/views.py:228 caravel/views.py:257
 msgid "Verbose Name"
 msgstr ""
 
-#: caravel/views.py:135 caravel/views.py:193 caravel/views.py:222
-#: caravel/views.py:400 caravel/views.py:535
+#: caravel/views.py:169 caravel/views.py:227 caravel/views.py:256
+#: caravel/views.py:440 caravel/views.py:581
 msgid "Description"
 msgstr ""
 
-#: caravel/views.py:136 caravel/views.py:164
+#: caravel/views.py:170 caravel/views.py:198
 msgid "Groupable"
 msgstr ""
 
-#: caravel/views.py:137 caravel/views.py:165
+#: caravel/views.py:171 caravel/views.py:199
 msgid "Filterable"
 msgstr ""
 
-#: caravel/views.py:138 caravel/views.py:197 caravel/views.py:308
-#: caravel/views.py:406
+#: caravel/views.py:172 caravel/views.py:231 caravel/views.py:343
+#: caravel/views.py:446
 msgid "Table"
 msgstr ""
 
-#: caravel/views.py:139 caravel/views.py:166
+#: caravel/views.py:173 caravel/views.py:200
 msgid "Count Distinct"
 msgstr ""
 
-#: caravel/views.py:140 caravel/views.py:167
+#: caravel/views.py:174 caravel/views.py:201
 msgid "Sum"
 msgstr ""
 
-#: caravel/views.py:141 caravel/views.py:168
+#: caravel/views.py:175 caravel/views.py:202
 msgid "Min"
 msgstr ""
 
-#: caravel/views.py:142 caravel/views.py:169
+#: caravel/views.py:176 caravel/views.py:203
 msgid "Max"
 msgstr ""
 
-#: caravel/views.py:143
+#: caravel/views.py:177
 msgid "Expression"
 msgstr ""
 
-#: caravel/views.py:144
+#: caravel/views.py:178
 msgid "Is temporal"
 msgstr ""
 
-#: caravel/views.py:162 caravel/views.py:195 caravel/views.py:224
-#: caravel/views.py:424
+#: caravel/views.py:196 caravel/views.py:229 caravel/views.py:258
+#: caravel/views.py:468
 msgid "Type"
 msgstr ""
 
-#: caravel/views.py:163 caravel/views.py:399
+#: caravel/views.py:197 caravel/views.py:439
 msgid "Datasource"
 msgstr ""
 
-#: caravel/views.py:192 caravel/views.py:221
-msgid "Metric"
-msgstr ""
-
-#: caravel/views.py:196
+#: caravel/views.py:230
 msgid "SQL Expression"
 msgstr ""
 
-#: caravel/views.py:225 caravel/views.py:503
+#: caravel/views.py:259 caravel/views.py:548
 msgid "JSON"
 msgstr ""
 
-#: caravel/views.py:226
+#: caravel/views.py:260
 msgid "Druid Datasource"
 msgstr ""
 
-#: caravel/views.py:257 caravel/views.py:310
+#: caravel/views.py:291 caravel/views.py:345
 msgid "Database"
 msgstr ""
 
-#: caravel/views.py:258
+#: caravel/views.py:292
 msgid "SQL link"
 msgstr ""
 
-#: caravel/views.py:259 caravel/views.py:397 caravel/views.py:459
+#: caravel/views.py:293 caravel/views.py:437 caravel/views.py:503
 msgid "Creator"
 msgstr ""
 
-#: caravel/views.py:260 caravel/views.py:311
+#: caravel/views.py:294 caravel/views.py:346
 msgid "Last Changed"
 msgstr ""
 
-#: caravel/views.py:261
+#: caravel/views.py:295
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: caravel/views.py:262 caravel/views.py:317 caravel/views.py:396
-#: caravel/views.py:541
+#: caravel/views.py:296 caravel/views.py:352 caravel/views.py:436
+#: caravel/views.py:587
 msgid "Cache Timeout"
 msgstr ""
 
-#: caravel/views.py:263
+#: caravel/views.py:297
 msgid "Extra"
 msgstr ""
 
-#: caravel/views.py:279
+#: caravel/views.py:313
 msgid "Databases"
 msgstr ""
 
-#: caravel/views.py:281 caravel/views.py:337 caravel/views.py:369
+#: 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 ""
 
-#: caravel/views.py:309
+#: caravel/views.py:344
 msgid "Changed By"
 msgstr ""
 
-#: caravel/views.py:312
+#: caravel/views.py:347
 msgid "SQL Editor"
 msgstr ""
 
-#: caravel/views.py:313 caravel/views.py:537
+#: caravel/views.py:348 caravel/views.py:583
 msgid "Is Featured"
 msgstr ""
 
-#: caravel/views.py:314
+#: caravel/views.py:349
 msgid "Schema"
 msgstr ""
 
-#: caravel/views.py:315 caravel/views.py:539
+#: caravel/views.py:350 caravel/views.py:585
 msgid "Default Endpoint"
 msgstr ""
 
-#: caravel/views.py:316
+#: caravel/views.py:351
 msgid "Offset"
 msgstr ""
 
-#: caravel/views.py:354 caravel/views.py:534
+#: caravel/views.py:373
+msgid "Tables"
+msgstr ""
+
+#: caravel/views.py:392 caravel/views.py:580
 msgid "Cluster"
 msgstr ""
 
-#: caravel/views.py:355
+#: caravel/views.py:393
 msgid "Coordinator Host"
 msgstr ""
 
-#: caravel/views.py:356
+#: caravel/views.py:394
 msgid "Coordinator Port"
 msgstr ""
 
-#: caravel/views.py:357
+#: caravel/views.py:395
 msgid "Coordinator Endpoint"
 msgstr ""
 
-#: caravel/views.py:358
+#: caravel/views.py:396
 msgid "Broker Host"
 msgstr ""
 
-#: caravel/views.py:359
-msgid "Borker Port"
+#: caravel/views.py:397
+msgid "Broker Port"
 msgstr ""
 
-#: caravel/views.py:360
+#: caravel/views.py:398
 msgid "Broker Endpoint"
 msgstr ""
 
-#: caravel/views.py:398 caravel/views.py:479
+#: caravel/views.py:406
+msgid "Druid Clusters"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:25
+#: caravel/templates/caravel/welcome.html:25 caravel/views.py:438
+#: caravel/views.py:524
 msgid "Dashboards"
 msgstr ""
 
-#: caravel/views.py:401
+#: caravel/views.py:441
 msgid "Last Modified"
 msgstr ""
 
-#: caravel/views.py:402 caravel/views.py:458
+#: caravel/views.py:442 caravel/views.py:502
 msgid "Owners"
 msgstr ""
 
-#: caravel/views.py:403
+#: caravel/views.py:443
 msgid "Parameters"
 msgstr ""
 
-#: caravel/views.py:404 caravel/views.py:425
+#: caravel/views.py:444 caravel/views.py:469
 msgid "Slice"
 msgstr ""
 
-#: caravel/views.py:405
+#: caravel/views.py:445
 msgid "Name"
 msgstr ""
 
-#: caravel/views.py:407 caravel/views.py:426
+#: caravel/views.py:447 caravel/views.py:470
 msgid "Visualization Type"
 msgstr ""
 
-#: caravel/views.py:441
+#: caravel/foo/templates/caravel/welcome.html:46
+#: caravel/templates/caravel/welcome.html:46 caravel/views.py:456
+#: caravel/views.py:501
+msgid "Slices"
+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 ""
 
-#: caravel/views.py:446
+#: 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 ""
 
-#: caravel/views.py:450
+#: caravel/views.py:494
 msgid "To get a readable URL for your dashboard"
 msgstr ""
 
-#: caravel/views.py:454
+#: caravel/views.py:498
 msgid "Dashboard"
 msgstr ""
 
-#: caravel/views.py:455
+#: caravel/views.py:499
 msgid "Title"
 msgstr ""
 
-#: caravel/views.py:456
+#: caravel/views.py:500
 msgid "Slug"
 msgstr ""
 
-#: caravel/views.py:457
-msgid "Slices"
-msgstr ""
-
-#: caravel/views.py:460
+#: caravel/views.py:504
 msgid "Modified"
 msgstr ""
 
-#: caravel/views.py:461
+#: caravel/views.py:505
 msgid "Position JSON"
 msgstr ""
 
-#: caravel/views.py:462
+#: caravel/views.py:506
 msgid "CSS"
 msgstr ""
 
-#: caravel/views.py:463
+#: caravel/views.py:507
 msgid "JSON Metadata"
 msgstr ""
 
-#: caravel/views.py:500
+#: caravel/views.py:545
 msgid "User"
 msgstr ""
 
-#: caravel/views.py:501
+#: caravel/views.py:546
 msgid "Action"
 msgstr ""
 
-#: caravel/views.py:502
+#: caravel/views.py:547
 msgid "dttm"
 msgstr ""
 
-#: caravel/views.py:509
+#: caravel/views.py:554
 msgid "Action Log"
 msgstr ""
 
-#: caravel/views.py:510
+#: caravel/views.py:556
 msgid "Security"
 msgstr ""
 
-#: caravel/views.py:527
+#: caravel/views.py:573
 msgid "Timezone offset (in hours) for this datasource"
 msgstr ""
 
-#: caravel/views.py:533
+#: caravel/views.py:579
 msgid "Data Source"
 msgstr ""
 
-#: caravel/views.py:536
+#: caravel/views.py:582
 msgid "Owner"
 msgstr ""
 
-#: caravel/views.py:538
+#: caravel/views.py:584
 msgid "Is Hidden"
 msgstr ""
 
-#: caravel/views.py:540
+#: caravel/views.py:586
 msgid "Time Offset"
 msgstr ""
 
-#: caravel/views.py:555
+#: caravel/views.py:601
 msgid "Druid Datasources"
 msgstr ""
 
-#: caravel/views.py:639
-msgid "The datasource seems to have been deleted"
-msgstr ""
-
-#: caravel/views.py:647
-msgid "You don't seem to have access to this datasource"
-msgstr ""
-
-#: caravel/views.py:970
+#: caravel/views.py:1016
 msgid "This view requires the `all_datasource_access` permission"
 msgstr ""
 
-#: caravel/views.py:1081
+#: caravel/views.py:1113
 msgid "CSS Templates"
 msgstr ""
 
-#: caravel/viz.py:324
+#: caravel/viz.py:314
 msgid "Table View"
 msgstr ""
 
-#: caravel/viz.py:385
+#: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
 
-#: caravel/viz.py:447
+#: caravel/viz.py:442
 msgid "Markup"
 msgstr ""
 
-#: caravel/viz.py:475
+#: caravel/viz.py:470
 msgid "Word Cloud"
 msgstr ""
 
-#: caravel/viz.py:507
+#: caravel/viz.py:502
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:551
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
+#: caravel/viz.py:1069 caravel/viz.py:1124
+msgid "Chart Options"
+msgstr ""
+
+#: caravel/viz.py:546
 msgid "Calender Heatmap"
 msgstr ""
 
-#: caravel/viz.py:622
+#: caravel/viz.py:617
 msgid "Box Plot"
 msgstr ""
 
-#: caravel/viz.py:729
+#: caravel/viz.py:724
 msgid "Bubble Chart"
 msgstr ""
 
-#: caravel/viz.py:797
+#: caravel/viz.py:792
 msgid "Big Number with Trendline"
 msgstr ""
 
-#: caravel/viz.py:847
+#: caravel/viz.py:842
 msgid "Big Number"
 msgstr ""
 
-#: caravel/viz.py:893
+#: caravel/viz.py:888
 msgid "Time Series - Line Chart"
 msgstr ""
 
-#: caravel/viz.py:1045
+#: caravel/viz.py:907
+msgid "Advanced Analytics"
+msgstr ""
+
+#: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1063
+#: caravel/viz.py:1058
 msgid "Time Series - Percent Change"
 msgstr ""
 
-#: caravel/viz.py:1071
+#: caravel/viz.py:1066
 msgid "Time Series - Stacked"
 msgstr ""
 
-#: caravel/viz.py:1090
+#: caravel/viz.py:1085
 msgid "Distribution - NVD3 - Pie Chart"
 msgstr ""
 
-#: caravel/viz.py:1126
+#: caravel/viz.py:1121
 msgid "Distribution - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1206
+#: caravel/viz.py:1139
+msgid "Breakdowns"
+msgstr ""
+
+#: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
 
-#: caravel/viz.py:1272
+#: caravel/viz.py:1216
+msgid "Primary Metric"
+msgstr ""
+
+#: caravel/viz.py:1217
+msgid "The primary metric is used to define the arc segment sizes"
+msgstr ""
+
+#: caravel/viz.py:1223
+msgid ""
+"This secondary metric is used to define the color as a ratio against the "
+"primary metric. If the two metrics match, color is mapped level groups"
+msgstr ""
+
+#: caravel/viz.py:1229
+msgid "Hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1230
+msgid "This defines the level of the hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1267
 msgid "Sankey"
 msgstr ""
 
-#: caravel/viz.py:1336
+#: caravel/viz.py:1280 caravel/viz.py:1350
+msgid "Source / Target"
+msgstr ""
+
+#: caravel/viz.py:1281 caravel/viz.py:1351
+msgid "Choose a source and a target"
+msgstr ""
+
+#: caravel/viz.py:1331
 msgid "Directed Force Layout"
 msgstr ""
 
-#: caravel/viz.py:1378
+#: caravel/viz.py:1342
+msgid "Force Layout"
+msgstr ""
+
+#: caravel/viz.py:1373
 msgid "World Map"
 msgstr ""
 
-#: caravel/viz.py:1452
+#: caravel/viz.py:1384
+msgid "Bubbles"
+msgstr ""
+
+#: caravel/viz.py:1393
+msgid "Country Field"
+msgstr ""
+
+#: caravel/viz.py:1394
+msgid "3 letter code of the country"
+msgstr ""
+
+#: caravel/viz.py:1397
+msgid "Metric for color"
+msgstr ""
+
+#: caravel/viz.py:1398
+msgid "Metric that defines the color of the country"
+msgstr ""
+
+#: caravel/viz.py:1401
+msgid "Bubble size"
+msgstr ""
+
+#: caravel/viz.py:1402
+msgid "Metric that defines the size of the bubble"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:137
+#: caravel/templates/caravel/explore.html:137 caravel/viz.py:1447
 msgid "Filters"
 msgstr ""
 
-#: caravel/viz.py:1500
+#: caravel/viz.py:1459
+msgid "Filter fields"
+msgstr ""
+
+#: caravel/viz.py:1460
+msgid "The fields you want to filter on"
+msgstr ""
+
+#: caravel/viz.py:1495
 msgid "iFrame"
 msgstr ""
 
-#: caravel/viz.py:1518
+#: caravel/viz.py:1513
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: caravel/viz.py:1554
+#: caravel/viz.py:1549
 msgid "Heatmap"
 msgstr ""
 
-#: caravel/viz.py:1622
+#: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar.html:24
+#: caravel/templates/appbuilder/navbar.html:24
+msgid "Documentation"
+msgstr ""
+
+#: caravel/foo/templates/appbuilder/navbar_right.html:34
 #: caravel/templates/appbuilder/navbar_right.html:34
 msgid "Profile"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:35
 #: caravel/templates/appbuilder/navbar_right.html:35
 msgid "Logout"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:40
 #: caravel/templates/appbuilder/navbar_right.html:40
 msgid "Login"
 msgstr ""
 
+#: caravel/foo/templates/caravel/explore.html:58
+#: caravel/templates/caravel/explore.html:58
+msgid "Force refresh"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:63
+#: caravel/templates/caravel/explore.html:63
+msgid "Short URL"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:65
+#: caravel/templates/caravel/explore.html:65
+msgid "Standalone version, use to embed anywhere"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:68
+#: caravel/templates/caravel/explore.html:68
+msgid "Export to .json"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:72
+#: caravel/templates/caravel/explore.html:72
+msgid "Export to .csv format"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:75
+#: caravel/templates/caravel/explore.html:75
+msgid "0 sec"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:77
+#: caravel/templates/caravel/explore.html:77
+msgid "query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:86
+#: caravel/foo/templates/caravel/explore.html:192
+#: caravel/templates/caravel/explore.html:86
+#: caravel/templates/caravel/explore.html:192
+msgid "Query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:90
+#: caravel/templates/caravel/explore.html:90
+msgid "Overwrite"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:94
+#: caravel/templates/caravel/explore.html:94
+msgid "Save as"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:140
+#: caravel/templates/caravel/explore.html:140
+msgid "Filters are defined using comma delimited strings as in 'US,FR,Other'"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:158
+#: caravel/templates/caravel/explore.html:158
+msgid "Add filter"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:198
+#: caravel/foo/templates/caravel/explore.html:216
+#: caravel/templates/caravel/explore.html:198
+#: caravel/templates/caravel/explore.html:216
+msgid "Close"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:210
+#: caravel/templates/caravel/explore.html:210
+msgid "Datasource Description"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:11
+#: caravel/templates/caravel/sql.html:11
+msgid "Run!"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:12
+#: caravel/templates/caravel/sql.html:12
+msgid "Create View"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:8
+#: caravel/foo/templates/caravel/welcome.html:13
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:13
 msgid "Welcome!"
 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 ""
+
+#~ 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 f7556c9c1188c..767b253cdd1bd 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-05-20 20:30-0700\n"
+"POT-Creation-Date: 2016-06-08 12:20+0200\n"
 "PO-Revision-Date: 2016-05-01 23:07-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -18,443 +18,1293 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: caravel/models.py:607
+#: caravel/forms.py:135
+msgid "Viz"
+msgstr ""
+
+#: caravel/forms.py:138
+msgid "The type of visualization to display"
+msgstr ""
+
+#: caravel/forms.py:141
+msgid "Metrics"
+msgstr ""
+
+#: caravel/forms.py:144
+msgid "One or many metrics to display"
+msgstr ""
+
+#: caravel/forms.py:147 caravel/views.py:226 caravel/views.py:255
+msgid "Metric"
+msgstr ""
+
+#: caravel/forms.py:150
+msgid "Choose the metric"
+msgstr ""
+
+#: caravel/forms.py:153
+msgid "Chart Style"
+msgstr ""
+
+#: caravel/forms.py:159
+msgid "Color Scheme"
+msgstr ""
+
+#: caravel/forms.py:167
+msgid "Normalize Across"
+msgstr ""
+
+#: caravel/forms.py:171
+msgid ""
+"Color will be rendered based on a ratio of the cell against the sum of "
+"across this criteria"
+msgstr ""
+
+#: caravel/forms.py:177
+msgid "Color Scale"
+msgstr ""
+
+#: caravel/forms.py:180
+msgid "Defines how the color are attributed."
+msgstr ""
+
+#: caravel/forms.py:183
+msgid "Rendering"
+msgstr ""
+
+#: caravel/forms.py:185
+msgid "pixelated (Sharp)"
+msgstr ""
+
+#: caravel/forms.py:186
+msgid "auto (Smooth)"
+msgstr ""
+
+#: caravel/forms.py:189
+msgid ""
+"image-rendering CSS attribute of the canvas object that defines how the "
+"browser scales up the image"
+msgstr ""
+
+#: caravel/forms.py:194
+msgid "XScale Interval"
+msgstr ""
+
+#: caravel/forms.py:197
+msgid "Number of step to take between ticks when printing the x scale"
+msgstr ""
+
+#: caravel/forms.py:202
+msgid "YScale Interval"
+msgstr ""
+
+#: caravel/forms.py:205
+msgid "Number of step to take between ticks when printing the y scale"
+msgstr ""
+
+#: caravel/forms.py:210
+msgid "Stacked Bars"
+msgstr ""
+
+#: caravel/forms.py:215
+msgid "Include Series"
+msgstr ""
+
+#: caravel/forms.py:217
+msgid "Include series name as an axis"
+msgstr ""
+
+#: caravel/forms.py:220
+msgid "Color Metric"
+msgstr ""
+
+#: caravel/forms.py:223
+msgid "A metric to use for color"
+msgstr ""
+
+#: caravel/forms.py:226
+msgid "Country Field Type"
+msgstr ""
+
+#: caravel/forms.py:229
+msgid "Full name"
+msgstr ""
+
+#: caravel/forms.py:230
+msgid "code International Olympic Committee (cioc)"
+msgstr ""
+
+#: caravel/forms.py:231
+msgid "code ISO 3166-1 alpha-2 (cca2)"
+msgstr ""
+
+#: caravel/forms.py:232
+msgid "code ISO 3166-1 alpha-3 (cca3)"
+msgstr ""
+
+#: caravel/forms.py:234
+msgid ""
+"The country code standard that Caravel should expect to find in the "
+"[country] column"
+msgstr ""
+
+#: caravel/forms.py:239
+msgid "Group by"
+msgstr ""
+
+#: caravel/forms.py:241
+msgid "One or many fields to group by"
+msgstr ""
+
+#: caravel/forms.py:244 caravel/forms.py:249
+msgid "Columns"
+msgstr ""
+
+#: caravel/forms.py:246
+msgid "One or many fields to pivot as columns"
+msgstr ""
+
+#: caravel/forms.py:251 caravel/forms.py:256 caravel/forms.py:261
+msgid "Columns to display"
+msgstr ""
+
+#: caravel/forms.py:254
+msgid "X"
+msgstr ""
+
+#: caravel/forms.py:259
+msgid "Y"
+msgstr ""
+
+#: caravel/forms.py:264
+msgid "Origin"
+msgstr ""
+
+#: caravel/forms.py:266
+msgid "default"
+msgstr ""
+
+#: caravel/forms.py:267
+msgid "now"
+msgstr ""
+
+#: caravel/forms.py:270
+msgid ""
+"Defines the origin where time buckets start, accepts natural dates as in "
+"'now', 'sunday' or '1970-01-01'"
+msgstr ""
+
+#: caravel/forms.py:275
+msgid "Time Granularity"
+msgstr ""
+
+#: caravel/forms.py:288
+msgid ""
+"The time granularity for the visualization. Note that you can type and "
+"use simple natural language as in '10 seconds', '1 day' or '56 weeks'"
+msgstr ""
+
+#: caravel/forms.py:294
+msgid "Domain"
+msgstr ""
+
+#: caravel/forms.py:303
+msgid "The time unit used for the grouping of blocks"
+msgstr ""
+
+#: caravel/forms.py:307
+msgid "Subdomain"
+msgstr ""
+
+#: caravel/forms.py:316
+msgid ""
+"The time unit for each block. Should be a smaller unit than "
+"domain_granularity. Should be larger or equal to Time Grain"
+msgstr ""
+
+#: caravel/forms.py:321
+msgid "Link Length"
+msgstr ""
+
+#: caravel/forms.py:333
+msgid "Link length in the force layout"
+msgstr ""
+
+#: caravel/forms.py:336
+msgid "Charge"
+msgstr ""
+
+#: caravel/forms.py:350
+msgid "Charge in the force layout"
+msgstr ""
+
+#: caravel/forms.py:353
+msgid "Time Column"
+msgstr ""
+
+#: caravel/forms.py:356
+msgid ""
+"The time column for the visualization. Note that you can define arbitrary"
+" expression that return a DATETIME column in the table editor. Also note "
+"that the filter bellow is applied against this column or expression"
+msgstr ""
+
+#: caravel/forms.py:364
+msgid "Resample Rule"
+msgstr ""
+
+#: caravel/forms.py:367
+msgid "Pandas resample rule"
+msgstr ""
+
+#: caravel/forms.py:370
+msgid "Resample How"
+msgstr ""
+
+#: caravel/forms.py:373
+msgid "Pandas resample how"
+msgstr ""
+
+#: caravel/forms.py:376
+msgid "Resample Fill Method"
+msgstr ""
+
+#: caravel/forms.py:379
+msgid "Pandas resample fill method"
+msgstr ""
+
+#: caravel/forms.py:382
+msgid "Since"
+msgstr ""
+
+#: caravel/forms.py:393
+msgid ""
+"Timestamp from filter. This supports free form typing and natural "
+"language as in '1 day ago', '28 days' or '3 years'"
+msgstr ""
+
+#: caravel/forms.py:398
+msgid "Until"
+msgstr ""
+
+#: caravel/forms.py:409
+msgid "Max Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:422
+msgid "Whisker/outlier options"
+msgstr ""
+
+#: caravel/forms.py:424
+msgid "Determines how whiskers and outliers are calculated."
+msgstr ""
+
+#: caravel/forms.py:434
+msgid "Ratio"
+msgstr ""
+
+#: caravel/forms.py:436
+msgid "Target aspect ratio for treemap tiles."
+msgstr ""
+
+#: caravel/forms.py:439
+msgid "Number format"
+msgstr ""
+
+#: caravel/forms.py:449
+msgid ""
+"D3 format syntax for numbers https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:454
+msgid "Row limit"
+msgstr ""
+
+#: caravel/forms.py:460
+msgid "Series limit"
+msgstr ""
+
+#: caravel/forms.py:463
+msgid "Limits the number of time series that get displayed"
+msgstr ""
+
+#: caravel/forms.py:467
+msgid "Rolling"
+msgstr ""
+
+#: caravel/forms.py:470
+msgid ""
+"Defines a rolling window function to apply, works along with the "
+"[Periods] text box"
+msgstr ""
+
+#: caravel/forms.py:475
+msgid "Periods"
+msgstr ""
+
+#: caravel/forms.py:477
+msgid ""
+"Defines the size of the rolling window function, relative to the time "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:482 caravel/viz.py:1136
+msgid "Series"
+msgstr ""
+
+#: caravel/forms.py:485
+msgid ""
+"Defines the grouping of entities. Each serie is shown as a specific color"
+" on the chart and has a legend toggle"
+msgstr ""
+
+#: caravel/forms.py:491
+msgid "Entity"
+msgstr ""
+
+#: caravel/forms.py:494
+msgid "This define the element to be plotted on the chart"
+msgstr ""
+
+#: caravel/forms.py:497
+msgid "X Axis"
+msgstr ""
+
+#: caravel/forms.py:500
+msgid "Metric assigned to the [X] axis"
+msgstr ""
+
+#: caravel/forms.py:503
+msgid "Y Axis"
+msgstr ""
+
+#: caravel/forms.py:506
+msgid "Metric assigned to the [Y] axis"
+msgstr ""
+
+#: caravel/forms.py:509
+msgid "Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:514
+msgid "URL"
+msgstr ""
+
+#: caravel/forms.py:515
+msgid ""
+"The URL, this field is templated, so you can integrate {{ width }} and/or"
+" {{ height }} in your URL string."
+msgstr ""
+
+#: caravel/forms.py:522
+msgid "Custom WHERE clause"
+msgstr ""
+
+#: caravel/forms.py:524
+msgid ""
+"The text in this box gets included in your query's WHERE clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:531
+msgid "Custom HAVING clause"
+msgstr ""
+
+#: caravel/forms.py:533
+msgid ""
+"The text in this box gets included in your query's HAVING clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:540
+msgid "Comparison Period Lag"
+msgstr ""
+
+#: caravel/forms.py:541
+msgid "Based on granularity, number of time periods to compare against"
+msgstr ""
+
+#: caravel/forms.py:546
+msgid "Comparison suffix"
+msgstr ""
+
+#: caravel/forms.py:547
+msgid "Suffix to apply after the percentage display"
+msgstr ""
+
+#: caravel/forms.py:550
+msgid "Table Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:553
+msgid "Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:556
+msgid "Series Height"
+msgstr ""
+
+#: caravel/forms.py:559
+msgid "Pixel height of each series"
+msgstr ""
+
+#: caravel/forms.py:562
+msgid "X axis format"
+msgstr ""
+
+#: caravel/forms.py:565 caravel/forms.py:580
+msgid ""
+"D3 format syntax for y axis https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:570
+msgid "Y axis format"
+msgstr ""
+
+#: caravel/forms.py:585
+msgid "Markup Type"
+msgstr ""
+
+#: caravel/forms.py:588
+msgid "Pick your favorite markup language"
+msgstr ""
+
+#: caravel/forms.py:591
+msgid "Rotation"
+msgstr ""
+
+#: caravel/forms.py:594
+msgid "Rotation to apply to words in the cloud"
+msgstr ""
+
+#: caravel/forms.py:597
+msgid "Line Style"
+msgstr ""
+
+#: caravel/forms.py:602
+msgid "Line interpolation as defined by d3.js"
+msgstr ""
+
+#: caravel/forms.py:605
+msgid "Code"
+msgstr ""
+
+#: caravel/forms.py:606
+msgid "Put your code here"
+msgstr ""
+
+#: caravel/forms.py:610
+msgid "Aggregation function"
+msgstr ""
+
+#: caravel/forms.py:614
+msgid ""
+"Aggregate function to apply when pivoting and computing the total rows "
+"and columns"
+msgstr ""
+
+#: caravel/forms.py:619
+msgid "Font Size From"
+msgstr ""
+
+#: caravel/forms.py:621
+msgid "Font size for the smallest value in the list"
+msgstr ""
+
+#: caravel/forms.py:624
+msgid "Font Size To"
+msgstr ""
+
+#: caravel/forms.py:626
+msgid "Font size for the biggest value in the list"
+msgstr ""
+
+#: caravel/forms.py:629
+msgid "Range Filter"
+msgstr ""
+
+#: caravel/forms.py:631
+msgid "Whether to display the time range interactive selector"
+msgstr ""
+
+#: caravel/forms.py:635
+msgid "Data Table"
+msgstr ""
+
+#: caravel/forms.py:637
+msgid "Whether to display the interactive data table"
+msgstr ""
+
+#: caravel/forms.py:640
+msgid "Search Box"
+msgstr ""
+
+#: caravel/forms.py:642
+msgid "Whether to include a client side search box"
+msgstr ""
+
+#: caravel/forms.py:646
+msgid "Show Bubbles"
+msgstr ""
+
+#: caravel/forms.py:648
+msgid "Whether to display bubbles on top of countries"
+msgstr ""
+
+#: caravel/forms.py:652
+msgid "Legend"
+msgstr ""
+
+#: caravel/forms.py:654
+msgid "Whether to display the legend (toggles)"
+msgstr ""
+
+#: caravel/forms.py:657
+msgid "X bounds"
+msgstr ""
+
+#: caravel/forms.py:659
+msgid "Whether to display the min and max values of the X axis"
+msgstr ""
+
+#: caravel/forms.py:663
+msgid "Rich Tooltip"
+msgstr ""
+
+#: caravel/forms.py:665
+msgid "The rich tooltip shows a list of all series for that point in time"
+msgstr ""
+
+#: caravel/forms.py:670
+msgid "Y Axis Zero"
+msgstr ""
+
+#: caravel/forms.py:672
+msgid "Force the Y axis to start at 0 instead of the minimum value"
+msgstr ""
+
+#: caravel/forms.py:677
+msgid "Y Log"
+msgstr ""
+
+#: caravel/forms.py:679
+msgid "Use a log scale for the Y axis"
+msgstr ""
+
+#: caravel/forms.py:682
+msgid "X Log"
+msgstr ""
+
+#: caravel/forms.py:684
+msgid "Use a log scale for the X axis"
+msgstr ""
+
+#: caravel/forms.py:687
+msgid "Donut"
+msgstr ""
+
+#: caravel/forms.py:689
+msgid "Do you want a donut or a pie?"
+msgstr ""
+
+#: caravel/forms.py:692
+msgid "Contribution"
+msgstr ""
+
+#: caravel/forms.py:694
+msgid "Compute the contribution to the total"
+msgstr ""
+
+#: caravel/forms.py:697
+msgid "Period Ratio"
+msgstr ""
+
+#: caravel/forms.py:700
+msgid ""
+"[integer] Number of period to compare against, this is relative to the "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:705
+msgid "Time Shift"
+msgstr ""
+
+#: caravel/forms.py:707
+msgid ""
+"Overlay a timeseries from a relative time period. Expects relative time "
+"delta in natural language (example:  24 hours, 7 days, 56 weeks, 365 days"
+msgstr ""
+
+#: caravel/forms.py:714
+msgid "Subheader"
+msgstr ""
+
+#: caravel/forms.py:715
+msgid "Description text that shows up below your Big Number"
+msgstr ""
+
+#: caravel/forms.py:778
+msgid "SQL"
+msgstr ""
+
+#: caravel/forms.py:780
+msgid "This section exposes ways to include snippets of SQL in your query"
+msgstr ""
+
+#: caravel/forms.py:790
+msgid "Time Grain"
+msgstr ""
+
+#: caravel/forms.py:793
+msgid ""
+"The time granularity for the visualization. This applies a date "
+"transformation to alter your time column and defines a new time "
+"granularity.The options here are defined on a per database engine basis "
+"in the Caravel source code"
+msgstr ""
+
+#: caravel/forms.py:829
+msgid "Time"
+msgstr ""
+
+#: caravel/forms.py:834
+msgid "Time related form attributes"
+msgstr ""
+
+#: caravel/models.py:615
 msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
 msgstr ""
 
-#: caravel/models.py:1243
+#: caravel/models.py:1255
 msgid "No data was returned."
 msgstr ""
 
-#: caravel/views.py:124
+#: 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 ""
 
-#: caravel/views.py:133 caravel/views.py:161
+#: caravel/views.py:167 caravel/views.py:195
 msgid "Column"
 msgstr "Colonne"
 
-#: caravel/views.py:134 caravel/views.py:194 caravel/views.py:223
+#: caravel/views.py:168 caravel/views.py:228 caravel/views.py:257
 msgid "Verbose Name"
 msgstr "Nom Complet"
 
-#: caravel/views.py:135 caravel/views.py:193 caravel/views.py:222
-#: caravel/views.py:400 caravel/views.py:535
+#: caravel/views.py:169 caravel/views.py:227 caravel/views.py:256
+#: caravel/views.py:440 caravel/views.py:581
 msgid "Description"
 msgstr ""
 
-#: caravel/views.py:136 caravel/views.py:164
+#: caravel/views.py:170 caravel/views.py:198
 msgid "Groupable"
 msgstr ""
 
-#: caravel/views.py:137 caravel/views.py:165
+#: caravel/views.py:171 caravel/views.py:199
 msgid "Filterable"
 msgstr "Filtrable"
 
-#: caravel/views.py:138 caravel/views.py:197 caravel/views.py:308
-#: caravel/views.py:406
+#: caravel/views.py:172 caravel/views.py:231 caravel/views.py:343
+#: caravel/views.py:446
 msgid "Table"
 msgstr ""
 
-#: caravel/views.py:139 caravel/views.py:166
+#: caravel/views.py:173 caravel/views.py:200
 msgid "Count Distinct"
 msgstr ""
 
-#: caravel/views.py:140 caravel/views.py:167
+#: caravel/views.py:174 caravel/views.py:201
 msgid "Sum"
 msgstr "Somme"
 
-#: caravel/views.py:141 caravel/views.py:168
+#: caravel/views.py:175 caravel/views.py:202
 msgid "Min"
 msgstr ""
 
-#: caravel/views.py:142 caravel/views.py:169
+#: caravel/views.py:176 caravel/views.py:203
 msgid "Max"
 msgstr ""
 
-#: caravel/views.py:143
+#: caravel/views.py:177
 msgid "Expression"
 msgstr ""
 
-#: caravel/views.py:144
+#: caravel/views.py:178
 msgid "Is temporal"
 msgstr "Est temporel"
 
-#: caravel/views.py:162 caravel/views.py:195 caravel/views.py:224
-#: caravel/views.py:424
+#: caravel/views.py:196 caravel/views.py:229 caravel/views.py:258
+#: caravel/views.py:468
 msgid "Type"
 msgstr ""
 
-#: caravel/views.py:163 caravel/views.py:399
+#: caravel/views.py:197 caravel/views.py:439
 msgid "Datasource"
 msgstr "Source de données"
 
-#: caravel/views.py:192 caravel/views.py:221
-msgid "Metric"
-msgstr ""
-
-#: caravel/views.py:196
+#: caravel/views.py:230
 msgid "SQL Expression"
 msgstr ""
 
-#: caravel/views.py:225 caravel/views.py:503
+#: caravel/views.py:259 caravel/views.py:548
 msgid "JSON"
 msgstr ""
 
-#: caravel/views.py:226
+#: caravel/views.py:260
 msgid "Druid Datasource"
 msgstr "Source de données Druid"
 
-#: caravel/views.py:257 caravel/views.py:310
+#: caravel/views.py:291 caravel/views.py:345
 msgid "Database"
 msgstr "Base de données"
 
-#: caravel/views.py:258
+#: caravel/views.py:292
 msgid "SQL link"
 msgstr "Lien SQL"
 
-#: caravel/views.py:259 caravel/views.py:397 caravel/views.py:459
+#: caravel/views.py:293 caravel/views.py:437 caravel/views.py:503
 msgid "Creator"
 msgstr "Createur"
 
-#: caravel/views.py:260 caravel/views.py:311
+#: caravel/views.py:294 caravel/views.py:346
 msgid "Last Changed"
 msgstr "Modifié"
 
-#: caravel/views.py:261
+#: caravel/views.py:295
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: caravel/views.py:262 caravel/views.py:317 caravel/views.py:396
-#: caravel/views.py:541
+#: caravel/views.py:296 caravel/views.py:352 caravel/views.py:436
+#: caravel/views.py:587
 msgid "Cache Timeout"
 msgstr ""
 
-#: caravel/views.py:263
+#: caravel/views.py:297
 msgid "Extra"
 msgstr ""
 
-#: caravel/views.py:279
+#: caravel/views.py:313
 msgid "Databases"
 msgstr "Base de Données"
 
-#: caravel/views.py:281 caravel/views.py:337 caravel/views.py:369
+#: 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 ""
 
-#: caravel/views.py:309
+#: caravel/views.py:344
 msgid "Changed By"
 msgstr ""
 
-#: caravel/views.py:312
+#: caravel/views.py:347
 msgid "SQL Editor"
 msgstr ""
 
-#: caravel/views.py:313 caravel/views.py:537
+#: caravel/views.py:348 caravel/views.py:583
 msgid "Is Featured"
 msgstr ""
 
-#: caravel/views.py:314
+#: caravel/views.py:349
 msgid "Schema"
 msgstr ""
 
-#: caravel/views.py:315 caravel/views.py:539
+#: caravel/views.py:350 caravel/views.py:585
 msgid "Default Endpoint"
 msgstr ""
 
-#: caravel/views.py:316
+#: caravel/views.py:351
 msgid "Offset"
 msgstr ""
 
-#: caravel/views.py:354 caravel/views.py:534
+#: caravel/views.py:373
+msgid "Tables"
+msgstr ""
+
+#: caravel/views.py:392 caravel/views.py:580
 msgid "Cluster"
 msgstr ""
 
-#: caravel/views.py:355
+#: caravel/views.py:393
 msgid "Coordinator Host"
 msgstr ""
 
-#: caravel/views.py:356
+#: caravel/views.py:394
 msgid "Coordinator Port"
 msgstr ""
 
-#: caravel/views.py:357
+#: caravel/views.py:395
 msgid "Coordinator Endpoint"
 msgstr ""
 
-#: caravel/views.py:358
+#: caravel/views.py:396
 msgid "Broker Host"
 msgstr ""
 
-#: caravel/views.py:359
-msgid "Borker Port"
+#: caravel/views.py:397
+msgid "Broker Port"
 msgstr ""
 
-#: caravel/views.py:360
+#: caravel/views.py:398
 msgid "Broker Endpoint"
 msgstr ""
 
-#: caravel/views.py:398 caravel/views.py:479
+#: caravel/views.py:406
+msgid "Druid Clusters"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:25
+#: caravel/templates/caravel/welcome.html:25 caravel/views.py:438
+#: caravel/views.py:524
 msgid "Dashboards"
 msgstr ""
 
-#: caravel/views.py:401
+#: caravel/views.py:441
 msgid "Last Modified"
 msgstr ""
 
-#: caravel/views.py:402 caravel/views.py:458
+#: caravel/views.py:442 caravel/views.py:502
 msgid "Owners"
 msgstr ""
 
-#: caravel/views.py:403
+#: caravel/views.py:443
 msgid "Parameters"
 msgstr ""
 
-#: caravel/views.py:404 caravel/views.py:425
+#: caravel/views.py:444 caravel/views.py:469
 msgid "Slice"
 msgstr "Graphique"
 
-#: caravel/views.py:405
+#: caravel/views.py:445
 msgid "Name"
 msgstr "Nom"
 
-#: caravel/views.py:407 caravel/views.py:426
+#: caravel/views.py:447 caravel/views.py:470
 msgid "Visualization Type"
 msgstr "Type de visualization"
 
-#: caravel/views.py:441
+#: 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"
+
+#: 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 ""
 
-#: caravel/views.py:446
+#: 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 ""
 
-#: caravel/views.py:450
+#: caravel/views.py:494
 msgid "To get a readable URL for your dashboard"
 msgstr ""
 
-#: caravel/views.py:454
+#: caravel/views.py:498
 msgid "Dashboard"
 msgstr "Tableau de Bord"
 
-#: caravel/views.py:455
+#: caravel/views.py:499
 msgid "Title"
 msgstr "Titre"
 
-#: caravel/views.py:456
+#: caravel/views.py:500
 msgid "Slug"
 msgstr ""
 
-#: caravel/views.py:457
-msgid "Slices"
-msgstr "Graphiques"
-
-#: caravel/views.py:460
+#: caravel/views.py:504
 msgid "Modified"
 msgstr "Modifié"
 
-#: caravel/views.py:461
+#: caravel/views.py:505
 msgid "Position JSON"
 msgstr ""
 
-#: caravel/views.py:462
+#: caravel/views.py:506
 msgid "CSS"
 msgstr ""
 
-#: caravel/views.py:463
+#: caravel/views.py:507
 msgid "JSON Metadata"
 msgstr ""
 
-#: caravel/views.py:500
+#: caravel/views.py:545
 msgid "User"
 msgstr "Utilisateur"
 
-#: caravel/views.py:501
+#: caravel/views.py:546
 msgid "Action"
 msgstr ""
 
-#: caravel/views.py:502
+#: caravel/views.py:547
 msgid "dttm"
 msgstr ""
 
-#: caravel/views.py:509
+#: caravel/views.py:554
 msgid "Action Log"
 msgstr ""
 
-#: caravel/views.py:510
+#: caravel/views.py:556
 msgid "Security"
 msgstr "Securité"
 
-#: caravel/views.py:527
+#: caravel/views.py:573
 msgid "Timezone offset (in hours) for this datasource"
 msgstr ""
 
-#: caravel/views.py:533
+#: caravel/views.py:579
 msgid "Data Source"
 msgstr "Source de Données"
 
-#: caravel/views.py:536
+#: caravel/views.py:582
 msgid "Owner"
 msgstr "Propriétair"
 
-#: caravel/views.py:538
+#: caravel/views.py:584
 msgid "Is Hidden"
 msgstr "Caché"
 
-#: caravel/views.py:540
+#: caravel/views.py:586
 msgid "Time Offset"
 msgstr ""
 
-#: caravel/views.py:555
+#: caravel/views.py:601
 msgid "Druid Datasources"
 msgstr "Source de données Druid"
 
-#: caravel/views.py:639
-msgid "The datasource seems to have been deleted"
-msgstr "Cette source semble seche"
-
-#: caravel/views.py:647
-msgid "You don't seem to have access to this datasource"
-msgstr "Vous n'avez pas acces a cette source de donnees"
-
-#: caravel/views.py:970
+#: caravel/views.py:1016
 msgid "This view requires the `all_datasource_access` permission"
 msgstr ""
 
-#: caravel/views.py:1081
+#: caravel/views.py:1113
 msgid "CSS Templates"
 msgstr ""
 
-#: caravel/viz.py:324
+#: caravel/viz.py:314
 msgid "Table View"
 msgstr ""
 
-#: caravel/viz.py:385
+#: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
 
-#: caravel/viz.py:447
+#: caravel/viz.py:442
 msgid "Markup"
 msgstr ""
 
-#: caravel/viz.py:475
+#: caravel/viz.py:470
 msgid "Word Cloud"
 msgstr "Nuage de Mots"
 
-#: caravel/viz.py:507
+#: caravel/viz.py:502
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:551
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
+#: caravel/viz.py:1069 caravel/viz.py:1124
+msgid "Chart Options"
+msgstr ""
+
+#: caravel/viz.py:546
 msgid "Calender Heatmap"
 msgstr ""
 
-#: caravel/viz.py:622
+#: caravel/viz.py:617
 msgid "Box Plot"
 msgstr ""
 
-#: caravel/viz.py:729
+#: caravel/viz.py:724
 msgid "Bubble Chart"
 msgstr "Graphique en Bulles"
 
-#: caravel/viz.py:797
+#: caravel/viz.py:792
 msgid "Big Number with Trendline"
 msgstr ""
 
-#: caravel/viz.py:847
+#: caravel/viz.py:842
 msgid "Big Number"
 msgstr "Gros Chiffre"
 
-#: caravel/viz.py:893
+#: caravel/viz.py:888
 msgid "Time Series - Line Chart"
 msgstr ""
 
-#: caravel/viz.py:1045
+#: caravel/viz.py:907
+msgid "Advanced Analytics"
+msgstr ""
+
+#: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1063
+#: caravel/viz.py:1058
 msgid "Time Series - Percent Change"
 msgstr ""
 
-#: caravel/viz.py:1071
+#: caravel/viz.py:1066
 msgid "Time Series - Stacked"
 msgstr ""
 
-#: caravel/viz.py:1090
+#: caravel/viz.py:1085
 msgid "Distribution - NVD3 - Pie Chart"
 msgstr ""
 
-#: caravel/viz.py:1126
+#: caravel/viz.py:1121
 msgid "Distribution - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1206
+#: caravel/viz.py:1139
+msgid "Breakdowns"
+msgstr ""
+
+#: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
 
-#: caravel/viz.py:1272
+#: caravel/viz.py:1216
+msgid "Primary Metric"
+msgstr ""
+
+#: caravel/viz.py:1217
+msgid "The primary metric is used to define the arc segment sizes"
+msgstr ""
+
+#: caravel/viz.py:1223
+msgid ""
+"This secondary metric is used to define the color as a ratio against the "
+"primary metric. If the two metrics match, color is mapped level groups"
+msgstr ""
+
+#: caravel/viz.py:1229
+msgid "Hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1230
+msgid "This defines the level of the hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1267
 msgid "Sankey"
 msgstr ""
 
-#: caravel/viz.py:1336
+#: caravel/viz.py:1280 caravel/viz.py:1350
+msgid "Source / Target"
+msgstr ""
+
+#: caravel/viz.py:1281 caravel/viz.py:1351
+msgid "Choose a source and a target"
+msgstr ""
+
+#: caravel/viz.py:1331
 msgid "Directed Force Layout"
 msgstr ""
 
-#: caravel/viz.py:1378
+#: caravel/viz.py:1342
+msgid "Force Layout"
+msgstr ""
+
+#: caravel/viz.py:1373
 msgid "World Map"
 msgstr "Carte du monde"
 
-#: caravel/viz.py:1452
+#: caravel/viz.py:1384
+msgid "Bubbles"
+msgstr ""
+
+#: caravel/viz.py:1393
+msgid "Country Field"
+msgstr ""
+
+#: caravel/viz.py:1394
+msgid "3 letter code of the country"
+msgstr ""
+
+#: caravel/viz.py:1397
+msgid "Metric for color"
+msgstr ""
+
+#: caravel/viz.py:1398
+msgid "Metric that defines the color of the country"
+msgstr ""
+
+#: caravel/viz.py:1401
+msgid "Bubble size"
+msgstr ""
+
+#: caravel/viz.py:1402
+msgid "Metric that defines the size of the bubble"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:137
+#: caravel/templates/caravel/explore.html:137 caravel/viz.py:1447
 msgid "Filters"
 msgstr "Filtres"
 
-#: caravel/viz.py:1500
+#: caravel/viz.py:1459
+msgid "Filter fields"
+msgstr ""
+
+#: caravel/viz.py:1460
+msgid "The fields you want to filter on"
+msgstr ""
+
+#: caravel/viz.py:1495
 msgid "iFrame"
 msgstr ""
 
-#: caravel/viz.py:1518
+#: caravel/viz.py:1513
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: caravel/viz.py:1554
+#: caravel/viz.py:1549
 msgid "Heatmap"
 msgstr ""
 
-#: caravel/viz.py:1622
+#: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar.html:24
+#: caravel/templates/appbuilder/navbar.html:24
+msgid "Documentation"
+msgstr ""
+
+#: caravel/foo/templates/appbuilder/navbar_right.html:34
 #: caravel/templates/appbuilder/navbar_right.html:34
 msgid "Profile"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:35
 #: caravel/templates/appbuilder/navbar_right.html:35
 msgid "Logout"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:40
 #: caravel/templates/appbuilder/navbar_right.html:40
 msgid "Login"
 msgstr ""
 
+#: caravel/foo/templates/caravel/explore.html:58
+#: caravel/templates/caravel/explore.html:58
+msgid "Force refresh"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:63
+#: caravel/templates/caravel/explore.html:63
+msgid "Short URL"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:65
+#: caravel/templates/caravel/explore.html:65
+msgid "Standalone version, use to embed anywhere"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:68
+#: caravel/templates/caravel/explore.html:68
+msgid "Export to .json"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:72
+#: caravel/templates/caravel/explore.html:72
+msgid "Export to .csv format"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:75
+#: caravel/templates/caravel/explore.html:75
+msgid "0 sec"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:77
+#: caravel/templates/caravel/explore.html:77
+msgid "query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:86
+#: caravel/foo/templates/caravel/explore.html:192
+#: caravel/templates/caravel/explore.html:86
+#: caravel/templates/caravel/explore.html:192
+msgid "Query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:90
+#: caravel/templates/caravel/explore.html:90
+msgid "Overwrite"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:94
+#: caravel/templates/caravel/explore.html:94
+msgid "Save as"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:140
+#: caravel/templates/caravel/explore.html:140
+msgid "Filters are defined using comma delimited strings as in 'US,FR,Other'"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:158
+#: caravel/templates/caravel/explore.html:158
+msgid "Add filter"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:198
+#: caravel/foo/templates/caravel/explore.html:216
+#: caravel/templates/caravel/explore.html:198
+#: caravel/templates/caravel/explore.html:216
+msgid "Close"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:210
+#: caravel/templates/caravel/explore.html:210
+msgid "Datasource Description"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:11
+#: caravel/templates/caravel/sql.html:11
+msgid "Run!"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:12
+#: caravel/templates/caravel/sql.html:12
+msgid "Create View"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:8
+#: caravel/foo/templates/caravel/welcome.html:13
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:13
 msgid "Welcome!"
 msgstr "Bienvenue!"
 
+#: 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 e329b6aff4485..51ca4d10a19be 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-05-20 20:30-0700\n"
+"POT-Creation-Date: 2016-06-08 12:20+0200\n"
 "PO-Revision-Date: 2016-05-19 16:43+0200\n"
 "Last-Translator: Riccardo Magliocchetti "
 "<riccardo.magliocchetti@gmail.com>\n"
@@ -19,7 +19,664 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: caravel/models.py:607
+#: caravel/forms.py:135
+msgid "Viz"
+msgstr ""
+
+#: caravel/forms.py:138
+msgid "The type of visualization to display"
+msgstr ""
+
+#: caravel/forms.py:141
+msgid "Metrics"
+msgstr ""
+
+#: caravel/forms.py:144
+msgid "One or many metrics to display"
+msgstr ""
+
+#: caravel/forms.py:147 caravel/views.py:226 caravel/views.py:255
+msgid "Metric"
+msgstr ""
+
+#: caravel/forms.py:150
+msgid "Choose the metric"
+msgstr ""
+
+#: caravel/forms.py:153
+msgid "Chart Style"
+msgstr ""
+
+#: caravel/forms.py:159
+msgid "Color Scheme"
+msgstr ""
+
+#: caravel/forms.py:167
+msgid "Normalize Across"
+msgstr ""
+
+#: caravel/forms.py:171
+msgid ""
+"Color will be rendered based on a ratio of the cell against the sum of "
+"across this criteria"
+msgstr ""
+
+#: caravel/forms.py:177
+msgid "Color Scale"
+msgstr ""
+
+#: caravel/forms.py:180
+msgid "Defines how the color are attributed."
+msgstr ""
+
+#: caravel/forms.py:183
+msgid "Rendering"
+msgstr ""
+
+#: caravel/forms.py:185
+msgid "pixelated (Sharp)"
+msgstr ""
+
+#: caravel/forms.py:186
+msgid "auto (Smooth)"
+msgstr ""
+
+#: caravel/forms.py:189
+msgid ""
+"image-rendering CSS attribute of the canvas object that defines how the "
+"browser scales up the image"
+msgstr ""
+
+#: caravel/forms.py:194
+msgid "XScale Interval"
+msgstr ""
+
+#: caravel/forms.py:197
+msgid "Number of step to take between ticks when printing the x scale"
+msgstr ""
+
+#: caravel/forms.py:202
+msgid "YScale Interval"
+msgstr ""
+
+#: caravel/forms.py:205
+msgid "Number of step to take between ticks when printing the y scale"
+msgstr ""
+
+#: caravel/forms.py:210
+msgid "Stacked Bars"
+msgstr ""
+
+#: caravel/forms.py:215
+msgid "Include Series"
+msgstr ""
+
+#: caravel/forms.py:217
+msgid "Include series name as an axis"
+msgstr ""
+
+#: caravel/forms.py:220
+msgid "Color Metric"
+msgstr ""
+
+#: caravel/forms.py:223
+msgid "A metric to use for color"
+msgstr ""
+
+#: caravel/forms.py:226
+msgid "Country Field Type"
+msgstr ""
+
+#: caravel/forms.py:229
+msgid "Full name"
+msgstr ""
+
+#: caravel/forms.py:230
+msgid "code International Olympic Committee (cioc)"
+msgstr ""
+
+#: caravel/forms.py:231
+msgid "code ISO 3166-1 alpha-2 (cca2)"
+msgstr ""
+
+#: caravel/forms.py:232
+msgid "code ISO 3166-1 alpha-3 (cca3)"
+msgstr ""
+
+#: caravel/forms.py:234
+msgid ""
+"The country code standard that Caravel should expect to find in the "
+"[country] column"
+msgstr ""
+
+#: caravel/forms.py:239
+msgid "Group by"
+msgstr ""
+
+#: caravel/forms.py:241
+msgid "One or many fields to group by"
+msgstr ""
+
+#: caravel/forms.py:244 caravel/forms.py:249
+msgid "Columns"
+msgstr ""
+
+#: caravel/forms.py:246
+msgid "One or many fields to pivot as columns"
+msgstr ""
+
+#: caravel/forms.py:251 caravel/forms.py:256 caravel/forms.py:261
+msgid "Columns to display"
+msgstr ""
+
+#: caravel/forms.py:254
+msgid "X"
+msgstr ""
+
+#: caravel/forms.py:259
+msgid "Y"
+msgstr ""
+
+#: caravel/forms.py:264
+msgid "Origin"
+msgstr ""
+
+#: caravel/forms.py:266
+msgid "default"
+msgstr ""
+
+#: caravel/forms.py:267
+msgid "now"
+msgstr ""
+
+#: caravel/forms.py:270
+msgid ""
+"Defines the origin where time buckets start, accepts natural dates as in "
+"'now', 'sunday' or '1970-01-01'"
+msgstr ""
+
+#: caravel/forms.py:275
+msgid "Time Granularity"
+msgstr ""
+
+#: caravel/forms.py:288
+msgid ""
+"The time granularity for the visualization. Note that you can type and "
+"use simple natural language as in '10 seconds', '1 day' or '56 weeks'"
+msgstr ""
+
+#: caravel/forms.py:294
+msgid "Domain"
+msgstr ""
+
+#: caravel/forms.py:303
+msgid "The time unit used for the grouping of blocks"
+msgstr ""
+
+#: caravel/forms.py:307
+msgid "Subdomain"
+msgstr ""
+
+#: caravel/forms.py:316
+msgid ""
+"The time unit for each block. Should be a smaller unit than "
+"domain_granularity. Should be larger or equal to Time Grain"
+msgstr ""
+
+#: caravel/forms.py:321
+msgid "Link Length"
+msgstr ""
+
+#: caravel/forms.py:333
+msgid "Link length in the force layout"
+msgstr ""
+
+#: caravel/forms.py:336
+msgid "Charge"
+msgstr ""
+
+#: caravel/forms.py:350
+msgid "Charge in the force layout"
+msgstr ""
+
+#: caravel/forms.py:353
+msgid "Time Column"
+msgstr ""
+
+#: caravel/forms.py:356
+msgid ""
+"The time column for the visualization. Note that you can define arbitrary"
+" expression that return a DATETIME column in the table editor. Also note "
+"that the filter bellow is applied against this column or expression"
+msgstr ""
+
+#: caravel/forms.py:364
+msgid "Resample Rule"
+msgstr ""
+
+#: caravel/forms.py:367
+msgid "Pandas resample rule"
+msgstr ""
+
+#: caravel/forms.py:370
+msgid "Resample How"
+msgstr ""
+
+#: caravel/forms.py:373
+msgid "Pandas resample how"
+msgstr ""
+
+#: caravel/forms.py:376
+msgid "Resample Fill Method"
+msgstr ""
+
+#: caravel/forms.py:379
+msgid "Pandas resample fill method"
+msgstr ""
+
+#: caravel/forms.py:382
+msgid "Since"
+msgstr ""
+
+#: caravel/forms.py:393
+msgid ""
+"Timestamp from filter. This supports free form typing and natural "
+"language as in '1 day ago', '28 days' or '3 years'"
+msgstr ""
+
+#: caravel/forms.py:398
+msgid "Until"
+msgstr ""
+
+#: caravel/forms.py:409
+msgid "Max Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:422
+msgid "Whisker/outlier options"
+msgstr ""
+
+#: caravel/forms.py:424
+msgid "Determines how whiskers and outliers are calculated."
+msgstr ""
+
+#: caravel/forms.py:434
+msgid "Ratio"
+msgstr ""
+
+#: caravel/forms.py:436
+msgid "Target aspect ratio for treemap tiles."
+msgstr ""
+
+#: caravel/forms.py:439
+msgid "Number format"
+msgstr ""
+
+#: caravel/forms.py:449
+msgid ""
+"D3 format syntax for numbers https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:454
+msgid "Row limit"
+msgstr ""
+
+#: caravel/forms.py:460
+msgid "Series limit"
+msgstr ""
+
+#: caravel/forms.py:463
+msgid "Limits the number of time series that get displayed"
+msgstr ""
+
+#: caravel/forms.py:467
+msgid "Rolling"
+msgstr ""
+
+#: caravel/forms.py:470
+msgid ""
+"Defines a rolling window function to apply, works along with the "
+"[Periods] text box"
+msgstr ""
+
+#: caravel/forms.py:475
+msgid "Periods"
+msgstr ""
+
+#: caravel/forms.py:477
+msgid ""
+"Defines the size of the rolling window function, relative to the time "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:482 caravel/viz.py:1136
+msgid "Series"
+msgstr ""
+
+#: caravel/forms.py:485
+msgid ""
+"Defines the grouping of entities. Each serie is shown as a specific color"
+" on the chart and has a legend toggle"
+msgstr ""
+
+#: caravel/forms.py:491
+msgid "Entity"
+msgstr ""
+
+#: caravel/forms.py:494
+msgid "This define the element to be plotted on the chart"
+msgstr ""
+
+#: caravel/forms.py:497
+msgid "X Axis"
+msgstr ""
+
+#: caravel/forms.py:500
+msgid "Metric assigned to the [X] axis"
+msgstr ""
+
+#: caravel/forms.py:503
+msgid "Y Axis"
+msgstr ""
+
+#: caravel/forms.py:506
+msgid "Metric assigned to the [Y] axis"
+msgstr ""
+
+#: caravel/forms.py:509
+msgid "Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:514
+msgid "URL"
+msgstr ""
+
+#: caravel/forms.py:515
+msgid ""
+"The URL, this field is templated, so you can integrate {{ width }} and/or"
+" {{ height }} in your URL string."
+msgstr ""
+
+#: caravel/forms.py:522
+msgid "Custom WHERE clause"
+msgstr ""
+
+#: caravel/forms.py:524
+msgid ""
+"The text in this box gets included in your query's WHERE clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:531
+msgid "Custom HAVING clause"
+msgstr ""
+
+#: caravel/forms.py:533
+msgid ""
+"The text in this box gets included in your query's HAVING clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:540
+msgid "Comparison Period Lag"
+msgstr ""
+
+#: caravel/forms.py:541
+msgid "Based on granularity, number of time periods to compare against"
+msgstr ""
+
+#: caravel/forms.py:546
+msgid "Comparison suffix"
+msgstr ""
+
+#: caravel/forms.py:547
+msgid "Suffix to apply after the percentage display"
+msgstr ""
+
+#: caravel/forms.py:550
+msgid "Table Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:553
+msgid "Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:556
+msgid "Series Height"
+msgstr ""
+
+#: caravel/forms.py:559
+msgid "Pixel height of each series"
+msgstr ""
+
+#: caravel/forms.py:562
+msgid "X axis format"
+msgstr ""
+
+#: caravel/forms.py:565 caravel/forms.py:580
+msgid ""
+"D3 format syntax for y axis https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:570
+msgid "Y axis format"
+msgstr ""
+
+#: caravel/forms.py:585
+msgid "Markup Type"
+msgstr ""
+
+#: caravel/forms.py:588
+msgid "Pick your favorite markup language"
+msgstr ""
+
+#: caravel/forms.py:591
+msgid "Rotation"
+msgstr ""
+
+#: caravel/forms.py:594
+msgid "Rotation to apply to words in the cloud"
+msgstr ""
+
+#: caravel/forms.py:597
+msgid "Line Style"
+msgstr ""
+
+#: caravel/forms.py:602
+msgid "Line interpolation as defined by d3.js"
+msgstr ""
+
+#: caravel/forms.py:605
+msgid "Code"
+msgstr ""
+
+#: caravel/forms.py:606
+msgid "Put your code here"
+msgstr ""
+
+#: caravel/forms.py:610
+msgid "Aggregation function"
+msgstr ""
+
+#: caravel/forms.py:614
+msgid ""
+"Aggregate function to apply when pivoting and computing the total rows "
+"and columns"
+msgstr ""
+
+#: caravel/forms.py:619
+msgid "Font Size From"
+msgstr ""
+
+#: caravel/forms.py:621
+msgid "Font size for the smallest value in the list"
+msgstr ""
+
+#: caravel/forms.py:624
+msgid "Font Size To"
+msgstr ""
+
+#: caravel/forms.py:626
+msgid "Font size for the biggest value in the list"
+msgstr ""
+
+#: caravel/forms.py:629
+msgid "Range Filter"
+msgstr ""
+
+#: caravel/forms.py:631
+msgid "Whether to display the time range interactive selector"
+msgstr ""
+
+#: caravel/forms.py:635
+msgid "Data Table"
+msgstr ""
+
+#: caravel/forms.py:637
+msgid "Whether to display the interactive data table"
+msgstr ""
+
+#: caravel/forms.py:640
+msgid "Search Box"
+msgstr ""
+
+#: caravel/forms.py:642
+msgid "Whether to include a client side search box"
+msgstr ""
+
+#: caravel/forms.py:646
+msgid "Show Bubbles"
+msgstr ""
+
+#: caravel/forms.py:648
+msgid "Whether to display bubbles on top of countries"
+msgstr ""
+
+#: caravel/forms.py:652
+msgid "Legend"
+msgstr ""
+
+#: caravel/forms.py:654
+msgid "Whether to display the legend (toggles)"
+msgstr ""
+
+#: caravel/forms.py:657
+msgid "X bounds"
+msgstr ""
+
+#: caravel/forms.py:659
+msgid "Whether to display the min and max values of the X axis"
+msgstr ""
+
+#: caravel/forms.py:663
+msgid "Rich Tooltip"
+msgstr ""
+
+#: caravel/forms.py:665
+msgid "The rich tooltip shows a list of all series for that point in time"
+msgstr ""
+
+#: caravel/forms.py:670
+msgid "Y Axis Zero"
+msgstr ""
+
+#: caravel/forms.py:672
+msgid "Force the Y axis to start at 0 instead of the minimum value"
+msgstr ""
+
+#: caravel/forms.py:677
+msgid "Y Log"
+msgstr ""
+
+#: caravel/forms.py:679
+msgid "Use a log scale for the Y axis"
+msgstr ""
+
+#: caravel/forms.py:682
+msgid "X Log"
+msgstr ""
+
+#: caravel/forms.py:684
+msgid "Use a log scale for the X axis"
+msgstr ""
+
+#: caravel/forms.py:687
+msgid "Donut"
+msgstr ""
+
+#: caravel/forms.py:689
+msgid "Do you want a donut or a pie?"
+msgstr ""
+
+#: caravel/forms.py:692
+msgid "Contribution"
+msgstr ""
+
+#: caravel/forms.py:694
+msgid "Compute the contribution to the total"
+msgstr ""
+
+#: caravel/forms.py:697
+msgid "Period Ratio"
+msgstr ""
+
+#: caravel/forms.py:700
+msgid ""
+"[integer] Number of period to compare against, this is relative to the "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:705
+msgid "Time Shift"
+msgstr ""
+
+#: caravel/forms.py:707
+msgid ""
+"Overlay a timeseries from a relative time period. Expects relative time "
+"delta in natural language (example:  24 hours, 7 days, 56 weeks, 365 days"
+msgstr ""
+
+#: caravel/forms.py:714
+msgid "Subheader"
+msgstr ""
+
+#: caravel/forms.py:715
+msgid "Description text that shows up below your Big Number"
+msgstr ""
+
+#: caravel/forms.py:778
+msgid "SQL"
+msgstr ""
+
+#: caravel/forms.py:780
+msgid "This section exposes ways to include snippets of SQL in your query"
+msgstr ""
+
+#: caravel/forms.py:790
+msgid "Time Grain"
+msgstr ""
+
+#: caravel/forms.py:793
+msgid ""
+"The time granularity for the visualization. This applies a date "
+"transformation to alter your time column and defines a new time "
+"granularity.The options here are defined on a per database engine basis "
+"in the Caravel source code"
+msgstr ""
+
+#: caravel/forms.py:829
+msgid "Time"
+msgstr ""
+
+#: caravel/forms.py:834
+msgid "Time related form attributes"
+msgstr ""
+
+#: caravel/models.py:615
 msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
@@ -27,11 +684,11 @@ msgstr ""
 "La colonna di tipo datetime non è stata fornita nella configurazione "
 "della tabella ma richiesta da questo tipo di grafico"
 
-#: caravel/models.py:1243
+#: caravel/models.py:1255
 msgid "No data was returned."
 msgstr "Nessun dato disponibile."
 
-#: caravel/views.py:124
+#: caravel/views.py:158
 msgid ""
 "Whether to make this column available as a [Time Granularity] option, "
 "column has to be DATETIME or DATETIME-like"
@@ -39,199 +696,212 @@ msgstr ""
 "Rendi questa colonna disponibile come una opzione [Time Granularity], la "
 "colonna deve essere DATATIME o DATETIME-like"
 
-#: caravel/views.py:133 caravel/views.py:161
+#: caravel/views.py:167 caravel/views.py:195
 msgid "Column"
 msgstr ""
 
-#: caravel/views.py:134 caravel/views.py:194 caravel/views.py:223
+#: caravel/views.py:168 caravel/views.py:228 caravel/views.py:257
 msgid "Verbose Name"
 msgstr ""
 
-#: caravel/views.py:135 caravel/views.py:193 caravel/views.py:222
-#: caravel/views.py:400 caravel/views.py:535
+#: caravel/views.py:169 caravel/views.py:227 caravel/views.py:256
+#: caravel/views.py:440 caravel/views.py:581
 msgid "Description"
 msgstr ""
 
-#: caravel/views.py:136 caravel/views.py:164
+#: caravel/views.py:170 caravel/views.py:198
 msgid "Groupable"
 msgstr ""
 
-#: caravel/views.py:137 caravel/views.py:165
+#: caravel/views.py:171 caravel/views.py:199
 msgid "Filterable"
 msgstr ""
 
-#: caravel/views.py:138 caravel/views.py:197 caravel/views.py:308
-#: caravel/views.py:406
+#: caravel/views.py:172 caravel/views.py:231 caravel/views.py:343
+#: caravel/views.py:446
 msgid "Table"
 msgstr ""
 
-#: caravel/views.py:139 caravel/views.py:166
+#: caravel/views.py:173 caravel/views.py:200
 msgid "Count Distinct"
 msgstr ""
 
-#: caravel/views.py:140 caravel/views.py:167
+#: caravel/views.py:174 caravel/views.py:201
 msgid "Sum"
 msgstr ""
 
-#: caravel/views.py:141 caravel/views.py:168
+#: caravel/views.py:175 caravel/views.py:202
 msgid "Min"
 msgstr ""
 
-#: caravel/views.py:142 caravel/views.py:169
+#: caravel/views.py:176 caravel/views.py:203
 msgid "Max"
 msgstr ""
 
-#: caravel/views.py:143
+#: caravel/views.py:177
 msgid "Expression"
 msgstr ""
 
-#: caravel/views.py:144
+#: caravel/views.py:178
 msgid "Is temporal"
 msgstr ""
 
-#: caravel/views.py:162 caravel/views.py:195 caravel/views.py:224
-#: caravel/views.py:424
+#: caravel/views.py:196 caravel/views.py:229 caravel/views.py:258
+#: caravel/views.py:468
 msgid "Type"
 msgstr ""
 
-#: caravel/views.py:163 caravel/views.py:399
+#: caravel/views.py:197 caravel/views.py:439
 msgid "Datasource"
 msgstr ""
 
-#: caravel/views.py:192 caravel/views.py:221
-msgid "Metric"
-msgstr ""
-
-#: caravel/views.py:196
+#: caravel/views.py:230
 msgid "SQL Expression"
 msgstr ""
 
-#: caravel/views.py:225 caravel/views.py:503
+#: caravel/views.py:259 caravel/views.py:548
 msgid "JSON"
 msgstr ""
 
-#: caravel/views.py:226
+#: caravel/views.py:260
 msgid "Druid Datasource"
 msgstr ""
 
-#: caravel/views.py:257 caravel/views.py:310
+#: caravel/views.py:291 caravel/views.py:345
 msgid "Database"
 msgstr ""
 
-#: caravel/views.py:258
+#: caravel/views.py:292
 msgid "SQL link"
 msgstr ""
 
-#: caravel/views.py:259 caravel/views.py:397 caravel/views.py:459
+#: caravel/views.py:293 caravel/views.py:437 caravel/views.py:503
 msgid "Creator"
 msgstr ""
 
-#: caravel/views.py:260 caravel/views.py:311
+#: caravel/views.py:294 caravel/views.py:346
 msgid "Last Changed"
 msgstr ""
 
-#: caravel/views.py:261
+#: caravel/views.py:295
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: caravel/views.py:262 caravel/views.py:317 caravel/views.py:396
-#: caravel/views.py:541
+#: caravel/views.py:296 caravel/views.py:352 caravel/views.py:436
+#: caravel/views.py:587
 msgid "Cache Timeout"
 msgstr ""
 
-#: caravel/views.py:263
+#: caravel/views.py:297
 msgid "Extra"
 msgstr ""
 
-#: caravel/views.py:279
+#: caravel/views.py:313
 msgid "Databases"
 msgstr "Database"
 
-#: caravel/views.py:281 caravel/views.py:337 caravel/views.py:369
+#: 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"
 
-#: caravel/views.py:309
+#: caravel/views.py:344
 msgid "Changed By"
 msgstr ""
 
-#: caravel/views.py:312
+#: caravel/views.py:347
 msgid "SQL Editor"
 msgstr ""
 
-#: caravel/views.py:313 caravel/views.py:537
+#: caravel/views.py:348 caravel/views.py:583
 msgid "Is Featured"
 msgstr ""
 
-#: caravel/views.py:314
+#: caravel/views.py:349
 msgid "Schema"
 msgstr ""
 
-#: caravel/views.py:315 caravel/views.py:539
+#: caravel/views.py:350 caravel/views.py:585
 msgid "Default Endpoint"
 msgstr ""
 
-#: caravel/views.py:316
+#: caravel/views.py:351
 msgid "Offset"
 msgstr ""
 
-#: caravel/views.py:354 caravel/views.py:534
+#: caravel/views.py:373
+msgid "Tables"
+msgstr ""
+
+#: caravel/views.py:392 caravel/views.py:580
 msgid "Cluster"
 msgstr ""
 
-#: caravel/views.py:355
+#: caravel/views.py:393
 msgid "Coordinator Host"
 msgstr ""
 
-#: caravel/views.py:356
+#: caravel/views.py:394
 msgid "Coordinator Port"
 msgstr ""
 
-#: caravel/views.py:357
+#: caravel/views.py:395
 msgid "Coordinator Endpoint"
 msgstr ""
 
-#: caravel/views.py:358
+#: caravel/views.py:396
 msgid "Broker Host"
 msgstr ""
 
-#: caravel/views.py:359
-msgid "Borker Port"
+#: caravel/views.py:397
+msgid "Broker Port"
 msgstr ""
 
-#: caravel/views.py:360
+#: caravel/views.py:398
 msgid "Broker Endpoint"
 msgstr ""
 
-#: caravel/views.py:398 caravel/views.py:479
+#: caravel/views.py:406
+msgid "Druid Clusters"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:25
+#: caravel/templates/caravel/welcome.html:25 caravel/views.py:438
+#: caravel/views.py:524
 msgid "Dashboards"
 msgstr "Dashboard"
 
-#: caravel/views.py:401
+#: caravel/views.py:441
 msgid "Last Modified"
 msgstr ""
 
-#: caravel/views.py:402 caravel/views.py:458
+#: caravel/views.py:442 caravel/views.py:502
 msgid "Owners"
 msgstr ""
 
-#: caravel/views.py:403
+#: caravel/views.py:443
 msgid "Parameters"
 msgstr ""
 
-#: caravel/views.py:404 caravel/views.py:425
+#: caravel/views.py:444 caravel/views.py:469
 msgid "Slice"
 msgstr ""
 
-#: caravel/views.py:405
+#: caravel/views.py:445
 msgid "Name"
 msgstr ""
 
-#: caravel/views.py:407 caravel/views.py:426
+#: caravel/views.py:447 caravel/views.py:470
 msgid "Visualization Type"
 msgstr ""
 
-#: caravel/views.py:441
+#: caravel/foo/templates/caravel/welcome.html:46
+#: caravel/templates/caravel/welcome.html:46 caravel/views.py:456
+#: caravel/views.py:501
+msgid "Slices"
+msgstr "Slice"
+
+#: 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 "
@@ -241,7 +911,7 @@ msgstr ""
 "dashboard.E` generata dinamicamente quando vengono cambiate la dimensioni"
 " dei widget o laposizione tramite il drag&drop nella vista dashboard."
 
-#: caravel/views.py:446
+#: caravel/views.py:490
 msgid ""
 "The css for individual dashboards can be altered here, or in the "
 "dashboard view where changes are immediately visible"
@@ -249,222 +919,402 @@ msgstr ""
 "Il css per ogni dashboard può essere modificato qui o nella vistdashboard"
 " dove i cambiamenti sono visibili immediatamente"
 
-#: caravel/views.py:450
+#: caravel/views.py:494
 msgid "To get a readable URL for your dashboard"
 msgstr ""
 
-#: caravel/views.py:454
+#: caravel/views.py:498
 msgid "Dashboard"
 msgstr ""
 
-#: caravel/views.py:455
+#: caravel/views.py:499
 msgid "Title"
 msgstr ""
 
-#: caravel/views.py:456
+#: caravel/views.py:500
 msgid "Slug"
 msgstr ""
 
-#: caravel/views.py:457
-msgid "Slices"
-msgstr "Slice"
-
-#: caravel/views.py:460
+#: caravel/views.py:504
 msgid "Modified"
 msgstr ""
 
-#: caravel/views.py:461
+#: caravel/views.py:505
 msgid "Position JSON"
 msgstr ""
 
-#: caravel/views.py:462
+#: caravel/views.py:506
 msgid "CSS"
 msgstr ""
 
-#: caravel/views.py:463
+#: caravel/views.py:507
 msgid "JSON Metadata"
 msgstr ""
 
-#: caravel/views.py:500
+#: caravel/views.py:545
 msgid "User"
 msgstr ""
 
-#: caravel/views.py:501
+#: caravel/views.py:546
 msgid "Action"
 msgstr ""
 
-#: caravel/views.py:502
+#: caravel/views.py:547
 msgid "dttm"
 msgstr ""
 
-#: caravel/views.py:509
+#: caravel/views.py:554
 msgid "Action Log"
 msgstr "Log delle azioni"
 
-#: caravel/views.py:510
+#: caravel/views.py:556
 msgid "Security"
 msgstr "Sicurezza"
 
-#: caravel/views.py:527
+#: caravel/views.py:573
 msgid "Timezone offset (in hours) for this datasource"
 msgstr ""
 
-#: caravel/views.py:533
+#: caravel/views.py:579
 msgid "Data Source"
 msgstr ""
 
-#: caravel/views.py:536
+#: caravel/views.py:582
 msgid "Owner"
 msgstr ""
 
-#: caravel/views.py:538
+#: caravel/views.py:584
 msgid "Is Hidden"
 msgstr ""
 
-#: caravel/views.py:540
+#: caravel/views.py:586
 msgid "Time Offset"
 msgstr ""
 
-#: caravel/views.py:555
+#: caravel/views.py:601
 msgid "Druid Datasources"
 msgstr "Datasource Druid"
 
-#: caravel/views.py:639
-msgid "The datasource seems to have been deleted"
-msgstr "Sembra che il datasource sia stato eliminato"
-
-#: caravel/views.py:647
-msgid "You don't seem to have access to this datasource"
-msgstr "Non hai i permessi per accedere a questo datasource"
-
-#: caravel/views.py:970
+#: caravel/views.py:1016
 msgid "This view requires the `all_datasource_access` permission"
 msgstr "Questa vista richiede il permesso `all_datasource_access`"
 
-#: caravel/views.py:1081
+#: caravel/views.py:1113
 msgid "CSS Templates"
 msgstr "Template CSS"
 
-#: caravel/viz.py:324
+#: caravel/viz.py:314
 msgid "Table View"
 msgstr ""
 
-#: caravel/viz.py:385
+#: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
 
-#: caravel/viz.py:447
+#: caravel/viz.py:442
 msgid "Markup"
 msgstr ""
 
-#: caravel/viz.py:475
+#: caravel/viz.py:470
 msgid "Word Cloud"
 msgstr ""
 
-#: caravel/viz.py:507
+#: caravel/viz.py:502
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:551
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
+#: caravel/viz.py:1069 caravel/viz.py:1124
+msgid "Chart Options"
+msgstr ""
+
+#: caravel/viz.py:546
 msgid "Calender Heatmap"
 msgstr ""
 
-#: caravel/viz.py:622
+#: caravel/viz.py:617
 msgid "Box Plot"
 msgstr ""
 
-#: caravel/viz.py:729
+#: caravel/viz.py:724
 msgid "Bubble Chart"
 msgstr ""
 
-#: caravel/viz.py:797
+#: caravel/viz.py:792
 msgid "Big Number with Trendline"
 msgstr ""
 
-#: caravel/viz.py:847
+#: caravel/viz.py:842
 msgid "Big Number"
 msgstr ""
 
-#: caravel/viz.py:893
+#: caravel/viz.py:888
 msgid "Time Series - Line Chart"
 msgstr ""
 
-#: caravel/viz.py:1045
+#: caravel/viz.py:907
+msgid "Advanced Analytics"
+msgstr ""
+
+#: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1063
+#: caravel/viz.py:1058
 msgid "Time Series - Percent Change"
 msgstr ""
 
-#: caravel/viz.py:1071
+#: caravel/viz.py:1066
 msgid "Time Series - Stacked"
 msgstr ""
 
-#: caravel/viz.py:1090
+#: caravel/viz.py:1085
 msgid "Distribution - NVD3 - Pie Chart"
 msgstr ""
 
-#: caravel/viz.py:1126
+#: caravel/viz.py:1121
 msgid "Distribution - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1206
+#: caravel/viz.py:1139
+msgid "Breakdowns"
+msgstr ""
+
+#: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
 
-#: caravel/viz.py:1272
+#: caravel/viz.py:1216
+msgid "Primary Metric"
+msgstr ""
+
+#: caravel/viz.py:1217
+msgid "The primary metric is used to define the arc segment sizes"
+msgstr ""
+
+#: caravel/viz.py:1223
+msgid ""
+"This secondary metric is used to define the color as a ratio against the "
+"primary metric. If the two metrics match, color is mapped level groups"
+msgstr ""
+
+#: caravel/viz.py:1229
+msgid "Hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1230
+msgid "This defines the level of the hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1267
 msgid "Sankey"
 msgstr ""
 
-#: caravel/viz.py:1336
+#: caravel/viz.py:1280 caravel/viz.py:1350
+msgid "Source / Target"
+msgstr ""
+
+#: caravel/viz.py:1281 caravel/viz.py:1351
+msgid "Choose a source and a target"
+msgstr ""
+
+#: caravel/viz.py:1331
 msgid "Directed Force Layout"
 msgstr ""
 
-#: caravel/viz.py:1378
+#: caravel/viz.py:1342
+msgid "Force Layout"
+msgstr ""
+
+#: caravel/viz.py:1373
 msgid "World Map"
 msgstr ""
 
-#: caravel/viz.py:1452
+#: caravel/viz.py:1384
+msgid "Bubbles"
+msgstr ""
+
+#: caravel/viz.py:1393
+msgid "Country Field"
+msgstr ""
+
+#: caravel/viz.py:1394
+msgid "3 letter code of the country"
+msgstr ""
+
+#: caravel/viz.py:1397
+msgid "Metric for color"
+msgstr ""
+
+#: caravel/viz.py:1398
+msgid "Metric that defines the color of the country"
+msgstr ""
+
+#: caravel/viz.py:1401
+msgid "Bubble size"
+msgstr ""
+
+#: caravel/viz.py:1402
+msgid "Metric that defines the size of the bubble"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:137
+#: caravel/templates/caravel/explore.html:137 caravel/viz.py:1447
 msgid "Filters"
 msgstr ""
 
-#: caravel/viz.py:1500
+#: caravel/viz.py:1459
+msgid "Filter fields"
+msgstr ""
+
+#: caravel/viz.py:1460
+msgid "The fields you want to filter on"
+msgstr ""
+
+#: caravel/viz.py:1495
 msgid "iFrame"
 msgstr ""
 
-#: caravel/viz.py:1518
+#: caravel/viz.py:1513
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: caravel/viz.py:1554
+#: caravel/viz.py:1549
 msgid "Heatmap"
 msgstr ""
 
-#: caravel/viz.py:1622
+#: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar.html:24
+#: caravel/templates/appbuilder/navbar.html:24
+msgid "Documentation"
+msgstr ""
+
+#: caravel/foo/templates/appbuilder/navbar_right.html:34
 #: caravel/templates/appbuilder/navbar_right.html:34
 msgid "Profile"
 msgstr "Profilo"
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:35
 #: caravel/templates/appbuilder/navbar_right.html:35
 msgid "Logout"
 msgstr "Logout"
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:40
 #: caravel/templates/appbuilder/navbar_right.html:40
 msgid "Login"
 msgstr "Login"
 
+#: caravel/foo/templates/caravel/explore.html:58
+#: caravel/templates/caravel/explore.html:58
+msgid "Force refresh"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:63
+#: caravel/templates/caravel/explore.html:63
+msgid "Short URL"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:65
+#: caravel/templates/caravel/explore.html:65
+msgid "Standalone version, use to embed anywhere"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:68
+#: caravel/templates/caravel/explore.html:68
+msgid "Export to .json"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:72
+#: caravel/templates/caravel/explore.html:72
+msgid "Export to .csv format"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:75
+#: caravel/templates/caravel/explore.html:75
+msgid "0 sec"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:77
+#: caravel/templates/caravel/explore.html:77
+msgid "query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:86
+#: caravel/foo/templates/caravel/explore.html:192
+#: caravel/templates/caravel/explore.html:86
+#: caravel/templates/caravel/explore.html:192
+msgid "Query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:90
+#: caravel/templates/caravel/explore.html:90
+msgid "Overwrite"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:94
+#: caravel/templates/caravel/explore.html:94
+msgid "Save as"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:140
+#: caravel/templates/caravel/explore.html:140
+msgid "Filters are defined using comma delimited strings as in 'US,FR,Other'"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:158
+#: caravel/templates/caravel/explore.html:158
+msgid "Add filter"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:198
+#: caravel/foo/templates/caravel/explore.html:216
+#: caravel/templates/caravel/explore.html:198
+#: caravel/templates/caravel/explore.html:216
+msgid "Close"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:210
+#: caravel/templates/caravel/explore.html:210
+msgid "Datasource Description"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:11
+#: caravel/templates/caravel/sql.html:11
+msgid "Run!"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:12
+#: caravel/templates/caravel/sql.html:12
+msgid "Create View"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:8
+#: caravel/foo/templates/caravel/welcome.html:13
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:13
 msgid "Welcome!"
 msgstr "Benvenuto!"
 
+#: 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 c80fd07bf9a6a..e41181601d4a0 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-05-20 20:30-0700\n"
+"POT-Creation-Date: 2016-06-08 12:20+0200\n"
 "PO-Revision-Date: 2016-05-01 23:07-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -18,445 +18,1293 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: caravel/models.py:607
+#: caravel/forms.py:135
+msgid "Viz"
+msgstr ""
+
+#: caravel/forms.py:138
+msgid "The type of visualization to display"
+msgstr ""
+
+#: caravel/forms.py:141
+msgid "Metrics"
+msgstr ""
+
+#: caravel/forms.py:144
+msgid "One or many metrics to display"
+msgstr ""
+
+#: caravel/forms.py:147 caravel/views.py:226 caravel/views.py:255
+msgid "Metric"
+msgstr ""
+
+#: caravel/forms.py:150
+msgid "Choose the metric"
+msgstr ""
+
+#: caravel/forms.py:153
+msgid "Chart Style"
+msgstr ""
+
+#: caravel/forms.py:159
+msgid "Color Scheme"
+msgstr ""
+
+#: caravel/forms.py:167
+msgid "Normalize Across"
+msgstr ""
+
+#: caravel/forms.py:171
+msgid ""
+"Color will be rendered based on a ratio of the cell against the sum of "
+"across this criteria"
+msgstr ""
+
+#: caravel/forms.py:177
+msgid "Color Scale"
+msgstr ""
+
+#: caravel/forms.py:180
+msgid "Defines how the color are attributed."
+msgstr ""
+
+#: caravel/forms.py:183
+msgid "Rendering"
+msgstr ""
+
+#: caravel/forms.py:185
+msgid "pixelated (Sharp)"
+msgstr ""
+
+#: caravel/forms.py:186
+msgid "auto (Smooth)"
+msgstr ""
+
+#: caravel/forms.py:189
+msgid ""
+"image-rendering CSS attribute of the canvas object that defines how the "
+"browser scales up the image"
+msgstr ""
+
+#: caravel/forms.py:194
+msgid "XScale Interval"
+msgstr ""
+
+#: caravel/forms.py:197
+msgid "Number of step to take between ticks when printing the x scale"
+msgstr ""
+
+#: caravel/forms.py:202
+msgid "YScale Interval"
+msgstr ""
+
+#: caravel/forms.py:205
+msgid "Number of step to take between ticks when printing the y scale"
+msgstr ""
+
+#: caravel/forms.py:210
+msgid "Stacked Bars"
+msgstr ""
+
+#: caravel/forms.py:215
+msgid "Include Series"
+msgstr ""
+
+#: caravel/forms.py:217
+msgid "Include series name as an axis"
+msgstr ""
+
+#: caravel/forms.py:220
+msgid "Color Metric"
+msgstr ""
+
+#: caravel/forms.py:223
+msgid "A metric to use for color"
+msgstr ""
+
+#: caravel/forms.py:226
+msgid "Country Field Type"
+msgstr ""
+
+#: caravel/forms.py:229
+msgid "Full name"
+msgstr ""
+
+#: caravel/forms.py:230
+msgid "code International Olympic Committee (cioc)"
+msgstr ""
+
+#: caravel/forms.py:231
+msgid "code ISO 3166-1 alpha-2 (cca2)"
+msgstr ""
+
+#: caravel/forms.py:232
+msgid "code ISO 3166-1 alpha-3 (cca3)"
+msgstr ""
+
+#: caravel/forms.py:234
+msgid ""
+"The country code standard that Caravel should expect to find in the "
+"[country] column"
+msgstr ""
+
+#: caravel/forms.py:239
+msgid "Group by"
+msgstr ""
+
+#: caravel/forms.py:241
+msgid "One or many fields to group by"
+msgstr ""
+
+#: caravel/forms.py:244 caravel/forms.py:249
+msgid "Columns"
+msgstr ""
+
+#: caravel/forms.py:246
+msgid "One or many fields to pivot as columns"
+msgstr ""
+
+#: caravel/forms.py:251 caravel/forms.py:256 caravel/forms.py:261
+msgid "Columns to display"
+msgstr ""
+
+#: caravel/forms.py:254
+msgid "X"
+msgstr ""
+
+#: caravel/forms.py:259
+msgid "Y"
+msgstr ""
+
+#: caravel/forms.py:264
+msgid "Origin"
+msgstr ""
+
+#: caravel/forms.py:266
+msgid "default"
+msgstr ""
+
+#: caravel/forms.py:267
+msgid "now"
+msgstr ""
+
+#: caravel/forms.py:270
+msgid ""
+"Defines the origin where time buckets start, accepts natural dates as in "
+"'now', 'sunday' or '1970-01-01'"
+msgstr ""
+
+#: caravel/forms.py:275
+msgid "Time Granularity"
+msgstr ""
+
+#: caravel/forms.py:288
+msgid ""
+"The time granularity for the visualization. Note that you can type and "
+"use simple natural language as in '10 seconds', '1 day' or '56 weeks'"
+msgstr ""
+
+#: caravel/forms.py:294
+msgid "Domain"
+msgstr ""
+
+#: caravel/forms.py:303
+msgid "The time unit used for the grouping of blocks"
+msgstr ""
+
+#: caravel/forms.py:307
+msgid "Subdomain"
+msgstr ""
+
+#: caravel/forms.py:316
+msgid ""
+"The time unit for each block. Should be a smaller unit than "
+"domain_granularity. Should be larger or equal to Time Grain"
+msgstr ""
+
+#: caravel/forms.py:321
+msgid "Link Length"
+msgstr ""
+
+#: caravel/forms.py:333
+msgid "Link length in the force layout"
+msgstr ""
+
+#: caravel/forms.py:336
+msgid "Charge"
+msgstr ""
+
+#: caravel/forms.py:350
+msgid "Charge in the force layout"
+msgstr ""
+
+#: caravel/forms.py:353
+msgid "Time Column"
+msgstr ""
+
+#: caravel/forms.py:356
+msgid ""
+"The time column for the visualization. Note that you can define arbitrary"
+" expression that return a DATETIME column in the table editor. Also note "
+"that the filter bellow is applied against this column or expression"
+msgstr ""
+
+#: caravel/forms.py:364
+msgid "Resample Rule"
+msgstr ""
+
+#: caravel/forms.py:367
+msgid "Pandas resample rule"
+msgstr ""
+
+#: caravel/forms.py:370
+msgid "Resample How"
+msgstr ""
+
+#: caravel/forms.py:373
+msgid "Pandas resample how"
+msgstr ""
+
+#: caravel/forms.py:376
+msgid "Resample Fill Method"
+msgstr ""
+
+#: caravel/forms.py:379
+msgid "Pandas resample fill method"
+msgstr ""
+
+#: caravel/forms.py:382
+msgid "Since"
+msgstr ""
+
+#: caravel/forms.py:393
+msgid ""
+"Timestamp from filter. This supports free form typing and natural "
+"language as in '1 day ago', '28 days' or '3 years'"
+msgstr ""
+
+#: caravel/forms.py:398
+msgid "Until"
+msgstr ""
+
+#: caravel/forms.py:409
+msgid "Max Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:422
+msgid "Whisker/outlier options"
+msgstr ""
+
+#: caravel/forms.py:424
+msgid "Determines how whiskers and outliers are calculated."
+msgstr ""
+
+#: caravel/forms.py:434
+msgid "Ratio"
+msgstr ""
+
+#: caravel/forms.py:436
+msgid "Target aspect ratio for treemap tiles."
+msgstr ""
+
+#: caravel/forms.py:439
+msgid "Number format"
+msgstr ""
+
+#: caravel/forms.py:449
+msgid ""
+"D3 format syntax for numbers https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:454
+msgid "Row limit"
+msgstr ""
+
+#: caravel/forms.py:460
+msgid "Series limit"
+msgstr ""
+
+#: caravel/forms.py:463
+msgid "Limits the number of time series that get displayed"
+msgstr ""
+
+#: caravel/forms.py:467
+msgid "Rolling"
+msgstr ""
+
+#: caravel/forms.py:470
+msgid ""
+"Defines a rolling window function to apply, works along with the "
+"[Periods] text box"
+msgstr ""
+
+#: caravel/forms.py:475
+msgid "Periods"
+msgstr ""
+
+#: caravel/forms.py:477
+msgid ""
+"Defines the size of the rolling window function, relative to the time "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:482 caravel/viz.py:1136
+msgid "Series"
+msgstr ""
+
+#: caravel/forms.py:485
+msgid ""
+"Defines the grouping of entities. Each serie is shown as a specific color"
+" on the chart and has a legend toggle"
+msgstr ""
+
+#: caravel/forms.py:491
+msgid "Entity"
+msgstr ""
+
+#: caravel/forms.py:494
+msgid "This define the element to be plotted on the chart"
+msgstr ""
+
+#: caravel/forms.py:497
+msgid "X Axis"
+msgstr ""
+
+#: caravel/forms.py:500
+msgid "Metric assigned to the [X] axis"
+msgstr ""
+
+#: caravel/forms.py:503
+msgid "Y Axis"
+msgstr ""
+
+#: caravel/forms.py:506
+msgid "Metric assigned to the [Y] axis"
+msgstr ""
+
+#: caravel/forms.py:509
+msgid "Bubble Size"
+msgstr ""
+
+#: caravel/forms.py:514
+msgid "URL"
+msgstr ""
+
+#: caravel/forms.py:515
+msgid ""
+"The URL, this field is templated, so you can integrate {{ width }} and/or"
+" {{ height }} in your URL string."
+msgstr ""
+
+#: caravel/forms.py:522
+msgid "Custom WHERE clause"
+msgstr ""
+
+#: caravel/forms.py:524
+msgid ""
+"The text in this box gets included in your query's WHERE clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:531
+msgid "Custom HAVING clause"
+msgstr ""
+
+#: caravel/forms.py:533
+msgid ""
+"The text in this box gets included in your query's HAVING clause, as an "
+"AND to other criteria. You can include complex expression, parenthesis "
+"and anything else supported by the backend it is directed towards."
+msgstr ""
+
+#: caravel/forms.py:540
+msgid "Comparison Period Lag"
+msgstr ""
+
+#: caravel/forms.py:541
+msgid "Based on granularity, number of time periods to compare against"
+msgstr ""
+
+#: caravel/forms.py:546
+msgid "Comparison suffix"
+msgstr ""
+
+#: caravel/forms.py:547
+msgid "Suffix to apply after the percentage display"
+msgstr ""
+
+#: caravel/forms.py:550
+msgid "Table Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:553
+msgid "Timestamp Format"
+msgstr ""
+
+#: caravel/forms.py:556
+msgid "Series Height"
+msgstr ""
+
+#: caravel/forms.py:559
+msgid "Pixel height of each series"
+msgstr ""
+
+#: caravel/forms.py:562
+msgid "X axis format"
+msgstr ""
+
+#: caravel/forms.py:565 caravel/forms.py:580
+msgid ""
+"D3 format syntax for y axis https: //github.com/mbostock/\n"
+"d3/wiki/Formatting"
+msgstr ""
+
+#: caravel/forms.py:570
+msgid "Y axis format"
+msgstr ""
+
+#: caravel/forms.py:585
+msgid "Markup Type"
+msgstr ""
+
+#: caravel/forms.py:588
+msgid "Pick your favorite markup language"
+msgstr ""
+
+#: caravel/forms.py:591
+msgid "Rotation"
+msgstr ""
+
+#: caravel/forms.py:594
+msgid "Rotation to apply to words in the cloud"
+msgstr ""
+
+#: caravel/forms.py:597
+msgid "Line Style"
+msgstr ""
+
+#: caravel/forms.py:602
+msgid "Line interpolation as defined by d3.js"
+msgstr ""
+
+#: caravel/forms.py:605
+msgid "Code"
+msgstr ""
+
+#: caravel/forms.py:606
+msgid "Put your code here"
+msgstr ""
+
+#: caravel/forms.py:610
+msgid "Aggregation function"
+msgstr ""
+
+#: caravel/forms.py:614
+msgid ""
+"Aggregate function to apply when pivoting and computing the total rows "
+"and columns"
+msgstr ""
+
+#: caravel/forms.py:619
+msgid "Font Size From"
+msgstr ""
+
+#: caravel/forms.py:621
+msgid "Font size for the smallest value in the list"
+msgstr ""
+
+#: caravel/forms.py:624
+msgid "Font Size To"
+msgstr ""
+
+#: caravel/forms.py:626
+msgid "Font size for the biggest value in the list"
+msgstr ""
+
+#: caravel/forms.py:629
+msgid "Range Filter"
+msgstr ""
+
+#: caravel/forms.py:631
+msgid "Whether to display the time range interactive selector"
+msgstr ""
+
+#: caravel/forms.py:635
+msgid "Data Table"
+msgstr ""
+
+#: caravel/forms.py:637
+msgid "Whether to display the interactive data table"
+msgstr ""
+
+#: caravel/forms.py:640
+msgid "Search Box"
+msgstr ""
+
+#: caravel/forms.py:642
+msgid "Whether to include a client side search box"
+msgstr ""
+
+#: caravel/forms.py:646
+msgid "Show Bubbles"
+msgstr ""
+
+#: caravel/forms.py:648
+msgid "Whether to display bubbles on top of countries"
+msgstr ""
+
+#: caravel/forms.py:652
+msgid "Legend"
+msgstr ""
+
+#: caravel/forms.py:654
+msgid "Whether to display the legend (toggles)"
+msgstr ""
+
+#: caravel/forms.py:657
+msgid "X bounds"
+msgstr ""
+
+#: caravel/forms.py:659
+msgid "Whether to display the min and max values of the X axis"
+msgstr ""
+
+#: caravel/forms.py:663
+msgid "Rich Tooltip"
+msgstr ""
+
+#: caravel/forms.py:665
+msgid "The rich tooltip shows a list of all series for that point in time"
+msgstr ""
+
+#: caravel/forms.py:670
+msgid "Y Axis Zero"
+msgstr ""
+
+#: caravel/forms.py:672
+msgid "Force the Y axis to start at 0 instead of the minimum value"
+msgstr ""
+
+#: caravel/forms.py:677
+msgid "Y Log"
+msgstr ""
+
+#: caravel/forms.py:679
+msgid "Use a log scale for the Y axis"
+msgstr ""
+
+#: caravel/forms.py:682
+msgid "X Log"
+msgstr ""
+
+#: caravel/forms.py:684
+msgid "Use a log scale for the X axis"
+msgstr ""
+
+#: caravel/forms.py:687
+msgid "Donut"
+msgstr ""
+
+#: caravel/forms.py:689
+msgid "Do you want a donut or a pie?"
+msgstr ""
+
+#: caravel/forms.py:692
+msgid "Contribution"
+msgstr ""
+
+#: caravel/forms.py:694
+msgid "Compute the contribution to the total"
+msgstr ""
+
+#: caravel/forms.py:697
+msgid "Period Ratio"
+msgstr ""
+
+#: caravel/forms.py:700
+msgid ""
+"[integer] Number of period to compare against, this is relative to the "
+"granularity selected"
+msgstr ""
+
+#: caravel/forms.py:705
+msgid "Time Shift"
+msgstr ""
+
+#: caravel/forms.py:707
+msgid ""
+"Overlay a timeseries from a relative time period. Expects relative time "
+"delta in natural language (example:  24 hours, 7 days, 56 weeks, 365 days"
+msgstr ""
+
+#: caravel/forms.py:714
+msgid "Subheader"
+msgstr ""
+
+#: caravel/forms.py:715
+msgid "Description text that shows up below your Big Number"
+msgstr ""
+
+#: caravel/forms.py:778
+msgid "SQL"
+msgstr ""
+
+#: caravel/forms.py:780
+msgid "This section exposes ways to include snippets of SQL in your query"
+msgstr ""
+
+#: caravel/forms.py:790
+msgid "Time Grain"
+msgstr ""
+
+#: caravel/forms.py:793
+msgid ""
+"The time granularity for the visualization. This applies a date "
+"transformation to alter your time column and defines a new time "
+"granularity.The options here are defined on a per database engine basis "
+"in the Caravel source code"
+msgstr ""
+
+#: caravel/forms.py:829
+msgid "Time"
+msgstr ""
+
+#: caravel/forms.py:834
+msgid "Time related form attributes"
+msgstr ""
+
+#: caravel/models.py:615
 msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
 msgstr "所选表格需要日期时间但在表格配置文件中没有被提供"
 
-#: caravel/models.py:1243
+#: caravel/models.py:1255
 msgid "No data was returned."
 msgstr "所选数据为空"
 
-#: caravel/views.py:124
+#: 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 "是否要让这列接受[Time Granularity]的选项，这列必须是DATETIME或DATETIME-like"
 
-#: caravel/views.py:133 caravel/views.py:161
+#: caravel/views.py:167 caravel/views.py:195
 msgid "Column"
 msgstr ""
 
-#: caravel/views.py:134 caravel/views.py:194 caravel/views.py:223
+#: caravel/views.py:168 caravel/views.py:228 caravel/views.py:257
 msgid "Verbose Name"
 msgstr ""
 
-#: caravel/views.py:135 caravel/views.py:193 caravel/views.py:222
-#: caravel/views.py:400 caravel/views.py:535
+#: caravel/views.py:169 caravel/views.py:227 caravel/views.py:256
+#: caravel/views.py:440 caravel/views.py:581
 msgid "Description"
 msgstr ""
 
-#: caravel/views.py:136 caravel/views.py:164
+#: caravel/views.py:170 caravel/views.py:198
 msgid "Groupable"
 msgstr ""
 
-#: caravel/views.py:137 caravel/views.py:165
+#: caravel/views.py:171 caravel/views.py:199
 msgid "Filterable"
 msgstr ""
 
-#: caravel/views.py:138 caravel/views.py:197 caravel/views.py:308
-#: caravel/views.py:406
+#: caravel/views.py:172 caravel/views.py:231 caravel/views.py:343
+#: caravel/views.py:446
 msgid "Table"
 msgstr ""
 
-#: caravel/views.py:139 caravel/views.py:166
+#: caravel/views.py:173 caravel/views.py:200
 msgid "Count Distinct"
 msgstr ""
 
-#: caravel/views.py:140 caravel/views.py:167
+#: caravel/views.py:174 caravel/views.py:201
 msgid "Sum"
 msgstr ""
 
-#: caravel/views.py:141 caravel/views.py:168
+#: caravel/views.py:175 caravel/views.py:202
 msgid "Min"
 msgstr ""
 
-#: caravel/views.py:142 caravel/views.py:169
+#: caravel/views.py:176 caravel/views.py:203
 msgid "Max"
 msgstr ""
 
-#: caravel/views.py:143
+#: caravel/views.py:177
 msgid "Expression"
 msgstr ""
 
-#: caravel/views.py:144
+#: caravel/views.py:178
 msgid "Is temporal"
 msgstr ""
 
-#: caravel/views.py:162 caravel/views.py:195 caravel/views.py:224
-#: caravel/views.py:424
+#: caravel/views.py:196 caravel/views.py:229 caravel/views.py:258
+#: caravel/views.py:468
 msgid "Type"
 msgstr ""
 
-#: caravel/views.py:163 caravel/views.py:399
+#: caravel/views.py:197 caravel/views.py:439
 msgid "Datasource"
 msgstr ""
 
-#: caravel/views.py:192 caravel/views.py:221
-msgid "Metric"
-msgstr ""
-
-#: caravel/views.py:196
+#: caravel/views.py:230
 msgid "SQL Expression"
 msgstr ""
 
-#: caravel/views.py:225 caravel/views.py:503
+#: caravel/views.py:259 caravel/views.py:548
 msgid "JSON"
 msgstr ""
 
-#: caravel/views.py:226
+#: caravel/views.py:260
 msgid "Druid Datasource"
 msgstr ""
 
-#: caravel/views.py:257 caravel/views.py:310
+#: caravel/views.py:291 caravel/views.py:345
 msgid "Database"
 msgstr ""
 
-#: caravel/views.py:258
+#: caravel/views.py:292
 msgid "SQL link"
 msgstr ""
 
-#: caravel/views.py:259 caravel/views.py:397 caravel/views.py:459
+#: caravel/views.py:293 caravel/views.py:437 caravel/views.py:503
 msgid "Creator"
 msgstr ""
 
-#: caravel/views.py:260 caravel/views.py:311
+#: caravel/views.py:294 caravel/views.py:346
 msgid "Last Changed"
 msgstr ""
 
-#: caravel/views.py:261
+#: caravel/views.py:295
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: caravel/views.py:262 caravel/views.py:317 caravel/views.py:396
-#: caravel/views.py:541
+#: caravel/views.py:296 caravel/views.py:352 caravel/views.py:436
+#: caravel/views.py:587
 msgid "Cache Timeout"
 msgstr ""
 
-#: caravel/views.py:263
+#: caravel/views.py:297
 msgid "Extra"
 msgstr ""
 
-#: caravel/views.py:279
+#: caravel/views.py:313
 msgid "Databases"
 msgstr "数据库"
 
-#: caravel/views.py:281 caravel/views.py:337 caravel/views.py:369
+#: 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 "源"
 
-#: caravel/views.py:309
+#: caravel/views.py:344
 msgid "Changed By"
 msgstr ""
 
-#: caravel/views.py:312
+#: caravel/views.py:347
 msgid "SQL Editor"
 msgstr ""
 
-#: caravel/views.py:313 caravel/views.py:537
+#: caravel/views.py:348 caravel/views.py:583
 msgid "Is Featured"
 msgstr ""
 
-#: caravel/views.py:314
+#: caravel/views.py:349
 msgid "Schema"
 msgstr ""
 
-#: caravel/views.py:315 caravel/views.py:539
+#: caravel/views.py:350 caravel/views.py:585
 msgid "Default Endpoint"
 msgstr ""
 
-#: caravel/views.py:316
+#: caravel/views.py:351
 msgid "Offset"
 msgstr ""
 
-#: caravel/views.py:354 caravel/views.py:534
+#: caravel/views.py:373
+msgid "Tables"
+msgstr ""
+
+#: caravel/views.py:392 caravel/views.py:580
 msgid "Cluster"
 msgstr ""
 
-#: caravel/views.py:355
+#: caravel/views.py:393
 msgid "Coordinator Host"
 msgstr ""
 
-#: caravel/views.py:356
+#: caravel/views.py:394
 msgid "Coordinator Port"
 msgstr ""
 
-#: caravel/views.py:357
+#: caravel/views.py:395
 msgid "Coordinator Endpoint"
 msgstr ""
 
-#: caravel/views.py:358
+#: caravel/views.py:396
 msgid "Broker Host"
 msgstr ""
 
-#: caravel/views.py:359
-msgid "Borker Port"
+#: caravel/views.py:397
+msgid "Broker Port"
 msgstr ""
 
-#: caravel/views.py:360
+#: caravel/views.py:398
 msgid "Broker Endpoint"
 msgstr ""
 
-#: caravel/views.py:398 caravel/views.py:479
+#: caravel/views.py:406
+msgid "Druid Clusters"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:25
+#: caravel/templates/caravel/welcome.html:25 caravel/views.py:438
+#: caravel/views.py:524
 msgid "Dashboards"
 msgstr "仪表盘"
 
-#: caravel/views.py:401
+#: caravel/views.py:441
 msgid "Last Modified"
 msgstr ""
 
-#: caravel/views.py:402 caravel/views.py:458
+#: caravel/views.py:442 caravel/views.py:502
 msgid "Owners"
 msgstr ""
 
-#: caravel/views.py:403
+#: caravel/views.py:443
 msgid "Parameters"
 msgstr ""
 
-#: caravel/views.py:404 caravel/views.py:425
+#: caravel/views.py:444 caravel/views.py:469
 msgid "Slice"
 msgstr ""
 
-#: caravel/views.py:405
+#: caravel/views.py:445
 msgid "Name"
 msgstr ""
 
-#: caravel/views.py:407 caravel/views.py:426
+#: caravel/views.py:447 caravel/views.py:470
 msgid "Visualization Type"
 msgstr ""
 
-#: caravel/views.py:441
+#: caravel/foo/templates/caravel/welcome.html:46
+#: caravel/templates/caravel/welcome.html:46 caravel/views.py:456
+#: caravel/views.py:501
+msgid "Slices"
+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 "这个json描述了部件在面板中的位置。 当通过拖拽来改变窗口大小和位子的时候，它会被自动生成。"
 
-#: caravel/views.py:446
+#: 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可以在此变更，或者在面板视窗（立即生效）"
 
-#: caravel/views.py:450
+#: caravel/views.py:494
 msgid "To get a readable URL for your dashboard"
 msgstr ""
 
-#: caravel/views.py:454
+#: caravel/views.py:498
 msgid "Dashboard"
 msgstr ""
 
-#: caravel/views.py:455
+#: caravel/views.py:499
 msgid "Title"
 msgstr ""
 
-#: caravel/views.py:456
+#: caravel/views.py:500
 msgid "Slug"
 msgstr ""
 
-#: caravel/views.py:457
-msgid "Slices"
-msgstr "切片"
-
-#: caravel/views.py:460
+#: caravel/views.py:504
 msgid "Modified"
 msgstr ""
 
-#: caravel/views.py:461
+#: caravel/views.py:505
 msgid "Position JSON"
 msgstr ""
 
-#: caravel/views.py:462
+#: caravel/views.py:506
 msgid "CSS"
 msgstr ""
 
-#: caravel/views.py:463
+#: caravel/views.py:507
 msgid "JSON Metadata"
 msgstr ""
 
-#: caravel/views.py:500
+#: caravel/views.py:545
 msgid "User"
 msgstr ""
 
-#: caravel/views.py:501
+#: caravel/views.py:546
 msgid "Action"
 msgstr ""
 
-#: caravel/views.py:502
+#: caravel/views.py:547
 msgid "dttm"
 msgstr ""
 
-#: caravel/views.py:509
+#: caravel/views.py:554
 msgid "Action Log"
 msgstr "行动记录"
 
-#: caravel/views.py:510
+#: caravel/views.py:556
 msgid "Security"
 msgstr "权限"
 
-#: caravel/views.py:527
+#: caravel/views.py:573
 msgid "Timezone offset (in hours) for this datasource"
 msgstr ""
 
-#: caravel/views.py:533
+#: caravel/views.py:579
 msgid "Data Source"
 msgstr ""
 
-#: caravel/views.py:536
+#: caravel/views.py:582
 msgid "Owner"
 msgstr ""
 
-#: caravel/views.py:538
+#: caravel/views.py:584
 msgid "Is Hidden"
 msgstr ""
 
-#: caravel/views.py:540
+#: caravel/views.py:586
 msgid "Time Offset"
 msgstr ""
 
-#: caravel/views.py:555
+#: caravel/views.py:601
 msgid "Druid Datasources"
 msgstr "Druid数据源"
 
-#: caravel/views.py:639
-msgid "The datasource seems to have been deleted"
-msgstr "此数据源好像已被删除"
-
-#: caravel/views.py:647
-msgid "You don't seem to have access to this datasource"
-msgstr "看来您不能读取此数据源"
-
-#: caravel/views.py:970
+#: caravel/views.py:1016
 msgid "This view requires the `all_datasource_access` permission"
 msgstr "此视图需要`all_datasource_access`权限"
 
-#: caravel/views.py:1081
+#: caravel/views.py:1113
 msgid "CSS Templates"
 msgstr "CSS模板"
 
-#: caravel/viz.py:324
+#: caravel/viz.py:314
 msgid "Table View"
 msgstr ""
 
-#: caravel/viz.py:385
+#: caravel/viz.py:380
 msgid "Pivot Table"
 msgstr ""
 
-#: caravel/viz.py:447
+#: caravel/viz.py:442
 msgid "Markup"
 msgstr ""
 
-#: caravel/viz.py:475
+#: caravel/viz.py:470
 msgid "Word Cloud"
 msgstr ""
 
-#: caravel/viz.py:507
+#: caravel/viz.py:502
 msgid "Treemap"
 msgstr ""
 
-#: caravel/viz.py:551
+#: caravel/viz.py:512 caravel/viz.py:627 caravel/viz.py:898 caravel/viz.py:1042
+#: caravel/viz.py:1069 caravel/viz.py:1124
+msgid "Chart Options"
+msgstr ""
+
+#: caravel/viz.py:546
 msgid "Calender Heatmap"
 msgstr ""
 
-#: caravel/viz.py:622
+#: caravel/viz.py:617
 msgid "Box Plot"
 msgstr ""
 
-#: caravel/viz.py:729
+#: caravel/viz.py:724
 msgid "Bubble Chart"
 msgstr ""
 
-#: caravel/viz.py:797
+#: caravel/viz.py:792
 msgid "Big Number with Trendline"
 msgstr ""
 
-#: caravel/viz.py:847
+#: caravel/viz.py:842
 msgid "Big Number"
 msgstr ""
 
-#: caravel/viz.py:893
+#: caravel/viz.py:888
 msgid "Time Series - Line Chart"
 msgstr ""
 
-#: caravel/viz.py:1045
+#: caravel/viz.py:907
+msgid "Advanced Analytics"
+msgstr ""
+
+#: caravel/viz.py:1040
 msgid "Time Series - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1063
+#: caravel/viz.py:1058
 msgid "Time Series - Percent Change"
 msgstr ""
 
-#: caravel/viz.py:1071
+#: caravel/viz.py:1066
 msgid "Time Series - Stacked"
 msgstr ""
 
-#: caravel/viz.py:1090
+#: caravel/viz.py:1085
 msgid "Distribution - NVD3 - Pie Chart"
 msgstr ""
 
-#: caravel/viz.py:1126
+#: caravel/viz.py:1121
 msgid "Distribution - Bar Chart"
 msgstr ""
 
-#: caravel/viz.py:1206
+#: caravel/viz.py:1139
+msgid "Breakdowns"
+msgstr ""
+
+#: caravel/viz.py:1201
 msgid "Sunburst"
 msgstr ""
 
-#: caravel/viz.py:1272
+#: caravel/viz.py:1216
+msgid "Primary Metric"
+msgstr ""
+
+#: caravel/viz.py:1217
+msgid "The primary metric is used to define the arc segment sizes"
+msgstr ""
+
+#: caravel/viz.py:1223
+msgid ""
+"This secondary metric is used to define the color as a ratio against the "
+"primary metric. If the two metrics match, color is mapped level groups"
+msgstr ""
+
+#: caravel/viz.py:1229
+msgid "Hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1230
+msgid "This defines the level of the hierarchy"
+msgstr ""
+
+#: caravel/viz.py:1267
 msgid "Sankey"
 msgstr ""
 
-#: caravel/viz.py:1336
+#: caravel/viz.py:1280 caravel/viz.py:1350
+msgid "Source / Target"
+msgstr ""
+
+#: caravel/viz.py:1281 caravel/viz.py:1351
+msgid "Choose a source and a target"
+msgstr ""
+
+#: caravel/viz.py:1331
 msgid "Directed Force Layout"
 msgstr ""
 
-#: caravel/viz.py:1378
+#: caravel/viz.py:1342
+msgid "Force Layout"
+msgstr ""
+
+#: caravel/viz.py:1373
 msgid "World Map"
 msgstr ""
 
-#: caravel/viz.py:1452
+#: caravel/viz.py:1384
+msgid "Bubbles"
+msgstr ""
+
+#: caravel/viz.py:1393
+msgid "Country Field"
+msgstr ""
+
+#: caravel/viz.py:1394
+msgid "3 letter code of the country"
+msgstr ""
+
+#: caravel/viz.py:1397
+msgid "Metric for color"
+msgstr ""
+
+#: caravel/viz.py:1398
+msgid "Metric that defines the color of the country"
+msgstr ""
+
+#: caravel/viz.py:1401
+msgid "Bubble size"
+msgstr ""
+
+#: caravel/viz.py:1402
+msgid "Metric that defines the size of the bubble"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:137
+#: caravel/templates/caravel/explore.html:137 caravel/viz.py:1447
 msgid "Filters"
 msgstr ""
 
-#: caravel/viz.py:1500
+#: caravel/viz.py:1459
+msgid "Filter fields"
+msgstr ""
+
+#: caravel/viz.py:1460
+msgid "The fields you want to filter on"
+msgstr ""
+
+#: caravel/viz.py:1495
 msgid "iFrame"
 msgstr ""
 
-#: caravel/viz.py:1518
+#: caravel/viz.py:1513
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: caravel/viz.py:1554
+#: caravel/viz.py:1549
 msgid "Heatmap"
 msgstr ""
 
-#: caravel/viz.py:1622
+#: caravel/viz.py:1617
 msgid "Horizon Charts"
 msgstr ""
 
+#: caravel/foo/templates/appbuilder/navbar.html:24
+#: caravel/templates/appbuilder/navbar.html:24
+msgid "Documentation"
+msgstr ""
+
+#: caravel/foo/templates/appbuilder/navbar_right.html:34
 #: caravel/templates/appbuilder/navbar_right.html:34
 msgid "Profile"
 msgstr "个人资料"
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:35
 #: caravel/templates/appbuilder/navbar_right.html:35
 msgid "Logout"
 msgstr "登出"
 
+#: caravel/foo/templates/appbuilder/navbar_right.html:40
 #: caravel/templates/appbuilder/navbar_right.html:40
 msgid "Login"
 msgstr "登录"
 
+#: caravel/foo/templates/caravel/explore.html:58
+#: caravel/templates/caravel/explore.html:58
+msgid "Force refresh"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:63
+#: caravel/templates/caravel/explore.html:63
+msgid "Short URL"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:65
+#: caravel/templates/caravel/explore.html:65
+msgid "Standalone version, use to embed anywhere"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:68
+#: caravel/templates/caravel/explore.html:68
+msgid "Export to .json"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:72
+#: caravel/templates/caravel/explore.html:72
+msgid "Export to .csv format"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:75
+#: caravel/templates/caravel/explore.html:75
+msgid "0 sec"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:77
+#: caravel/templates/caravel/explore.html:77
+msgid "query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:86
+#: caravel/foo/templates/caravel/explore.html:192
+#: caravel/templates/caravel/explore.html:86
+#: caravel/templates/caravel/explore.html:192
+msgid "Query"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:90
+#: caravel/templates/caravel/explore.html:90
+msgid "Overwrite"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:94
+#: caravel/templates/caravel/explore.html:94
+msgid "Save as"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:140
+#: caravel/templates/caravel/explore.html:140
+msgid "Filters are defined using comma delimited strings as in 'US,FR,Other'"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:158
+#: caravel/templates/caravel/explore.html:158
+msgid "Add filter"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:198
+#: caravel/foo/templates/caravel/explore.html:216
+#: caravel/templates/caravel/explore.html:198
+#: caravel/templates/caravel/explore.html:216
+msgid "Close"
+msgstr ""
+
+#: caravel/foo/templates/caravel/explore.html:210
+#: caravel/templates/caravel/explore.html:210
+msgid "Datasource Description"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:11
+#: caravel/templates/caravel/sql.html:11
+msgid "Run!"
+msgstr ""
+
+#: caravel/foo/templates/caravel/sql.html:12
+#: caravel/templates/caravel/sql.html:12
+msgid "Create View"
+msgstr ""
+
+#: caravel/foo/templates/caravel/welcome.html:8
+#: caravel/foo/templates/caravel/welcome.html:13
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:13
 msgid "Welcome!"
 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 ae67f2e0271ad..d17e445a30ad9 100644
--- a/caravel/viz.py
+++ b/caravel/viz.py
@@ -509,7 +509,7 @@ class TreemapViz(BaseViz):
             'groupby',
         ),
     }, {
-        'label': 'Chart Options',
+        'label': _('Chart Options'),
         'fields': (
             'treemap_ratio',
             'number_format',
@@ -624,7 +624,7 @@ class BoxPlotViz(NVD3Viz):
             'groupby', 'limit',
         ),
     }, {
-        'label': 'Chart Options',
+        'label': _('Chart Options'),
         'fields': (
             'whisker_options',
         )
@@ -895,7 +895,7 @@ class NVD3TimeSeriesViz(NVD3Viz):
             'groupby', 'limit',
         ),
     }, {
-        'label': 'Chart Options',
+        'label': _('Chart Options'),
         'fields': (
             ('show_brush', 'show_legend'),
             ('rich_tooltip', 'y_axis_zero'),
@@ -904,7 +904,7 @@ class NVD3TimeSeriesViz(NVD3Viz):
             ('line_interpolation', 'x_axis_showminmax'),
         ),
     }, {
-        'label': 'Advanced Analytics',
+        'label': _('Advanced Analytics'),
         'description': (
             "This section contains options "
             "that allow for advanced analytical post processing "
@@ -1039,7 +1039,7 @@ class NVD3TimeSeriesBarViz(NVD3TimeSeriesViz):
     sort_series = True
     verbose_name = _("Time Series - Bar Chart")
     fieldsets = [NVD3TimeSeriesViz.fieldsets[0]] + [{
-        'label': 'Chart Options',
+        'label': _('Chart Options'),
         'fields': (
             ('show_brush', 'show_legend'),
             ('rich_tooltip', 'y_axis_zero'),
@@ -1066,7 +1066,7 @@ class NVD3TimeSeriesStackedViz(NVD3TimeSeriesViz):
     verbose_name = _("Time Series - Stacked")
     sort_series = True
     fieldsets = [NVD3TimeSeriesViz.fieldsets[0]] + [{
-        'label': 'Chart Options',
+        'label': _('Chart Options'),
         'fields': (
             ('show_brush', 'show_legend'),
             ('rich_tooltip', 'y_axis_zero'),
@@ -1121,7 +1121,7 @@ class DistributionBarViz(DistributionPieViz):
     verbose_name = _("Distribution - Bar Chart")
     is_timeseries = False
     fieldsets = ({
-        'label': 'Chart Options',
+        'label': _('Chart Options'),
         'fields': (
             'groupby',
             'columns',
@@ -1133,10 +1133,10 @@ class DistributionBarViz(DistributionPieViz):
     },)
     form_overrides = {
         'groupby': {
-            'label': 'Series',
+            'label': _('Series'),
         },
         'columns': {
-            'label': 'Breakdowns',
+            'label': _('Breakdowns'),
             'description': "Defines how each series is broken down",
         },
     }
@@ -1213,21 +1213,21 @@ class SunburstViz(BaseViz):
     },)
     form_overrides = {
         'metric': {
-            'label': 'Primary Metric',
-            'description': (
+            'label': _('Primary Metric'),
+            'description': _(
                 "The primary metric is used to "
                 "define the arc segment sizes"),
         },
         'secondary_metric': {
             'label': 'Secondary Metric',
-            'description': (
+            'description': _(
                 "This secondary metric is used to "
                 "define the color as a ratio against the primary metric. "
                 "If the two metrics match, color is mapped level groups"),
         },
         'groupby': {
-            'label': 'Hierarchy',
-            'description': "This defines the level of the hierarchy",
+            'label': _('Hierarchy'),
+            'description': _("This defines the level of the hierarchy"),
         },
     }
 
@@ -1277,8 +1277,8 @@ class SankeyViz(BaseViz):
     },)
     form_overrides = {
         'groupby': {
-            'label': 'Source / Target',
-            'description': "Choose a source and a target",
+            'label': _('Source / Target'),
+            'description': _("Choose a source and a target"),
         },
     }
 
@@ -1339,7 +1339,7 @@ class DirectedForceViz(BaseViz):
             'row_limit',
         )
     }, {
-        'label': 'Force Layout',
+        'label': _('Force Layout'),
         'fields': (
             'link_length',
             'charge',
@@ -1347,8 +1347,8 @@ class DirectedForceViz(BaseViz):
     },)
     form_overrides = {
         'groupby': {
-            'label': 'Source / Target',
-            'description': "Choose a source and a target",
+            'label': _('Source / Target'),
+            'description':_( "Choose a source and a target"),
         },
     }
 
@@ -1381,7 +1381,7 @@ class WorldMapViz(BaseViz):
             'metric',
         )
     }, {
-        'label': 'Bubbles',
+        'label': _('Bubbles'),
         'fields': (
             ('show_bubbles', None),
             'secondary_metric',
@@ -1390,16 +1390,16 @@ class WorldMapViz(BaseViz):
     })
     form_overrides = {
         'entity': {
-            'label': 'Country Field',
-            'description': "3 letter code of the country",
+            'label': _('Country Field'),
+            'description': _("3 letter code of the country"),
         },
         'metric': {
-            'label': 'Metric for color',
-            'description': ("Metric that defines the color of the country"),
+            'label': _('Metric for color'),
+            'description': _("Metric that defines the color of the country"),
         },
         'secondary_metric': {
-            'label': 'Bubble size',
-            'description': ("Metric that defines the size of the bubble"),
+            'label': _('Bubble size'),
+            'description': _("Metric that defines the size of the bubble"),
         },
     }
 
@@ -1456,8 +1456,8 @@ class FilterBoxViz(BaseViz):
     },)
     form_overrides = {
         'groupby': {
-            'label': 'Filter fields',
-            'description': "The fields you want to filter on",
+            'label': _('Filter fields'),
+            'description': _("The fields you want to filter on"),
         },
     }