diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ae1b06759..312fad7a0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -208,7 +208,7 @@ new language dictionary, run the following command:
 
     pybabel init -i ./babel/messages.pot -d caravel/translations -l es
 
-Then it's a matter of running the statement bellow to gather all stings that
+Then it's a matter of running the statement below to gather all stings that
 need translation
 
     fabmanager babel-extract --target caravel/translations/
diff --git a/babel/messages.pot b/babel/messages.pot
index 0caef7b64..665fe0cc6 100755
--- a/babel/messages.pot
+++ b/babel/messages.pot
@@ -396,7 +396,7 @@ msgstr ""
 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"
+"that the filter below is applied against this column or expression"
 msgstr ""
 
 #: caravel/forms.py:414
diff --git a/caravel/forms.py b/caravel/forms.py
index 998ed88eb..c66715e92 100755
--- a/caravel/forms.py
+++ b/caravel/forms.py
@@ -409,7 +409,7 @@ class FormFactory(object):
                     "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 "
+                    "filter below is applied against this column or "
                     "expression")
             }),
             'resample_rule': (FreeFormSelectField, {
diff --git a/caravel/translations/es/LC_MESSAGES/messages.po b/caravel/translations/es/LC_MESSAGES/messages.po
index 1b7b1754f..05e850569 100755
--- a/caravel/translations/es/LC_MESSAGES/messages.po
+++ b/caravel/translations/es/LC_MESSAGES/messages.po
@@ -397,7 +397,7 @@ msgstr ""
 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"
+"that the filter below is applied against this column or expression"
 msgstr ""
 
 #: caravel/forms.py:414
diff --git a/caravel/translations/fr/LC_MESSAGES/messages.po b/caravel/translations/fr/LC_MESSAGES/messages.po
index 12d478fa3..490626415 100755
--- a/caravel/translations/fr/LC_MESSAGES/messages.po
+++ b/caravel/translations/fr/LC_MESSAGES/messages.po
@@ -397,7 +397,7 @@ msgstr ""
 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"
+"that the filter below is applied against this column or expression"
 msgstr ""
 
 #: caravel/forms.py:414
diff --git a/caravel/translations/it/LC_MESSAGES/messages.po b/caravel/translations/it/LC_MESSAGES/messages.po
index 6bc3e9334..444f49f96 100755
--- a/caravel/translations/it/LC_MESSAGES/messages.po
+++ b/caravel/translations/it/LC_MESSAGES/messages.po
@@ -398,7 +398,7 @@ msgstr ""
 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"
+"that the filter below is applied against this column or expression"
 msgstr ""
 
 #: caravel/forms.py:414
diff --git a/caravel/translations/zh/LC_MESSAGES/messages.po b/caravel/translations/zh/LC_MESSAGES/messages.po
index eb7e16b8a..a386a9727 100755
--- a/caravel/translations/zh/LC_MESSAGES/messages.po
+++ b/caravel/translations/zh/LC_MESSAGES/messages.po
@@ -20,75 +20,75 @@ msgstr ""
 
 #: caravel/forms.py:140
 msgid "Viz"
-msgstr "图表"
+msgstr "鍥捐〃"
 
 #: caravel/forms.py:143
 msgid "The type of visualization to display"
-msgstr "显示图表类型"
+msgstr "鏄剧ず鍥捐〃绫诲瀷"
 
 #: caravel/forms.py:146
 msgid "Metrics"
-msgstr "度量"
+msgstr "搴﹂噺"
 
 #: caravel/forms.py:149 caravel/forms.py:154
 msgid "One or many metrics to display"
-msgstr "显示一个或多个度量"
+msgstr "鏄剧ず涓�涓垨澶氫釜搴﹂噺"
 
 #: caravel/forms.py:152
 msgid "Ordering"
-msgstr "排序"
+msgstr "鎺掑簭"
 
 #: caravel/forms.py:157 caravel/views.py:294 caravel/views.py:334
 msgid "Metric"
-msgstr "度量"
+msgstr "搴﹂噺"
 
 #: caravel/forms.py:160
 msgid "Choose the metric"
-msgstr "选择度量"
+msgstr "閫夋嫨搴﹂噺"
 
 #: caravel/forms.py:163
 msgid "Chart Style"
-msgstr "图表样式"
+msgstr "鍥捐〃鏍峰紡"
 
 #: caravel/forms.py:165
 msgid "stack"
-msgstr "堆积"
+msgstr "鍫嗙Н"
 
 #: caravel/forms.py:166
 msgid "stream"
-msgstr "流"
+msgstr "娴�"
 
 #: caravel/forms.py:167
 msgid "expand"
-msgstr "展开"
+msgstr "灞曞紑"
 
 #: caravel/forms.py:173
 msgid "Color Scheme"
-msgstr "配色"
+msgstr "閰嶈壊"
 
 #: caravel/forms.py:175
 msgid "fire"
-msgstr "火焰"
+msgstr "鐏劙"
 
 #: caravel/forms.py:176
 msgid "blue_white_yellow"
-msgstr "蓝白黄"
+msgstr "钃濈櫧榛�"
 
 #: caravel/forms.py:177
 msgid "white_black"
-msgstr "白黑"
+msgstr "鐧介粦"
 
 #: caravel/forms.py:178
 msgid "black_white"
-msgstr "黑白"
+msgstr "榛戠櫧"
 
 #: caravel/forms.py:184
 msgid "Normalize Across"
-msgstr "标准化"
+msgstr "鏍囧噯鍖�"
 
 #: caravel/forms.py:186
 msgid "heatmap"
-msgstr "热力图"
+msgstr "鐑姏鍥�"
 
 #: caravel/forms.py:187
 msgid "x"
@@ -102,79 +102,79 @@ msgstr ""
 msgid ""
 "Color will be rendered based on a ratio of the cell against the sum of "
 "across this criteria"
-msgstr "颜色将根据比例进行渲染"
+msgstr "棰滆壊灏嗘牴鎹瘮渚嬭繘琛屾覆鏌�"
 
 #: caravel/forms.py:197
 msgid "Color Scale"
-msgstr "色阶"
+msgstr "鑹查樁"
 
 #: caravel/forms.py:199
 msgid "series"
-msgstr "项目"
+msgstr "椤圭洰"
 
 #: caravel/forms.py:200
 msgid "overall"
-msgstr "综合"
+msgstr "缁煎悎"
 
 #: caravel/forms.py:201
 msgid "change"
-msgstr "变化"
+msgstr "鍙樺寲"
 
 #: caravel/forms.py:204
 msgid "Defines how the color are attributed."
-msgstr "定义颜色属性"
+msgstr "瀹氫箟棰滆壊灞炴��"
 
 #: caravel/forms.py:207
 msgid "Rendering"
-msgstr "渲染"
+msgstr "娓叉煋"
 
 #: caravel/forms.py:209
 msgid "pixelated (Sharp)"
-msgstr "像素化(锐利)"
+msgstr "鍍忕礌鍖�(閿愬埄)"
 
 #: caravel/forms.py:210
 msgid "auto (Smooth)"
-msgstr "自动(平滑)"
+msgstr "鑷姩(骞虫粦)"
 
 #: caravel/forms.py:213
 msgid ""
 "image-rendering CSS attribute of the canvas object that defines how the "
 "browser scales up the image"
-msgstr "浏览器渲染图片的方式"
+msgstr "娴忚鍣ㄦ覆鏌撳浘鐗囩殑鏂瑰紡"
 
 #: caravel/forms.py:218
 msgid "XScale Interval"
-msgstr "X轴步长"
+msgstr "X杞存闀�"
 
 #: caravel/forms.py:221
 msgid "Number of step to take between ticks when printing the x scale"
-msgstr "X轴每个刻度的单位长度"
+msgstr "X杞存瘡涓埢搴︾殑鍗曚綅闀垮害"
 
 #: caravel/forms.py:226
 msgid "YScale Interval"
-msgstr "Y轴步长"
+msgstr "Y杞存闀�"
 
 #: caravel/forms.py:229
 msgid "Number of step to take between ticks when printing the y scale"
-msgstr "Y轴每个刻度的单位长度"
+msgstr "Y杞存瘡涓埢搴︾殑鍗曚綅闀垮害"
 
 #: caravel/forms.py:234
 msgid "Stacked Bars"
-msgstr "堆积"
+msgstr "鍫嗙Н"
 
 #: caravel/forms.py:239
 msgid "Extra Controls"
-msgstr "扩展控件"
+msgstr "鎵╁睍鎺т欢"
 
 #: caravel/forms.py:241
 msgid ""
 "Whether to show extra controls or not. Extra controls include things like"
 " making mulitBar charts stacked or side by side."
-msgstr "是否显示扩展控件"
+msgstr "鏄惁鏄剧ず鎵╁睍鎺т欢"
 
 #: caravel/forms.py:247
 msgid "Reduce X ticks"
-msgstr "X轴自适应"
+msgstr "X杞磋嚜閫傚簲"
 
 #: caravel/forms.py:249
 msgid ""
@@ -182,69 +182,69 @@ msgid ""
 "wont overflow and labels may be missing. If false, a minimum width will "
 "be applied to columns and the width may overflow into an horizontal "
 "scroll."
-msgstr "当X轴显示不下时，自动调整X轴步长"
+msgstr "褰揦杞存樉绀轰笉涓嬫椂锛岃嚜鍔ㄨ皟鏁碭杞存闀�"
 
 #: caravel/forms.py:257
 msgid "Include Series"
-msgstr "显示项目"
+msgstr "鏄剧ず椤圭洰"
 
 #: caravel/forms.py:259
 msgid "Include series name as an axis"
-msgstr "坐标上显示项目名称"
+msgstr "鍧愭爣涓婃樉绀洪」鐩悕绉�"
 
 #: caravel/forms.py:262
 msgid "Color Metric"
-msgstr "颜色度量"
+msgstr "棰滆壊搴﹂噺"
 
 #: caravel/forms.py:265
 msgid "A metric to use for color"
-msgstr "颜色度量项目"
+msgstr "棰滆壊搴﹂噺椤圭洰"
 
 #: caravel/forms.py:268
 msgid "Country Field Type"
-msgstr "国家名称编码方式"
+msgstr "鍥藉鍚嶇О缂栫爜鏂瑰紡"
 
 #: caravel/forms.py:271
 msgid "Full name"
-msgstr "全名"
+msgstr "鍏ㄥ悕"
 
 #: caravel/forms.py:272
 msgid "code International Olympic Committee (cioc)"
-msgstr "国际奥委会编码(cioc)"
+msgstr "鍥介檯濂ュ浼氱紪鐮�(cioc)"
 
 #: caravel/forms.py:273
 msgid "code ISO 3166-1 alpha-2 (cca2)"
-msgstr "ISO 3166-1 alpha-2编码(cca2)"
+msgstr "ISO 3166-1 alpha-2缂栫爜(cca2)"
 
 #: caravel/forms.py:274
 msgid "code ISO 3166-1 alpha-3 (cca3)"
-msgstr "ISO 3166-1 alpha-3编码(cca3)"
+msgstr "ISO 3166-1 alpha-3缂栫爜(cca3)"
 
 #: caravel/forms.py:276
 msgid ""
 "The country code standard that Caravel should expect to find in the "
 "[country] column"
-msgstr "数据库中国家名称类型"
+msgstr "鏁版嵁搴撲腑鍥藉鍚嶇О绫诲瀷"
 
 #: caravel/forms.py:281
 msgid "Group by"
-msgstr "分组"
+msgstr "鍒嗙粍"
 
 #: caravel/forms.py:283
 msgid "One or many fields to group by"
-msgstr "根据一个或多个字段分组"
+msgstr "鏍规嵁涓�涓垨澶氫釜瀛楁鍒嗙粍"
 
 #: caravel/forms.py:286 caravel/forms.py:291
 msgid "Columns"
-msgstr "列"
+msgstr "鍒�"
 
 #: caravel/forms.py:288
 msgid "One or many fields to pivot as columns"
-msgstr "将一个或多个字段做为列"
+msgstr "灏嗕竴涓垨澶氫釜瀛楁鍋氫负鍒�"
 
 #: caravel/forms.py:293 caravel/forms.py:298 caravel/forms.py:303
 msgid "Columns to display"
-msgstr "显示列"
+msgstr "鏄剧ず鍒�"
 
 #: caravel/forms.py:296
 msgid "X"
@@ -256,153 +256,153 @@ msgstr ""
 
 #: caravel/forms.py:306
 msgid "Origin"
-msgstr "起点"
+msgstr "璧风偣"
 
 #: caravel/forms.py:308
 msgid "default"
-msgstr "默认"
+msgstr "榛樿"
 
 #: caravel/forms.py:309 caravel/forms.py:467
 msgid "now"
-msgstr "现在"
+msgstr "鐜板湪"
 
 #: caravel/forms.py:312
 msgid ""
 "Defines the origin where time buckets start, accepts natural dates as in "
 "'now', 'sunday' or '1970-01-01'"
-msgstr "定义时间起点，支持'now', 'sunday' or '1970-01-01'等"
+msgstr "瀹氫箟鏃堕棿璧风偣锛屾敮鎸�'now', 'sunday' or '1970-01-01'绛�"
 
 #: caravel/forms.py:317
 msgid "Bottom Margin"
-msgstr "底部留白"
+msgstr "搴曢儴鐣欑櫧"
 
 #: caravel/forms.py:320
 msgid "Bottom marging, in pixels, allowing for more room for axis labels"
-msgstr "底部留白的像素大小"
+msgstr "搴曢儴鐣欑櫧鐨勫儚绱犲ぇ灏�"
 
 #: caravel/forms.py:325
 msgid "Time Granularity"
-msgstr "时间粒度"
+msgstr "鏃堕棿绮掑害"
 
 #: caravel/forms.py:328
 msgid "all"
-msgstr "全部"
+msgstr "鍏ㄩ儴"
 
 #: caravel/forms.py:329
 msgid "5 seconds"
-msgstr "5秒"
+msgstr "5绉�"
 
 #: caravel/forms.py:330
 msgid "30 seconds"
-msgstr "30秒"
+msgstr "30绉�"
 
 #: caravel/forms.py:331
 msgid "1 minute"
-msgstr "1分钟"
+msgstr "1鍒嗛挓"
 
 #: caravel/forms.py:332
 msgid "5 minutes"
-msgstr "5分钟"
+msgstr "5鍒嗛挓"
 
 #: caravel/forms.py:333
 msgid "1 hour"
-msgstr "1小时"
+msgstr "1灏忔椂"
 
 #: caravel/forms.py:334
 msgid "6 hour"
-msgstr "6小时"
+msgstr "6灏忔椂"
 
 #: caravel/forms.py:335
 msgid "1 day"
-msgstr "1天"
+msgstr "1澶�"
 
 #: caravel/forms.py:336
 msgid "7 days"
-msgstr "1周"
+msgstr "1鍛�"
 
 #: caravel/forms.py:338
 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 "图表时间粒度。可以使用'10 seconds', '1 day', '56 weeks'等"
+msgstr "鍥捐〃鏃堕棿绮掑害銆傚彲浠ヤ娇鐢�'10 seconds', '1 day', '56 weeks'绛�"
 
 #: caravel/forms.py:344
 msgid "Domain"
-msgstr "区域"
+msgstr "鍖哄煙"
 
 #: caravel/forms.py:347 caravel/forms.py:361 caravel/models.py:417
 #: caravel/models.py:435
 msgid "hour"
-msgstr "小时"
+msgstr "灏忔椂"
 
 #: caravel/forms.py:348 caravel/forms.py:362 caravel/models.py:419
 #: caravel/models.py:427 caravel/models.py:436
 msgid "day"
-msgstr "天"
+msgstr "澶�"
 
 #: caravel/forms.py:349 caravel/forms.py:363 caravel/models.py:407
 #: caravel/models.py:420 caravel/models.py:428 caravel/models.py:437
 msgid "week"
-msgstr "周"
+msgstr "鍛�"
 
 #: caravel/forms.py:350 caravel/forms.py:364 caravel/models.py:408
 #: caravel/models.py:422 caravel/models.py:429 caravel/models.py:438
 msgid "month"
-msgstr "月"
+msgstr "鏈�"
 
 #: caravel/forms.py:351 caravel/models.py:439
 msgid "year"
-msgstr "年"
+msgstr "骞�"
 
 #: caravel/forms.py:353
 msgid "The time unit used for the grouping of blocks"
-msgstr "每个区域表示的时间段"
+msgstr "姣忎釜鍖哄煙琛ㄧず鐨勬椂闂存"
 
 #: caravel/forms.py:357
 msgid "Subdomain"
-msgstr "方块"
+msgstr "鏂瑰潡"
 
 #: caravel/forms.py:360 caravel/forms.py:701
 msgid "min"
-msgstr "分钟"
+msgstr "鍒嗛挓"
 
 #: caravel/forms.py:366
 msgid ""
 "The time unit for each block. Should be a smaller unit than "
 "domain_granularity. Should be larger or equal to Time Grain"
-msgstr "每个区域内方块表示的时间段。必须比区域时间段小，比时间粒度大。"
+msgstr "姣忎釜鍖哄煙鍐呮柟鍧楄〃绀虹殑鏃堕棿娈点�傚繀椤绘瘮鍖哄煙鏃堕棿娈靛皬锛屾瘮鏃堕棿绮掑害澶с��"
 
 #: caravel/forms.py:371
 msgid "Link Length"
-msgstr "链接长度"
+msgstr "閾炬帴闀垮害"
 
 #: caravel/forms.py:383
 msgid "Link length in the force layout"
-msgstr "有向图中的链接长度"
+msgstr "鏈夊悜鍥句腑鐨勯摼鎺ラ暱搴�"
 
 #: caravel/forms.py:386
 msgid "Charge"
-msgstr "缩放"
+msgstr "缂╂斁"
 
 #: caravel/forms.py:400
 msgid "Charge in the force layout"
-msgstr "有向图缩放大小"
+msgstr "鏈夊悜鍥剧缉鏀惧ぇ灏�"
 
 #: caravel/forms.py:403 caravel/models.py:406 caravel/models.py:416
 #: caravel/models.py:426 caravel/models.py:432
 msgid "Time Column"
-msgstr "时间字段"
+msgstr "鏃堕棿瀛楁"
 
 #: caravel/forms.py:406
 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 "图表中的时间字段。可以在表格编辑器中返回任意DATETIME列。"
+"that the filter below is applied against this column or expression"
+msgstr "鍥捐〃涓殑鏃堕棿瀛楁銆傚彲浠ュ湪琛ㄦ牸缂栬緫鍣ㄤ腑杩斿洖浠绘剰DATETIME鍒椼��"
 
 #: caravel/forms.py:414
 msgid "Resample Rule"
-msgstr "重采样尺度"
+msgstr "閲嶉噰鏍峰昂搴�"
 
 #: caravel/forms.py:417
 msgid "1T"
@@ -430,31 +430,31 @@ msgstr ""
 
 #: caravel/forms.py:424
 msgid "Pandas resample rule"
-msgstr "重采样尺度"
+msgstr "閲嶉噰鏍峰昂搴�"
 
 #: caravel/forms.py:427
 msgid "Resample How"
-msgstr "重采样方式"
+msgstr "閲嶉噰鏍锋柟寮�"
 
 #: caravel/forms.py:431 caravel/forms.py:700
 msgid "mean"
-msgstr "平均值"
+msgstr "骞冲潎鍊�"
 
 #: caravel/forms.py:432 caravel/forms.py:699
 msgid "sum"
-msgstr "求和"
+msgstr "姹傚拰"
 
 #: caravel/forms.py:433 caravel/forms.py:703
 msgid "median"
-msgstr "中间值"
+msgstr "涓棿鍊�"
 
 #: caravel/forms.py:435
 msgid "Pandas resample how"
-msgstr "重采样方式"
+msgstr "閲嶉噰鏍锋柟寮�"
 
 #: caravel/forms.py:438
 msgid "Resample Fill Method"
-msgstr "插值方式"
+msgstr "鎻掑�兼柟寮�"
 
 #: caravel/forms.py:442
 msgid "ffill"
@@ -466,165 +466,165 @@ msgstr ""
 
 #: caravel/forms.py:445
 msgid "Pandas resample fill method"
-msgstr "重采样插值方式"
+msgstr "閲嶉噰鏍锋彃鍊兼柟寮�"
 
 #: caravel/forms.py:448
 msgid "Since"
-msgstr "起始时间"
+msgstr "璧峰鏃堕棿"
 
 #: caravel/forms.py:451
 msgid "1 hour ago"
-msgstr "1小时前"
+msgstr "1灏忔椂鍓�"
 
 #: caravel/forms.py:452
 msgid "12 hours ago"
-msgstr "12小时前"
+msgstr "12灏忔椂鍓�"
 
 #: caravel/forms.py:453 caravel/forms.py:468
 msgid "1 day ago"
-msgstr "1天前"
+msgstr "1澶╁墠"
 
 #: caravel/forms.py:454 caravel/forms.py:469
 msgid "7 days ago"
-msgstr "7天前"
+msgstr "7澶╁墠"
 
 #: caravel/forms.py:455 caravel/forms.py:470
 msgid "28 days ago"
-msgstr "28天前"
+msgstr "28澶╁墠"
 
 #: caravel/forms.py:456 caravel/forms.py:471
 msgid "90 days ago"
-msgstr "90天前"
+msgstr "90澶╁墠"
 
 #: caravel/forms.py:457 caravel/forms.py:472
 msgid "1 year ago"
-msgstr "1年前"
+msgstr "1骞村墠"
 
 #: caravel/forms.py:459
 msgid ""
 "Timestamp from filter. This supports free form typing and natural "
 "language as in '1 day ago', '28 days' or '3 years'"
-msgstr "时间范围。支持自定义，可使用自然语言，如'1 day ago', '28 days' or '3 years'"
+msgstr "鏃堕棿鑼冨洿銆傛敮鎸佽嚜瀹氫箟锛屽彲浣跨敤鑷劧璇█锛屽'1 day ago', '28 days' or '3 years'"
 
 #: caravel/forms.py:464
 msgid "Until"
-msgstr "结束时间"
+msgstr "缁撴潫鏃堕棿"
 
 #: caravel/forms.py:476
 msgid "Max Bubble Size"
-msgstr "气泡最大尺寸"
+msgstr "姘旀场鏈�澶у昂瀵�"
 
 #: caravel/forms.py:489
 msgid "Whisker/outlier options"
-msgstr "非异常值选项"
+msgstr "闈炲紓甯稿�奸�夐」"
 
 #: caravel/forms.py:491
 msgid "Determines how whiskers and outliers are calculated."
-msgstr "计算最大/最小非异常值的方法"
+msgstr "璁＄畻鏈�澶�/鏈�灏忛潪寮傚父鍊肩殑鏂规硶"
 
 #: caravel/forms.py:494
 msgid "Tukey"
-msgstr "图基法"
+msgstr "鍥惧熀娉�"
 
 #: caravel/forms.py:495
 msgid "Min/max (no outliers)"
-msgstr "最小/最大值(无异常值)"
+msgstr "鏈�灏�/鏈�澶у��(鏃犲紓甯稿��)"
 
 #: caravel/forms.py:496
 msgid "2/98 percentiles"
-msgstr "2/98百分比"
+msgstr "2/98鐧惧垎姣�"
 
 #: caravel/forms.py:497
 msgid "9/91 percentiles"
-msgstr "9/91百分比"
+msgstr "9/91鐧惧垎姣�"
 
 #: caravel/forms.py:501
 msgid "Ratio"
-msgstr "比例"
+msgstr "姣斾緥"
 
 #: caravel/forms.py:503
 msgid "Target aspect ratio for treemap tiles."
-msgstr "树状图中方块的比例"
+msgstr "鏍戠姸鍥句腑鏂瑰潡鐨勬瘮渚�"
 
 #: caravel/forms.py:506 caravel/viz.py:856 caravel/viz.py:905
 msgid "Number format"
-msgstr "数字格式"
+msgstr "鏁板瓧鏍煎紡"
 
 #: caravel/forms.py:516
 msgid ""
 "D3 format syntax for numbers https: //github.com/mbostock/\n"
 "d3/wiki/Formatting"
-msgstr "自定义格式请参考 https://github.com/mbostock/d3/wiki/Formatting"
+msgstr "鑷畾涔夋牸寮忚鍙傝�� https://github.com/mbostock/d3/wiki/Formatting"
 
 #: caravel/forms.py:521
 msgid "Row limit"
-msgstr "行数上限"
+msgstr "琛屾暟涓婇檺"
 
 #: caravel/forms.py:527
 msgid "Series limit"
-msgstr "项目上限"
+msgstr "椤圭洰涓婇檺"
 
 #: caravel/forms.py:530
 msgid "Limits the number of time series that get displayed"
-msgstr "设置显示项目的数量上限"
+msgstr "璁剧疆鏄剧ず椤圭洰鐨勬暟閲忎笂闄�"
 
 #: caravel/forms.py:534
 msgid "Rolling"
-msgstr "滚动"
+msgstr "婊氬姩"
 
 #: caravel/forms.py:537
 msgid ""
 "Defines a rolling window function to apply, works along with the "
 "[Periods] text box"
-msgstr "滚动窗口聚合函数，配合[周期]使用"
+msgstr "婊氬姩绐楀彛鑱氬悎鍑芥暟锛岄厤鍚圼鍛ㄦ湡]浣跨敤"
 
 #: caravel/forms.py:542
 msgid "Periods"
-msgstr "周期"
+msgstr "鍛ㄦ湡"
 
 #: caravel/forms.py:544
 msgid ""
 "Defines the size of the rolling window function, relative to the time "
 "granularity selected"
-msgstr "滚动窗口大小，取值和时间粒度相关"
+msgstr "婊氬姩绐楀彛澶у皬锛屽彇鍊煎拰鏃堕棿绮掑害鐩稿叧"
 
 #: caravel/forms.py:549 caravel/viz.py:1192
 msgid "Series"
-msgstr "项目"
+msgstr "椤圭洰"
 
 #: caravel/forms.py:552
 msgid ""
 "Defines the grouping of entities. Each serie is shown as a specific color"
 " on the chart and has a legend toggle"
-msgstr "定义分组实体。每个项目有特定的颜色和图例。"
+msgstr "瀹氫箟鍒嗙粍瀹炰綋銆傛瘡涓」鐩湁鐗瑰畾鐨勯鑹插拰鍥句緥銆�"
 
 #: caravel/forms.py:558
 msgid "Entity"
-msgstr "实体"
+msgstr "瀹炰綋"
 
 #: caravel/forms.py:561
 msgid "This define the element to be plotted on the chart"
-msgstr "在图表上绘制的元素"
+msgstr "鍦ㄥ浘琛ㄤ笂缁樺埗鐨勫厓绱�"
 
 #: caravel/forms.py:564
 msgid "X Axis"
-msgstr "X轴"
+msgstr "X杞�"
 
 #: caravel/forms.py:567
 msgid "Metric assigned to the [X] axis"
-msgstr "X轴对应的项目"
+msgstr "X杞村搴旂殑椤圭洰"
 
 #: caravel/forms.py:570
 msgid "Y Axis"
-msgstr "Y轴"
+msgstr "Y杞�"
 
 #: caravel/forms.py:573
 msgid "Metric assigned to the [Y] axis"
-msgstr "Y轴对应的项目"
+msgstr "Y杞村搴旂殑椤圭洰"
 
 #: caravel/forms.py:576
 msgid "Bubble Size"
-msgstr "气泡大小"
+msgstr "姘旀场澶у皬"
 
 #: caravel/forms.py:581
 msgid "URL"
@@ -638,83 +638,83 @@ msgstr ""
 
 #: caravel/forms.py:589
 msgid "X Axis Label"
-msgstr "X轴名称"
+msgstr "X杞村悕绉�"
 
 #: caravel/forms.py:593
 msgid "Y Axis Label"
-msgstr "Y轴名称"
+msgstr "Y杞村悕绉�"
 
 #: caravel/forms.py:597
 msgid "Custom WHERE clause"
-msgstr "WHERE语句"
+msgstr "WHERE璇彞"
 
 #: caravel/forms.py:599
 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 "语句将包含到WHERE子句中，并用AND连接到其他条件。"
+msgstr "璇彞灏嗗寘鍚埌WHERE瀛愬彞涓紝骞剁敤AND杩炴帴鍒板叾浠栨潯浠躲��"
 
 #: caravel/forms.py:606
 msgid "Custom HAVING clause"
-msgstr "HAVING语句"
+msgstr "HAVING璇彞"
 
 #: caravel/forms.py:608
 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 "语句将包含到HAVE子句中，并用AND连接到其他条件"
+msgstr "璇彞灏嗗寘鍚埌HAVE瀛愬彞涓紝骞剁敤AND杩炴帴鍒板叾浠栨潯浠�"
 
 #: caravel/forms.py:615
 msgid "Comparison Period Lag"
-msgstr "滞后比较周期"
+msgstr "婊炲悗姣旇緝鍛ㄦ湡"
 
 #: caravel/forms.py:616
 msgid "Based on granularity, number of time periods to compare against"
-msgstr "比较的时间周期，基于时间粒度"
+msgstr "姣旇緝鐨勬椂闂村懆鏈燂紝鍩轰簬鏃堕棿绮掑害"
 
 #: caravel/forms.py:621
 msgid "Comparison suffix"
-msgstr "后缀文字"
+msgstr "鍚庣紑鏂囧瓧"
 
 #: caravel/forms.py:622
 msgid "Suffix to apply after the percentage display"
-msgstr "百分比后面显示的文本"
+msgstr "鐧惧垎姣斿悗闈㈡樉绀虹殑鏂囨湰"
 
 #: caravel/forms.py:625
 msgid "Table Timestamp Format"
-msgstr "时间格式"
+msgstr "鏃堕棿鏍煎紡"
 
 #: caravel/forms.py:628
 msgid "Timestamp Format"
-msgstr "时间格式"
+msgstr "鏃堕棿鏍煎紡"
 
 #: caravel/forms.py:631
 msgid "Series Height"
-msgstr "项目高度"
+msgstr "椤圭洰楂樺害"
 
 #: caravel/forms.py:634
 msgid "Pixel height of each series"
-msgstr "每个项目的像素高度"
+msgstr "姣忎釜椤圭洰鐨勫儚绱犻珮搴�"
 
 #: caravel/forms.py:637
 msgid "X axis format"
-msgstr "X轴数值格式"
+msgstr "X杞存暟鍊兼牸寮�"
 
 #: caravel/forms.py:640 caravel/forms.py:655
 msgid ""
 "D3 format syntax for y axis https: //github.com/mbostock/\n"
 "d3/wiki/Formatting"
-msgstr "自定义格式请参考 https://github.com/mbostock/d3/wiki/Formatting"
+msgstr "鑷畾涔夋牸寮忚鍙傝�� https://github.com/mbostock/d3/wiki/Formatting"
 
 #: caravel/forms.py:645
 msgid "Y axis format"
-msgstr "Y轴数值格式"
+msgstr "Y杞存暟鍊兼牸寮�"
 
 #: caravel/forms.py:660
 msgid "Markup Type"
-msgstr "标记类型"
+msgstr "鏍囪绫诲瀷"
 
 #: caravel/forms.py:662
 msgid "markdown"
@@ -726,236 +726,236 @@ msgstr ""
 
 #: caravel/forms.py:666
 msgid "Pick your favorite markup language"
-msgstr "选择标记语言"
+msgstr "閫夋嫨鏍囪璇█"
 
 #: caravel/forms.py:669
 msgid "Rotation"
-msgstr "旋转"
+msgstr "鏃嬭浆"
 
 #: caravel/forms.py:671
 msgid "random"
-msgstr "随机"
+msgstr "闅忔満"
 
 #: caravel/forms.py:672
 msgid "flat"
-msgstr "水平"
+msgstr "姘村钩"
 
 #: caravel/forms.py:673
 msgid "square"
-msgstr "方格"
+msgstr "鏂规牸"
 
 #: caravel/forms.py:676
 msgid "Rotation to apply to words in the cloud"
-msgstr "词汇云中词语的旋转方式"
+msgstr "璇嶆眹浜戜腑璇嶈鐨勬棆杞柟寮�"
 
 #: caravel/forms.py:679
 msgid "Line Style"
-msgstr "线形"
+msgstr "绾垮舰"
 
 #: caravel/forms.py:681
 msgid "linear"
-msgstr "折线"
+msgstr "鎶樼嚎"
 
 #: caravel/forms.py:682
 msgid "basis"
-msgstr "B样条曲线"
+msgstr "B鏍锋潯鏇茬嚎"
 
 #: caravel/forms.py:683
 msgid "cardinal"
-msgstr "基本样条曲线"
+msgstr "鍩烘湰鏍锋潯鏇茬嚎"
 
 #: caravel/forms.py:684
 msgid "monotone"
-msgstr "三次插值曲线"
+msgstr "涓夋鎻掑�兼洸绾�"
 
 #: caravel/forms.py:685
 msgid "step-before"
-msgstr "前阶梯线"
+msgstr "鍓嶉樁姊嚎"
 
 #: caravel/forms.py:686
 msgid "step-after"
-msgstr "后阶梯线"
+msgstr "鍚庨樁姊嚎"
 
 #: caravel/forms.py:689
 msgid "Line interpolation as defined by d3.js"
-msgstr "定义线形"
+msgstr "瀹氫箟绾垮舰"
 
 #: caravel/forms.py:692
 msgid "Code"
-msgstr "代码"
+msgstr "浠ｇ爜"
 
 #: caravel/forms.py:693
 msgid "Put your code here"
-msgstr "输入代码"
+msgstr "杈撳叆浠ｇ爜"
 
 #: caravel/forms.py:697
 msgid "Aggregation function"
-msgstr "聚合函数"
+msgstr "鑱氬悎鍑芥暟"
 
 #: caravel/forms.py:702
 msgid "max"
-msgstr "最大值"
+msgstr "鏈�澶у��"
 
 #: caravel/forms.py:704
 msgid "stdev"
-msgstr "标准差"
+msgstr "鏍囧噯宸�"
 
 #: caravel/forms.py:705
 msgid "var"
-msgstr "变量值"
+msgstr "鍙橀噺鍊�"
 
 #: caravel/forms.py:708
 msgid ""
 "Aggregate function to apply when pivoting and computing the total rows "
 "and columns"
-msgstr "透视时计算行和列的聚合函数"
+msgstr "閫忚鏃惰绠楄鍜屽垪鐨勮仛鍚堝嚱鏁�"
 
 #: caravel/forms.py:713
 msgid "Font Size From"
-msgstr "最小字体"
+msgstr "鏈�灏忓瓧浣�"
 
 #: caravel/forms.py:715
 msgid "Font size for the smallest value in the list"
-msgstr "列表中最小值的字体大小"
+msgstr "鍒楄〃涓渶灏忓�肩殑瀛椾綋澶у皬"
 
 #: caravel/forms.py:718
 msgid "Font Size To"
-msgstr "最大字体"
+msgstr "鏈�澶у瓧浣�"
 
 #: caravel/forms.py:720
 msgid "Font size for the biggest value in the list"
-msgstr "列表中最大值的字体大小"
+msgstr "鍒楄〃涓渶澶у�肩殑瀛椾綋澶у皬"
 
 #: caravel/forms.py:723
 msgid "Range Filter"
-msgstr "区间过滤"
+msgstr "鍖洪棿杩囨护"
 
 #: caravel/forms.py:725
 msgid "Whether to display the time range interactive selector"
-msgstr "是否显示时间区间选择控件"
+msgstr "鏄惁鏄剧ず鏃堕棿鍖洪棿閫夋嫨鎺т欢"
 
 #: caravel/forms.py:729
 msgid "Data Table"
-msgstr "明细表"
+msgstr "鏄庣粏琛�"
 
 #: caravel/forms.py:731
 msgid "Whether to display the interactive data table"
-msgstr "是否显示明细表"
+msgstr "鏄惁鏄剧ず鏄庣粏琛�"
 
 #: caravel/forms.py:734
 msgid "Search Box"
-msgstr "搜索框"
+msgstr "鎼滅储妗�"
 
 #: caravel/forms.py:736
 msgid "Whether to include a client side search box"
-msgstr "是否显示搜索框"
+msgstr "鏄惁鏄剧ず鎼滅储妗�"
 
 #: caravel/forms.py:740
 msgid "Show Bubbles"
-msgstr "显示气泡"
+msgstr "鏄剧ず姘旀场"
 
 #: caravel/forms.py:742
 msgid "Whether to display bubbles on top of countries"
-msgstr "是否在国家上显示气泡"
+msgstr "鏄惁鍦ㄥ浗瀹朵笂鏄剧ず姘旀场"
 
 #: caravel/forms.py:746
 msgid "Legend"
-msgstr "图例"
+msgstr "鍥句緥"
 
 #: caravel/forms.py:748
 msgid "Whether to display the legend (toggles)"
-msgstr "是否显示图例"
+msgstr "鏄惁鏄剧ず鍥句緥"
 
 #: caravel/forms.py:751
 msgid "X bounds"
-msgstr "X轴边界"
+msgstr "X杞磋竟鐣�"
 
 #: caravel/forms.py:753
 msgid "Whether to display the min and max values of the X axis"
-msgstr "是否显示X轴的最大最小值"
+msgstr "鏄惁鏄剧ずX杞寸殑鏈�澶ф渶灏忓��"
 
 #: caravel/forms.py:757
 msgid "Rich Tooltip"
-msgstr "详细信息"
+msgstr "璇︾粏淇℃伅"
 
 #: caravel/forms.py:759
 msgid "The rich tooltip shows a list of all series for that point in time"
-msgstr "显示特定时间点的所有项目"
+msgstr "鏄剧ず鐗瑰畾鏃堕棿鐐圭殑鎵�鏈夐」鐩�"
 
 #: caravel/forms.py:764
 msgid "Y Axis Zero"
-msgstr "Y轴从0开始"
+msgstr "Y杞翠粠0寮�濮�"
 
 #: caravel/forms.py:766
 msgid "Force the Y axis to start at 0 instead of the minimum value"
-msgstr "Y轴不是从最小值开始"
+msgstr "Y杞翠笉鏄粠鏈�灏忓�煎紑濮�"
 
 #: caravel/forms.py:771
 msgid "Y Log"
-msgstr "Y轴对数刻度"
+msgstr "Y杞村鏁板埢搴�"
 
 #: caravel/forms.py:773
 msgid "Use a log scale for the Y axis"
-msgstr "Y轴刻度值按照对数分布显示"
+msgstr "Y杞村埢搴﹀�兼寜鐓у鏁板垎甯冩樉绀�"
 
 #: caravel/forms.py:776
 msgid "X Log"
-msgstr "X轴对数刻度"
+msgstr "X杞村鏁板埢搴�"
 
 #: caravel/forms.py:778
 msgid "Use a log scale for the X axis"
-msgstr "X轴刻度值按照对数分布显示"
+msgstr "X杞村埢搴﹀�兼寜鐓у鏁板垎甯冩樉绀�"
 
 #: caravel/forms.py:781
 msgid "Donut"
-msgstr "环形图"
+msgstr "鐜舰鍥�"
 
 #: caravel/forms.py:783
 msgid "Do you want a donut or a pie?"
-msgstr "使用环形图替代饼图"
+msgstr "浣跨敤鐜舰鍥炬浛浠ｉゼ鍥�"
 
 #: caravel/forms.py:786
 msgid "Contribution"
-msgstr "贡献值"
+msgstr "璐＄尞鍊�"
 
 #: caravel/forms.py:788
 msgid "Compute the contribution to the total"
-msgstr "在总和中的贡献值"
+msgstr "鍦ㄦ�诲拰涓殑璐＄尞鍊�"
 
 #: caravel/forms.py:791
 msgid "Period Ratio"
-msgstr "周期比"
+msgstr "鍛ㄦ湡姣�"
 
 #: caravel/forms.py:794
 msgid ""
 "[integer] Number of period to compare against, this is relative to the "
 "granularity selected"
-msgstr "[整数]要比较的周期数，和粒度有关"
+msgstr "[鏁存暟]瑕佹瘮杈冪殑鍛ㄦ湡鏁帮紝鍜岀矑搴︽湁鍏�"
 
 #: caravel/forms.py:799
 msgid "Time Shift"
-msgstr "时间飘移"
+msgstr "鏃堕棿椋樼Щ"
 
 #: caravel/forms.py:801
 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 "相关时间周期内的时间偏移。相对时间，如:  24 hours, 7 days, 56 weeks, 365 days"
+msgstr "鐩稿叧鏃堕棿鍛ㄦ湡鍐呯殑鏃堕棿鍋忕Щ銆傜浉瀵规椂闂达紝濡�:  24 hours, 7 days, 56 weeks, 365 days"
 
 #: caravel/forms.py:808
 msgid "Subheader"
-msgstr "子标题"
+msgstr "瀛愭爣棰�"
 
 #: caravel/forms.py:809
 msgid "Description text that shows up below your Big Number"
-msgstr "在数字下显示的文本"
+msgstr "鍦ㄦ暟瀛椾笅鏄剧ず鐨勬枃鏈�"
 
 #: caravel/forms.py:816
 msgid ""
 "'count' is COUNT(*) if a group by is used. Numerical columns will be "
 "aggregated with the aggregator. Non-numerical columns will be used to "
 "label points. Leave empty to get a count of points in each cluster."
-msgstr "对分组使用COUNT(*)。"
+msgstr "瀵瑰垎缁勪娇鐢–OUNT(*)銆�"
 
 #: caravel/forms.py:832
 msgid "Base layer map style"
@@ -963,33 +963,33 @@ msgstr ""
 
 #: caravel/forms.py:835
 msgid "Clustering Radius"
-msgstr "簇半径"
+msgstr "绨囧崐寰�"
 
 #: caravel/forms.py:848
 msgid ""
 "The radius (in pixels) the algorithm uses to define a cluster. Choose 0 "
 "to turn off clustering, but beware that a large number of points (>1000) "
 "will cause lag."
-msgstr "定义簇的半径大小(单位为像素)。0表示不显示簇。大量的点会导致显示缓慢。"
+msgstr "瀹氫箟绨囩殑鍗婂緞澶у皬(鍗曚綅涓哄儚绱�)銆�0琛ㄧず涓嶆樉绀虹皣銆傚ぇ閲忕殑鐐逛細瀵艰嚧鏄剧ず缂撴參銆�"
 
 #: caravel/forms.py:854
 msgid "Point Radius"
-msgstr "点半径"
+msgstr "鐐瑰崐寰�"
 
 #: caravel/forms.py:857
 msgid ""
 "The radius of individual points (ones that are not in a cluster). Either "
 "a numerical column or 'Auto', which scales the point based on the largest"
 " cluster"
-msgstr "不在簇中点的半径。选择'Auto'时根据最大的簇自动调整。"
+msgstr "涓嶅湪绨囦腑鐐圭殑鍗婂緞銆傞�夋嫨'Auto'鏃舵牴鎹渶澶х殑绨囪嚜鍔ㄨ皟鏁淬��"
 
 #: caravel/forms.py:863
 msgid "Point Radius Unit"
-msgstr "点半径单位"
+msgstr "鐐瑰崐寰勫崟浣�"
 
 #: caravel/forms.py:870
 msgid "The unit of measure for the specified point radius"
-msgstr "点半径的测量单位"
+msgstr "鐐瑰崐寰勭殑娴嬮噺鍗曚綅"
 
 #: caravel/forms.py:873
 msgid "Opacity"
@@ -1009,27 +1009,27 @@ msgstr ""
 
 #: caravel/forms.py:887
 msgid "Default latitude"
-msgstr "默认纬度"
+msgstr "榛樿绾害"
 
 #: caravel/forms.py:889
 msgid "Latitude of default viewport"
-msgstr "视窗默认纬度"
+msgstr "瑙嗙獥榛樿绾害"
 
 #: caravel/forms.py:893
 msgid "Default longitude"
-msgstr "默认经度"
+msgstr "榛樿缁忓害"
 
 #: caravel/forms.py:895
 msgid "Longitude of default viewport"
-msgstr "视窗默认经度"
+msgstr "瑙嗙獥榛樿缁忓害"
 
 #: caravel/forms.py:899
 msgid "Live render"
-msgstr "实时更新"
+msgstr "瀹炴椂鏇存柊"
 
 #: caravel/forms.py:901
 msgid "Points and clusters will update as viewport is being changed"
-msgstr "视窗发生改变时，点和簇实时更新"
+msgstr "瑙嗙獥鍙戠敓鏀瑰彉鏃讹紝鐐瑰拰绨囧疄鏃舵洿鏂�"
 
 #: caravel/forms.py:905
 msgid "RGB Color"
@@ -1045,11 +1045,11 @@ msgstr ""
 
 #: caravel/forms.py:980
 msgid "This section exposes ways to include snippets of SQL in your query"
-msgstr "用于定制SQL语句"
+msgstr "鐢ㄤ簬瀹氬埗SQL璇彞"
 
 #: caravel/forms.py:991
 msgid "Time Grain"
-msgstr "时间粒度"
+msgstr "鏃堕棿绮掑害"
 
 #: caravel/forms.py:994
 msgid ""
@@ -1057,7 +1057,7 @@ msgid ""
 "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 "图表中的时间粒度。用于替换时间字段默认的时间粒度。"
+msgstr "鍥捐〃涓殑鏃堕棿绮掑害銆傜敤浜庢浛鎹㈡椂闂村瓧娈甸粯璁ょ殑鏃堕棿绮掑害銆�"
 
 #: caravel/forms.py:1027 caravel/forms.py:1031
 msgid "Filter 1"
@@ -1069,125 +1069,125 @@ msgstr ""
 
 #: caravel/forms.py:1040
 msgid "Time"
-msgstr "时间"
+msgstr "鏃堕棿"
 
 #: caravel/forms.py:1045
 msgid "Time related form attributes"
-msgstr "时间相关的属性"
+msgstr "鏃堕棿鐩稿叧鐨勫睘鎬�"
 
 #: caravel/models.py:409
 msgid "quarter"
-msgstr "季度"
+msgstr "瀛ｅ害"
 
 #: caravel/models.py:410
 msgid "week_ending_saturday"
-msgstr "周日为一周开始"
+msgstr "鍛ㄦ棩涓轰竴鍛ㄥ紑濮�"
 
 #: caravel/models.py:412
 msgid "week_start_sunday"
-msgstr "周日为一周结束"
+msgstr "鍛ㄦ棩涓轰竴鍛ㄧ粨鏉�"
 
 #: caravel/models.py:433
 msgid "second"
-msgstr "秒"
+msgstr "绉�"
 
 #: caravel/models.py:434
 msgid "minute"
-msgstr "分"
+msgstr "鍒�"
 
 #: caravel/models.py:620
 msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
-msgstr "缺少时间字段"
+msgstr "缂哄皯鏃堕棿瀛楁"
 
 #: caravel/models.py:1328
 msgid "No data was returned."
-msgstr "没有数据"
+msgstr "娌℃湁鏁版嵁"
 
 #: caravel/views.py:203
 msgid ""
 "Whether to make this column available as a [Time Granularity] option, "
 "column has to be DATETIME or DATETIME-like"
-msgstr "是否将此列作为[时间粒度]选项, 列中的数据类型必须是DATETIME"
+msgstr "鏄惁灏嗘鍒椾綔涓篬鏃堕棿绮掑害]閫夐」, 鍒椾腑鐨勬暟鎹被鍨嬪繀椤绘槸DATETIME"
 
 #: caravel/views.py:230 caravel/views.py:259
 msgid "Column"
-msgstr "列"
+msgstr "鍒�"
 
 #: caravel/views.py:231 caravel/views.py:296 caravel/views.py:336
 msgid "Verbose Name"
-msgstr "全称"
+msgstr "鍏ㄧО"
 
 #: caravel/views.py:232 caravel/views.py:295 caravel/views.py:335
 #: caravel/views.py:537 caravel/views.py:691
 msgid "Description"
-msgstr "描述"
+msgstr "鎻忚堪"
 
 #: caravel/views.py:233 caravel/views.py:262
 msgid "Groupable"
-msgstr "可分组"
+msgstr "鍙垎缁�"
 
 #: caravel/views.py:234 caravel/views.py:263
 msgid "Filterable"
-msgstr "可筛选"
+msgstr "鍙瓫閫�"
 
 #: caravel/views.py:235 caravel/views.py:299 caravel/views.py:433
 #: caravel/views.py:543
 msgid "Table"
-msgstr "表"
+msgstr "琛�"
 
 #: caravel/views.py:236 caravel/views.py:264
 msgid "Count Distinct"
-msgstr "计数"
+msgstr "璁℃暟"
 
 #: caravel/views.py:237 caravel/views.py:265
 msgid "Sum"
-msgstr "求和"
+msgstr "姹傚拰"
 
 #: caravel/views.py:238 caravel/views.py:266
 msgid "Min"
-msgstr "最小值"
+msgstr "鏈�灏忓��"
 
 #: caravel/views.py:239 caravel/views.py:267
 msgid "Max"
-msgstr "最大值"
+msgstr "鏈�澶у��"
 
 #: caravel/views.py:240
 msgid "Expression"
-msgstr "表达式"
+msgstr "琛ㄨ揪寮�"
 
 #: caravel/views.py:241
 msgid "Is temporal"
-msgstr "表示时间"
+msgstr "琛ㄧず鏃堕棿"
 
 #: caravel/views.py:242
 msgid "Datetime Format"
-msgstr "时间格式"
+msgstr "鏃堕棿鏍煎紡"
 
 #: caravel/views.py:243
 msgid "Database Expression"
-msgstr "数据库表达式"
+msgstr "鏁版嵁搴撹〃杈惧紡"
 
 #: caravel/views.py:260 caravel/views.py:297 caravel/views.py:337
 #: caravel/views.py:568
 msgid "Type"
-msgstr "类型"
+msgstr "绫诲瀷"
 
 #: caravel/views.py:261 caravel/views.py:536
 msgid "Datasource"
-msgstr "数据源"
+msgstr "鏁版嵁婧�"
 
 #: caravel/views.py:286 caravel/views.py:328
 msgid ""
 "Whether the access to this metric is restricted to certain roles. Only "
 "roles with the permission 'metric access on XXX (the name of this "
 "metric)' are allowed to access this metric"
-msgstr "是否访问受限。只有有权限的用户才能访问。"
+msgstr "鏄惁璁块棶鍙楅檺銆傚彧鏈夋湁鏉冮檺鐨勭敤鎴锋墠鑳借闂��"
 
 #: caravel/views.py:298
 msgid "SQL Expression"
-msgstr "SQL表达式"
+msgstr "SQL琛ㄨ揪寮�"
 
 #: caravel/views.py:338 caravel/views.py:656
 msgid "JSON"
@@ -1195,23 +1195,23 @@ msgstr ""
 
 #: caravel/views.py:339
 msgid "Druid Datasource"
-msgstr "Druid数据源"
+msgstr "Druid鏁版嵁婧�"
 
 #: caravel/views.py:378 caravel/views.py:435
 msgid "Database"
-msgstr "数据库"
+msgstr "鏁版嵁搴�"
 
 #: caravel/views.py:379
 msgid "SQL link"
-msgstr "SQL查询"
+msgstr "SQL鏌ヨ"
 
 #: caravel/views.py:380 caravel/views.py:534 caravel/views.py:610
 msgid "Creator"
-msgstr "作者"
+msgstr "浣滆��"
 
 #: caravel/views.py:381 caravel/views.py:436
 msgid "Last Changed"
-msgstr "更新时间"
+msgstr "鏇存柊鏃堕棿"
 
 #: caravel/views.py:382
 msgid "SQLAlchemy URI"
@@ -1220,27 +1220,27 @@ msgstr ""
 #: caravel/views.py:383 caravel/views.py:442 caravel/views.py:533
 #: caravel/views.py:697
 msgid "Cache Timeout"
-msgstr "缓存时间"
+msgstr "缂撳瓨鏃堕棿"
 
 #: caravel/views.py:384
 msgid "Extra"
-msgstr "扩展"
+msgstr "鎵╁睍"
 
 #: caravel/views.py:434
 msgid "Changed By"
-msgstr "修改人"
+msgstr "淇敼浜�"
 
 #: caravel/views.py:437
 msgid "SQL Editor"
-msgstr "SQL查询"
+msgstr "SQL鏌ヨ"
 
 #: caravel/views.py:438 caravel/views.py:693
 msgid "Is Featured"
-msgstr "是否突出"
+msgstr "鏄惁绐佸嚭"
 
 #: caravel/views.py:439
 msgid "Schema"
-msgstr "模式"
+msgstr "妯″紡"
 
 #: caravel/views.py:440 caravel/views.py:695
 msgid "Default Endpoint"
@@ -1248,11 +1248,11 @@ msgstr ""
 
 #: caravel/views.py:441
 msgid "Offset"
-msgstr "偏移"
+msgstr "鍋忕Щ"
 
 #: caravel/views.py:482 caravel/views.py:690
 msgid "Cluster"
-msgstr "集群"
+msgstr "闆嗙兢"
 
 #: caravel/views.py:483
 msgid "Coordinator Host"
@@ -1284,75 +1284,75 @@ msgid ""
 "overwrite button in the explore view. This JSON object is exposed here "
 "for reference and for power users who may want to alter specific "
 "parameters."
-msgstr "当单击“保存”或“覆盖”按钮时，这些参数会在视图中动态生成。高级用户可以在这里改变特定的参数。"
+msgstr "褰撳崟鍑烩�滀繚瀛樷�濇垨鈥滆鐩栤�濇寜閽椂锛岃繖浜涘弬鏁颁細鍦ㄨ鍥句腑鍔ㄦ�佺敓鎴愩�傞珮绾х敤鎴峰彲浠ュ湪杩欓噷鏀瑰彉鐗瑰畾鐨勫弬鏁般��"
 
 #: caravel/views.py:527
 msgid "Duration (in seconds) of the caching timeout for this slice."
-msgstr "切片数据过期时间(秒)"
+msgstr "鍒囩墖鏁版嵁杩囨湡鏃堕棿(绉�)"
 
 #: caravel/templates/caravel/welcome.html:26 caravel/views.py:535
 msgid "Dashboards"
-msgstr "看板"
+msgstr "鐪嬫澘"
 
 #: caravel/views.py:538
 msgid "Last Modified"
-msgstr "最后修改"
+msgstr "鏈�鍚庝慨鏀�"
 
 #: caravel/views.py:539 caravel/views.py:609
 msgid "Owners"
-msgstr "所有者"
+msgstr "鎵�鏈夎��"
 
 #: caravel/views.py:540
 msgid "Parameters"
-msgstr "参数"
+msgstr "鍙傛暟"
 
 #: caravel/views.py:541 caravel/views.py:569
 msgid "Slice"
-msgstr "切片"
+msgstr "鍒囩墖"
 
 #: caravel/views.py:542
 msgid "Name"
-msgstr "名字"
+msgstr "鍚嶅瓧"
 
 #: caravel/views.py:544 caravel/views.py:570
 msgid "Visualization Type"
-msgstr "图表类型"
+msgstr "鍥捐〃绫诲瀷"
 
 #: caravel/views.py:586
 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:591
 msgid ""
 "The css for individual dashboards can be altered here, or in the "
 "dashboard view where changes are immediately visible"
-msgstr "可以在这里或者在看板视图修改单个看板的CSS样式"
+msgstr "鍙互鍦ㄨ繖閲屾垨鑰呭湪鐪嬫澘瑙嗗浘淇敼鍗曚釜鐪嬫澘鐨凜SS鏍峰紡"
 
 #: caravel/views.py:595
 msgid "To get a readable URL for your dashboard"
-msgstr "为看板生成一个可读的URL"
+msgstr "涓虹湅鏉跨敓鎴愪竴涓彲璇荤殑URL"
 
 #: caravel/views.py:596
 msgid ""
 "This JSON object is generated dynamically when clicking the save or "
 "overwrite button in the dashboard view. It is exposed here for reference "
 "and for power users who may want to alter specific parameters."
-msgstr "当在看板视图中单击“保存”或“覆盖”按钮时，这些参数会在视图中动态生成。高级用户可以在这里改变特定的参数。"
+msgstr "褰撳湪鐪嬫澘瑙嗗浘涓崟鍑烩�滀繚瀛樷�濇垨鈥滆鐩栤�濇寜閽椂锛岃繖浜涘弬鏁颁細鍦ㄨ鍥句腑鍔ㄦ�佺敓鎴愩�傞珮绾х敤鎴峰彲浠ュ湪杩欓噷鏀瑰彉鐗瑰畾鐨勫弬鏁般��"
 
 #: caravel/views.py:601
 msgid "Owners is a list of users who can alter the dashboard."
-msgstr "“所有者”是一组可以修改看板的用户列表"
+msgstr "鈥滄墍鏈夎�呪�濇槸涓�缁勫彲浠ヤ慨鏀圭湅鏉跨殑鐢ㄦ埛鍒楄〃"
 
 #: caravel/views.py:605
 msgid "Dashboard"
-msgstr "看板"
+msgstr "鐪嬫澘"
 
 #: caravel/views.py:606
 msgid "Title"
-msgstr "标题"
+msgstr "鏍囬"
 
 #: caravel/views.py:607
 msgid "Slug"
@@ -1360,15 +1360,15 @@ msgstr ""
 
 #: caravel/views.py:608
 msgid "Slices"
-msgstr "切片"
+msgstr "鍒囩墖"
 
 #: caravel/views.py:611
 msgid "Modified"
-msgstr "已修改"
+msgstr "宸蹭慨鏀�"
 
 #: caravel/views.py:612
 msgid "Position JSON"
-msgstr "位置参数"
+msgstr "浣嶇疆鍙傛暟"
 
 #: caravel/views.py:613
 msgid "CSS"
@@ -1376,19 +1376,19 @@ msgstr ""
 
 #: caravel/views.py:614
 msgid "JSON Metadata"
-msgstr "JSON模板"
+msgstr "JSON妯℃澘"
 
 #: caravel/views.py:615
 msgid "Underlying Tables"
-msgstr "底层表"
+msgstr "搴曞眰琛�"
 
 #: caravel/views.py:653
 msgid "User"
-msgstr "用户"
+msgstr "鐢ㄦ埛"
 
 #: caravel/views.py:654
 msgid "Action"
-msgstr "操作"
+msgstr "鎿嶄綔"
 
 #: caravel/views.py:655
 msgid "dttm"
@@ -1396,233 +1396,233 @@ msgstr "DTTM"
 
 #: caravel/views.py:683
 msgid "Timezone offset (in hours) for this datasource"
-msgstr "数据源的时差(单位：小时)"
+msgstr "鏁版嵁婧愮殑鏃跺樊(鍗曚綅锛氬皬鏃�)"
 
 #: caravel/views.py:689
 msgid "Data Source"
-msgstr "数据源"
+msgstr "鏁版嵁婧�"
 
 #: caravel/views.py:692
 msgid "Owner"
-msgstr "所有者"
+msgstr "鎵�鏈夎��"
 
 #: caravel/views.py:694
 msgid "Is Hidden"
-msgstr "隐藏"
+msgstr "闅愯棌"
 
 #: caravel/views.py:696
 msgid "Time Offset"
-msgstr "时间偏移"
+msgstr "鏃堕棿鍋忕Щ"
 
 #: caravel/views.py:1176
 msgid "This view requires the `all_datasource_access` permission"
-msgstr "本视图需要`访问所有数据`的权限"
+msgstr "鏈鍥鹃渶瑕乣璁块棶鎵�鏈夋暟鎹甡鐨勬潈闄�"
 
 #: caravel/views.py:1249
 msgid "Refresh Druid Metadata"
-msgstr "刷新Druid元数据"
+msgstr "鍒锋柊Druid鍏冩暟鎹�"
 
 #: caravel/viz.py:367
 msgid "Table View"
-msgstr "表视图"
+msgstr "琛ㄨ鍥�"
 
 #: caravel/viz.py:370
 msgid "GROUP BY"
-msgstr "分组"
+msgstr "鍒嗙粍"
 
 #: caravel/viz.py:371
 msgid "Use this section if you want a query that aggregates"
-msgstr "进行聚合查询"
+msgstr "杩涜鑱氬悎鏌ヨ"
 
 #: caravel/viz.py:374
 msgid "NOT GROUPED BY"
-msgstr "不分组"
+msgstr "涓嶅垎缁�"
 
 #: caravel/viz.py:375
 msgid "Use this section if you want to query atomic rows"
-msgstr "进行非聚合查询"
+msgstr "杩涜闈炶仛鍚堟煡璇�"
 
 #: caravel/viz.py:378
 msgid "Options"
-msgstr "选项"
+msgstr "閫夐」"
 
 #: caravel/viz.py:429
 msgid "Pivot Table"
-msgstr "透视表"
+msgstr "閫忚琛�"
 
 #: caravel/viz.py:491
 msgid "Markup"
-msgstr "标记"
+msgstr "鏍囪"
 
 #: caravel/viz.py:519
 msgid "Word Cloud"
-msgstr "词汇云"
+msgstr "璇嶆眹浜�"
 
 #: caravel/viz.py:551
 msgid "Treemap"
-msgstr "树状图"
+msgstr "鏍戠姸鍥�"
 
 #: caravel/viz.py:561 caravel/viz.py:676 caravel/viz.py:783 caravel/viz.py:948
 #: caravel/viz.py:1093 caravel/viz.py:1122 caravel/viz.py:1177
 #: caravel/viz.py:1682
 msgid "Chart Options"
-msgstr "图表选项"
+msgstr "鍥捐〃閫夐」"
 
 #: caravel/viz.py:595
 msgid "Calender Heatmap"
-msgstr "时间热力图"
+msgstr "鏃堕棿鐑姏鍥�"
 
 #: caravel/viz.py:666
 msgid "Box Plot"
-msgstr "箱线图"
+msgstr "绠辩嚎鍥�"
 
 #: caravel/viz.py:773
 msgid "Bubble Chart"
-msgstr "气泡图"
+msgstr "姘旀场鍥�"
 
 #: caravel/viz.py:842
 msgid "Big Number with Trendline"
-msgstr "数字和趋势线"
+msgstr "鏁板瓧鍜岃秼鍔跨嚎"
 
 #: caravel/viz.py:892
 msgid "Big Number"
-msgstr "数字"
+msgstr "鏁板瓧"
 
 #: caravel/viz.py:938
 msgid "Time Series - Line Chart"
-msgstr "时间序列-折线图"
+msgstr "鏃堕棿搴忓垪-鎶樼嚎鍥�"
 
 #: caravel/viz.py:958
 msgid "Advanced Analytics"
-msgstr "高级分析"
+msgstr "楂樼骇鍒嗘瀽"
 
 #: caravel/viz.py:959
 msgid ""
 "This section contains options that allow for advanced analytical post "
 "processing of query results"
-msgstr "使用高级分析选项"
+msgstr "浣跨敤楂樼骇鍒嗘瀽閫夐」"
 
 #: caravel/viz.py:1091
 msgid "Time Series - Bar Chart"
-msgstr "时间序列-柱状图"
+msgstr "鏃堕棿搴忓垪-鏌辩姸鍥�"
 
 #: caravel/viz.py:1111
 msgid "Time Series - Percent Change"
-msgstr "时间序列-百分比变化"
+msgstr "鏃堕棿搴忓垪-鐧惧垎姣斿彉鍖�"
 
 #: caravel/viz.py:1119
 msgid "Time Series - Stacked"
-msgstr "时间序列-堆积图"
+msgstr "鏃堕棿搴忓垪-鍫嗙Н鍥�"
 
 #: caravel/viz.py:1138
 msgid "Distribution - NVD3 - Pie Chart"
-msgstr "分布-饼图"
+msgstr "鍒嗗竷-楗煎浘"
 
 #: caravel/viz.py:1174
 msgid "Distribution - Bar Chart"
-msgstr "分布-柱状图"
+msgstr "鍒嗗竷-鏌辩姸鍥�"
 
 #: caravel/viz.py:1195
 msgid "Breakdowns"
-msgstr "拆分"
+msgstr "鎷嗗垎"
 
 #: caravel/viz.py:1196
 msgid "Defines how each series is broken down"
-msgstr "项目的拆分方式"
+msgstr "椤圭洰鐨勬媶鍒嗘柟寮�"
 
 #: caravel/viz.py:1261
 msgid "Sunburst"
-msgstr "环状层次图"
+msgstr "鐜姸灞傛鍥�"
 
 #: caravel/viz.py:1276
 msgid "Primary Metric"
-msgstr "主指标"
+msgstr "涓绘寚鏍�"
 
 #: caravel/viz.py:1277
 msgid "The primary metric is used to define the arc segment sizes"
-msgstr "主要指标用来定义的弧段尺寸"
+msgstr "涓昏鎸囨爣鐢ㄦ潵瀹氫箟鐨勫姬娈靛昂瀵�"
 
 #: caravel/viz.py:1282
 msgid "Secondary Metric"
-msgstr "次指标"
+msgstr "娆℃寚鏍�"
 
 #: caravel/viz.py:1283
 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 "次指标用于定义相对主指标的颜色"
+msgstr "娆℃寚鏍囩敤浜庡畾涔夌浉瀵逛富鎸囨爣鐨勯鑹�"
 
 #: caravel/viz.py:1289
 msgid "Hierarchy"
-msgstr "层次"
+msgstr "灞傛"
 
 #: caravel/viz.py:1290
 msgid "This defines the level of the hierarchy"
-msgstr "定义层次"
+msgstr "瀹氫箟灞傛"
 
 #: caravel/viz.py:1327
 msgid "Sankey"
-msgstr "蛇形图"
+msgstr "铔囧舰鍥�"
 
 #: caravel/viz.py:1340 caravel/viz.py:1410
 msgid "Source / Target"
-msgstr "源/目标"
+msgstr "婧�/鐩爣"
 
 #: caravel/viz.py:1341 caravel/viz.py:1411
 msgid "Choose a source and a target"
-msgstr "选择源和目标"
+msgstr "閫夋嫨婧愬拰鐩爣"
 
 #: caravel/viz.py:1391
 msgid "Directed Force Layout"
-msgstr "有向图"
+msgstr "鏈夊悜鍥�"
 
 #: caravel/viz.py:1402
 msgid "Force Layout"
-msgstr "有向图"
+msgstr "鏈夊悜鍥�"
 
 #: caravel/viz.py:1433
 msgid "World Map"
-msgstr "世界地图"
+msgstr "涓栫晫鍦板浘"
 
 #: caravel/viz.py:1444
 msgid "Bubbles"
-msgstr "气泡"
+msgstr "姘旀场"
 
 #: caravel/viz.py:1453
 msgid "Country Field"
-msgstr "国家"
+msgstr "鍥藉"
 
 #: caravel/viz.py:1454
 msgid "3 letter code of the country"
-msgstr "3位国家码"
+msgstr "3浣嶅浗瀹剁爜"
 
 #: caravel/viz.py:1457
 msgid "Metric for color"
-msgstr "色彩度量项"
+msgstr "鑹插僵搴﹂噺椤�"
 
 #: caravel/viz.py:1458
 msgid "Metric that defines the color of the country"
-msgstr "国家颜色表示的统计项"
+msgstr "鍥藉棰滆壊琛ㄧず鐨勭粺璁￠」"
 
 #: caravel/viz.py:1461
 msgid "Bubble size"
-msgstr "气泡大小"
+msgstr "姘旀场澶у皬"
 
 #: caravel/viz.py:1462
 msgid "Metric that defines the size of the bubble"
-msgstr "气泡大小表示的度量项"
+msgstr "姘旀场澶у皬琛ㄧず鐨勫害閲忛」"
 
 #: caravel/templates/caravel/explore.html:147 caravel/viz.py:1507
 msgid "Filters"
-msgstr "筛选"
+msgstr "绛涢��"
 
 #: caravel/viz.py:1519
 msgid "Filter fields"
-msgstr "筛选条件"
+msgstr "绛涢�夋潯浠�"
 
 #: caravel/viz.py:1520
 msgid "The fields you want to filter on"
-msgstr "筛选字段"
+msgstr "绛涢�夊瓧娈�"
 
 #: caravel/viz.py:1555
 msgid "iFrame"
@@ -1630,31 +1630,31 @@ msgstr ""
 
 #: caravel/viz.py:1573
 msgid "Parallel Coordinates"
-msgstr "平行坐标"
+msgstr "骞宠鍧愭爣"
 
 #: caravel/viz.py:1609
 msgid "Heatmap"
-msgstr "热力图"
+msgstr "鐑姏鍥�"
 
 #: caravel/viz.py:1622
 msgid "Heatmap Options"
-msgstr "热力图选项"
+msgstr "鐑姏鍥鹃�夐」"
 
 #: caravel/viz.py:1677
 msgid "Horizon Charts"
-msgstr "水平图"
+msgstr "姘村钩鍥�"
 
 #: caravel/viz.py:1693
 msgid "Mapbox"
-msgstr "箱图"
+msgstr "绠卞浘"
 
 #: caravel/viz.py:1707
 msgid "Points"
-msgstr "点"
+msgstr "鐐�"
 
 #: caravel/viz.py:1713
 msgid "Labelling"
-msgstr "标记"
+msgstr "鏍囪"
 
 #: caravel/viz.py:1719
 msgid "Visual Tweaks"
@@ -1666,19 +1666,19 @@ msgstr ""
 
 #: caravel/viz.py:1736
 msgid "Longitude"
-msgstr "经度"
+msgstr "缁忓害"
 
 #: caravel/viz.py:1737
 msgid "Column containing longitude data"
-msgstr "表示经度的列"
+msgstr "琛ㄧず缁忓害鐨勫垪"
 
 #: caravel/viz.py:1740
 msgid "Latitude"
-msgstr "纬度"
+msgstr "绾害"
 
 #: caravel/viz.py:1741
 msgid "Column containing latitude data"
-msgstr "表示纬度的列"
+msgstr "琛ㄧず绾害鐨勫垪"
 
 #: caravel/viz.py:1744
 msgid "Cluster label aggregator"
@@ -1688,38 +1688,38 @@ msgstr ""
 msgid ""
 "Aggregate function applied to the list of points in each cluster to "
 "produce the cluster label."
-msgstr "聚合函数用于集群标签"
+msgstr "鑱氬悎鍑芥暟鐢ㄤ簬闆嗙兢鏍囩"
 
 #: caravel/viz.py:1750
 msgid "Tooltip"
-msgstr "提示"
+msgstr "鎻愮ず"
 
 #: caravel/viz.py:1751
 msgid "Show a tooltip when hovering over points and clusters describing the label"
-msgstr "鼠标放在集群上时显示的提示信息"
+msgstr "榧犳爣鏀惧湪闆嗙兢涓婃椂鏄剧ず鐨勬彁绀轰俊鎭�"
 
 #: caravel/viz.py:1756
 msgid ""
 "One or many fields to group by. If grouping, latitude and longitude "
 "columns must be present."
-msgstr "按照一个或多个字段分组。必须指定经度和纬度。"
+msgstr "鎸夌収涓�涓垨澶氫釜瀛楁鍒嗙粍銆傚繀椤绘寚瀹氱粡搴﹀拰绾害銆�"
 
 #: caravel/templates/appbuilder/navbar_right.html:36
 msgid "Profile"
-msgstr "策略"
+msgstr "绛栫暐"
 
 #: caravel/templates/appbuilder/navbar_right.html:37
 msgid "Logout"
-msgstr "退出"
+msgstr "閫�鍑�"
 
 #: caravel/templates/appbuilder/navbar_right.html:42
 msgid "Login"
-msgstr "登录"
+msgstr "鐧诲綍"
 
 #: caravel/templates/caravel/explore.html:34
 #: caravel/templates/caravel/explore.html:241
 msgid "Query"
-msgstr "查询"
+msgstr "鏌ヨ"
 
 #: caravel/templates/caravel/explore.html:43
 #: caravel/templates/caravel/explore.html:306
@@ -1728,56 +1728,56 @@ msgstr ""
 
 #: caravel/templates/caravel/explore.html:72
 msgid "Force refresh"
-msgstr "强制刷新"
+msgstr "寮哄埗鍒锋柊"
 
 #: caravel/templates/caravel/explore.html:77
 msgid "Short URL"
-msgstr "短链接"
+msgstr "鐭摼鎺�"
 
 #: caravel/templates/caravel/explore.html:79
 msgid "Generate an embeddable iframe"
-msgstr "生成内嵌iframe"
+msgstr "鐢熸垚鍐呭祵iframe"
 
 #: caravel/templates/caravel/explore.html:82
 msgid "Export to .json"
-msgstr "导出为JSON"
+msgstr "瀵煎嚭涓篔SON"
 
 #: caravel/templates/caravel/explore.html:86
 msgid "Export to .csv format"
-msgstr "导出为CVS"
+msgstr "瀵煎嚭涓篊VS"
 
 #: caravel/templates/caravel/explore.html:92
 msgid "Query timer"
-msgstr "查询时间"
+msgstr "鏌ヨ鏃堕棿"
 
 #: caravel/templates/caravel/explore.html:94
 msgid "0 sec"
-msgstr "0秒"
+msgstr "0绉�"
 
 #: caravel/templates/caravel/explore.html:100
 msgid "View database query"
-msgstr "查询语句"
+msgstr "鏌ヨ璇彞"
 
 #: caravel/templates/caravel/explore.html:101
 msgid "query"
-msgstr "查询"
+msgstr "鏌ヨ"
 
 #: caravel/templates/caravel/explore.html:150
 msgid "Filters are defined using comma delimited strings as in 'US,FR,Other'"
-msgstr "使用逗号分隔多个过滤条件，如'US,FR,Other'"
+msgstr "浣跨敤閫楀彿鍒嗛殧澶氫釜杩囨护鏉′欢锛屽'US,FR,Other'"
 
 #: caravel/templates/caravel/explore.html:168
 msgid "Add filter"
-msgstr "增加过滤条件"
+msgstr "澧炲姞杩囨护鏉′欢"
 
 #: caravel/templates/caravel/explore.html:247
 #: caravel/templates/caravel/explore.html:265
 msgid "Close"
-msgstr "关闭"
+msgstr "鍏抽棴"
 
 #: caravel/templates/caravel/explore.html:259
 msgid "Datasource Description"
-msgstr "数据源描述"
+msgstr "鏁版嵁婧愭弿杩�"
 
 #: caravel/templates/caravel/explore.html:277
 msgid "Save a Slice"
@@ -1793,20 +1793,20 @@ msgstr ""
 
 #: caravel/templates/caravel/sql.html:12
 msgid "Run!"
-msgstr "执行"
+msgstr "鎵ц"
 
 #: caravel/templates/caravel/sql.html:13
 msgid "Create View"
-msgstr "创建视图"
+msgstr "鍒涘缓瑙嗗浘"
 
 #: caravel/templates/caravel/welcome.html:8
 #: caravel/templates/caravel/welcome.html:14
 msgid "Welcome!"
-msgstr "欢迎！"
+msgstr "娆㈣繋锛�"
 
 #: caravel/templates/caravel/models/database/macros.html:4
 msgid "Test Connection"
-msgstr "测试连接"
+msgstr "娴嬭瘯杩炴帴"
 
 #~ msgid "Databases"
 #~ msgstr ""