diff --git a/superset/translations/ja/LC_MESSAGES/messages.json b/superset/translations/ja/LC_MESSAGES/messages.json
index 4c7539593..4e5a2e42e 100644
--- a/superset/translations/ja/LC_MESSAGES/messages.json
+++ b/superset/translations/ja/LC_MESSAGES/messages.json
@@ -20,62 +20,118 @@
       "Row level security": ["行レベルセキュリティ"],
       "Security": ["セキュリティ"],
       "Import Dashboards": ["ダッシュボードをインポート"],
-      "SQL Editor": ["SQLエディタ"],
-      "SQL Lab": ["SQLラボ"],
-      "Saved Queries": ["保存されたクエリ"],
+      "SQL Editor": ["SQL Editor"],
+      "SQL Lab": ["SQL Lab"],
+      "Saved Queries": ["保存したクエリ"],
       "Query History": ["クエリ履歴"],
       "Upload a CSV": ["CSVをアップロード"],
       "Upload Excel": ["Excelをアップロード"],
-      "Action Log": ["アクション履歴"],
+      "Action Log": ["操作履歴"],
       "Dashboard Emails": ["ダッシュボードメール"],
       "Chart Email Schedules": ["チャートメールスケジュール"],
       "Alerts": ["アラート"],
       "Alerts & Reports": ["アラートとレポート"],
       "Access requests": ["アクセス要求"],
-      "Druid Datasources": [""],
-      "Druid Clusters": [""],
-      "Scan New Datasources": [""],
-      "Refresh Druid Metadata": [""],
-      "Issue 1000 - The datasource is too large to query.": [""],
-      "Issue 1001 - The database is under an unusual load.": [""],
-      "Issue 1002 - The database returned an unexpected error.": [""],
+      "Druid Datasources": ["Druid データソース"],
+      "Druid Clusters": ["Druid クラスタ"],
+      "Scan New Datasources": ["新しいデータソースをスキャン"],
+      "Refresh Druid Metadata": ["Druid Metadataを更新"],
+      "Issue 1000 - The datasource is too large to query.": [
+        "Issue 1000 - データ ソースが大きすぎてクエリを実行できませんでした。"
+      ],
+      "Issue 1001 - The database is under an unusual load.": [
+        "Issue 1001 - データベースに異常な負荷がかかっています。"
+      ],
+      "Issue 1002 - The database returned an unexpected error.": [
+        "Issue 1002 - データベースが予期しないエラーを返しました。"
+      ],
       "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.": [
-        ""
+        "Issue 1003 - SQL クエリに構文エラーがあります。スペルミスやタイプミスがないか確認して下さい。"
+      ],
+      "Issue 1004 - The column was deleted or renamed in the database.": [
+        "Issue 1004 - データベースでカラムが削除または名前変更されました。"
+      ],
+      "Issue 1005 - The table was deleted or renamed in the database.": [
+        "Issue 1005 - データベースでテーブルが削除または名前変更されました。"
+      ],
+      "Issue 1005 - The schema was deleted or renamed in the database.": [
+        "Issue 1005 - データベースでスキーマが削除または名前変更されました。"
       ],
-      "Issue 1004 - The column was deleted or renamed in the database.": [""],
-      "Issue 1005 - The table was deleted or renamed in the database.": [""],
       "Issue 1006 - One or more parameters specified in the query are missing.": [
-        ""
+        "Issue 1006 - クエリで指定された1つ以上のパラメーターが見つかりません。"
+      ],
+      "Issue 1007 - The hostname provided can't be resolved.": [
+        "Issue 1007 - 指定されたホスト名を解決できません。"
+      ],
+      "Issue 1008 - The port is closed.": [
+        "Issue 1008 - ポートが閉じています。"
+      ],
+      "Issue 1009 - The host might be down, and can't be reached on the provided port.": [
+        "Issue 1009 - 指定されたポートに到達できません。ホストがダウンしている可能性があります。"
+      ],
+      "Issue 1010 - Superset encountered an error while running a command.": [
+        "Issue 1010 - コマンドの実行中にSuperset内でエラーが発生しました。"
+      ],
+      "Issue 1011 - Superset encountered an unexpected error.": [
+        "Issue 1011 - Supersetで予期しないエラーが発生しました。"
+      ],
+      "Issue 1012 - The username provided when connecting to a database is not valid.": [
+        "Issue 1012 - データベース接続時に指定されたユーザー名が無効です。"
+      ],
+      "Issue 1013 - The password provided when connecting to a database is not valid.": [
+        "Issue 1013 - データベース接続時に指定されたパスワードが無効です。"
+      ],
+      "Issue 1014 - Either the username or the password is wrong.": [
+        "Issue 1014 - ユーザー名またはパスワードが間違っています。"
+      ],
+      "Issue 1015 - Either the database is spelled incorrectly or does not exist.": [
+        "Issue 1015 - データベース名が正しくないか、または存在しません。"
+      ],
+      "Issue 1017 - User doesn't have the proper permissions.": [
+        "Issue 1017 - ユーザーに適切なアクセス許可がありません。"
+      ],
+      "Invalid certificate": ["無効な証明書"],
+      "Unsafe return type for function %(func)s: %(value_type)s": [
+        "関数 %(func)s の安全でない戻り値の型: %(value_type)s"
+      ],
+      "Unsupported return value for method %(name)s": [
+        "メソッド %(name)s のサポートされていない戻り値"
+      ],
+      "Unsafe template value for key %(key)s: %(value_type)s": [
+        "キー %(key)s の安全でないテンプレート値: %(value_type)s"
       ],
-      "Invalid certificate": [""],
-      "Unsafe return type for function %(func)s: %(value_type)s": [""],
-      "Unsupported return value for method %(name)s": [""],
-      "Unsafe template value for key %(key)s: %(value_type)s": [""],
       "Unsupported template value for key %(key)s": [""],
-      "Only `SELECT` statements are allowed against this database": [""],
+      "SQL Lab timeout. This environment's policy is to kill queries after {} seconds.": [
+        "SQL Labタイムアウト。この環境のポリシーは {} 秒後にクエリを強制終了します。"
+      ],
+      "Only `SELECT` statements are allowed against this database": [
+        "`SELECT` 操作のみがこのDBに対して許可されています"
+      ],
       "CTAS (create table as select) can only be run with a query where the last statement is a SELECT. Please make sure your query has a SELECT as its last statement. Then, try running your query again.": [
         ""
       ],
       "CVAS (create view as select) can only be run with a query with a single SELECT statement. Please make sure your query has only a SELECT statement. Then, try running your query again.": [
         ""
       ],
-      "Viz is missing a datasource": [""],
+      "Viz is missing a datasource": ["Viz はデータソースがありません"],
       "Applied rolling window did not return any data. Please make sure the source query satisfies the minimum periods defined in the rolling window.": [
         ""
       ],
       "From date cannot be larger than to date": [
         "開始日は終了日を超えてはいけません"
       ],
-      "Cached value not found": [""],
+      "Cached value not found": ["キャッシュされた値が見つかりません"],
       "Columns missing in datasource: %(invalid_columns)s": [""],
       "Table View": [""],
       "You cannot use [Columns] in combination with [Group By]/[Metrics]/[Percentage Metrics]. Please choose one or the other.": [
-        ""
+        "[Columns] を [Group By]/[Metrics]/[Percentage Metrics] と組み合わせて使用することはできません。どちらか一方を選択してください。"
       ],
       "Pick a granularity in the Time section or uncheck 'Include Time'": [""],
       "Time Table View": [""],
       "Pick at least one metric": ["少なくとも1つの指標を選択してください"],
-      "When using 'Group By' you are limited to use a single metric": [""],
+      "When using 'Group By' you are limited to use a single metric": [
+        "‘Group By’ を使用する場合、指標は1つに制限されます。"
+      ],
       "Pivot Table": ["ピボットテーブル"],
       "Please choose at least one 'Group by' field ": [
         "少なくとも1つの[Group by]フィールドを選択してください "
@@ -86,45 +142,50 @@
       "Group By' and 'Columns' can't overlap": [
         "‘Group by’ と ‘Columns’ は重複できません"
       ],
-      "Treemap": [""],
+      "Treemap": ["ツリーマップ"],
       "Calendar Heatmap": [""],
       "Bubble Chart": ["バブルチャート"],
-      "Please use 3 different metric labels": [""],
+      "Please use 3 different metric labels": [
+        "3つの異なる指標ラベルを使用してください"
+      ],
       "Pick a metric for x, y and size": [""],
       "Bullet Chart": [""],
-      "Pick a metric to display": [""],
+      "Pick a metric to display": ["表示する指標を選択"],
       "Big Number with Trendline": [""],
       "Pick a metric!": ["指標を選んでください!"],
       "Big Number": ["数値"],
       "Time Series - Line Chart": ["時系列 - 折れ線グラフ"],
-      "Pick a time granularity for your time series": [""],
-      "An enclosed time range (both start and end) must be specified when using a Time Comparison.": [
-        ""
+      "Pick a time granularity for your time series": [
+        "時系列の時間粒度を選択"
       ],
-      "Time Series - Multiple Line Charts": [""],
-      "Time Series - Dual Axis Line Chart": [""],
+      "An enclosed time range (both start and end) must be specified when using a Time Comparison.": [
+        "時間比較を使用する場合は、期間 (開始と終了の両方) を指定する必要があります。"
+      ],
+      "Time Series - Multiple Line Charts": ["時系列 - 複数の折れ線グラフ"],
+      "Time Series - Dual Axis Line Chart": ["時系列 - 二重軸折れ線グラフ"],
       "Pick a metric for left axis!": [""],
       "Pick a metric for right axis!": [""],
       "Please choose different metrics on left and right axis": [""],
       "Time Series - Bar Chart": ["時系列 - 棒グラフ"],
-      "Time Series - Period Pivot": [""],
-      "Time Series - Percent Change": [""],
-      "Time Series - Stacked": [""],
+      "Time Series - Period Pivot": ["時系列 - 期間ピボット"],
+      "Time Series - Percent Change": ["時系列 - 変化率"],
+      "Time Series - Stacked": ["時系列 - 積み上げ"],
       "Histogram": ["ヒストグラム"],
-      "Must have at least one numeric column specified": [""],
+      "Must have at least one numeric column specified": [
+        "少なくとも 1 つの数値列を指定する必要があります。"
+      ],
       "Distribution - Bar Chart": ["棒グラフ"],
       "Can't have overlap between Series and Breakdowns": [""],
       "Pick at least one field for [Series]": [""],
       "Sunburst": [""],
-      "Sankey": [""],
+      "Sankey": ["サンキー"],
       "Pick exactly 2 columns as [Source / Target]": [""],
       "There's a loop in your Sankey, please provide a tree. Here's a faulty link: {}": [
         ""
       ],
       "Directed Force Layout": [""],
-      "Pick exactly 2 columns to 'Group By'": [""],
-      "Country Map": [""],
-      "World Map": [""],
+      "Country Map": ["国別地図"],
+      "World Map": ["世界地図"],
       "Filters": ["フィルタ"],
       "Invalid filter configuration, please select a column": [""],
       "Parallel Coordinates": [""],
@@ -132,7 +193,9 @@
       "Horizon Charts": [""],
       "Mapbox": [""],
       "[Longitude] and [Latitude] must be set": [""],
-      "Must have a [Group By] column to have 'count' as the [Label]": [""],
+      "Must have a [Group By] column to have 'count' as the [Label]": [
+        "[Label] として ’count’ を持つには、[Group By] 列が必要です"
+      ],
       "Choice of [Label] must be present in [Group By]": [""],
       "Choice of [Point Radius] must be present in [Group By]": [""],
       "[Longitude] and [Latitude] columns must be present in [Group By]": [""],
@@ -154,12 +217,6 @@
       "Time Series - Paired t-test": [""],
       "Time Series - Nightingale Rose Chart": [""],
       "Partition Diagram": [""],
-      "Choose either fields to [Group By] and [Metrics] and/or [Percentage Metrics], or [Columns], not both": [
-        "[Group By]と[Metrics]または[列]のいずれかを選択します"
-      ],
-      "Box Plot": ["ボックスプロット"],
-      "Distribution - NVD3 - Pie Chart": ["円グラフ"],
-      "iFrame": [""],
       "Deleted %(num)d annotation layer": [""],
       "All Text": [""],
       "Deleted %(num)d annotation": [""],
@@ -192,29 +249,45 @@
         ""
       ],
       "`width` must be greater or equal to 0": [""],
-      "`row_limit` must be greater than or equal to 1": [""],
+      "`row_limit` must be greater than or equal to 0": [""],
       "`row_offset` must be greater than or equal to 0": [""],
       "There are associated alerts or reports: %s,": [""],
+      "Time string is unclear. Please specify [%(human_readable)s ago] or [%(human_readable)s later].": [
+        ""
+      ],
+      "Cannot parse time string [%(human_readable)s]": [""],
       "Database does not exist": [""],
       "Dashboards do not exist": ["ダッシュボードは存在しません"],
       "Datasource type is required when datasource_id is given": [""],
       "Chart parameters are invalid.": [""],
-      "Chart could not be created.": ["チャートを作成できませんでした"],
-      "Chart could not be updated.": ["チャートをアップロードできませんでした"],
-      "Chart could not be deleted.": ["チャートを削除できませんでした"],
-      "There are associated alerts or reports": [""],
-      "Changing this chart is forbidden": [""],
-      "Charts could not be deleted.": [""],
+      "Chart could not be created.": ["チャートを作成できませんでした。"],
+      "Chart could not be updated.": [
+        "チャートをアップロードできませんでした。"
+      ],
+      "Chart could not be deleted.": ["チャートを削除できませんでした。"],
+      "There are associated alerts or reports": [
+        "関連するアラートまたはレポートがあります"
+      ],
+      "Changing this chart is forbidden": [
+        "このチャートの変更は禁止されています"
+      ],
+      "Charts could not be deleted.": ["チャートを削除できませんでした。"],
       "Import chart failed for an unknown reason": [""],
       "Owners are invalid": [""],
+      "Some roles do not exist": ["一部のロールが存在しません"],
       "Dataset does not exist": ["データセットが存在しません"],
+      "Invalid result type: %(result_type)": [""],
+      "The chart does not exist": ["チャートが存在しません"],
+      "Duplicate column/metric labels: %(labels)s. Please make sure all columns and metrics have a unique label.": [
+        ""
+      ],
       "`operation` property of post processing object undefined": [""],
       "Unsupported post processing operation: %(operation)s": [""],
       "Adding new datasource [{}]": [""],
       "Refreshing datasource [{}]": [""],
       "Metric(s) {} must be aggregations.": [""],
       "Unsupported extraction function: ": [""],
-      "Columns": [""],
+      "Columns": ["列"],
       "Show Druid Column": [""],
       "Add Druid Column": [""],
       "Edit Druid Column": [""],
@@ -235,7 +308,7 @@
       "Verbose Name": [""],
       "JSON": [""],
       "Druid Datasource": [""],
-      "Warning Message": [""],
+      "Warning Message": ["警告メッセージ"],
       "Show Druid Cluster": [""],
       "Add Druid Cluster": [""],
       "Edit Druid Cluster": [""],
@@ -276,30 +349,43 @@
       "Data Source": [""],
       "Cluster": [""],
       "Owners": ["所有者"],
-      "Is Hidden": [""],
+      "Is Hidden": ["非表示"],
       "Enable Filter Select": [""],
       "Default Endpoint": [""],
       "Time Offset": [""],
       "Datasource Name": ["データソース名"],
       "Fetch Values From": [""],
       "Changed By": ["更新者"],
-      "Modified": ["最終更新日"],
+      "Modified": ["最終更新"],
       "Refreshed metadata from cluster [{}]": [""],
-      "Only `SELECT` statements are allowed": [""],
-      "Only single queries supported": [""],
+      "Only `SELECT` statements are allowed": [
+        "'SELECT' 操作のみが許可されます"
+      ],
+      "Only single queries supported": [
+        "単一のクエリのみがサポートされています"
+      ],
       "Error in jinja expression in fetch values predicate: %(msg)s": [""],
-      "Error in jinja expression in FROM clause: %(msg)s": [""],
-      "Virtual dataset query cannot consist of multiple statements": [""],
       "Virtual dataset query must be read-only": [""],
+      "Error while rendering virtual dataset query: %(msg)s": [""],
+      "Virtual dataset query cannot be empty": [""],
+      "Virtual dataset query cannot consist of multiple statements": [""],
       "Error in jinja expression in RLS filters: %(msg)s": [""],
       "Datetime column not provided as part table configuration and is required by this type of chart": [
         ""
       ],
       "Empty query?": [""],
       "Metric '%(metric)s' does not exist": [""],
+      "Unknown column used in orderby: %(col)s": [""],
+      "Time column \"%(col)s\" does not exist in dataset": [""],
+      "Filter value list cannot be empty": [""],
+      "Must specify a value for filters with comparison operators": [""],
       "Invalid filter operation type: %(op)s": [""],
       "Error in jinja expression in WHERE clause: %(msg)s": [""],
       "Error in jinja expression in HAVING clause: %(msg)s": [""],
+      "Database does not support subqueries": [
+        "データベースはサブクエリをサポートしていません"
+      ],
+      "Db engine did not return all queried columns": [""],
       "Show Column": [""],
       "Add Column": [""],
       "Edit Column": [""],
@@ -310,16 +396,16 @@
         ""
       ],
       "Table": ["テーブル"],
-      "Expression": [""],
+      "Expression": ["式"],
       "Is temporal": [""],
       "Datetime Format": ["日時フォーマット"],
       "Invalid date/timestamp format": [
         "無効な日付/タイムスタンプのフォーマット"
       ],
-      "Show Metric": [""],
-      "Add Metric": [""],
-      "Edit Metric": [""],
-      "SQL Expression": [""],
+      "Show Metric": ["指標を表示"],
+      "Add Metric": ["指標を追加"],
+      "Edit Metric": ["指標を編集"],
+      "SQL Expression": ["SQL 式"],
       "D3 Format": [""],
       "Extra": [""],
       "Row level security filter": [""],
@@ -343,9 +429,9 @@
       "Roles": [""],
       "Clause": [""],
       "Creator": ["作成者"],
-      "Show Table": [""],
-      "Import a table definition": [""],
-      "Edit Table": [""],
+      "Show Table": ["テーブルを表示"],
+      "Import a table definition": ["テーブル定義のインポート"],
+      "Edit Table": ["テーブルを編集"],
       "Name of the table that exists in the source database": [""],
       "Schema, as used only in some databases like Postgres, Redshift and DB2": [
         ""
@@ -369,13 +455,13 @@
         ""
       ],
       "Database": ["データベース"],
-      "Last Changed": ["最終更新日"],
+      "Last Changed": ["最終更新"],
       "Schema": ["スキーマ"],
       "Offset": ["オフセット"],
       "Table Name": ["テーブル名"],
       "Fetch Values Predicate": [""],
       "Main Datetime Column": [""],
-      "SQL Lab View": ["SQLラボビュー"],
+      "SQL Lab View": ["SQL Lab ビュー"],
       "Template parameters": ["テンプレートパラメータ"],
       "The table was created. As part of this two-phase configuration process, you should now click the edit button by the new table to configure it.": [
         ""
@@ -390,8 +476,11 @@
       "Deleted %(num)d css template": [""],
       "CSS template could not be deleted.": [""],
       "CSS template not found.": [""],
-      "Deleted %(num)d dashboard": [" %(num)d ダッシュボードを削除しました"],
+      "Deleted %(num)d dashboard": [
+        " %(num)d 件のダッシュボードを削除しました"
+      ],
       "Title or Slug": ["タイトルまたはスラッグ"],
+      "Role": [""],
       "Must be unique": ["一意である必要があります"],
       "Dashboard parameters are invalid.": [
         "ダッシュボードパラメータが無効です。"
@@ -415,38 +504,59 @@
       "Import dashboard failed for an unknown reason": [
         "不明な理由でダッシュボードのインポートに失敗しました"
       ],
+      "You don't have access to this dashboard.": [
+        "このダッシュボードにアクセスできません。"
+      ],
       "No data in file": ["ファイルにデータがありません"],
       "Table name undefined": [""],
       "Invalid connection string, a valid string usually follows: driver://user:password@database-host/database-name": [
         ""
       ],
-      "SQLite database cannot be used as a data source for security reasons.": [
-        ""
-      ],
       "Field cannot be decoded by JSON. %(msg)s": [""],
       "The metadata_params in Extra field is not configured correctly. The key %(key)s is invalid.": [
         ""
       ],
-      "Database parameters are invalid.": [""],
+      "An engine must be specified when passing individual parameters to a database.": [
+        ""
+      ],
+      "Engine \"%(engine)s\" is not a valid engine.": [""],
+      "Engine spec \"%(engine_spec)s\" does not support being configured via individual parameters.": [
+        ""
+      ],
+      "Database parameters are invalid.": [
+        "データベース パラメータが無効です。"
+      ],
       "A database with the same name already exists": [""],
       "Field is required": [""],
       "Field cannot be decoded by JSON.  %{json_error}s": [""],
       "The metadata_params in Extra field is not configured correctly. The key %{key}s is invalid.": [
         ""
       ],
-      "Database not found.": [""],
-      "Database could not be created.": [""],
-      "Database could not be updated.": [""],
+      "Database not found.": ["データベースが見つかりません。"],
+      "Database could not be created.": [
+        "データベースを作成できませんでした。"
+      ],
+      "Database could not be updated.": [
+        "データベースを更新できませんでした。"
+      ],
       "Connection failed, please check your connection settings": [""],
       "Cannot delete a database that has tables attached": [""],
-      "Database could not be deleted.": [""],
+      "Database could not be deleted.": [
+        "データベースを削除できませんでした。"
+      ],
       "Stopped an unsafe database connection": [""],
       "Could not load database driver": [""],
       "Unexpected error occurred, please check your logs for details": [""],
       "Import database failed for an unknown reason": [""],
       "Could not load database driver: {}": [""],
-      "Deleted %(num)d dataset": [""],
+      "Deleted %(num)d dataset": [" %(num)d 件のデータセットを削除しました"],
       "Null or Empty": [""],
+      "Dataset column not found.": ["データセット列が見つかりません。"],
+      "Dataset column delete failed.": ["データセット列の削除に失敗しました。"],
+      "Changing this dataset is forbidden.": [
+        "このデータセットの変更は禁止されています。"
+      ],
+      "Dataset %(name)s already exists": [""],
       "Database not allowed to change": [""],
       "One or more columns do not exist": [""],
       "One or more columns are duplicated": [""],
@@ -464,19 +574,86 @@
       "Dataset(s) could not be bulk deleted.": [""],
       "Changing this dataset is forbidden": [""],
       "Import dataset failed for an unknown reason": [""],
-      "Unknown Presto Error": [""],
+      "Dataset metric not found.": ["データセットの指標が見つかりません。"],
+      "Dataset metric delete failed.": [
+        "データセット指標の削除に失敗しました。"
+      ],
+      "Original value": [""],
+      "Second": ["秒"],
+      "Minute": ["分"],
+      "5 minute": ["5分"],
+      "10 minute": ["10分"],
+      "15 minute": ["15分"],
+      "Half hour": ["30分"],
+      "Hour": ["時間"],
+      "Day": ["日"],
+      "Week": ["週"],
+      "Month": ["月"],
+      "Quarter": ["四半期"],
+      "Year": ["年"],
+      "Week starting sunday": [""],
+      "Week starting monday": [""],
+      "Week ending saturday": [""],
+      "Week_ending sunday": [""],
+      "Username": ["ユーザー名"],
+      "Password": ["パスワード"],
+      "Hostname or IP address": ["ホスト名またはIPアドレス"],
+      "Database port": ["DBポート番号"],
+      "Database name": ["データベース名"],
+      "Additinal parameters": ["追加パラメータ"],
+      "We were unable to connect to your database. Please confirm that your service account has the Viewer and Job User roles on the project.": [
+        ""
+      ],
+      "Either the username \"%(username)s\", password, or database name \"%(database)s\" is incorrect.": [
+        ""
+      ],
+      "The hostname \"%(hostname)s\" cannot be resolved.": [""],
+      "Port %(port)s on hostname \"%(hostname)s\" refused the connection.": [
+        ""
+      ],
+      "The host \"%(hostname)s\" might be down, and can't be reached on port %(port)s.": [
+        ""
+      ],
+      "Either the username \"%(username)s\" or the password is incorrect.": [
+        ""
+      ],
+      "Unknown MySQL server host \"%(hostname)s\".": [""],
+      "The host \"%(hostname)s\" might be down and can't be reached.": [""],
+      "Unable to connect to database \"%(database)s\".": [
+        "“%(database)s” に接続できません。"
+      ],
+      "The username \"%(username)s\" does not exist.": [""],
+      "The password provided for username \"%(username)s\" is incorrect.": [""],
       "We can't seem to resolve the column \"%(column_name)s\" at line %(location)s.": [
         ""
       ],
       "The table \"%(table_name)s\" does not exist. A valid table must be used to run this query.": [
         ""
       ],
-      "Deleted %(num)d saved query": [""],
+      "The schema \"%(schema_name)s\" does not exist. A valid schema must be used to run this query.": [
+        ""
+      ],
+      "Unable to connect to catalog named \"%(catalog_name)s\".": [""],
+      "Unknown Presto Error": [""],
+      "We were unable to connect to your database named \"%(database)s\". Please verify your database name and try again.": [
+        ""
+      ],
+      "Temporal expression not supported for type: %(col_type)s": [""],
+      "Deleted %(num)d saved query": [
+        " %(num)d 件の保存したクエリを削除しました"
+      ],
       "Saved queries could not be deleted.": [""],
       "Saved query not found.": [""],
-      "Deleted %(num)d report schedule": [
-        " %(num)d のレポートスケジュールを削除しました"
+      "Import saved query failed for an unknown reason.": [
+        "不明な理由により、保存したクエリをインポートできませんでした。"
       ],
+      "Saved query parameters are invalid.": [
+        "保存したクエリ パラメーターが無効です。"
+      ],
+      "Deleted %(num)d report schedule": [
+        " %(num)d 件のレポートスケジュールを削除しました"
+      ],
+      "Value must be greater than 0": ["値は 0 より大きくする必要があります"],
       "Alert query returned more then one row. %s rows returned": [
         "アラートクエリが複数の行を返しました。 %s 行が返されました"
       ],
@@ -512,6 +689,9 @@
       "Report Schedule execution failed when generating a screenshot.": [
         "スクリーンショットの生成時にレポートスケジュールの実行に失敗しました。"
       ],
+      "Report Schedule execution failed when generating a csv.": [
+        "csv の生成中にレポートスケジュールの実行に失敗しました。"
+      ],
       "Report Schedule execution got an unexpected error.": [
         "レポートスケジュールの実行で予期しないエラーが発生しました。"
       ],
@@ -524,7 +704,7 @@
       "Alert query returned more then one row.": [
         "アラートクエリが複数の行を返しました。"
       ],
-      "Alert validator config error.": ["アラートバリデーター設定エラー"],
+      "Alert validator config error.": ["アラートバリデーター設定エラー。"],
       "Alert query returned more then one column.": [
         "アラートクエリが複数の列を返しました。"
       ],
@@ -534,6 +714,15 @@
       "Alert found an error while executing a query.": [
         "クエリの実行中にアラートがエラーを検出しました。"
       ],
+      "A timeout occurred while executing the query.": [
+        "クエリの実行中にタイムアウトが発生しました。"
+      ],
+      "A timeout occurred while taking a screenshot.": [
+        "スクリーンショットの撮影中にタイムアウトが発生しました。"
+      ],
+      "A timeout occurred while generating a csv.": [
+        "csv の生成中にタイムアウトが発生しました。"
+      ],
       "Alert fired during grace period.": [
         "猶予期間中にアラートが発生しました。"
       ],
@@ -552,20 +741,28 @@
         "このレポートの変更は禁止されています"
       ],
       "An error occurred while pruning logs ": [
-        "ログのプルーニング中にエラーが発生しました"
+        "ログのプルーニング中にエラーが発生しました "
       ],
-      "\n            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n            <img src=\"cid:%(msgid)s\">\n            ": [
+      "\n            Error: %(text)s\n            ": [""],
+      "\n            <p>%(description)s</p>\n            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n            %(img_tag)s\n            ": [
         ""
       ],
+      "%(name)s.csv": [""],
       "%(prefix)s %(title)s": [""],
-      "\n            *%(name)s*\n\n            <%(url)s|Explore in Superset>\n            ": [
+      "\n            *%(name)s*\n\n            %(description)s\n\n            Error: %(text)s\n            ": [
         ""
       ],
+      "\n            *%(name)s*\n\n            %(description)s\n\n            <%(url)s|Explore in Superset>\n            ": [
+        ""
+      ],
+      "%(dialect)s cannot be used as a data source for security reasons.": [""],
       "\n        *%(name)s*\n\n        <%(url)s|Explore in Superset>\n        ": [
         ""
       ],
       "<b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>": [""],
-      "%(name)s.csv": [""],
+      "\n            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n            <img src=\"cid:%(msgid)s\">\n            ": [
+        ""
+      ],
       "\n        *%(slice_name)s*\n\n        <%(slice_url_user_friendly)s|Explore in Superset>\n        ": [
         ""
       ],
@@ -588,7 +785,7 @@
       "File": ["ファイル"],
       "Choose File": ["ファイルを選択"],
       "Upload": ["アップロード"],
-      "No Access!": ["アクセスなし"],
+      "No Access!": ["アクセスがありません!"],
       "You do not have permissions to access the datasource(s): %(name)s.": [
         "データソースにアクセスするためのアクセス許可がありません: %(name)s."
       ],
@@ -597,11 +794,11 @@
       "Use the edit buttom to change this field": [
         "このフィールドを変更するには、編集ボタンを使用します"
       ],
-      "Test Connection": ["テスト接続"],
+      "Test Connection": ["接続のテスト"],
       "[Superset] Access to the datasource %(name)s was granted": [
         "[Superset]　データソース　%(name)s へのアクセスは許可されました"
       ],
-      "Unable to find such a holiday: [{}]": [""],
+      "Unable to find such a holiday: [%(holiday)s]": [""],
       "Referenced columns not available in DataFrame.": [""],
       "Column referenced by aggregate is undefined: %(column)s": [""],
       "Operator undefined for aggregator: %(name)s": [""],
@@ -615,8 +812,12 @@
       "Invalid geohash string": [""],
       "Invalid longitude/latitude": [""],
       "Invalid geodetic string": [""],
-      "`fbprophet` package not installed": [""],
-      "Time grain missing": ["時間単位がありません"],
+      "Column \"%(column)s\" is not numeric or does not exists in the query results.": [
+        ""
+      ],
+      "`rename_columns` must have the same length as `columns`.": [""],
+      "`prophet` package not installed": [""],
+      "Time grain missing": [""],
       "Unsupported time grain: %(time_grain)s": [""],
       "Periods must be a positive integer value": [""],
       "Confidence interval must be between 0 and 1 (exclusive)": [""],
@@ -644,6 +845,9 @@
       "A SQL statement that defines whether the alert should get triggered or not. The query is expected to return either NULL or a number value.": [
         ""
       ],
+      "This feature is deprecated and will be removed on 2.0. Take a look at the replacement feature <a href='https://superset.apache.org/docs/installation/alerts-reports'>Alerts & Reports documentation</a>": [
+        ""
+      ],
       "annotation start time or end time is required.": [""],
       "Annotation end time must be no earlier than start time.": [""],
       "Annotations": ["注釈"],
@@ -659,7 +863,6 @@
       "Add Annotation Layer": ["注釈レイヤーを追加"],
       "Edit Annotation Layer": ["注釈レイヤーを編集"],
       "Name": ["名前"],
-      "Dataset %(name)s already exists": [""],
       "Table [%{table}s] could not be found, please double check your database connection, schema, and table name, error: {}": [
         ""
       ],
@@ -686,14 +889,15 @@
       "An unknown error occurred. Please contact your Superset administrator": [
         ""
       ],
-      "Error occurred when opening the chart: %(error)s": [""],
+      "[Missing Dataset]": ["[データセットが見つかりません]"],
       "You don't have the rights to ": [""],
       "alter this ": [""],
       "chart": ["チャート"],
-      "create a ": ["作成日"],
+      "create a ": ["作成日 "],
       "Explore - %(table)s": [""],
-      "Chart [{}] has been saved": [""],
-      "Chart [{}] has been overwritten": [""],
+      "Explore": [""],
+      "Chart [{}] has been saved": ["チャート [{}] が保存されました"],
+      "Chart [{}] has been overwritten": ["チャート [{}] が上書きされました"],
       "dashboard": ["ダッシュボード"],
       "Chart [{}] was added to dashboard [{}]": [
         "チャート [{}] はダッシュボード [{}] に追加されました"
@@ -702,7 +906,7 @@
         "ダッシュボード [{}] が作成されチャート [{}] が追加されました"
       ],
       "This dashboard was changed recently. Please reload dashboard to get latest version.": [
-        "このダッシュボードは最近変更されました。最新の情報を入手するにはダッシュボードをリロードしてください"
+        "このダッシュボードは最近変更されました。最新の情報を入手するにはダッシュボードをリロードしてください。"
       ],
       "Could not load database driver: %(driver_name)s": [
         "データベースドライバ: %(driver_name)s 読み込めませんでした"
@@ -715,7 +919,7 @@
       ],
       "Chart %(id)s not found": ["チャート %(id)s が見つかりません"],
       "Table %(table)s wasn't found in the database %(db)s": [
-        "テーブル %(t)s はデータベース %(d)s　にありません"
+        "テーブル %(table)s はデータベース %(db)s にありません"
       ],
       "Can't find User '%(name)s', please ask your admin to create one.": [
         "ユーザー ‘%(name)s’ が見つかりません。管理者に作成を依頼してください。"
@@ -735,6 +939,8 @@
       "Add CSS Template": ["CSSテンプレートを追加"],
       "Edit CSS Template": ["CSSテンプレートを編集"],
       "Template Name": ["テンプレート名"],
+      "Request missing data field.": [""],
+      "Duplicate column name(s): %(columns)s": [""],
       "A human-friendly name": [""],
       "Used internally to identify the plugin. Should be set to the package name from the pluginʼs package.json": [
         ""
@@ -749,22 +955,25 @@
       "Schedule Email Reports for Dashboards": [""],
       "Manage Email Reports for Dashboards": [""],
       "Changed On": ["変更日"],
-      "Active": [""],
+      "Active": ["アクティブ"],
       "Crontab": [""],
       "Recipients": [""],
       "Slack Channel": [""],
       "Deliver As Group": [""],
       "Delivery Type": [""],
-      "Schedule Email Reports for Charts": [""],
-      "Manage Email Reports for Charts": [""],
+      "Schedule Email Reports for Charts": [
+        "チャートのメールレポートのスケジュール"
+      ],
+      "Manage Email Reports for Charts": ["チャートのメールレポートの管理"],
       "Email Format": ["メールフォーマット"],
-      "List Saved Query": ["保存されたクエリのリスト"],
-      "Show Saved Query": ["保存されたクエリを表示"],
-      "Add Saved Query": ["保存されたクエリを追加"],
-      "Edit Saved Query": ["保存されたクエリの編集"],
+      "List Saved Query": ["保存したクエリのリスト"],
+      "Show Saved Query": ["保存したクエリを表示"],
+      "Add Saved Query": ["保存したクエリを追加"],
+      "Edit Saved Query": ["保存したクエリの編集"],
       "End Time": ["終了時間"],
       "Pop Tab Link": [""],
       "Changed on": ["変更日"],
+      "The dataset associated with this chart no longer exists": [""],
       "Could not determine datasource type": [""],
       "Could not find viz object": [""],
       "Show Chart": ["チャートを表示"],
@@ -776,7 +985,7 @@
       "Duration (in seconds) of the caching timeout for this chart. Note this defaults to the datasource/table timeout if undefined.": [
         ""
       ],
-      "Last Modified": ["最終更新日"],
+      "Last Modified": ["最終更新"],
       "Parameters": ["パラメータ"],
       "Visualization Type": ["可視化方式"],
       "Show Dashboard": ["ダッシュボードを表示"],
@@ -792,10 +1001,13 @@
         "ダッシュボードの読み取り可能なURLを取得するには"
       ],
       "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.": [
-        ""
+        "この JSON オブジェクトは、ダッシュボード ビューの [保存] または [上書き] ボタンをクリックすると動的に生成されます。これは、参照用と特定のパラメータを変更する可能性のあるパワーユーザーのために公開されています。"
       ],
       "Owners is a list of users who can alter the dashboard.": [
-        "所有者は、ダッシュボードを変更できるユーザーのリストです"
+        "所有者は、ダッシュボードを変更できるユーザーのリストです。"
+      ],
+      "Roles is a list which defines access to the dashboard. Granting a role access to a dashboard will bypass dataset level checks.If no roles defined then the dashboard is available to all roles.": [
+        ""
       ],
       "Determines whether or not this dashboard is visible in the list of all dashboards": [
         "このダッシュボードがすべてのダッシュボードのリストに表示されるかどうかを決定します"
@@ -810,13 +1022,17 @@
       "Export dashboards?": ["ダッシュボードをエクスポートしますか？"],
       "Name of table to be created from csv data.": [""],
       "CSV File": [""],
-      "Select a CSV file to be uploaded to a database.": [""],
+      "Select a CSV file to be uploaded to a database.": [
+        "データベースにアップロードする CSV ファイルを選択します。"
+      ],
       "Only the following file extensions are allowed: %(allowed_extensions)s": [
-        ""
+        "次のファイル拡張子のみが許可されます: %(allowed_extensions)s"
       ],
       "Specify a schema (if database flavor supports this).": [""],
-      "Delimiter": [""],
-      "Delimiter used by CSV file (for whitespace use \\s+).": [""],
+      "Delimiter": ["区切り文字"],
+      "Delimiter used by CSV file (for whitespace use \\s+).": [
+        "CSV ファイルで使用する区切り文字 (空白文字の場合は \\s+ を使用)。"
+      ],
       "Table Exists": [""],
       "If table exists do one of the following: Fail (do nothing), Replace (drop and recreate table) or Append (insert data).": [
         ""
@@ -885,7 +1101,7 @@
         ""
       ],
       "Duration (in seconds) of the caching timeout for charts of this database. A timeout of 0 indicates that the cache never expires. Note this defaults to the global timeout if undefined.": [
-        ""
+        "このデータベースのチャートに対するキャッシュのタイムアウト期間（秒）。タイムアウトが0の場合は、キャッシュが失効しないことを意味します。未定義の場合は、グローバル・タイムアウトがデフォルト値になることに注意してください。"
       ],
       "If selected, please set the schemas allowed for csv upload in Extra.": [
         ""
@@ -950,7 +1166,7 @@
       "An error occurred while storing the latest query id in the backend. Please contact your administrator if this problem persists.": [
         ""
       ],
-      "Unknown error": [""],
+      "Unknown error": ["不明なエラー"],
       "Query was stopped.": [""],
       "Unable to migrate table schema state to backend. Superset will retry later. Please contact your administrator if this problem persists.": [
         ""
@@ -969,6 +1185,9 @@
         ""
       ],
       "An error occurred while fetching tab state": [""],
+      "An error occurred while hiding the left bar. Please contact your administrator.": [
+        ""
+      ],
       "An error occurred while removing tab. Please contact your administrator.": [
         ""
       ],
@@ -987,10 +1206,10 @@
       "An error occurred while setting the tab title. Please contact your administrator.": [
         ""
       ],
-      "Your query was saved": [""],
-      "Your query could not be saved": [""],
-      "Your query was updated": [""],
-      "Your query could not be updated": [""],
+      "Your query was saved": ["クエリが保存されました"],
+      "Your query could not be saved": ["クエリを保存できませんでした"],
+      "Your query was updated": ["クエリが更新されました"],
+      "Your query could not be updated": ["クエリを更新できませんでした"],
       "An error occurred while storing your query in the backend. To avoid losing your changes, please save your query using the \"Save Query\" button.": [
         ""
       ],
@@ -1011,18 +1230,24 @@
         ""
       ],
       "Shared query": ["クエリを共有"],
-      "The datasource couldn't be loaded": [""],
-      "An error occurred while creating the data source": [""],
+      "The datasource couldn't be loaded": [
+        "データ ソースを読み込めませんでした"
+      ],
+      "An error occurred while creating the data source": [
+        "データ ソースの作成中にエラーが発生しました"
+      ],
+      "An error occurred while fetching function names.": [
+        "関数名の取得中にエラーが発生しました。"
+      ],
       "SQL Lab uses your browser's local storage to store queries and results.\n Currently, you are using ${currentUsage.toFixed(\n            2,\n          )} KB out of ${LOCALSTORAGE_MAX_USAGE_KB} KB. storage space.\n To keep SQL Lab from crashing, please delete some query tabs.\n You can re-access these queries by using the Save feature before you delete the tab. Note that you will need to close other SQL Lab windows before you do this.": [
         ""
       ],
-      "Estimate selected query cost": [""],
-      "Estimate cost": [""],
-      "Cost estimate": [""],
+      "Estimate selected query cost": ["選択したクエリコストの見積"],
+      "Estimate cost": ["見積コスト"],
+      "Cost estimate": ["コストの見積もり"],
       "Creating a data source and creating a new tab": [""],
-      "An error occurred": [""],
+      "An error occurred": ["エラーが発生しました"],
       "Explore the result set in the data exploration view": [""],
-      "Explore": [""],
       "This query took %s seconds to run, ": [""],
       "and the explore view times out at %s seconds ": [""],
       "following this flow will most likely lead to your query timing out. ": [
@@ -1037,12 +1262,12 @@
       "cannot be used as a column name. The column name/alias \"__timestamp\"\n          is reserved for the main temporal expression, and column aliases ending with\n          double underscores followed by a numeric value (e.g. \"my_col__1\") are reserved\n          for deduplicating duplicate column names. Please use aliases to rename the\n          invalid column names.": [
         ""
       ],
-      "Raw SQL": [""],
       "Source SQL": [""],
+      "Raw SQL": [""],
       "SQL": [""],
-      "No query history yet...": [""],
-      "It seems you don't have access to any database": [""],
+      "No query history yet...": ["クエリ履歴はまだありません。"],
       "An error occurred when refreshing queries": [""],
+      "It seems you don't have access to any database": [""],
       "Filter by user": [""],
       "Filter by database": [""],
       "Query search string": [""],
@@ -1056,9 +1281,14 @@
       "Run query in a new tab": ["新しいタブでクエリを実行"],
       "Remove query from log": ["ログからクエリを削除"],
       "An error occurred saving dataset": [""],
-      ".CSV": [""],
-      "Clipboard": [""],
+      "Download to CSV": [""],
+      "Copy to Clipboard": [""],
       "Filter results": [""],
+      "%s rows returned": [""],
+      "The number of results displayed is limited to %s. Please add\n            additional limits/filters or download to csv to see more rows up to\n            the %s limit.": [
+        ""
+      ],
+      "Query was stopped": [""],
       "Database error": ["データベースエラー"],
       "was created": ["作成されました"],
       "Query in a new tab": [""],
@@ -1068,9 +1298,9 @@
       "Track job": ["ジョブ履歴"],
       "Stop": ["中止"],
       "Run selection": [""],
-      "Run": [""],
-      "Stop running (Ctrl + x)": [""],
-      "Run query (Ctrl + Return)": [""],
+      "Run": ["実行"],
+      "Stop running (Ctrl + x)": ["実行を停止 (Ctrl + x)"],
+      "Run query (Ctrl + Return)": ["クエリを実行 (Ctrl + Return)"],
       "Save & Explore": [""],
       "Overwrite & Explore": [""],
       "Undefined": [""],
@@ -1084,24 +1314,23 @@
       "Schedule query": [""],
       "Schedule": [""],
       "There was an error with your request": [""],
-      "Please save the query to enable sharing": [""],
+      "Please save the query to enable sharing": [
+        "共有を有効にするにはクエリを保存して下さい"
+      ],
+      "Copy query link to your clipboard": [
+        "クエリのlinkをクリップボードにコピー"
+      ],
+      "Save the query to enable this feature": [
+        "この機能を有効にするためクエリを保存する"
+      ],
       "Copy link": [""],
-      "Copy query link to your clipboard": [""],
-      "Save the query to copy the link": [""],
-      "No stored results found, you need to re-run your query": [""],
-      "Run a query to display results here": [""],
-      "Preview: `%s`": [""],
-      "Results": ["結果"],
-      "Query history": ["クエリ履歴"],
       "Run query": ["クエリ実行"],
       "New tab": [""],
       "Untitled query": [""],
       "Stop query": ["クエリを中止"],
       "Schedule the query periodically": [""],
       "You must run the query successfully first": [""],
-      "It appears that the number of rows in the query results displayed\n           was limited on the server side to\n           the %s limit.": [
-        ""
-      ],
+      "Autocomplete": [""],
       "CREATE TABLE AS": [""],
       "CREATE VIEW AS": [""],
       "Estimate the cost before running a query": [""],
@@ -1114,33 +1343,53 @@
       "Hide tool bar": [""],
       "Close all other tabs": [""],
       "Duplicate tab": [""],
+      "New tab (Ctrl + q)": [""],
+      "New tab (Ctrl + t)": [""],
       "Copy partition query to clipboard": [""],
       "latest partition:": [""],
       "Keys for table": [""],
       "View keys & indexes (%s)": [""],
-      "Sort columns alphabetically": [""],
-      "Original table column order": [""],
-      "Copy SELECT statement to the clipboard": [""],
-      "Show CREATE VIEW statement": [""],
-      "CREATE VIEW statement": [""],
+      "Sort columns alphabetically": ["列をアルファベット順に並び替え"],
+      "Original table column order": ["元のテーブル列順で表示"],
+      "Copy SELECT statement to the clipboard": [
+        "SELECT文をクリップボードにコピー"
+      ],
+      "Show CREATE VIEW statement": ["CREATE VIEW文を表示"],
+      "CREATE VIEW statement": ["CREATE VIEW文"],
       "Remove table preview": [""],
-      "Assign a set of parameters as": [""],
-      "below (example:": [""],
-      "), and they become available in your SQL (example:": [""],
-      ") by using": [""],
       "Edit template parameters": [""],
       "Invalid JSON": [""],
+      "No stored results found, you need to re-run your query": [""],
+      "Run a query to display results here": [
+        "クエリを実行すると結果がここに表示されます"
+      ],
+      "Preview: `%s`": [""],
+      "Results": ["結果"],
+      "Query history": ["クエリ履歴"],
       "Create a new chart": ["新しいチャートを作成"],
       "Choose a dataset": ["データセットを選択"],
       "If the dataset you are looking for is not available in the list, follow the instructions on how to add it in the Superset tutorial.": [
         "探しているデータセットがリストにない場合は、Supersetチュートリアルでデータセットを追加する方法についての説明に従ってください。"
       ],
-      "Choose a visualization type": ["チャートの可視化形式を選んでください"],
+      "Choose a visualization type": ["可視化形式を選択"],
       "Create new chart": ["新しいチャートを作成"],
-      "An error occurred while loading the SQL": [""],
-      "Updating chart was stopped": [""],
-      "An error occurred while rendering the visualization: %s": [""],
-      "Network error.": [""],
+      "An error occurred while loading the SQL": [
+        "SQL のロード中にエラーが発生しました"
+      ],
+      "Click to see difference": ["クリックして差分を確認"],
+      "Altered": ["変更"],
+      "Chart changes": ["チャートの変更点"],
+      "Superset chart": [""],
+      "Check out this chart in dashboard:": [""],
+      "Select ...": [""],
+      "Loaded data cached": [""],
+      "Loaded from cache": [""],
+      "Click to force-refresh": [""],
+      "cached": [""],
+      "Certified by %s": [""],
+      "Copy to clipboard": [""],
+      "Copied to clipboard!": [""],
+      "Sorry, your browser does not support copying. Use Ctrl / Cmd + C!": [""],
       "every": [""],
       "every month": [""],
       "every day of the month": [""],
@@ -1203,21 +1452,6 @@
       "OCT": ["10月"],
       "NOV": ["11月"],
       "DEC": ["12月"],
-      "OK": [""],
-      "Click to see difference": [""],
-      "Altered": [""],
-      "Chart changes": [""],
-      "Superset chart": [""],
-      "Check out this chart in dashboard:": [""],
-      "Select ...": [""],
-      "Loaded data cached": [""],
-      "Loaded from cache": [""],
-      "Click to force-refresh": [""],
-      "cached": [""],
-      "Certified by %s": [""],
-      "Copy to clipboard": [""],
-      "Copied!": [""],
-      "Sorry, your browser does not support copying. Use Ctrl / Cmd + C!": [""],
       "Error while fetching schema list": [""],
       "Error while fetching database list": [""],
       "Database:": [""],
@@ -1229,20 +1463,10 @@
       "schema": ["スキーマ"],
       "delete": ["削除"],
       "Type \"%s\" to confirm": [""],
-      "DELETE": [""],
+      "DELETE": ["削除"],
       "Click to edit": [""],
       "You don't have the rights to alter this title.": [""],
       "Unexpected error": [""],
-      "Click to favorite/unfavorite": [""],
-      "An error occurred while fetching dashboards": [""],
-      "Error while fetching table list": [""],
-      "Select table or type table name": [""],
-      "Type to search ...": [""],
-      "Select table ": ["データソースを選択"],
-      "Force refresh table list": [""],
-      "See table schema": [""],
-      "%s%s": [""],
-      "Share dashboard": ["ダッシュボードを共有"],
       "This may be triggered by:": [""],
       "Please reach out to the Chart Owner for assistance.": [""],
       "Chart Owner: %s": [""],
@@ -1250,9 +1474,9 @@
       "See more": [""],
       "See less": [""],
       "Copy message": [""],
-      "Close": [""],
+      "Close": ["閉じる"],
       "This was triggered by:": [""],
-      "Did you mean:": [""],
+      "Did you mean:": ["もしかして:"],
       "%(suggestion)s instead of \"%(undefinedParameter)s?\"": [""],
       "Parameter error": ["パラメータエラー"],
       "We’re having trouble loading this visualization. Queries are set to timeout after %s second.": [
@@ -1262,19 +1486,30 @@
         ""
       ],
       "Timeout error": ["タイムアウトエラー"],
+      "Click to favorite/unfavorite": ["クリックしてお気に入りに追加/解除"],
       "Cell content": [""],
       "The import was successful": [""],
       "OVERWRITE": ["上書き"],
       "Overwrite": ["上書き"],
-      "Import": [""],
-      "Import %s": [""],
-      "Last Updated %s": [""],
+      "Import": ["インポート"],
+      "Import %s": ["インポート %s"],
+      "Last Updated %s": ["最終更新 %s"],
+      "Sort:": [""],
       "%s Selected": [""],
-      "Deselect all": [""],
+      "Deselect all": ["すべての選択を解除"],
+      "No Data": [""],
       "%s-%s of %s": [""],
       "Settings": ["設定"],
-      "About": ["概要"],
+      "About": [""],
       "SQL query": ["SQLクエリ"],
+      "OK": [""],
+      "Error while fetching table list": [""],
+      "Select table or type table name": [""],
+      "Type to search ...": [""],
+      "Select table ": ["テーブルを選択 "],
+      "Force refresh table list": ["テーブルリストを強制更新"],
+      "See table schema": ["テーブルスキーマを参照"],
+      "%s%s": [""],
       "There is not enough space for this component. Try decreasing its width, or increasing the destination width.": [
         "このコンポーネント用の十分なスペースがありません。幅を狭くするか、移動先の幅を大きくしてみてください。"
       ],
@@ -1294,16 +1529,16 @@
         "このダッシュボードは現在 ${nowPublished}"
       ],
       "You do not have permissions to edit this dashboard.": [
-        "このダッシュボードを編集する権限がありません"
+        "このダッシュボードを編集する権限がありません。"
       ],
       "This dashboard was saved successfully.": [
-        "このダッシュボードは正常に保存されました"
+        "このダッシュボードは正常に保存されました。"
       ],
       "Could not fetch all saved charts": [
-        "保存されたすべてのチャートを取得できませんでした"
+        "保存したすべてのチャートを取得できませんでした"
       ],
       "Sorry there was an error fetching saved charts: ": [
-        "保存したグラフの取得中にエラーが発生しました。:"
+        "保存したグラフの取得中にエラーが発生しました: "
       ],
       "Visualization": ["可視化"],
       "Data source": ["データソース"],
@@ -1313,66 +1548,14 @@
         "ここで選択したカラーパレットは、このダッシュボードの個々のグラフに適用される色を上書きします"
       ],
       "Color scheme": ["配色"],
-      "Load a template": ["テンプレートの読み込み"],
-      "Load a CSS template": ["CSSテンプレートの読み込み"],
-      "Live CSS editor": [""],
-      "You have unsaved changes.": ["未保存の変更があります."],
-      "This dashboard is currently force refreshing; the next force refresh will be in %s.": [
-        "このダッシュボードは現在強制的に更新されています。次の強制更新は %s。"
-      ],
-      "Your dashboard is too large. Please reduce the size before save it.": [
-        "ダッシュボードが大きすぎます。保存する前にサイズを小さくしてください"
-      ],
-      "Discard changes": ["変更を破棄"],
-      "An error occurred while fetching available CSS templates": [
-        "利用可能なCSSテンプレートの取得中にエラーが発生しました"
-      ],
-      "Superset dashboard": ["Supersetダッシュボード"],
-      "Check out this dashboard: ": ["このダッシュボードを確認してください: "],
-      "Refresh dashboard": ["ダッシュボードを更新"],
-      "Set auto-refresh interval": ["自動更新間隔を設定"],
-      "Set filter mapping": ["フィルタマッピングを設定"],
-      "Edit dashboard properties": ["ダッシュボードのプロパティを編集"],
-      "Edit CSS": ["CSSを編集"],
-      "Download as image": ["画像としてダウンロード"],
-      "Toggle fullscreen": ["フルスクリーン切り替え"],
+      "You have unsaved changes.": ["未保存の変更があります。"],
       "There is no chart definition associated with this component, could it have been deleted?": [
-        "このコンポーネントに関連付けられているチャート定義はありません。削除された可能性がありますか？"
+        "このコンポーネントに関連付けられているチャート定義はありません。削除されたのでしょうか？"
       ],
       "Delete this container and save to remove this message.": [
         "このコンテナを削除し、保存してこのメ​​ッセージを削除します。"
       ],
-      "An error has occurred": ["エラーが発生しました"],
-      "You do not have permission to edit this dashboard": [
-        "このダッシュボードを編集する権限がありません"
-      ],
-      "A valid color scheme is required": ["有効な配色が必要です"],
-      "The dashboard has been saved": ["ダッシュボードが保存されました"],
-      "Apply": ["適用"],
-      "Dashboard properties": ["ダッシュボードのプロパティ"],
-      "Basic information": ["基本情報"],
-      "URL slug": ["URLスラッグ"],
-      "A readable URL for your dashboard": [
-        "ダッシュボードの読み取り可能なURL"
-      ],
-      "Access": ["アクセス"],
-      "Owners is a list of users who can alter the dashboard. Searchable by name or username.": [
-        "所有者は、ダッシュボードを変更できるユーザーのリストです。名前またはユーザー名で検索可能"
-      ],
-      "Colors": ["色"],
-      "Advanced": [""],
-      "JSON metadata": [""],
-      "This dashboard is not published, it will not show up in the list of dashboards. Click here to publish this dashboard.": [
-        "このダッシュボードは公開されていないため、ダッシュボードのリストには表示されません。このダッシュボードを公開するには、ここをクリックしてください。"
-      ],
-      "This dashboard is not published which means it will not show up in the list of dashboards. Favorite it to see it there or access it by using the URL directly.": [
-        "このダッシュボードは公開されていないため、ダッシュボードのリストには表示されません。お気に入りに追加して表示するか、URLを直接使用してアクセスします"
-      ],
-      "This dashboard is published. Click to make it a draft.": [
-        "このダッシュボードは公開されています。クリックして下書きにします"
-      ],
-      "Draft": ["下書き"],
-      "Don't refresh": ["更新しないでください"],
+      "Don't refresh": ["更新しない"],
       "10 seconds": ["10秒"],
       "30 seconds": ["30秒"],
       "1 minute": ["1分"],
@@ -1392,15 +1575,77 @@
       "Save dashboard": ["ダッシュボードを保存"],
       "Overwrite Dashboard [%s]": ["ダッシュボード [%s] を上書き"],
       "Save as:": ["別名で保存:"],
-      "[dashboard name]": [""],
+      "[dashboard name]": ["[ダッシュボード名]"],
       "also copy (duplicate) charts": ["チャートも複製する"],
       "Filter your charts": ["チャートを検索"],
+      "Cross Filter Scoping": [""],
+      "Load a template": ["テンプレートの読み込み"],
+      "Load a CSS template": ["CSSテンプレートの読み込み"],
+      "Live CSS editor": [""],
+      "Applied Cross Filters (%d)": ["適用したクロス フィルター (%d)"],
+      "Applied Filters (%d)": ["適用したフィルタ (%d)"],
+      "Incompatible Filters (%d)": ["互換性のないフィルタ (%d)"],
+      "Unset Filters (%d)": ["フィルタ (%d) の設定を解除"],
+      "This dashboard is currently force refreshing; the next force refresh will be in %s.": [
+        "このダッシュボードは現在強制的に更新されています。次の強制更新は %s。"
+      ],
+      "Your dashboard is too large. Please reduce the size before save it.": [
+        "ダッシュボードが大きすぎます。保存する前にサイズを小さくしてください。"
+      ],
+      "Discard changes": ["変更を破棄"],
+      "Edit dashboard": ["ダッシュボードを編集"],
+      "An error occurred while fetching available CSS templates": [
+        "利用可能なCSSテンプレートの取得中にエラーが発生しました"
+      ],
+      "Superset dashboard": ["Supersetダッシュボード"],
+      "Check out this dashboard: ": ["このダッシュボードを確認してください: "],
+      "Copy dashboard URL": ["ダッシュボードURLをコピー"],
+      "Share dashboard by email": ["ダッシュボードをメールで共有"],
+      "Refresh dashboard": ["ダッシュボードを更新"],
+      "Set auto-refresh interval": ["自動更新間隔を設定"],
+      "Set filter mapping": ["フィルタマッピングを設定"],
+      "Edit dashboard properties": ["ダッシュボードのプロパティを編集"],
+      "Edit CSS": ["CSSを編集"],
+      "Download as image": ["画像としてダウンロード"],
+      "Toggle fullscreen": ["フルスクリーン切り替え"],
+      "An error has occurred": ["エラーが発生しました"],
+      "You do not have permission to edit this dashboard": [
+        "このダッシュボードを編集する権限がありません"
+      ],
+      "A valid color scheme is required": ["有効な配色が必要です"],
+      "The dashboard has been saved": ["ダッシュボードが保存されました"],
+      "Access": ["アクセス"],
+      "Owners is a list of users who can alter the dashboard. Searchable by name or username.": [
+        "所有者は、ダッシュボードを変更できるユーザーのリストです。名前またはユーザー名で検索できます。"
+      ],
+      "Colors": ["色"],
+      "Roles is a list which defines access to the dashboard. Granting a role access to a dashboard will bypass dataset level checks. If no roles defined then the dashboard is available to all roles.": [
+        ""
+      ],
+      "Apply": ["適用"],
+      "Dashboard properties": ["ダッシュボードのプロパティ"],
+      "Basic information": ["基本情報"],
+      "URL slug": ["URLスラッグ"],
+      "A readable URL for your dashboard": ["ダッシュボード用の読みやすいURL"],
+      "Advanced": [""],
+      "JSON metadata": [""],
+      "This dashboard is not published, it will not show up in the list of dashboards. Click here to publish this dashboard.": [
+        "このダッシュボードは公開されていないため、ダッシュボードのリストには表示されません。このダッシュボードを公開するには、ここをクリックしてください。"
+      ],
+      "This dashboard is not published which means it will not show up in the list of dashboards. Favorite it to see it there or access it by using the URL directly.": [
+        "このダッシュボードは公開されていないため、ダッシュボードのリストには表示されません。お気に入りに追加して表示するか、URLを直接使用してアクセスします。"
+      ],
+      "This dashboard is published. Click to make it a draft.": [
+        "このダッシュボードは公開されています。クリックして下書きにします。"
+      ],
+      "Draft": ["下書き"],
       "Annotation layers are still loading.": [
-        "注釈レイヤーはまだ読み込み中です"
+        "注釈レイヤーはまだ読み込み中です。"
       ],
       "One ore more annotation layers failed loading.": [
-        "1つ以上の注釈レイヤーの読み込みに失敗しました"
+        "1つ以上の注釈レイヤーの読み込みに失敗しました。"
       ],
+      "Emitted values": [""],
       "Cached %s": [""],
       "Fetched %s": [""],
       "Minimize chart": ["チャートを最小化"],
@@ -1408,23 +1653,22 @@
       "Force refresh": ["強制更新"],
       "Toggle chart description": ["チャートの説明を切り替え"],
       "View chart in Explore": ["チャートを表示"],
-      "Share chart": ["チャートを共有"],
+      "Copy chart URL": ["チャートのURLをコピー"],
+      "Share chart by email": ["チャートをメールで共有"],
       "Export CSV": ["CSVで出力"],
-      "Applied Filters (%d)": ["適用されたフィルタ (%d)"],
-      "Incompatible Filters (%d)": ["互換性のないフィルタ (%d)"],
-      "Unset Filters (%d)": ["フィルタ (%d) の設定を解除"],
-      "Search...": ["検索"],
-      "No filter is selected.": ["フィルタは選択されていません"],
+      "Cross-filter scoping": [""],
+      "Search...": ["検索…"],
+      "No filter is selected.": ["フィルタは選択されていません。"],
       "Editing 1 filter:": ["1つのフィルタを編集する:"],
-      "Batch editing %d filters:": [" ％d フィルタのバッチ編集:"],
+      "Batch editing %d filters:": [" %d フィルタのバッチ編集:"],
       "Configure filter scopes": ["フィルタスコープを構成する"],
       "There are no filters in this dashboard.": [
-        "このダッシュボードにはフィルターはありません"
+        "このダッシュボードにはフィルターはありません。"
       ],
       "Expand all": ["すべて展開"],
       "Collapse all": ["すべて折りたたむ"],
       "This markdown component has an error.": [
-        "このマークダウンコンポーネントにエラーがあります"
+        "このマークダウンコンポーネントにエラーがあります。"
       ],
       "This markdown component has an error. Please revert your recent changes.": [
         "このマークダウンコンポーネントにエラーがあります。最近の変更を元に戻してください。"
@@ -1434,30 +1678,44 @@
       "Header": ["見出し"],
       "Row": ["行"],
       "Tabs": ["タブ"],
-      "Markdown": ["マークダウン"],
       "Preview": ["プレビュー"],
-      "Yes, cancel": ["はい、キャンセルします"],
-      "Keep editing": ["編集を続ける"],
+      "Sorry, your browser does not support copying.": [""],
+      "Sorry, something went wrong. Try again later.": [""],
+      "All Filters (${filterValues.length})": [""],
+      "Filter Sets (${filterSetFilterValues.length})": [""],
       "Select parent filters": ["親フィルタを選択する"],
-      "Reset all": ["すべてリセット"],
-      "You have removed this filter.": ["このフィルタを削除しました。"],
-      "Restore filter": ["フィルタを復元"],
-      "Filter name": ["フィルタ名"],
-      "Name is required": ["名前が必要です"],
-      "Datasource is required": ["データソースが必要です"],
-      "Field": ["フィールド"],
-      "Parent filter": ["親フィルタ"],
+      "Check configuration": ["設定を確認"],
+      "Cannot load filter": ["フィルタを読み込めません"],
+      "Editing filter set:": ["フィルタセットを編集:"],
+      "Filter set with this name already exists": [""],
+      "Filter set already exists": [""],
+      "This filter set is identical to: \"%s\"": [""],
+      "Remove invalid filters": [""],
+      "Rebuild": [""],
+      "Filters (%d)": ["フィルター (%d)"],
+      "This filter doesn't exist in dashboard. It will not be applied.": [""],
+      "Filter metadata changed in dashboard. It will not be applied.": [""],
       "None": ["なし"],
-      "Apply changes instantly": ["変更を即座に適用する"],
-      "Allow multiple selections": ["複数の選択を許可する"],
-      "Inverse selection": ["逆選択"],
-      "Required": ["必須"],
-      "Are you sure you want to cancel?": ["キャンセルしてもよろしいですか？"],
-      "will not be saved.": ["保存されません"],
-      "Filter configuration and scoping": ["フィルタの構成とスコープ"],
+      "Please filter set name": [""],
+      "Create": ["作成"],
+      "Create new filter set": ["新しいフィルタ セットの作成"],
+      "New filter set": ["新しいフィルタ セット"],
+      "Clear all": ["すべてクリア"],
       "Add filter": ["フィルタを追加"],
       "(Removed)": ["(削除)"],
       "Undo?": ["元に戻しますか？"],
+      "New filter": ["新しいフィルタ"],
+      "Filters configuration and scoping": ["フィルタの構成とスコープ"],
+      "Filter name": ["フィルタ名"],
+      "Name is required": ["名前が必要です"],
+      "Filter Type": ["フィルタタイプ"],
+      "Dataset": ["データセット"],
+      "Dataset is required": ["データセットが必要です"],
+      "Parent filter": ["親フィルタ"],
+      "Default Value": ["デフォルト値"],
+      "Apply changes instantly": ["変更を即座に適用する"],
+      "You have removed this filter.": ["このフィルタを削除しました。"],
+      "Restore Filter": ["フィルタを復元"],
       "Scoping": ["スコープ"],
       "Apply to all panels": ["すべてのパネルに適用"],
       "Apply to specific panels": ["特定のパネルに適用"],
@@ -1467,23 +1725,28 @@
       "All panels with this column will be affected by this filter": [
         "この列のすべてのパネルは、このフィルターの影響を受けます"
       ],
+      "Yes, cancel": ["はい、キャンセルします"],
+      "Keep editing": ["編集を続ける"],
+      "Are you sure you want to cancel?": ["キャンセルしてもよろしいですか？"],
+      "will not be saved.": ["保存されません。"],
       "All filters": ["すべてのフィルタ"],
       "All charts": ["すべてのチャート"],
+      "Tab title": [""],
       "Warning! Changing the dataset may break the chart if the metadata does not exist.": [
         ""
       ],
       "Changing the dataset may break the chart if the chart relies on columns or metadata that does not exist in the target dataset": [
-        ""
+        "データセットを変更すると、ターゲットのデータセットに存在しないカラムやメタデータに依存しているチャートが壊れることがあります"
       ],
-      "dataset": [""],
-      "Change dataset": [""],
-      "Warning!": [""],
+      "dataset": ["データセット"],
+      "Change dataset": ["データセットを変更"],
+      "Warning!": ["警告!"],
       "Search / Filter": [""],
       "Physical (table or view)": [""],
       "Virtual (SQL)": [""],
-      "SQL expression": [""],
+      "SQL expression": ["SQL 式"],
       "Data type": [""],
-      "Datetime format": [""],
+      "Datetime format": ["日時フォーマット"],
       "The pattern of timestamp format. For strings use ": [""],
       "Python datetime string pattern": [""],
       " expression which needs to adhere to the ": [""],
@@ -1511,13 +1774,16 @@
       "When using \"Autocomplete filters\", this can be used to improve performance of the query fetching the values. Use this option to apply a predicate (WHERE clause) to the query selecting the distinct values from the table. Typically the intent would be to limit the scan by applying a relative time filter on a partitioned or indexed time-related field.": [
         ""
       ],
-      "Extra data to specify table metadata. Currently supports certification data of the format: `{ \"certification\": { \"certified_by\": \"Data Platform Team\", \"details\": \"This table is the source of truth.\" } }`.": [
+      "Extra data to specify table metadata. Currently supports metadata of the format: `{ \"certification\": { \"certified_by\": \"Data Platform Team\", \"details\": \"This table is the source of truth.\" }, \"warning_markdown\": \"This is a warning.\" }`.": [
         ""
       ],
       "Owners of the dataset": [""],
       "Cache timeout": [""],
       "The duration of time in seconds before the cache is invalidated": [""],
       "Hours offset": [""],
+      "The number of hours, negative or positive, to shift the time column. This can be used to move UTC time to local time.": [
+        ""
+      ],
       "Spatial": [""],
       "virtual": [""],
       "Dataset name": [""],
@@ -1532,12 +1798,12 @@
       "Click the lock to make changes.": [""],
       "Click the lock to prevent further changes.": [""],
       "D3 format": [""],
-      "Warning message": [""],
-      "Warning message to display in the metric selector": [""],
       "Certified by": [""],
       "Person or group that has certified this metric": [""],
       "Certification details": [""],
       "Details of the certification": [""],
+      "Warning": ["警告"],
+      "Optional warning about use of this metric": [""],
       "Be careful.": [""],
       "Changing these settings will affect all charts using this dataset, including charts owned by other people.": [
         ""
@@ -1553,19 +1819,13 @@
       "Confirm save": [""],
       "Edit Dataset ": [""],
       "Use legacy datasource editor": [""],
-      "Time range": ["時間範囲"],
-      "Time column": ["時間列"],
-      "Time grain": ["時間単位"],
-      "Origin": [""],
-      "Time granularity": ["時間粒度"],
       "A reference to the [Time] configuration, taking granularity into account": [
         ""
       ],
       "Group by": [""],
       "One or many controls to group by": [""],
       "One or many metrics to display": [""],
-      "Dataset": ["データセット"],
-      "Visualization type": ["可視化タイプ"],
+      "Visualization type": ["可視化方式"],
       "The type of visualization to display": ["表示する可視化のタイプ"],
       "Fixed color": ["固定の色"],
       "Use this to define a static color for all circles": [
@@ -1584,14 +1844,14 @@
         ""
       ],
       "The time column for the visualization. Note that you can define arbitrary expression that return a DATETIME column in the table. Also note that the filter below is applied against this column or expression": [
-        ""
+        "可視化のための時間カラム。テーブルのDATETIME列を返す任意の式を定義することができます。この列または式に対して以下のフィルターが適用されることに注意してください"
       ],
       "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 Superset source code.": [
         ""
       ],
-      "Last week": [""],
+      "Last week": ["先週"],
       "The time range for the visualization. All relative times, e.g. \"Last month\", \"Last 7 days\", \"now\", etc. are evaluated on the server using the server's local time (sans timezone). All tooltips and placeholder times are expressed in UTC (sans timezone). The timestamps are then evaluated by the database using the engine's local timezone. Note one can explicitly set the timezone per the ISO 8601 format if specifying either the start and/or end time.": [
-        ""
+        "可視化の期間。すべての相対時間( e.g. “Last month”, “Last 7 days”, “now”, etc )はサーバーのローカル時間(sans timezone)を使用して評価されます。すべてのツールヒントとプレースホルダー時間は UTC (sans timezone) で表されます。タイムスタンプは、エンジンのローカルタイムゾーンを使用してデータベースによって評価されます。開始時刻や終了時刻を指定する場合は ISO 8601 形式に従ってタイムゾーンを明示的に設定できます。"
       ],
       "Row limit": [""],
       "Series limit": [""],
@@ -1607,9 +1867,9 @@
       "Entity": [""],
       "This defines the element to be plotted on the chart": [""],
       "X Axis": ["X軸"],
-      "Metric assigned to the [X] axis": [""],
+      "Metric assigned to the [X] axis": ["[X] 軸に割り当てられた指標"],
       "Y Axis": ["Y軸"],
-      "Metric assigned to the [Y] axis": [""],
+      "Metric assigned to the [Y] axis": ["[Y] 軸に割り当てられた指標"],
       "Bubble size": [""],
       "Y Axis Format": [""],
       "When `Calculation type` is set to \"Percentage change\", the Y Axis Format is forced to `.1%`": [
@@ -1619,26 +1879,44 @@
       "Color map": [""],
       "description": [""],
       "bolt": [""],
-      "Changing this control takes effect instantly": [""],
+      "Changing this control takes effect instantly": [
+        "この変更は即座に反映されます"
+      ],
       "Customize": ["カスタマイズ"],
-      "rows retrieved": [""],
-      "Sorry, An error occurred": [""],
-      "No data": [""],
-      "View samples": [""],
-      "Search Metrics & Columns": [""],
-      "Showing %s of %s": [""],
-      "New chart": [""],
-      "Edit properties": [""],
-      "View query": ["クエリを見る"],
-      "Run in SQL Lab": ["SQLラボで実行"],
       "Height": ["高さ"],
       "Width": ["幅"],
-      "Export to .json": ["jsonで出力"],
-      "Export to .csv format": ["csvで出力"],
+      "Copy chart URL to clipboard": [""],
+      "Loading...": [""],
+      "Superset Chart": [""],
+      "Export to .JSON format": [""],
+      "Export to .CSV format": [""],
       "%s - untitled": [""],
       "Edit chart properties": ["チャートのプロパティを編集"],
       "Control labeled ": [""],
       "Open Datasource tab": ["データソースタブを開く"],
+      "rows": ["行"],
+      "Limit reached": [""],
+      "**Select** a dashboard OR **create** a new one": [
+        "ダッシュボードを **選択** または **新規作成**"
+      ],
+      "Please enter a chart name": ["チャート名を入力してください"],
+      "Save chart": ["チャートを保存"],
+      "Save & go to dashboard": ["保存してダッシュボードに移動"],
+      "Save as new chart": ["新しいチャートとして保存"],
+      "Save (Overwrite)": ["上書き保存"],
+      "Save as ...": ["別名で保存"],
+      "Chart name": ["チャート名"],
+      "Add to dashboard": ["新しいダッシュボードに追加"],
+      "rows retrieved": ["行を取得"],
+      "Sorry, An error occurred": ["エラーが発生しました"],
+      "No data": [""],
+      "View samples": ["サンプルを表示"],
+      "Search Metrics & Columns": [""],
+      "Showing %s of %s": ["Showing %s of %s"],
+      "New chart": ["新しいチャート"],
+      "Edit properties": [""],
+      "View query": ["クエリを見る"],
+      "Run in SQL Lab": ["SQL Labで実行"],
       "You do not have permission to edit this chart": [
         "このチャートを編集する権限がありません"
       ],
@@ -1652,17 +1930,32 @@
       "A list of users who can alter the chart. Searchable by name or username.": [
         ""
       ],
-      "rows": ["行"],
-      "Limit reached": [""],
-      "**Select** a dashboard OR **create** a new one": [""],
-      "Please enter a chart name": ["チャート名を入力してください"],
-      "Save chart": ["チャートを保存"],
-      "Save & go to dashboard": ["保存してダッシュボードに移動"],
-      "Save as new chart": ["新しいチャートとして保存"],
-      "Save (Overwrite)": ["上書き保存"],
-      "Save as ...": ["別名で保存"],
-      "Chart name": ["チャート名"],
-      "Add to dashboard": ["新しいダッシュボードに追加"],
+      "`Min` value should be numeric or empty": [""],
+      "`Max` value should be numeric or empty": [""],
+      "Min": ["最小値"],
+      "Max": ["最大値"],
+      "No results found": [""],
+      "%s option(s)": [""],
+      "Invalid lat/long configuration.": [""],
+      "Reverse lat/long ": [""],
+      "Longitude & Latitude columns": [""],
+      "Delimited long & lat single column": [""],
+      "Multiple formats accepted, look the geopy.points Python library for more details": [
+        ""
+      ],
+      "Geohash": [""],
+      "textarea": [""],
+      "in modal": [""],
+      "This visualization type is not supported.": [
+        "この可視化方式はサポートされていません。"
+      ],
+      "Click to change visualization type": ["クリックして可視化方式を変更"],
+      "Select a visualization type": ["可視化方式を選んでください"],
+      "Failed to verify select options: %s": [""],
+      "Annotation Slice Configuration": ["注釈スライスの構成"],
+      "This section allows you to configure how to use the slice\n               to generate annotations.": [
+        ""
+      ],
       "Display configuration": [""],
       "Configure your how you overlay is displayed here.": [""],
       "Style": [""],
@@ -1680,16 +1973,44 @@
       "Remove": ["削除"],
       "Edit annotation layer": ["注釈レイヤーを編集"],
       "Add annotation layer": ["注釈レイヤーを追加"],
-      "`Min` value should be numeric or empty": [""],
-      "`Max` value should be numeric or empty": [""],
-      "Min": ["最小値"],
-      "Max": ["最大値"],
+      "Empty collection": ["空のコレクション"],
+      "Add an item": ["アイテムを追加"],
+      "Remove item": ["アイテムを削除"],
       "Edit dataset": ["データセットを編集"],
-      "View in SQL Lab": ["SQLラボで表示"],
-      "More dataset related options": [""],
-      "Superset supports smart date parsing. Strings like `3 weeks ago`, `last sunday`, or `2 weeks from now` can be used.": [
+      "View in SQL Lab": ["SQL Labで表示"],
+      "More dataset related options": [
+        "データセットに関連するその他のオプション"
+      ],
+      "Missing dataset": ["データセットが見つかりません"],
+      "The dataset linked to this chart may have been deleted.": [""],
+      "RANGE TYPE": ["範囲のタイプ"],
+      "Actual time range": ["実際の期間"],
+      "CANCEL": ["キャンセル"],
+      "APPLY": ["適用"],
+      "Edit time range": ["期間を編集"],
+      "Configure Advanced Time Range ": [""],
+      "START (INCLUSIVE)": [""],
+      "Start date included in time range": [""],
+      "END (EXCLUSIVE)": [""],
+      "End date excluded from time range": [""],
+      "Configure Time Range: Previous...": [""],
+      "Configure Time Range: Last...": [""],
+      "Configure custom time range": [""],
+      "Relative quantity": [""],
+      "Anchor to": [""],
+      "NOW": [""],
+      "Date/Time": [""],
+      "Return to specific datetime.": [""],
+      "Syntax": [""],
+      "Example": ["例"],
+      "Moves the given set of dates by a specified interval.": [""],
+      "Truncates the specified date to the accuracy specified by the date unit.": [
         ""
       ],
+      "Get the last date by the date unit.": [""],
+      "Get the specify date for the holiday": [""],
+      "Drop columns or metrics": ["列または指標を削除する"],
+      "Drop columns": ["列を削除する"],
       "Default": [""],
       "(optional) default value for the filter, when using the multiple option, you can use a semicolon-delimited list of options.": [
         ""
@@ -1698,6 +2019,7 @@
       "Metric to sort the results by": [""],
       "Sort ascending": [""],
       "Check for sorting ascending": [""],
+      "Allow multiple selections": ["複数の選択を許可する"],
       "Multiple selections allowed, otherwise filter is limited to a single value": [
         ""
       ],
@@ -1705,43 +2027,9 @@
       "By default, each filter loads at most 1000 choices at the initial page load. Check this box if you have more than 1000 filter values and want to enable dynamically searching that loads filter values as users type (may add stress to your database).": [
         ""
       ],
+      "Required": ["必須"],
       "User must select a value for this filter": [""],
       "Filter configuration": ["フィルタ構成"],
-      "Error while fetching data": ["データの取得中にエラーが発生しました"],
-      "No results found": [""],
-      "%s option(s)": [""],
-      "Invalid lat/long configuration.": [""],
-      "Reverse lat/long ": [""],
-      "Longitude & Latitude columns": [""],
-      "Delimited long & lat single column": [""],
-      "Multiple formats accepted, look the geopy.points Python library for more details": [
-        ""
-      ],
-      "Geohash": [""],
-      "textarea": [""],
-      "in modal": [""],
-      "Time series columns": [""],
-      "This visualization type is not supported.": [""],
-      "Click to change visualization type": [
-        "クリックして可視化のタイプを変更"
-      ],
-      "Select a visualization type": ["可視化のタイプを選んでください"],
-      "Failed to verify select options: %s": [""],
-      "RANGE TYPE": ["範囲のタイプ"],
-      "Actual time range": [""],
-      "CANCEL": ["キャンセル"],
-      "APPLY": ["適用"],
-      "Edit time range": ["時間範囲を編集"],
-      "Configure advanced time range": [""],
-      "START": [""],
-      "END": [""],
-      "Configure Time Range: Previous...": [""],
-      "Configure Time Range: Last...": [""],
-      "Configure custom time range": [""],
-      "Relative quantity": [""],
-      "Anchor to": [""],
-      "NOW": [""],
-      "Date/Time": [""],
       "Simple": [""],
       "Custom SQL": [""],
       "No such column found. To filter on a metric, try the Custom SQL tab.": [
@@ -1756,20 +2044,26 @@
       "choose WHERE or HAVING...": [""],
       "Filters by columns": [""],
       "Filters by metrics": [""],
-      "\n                This filter was inherited from the dashboard's context.\n                It won't be saved when saving the chart.\n              ": [
-        ""
-      ],
+      "Fixed": [""],
+      "Based on a metric": [""],
+      "My metric": [""],
+      "Add metric": [""],
       "%s aggregates(s)": [""],
       "%s saved metric(s)": [""],
       "Saved": [""],
-      "Saved metric": [""],
+      "Saved metric": ["保存した指標"],
       "column": [""],
       "aggregate": [""],
-      "My metric": [""],
-      "Add metric": [""],
+      "\n                This filter was inherited from the dashboard's context.\n                It won't be saved when saving the chart.\n              ": [
+        ""
+      ],
+      "Error while fetching data": ["データの取得中にエラーが発生しました"],
+      "Time series columns": [""],
       "Code": [""],
       "Markup type": [""],
-      "Pick your favorite markup language": [""],
+      "Pick your favorite markup language": [
+        "お気に入りのマークアップ言語を選択"
+      ],
       "Put your code here": [""],
       "Query": ["クエリ"],
       "URL": [""],
@@ -1780,18 +2074,22 @@
       "Time related form attributes": [""],
       "Chart type": ["チャートタイプ"],
       "Chart ID": ["チャートID"],
-      "The id of the active chart": [""],
-      "Cache Timeout (seconds)": [""],
-      "The number of seconds before expiring the cache": [""],
+      "The id of the active chart": ["アクティブなチャートのID"],
+      "Cache Timeout (seconds)": ["キャッシュタイムアウト (秒)"],
+      "The number of seconds before expiring the cache": [
+        "キャッシュを期限切れにするまでの秒数"
+      ],
       "URL parameters": ["URLパラメータ"],
       "Extra parameters for use in jinja templated queries": [""],
       "Time range endpoints": [""],
       "Time range endpoints (SIP-15)": [""],
       "Annotations and layers": [""],
       "Sort descending": [""],
-      "Whether to sort descending or ascending": [""],
+      "Whether to sort descending or ascending": [
+        "降順または昇順でソートするかどうか"
+      ],
       "Contribution": [""],
-      "Compute the contribution to the total": [""],
+      "Compute the contribution to the total": ["全体への寄与度を算出"],
       "Advanced analytics": [""],
       "This section contains options that allow for advanced analytical post processing of query results": [
         ""
@@ -1823,6 +2121,10 @@
       "Pandas resample rule": [""],
       "Method": [""],
       "Pandas resample method": [""],
+      "No columns": [""],
+      "%s option": [""],
+      "Chosen non-numeric column": [""],
+      "No time columns": [""],
       "Favorites": ["お気に入り"],
       "Created content": ["作成したコンテンツ"],
       "Recent activity": ["最近のアクティビティ"],
@@ -1838,14 +2140,16 @@
       "Profile picture provided by Gravatar": [
         "Gravatarが提供するプロフィール写真"
       ],
-      "joined": ["参加しました"],
+      "joined": ["参加"],
       "id:": [""],
       "There was an error fetching your recent activity:": [
         "最近のアクティビティの取得中にエラーが発生しました:"
       ],
-      "Deleted: %s": ["削除: %s"],
+      "Deleted: %s": ["削除しました: %s"],
       "There was an issue deleting: %s": ["削除中に問題が発生しました: %s"],
-      "There was an issue deleting %s: %s": ["削除中に問題が発生しました: %s"],
+      "There was an issue deleting %s: %s": [
+        "%s の削除中に問題が発生しました: %s"
+      ],
       "report": ["レポート"],
       "alert": ["アラート"],
       "reports": ["レポート"],
@@ -1868,7 +2172,7 @@
       "Alerts & reports": ["アラートとレポート"],
       "Reports": ["レポート"],
       "This action will permanently delete %s.": [""],
-      "Delete %s?": ["削除"],
+      "Delete %s?": ["%s を削除しますか?"],
       "Please confirm": ["確認してください"],
       "Are you sure you want to delete the selected %s?": [""],
       "< (Smaller than)": [""],
@@ -1883,7 +2187,6 @@
       "90 days": ["90日"],
       "Add notification method": [""],
       "Add delivery method": [""],
-      "Recipients are separated by \",\" or \";\"": [""],
       "Add": ["追加"],
       "Edit ${isReport ? 'Report' : 'Alert'}": [""],
       "Add ${isReport ? 'Report' : 'Alert'}": [""],
@@ -1902,8 +2205,9 @@
       "Message content": ["メッセージ内容"],
       "log": ["ログ"],
       "State": ["状態"],
-      "Scheduled at": [""],
-      "Start at": ["開始時間"],
+      "Execution ID": ["実行 ID"],
+      "Scheduled at (UTC)": ["スケジュール設定時刻 (UTC)"],
+      "Start at (UTC)": ["開始時刻 (UTC)"],
       "Duration": ["期限"],
       "Error message": ["エラーメッセージ"],
       "${alertResource?.type}": [""],
@@ -1918,6 +2222,7 @@
       "Alert failed": ["アラートに失敗しました"],
       "Nothing triggered": [""],
       "Alert Triggered, In Grace Period": ["アラート発動、猶予期間中"],
+      "Recipients are separated by \",\" or \";\"": [""],
       "${RecipientIconName.email}": [""],
       "${RecipientIconName.slack}": [""],
       "annotation": ["注釈"],
@@ -1952,24 +2257,24 @@
       "There was an issue deleting the selected layers: %s": [
         "選択したレイヤーの削除で問題が発生しました: %s"
       ],
-      "Last modified": ["最終更新日"],
+      "Last modified": ["最終更新"],
       "Created on": ["作成日"],
       "Edit template": ["テンプレートを編集"],
       "Delete template": ["テンプレートを削除"],
       "Annotation layer": ["注釈レイヤー"],
       "An error occurred while fetching dataset datasource values: %s": [
-        "データセット・データソース値の取得中にエラーが発生しました"
+        "データセット・データソース値の取得中にエラーが発生しました: %s"
       ],
       "No annotation layers yet": ["注釈レイヤーはまだありません"],
       "This action will permanently delete the layer.": [
-        "このアクションにより、レイヤーが完全に削除されます"
+        "このアクションにより、レイヤーが完全に削除されます。"
       ],
       "Delete Layer?": ["本当にレイヤーを削除しますか？"],
       "Are you sure you want to delete the selected layers?": [
-        "選択されたレイヤーを削除してもよろしいですか？"
+        "選択したレイヤーを削除してもよろしいですか？"
       ],
       "Are you sure you want to delete": ["削除してもよろしいですか"],
-      "Last modified %s": ["最終更新日 %s"],
+      "Last modified %s": ["最終更新 %s"],
       "The passwords for the databases below are needed in order to import them together with the charts. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
         ""
       ],
@@ -1979,32 +2284,42 @@
       "There was an issue deleting the selected charts: %s": [""],
       "Modified by": ["更新者"],
       "Owner": ["所有者"],
+      "All": [""],
       "An error occurred while fetching chart owners values: %s": [""],
       "An error occurred while fetching chart created by values: %s": [""],
       "Viz type": ["可視化タイプ"],
       "An error occurred while fetching chart dataset values: %s": [""],
       "Favorite": ["お気に入り"],
+      "Any": ["任意"],
       "Yes": [""],
       "No": [""],
+      "Alphabetical": ["ABC順"],
+      "Recently modified": ["更新"],
+      "Least recently modified": ["最終更新"],
+      "Import charts": ["チャートのインポート"],
       "Are you sure you want to delete the selected charts?": [
         "選択したチャートを削除してもよろしいですか？"
       ],
       "css_template": [""],
       "Edit CSS template properties": ["CSSテンプレートのプロパティを編集する"],
       "Add CSS template": ["CSSテンプレートを追加する"],
-      "CSS template name": ["テンプレート名"],
+      "CSS template name": ["CSSテンプレート名"],
       "css": [""],
       "CSS templates": ["CSSテンプレート"],
-      "There was an issue deleting the selected templates: %s": [""],
+      "There was an issue deleting the selected templates: %s": [
+        "選択したテンプレートの削除で問題が発生しました: %s"
+      ],
       "Last modified by %s": ["最終更新者 %s"],
       "CSS template": ["CSSテンプレート"],
       "This action will permanently delete the template.": [
         "このアクションにより、テンプレートが完全に削除されます。"
       ],
-      "Delete Template?": ["CSSテンプレート"],
+      "Delete Template?": ["テンプレートを削除しますか?"],
       "Are you sure you want to delete the selected templates?": [
         "選択したテンプレートを削除してもよろしいですか？"
       ],
+      "published": ["公開"],
+      "draft": ["下書き"],
       "The passwords for the databases below are needed in order to import them together with the dashboards. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
         ""
       ],
@@ -2015,19 +2330,17 @@
         "ダッシュボードの取得中にエラーが発生しました: %s"
       ],
       "There was an issue deleting the selected dashboards: ": [
-        "選択したダッシュボードの削除で問題が発生しました。:"
+        "選択したダッシュボードの削除で問題が発生しました。: "
       ],
       "An error occurred while fetching dashboard owner values: %s": [
         "ダッシュボードの所有者の値の取得中にエラーが発生しました: %s"
       ],
       "An error occurred while fetching dashboard created by values: %s": [
-        "値によって作成されたダッシュボードの取得中にエラーが発生しました: %s"
+        "作成したダッシュボードの取得中にエラーが発生しました: %s"
       ],
-      "Unpublished": ["未公開"],
       "Are you sure you want to delete the selected dashboards?": [
         "選択したダッシュボードを削除してもよろしいですか？"
       ],
-      "Sorry, your browser does not support copying.": [""],
       "SQL Copied!": [""],
       "The passwords for the databases below are needed in order to import them. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
         ""
@@ -2037,7 +2350,8 @@
       ],
       "database": ["データベース"],
       "An error occurred while fetching database related data: %s": [""],
-      "Asynchronous query execution": [""],
+      "Import databases": ["データベースのインポート"],
+      "Asynchronous query execution": ["非同期でのクエリ実行"],
       "AQE": [""],
       "Allow data manipulation language": [""],
       "DML": [""],
@@ -2048,32 +2362,31 @@
       ],
       "Delete Database?": ["データベースを削除しますか？"],
       "Please enter a SQLAlchemy URI to test": [""],
-      "Connection looks good!": [""],
-      "ERROR: Connection failed. ": [""],
       "Sorry there was an error fetching database information: %s": [""],
       "Edit database": ["データベースを編集"],
       "Add database": ["データベースを追加"],
-      "Connection": [""],
-      "Database name": ["データベース名"],
+      "Display Name": ["表示名"],
       "Name your dataset": [""],
+      "Pick a name to help you identify this database.": [""],
       "dialect+driver://username:password@host:port/database": [""],
-      "Test connection": [""],
       "Refer to the ": [""],
-      "SQLAlchemy docs": [""],
       " for more information on how to structure your URI.": [""],
-      "Performance": [""],
-      "Chart cache timeout": [""],
-      "Operate the database in asynchronous mode, meaning that the queries are executed on remote workers as opposed to on the web server itself. This assumes that you have a Celery worker setup as well as a results backend. Refer to the installation docs for more information.": [
+      "Test connection": ["接続のテスト"],
+      "Allow this database to be queried in SQL Lab": [""],
+      "Allow creation of new tables based on queries": [""],
+      "Allow creation of new views based on queries": [""],
+      "CTAS & CVAS SCHEMA": [""],
+      "Search or select schema": [""],
+      "When allowing CREATE TABLE AS option in SQL Lab, this option forces the table to be created in this schema.": [
         ""
       ],
-      "SQL Lab settings": ["SQLラボ設定"],
-      "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...)": [
+      "Allow manipulation of the database using non-SELECT statements such as UPDATE, DELETE, CREATE, etc.": [
         ""
       ],
       "Allow multi schema metadata fetch": [""],
-      "CTAS schema": ["CTASスキーマ"],
-      "When allowing CREATE TABLE AS option in SQL Lab, this option forces the table to be created in this schema.": [
-        ""
+      "Chart cache timeout": [""],
+      "Operate the database in asynchronous mode, meaning that the queries are executed on remote workers as opposed to on the web server itself. This assumes that you have a Celery worker setup as well as a results backend. Refer to the installation docs for more information.": [
+        "データベースを非同期モードで動作させます。Webサーバー自体ではなくリモートワーカーでクエリを実行します。この機能はCeleryワーカーと結果バックエンドがセットアップされていることを前提としています。詳細についてはインストールドキュメントを参照してください。"
       ],
       "Secure extra": [""],
       "JSON string containing additional connection configuration.": [""],
@@ -2107,7 +2420,6 @@
       "5. The allows_virtual_table_explore field is a boolean specifying whether or not the Explore button in SQL Lab results is shown.": [
         ""
       ],
-      "Error while saving dataset: %s": [""],
       "Add dataset": ["データセットを追加"],
       "The passwords for the databases below are needed in order to import them together with the datasets. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
         ""
@@ -2122,51 +2434,78 @@
       "An error occurred while fetching dataset owner values: %s": [""],
       "An error occurred while fetching datasets: %s": [""],
       "An error occurred while fetching schema values: %s": [""],
-      "There was an issue deleting the selected datasets: %s": [""],
+      "Import datasets": ["データセットのインポート"],
+      "There was an issue deleting the selected datasets: %s": [
+        "選択したデータセットの削除に問題が発生しました: %s"
+      ],
       "The dataset %s is linked to %s charts that appear on %s dashboards. Are you sure you want to continue? Deleting the dataset will break those objects.": [
         ""
       ],
-      "Delete Dataset?": ["本当にデータセットを削除しますか？"],
-      "Are you sure you want to delete the selected datasets?": [""],
+      "Delete Dataset?": ["データセットを削除しますか?"],
+      "Are you sure you want to delete the selected datasets?": [
+        "選択したデータセットを削除しますか?"
+      ],
       "0 Selected": [""],
       "%s Selected (Virtual)": [""],
       "%s Selected (Physical)": [""],
       "%s Selected (%s Physical, %s Virtual)": [""],
-      "There was an issue previewing the selected query. %s": [""],
-      "Success": [""],
-      "Failed": [""],
-      "Running": [""],
-      "Offline": [""],
+      "There was an issue previewing the selected query. %s": [
+        "選択したクエリのプレビュー中に問題が発生しました。 %s"
+      ],
+      "Success": ["成功"],
+      "Failed": ["失敗"],
+      "Running": ["実行中"],
+      "Offline": ["オフライン"],
       "Scheduled": [""],
       "Duration: %s": [""],
-      "Tab name": [""],
+      "Tab name": ["タブ名"],
       "TABLES": [""],
       "Rows": [""],
-      "Open query in SQL Lab": ["SQLラボでクエリを開く"],
+      "Open query in SQL Lab": ["SQL Labでクエリを開く"],
       "An error occurred while fetching database values: %s": [""],
+      "Time range": ["期間"],
       "Search by query text": [""],
-      "Query preview": [""],
-      "Previous": [""],
-      "Next": [""],
-      "Open in SQL Lab": ["SQLラボで開く"],
+      "Query preview": ["クエリプレビュー"],
+      "Previous": ["前"],
+      "Next": ["次"],
+      "Open in SQL Lab": ["SQL Labで開く"],
       "User query": ["ユーザークエリ"],
-      "Executed query": ["実行されたクエリ"],
-      "Saved queries": ["保存されたクエリ"],
-      "There was an issue previewing the selected query %s": [""],
-      "Link Copied!": [""],
-      "There was an issue deleting the selected queries: %s": [""],
+      "Executed query": ["実行したクエリ"],
+      "The passwords for the databases below are needed in order to import them together with the saved queries. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
+        "保存したクエリと一緒にインポートするには、以下のデータベースのパスワードが必要です。データベース構成の ”Secure Extra” と ”Certificate” セクションはエクスポートファイルに存在せず、必要に応じてインポート後に手動で追加する必要がある点に注意してください。"
+      ],
+      "You are importing one or more saved queries that already exist. Overwriting might cause you to lose some of your work. Are you sure you want to overwrite?": [
+        "既に存在する 1 つ以上の保存済みクエリをインポートしています。上書きすると、作業の一部が失われる可能性があります。上書きしますか?"
+      ],
+      "Saved queries": ["保存したクエリ"],
+      "There was an issue previewing the selected query %s": [
+        "選択したクエリのプレビュー中に問題が発生しました %s"
+      ],
+      "Import queries": ["クエリのインポート"],
+      "Link Copied!": ["リンクをコピーしました!"],
+      "There was an issue deleting the selected queries: %s": [
+        "選択したクエリの削除に問題が発生しました: %s"
+      ],
       "Edit query": ["クエリを編集"],
-      "Copy query URL": [""],
+      "Copy query URL": ["クエリ URL のコピー"],
+      "Export query": ["クエリのエクスポート"],
       "Delete query": ["クエリを削除"],
-      "This action will permanently delete the saved query.": [""],
+      "This action will permanently delete the saved query.": [
+        "この操作を実行すると、保存したクエリは完全に削除されます。"
+      ],
       "Delete Query?": ["クエリを削除しますか？"],
-      "Are you sure you want to delete the selected queries?": [""],
+      "Are you sure you want to delete the selected queries?": [
+        "選択したクエリを削除しますか?"
+      ],
+      "queries": ["クエリ"],
       "Query name": ["クエリ名"],
-      "Edited": ["編集したもの"],
-      "Created": ["作成したもの"],
-      "Viewed": ["表示したもの"],
+      "[Untitled]": [""],
+      "Unknown": ["不明"],
+      "Edited": ["編集した項目"],
+      "Created": ["作成した項目"],
+      "Viewed": ["表示した項目"],
       "Examples": ["例"],
-      "Mine": ["私のもの"],
+      "Mine": ["個人用"],
       "Recently viewed charts, dashboards, and saved queries will appear here": [
         "最近表示したグラフ、ダッシュボード、保存したクエリがここに表示されます"
       ],
@@ -2174,20 +2513,32 @@
         "最近作成したグラフ、ダッシュボード、保存したクエリがここに表示されます"
       ],
       "Recent example charts, dashboards, and saved queries will appear here": [
-        "最近のチャート、ダッシュボード、保存されたクエリの例がここに表示されます"
+        "最近のチャート、ダッシュボード、保存したクエリの例がここに表示されます"
       ],
       "Recently edited charts, dashboards, and saved queries will appear here": [
         "最近編集したグラフ、ダッシュボード、保存したクエリがここに表示されます"
       ],
-      "${tableName\n                        .split('')\n                        .slice(0, tableName.length - 1)\n                        .join('')}\n                    ": [
+      "${tableName\n                      .split('')\n                      .slice(0, tableName.length - 1)\n                      .join('')}\n                    ": [
         ""
       ],
-      "You don't have any favorites yet!": ["まだお気に入りはありません！"],
-      "SQL Lab queries": ["SQLラボクエリ"],
-      "${tableName}": ["テーブル名"],
+      "You don't have any favorites yet!": ["まだお気に入りはありません!"],
+      "SQL Lab queries": ["SQL Labクエリ"],
+      "${tableName}": [""],
       "query": ["クエリ"],
       "Share": ["共有"],
       "Last run %s": ["前回の実行 %s"],
+      "There was an issue fetching your recent activity: %s": [
+        "最近のアクティビティの取得中に問題が発生しました: %s"
+      ],
+      "There was an issues fetching your dashboards: %s": [
+        "ダッシュボードの取得中に問題が発生しました: %s"
+      ],
+      "There was an issues fetching your chart: %s": [
+        "チャートの取得中に問題が発生しました: %s"
+      ],
+      "There was an issues fetching your saved queries: %s": [
+        "保存したクエリの取得中に問題が発生しました: %s"
+      ],
       "Recents": ["最近"],
       "Select start and end date": ["開始日と終了日を選択"],
       "Type or Select [%s]": ["入力または選択 [%s]"],
diff --git a/superset/translations/ja/LC_MESSAGES/messages.po b/superset/translations/ja/LC_MESSAGES/messages.po
index e28d6d322..c355eec5c 100644
--- a/superset/translations/ja/LC_MESSAGES/messages.po
+++ b/superset/translations/ja/LC_MESSAGES/messages.po
@@ -17,568 +17,597 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-22 15:56-0300\n"
-"PO-Revision-Date: 2017-10-20 16:25+0900\n"
-"Last-Translator: \n"
-"Language-Team: ja <LL@li.org>\n"
+"POT-Creation-Date: 2021-04-26 02:49+0900\n"
+"PO-Revision-Date: 2021-04-27 01:24+0900\n"
+"Last-Translator: Yuri Umezaki <bungoume@gmail.com>\n"
 "Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Language-Team: ja <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"Generated-By: Babel 2.8.0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
 
-#: superset/app.py:225
+#: superset/app.py:232
 msgid "Home"
 msgstr "ホーム"
 
-#: superset/app.py:230 superset/views/annotations.py:119
+#: superset/app.py:237 superset/views/annotations.py:119
 msgid "Annotation Layers"
 msgstr "注釈レイヤー"
 
-#: superset/app.py:233 superset/app.py:277 superset/app.py:286
-#: superset/app.py:339 superset/app.py:420 superset/app.py:428
-#: superset/app.py:438 superset/app.py:450
+#: superset/app.py:240 superset/app.py:284 superset/app.py:293
+#: superset/app.py:346 superset/app.py:431 superset/app.py:439
+#: superset/app.py:452 superset/app.py:464
 msgid "Manage"
 msgstr "管理"
 
-#: superset-frontend/src/profile/components/Security.tsx:46 superset/app.py:239
-#: superset/views/database/mixins.py:32
+#: superset-frontend/src/profile/components/Security.tsx:46 superset/app.py:246
+#: superset/views/database/mixins.py:33
 msgid "Databases"
 msgstr "データベース"
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:247
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:251
-#: superset/app.py:242 superset/app.py:251 superset/app.py:375
-#: superset/app.py:390 superset/app.py:478 superset/app.py:487
-#: superset/app.py:500 superset/app.py:509
+#: superset-frontend/src/explore/components/ControlPanelsContainer.tsx:300
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:293
+#: superset/app.py:249 superset/app.py:258 superset/app.py:382
+#: superset/app.py:397 superset/app.py:492 superset/app.py:501
+#: superset/app.py:514 superset/app.py:523
 msgid "Data"
 msgstr "データ"
 
-#: superset-frontend/src/profile/components/Security.tsx:60 superset/app.py:247
+#: superset-frontend/src/profile/components/Security.tsx:60 superset/app.py:254
 msgid "Datasets"
 msgstr "データセット"
 
 #: superset-frontend/src/dashboard/components/BuilderComponentPane.tsx:77
 #: superset-frontend/src/profile/components/CreatedContent.tsx:76
 #: superset-frontend/src/profile/components/Favorites.tsx:77
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:540
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:152 superset/app.py:258
-#: superset/views/chart/mixin.py:26 superset/views/dashboard/mixin.py:75
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:571
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:246 superset/app.py:265
+#: superset/views/chart/mixin.py:26 superset/views/dashboard/mixin.py:81
 msgid "Charts"
 msgstr "チャート"
 
 #: superset-frontend/src/profile/components/CreatedContent.tsx:73
 #: superset-frontend/src/profile/components/Favorites.tsx:74
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:499
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:134 superset/app.py:266
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:520
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:223 superset/app.py:273
 #: superset/views/chart/mixin.py:79 superset/views/dashboard/mixin.py:25
 msgid "Dashboards"
 msgstr "ダッシュボード"
 
-#: superset/app.py:275
+#: superset/app.py:282
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: superset/app.py:283 superset/views/css_templates.py:38
+#: superset/app.py:290 superset/views/css_templates.py:38
 msgid "CSS Templates"
 msgstr "CSSテンプレート"
 
-#: superset/app.py:293
+#: superset/app.py:300
 msgid "Row level security"
 msgstr "行レベルセキュリティ"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:551
-#: superset/app.py:295 superset/app.py:406 superset/app.py:464
+#: superset/app.py:302 superset/app.py:413 superset/app.py:478
 msgid "Security"
 msgstr "セキュリティ"
 
-#: superset/app.py:335
+#: superset/app.py:342
 msgid "Import Dashboards"
 msgstr "ダッシュボードをインポート"
 
-#: superset/app.py:344
+#: superset/app.py:351
 msgid "SQL Editor"
-msgstr "SQLエディタ"
+msgstr "SQL Editor"
 
-#: superset/app.py:349 superset/app.py:364
+#: superset/app.py:356 superset/app.py:371
 msgid "SQL Lab"
-msgstr "SQLラボ"
-
-#: superset/app.py:352
-msgid "Saved Queries"
-msgstr "保存されたクエリ"
+msgstr "SQL Lab"
 
 #: superset/app.py:359
+msgid "Saved Queries"
+msgstr "保存したクエリ"
+
+#: superset/app.py:366
 msgid "Query History"
 msgstr "クエリ履歴"
 
-#: superset/app.py:371
+#: superset/app.py:378
 msgid "Upload a CSV"
 msgstr "CSVをアップロード"
 
-#: superset/app.py:386
+#: superset/app.py:393
 msgid "Upload Excel"
 msgstr "Excelをアップロード"
 
-#: superset/app.py:404
+#: superset/app.py:411
 msgid "Action Log"
-msgstr "アクション履歴"
+msgstr "操作履歴"
 
-#: superset/app.py:418
+#: superset/app.py:429
 msgid "Dashboard Emails"
 msgstr "ダッシュボードメール"
 
-#: superset/app.py:426
+#: superset/app.py:437
 msgid "Chart Email Schedules"
 msgstr "チャートメールスケジュール"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:415 superset/app.py:436
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:420 superset/app.py:450
 msgid "Alerts"
 msgstr "アラート"
 
-#: superset/app.py:448
+#: superset/app.py:462
 msgid "Alerts & Reports"
 msgstr "アラートとレポート"
 
-#: superset/app.py:462
+#: superset/app.py:476
 msgid "Access requests"
 msgstr "アクセス要求"
 
-#: superset/app.py:476 superset/connectors/druid/views.py:257
+#: superset/app.py:490 superset/connectors/druid/views.py:257
 msgid "Druid Datasources"
-msgstr ""
+msgstr "Druid データソース"
 
-#: superset/app.py:484 superset/connectors/druid/views.py:195
+#: superset/app.py:498 superset/connectors/druid/views.py:195
 msgid "Druid Clusters"
-msgstr ""
+msgstr "Druid クラスタ"
 
-#: superset/app.py:497
+#: superset/app.py:511
 msgid "Scan New Datasources"
-msgstr ""
+msgstr "新しいデータソースをスキャン"
 
-#: superset/app.py:506
+#: superset/app.py:520
 msgid "Refresh Druid Metadata"
-msgstr ""
+msgstr "Druid Metadataを更新"
 
-#: superset/errors.py:64
+#: superset/errors.py:78
 msgid "Issue 1000 - The datasource is too large to query."
-msgstr ""
+msgstr "Issue 1000 - データ ソースが大きすぎてクエリを実行できませんでした。"
 
-#: superset/errors.py:68
+#: superset/errors.py:82
 msgid "Issue 1001 - The database is under an unusual load."
-msgstr ""
+msgstr "Issue 1001 - データベースに異常な負荷がかかっています。"
 
-#: superset/errors.py:74
+#: superset/errors.py:88
 msgid "Issue 1002 - The database returned an unexpected error."
-msgstr ""
+msgstr "Issue 1002 - データベースが予期しないエラーを返しました。"
 
-#: superset/errors.py:80 superset/errors.py:95
+#: superset/errors.py:94 superset/errors.py:109 superset/errors.py:124
 msgid ""
-"Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a "
-"misspelling or a typo."
-msgstr ""
+"Issue 1003 - There is a syntax error in the SQL query. Perhaps there was "
+"a misspelling or a typo."
+msgstr "Issue 1003 - SQL クエリに構文エラーがあります。スペルミスやタイプミスがないか確認して下さい。"
 
-#: superset/errors.py:87
+#: superset/errors.py:101
 msgid "Issue 1004 - The column was deleted or renamed in the database."
-msgstr ""
+msgstr "Issue 1004 - データベースでカラムが削除または名前変更されました。"
 
-#: superset/errors.py:102
+#: superset/errors.py:116
 msgid "Issue 1005 - The table was deleted or renamed in the database."
-msgstr ""
+msgstr "Issue 1005 - データベースでテーブルが削除または名前変更されました。"
 
-#: superset/errors.py:110
+#: superset/errors.py:131
+msgid "Issue 1005 - The schema was deleted or renamed in the database."
+msgstr "Issue 1005 - データベースでスキーマが削除または名前変更されました。"
+
+#: superset/errors.py:139
 msgid "Issue 1006 - One or more parameters specified in the query are missing."
-msgstr ""
+msgstr "Issue 1006 - クエリで指定された1つ以上のパラメーターが見つかりません。"
 
-#: superset/databases/schemas.py:168 superset/exceptions.py:125
+#: superset/errors.py:148
+msgid "Issue 1007 - The hostname provided can't be resolved."
+msgstr "Issue 1007 - 指定されたホスト名を解決できません。"
+
+#: superset/errors.py:152
+msgid "Issue 1008 - The port is closed."
+msgstr "Issue 1008 - ポートが閉じています。"
+
+#: superset/errors.py:157
+msgid ""
+"Issue 1009 - The host might be down, and can't be reached on the provided"
+" port."
+msgstr "Issue 1009 - 指定されたポートに到達できません。ホストがダウンしている可能性があります。"
+
+#: superset/errors.py:166
+msgid "Issue 1010 - Superset encountered an error while running a command."
+msgstr "Issue 1010 - コマンドの実行中にSuperset内でエラーが発生しました。"
+
+#: superset/errors.py:174
+msgid "Issue 1011 - Superset encountered an unexpected error."
+msgstr "Issue 1011 - Supersetで予期しないエラーが発生しました。"
+
+#: superset/errors.py:180
+msgid ""
+"Issue 1012 - The username provided when connecting to a database is not "
+"valid."
+msgstr "Issue 1012 - データベース接続時に指定されたユーザー名が無効です。"
+
+#: superset/errors.py:189
+msgid ""
+"Issue 1013 - The password provided when connecting to a database is not "
+"valid."
+msgstr "Issue 1013 - データベース接続時に指定されたパスワードが無効です。"
+
+#: superset/errors.py:198
+msgid "Issue 1014 - Either the username or the password is wrong."
+msgstr "Issue 1014 - ユーザー名またはパスワードが間違っています。"
+
+#: superset/errors.py:202 superset/errors.py:211
+msgid "Issue 1015 - Either the database is spelled incorrectly or does not exist."
+msgstr "Issue 1015 - データベース名が正しくないか、または存在しません。"
+
+#: superset/errors.py:220
+msgid "Issue 1017 - User doesn't have the proper permissions."
+msgstr "Issue 1017 - ユーザーに適切なアクセス許可がありません。"
+
+#: superset/databases/schemas.py:165 superset/exceptions.py:137
 msgid "Invalid certificate"
-msgstr ""
+msgstr "無効な証明書"
 
 #: superset/jinja_context.py:222
 #, python-format
 msgid "Unsafe return type for function %(func)s: %(value_type)s"
-msgstr ""
+msgstr "関数 %(func)s の安全でない戻り値の型: %(value_type)s"
 
 #: superset/jinja_context.py:233
 #, python-format
 msgid "Unsupported return value for method %(name)s"
-msgstr ""
+msgstr "メソッド %(name)s のサポートされていない戻り値"
 
 #: superset/jinja_context.py:246
 #, python-format
 msgid "Unsafe template value for key %(key)s: %(value_type)s"
-msgstr ""
+msgstr "キー %(key)s の安全でないテンプレート値: %(value_type)s"
 
 #: superset/jinja_context.py:257
 #, python-format
 msgid "Unsupported template value for key %(key)s"
 msgstr ""
 
-#: superset/sql_lab.py:173
+#: superset/sql_lab.py:168
+msgid ""
+"SQL Lab timeout. This environment's policy is to kill queries after {} "
+"seconds."
+msgstr "SQL Labタイムアウト。この環境のポリシーは {} 秒後にクエリを強制終了します。"
+
+#: superset/sql_lab.py:196
 msgid "Only `SELECT` statements are allowed against this database"
+msgstr "`SELECT` 操作のみがこのDBに対して許可されています"
+
+#: superset/sql_lab.py:355
+msgid ""
+"CTAS (create table as select) can only be run with a query where the last"
+" statement is a SELECT. Please make sure your query has a SELECT as its "
+"last statement. Then, try running your query again."
 msgstr ""
 
-#: superset/sql_lab.py:341
+#: superset/sql_lab.py:367
 msgid ""
-"CTAS (create table as select) can only be run with a query where the last "
-"statement is a SELECT. Please make sure your query has a SELECT as its last "
+"CVAS (create view as select) can only be run with a query with a single "
+"SELECT statement. Please make sure your query has only a SELECT "
 "statement. Then, try running your query again."
 msgstr ""
 
-#: superset/sql_lab.py:353
-msgid ""
-"CVAS (create view as select) can only be run with a query with a single "
-"SELECT statement. Please make sure your query has only a SELECT statement. "
-"Then, try running your query again."
-msgstr ""
-
-#: superset/viz.py:125 superset/viz_sip38.py:126
+#: superset/viz.py:131
 msgid "Viz is missing a datasource"
-msgstr ""
+msgstr "Viz はデータソースがありません"
 
-#: superset/viz.py:238
+#: superset/viz.py:237
 msgid ""
-"Applied rolling window did not return any data. Please make sure the source "
-"query satisfies the minimum periods defined in the rolling window."
+"Applied rolling window did not return any data. Please make sure the "
+"source query satisfies the minimum periods defined in the rolling window."
 msgstr ""
 
-#: superset/utils/date_parser.py:257 superset/viz.py:376
-#: superset/viz_sip38.py:376
+#: superset/utils/date_parser.py:264 superset/viz.py:355
 msgid "From date cannot be larger than to date"
 msgstr "開始日は終了日を超えてはいけません"
 
-#: superset/viz.py:527
+#: superset/viz.py:521
 msgid "Cached value not found"
-msgstr ""
+msgstr "キャッシュされた値が見つかりません"
 
-#: superset/common/query_context.py:395 superset/viz.py:542
+#: superset/common/query_context.py:356 superset/viz.py:537
 #, python-format
 msgid "Columns missing in datasource: %(invalid_columns)s"
 msgstr ""
 
-#: superset/viz.py:654 superset/viz_sip38.py:598
+#: superset/viz.py:649
 msgid "Table View"
 msgstr ""
 
-#: superset/viz.py:676
+#: superset/viz.py:671
 msgid ""
-"You cannot use [Columns] in combination with [Group By]/[Metrics]/"
-"[Percentage Metrics]. Please choose one or the other."
+"You cannot use [Columns] in combination with [Group "
+"By]/[Metrics]/[Percentage Metrics]. Please choose one or the other."
 msgstr ""
+"[Columns] を [Group By]/[Metrics]/[Percentage Metrics] "
+"と組み合わせて使用することはできません。どちらか一方を選択してください。"
 
-#: superset/viz.py:713 superset/viz_sip38.py:611
+#: superset/viz.py:708
 msgid "Pick a granularity in the Time section or uncheck 'Include Time'"
 msgstr ""
 
-#: superset/viz.py:786 superset/viz_sip38.py:713
+#: superset/viz.py:781
 msgid "Time Table View"
 msgstr ""
 
-#: superset/viz.py:795 superset/viz.py:1648 superset/viz_sip38.py:722
-#: superset/viz_sip38.py:1605
+#: superset/viz.py:790 superset/viz.py:1734
 msgid "Pick at least one metric"
 msgstr "少なくとも1つの指標を選択してください"
 
-#: superset/viz.py:799 superset/viz_sip38.py:726
+#: superset/viz.py:794
 msgid "When using 'Group By' you are limited to use a single metric"
-msgstr ""
+msgstr "‘Group By’ を使用する場合、指標は1つに制限されます。"
 
-#: superset/viz.py:828 superset/viz_sip38.py:755
+#: superset/viz.py:823
 msgid "Pivot Table"
 msgstr "ピボットテーブル"
 
-#: superset/viz.py:845 superset/viz_sip38.py:771
+#: superset/viz.py:840
 msgid "Please choose at least one 'Group by' field "
 msgstr "少なくとも1つの[Group by]フィールドを選択してください "
 
-#: superset/viz.py:857 superset/viz_sip38.py:783
+#: superset/viz.py:852
 msgid "Please choose at least one metric"
 msgstr "少なくとも1つの指標を選択してください"
 
-#: superset/viz.py:859 superset/viz_sip38.py:785
+#: superset/viz.py:854
 msgid "Group By' and 'Columns' can't overlap"
 msgstr "‘Group by’ と ‘Columns’ は重複できません"
 
-#: superset/viz.py:954 superset/viz_sip38.py:837
+#: superset/viz.py:956
 msgid "Treemap"
-msgstr ""
+msgstr "ツリーマップ"
 
-#: superset/viz.py:986 superset/viz_sip38.py:869
+#: superset/viz.py:999
 msgid "Calendar Heatmap"
 msgstr ""
 
-#: superset/viz.py:1066 superset/viz_sip38.py:1030
+#: superset/viz.py:1091
 msgid "Bubble Chart"
 msgstr "バブルチャート"
 
-#: superset/viz.py:1088 superset/viz_sip38.py:1046
+#: superset/viz.py:1113
 msgid "Please use 3 different metric labels"
-msgstr ""
+msgstr "3つの異なる指標ラベルを使用してください"
 
-#: superset/viz.py:1090 superset/viz_sip38.py:1048
+#: superset/viz.py:1115
 msgid "Pick a metric for x, y and size"
 msgstr ""
 
-#: superset/viz.py:1117 superset/viz_sip38.py:1075
+#: superset/viz.py:1142
 msgid "Bullet Chart"
 msgstr ""
 
-#: superset/viz.py:1127 superset/viz_sip38.py:1085
+#: superset/viz.py:1152
 msgid "Pick a metric to display"
-msgstr ""
+msgstr "表示する指標を選択"
 
-#: superset/viz.py:1145 superset/viz_sip38.py:1101
+#: superset/viz.py:1170
 msgid "Big Number with Trendline"
 msgstr ""
 
-#: superset/viz.py:1153 superset/viz.py:1187 superset/viz_sip38.py:1109
-#: superset/viz_sip38.py:1140
+#: superset/viz.py:1178 superset/viz.py:1212
 msgid "Pick a metric!"
 msgstr "指標を選んでください!"
 
-#: superset/viz.py:1179 superset/viz_sip38.py:1132
+#: superset/viz.py:1204
 msgid "Big Number"
 msgstr "数値"
 
-#: superset/viz.py:1201 superset/viz_sip38.py:1154
+#: superset/viz.py:1226
 msgid "Time Series - Line Chart"
 msgstr "時系列 - 折れ線グラフ"
 
-#: superset/viz.py:1271 superset/viz.py:1488 superset/viz_sip38.py:1219
-#: superset/viz_sip38.py:1433
+#: superset/viz.py:1296 superset/viz.py:1562
 msgid "Pick a time granularity for your time series"
-msgstr ""
+msgstr "時系列の時間粒度を選択"
 
-#: superset/viz.py:1330 superset/viz_sip38.py:1275
+#: superset/viz.py:1355
 msgid ""
-"An enclosed time range (both start and end) must be specified when using a "
-"Time Comparison."
-msgstr ""
+"An enclosed time range (both start and end) must be specified when using "
+"a Time Comparison."
+msgstr "時間比較を使用する場合は、期間 (開始と終了の両方) を指定する必要があります。"
 
-#: superset/viz.py:1400 superset/viz_sip38.py:1345
+#: superset/viz.py:1427
 msgid "Time Series - Multiple Line Charts"
-msgstr ""
+msgstr "時系列 - 複数の折れ線グラフ"
 
-#: superset/viz.py:1430 superset/viz_sip38.py:1375
+#: superset/viz.py:1504
 msgid "Time Series - Dual Axis Line Chart"
-msgstr ""
+msgstr "時系列 - 二重軸折れ線グラフ"
 
-#: superset/viz.py:1440 superset/viz_sip38.py:1385
+#: superset/viz.py:1514
 msgid "Pick a metric for left axis!"
 msgstr ""
 
-#: superset/viz.py:1442 superset/viz_sip38.py:1387
+#: superset/viz.py:1516
 msgid "Pick a metric for right axis!"
 msgstr ""
 
-#: superset/viz.py:1445 superset/viz_sip38.py:1390
+#: superset/viz.py:1519
 msgid "Please choose different metrics on left and right axis"
 msgstr ""
 
-#: superset/viz.py:1505 superset/viz_sip38.py:1450
+#: superset/viz.py:1579
 msgid "Time Series - Bar Chart"
 msgstr "時系列 - 棒グラフ"
 
-#: superset/viz.py:1514 superset/viz_sip38.py:1459
+#: superset/viz.py:1588
 msgid "Time Series - Period Pivot"
-msgstr ""
+msgstr "時系列 - 期間ピボット"
 
-#: superset/viz.py:1561 superset/viz_sip38.py:1506
+#: superset/viz.py:1635
 msgid "Time Series - Percent Change"
-msgstr ""
+msgstr "時系列 - 変化率"
 
-#: superset/viz.py:1569 superset/viz_sip38.py:1514
+#: superset/viz.py:1643
 msgid "Time Series - Stacked"
-msgstr ""
+msgstr "時系列 - 積み上げ"
 
-#: superset/viz.py:1579 superset/viz_sip38.py:1543
+#: superset/viz.py:1664
 msgid "Histogram"
 msgstr "ヒストグラム"
 
-#: superset/viz.py:1589 superset/viz_sip38.py:1552
+#: superset/viz.py:1674
 msgid "Must have at least one numeric column specified"
-msgstr ""
+msgstr "少なくとも 1 つの数値列を指定する必要があります。"
 
-#: superset/viz.py:1635 superset/viz_sip38.py:1596
+#: superset/viz.py:1721
 msgid "Distribution - Bar Chart"
 msgstr "棒グラフ"
 
-#: superset/viz.py:1645
+#: superset/viz.py:1731
 msgid "Can't have overlap between Series and Breakdowns"
 msgstr ""
 
-#: superset/viz.py:1650 superset/viz_sip38.py:1607
+#: superset/viz.py:1736
 msgid "Pick at least one field for [Series]"
 msgstr ""
 
-#: superset/viz.py:1702 superset/viz_sip38.py:1659
+#: superset/viz.py:1802
 msgid "Sunburst"
 msgstr ""
 
-#: superset/viz.py:1748 superset/viz_sip38.py:1703
+#: superset/viz.py:1850
 msgid "Sankey"
-msgstr ""
+msgstr "サンキー"
 
-#: superset/viz.py:1756
+#: superset/viz.py:1858
 msgid "Pick exactly 2 columns as [Source / Target]"
 msgstr ""
 
-#: superset/viz.py:1800 superset/viz_sip38.py:1736
+#: superset/viz.py:1902
 msgid ""
-"There's a loop in your Sankey, please provide a tree. Here's a faulty link: "
-"{}"
+"There's a loop in your Sankey, please provide a tree. Here's a faulty "
+"link: {}"
 msgstr ""
 
-#: superset/viz.py:1813 superset/viz.py:1836 superset/viz_sip38.py:1749
-#: superset/viz_sip38.py:1770
+#: superset/viz.py:1915
 msgid "Directed Force Layout"
 msgstr ""
 
-#: superset/viz.py:1820 superset/viz_sip38.py:1756
-msgid "Pick exactly 2 columns to 'Group By'"
-msgstr ""
-
-#: superset/viz.py:1869 superset/viz_sip38.py:1802
+#: superset/viz.py:1950
 msgid "Country Map"
-msgstr ""
+msgstr "国別地図"
 
-#: superset/viz.py:1898 superset/viz_sip38.py:1823
+#: superset/viz.py:1987
 msgid "World Map"
-msgstr ""
+msgstr "世界地図"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:438
-#: superset-frontend/src/explore/controls.jsx:467 superset/viz.py:1956
-#: superset/viz_sip38.py:1873
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:103
+#: superset-frontend/src/explore/controls.jsx:468 superset/viz.py:2047
 msgid "Filters"
 msgstr "フィルタ"
 
-#: superset/viz.py:1974 superset/viz_sip38.py:1891
+#: superset/viz.py:2067
 msgid "Invalid filter configuration, please select a column"
 msgstr ""
 
-#: superset/viz.py:2018 superset/viz_sip38.py:1952
+#: superset/viz.py:2115
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: superset/viz.py:2040 superset/viz_sip38.py:1968
+#: superset/viz.py:2144
 msgid "Heatmap"
 msgstr "ヒートマップ"
 
-#: superset/viz.py:2096 superset/viz_sip38.py:2017
+#: superset/viz.py:2204
 msgid "Horizon Charts"
 msgstr ""
 
-#: superset/viz.py:2108 superset/viz_sip38.py:2029
+#: superset/viz.py:2228
 msgid "Mapbox"
 msgstr ""
 
-#: superset/viz.py:2120 superset/viz_sip38.py:2041
+#: superset/viz.py:2240
 msgid "[Longitude] and [Latitude] must be set"
 msgstr ""
 
-#: superset/viz.py:2127 superset/viz_sip38.py:2048
+#: superset/viz.py:2247
 msgid "Must have a [Group By] column to have 'count' as the [Label]"
-msgstr ""
+msgstr "[Label] として ’count’ を持つには、[Group By] 列が必要です"
 
-#: superset/viz.py:2147 superset/viz_sip38.py:2068
+#: superset/viz.py:2267
 msgid "Choice of [Label] must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2155 superset/viz_sip38.py:2075
+#: superset/viz.py:2275
 msgid "Choice of [Point Radius] must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2163 superset/viz_sip38.py:2082
+#: superset/viz.py:2283
 msgid "[Longitude] and [Latitude] columns must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2243 superset/viz_sip38.py:2162
+#: superset/viz.py:2363
 msgid "Deck.gl - Multiple Layers"
 msgstr ""
 
-#: superset/viz.py:2283 superset/viz.py:2315 superset/viz_sip38.py:2218
+#: superset/viz.py:2403 superset/viz.py:2435
 msgid "Bad spatial key"
 msgstr ""
 
-#: superset/viz.py:2301 superset/viz_sip38.py:2204
+#: superset/viz.py:2421
 #, python-format
 msgid "Invalid spatial point encountered: %s"
 msgstr ""
 
-#: superset/viz.py:2337 superset/viz_sip38.py:2240
+#: superset/viz.py:2457
 msgid ""
-"Encountered invalid NULL spatial "
-"entry,                                        please consider filtering "
-"those out"
+"Encountered invalid NULL spatial entry,"
+"                                        please consider filtering those "
+"out"
 msgstr ""
 
-#: superset/viz.py:2427 superset/viz_sip38.py:2311
+#: superset/viz.py:2547
 msgid "Deck.gl - Scatter plot"
 msgstr ""
 
-#: superset/viz.py:2476 superset/viz_sip38.py:2358
+#: superset/viz.py:2596
 msgid "Deck.gl - Screen Grid"
 msgstr ""
 
-#: superset/viz.py:2502 superset/viz_sip38.py:2384
+#: superset/viz.py:2622
 msgid "Deck.gl - 3D Grid"
 msgstr ""
 
-#: superset/viz.py:2532 superset/viz_sip38.py:2411
+#: superset/viz.py:2652
 msgid "Deck.gl - Paths"
 msgstr ""
 
-#: superset/viz.py:2580 superset/viz_sip38.py:2456
+#: superset/viz.py:2700
 msgid "Deck.gl - Polygon"
 msgstr ""
 
-#: superset/viz.py:2609 superset/viz_sip38.py:2485
+#: superset/viz.py:2729
 msgid "Deck.gl - 3D HEX"
 msgstr ""
 
-#: superset/viz.py:2628 superset/viz_sip38.py:2501
+#: superset/viz.py:2748
 msgid "Deck.gl - GeoJSON"
 msgstr ""
 
-#: superset/viz.py:2647 superset/viz_sip38.py:2513
+#: superset/viz.py:2767
 msgid "Deck.gl - Arc"
 msgstr ""
 
-#: superset/viz.py:2682 superset/viz_sip38.py:2548
+#: superset/viz.py:2802
 msgid "Event flow"
 msgstr ""
 
-#: superset/viz.py:2714 superset/viz_sip38.py:2580
+#: superset/viz.py:2834
 msgid "Time Series - Paired t-test"
 msgstr ""
 
-#: superset/viz.py:2769 superset/viz_sip38.py:2635
+#: superset/viz.py:2901
 msgid "Time Series - Nightingale Rose Chart"
 msgstr ""
 
-#: superset/viz.py:2804 superset/viz_sip38.py:2670
+#: superset/viz.py:2947
 msgid "Partition Diagram"
 msgstr ""
 
-#: superset/viz_sip38.py:623
-msgid ""
-"Choose either fields to [Group By] and [Metrics] and/or [Percentage "
-"Metrics], or [Columns], not both"
-msgstr "[Group By]と[Metrics]または[列]のいずれかを選択します"
-
-#: superset/viz_sip38.py:943
-msgid "Box Plot"
-msgstr "ボックスプロット"
-
-#: superset/viz_sip38.py:1524
-msgid "Distribution - NVD3 - Pie Chart"
-msgstr "円グラフ"
-
-#: superset/viz_sip38.py:1929
-msgid "iFrame"
-msgstr ""
-
 #: superset/annotation_layers/api.py:346
 #, python-format
 msgid "Deleted %(num)d annotation layer"
@@ -660,7 +689,7 @@ msgid "Annotation layer has associated annotations."
 msgstr ""
 
 #: superset/annotation_layers/commands/exceptions.py:66
-#: superset/reports/commands/exceptions.py:133
+#: superset/reports/commands/exceptions.py:137
 msgid "Name must be unique"
 msgstr ""
 
@@ -670,40 +699,40 @@ msgid "Deleted %(num)d chart"
 msgid_plural "Deleted %(num)d charts"
 msgstr[0] ""
 
-#: superset/charts/api.py:563
+#: superset/charts/api.py:557
 msgid "Request is not JSON"
 msgstr ""
 
-#: superset/charts/api.py:571 superset/charts/api.py:643
+#: superset/charts/api.py:568 superset/charts/api.py:638
 #, python-format
 msgid "Request is incorrect: %(error)s"
 msgstr ""
 
-#: superset/charts/schemas.py:487
+#: superset/charts/schemas.py:510
 msgid "`confidence_interval` must be between 0 and 1 (exclusive)"
 msgstr ""
 
-#: superset/charts/schemas.py:553
+#: superset/charts/schemas.py:576
 msgid ""
 "lower percentile must be greater than 0 and less than 100. Must be lower "
 "than upper percentile."
 msgstr ""
 
-#: superset/charts/schemas.py:568
+#: superset/charts/schemas.py:591
 msgid ""
-"upper percentile must be greater than 0 and less than 100. Must be higher "
-"than lower percentile."
+"upper percentile must be greater than 0 and less than 100. Must be higher"
+" than lower percentile."
 msgstr ""
 
-#: superset/charts/schemas.py:848
+#: superset/charts/schemas.py:871
 msgid "`width` must be greater or equal to 0"
 msgstr ""
 
-#: superset/charts/schemas.py:938
-msgid "`row_limit` must be greater than or equal to 1"
+#: superset/charts/schemas.py:986
+msgid "`row_limit` must be greater than or equal to 0"
 msgstr ""
 
-#: superset/charts/schemas.py:944
+#: superset/charts/schemas.py:993
 msgid "`row_offset` must be greater than or equal to 0"
 msgstr ""
 
@@ -716,96 +745,128 @@ msgstr ""
 msgid "There are associated alerts or reports: %s,"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:37
-#: superset/datasets/commands/exceptions.py:38
+#: superset/charts/commands/exceptions.py:38
+#, python-format
+msgid ""
+"Time string is unclear. Please specify [%(human_readable)s ago] or "
+"[%(human_readable)s later]."
+msgstr ""
+
+#: superset/charts/commands/exceptions.py:51
+#, python-format
+msgid "Cannot parse time string [%(human_readable)s]"
+msgstr ""
+
+#: superset/charts/commands/exceptions.py:65
+#: superset/datasets/commands/exceptions.py:41
 #: superset/reports/commands/exceptions.py:35
 msgid "Database does not exist"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:46
+#: superset/charts/commands/exceptions.py:74
 msgid "Dashboards do not exist"
 msgstr "ダッシュボードは存在しません"
 
-#: superset/charts/commands/exceptions.py:56
+#: superset/charts/commands/exceptions.py:84
 msgid "Datasource type is required when datasource_id is given"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:66
+#: superset/charts/commands/exceptions.py:94
 msgid "Chart parameters are invalid."
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:70
+#: superset/charts/commands/exceptions.py:98
 msgid "Chart could not be created."
-msgstr "チャートを作成できませんでした"
+msgstr "チャートを作成できませんでした。"
 
-#: superset/charts/commands/exceptions.py:74
-msgid "Chart could not be updated."
-msgstr "チャートをアップロードできませんでした"
-
-#: superset/charts/commands/exceptions.py:78
-msgid "Chart could not be deleted."
-msgstr "チャートを削除できませんでした"
-
-#: superset/charts/commands/exceptions.py:82
 #: superset/charts/commands/exceptions.py:102
-#: superset/dashboards/commands/exceptions.py:57
-#: superset/dashboards/commands/exceptions.py:69
-#: superset/databases/commands/exceptions.py:116
-msgid "There are associated alerts or reports"
-msgstr ""
-
-#: superset/charts/commands/exceptions.py:86
-msgid "Changing this chart is forbidden"
-msgstr ""
-
-#: superset/charts/commands/exceptions.py:90
-msgid "Charts could not be deleted."
-msgstr ""
+msgid "Chart could not be updated."
+msgstr "チャートをアップロードできませんでした。"
 
 #: superset/charts/commands/exceptions.py:106
+msgid "Chart could not be deleted."
+msgstr "チャートを削除できませんでした。"
+
+#: superset/charts/commands/exceptions.py:110
+#: superset/charts/commands/exceptions.py:130
+#: superset/dashboards/commands/exceptions.py:57
+#: superset/dashboards/commands/exceptions.py:69
+#: superset/databases/commands/exceptions.py:117
+msgid "There are associated alerts or reports"
+msgstr "関連するアラートまたはレポートがあります"
+
+#: superset/charts/commands/exceptions.py:114
+msgid "Changing this chart is forbidden"
+msgstr "このチャートの変更は禁止されています"
+
+#: superset/charts/commands/exceptions.py:118
+msgid "Charts could not be deleted."
+msgstr "チャートを削除できませんでした。"
+
+#: superset/charts/commands/exceptions.py:134
 msgid "Import chart failed for an unknown reason"
 msgstr ""
 
 #: superset/commands/exceptions.py:85
-#: superset/datasets/commands/exceptions.py:141
+#: superset/datasets/commands/exceptions.py:144
 msgid "Owners are invalid"
 msgstr ""
 
 #: superset/commands/exceptions.py:92
+msgid "Some roles do not exist"
+msgstr "一部のロールが存在しません"
+
+#: superset/commands/exceptions.py:99
+#: superset/datasets/commands/exceptions.py:149
 msgid "Dataset does not exist"
 msgstr "データセットが存在しません"
 
-#: superset/common/query_object.py:301
+#: superset/common/query_actions.py:183
+msgid "Invalid result type: %(result_type)"
+msgstr ""
+
+#: superset/common/query_context.py:276
+msgid "The chart does not exist"
+msgstr "チャートが存在しません"
+
+#: superset/common/query_object.py:260
+#, python-format
+msgid ""
+"Duplicate column/metric labels: %(labels)s. Please make sure all columns "
+"and metrics have a unique label."
+msgstr ""
+
+#: superset/common/query_object.py:359
 msgid "`operation` property of post processing object undefined"
 msgstr ""
 
-#: superset/common/query_object.py:305
+#: superset/common/query_object.py:363
 #, python-format
 msgid "Unsupported post processing operation: %(operation)s"
 msgstr ""
 
-#: superset/connectors/druid/models.py:240
+#: superset/connectors/druid/models.py:239
 msgid "Adding new datasource [{}]"
 msgstr ""
 
-#: superset/connectors/druid/models.py:243
+#: superset/connectors/druid/models.py:242
 msgid "Refreshing datasource [{}]"
 msgstr ""
 
-#: superset/connectors/druid/models.py:1054
+#: superset/connectors/druid/models.py:1053
 msgid "Metric(s) {} must be aggregations."
 msgstr ""
 
-#: superset/connectors/druid/models.py:1476
+#: superset/connectors/druid/models.py:1471
 msgid "Unsupported extraction function: "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:994
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:231
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1031
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:228
 #: superset-frontend/src/explore/controls.jsx:251
 #: superset/connectors/druid/views.py:56 superset/connectors/sqla/views.py:63
 msgid "Columns"
-msgstr ""
+msgstr "列"
 
 #: superset/connectors/druid/views.py:57
 msgid "Show Druid Column"
@@ -820,21 +881,21 @@ msgid "Edit Druid Column"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx:31
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:209
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:137
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:222
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:228
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:137
 #: superset-frontend/src/explore/components/controls/SpatialControl.jsx:193
 #: superset/connectors/druid/views.py:77 superset/connectors/sqla/views.py:134
 msgid "Column"
 msgstr "列"
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:261
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:439
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:272
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:450
 #: superset/connectors/druid/views.py:78 superset/connectors/druid/views.py:174
-#: superset/connectors/sqla/views.py:143 superset/connectors/sqla/views.py:239
+#: superset/connectors/sqla/views.py:143 superset/connectors/sqla/views.py:251
 msgid "Type"
 msgstr "タイプ"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:148
 #: superset/connectors/druid/views.py:79 superset/views/access_requests.py:43
 #: superset/views/chart/mixin.py:80
 msgid "Datasource"
@@ -850,13 +911,14 @@ msgstr "フィルタ可能"
 
 #: superset/connectors/druid/views.py:84 superset/connectors/sqla/views.py:98
 msgid ""
-"Whether this column is exposed in the `Filters` section of the explore view."
+"Whether this column is exposed in the `Filters` section of the explore "
+"view."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:983
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:218
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1020
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:206
 #: superset-frontend/src/explore/controls.jsx:153
-#: superset/connectors/druid/views.py:143 superset/connectors/sqla/views.py:193
+#: superset/connectors/druid/views.py:143 superset/connectors/sqla/views.py:205
 msgid "Metrics"
 msgstr "指標"
 
@@ -872,28 +934,28 @@ msgstr ""
 msgid "Edit Druid Metric"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:836
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:864
 #: superset-frontend/src/explore/controls.jsx:172
 #: superset-frontend/src/explore/controls.jsx:173
-#: superset/connectors/druid/views.py:171 superset/connectors/sqla/views.py:236
+#: superset/connectors/druid/views.py:171 superset/connectors/sqla/views.py:248
 msgid "Metric"
 msgstr "指標"
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:128
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:161
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:156
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:160
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:518
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:850
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:854
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:214
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1094
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1100
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:153
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:158
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:129
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:159
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:175
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:179
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:537
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:878
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:882
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:209
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1031
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1037
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:152
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:161
 #: superset/connectors/druid/views.py:172
 #: superset/connectors/druid/views.py:325 superset/connectors/sqla/views.py:136
-#: superset/connectors/sqla/views.py:237 superset/connectors/sqla/views.py:464
+#: superset/connectors/sqla/views.py:249 superset/connectors/sqla/views.py:488
 #: superset/views/annotations.py:80 superset/views/annotations.py:128
 #: superset/views/chart/mixin.py:81 superset/views/sql_lab.py:73
 msgid "Description"
@@ -901,11 +963,11 @@ msgstr ""
 
 #: superset/connectors/druid/views.py:173
 #: superset/connectors/druid/views.py:220 superset/connectors/sqla/views.py:135
-#: superset/connectors/sqla/views.py:238
+#: superset/connectors/sqla/views.py:250
 msgid "Verbose Name"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:740
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:762
 #: superset/connectors/druid/views.py:175 superset/views/log/__init__.py:33
 msgid "JSON"
 msgstr ""
@@ -914,9 +976,9 @@ msgstr ""
 msgid "Druid Datasource"
 msgstr ""
 
-#: superset/connectors/druid/views.py:177 superset/connectors/sqla/views.py:244
+#: superset/connectors/druid/views.py:177 superset/connectors/sqla/views.py:256
 msgid "Warning Message"
-msgstr ""
+msgstr "警告メッセージ"
 
 #: superset/connectors/druid/views.py:196
 msgid "Show Druid Cluster"
@@ -955,7 +1017,7 @@ msgid "Broker Endpoint"
 msgstr ""
 
 #: superset/connectors/druid/views.py:221
-#: superset/connectors/druid/views.py:331 superset/connectors/sqla/views.py:459
+#: superset/connectors/druid/views.py:331 superset/connectors/sqla/views.py:483
 #: superset/views/chart/mixin.py:77
 msgid "Cache Timeout"
 msgstr ""
@@ -966,16 +1028,17 @@ msgstr ""
 
 #: superset/connectors/druid/views.py:225
 msgid ""
-"Duration (in seconds) of the caching timeout for this cluster. A timeout of "
-"0 indicates that the cache never expires. Note this defaults to the global "
-"timeout if undefined."
+"Duration (in seconds) of the caching timeout for this cluster. A timeout "
+"of 0 indicates that the cache never expires. Note this defaults to the "
+"global timeout if undefined."
 msgstr ""
 
 #: superset/connectors/druid/views.py:230
 #: superset/connectors/druid/views.py:235
 msgid ""
-"Druid supports basic authentication. See [auth](http://druid.io/docs/latest/"
-"design/auth.html) and druid-basic-security extension"
+"Druid supports basic authentication. See "
+"[auth](http://druid.io/docs/latest/design/auth.html) and druid-basic-"
+"security extension"
 msgstr ""
 
 #: superset/connectors/druid/views.py:258
@@ -990,31 +1053,32 @@ msgstr ""
 msgid "Edit Druid Datasource"
 msgstr ""
 
-#: superset/connectors/druid/views.py:283 superset/connectors/sqla/views.py:391
+#: superset/connectors/druid/views.py:283 superset/connectors/sqla/views.py:415
 msgid ""
-"The list of charts associated with this table. By altering this datasource, "
-"you may change how these associated charts behave. Also note that charts "
-"need to point to a datasource, so this form will fail at saving if removing "
-"charts from a datasource. If you want to change the datasource for a chart, "
-"overwrite the chart from the 'explore view'"
+"The list of charts associated with this table. By altering this "
+"datasource, you may change how these associated charts behave. Also note "
+"that charts need to point to a datasource, so this form will fail at "
+"saving if removing charts from a datasource. If you want to change the "
+"datasource for a chart, overwrite the chart from the 'explore view'"
 msgstr ""
 
-#: superset/connectors/druid/views.py:292 superset/connectors/sqla/views.py:400
+#: superset/connectors/druid/views.py:292 superset/connectors/sqla/views.py:424
 msgid "Timezone offset (in hours) for this datasource"
 msgstr ""
 
 #: superset/connectors/druid/views.py:297
 msgid ""
 "Time expression to use as a predicate when retrieving distinct values to "
-"populate the filter component. Only applies when `Enable Filter Select` is "
-"on. If you enter `7 days ago`, the distinct list of values in the filter "
-"will be populated based on the distinct value over the past week"
+"populate the filter component. Only applies when `Enable Filter Select` "
+"is on. If you enter `7 days ago`, the distinct list of values in the "
+"filter will be populated based on the distinct value over the past week"
 msgstr ""
 
-#: superset/connectors/druid/views.py:305 superset/connectors/sqla/views.py:423
+#: superset/connectors/druid/views.py:305 superset/connectors/sqla/views.py:447
 msgid ""
 "Whether to populate the filter's dropdown in the explore view's filter "
-"section with a list of distinct values fetched from the backend on the fly"
+"section with a list of distinct values fetched from the backend on the "
+"fly"
 msgstr ""
 
 #: superset/connectors/druid/views.py:310
@@ -1025,12 +1089,12 @@ msgstr ""
 
 #: superset/connectors/druid/views.py:314
 msgid ""
-"Duration (in seconds) of the caching timeout for this datasource. A timeout "
-"of 0 indicates that the cache never expires. Note this defaults to the "
-"cluster timeout if undefined."
+"Duration (in seconds) of the caching timeout for this datasource. A "
+"timeout of 0 indicates that the cache never expires. Note this defaults "
+"to the cluster timeout if undefined."
 msgstr ""
 
-#: superset/connectors/druid/views.py:322 superset/connectors/sqla/views.py:449
+#: superset/connectors/druid/views.py:322 superset/connectors/sqla/views.py:473
 msgid "Associated Charts"
 msgstr ""
 
@@ -1042,27 +1106,28 @@ msgstr ""
 msgid "Cluster"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:358
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:572
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:260
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:261
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1078
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:262
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:307
-#: superset/connectors/druid/views.py:326 superset/connectors/sqla/views.py:462
-#: superset/views/chart/mixin.py:83 superset/views/dashboard/mixin.py:76
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:330
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:370
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:591
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:255
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:266
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1015
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:270
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:318
+#: superset/connectors/druid/views.py:326 superset/connectors/sqla/views.py:486
+#: superset/views/chart/mixin.py:83 superset/views/dashboard/mixin.py:82
 msgid "Owners"
 msgstr "所有者"
 
 #: superset/connectors/druid/views.py:327
 msgid "Is Hidden"
-msgstr ""
+msgstr "非表示"
 
-#: superset/connectors/druid/views.py:328 superset/connectors/sqla/views.py:455
+#: superset/connectors/druid/views.py:328 superset/connectors/sqla/views.py:479
 msgid "Enable Filter Select"
 msgstr ""
 
-#: superset/connectors/druid/views.py:329 superset/connectors/sqla/views.py:457
+#: superset/connectors/druid/views.py:329 superset/connectors/sqla/views.py:481
 msgid "Default Endpoint"
 msgstr ""
 
@@ -1078,87 +1143,117 @@ msgstr "データソース名"
 msgid "Fetch Values From"
 msgstr ""
 
-#: superset/connectors/druid/views.py:334 superset/connectors/sqla/views.py:451
+#: superset/connectors/druid/views.py:334 superset/connectors/sqla/views.py:475
 msgid "Changed By"
 msgstr "更新者"
 
 #: superset-frontend/src/dashboard/components/AddSliceCard.jsx:65
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:240
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:282
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:295
-#: superset/connectors/druid/views.py:335 superset/connectors/sqla/views.py:342
-#: superset/connectors/sqla/views.py:468 superset/views/dashboard/mixin.py:79
-#: superset/views/dashboard/views.py:148 superset/views/database/mixins.py:201
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:248
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:293
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:350
+#: superset/connectors/druid/views.py:335 superset/connectors/sqla/views.py:366
+#: superset/connectors/sqla/views.py:492 superset/views/dashboard/mixin.py:86
+#: superset/views/dashboard/views.py:148 superset/views/database/mixins.py:202
 #: superset/views/sql_lab.py:74
 msgid "Modified"
-msgstr "最終更新日"
+msgstr "最終更新"
 
 #: superset/connectors/druid/views.py:400
 msgid "Refreshed metadata from cluster [{}]"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:634
+#: superset/connectors/sqla/models.py:637
 msgid "Only `SELECT` statements are allowed"
-msgstr ""
+msgstr "'SELECT' 操作のみが許可されます"
 
-#: superset/connectors/sqla/models.py:643
+#: superset/connectors/sqla/models.py:646
 msgid "Only single queries supported"
-msgstr ""
+msgstr "単一のクエリのみがサポートされています"
 
-#: superset/connectors/sqla/models.py:739
+#: superset/connectors/sqla/models.py:730
 #, python-format
 msgid "Error in jinja expression in fetch values predicate: %(msg)s"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:797
-#, python-format
-msgid "Error in jinja expression in FROM clause: %(msg)s"
-msgstr ""
-
-#: superset/connectors/sqla/models.py:806
-msgid "Virtual dataset query cannot consist of multiple statements"
-msgstr ""
-
-#: superset/connectors/sqla/models.py:815
+#: superset/connectors/sqla/models.py:812
 msgid "Virtual dataset query must be read-only"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:871
+#: superset/connectors/sqla/models.py:829
+#, python-format
+msgid "Error while rendering virtual dataset query: %(msg)s"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:836
+msgid "Virtual dataset query cannot be empty"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:839
+msgid "Virtual dataset query cannot consist of multiple statements"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:940
 #, python-format
 msgid "Error in jinja expression in RLS filters: %(msg)s"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:931
+#: superset/connectors/sqla/models.py:1003
 msgid ""
-"Datetime column not provided as part table configuration and is required by "
-"this type of chart"
+"Datetime column not provided as part table configuration and is required "
+"by this type of chart"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:941
+#: superset/connectors/sqla/models.py:1009
 msgid "Empty query?"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:951
-#: superset/connectors/sqla/models.py:1273
+#: superset/connectors/sqla/models.py:1020
+#: superset/connectors/sqla/models.py:1401
 #, python-format
 msgid "Metric '%(metric)s' does not exist"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:1101
+#: superset/connectors/sqla/models.py:1060
+#, python-format
+msgid "Unknown column used in orderby: %(col)s"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1102
+#, python-format
+msgid "Time column \"%(col)s\" does not exist in dataset"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1183
+msgid "Filter value list cannot be empty"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1204
+msgid "Must specify a value for filters with comparison operators"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1225
 #, python-format
 msgid "Invalid filter operation type: %(op)s"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:1112
+#: superset/connectors/sqla/models.py:1236
 #, python-format
 msgid "Error in jinja expression in WHERE clause: %(msg)s"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:1124
+#: superset/connectors/sqla/models.py:1248
 #, python-format
 msgid "Error in jinja expression in HAVING clause: %(msg)s"
 msgstr ""
 
+#: superset/connectors/sqla/models.py:1371
+msgid "Database does not support subqueries"
+msgstr "データベースはサブクエリをサポートしていません"
+
+#: superset/connectors/sqla/models.py:1446
+msgid "Db engine did not return all queried columns"
+msgstr ""
+
 #: superset/connectors/sqla/views.py:64
 msgid "Show Column"
 msgstr ""
@@ -1173,28 +1268,28 @@ msgstr ""
 
 #: superset/connectors/sqla/views.py:93
 msgid ""
-"Whether to make this column available as a [Time Granularity] option, column "
-"has to be DATETIME or DATETIME-like"
+"Whether to make this column available as a [Time Granularity] option, "
+"column has to be DATETIME or DATETIME-like"
 msgstr ""
 
 #: superset/connectors/sqla/views.py:102
 msgid ""
 "The data type that was inferred by the database. It may be necessary to "
-"input a type manually for expression-defined columns in some cases. In most "
-"case users should not need to alter this."
+"input a type manually for expression-defined columns in some cases. In "
+"most case users should not need to alter this."
 msgstr ""
 
-#: superset-frontend/src/components/TableSelector.tsx:392
-#: superset/connectors/sqla/views.py:139 superset/connectors/sqla/views.py:241
-#: superset/connectors/sqla/views.py:450 superset/views/chart/mixin.py:87
+#: superset-frontend/src/components/TableSelector/index.tsx:400
+#: superset/connectors/sqla/views.py:139 superset/connectors/sqla/views.py:253
+#: superset/connectors/sqla/views.py:474 superset/views/chart/mixin.py:87
 msgid "Table"
 msgstr "テーブル"
 
 #: superset/connectors/sqla/views.py:140
 msgid "Expression"
-msgstr ""
+msgstr "式"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:212
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:231
 #: superset/connectors/sqla/views.py:141
 msgid "Is temporal"
 msgstr ""
@@ -1207,256 +1302,256 @@ msgstr "日時フォーマット"
 msgid "Invalid date/timestamp format"
 msgstr "無効な日付/タイムスタンプのフォーマット"
 
-#: superset/connectors/sqla/views.py:194
+#: superset/connectors/sqla/views.py:206
 msgid "Show Metric"
-msgstr ""
+msgstr "指標を表示"
 
-#: superset/connectors/sqla/views.py:195
+#: superset/connectors/sqla/views.py:207
 msgid "Add Metric"
-msgstr ""
+msgstr "指標を追加"
 
-#: superset/connectors/sqla/views.py:196
+#: superset/connectors/sqla/views.py:208
 msgid "Edit Metric"
-msgstr ""
+msgstr "指標を編集"
 
-#: superset/connectors/sqla/views.py:240
+#: superset/connectors/sqla/views.py:252
 msgid "SQL Expression"
-msgstr ""
+msgstr "SQL 式"
 
-#: superset/connectors/sqla/views.py:242
+#: superset/connectors/sqla/views.py:254
 msgid "D3 Format"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:554
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:599
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:637
-#: superset/connectors/sqla/views.py:243 superset/connectors/sqla/views.py:467
-#: superset/views/database/mixins.py:195
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:573
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:600
+#: superset/connectors/sqla/views.py:255 superset/connectors/sqla/views.py:491
+#: superset/views/database/mixins.py:196
 msgid "Extra"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:285
+#: superset/connectors/sqla/views.py:309
 msgid "Row level security filter"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:286
+#: superset/connectors/sqla/views.py:310
 msgid "Show Row level security filter"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:287
+#: superset/connectors/sqla/views.py:311
 msgid "Add Row level security filter"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:288
+#: superset/connectors/sqla/views.py:312
 msgid "Edit Row level security filter"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:306
+#: superset/connectors/sqla/views.py:330
 msgid ""
 "Regular filters add where clauses to queries if a user belongs to a role "
-"referenced in the filter. Base filters apply filters to all queries except "
-"the roles defined in the filter, and can be used to define what users can "
-"see if no RLS filters within a filter group apply to them."
+"referenced in the filter. Base filters apply filters to all queries "
+"except the roles defined in the filter, and can be used to define what "
+"users can see if no RLS filters within a filter group apply to them."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:312
+#: superset/connectors/sqla/views.py:336
 msgid "These are the tables this filter will be applied to."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:313
+#: superset/connectors/sqla/views.py:337
 msgid ""
-"For regular filters, these are the roles this filter will be applied to. For "
-"base filters, these are the roles that the filter DOES NOT apply to, e.g. "
-"Admin if admin should see all data."
+"For regular filters, these are the roles this filter will be applied to. "
+"For base filters, these are the roles that the filter DOES NOT apply to, "
+"e.g. Admin if admin should see all data."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:319
+#: superset/connectors/sqla/views.py:343
 msgid ""
 "Filters with the same group key will be ORed together within the group, "
-"while different filter groups will be ANDed together. Undefined group keys "
-"are treated as unique groups, i.e. are not grouped together. For example, if "
-"a table has three filters, of which two are for departments Finance and "
-"Marketing (group key = 'department'), and one refers to the region Europe "
-"(group key = 'region'), the filter clause would apply the filter (department "
-"= 'Finance' OR department = 'Marketing') AND (region = 'Europe')."
+"while different filter groups will be ANDed together. Undefined group "
+"keys are treated as unique groups, i.e. are not grouped together. For "
+"example, if a table has three filters, of which two are for departments "
+"Finance and Marketing (group key = 'department'), and one refers to the "
+"region Europe (group key = 'region'), the filter clause would apply the "
+"filter (department = 'Finance' OR department = 'Marketing') AND (region ="
+" 'Europe')."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:329
+#: superset/connectors/sqla/views.py:353
 msgid ""
-"This is the condition that will be added to the WHERE clause. For example, "
-"to only return rows for a particular client, you might define a regular "
-"filter with the clause `client_id = 9`. To display no rows unless a user "
-"belongs to a RLS filter role, a base filter can be created with the clause "
-"`1 = 0` (always false)."
+"This is the condition that will be added to the WHERE clause. For "
+"example, to only return rows for a particular client, you might define a "
+"regular filter with the clause `client_id = 9`. To display no rows unless"
+" a user belongs to a RLS filter role, a base filter can be created with "
+"the clause `1 = 0` (always false)."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:276
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:260
-#: superset/connectors/sqla/views.py:338 superset/connectors/sqla/views.py:357
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:278
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:315
+#: superset/connectors/sqla/views.py:362 superset/connectors/sqla/views.py:381
 msgid "Tables"
 msgstr "テーブル"
 
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:389
 #: superset-frontend/src/profile/components/Security.tsx:35
-#: superset/connectors/sqla/views.py:339
+#: superset/connectors/sqla/views.py:363 superset/views/dashboard/mixin.py:83
 msgid "Roles"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:340
+#: superset/connectors/sqla/views.py:364
 msgid "Clause"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:341 superset/views/chart/mixin.py:78
-#: superset/views/dashboard/mixin.py:78 superset/views/dashboard/views.py:147
-#: superset/views/database/mixins.py:191
+#: superset/connectors/sqla/views.py:365 superset/views/chart/mixin.py:78
+#: superset/views/dashboard/mixin.py:85 superset/views/dashboard/views.py:147
+#: superset/views/database/mixins.py:192
 msgid "Creator"
 msgstr "作成者"
 
-#: superset/connectors/sqla/views.py:358
+#: superset/connectors/sqla/views.py:382
 msgid "Show Table"
-msgstr ""
+msgstr "テーブルを表示"
 
-#: superset/connectors/sqla/views.py:359
+#: superset/connectors/sqla/views.py:383
 msgid "Import a table definition"
-msgstr ""
+msgstr "テーブル定義のインポート"
 
-#: superset/connectors/sqla/views.py:360
+#: superset/connectors/sqla/views.py:384
 msgid "Edit Table"
-msgstr ""
+msgstr "テーブルを編集"
 
-#: superset/connectors/sqla/views.py:401
+#: superset/connectors/sqla/views.py:425
 msgid "Name of the table that exists in the source database"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:402
+#: superset/connectors/sqla/views.py:426
 msgid "Schema, as used only in some databases like Postgres, Redshift and DB2"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:409
+#: superset/connectors/sqla/views.py:433
 msgid ""
 "This fields acts a Superset view, meaning that Superset will run a query "
 "against this string as a subquery."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:413
+#: superset/connectors/sqla/views.py:437
 msgid ""
 "Predicate applied when fetching distinct value to populate the filter "
-"control component. Supports jinja template syntax. Applies only when `Enable "
-"Filter Select` is on."
+"control component. Supports jinja template syntax. Applies only when "
+"`Enable Filter Select` is on."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:419
-msgid ""
-"Redirects to this endpoint when clicking on the table from the table list"
+#: superset/connectors/sqla/views.py:443
+msgid "Redirects to this endpoint when clicking on the table from the table list"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:428
+#: superset/connectors/sqla/views.py:452
 msgid "Whether the table was generated by the 'Visualize' flow in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:617
-#: superset/connectors/sqla/views.py:431
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:639
+#: superset/connectors/sqla/views.py:455
 msgid ""
 "A set of parameters that become available in the query using Jinja "
 "templating syntax"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:435
+#: superset/connectors/sqla/views.py:459
 msgid ""
-"Duration (in seconds) of the caching timeout for this table. A timeout of 0 "
-"indicates that the cache never expires. Note this defaults to the database "
-"timeout if undefined."
+"Duration (in seconds) of the caching timeout for this table. A timeout of"
+" 0 indicates that the cache never expires. Note this defaults to the "
+"database timeout if undefined."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:165
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:197
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:409
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:230
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:338
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:213
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:360
-#: superset/connectors/sqla/views.py:452 superset/connectors/sqla/views.py:453
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:173
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:213
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:420
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:232
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:340
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:268
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:415
+#: superset/connectors/sqla/views.py:476 superset/connectors/sqla/views.py:477
 #: superset/templates/superset/import_dashboards.html:53
 #: superset/views/database/forms.py:112 superset/views/database/forms.py:309
-#: superset/views/database/mixins.py:190 superset/views/sql_lab.py:72
+#: superset/views/database/mixins.py:191 superset/views/sql_lab.py:72
 msgid "Database"
 msgstr "データベース"
 
-#: superset/connectors/sqla/views.py:454 superset/views/database/mixins.py:192
+#: superset/connectors/sqla/views.py:478 superset/views/database/mixins.py:193
 msgid "Last Changed"
-msgstr "最終更新日"
+msgstr "最終更新"
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:272
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:424
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:239
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:223
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:380
-#: superset/connectors/sqla/views.py:456 superset/views/database/forms.py:118
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:283
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:435
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:241
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:278
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:435
+#: superset/connectors/sqla/views.py:480 superset/views/database/forms.py:118
 #: superset/views/database/forms.py:315
 msgid "Schema"
 msgstr "スキーマ"
 
-#: superset/connectors/sqla/views.py:458
+#: superset/connectors/sqla/views.py:482
 msgid "Offset"
 msgstr "オフセット"
 
-#: superset/connectors/sqla/views.py:460 superset/views/database/forms.py:87
+#: superset/connectors/sqla/views.py:484 superset/views/database/forms.py:87
 #: superset/views/database/forms.py:276
 msgid "Table Name"
 msgstr "テーブル名"
 
-#: superset/connectors/sqla/views.py:461
+#: superset/connectors/sqla/views.py:485
 msgid "Fetch Values Predicate"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:463
+#: superset/connectors/sqla/views.py:487
 msgid "Main Datetime Column"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:465
+#: superset/connectors/sqla/views.py:489
 msgid "SQL Lab View"
-msgstr "SQLラボビュー"
+msgstr "SQL Lab ビュー"
 
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:125
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:616
-#: superset/connectors/sqla/views.py:466
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:94
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:638
+#: superset/connectors/sqla/views.py:490
 msgid "Template parameters"
 msgstr "テンプレートパラメータ"
 
-#: superset/connectors/sqla/views.py:495
+#: superset/connectors/sqla/views.py:526
 msgid ""
-"The table was created. As part of this two-phase configuration process, you "
-"should now click the edit button by the new table to configure it."
+"The table was created. As part of this two-phase configuration process, "
+"you should now click the edit button by the new table to configure it."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:520
+#: superset/connectors/sqla/views.py:551
 msgid "Refresh Metadata"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:520
+#: superset/connectors/sqla/views.py:551
 msgid "Refresh column metadata"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:554
+#: superset/connectors/sqla/views.py:588
 #, python-format
 msgid "Metadata refreshed for the following table(s): %(tables)s"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:564
+#: superset/connectors/sqla/views.py:598
 #, python-format
 msgid "The following tables added new columns: %(tables)s"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:575
+#: superset/connectors/sqla/views.py:609
 #, python-format
 msgid "The following tables removed columns: %(tables)s"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:586
+#: superset/connectors/sqla/views.py:620
 #, python-format
 msgid "The following tables update column metadata: %(tables)s"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:593
+#: superset/connectors/sqla/views.py:627
 #, python-format
 msgid "Unable to refresh metadata for the following table(s): %(tables)s"
 msgstr ""
@@ -1475,16 +1570,20 @@ msgstr ""
 msgid "CSS template not found."
 msgstr ""
 
-#: superset/dashboards/api.py:453
+#: superset/dashboards/api.py:606
 #, python-format
 msgid "Deleted %(num)d dashboard"
 msgid_plural "Deleted %(num)d dashboards"
-msgstr[0] " %(num)d ダッシュボードを削除しました"
+msgstr[0] " %(num)d 件のダッシュボードを削除しました"
 
-#: superset/dashboards/filters.py:32
+#: superset/dashboards/filters.py:35
 msgid "Title or Slug"
 msgstr "タイトルまたはスラッグ"
 
+#: superset/dashboards/filters.py:153
+msgid "Role"
+msgstr ""
+
 #: superset/dashboards/commands/exceptions.py:37
 msgid "Must be unique"
 msgstr "一意である必要があります"
@@ -1521,6 +1620,10 @@ msgstr "このダッシュボードの変更は禁止されています"
 msgid "Import dashboard failed for an unknown reason"
 msgstr "不明な理由でダッシュボードのインポートに失敗しました"
 
+#: superset/dashboards/commands/exceptions.py:81
+msgid "You don't have access to this dashboard."
+msgstr "このダッシュボードにアクセスできません。"
+
 #: superset/dashboards/commands/importers/v0.py:303
 msgid "No data in file"
 msgstr "ファイルにデータがありません"
@@ -1529,214 +1632,456 @@ msgstr "ファイルにデータがありません"
 msgid "Table name undefined"
 msgstr ""
 
-#: superset/databases/schemas.py:140
+#: superset/databases/schemas.py:143
 msgid ""
-"Invalid connection string, a valid string usually follows: driver://user:"
-"password@database-host/database-name"
+"Invalid connection string, a valid string usually follows: "
+"driver://user:password@database-host/database-name"
 msgstr ""
 
-#: superset/databases/schemas.py:150
-msgid "SQLite database cannot be used as a data source for security reasons."
-msgstr ""
-
-#: superset/databases/schemas.py:181 superset/databases/schemas.py:196
+#: superset/databases/schemas.py:178 superset/databases/schemas.py:193
 #, python-format
 msgid "Field cannot be decoded by JSON. %(msg)s"
 msgstr ""
 
-#: superset/databases/schemas.py:204
+#: superset/databases/schemas.py:201
 #, python-format
 msgid ""
 "The metadata_params in Extra field is not configured correctly. The key "
 "%(key)s is invalid."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:31
-msgid "Database parameters are invalid."
+#: superset/databases/schemas.py:248
+msgid ""
+"An engine must be specified when passing individual parameters to a "
+"database."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:41
+#: superset/databases/schemas.py:259
+#, python-format
+msgid "Engine \"%(engine)s\" is not a valid engine."
+msgstr ""
+
+#: superset/databases/schemas.py:265
+#, python-format
+msgid ""
+"Engine spec \"%(engine_spec)s\" does not support being configured via "
+"individual parameters."
+msgstr ""
+
+#: superset/databases/commands/exceptions.py:32
+msgid "Database parameters are invalid."
+msgstr "データベース パラメータが無効です。"
+
+#: superset/databases/commands/exceptions.py:42
 msgid "A database with the same name already exists"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:169
-#: superset/databases/commands/exceptions.py:49
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:223
+#: superset/databases/commands/exceptions.py:50
 msgid "Field is required"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:61
+#: superset/databases/commands/exceptions.py:62
 msgid "Field cannot be decoded by JSON.  %{json_error}s"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:78
-#: superset/views/database/mixins.py:251
+#: superset/databases/commands/exceptions.py:79
+#: superset/views/database/mixins.py:252
 msgid ""
 "The metadata_params in Extra field is not configured correctly. The key "
 "%{key}s is invalid."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:90
+#: superset/databases/commands/exceptions.py:91
 msgid "Database not found."
-msgstr ""
+msgstr "データベースが見つかりません。"
 
-#: superset/databases/commands/exceptions.py:94
+#: superset/databases/commands/exceptions.py:95
 msgid "Database could not be created."
-msgstr ""
+msgstr "データベースを作成できませんでした。"
 
-#: superset/databases/commands/exceptions.py:98
+#: superset/databases/commands/exceptions.py:99
 msgid "Database could not be updated."
-msgstr ""
+msgstr "データベースを更新できませんでした。"
 
-#: superset/databases/commands/exceptions.py:104
-#: superset/databases/commands/exceptions.py:120 superset/views/core.py:1284
+#: superset/databases/commands/exceptions.py:105
+#: superset/databases/commands/exceptions.py:122 superset/views/core.py:1296
 msgid "Connection failed, please check your connection settings"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:108
+#: superset/databases/commands/exceptions.py:109
 msgid "Cannot delete a database that has tables attached"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:112
+#: superset/databases/commands/exceptions.py:113
 msgid "Database could not be deleted."
-msgstr ""
+msgstr "データベースを削除できませんでした。"
 
-#: superset/databases/commands/exceptions.py:124
+#: superset/databases/commands/exceptions.py:126
 msgid "Stopped an unsafe database connection"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:128
+#: superset/databases/commands/exceptions.py:130
 msgid "Could not load database driver"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:132 superset/views/core.py:1292
+#: superset/databases/commands/exceptions.py:135 superset/views/core.py:1304
 msgid "Unexpected error occurred, please check your logs for details"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:136
+#: superset/databases/commands/exceptions.py:139
 msgid "Import database failed for an unknown reason"
 msgstr ""
 
-#: superset/databases/commands/test_connection.py:69
+#: superset/databases/commands/test_connection.py:95
 msgid "Could not load database driver: {}"
 msgstr ""
 
-#: superset/datasets/api.py:631
+#: superset/datasets/api.py:634
 #, python-format
 msgid "Deleted %(num)d dataset"
 msgid_plural "Deleted %(num)d datasets"
-msgstr[0] ""
+msgstr[0] " %(num)d 件のデータセットを削除しました"
 
 #: superset/datasets/filters.py:26
 msgid "Null or Empty"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:47
+#: superset/datasets/columns/commands/exceptions.py:23
+msgid "Dataset column not found."
+msgstr "データセット列が見つかりません。"
+
+#: superset/datasets/columns/commands/exceptions.py:27
+msgid "Dataset column delete failed."
+msgstr "データセット列の削除に失敗しました。"
+
+#: superset/datasets/columns/commands/exceptions.py:31
+#: superset/datasets/metrics/commands/exceptions.py:31
+msgid "Changing this dataset is forbidden."
+msgstr "このデータセットの変更は禁止されています。"
+
+#: superset/datasets/commands/exceptions.py:32
+#, python-format
+msgid "Dataset %(name)s already exists"
+msgstr ""
+
+#: superset/datasets/commands/exceptions.py:50
 msgid "Database not allowed to change"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:67
+#: superset/datasets/commands/exceptions.py:70
 msgid "One or more columns do not exist"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:77
+#: superset/datasets/commands/exceptions.py:80
 msgid "One or more columns are duplicated"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:87
+#: superset/datasets/commands/exceptions.py:90
 msgid "One or more columns already exist"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:96
+#: superset/datasets/commands/exceptions.py:99
 msgid "One or more metrics do not exist"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:106
+#: superset/datasets/commands/exceptions.py:109
 msgid "One or more metrics are duplicated"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:116
+#: superset/datasets/commands/exceptions.py:119
 msgid "One or more metrics already exist"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:127
+#: superset/datasets/commands/exceptions.py:130
 #, python-format
 msgid ""
-"Table [%(table_name)s] could not be found, please double check your database "
-"connection, schema, and table name"
-msgstr ""
-
-#: superset/datasets/commands/exceptions.py:149
-msgid "Dataset parameters are invalid."
+"Table [%(table_name)s] could not be found, please double check your "
+"database connection, schema, and table name"
 msgstr ""
 
 #: superset/datasets/commands/exceptions.py:153
-msgid "Dataset could not be created."
+msgid "Dataset parameters are invalid."
 msgstr ""
 
 #: superset/datasets/commands/exceptions.py:157
-#: superset/datasets/commands/exceptions.py:169
-msgid "Dataset could not be updated."
+msgid "Dataset could not be created."
 msgstr ""
 
 #: superset/datasets/commands/exceptions.py:161
-msgid "Dataset could not be deleted."
+#: superset/datasets/commands/exceptions.py:173
+msgid "Dataset could not be updated."
 msgstr ""
 
 #: superset/datasets/commands/exceptions.py:165
+msgid "Dataset could not be deleted."
+msgstr ""
+
+#: superset/datasets/commands/exceptions.py:169
 msgid "Dataset(s) could not be bulk deleted."
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:173
+#: superset/datasets/commands/exceptions.py:177
 msgid "Changing this dataset is forbidden"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:177
+#: superset/datasets/commands/exceptions.py:181
 msgid "Import dataset failed for an unknown reason"
 msgstr ""
 
-#: superset/db_engine_specs/presto.py:834
+#: superset/datasets/metrics/commands/exceptions.py:23
+msgid "Dataset metric not found."
+msgstr "データセットの指標が見つかりません。"
+
+#: superset/datasets/metrics/commands/exceptions.py:27
+msgid "Dataset metric delete failed."
+msgstr "データセット指標の削除に失敗しました。"
+
+#: superset/db_engine_specs/base.py:86
+msgid "Original value"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:87
+msgid "Second"
+msgstr "秒"
+
+#: superset/db_engine_specs/base.py:88
+msgid "Minute"
+msgstr "分"
+
+#: superset/db_engine_specs/base.py:89
+msgid "5 minute"
+msgstr "5分"
+
+#: superset/db_engine_specs/base.py:90
+msgid "10 minute"
+msgstr "10分"
+
+#: superset/db_engine_specs/base.py:91
+msgid "15 minute"
+msgstr "15分"
+
+#: superset/db_engine_specs/base.py:92
+msgid "Half hour"
+msgstr "30分"
+
+#: superset/db_engine_specs/base.py:93
+msgid "Hour"
+msgstr "時間"
+
+#: superset/db_engine_specs/base.py:94
+msgid "Day"
+msgstr "日"
+
+#: superset/db_engine_specs/base.py:95
+msgid "Week"
+msgstr "週"
+
+#: superset/db_engine_specs/base.py:96
+msgid "Month"
+msgstr "月"
+
+#: superset/db_engine_specs/base.py:97
+msgid "Quarter"
+msgstr "四半期"
+
+#: superset/db_engine_specs/base.py:98
+msgid "Year"
+msgstr "年"
+
+#: superset/db_engine_specs/base.py:99
+msgid "Week starting sunday"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:100
+msgid "Week starting monday"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:101
+msgid "Week ending saturday"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:102
+msgid "Week_ending sunday"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:1276
+msgid "Username"
+msgstr "ユーザー名"
+
+#: superset/db_engine_specs/base.py:1277
+msgid "Password"
+msgstr "パスワード"
+
+#: superset/db_engine_specs/base.py:1278
+msgid "Hostname or IP address"
+msgstr "ホスト名またはIPアドレス"
+
+#: superset/db_engine_specs/base.py:1279
+msgid "Database port"
+msgstr "DBポート番号"
+
+#: superset/db_engine_specs/base.py:1280
+msgid "Database name"
+msgstr "データベース名"
+
+#: superset/db_engine_specs/base.py:1282
+msgid "Additinal parameters"
+msgstr "追加パラメータ"
+
+#: superset/db_engine_specs/bigquery.py:100
+msgid ""
+"We were unable to connect to your database. Please confirm that your "
+"service account has the Viewer and Job User roles on the project."
+msgstr ""
+
+#: superset/db_engine_specs/mssql.py:69
+#, python-format
+msgid ""
+"Either the username \"%(username)s\", password, or database name "
+"\"%(database)s\" is incorrect."
+msgstr ""
+
+#: superset/db_engine_specs/mssql.py:76
+#: superset/db_engine_specs/postgres.py:112
+#: superset/db_engine_specs/presto.py:195
+#: superset/db_engine_specs/redshift.py:58
+#, python-format
+msgid "The hostname \"%(hostname)s\" cannot be resolved."
+msgstr ""
+
+#: superset/db_engine_specs/mssql.py:80
+#: superset/db_engine_specs/postgres.py:116
+#: superset/db_engine_specs/presto.py:206
+#: superset/db_engine_specs/redshift.py:62
+#, python-format
+msgid "Port %(port)s on hostname \"%(hostname)s\" refused the connection."
+msgstr ""
+
+#: superset/db_engine_specs/mssql.py:84
+#: superset/db_engine_specs/postgres.py:120
+#: superset/db_engine_specs/presto.py:199
+#: superset/db_engine_specs/redshift.py:66
+#, python-format
+msgid ""
+"The host \"%(hostname)s\" might be down, and can't be reached on port "
+"%(port)s."
+msgstr ""
+
+#: superset/db_engine_specs/mysql.py:112 superset/db_engine_specs/presto.py:191
+#: superset/db_engine_specs/redshift.py:54
+#, python-format
+msgid "Either the username \"%(username)s\" or the password is incorrect."
+msgstr ""
+
+#: superset/db_engine_specs/mysql.py:116
+#, python-format
+msgid "Unknown MySQL server host \"%(hostname)s\"."
+msgstr ""
+
+#: superset/db_engine_specs/mysql.py:120
+#, python-format
+msgid "The host \"%(hostname)s\" might be down and can't be reached."
+msgstr ""
+
+#: superset/db_engine_specs/mysql.py:124
+#: superset/db_engine_specs/postgres.py:127
+#, python-format
+msgid "Unable to connect to database \"%(database)s\"."
+msgstr "“%(database)s” に接続できません。"
+
+#: superset/db_engine_specs/postgres.py:104
+#, python-format
+msgid "The username \"%(username)s\" does not exist."
+msgstr ""
+
+#: superset/db_engine_specs/postgres.py:108
+#, python-format
+msgid "The password provided for username \"%(username)s\" is incorrect."
+msgstr ""
+
+#: superset/db_engine_specs/presto.py:170
+#, python-format
+msgid ""
+"We can't seem to resolve the column \"%(column_name)s\" at line "
+"%(location)s."
+msgstr ""
+
+#: superset/db_engine_specs/presto.py:177
+#, python-format
+msgid ""
+"The table \"%(table_name)s\" does not exist. A valid table must be used "
+"to run this query."
+msgstr ""
+
+#: superset/db_engine_specs/presto.py:184
+#, python-format
+msgid ""
+"The schema \"%(schema_name)s\" does not exist. A valid schema must be "
+"used to run this query."
+msgstr ""
+
+#: superset/db_engine_specs/presto.py:210
+#, python-format
+msgid "Unable to connect to catalog named \"%(catalog_name)s\"."
+msgstr ""
+
+#: superset/db_engine_specs/presto.py:997
 msgid "Unknown Presto Error"
 msgstr ""
 
-#: superset/db_engine_specs/presto.py:1052
+#: superset/db_engine_specs/redshift.py:73
 #, python-format
 msgid ""
-"We can't seem to resolve the column \"%(column_name)s\" at line %(location)s."
+"We were unable to connect to your database named \"%(database)s\". Please"
+" verify your database name and try again."
 msgstr ""
 
-#: superset/db_engine_specs/presto.py:1069
+#: superset/models/sql_types/base.py:50
 #, python-format
-msgid ""
-"The table \"%(table_name)s\" does not exist. A valid table must be used to "
-"run this query."
+msgid "Temporal expression not supported for type: %(col_type)s"
 msgstr ""
 
-#: superset/queries/saved_queries/api.py:188
+#: superset/queries/saved_queries/api.py:197
 #, python-format
 msgid "Deleted %(num)d saved query"
 msgid_plural "Deleted %(num)d saved queries"
-msgstr[0] ""
+msgstr[0] " %(num)d 件の保存したクエリを削除しました"
 
-#: superset/queries/saved_queries/commands/exceptions.py:23
+#: superset/queries/saved_queries/commands/exceptions.py:28
 msgid "Saved queries could not be deleted."
 msgstr ""
 
-#: superset/queries/saved_queries/commands/exceptions.py:27
+#: superset/queries/saved_queries/commands/exceptions.py:32
 msgid "Saved query not found."
 msgstr ""
 
-#: superset/reports/api.py:417
+#: superset/queries/saved_queries/commands/exceptions.py:36
+msgid "Import saved query failed for an unknown reason."
+msgstr "不明な理由により、保存したクエリをインポートできませんでした。"
+
+#: superset/queries/saved_queries/commands/exceptions.py:40
+msgid "Saved query parameters are invalid."
+msgstr "保存したクエリ パラメーターが無効です。"
+
+#: superset/reports/api.py:422
 #, python-format
 msgid "Deleted %(num)d report schedule"
 msgid_plural "Deleted %(num)d report schedules"
-msgstr[0] " %(num)d のレポートスケジュールを削除しました"
+msgstr[0] " %(num)d 件のレポートスケジュールを削除しました"
 
-#: superset/reports/commands/alert.py:74
+#: superset/reports/schemas.py:166 superset/reports/schemas.py:172
+#: superset/reports/schemas.py:178 superset/reports/schemas.py:245
+#: superset/reports/schemas.py:251 superset/reports/schemas.py:258
+msgid "Value must be greater than 0"
+msgstr "値は 0 より大きくする必要があります"
+
+#: superset/reports/commands/alert.py:96
 #, python-format
 msgid "Alert query returned more then one row. %s rows returned"
 msgstr "アラートクエリが複数の行を返しました。 %s 行が返されました"
 
-#: superset/reports/commands/alert.py:83
+#: superset/reports/commands/alert.py:105
 #, python-format
 msgid "Alert query returned more then one column. %s columns returned"
 msgstr "アラートクエリが複数の列を返しました。%s 列が返されました"
@@ -1794,79 +2139,109 @@ msgid "Report Schedule execution failed when generating a screenshot."
 msgstr "スクリーンショットの生成時にレポートスケジュールの実行に失敗しました。"
 
 #: superset/reports/commands/exceptions.py:116
+msgid "Report Schedule execution failed when generating a csv."
+msgstr "csv の生成中にレポートスケジュールの実行に失敗しました。"
+
+#: superset/reports/commands/exceptions.py:120
 msgid "Report Schedule execution got an unexpected error."
 msgstr "レポートスケジュールの実行で予期しないエラーが発生しました。"
 
-#: superset/reports/commands/exceptions.py:120
+#: superset/reports/commands/exceptions.py:124
 msgid "Report Schedule is still working, refusing to re-compute."
 msgstr "レポートスケジュールはまだ機能しており、再計算を拒否しています。"
 
-#: superset/reports/commands/exceptions.py:124
+#: superset/reports/commands/exceptions.py:128
 msgid "Report Schedule reached a working timeout."
 msgstr "レポートスケジュールが作業タイムアウトに達しました。"
 
-#: superset/reports/commands/exceptions.py:138
+#: superset/reports/commands/exceptions.py:142
 msgid "Alert query returned more then one row."
 msgstr "アラートクエリが複数の行を返しました。"
 
-#: superset/reports/commands/exceptions.py:143
-msgid "Alert validator config error."
-msgstr "アラートバリデーター設定エラー"
-
 #: superset/reports/commands/exceptions.py:147
+msgid "Alert validator config error."
+msgstr "アラートバリデーター設定エラー。"
+
+#: superset/reports/commands/exceptions.py:151
 msgid "Alert query returned more then one column."
 msgstr "アラートクエリが複数の列を返しました。"
 
-#: superset/reports/commands/exceptions.py:151
+#: superset/reports/commands/exceptions.py:155
 msgid "Alert query returned a non-number value."
 msgstr "アラートクエリが数値以外の値を返しました。"
 
-#: superset/reports/commands/exceptions.py:155
+#: superset/reports/commands/exceptions.py:159
 msgid "Alert found an error while executing a query."
 msgstr "クエリの実行中にアラートがエラーを検出しました。"
 
-#: superset/reports/commands/exceptions.py:159
+#: superset/reports/commands/exceptions.py:163
+msgid "A timeout occurred while executing the query."
+msgstr "クエリの実行中にタイムアウトが発生しました。"
+
+#: superset/reports/commands/exceptions.py:167
+msgid "A timeout occurred while taking a screenshot."
+msgstr "スクリーンショットの撮影中にタイムアウトが発生しました。"
+
+#: superset/reports/commands/exceptions.py:171
+msgid "A timeout occurred while generating a csv."
+msgstr "csv の生成中にタイムアウトが発生しました。"
+
+#: superset/reports/commands/exceptions.py:175
 msgid "Alert fired during grace period."
 msgstr "猶予期間中にアラートが発生しました。"
 
-#: superset/reports/commands/exceptions.py:163
+#: superset/reports/commands/exceptions.py:179
 msgid "Alert ended grace period."
 msgstr "アラートは猶予期間を終了しました。"
 
-#: superset/reports/commands/exceptions.py:167
+#: superset/reports/commands/exceptions.py:183
 msgid "Alert on grace period"
 msgstr "猶予期間に関するアラート"
 
-#: superset/reports/commands/exceptions.py:171
+#: superset/reports/commands/exceptions.py:187
 msgid "Report Schedule sellenium user not found"
 msgstr "レポートスケジュールselleniumユーザーが見つかりません"
 
-#: superset/reports/commands/exceptions.py:175
+#: superset/reports/commands/exceptions.py:191
 msgid "Report Schedule state not found"
 msgstr "レポートスケジュールの状態が見つかりません"
 
-#: superset/reports/commands/exceptions.py:179
+#: superset/reports/commands/exceptions.py:195
 msgid "Report schedule unexpected error"
 msgstr "レポートスケジュールの予期せぬエラー"
 
-#: superset/reports/commands/exceptions.py:183
+#: superset/reports/commands/exceptions.py:199
 msgid "Changing this report is forbidden"
 msgstr "このレポートの変更は禁止されています"
 
-#: superset/reports/commands/exceptions.py:187
+#: superset/reports/commands/exceptions.py:203
 msgid "An error occurred while pruning logs "
-msgstr "ログのプルーニング中にエラーが発生しました"
+msgstr "ログのプルーニング中にエラーが発生しました "
 
-#: superset/reports/notifications/email.py:59 superset/tasks/schedules.py:185
+#: superset/reports/notifications/email.py:55
 #, python-format
 msgid ""
 "\n"
-"            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n"
-"            <img src=\"cid:%(msgid)s\">\n"
+"            Error: %(text)s\n"
 "            "
 msgstr ""
 
-#: superset/reports/notifications/email.py:70 superset/tasks/schedules.py:294
+#: superset/reports/notifications/email.py:79
+#, python-format
+msgid ""
+"\n"
+"            <p>%(description)s</p>\n"
+"            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n"
+"            %(img_tag)s\n"
+"            "
+msgstr ""
+
+#: superset/reports/notifications/email.py:86 superset/tasks/schedules.py:362
+#, python-format
+msgid "%(name)s.csv"
+msgstr ""
+
+#: superset/reports/notifications/email.py:90 superset/tasks/schedules.py:294
 #: superset/tasks/schedules.py:463
 #, python-format
 msgid "%(prefix)s %(title)s"
@@ -1878,10 +2253,29 @@ msgid ""
 "\n"
 "            *%(name)s*\n"
 "\n"
+"            %(description)s\n"
+"\n"
+"            Error: %(text)s\n"
+"            "
+msgstr ""
+
+#: superset/reports/notifications/slack.py:64
+#, python-format
+msgid ""
+"\n"
+"            *%(name)s*\n"
+"\n"
+"            %(description)s\n"
+"\n"
 "            <%(url)s|Explore in Superset>\n"
 "            "
 msgstr ""
 
+#: superset/security/analytics_db_safety.py:44
+#, python-format
+msgid "%(dialect)s cannot be used as a data source for security reasons."
+msgstr ""
+
 #: superset/tasks/schedules.py:160
 #, python-format
 msgid ""
@@ -1897,9 +2291,13 @@ msgstr ""
 msgid "<b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>"
 msgstr ""
 
-#: superset/tasks/schedules.py:362
+#: superset/tasks/schedules.py:185
 #, python-format
-msgid "%(name)s.csv"
+msgid ""
+"\n"
+"            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n"
+"            <img src=\"cid:%(msgid)s\">\n"
+"            "
 msgstr ""
 
 #: superset/tasks/schedules.py:370
@@ -1921,46 +2319,46 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1144
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1081
 #: superset/templates/appbuilder/navbar_right.html:38
 msgid "SQL Query"
 msgstr "SQLクエリ"
 
 #: superset-frontend/src/components/Menu/NewMenu.tsx:31
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:383
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:211
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:522
-#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:148
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:387
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:225
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:545
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:154
 #: superset/templates/appbuilder/navbar_right.html:39
 #: superset/views/chart/mixin.py:85 superset/views/chart/views.py:114
-#: superset/views/schedules.py:286
+#: superset/views/schedules.py:307
 msgid "Chart"
 msgstr "チャート"
 
 #: superset-frontend/src/components/Menu/NewMenu.tsx:36
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:481
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:494
 #: superset/templates/appbuilder/navbar_right.html:40
-#: superset/views/dashboard/mixin.py:72 superset/views/dashboard/views.py:145
-#: superset/views/schedules.py:223
+#: superset/views/dashboard/mixin.py:78 superset/views/dashboard/views.py:145
+#: superset/views/schedules.py:227
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
-#: superset-frontend/src/components/Menu/Menu.tsx:212
+#: superset-frontend/src/components/Menu/Menu.tsx:231
 #: superset/templates/appbuilder/navbar_right.html:109
 msgid "Profile"
 msgstr "プロファイル"
 
-#: superset-frontend/src/components/Menu/Menu.tsx:217
+#: superset-frontend/src/components/Menu/Menu.tsx:235
 #: superset/templates/appbuilder/navbar_right.html:110
 msgid "Info"
 msgstr "情報"
 
-#: superset-frontend/src/components/Menu/Menu.tsx:220
+#: superset-frontend/src/components/Menu/Menu.tsx:238
 #: superset/templates/appbuilder/navbar_right.html:111
 msgid "Logout"
 msgstr "ログアウト"
 
-#: superset-frontend/src/components/Menu/Menu.tsx:276
+#: superset-frontend/src/components/Menu/Menu.tsx:290
 #: superset/templates/appbuilder/navbar_right.html:126
 msgid "Login"
 msgstr "ログイン"
@@ -1977,17 +2375,17 @@ msgstr "レコードが見つかりません"
 msgid "Filter List"
 msgstr "フィルタリスト"
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:296
-#: superset-frontend/src/explore/components/DataTableControl.tsx:73
-#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:226
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:398
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:306
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:466
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:292
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:424
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:388
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:450
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:397
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:256
+#: superset-frontend/src/explore/components/DataTableControl/index.tsx:77
+#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:228
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:403
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:309
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:481
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:295
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:429
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:404
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:461
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:452
 #: superset/templates/appbuilder/general/widgets/search.html:40
 msgid "Search"
 msgstr "検索"
@@ -1996,6 +2394,7 @@ msgstr "検索"
 msgid "Refresh"
 msgstr "更新"
 
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:508
 #: superset/templates/superset/import_dashboards.html:21
 msgid "Import dashboards"
 msgstr "ダッシュボードをインポート"
@@ -2019,7 +2418,7 @@ msgstr "アップロード"
 
 #: superset/templates/superset/request_access.html:20
 msgid "No Access!"
-msgstr "アクセスなし"
+msgstr "アクセスがありません!"
 
 #: superset/templates/superset/request_access.html:25
 #, python-format
@@ -2030,15 +2429,18 @@ msgstr "データソースにアクセスするためのアクセス許可があ
 msgid "Request Permissions"
 msgstr "権限のリクエスト"
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:176
-#: superset-frontend/src/common/components/Modal/Modal.tsx:145
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:305
-#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:142
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:472
-#: superset-frontend/src/datasource/DatasourceModal.tsx:202
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:175
-#: superset-frontend/src/explore/components/SaveModal.tsx:174
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:749
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:177
+#: superset-frontend/src/components/Modal/Modal.tsx:146
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:80
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:440
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:151
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:142
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:76
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:83
+#: superset-frontend/src/datasource/DatasourceModal.tsx:207
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:170
+#: superset-frontend/src/explore/components/SaveModal.tsx:180
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:750
 #: superset/templates/superset/request_access.html:34
 msgid "Cancel"
 msgstr "キャンセル"
@@ -2049,115 +2451,127 @@ msgstr "このフィールドを変更するには、編集ボタンを使用し
 
 #: superset/templates/superset/models/database/macros.html:22
 msgid "Test Connection"
-msgstr "テスト接続"
+msgstr "接続のテスト"
 
-#: superset/utils/core.py:794
+#: superset/utils/core.py:882
 #, python-format
 msgid "[Superset] Access to the datasource %(name)s was granted"
 msgstr "[Superset]　データソース　%(name)s へのアクセスは許可されました"
 
-#: superset/utils/date_parser.py:378
-msgid "Unable to find such a holiday: [{}]"
+#: superset/utils/date_parser.py:386
+#, python-format
+msgid "Unable to find such a holiday: [%(holiday)s]"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:136
+#: superset/utils/pandas_postprocessing.py:137
 msgid "Referenced columns not available in DataFrame."
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:161
+#: superset/utils/pandas_postprocessing.py:162
 #, python-format
 msgid "Column referenced by aggregate is undefined: %(column)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:168
+#: superset/utils/pandas_postprocessing.py:169
 #, python-format
 msgid "Operator undefined for aggregator: %(name)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:177
+#: superset/utils/pandas_postprocessing.py:178
 #, python-format
 msgid "Invalid numpy function: %(operator)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:245
+#: superset/utils/pandas_postprocessing.py:246
 msgid "Pivot operation requires at least one index"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:249
+#: superset/utils/pandas_postprocessing.py:250
 msgid "Pivot operation must include at least one aggregate"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:357
+#: superset/utils/pandas_postprocessing.py:358
 msgid "Undefined window for rolling operation"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:372
+#: superset/utils/pandas_postprocessing.py:373
 #, python-format
 msgid "Invalid rolling_type: %(type)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:378
+#: superset/utils/pandas_postprocessing.py:379
 #, python-format
 msgid "Invalid options for %(rolling_type)s: %(options)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:463
+#: superset/utils/pandas_postprocessing.py:464
 #, python-format
 msgid "Invalid cumulative operator: %(operator)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:489
+#: superset/utils/pandas_postprocessing.py:490
 msgid "Invalid geohash string"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:512
+#: superset/utils/pandas_postprocessing.py:513
 msgid "Invalid longitude/latitude"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:554
+#: superset/utils/pandas_postprocessing.py:555
 msgid "Invalid geodetic string"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:616
-msgid "`fbprophet` package not installed"
+#: superset/utils/pandas_postprocessing.py:588
+#, python-format
+msgid ""
+"Column \"%(column)s\" is not numeric or does not exists in the query "
+"results."
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:667
-msgid "Time grain missing"
-msgstr "時間単位がありません"
+#: superset/utils/pandas_postprocessing.py:598
+msgid "`rename_columns` must have the same length as `columns`."
+msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:670
+#: superset/utils/pandas_postprocessing.py:641
+msgid "`prophet` package not installed"
+msgstr ""
+
+#: superset/utils/pandas_postprocessing.py:692
+msgid "Time grain missing"
+msgstr ""
+
+#: superset/utils/pandas_postprocessing.py:695
 #, python-format
 msgid "Unsupported time grain: %(time_grain)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:676
+#: superset/utils/pandas_postprocessing.py:701
 msgid "Periods must be a positive integer value"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:679
+#: superset/utils/pandas_postprocessing.py:704
 msgid "Confidence interval must be between 0 and 1 (exclusive)"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:682
+#: superset/utils/pandas_postprocessing.py:707
 msgid "DataFrame must include temporal column"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:684
+#: superset/utils/pandas_postprocessing.py:709
 msgid "DataFrame include at least one series"
 msgstr "少なくとも1つの指標を選択してください"
 
-#: superset/utils/pandas_postprocessing.py:773
+#: superset/utils/pandas_postprocessing.py:798
 msgid ""
-"percentiles must be a list or tuple with two numeric values, of which the "
-"first is lower than the second value"
+"percentiles must be a list or tuple with two numeric values, of which the"
+" first is lower than the second value"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:208
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:282
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:372
+#: superset-frontend/src/components/Menu/Menu.tsx:228
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:284
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:374
 #: superset/views/access_requests.py:40 superset/views/log/__init__.py:30
-#: superset/views/schedules.py:226 superset/views/schedules.py:289
+#: superset/views/schedules.py:230 superset/views/schedules.py:310
 #: superset/views/sql_lab.py:71
 msgid "User"
 msgstr "ユーザー"
@@ -2174,45 +2588,54 @@ msgstr "データベースURL"
 msgid "Roles to grant"
 msgstr "付与する役割"
 
-#: superset/views/access_requests.py:45 superset/views/schedules.py:224
-#: superset/views/schedules.py:287
+#: superset/views/access_requests.py:45 superset/views/schedules.py:228
+#: superset/views/schedules.py:308
 msgid "Created On"
 msgstr "作成日"
 
-#: superset/views/alerts.py:59
+#: superset/views/alerts.py:63
 msgid "List Observations"
 msgstr "観測値のリスト"
 
-#: superset/views/alerts.py:60
+#: superset/views/alerts.py:64
 msgid "Show Observation"
 msgstr "観測値を表示"
 
-#: superset/views/alerts.py:67
+#: superset/views/alerts.py:71
 msgid "Error Message"
 msgstr "エラーメッセージ"
 
-#: superset/views/alerts.py:165
+#: superset/views/alerts.py:168
 msgid "Log Retentions (days)"
 msgstr ""
 
-#: superset/views/alerts.py:174
+#: superset/views/alerts.py:177
 msgid "A semicolon ';' delimited list of email addresses"
 msgstr ""
 
-#: superset/views/alerts.py:175
+#: superset/views/alerts.py:178
 msgid "How long to keep the logs around for this alert"
 msgstr ""
 
-#: superset/views/alerts.py:176
+#: superset/views/alerts.py:179
 msgid ""
-"Once an alert is triggered, how long, in seconds, before Superset nags you "
-"again."
+"Once an alert is triggered, how long, in seconds, before Superset nags "
+"you again."
 msgstr ""
 
-#: superset/views/alerts.py:180
+#: superset/views/alerts.py:183
 msgid ""
-"A SQL statement that defines whether the alert should get triggered or not. "
-"The query is expected to return either NULL or a number value."
+"A SQL statement that defines whether the alert should get triggered or "
+"not. The query is expected to return either NULL or a number value."
+msgstr ""
+
+#: superset/views/alerts.py:220 superset/views/schedules.py:244
+#: superset/views/schedules.py:325
+msgid ""
+"This feature is deprecated and will be removed on 2.0. Take a look at the"
+" replacement feature <a "
+"href='https://superset.apache.org/docs/installation/alerts-"
+"reports'>Alerts & Reports documentation</a>"
 msgstr ""
 
 #: superset/views/annotations.py:40
@@ -2243,28 +2666,28 @@ msgstr "注釈を編集"
 msgid "Layer"
 msgstr "レイヤー"
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:148
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:146
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:150
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:837
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:845
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:157
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:149
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:146
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:165
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:169
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:865
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:873
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:157
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:148
 #: superset/views/annotations.py:79 superset/views/sql_lab.py:70
 msgid "Label"
 msgstr "ラベル"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:161
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:160
 #: superset/views/annotations.py:81
 msgid "Start"
 msgstr "開始時間"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:170
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:169
 #: superset/views/annotations.py:82
 msgid "End"
 msgstr "終了時間"
 
-#: superset/views/annotations.py:83 superset/views/dashboard/mixin.py:82
+#: superset/views/annotations.py:83 superset/views/dashboard/mixin.py:89
 msgid "JSON Metadata"
 msgstr "JSONメタデータ"
 
@@ -2280,210 +2703,213 @@ msgstr "注釈レイヤーを追加"
 msgid "Edit Annotation Layer"
 msgstr "注釈レイヤーを編集"
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:119
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:200
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:706
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:218
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:132
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:131
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:252
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:209
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:120
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:195
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:707
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:223
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:135
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:134
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:263
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:264
 #: superset/views/annotations.py:128 superset/views/chart/mixin.py:86
 msgid "Name"
 msgstr "名前"
 
-#: superset/views/base.py:207
-#, python-format
-msgid "Dataset %(name)s already exists"
-msgstr ""
-
-#: superset/views/base.py:227
+#: superset/views/base.py:235
 msgid ""
 "Table [%{table}s] could not be found, please double check your database "
 "connection, schema, and table name, error: {}"
 msgstr ""
 
-#: superset/views/base.py:378
+#: superset/views/base.py:462
 msgid "json isn't valid"
 msgstr ""
 
-#: superset/views/base.py:389
+#: superset/views/base.py:473
 msgid "Export to YAML"
 msgstr "YAMLで出力"
 
-#: superset/views/base.py:389
+#: superset/views/base.py:473
 msgid "Export to YAML?"
 msgstr "YAMLで出力しますか？"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:310
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:472
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:315
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:370
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:98
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:309
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:559
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:336
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:295
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:512
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:330
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:592
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:444
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:230
-#: superset/views/base.py:446
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:82
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:315
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:480
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:314
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:378
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:101
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:323
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:590
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:339
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:130
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:303
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:533
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:341
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:611
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:499
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:232
+#: superset/views/base.py:530
 msgid "Delete"
 msgstr "削除"
 
-#: superset/views/base.py:446
+#: superset/views/base.py:530
 msgid "Delete all Really?"
 msgstr "本当に全部削除しますか？"
 
-#: superset/views/base_api.py:100
+#: superset/views/base_api.py:107
 msgid "Is favorite"
 msgstr "お気に入り"
 
-#: superset/views/core.py:161
+#: superset/views/core.py:163
 msgid "The data source seems to have been deleted"
 msgstr ""
 
-#: superset/views/core.py:162
+#: superset/views/core.py:164
 msgid "The user seems to have been deleted"
 msgstr ""
 
-#: superset/views/core.py:277
+#: superset/views/core.py:279
 msgid "Access was requested"
 msgstr ""
 
-#: superset/views/core.py:331
+#: superset/views/core.py:333
 msgid "The access requests seem to have been deleted"
 msgstr ""
 
-#: superset/views/core.py:343
+#: superset/views/core.py:345
 #, python-format
 msgid ""
 "%(user)s was granted the role %(role)s that gives access to the "
 "%(datasource)s"
 msgstr ""
 
-#: superset/views/core.py:366
+#: superset/views/core.py:368
 #, python-format
 msgid "Role %(r)s was extended to provide the access to the datasource %(ds)s"
 msgstr ""
 
-#: superset/views/core.py:383
+#: superset/views/core.py:385
 msgid "You have no permission to approve this request"
 msgstr ""
 
-#: superset/views/core.py:634
+#: superset/views/core.py:636
 #, python-format
 msgid ""
 "Cannot import dashboard: %(db_error)s.\n"
 "Make sure to create the database before importing the dashboard."
 msgstr ""
 
-#: superset/views/core.py:645
+#: superset/views/core.py:647
 msgid "An unknown error occurred. Please contact your Superset administrator"
 msgstr ""
 
-#: superset/views/core.py:710
-#, python-format
-msgid "Error occurred when opening the chart: %(error)s"
-msgstr ""
+#: superset/views/core.py:719
+msgid "[Missing Dataset]"
+msgstr "[データセットが見つかりません]"
 
-#: superset/views/core.py:764 superset/views/core.py:770
-#: superset/views/core.py:917 superset/views/core.py:935
+#: superset/views/core.py:759 superset/views/core.py:765
+#: superset/views/core.py:926 superset/views/core.py:944
 msgid "You don't have the rights to "
 msgstr ""
 
-#: superset/views/core.py:764 superset/views/core.py:918
+#: superset/views/core.py:759 superset/views/core.py:927
 msgid "alter this "
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:129
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:600
-#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:64
-#: superset/views/core.py:764 superset/views/core.py:770
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:139
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:631
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:66
+#: superset/views/core.py:759 superset/views/core.py:765
 msgid "chart"
 msgstr "チャート"
 
-#: superset/views/core.py:770 superset/views/core.py:936
+#: superset/views/core.py:765 superset/views/core.py:945
 msgid "create a "
-msgstr "作成日"
+msgstr "作成日 "
 
-#: superset/views/core.py:810
+#: superset/views/core.py:815
 #, python-format
 msgid "Explore - %(table)s"
 msgstr ""
 
-#: superset/views/core.py:893
+#: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:99
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:170
+#: superset/views/core.py:817
+msgid "Explore"
+msgstr ""
+
+#: superset/views/core.py:902
 msgid "Chart [{}] has been saved"
-msgstr ""
+msgstr "チャート [{}] が保存されました"
 
-#: superset/views/core.py:897
+#: superset/views/core.py:906
 msgid "Chart [{}] has been overwritten"
-msgstr ""
+msgstr "チャート [{}] が上書きされました"
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:102
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:563
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:55
-#: superset/views/core.py:919 superset/views/core.py:937
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:108
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:584
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:56
+#: superset/views/core.py:928 superset/views/core.py:946
 msgid "dashboard"
 msgstr "ダッシュボード"
 
-#: superset/views/core.py:924
+#: superset/views/core.py:933
 msgid "Chart [{}] was added to dashboard [{}]"
 msgstr "チャート [{}] はダッシュボード [{}] に追加されました"
 
-#: superset/views/core.py:946
+#: superset/views/core.py:955
 msgid "Dashboard [{}] just got created and chart [{}] was added to it"
 msgstr "ダッシュボード [{}] が作成されチャート [{}] が追加されました"
 
-#: superset/views/core.py:1174
+#: superset/views/core.py:1186
 msgid ""
-"This dashboard was changed recently. Please reload dashboard to get latest "
-"version."
-msgstr "このダッシュボードは最近変更されました。最新の情報を入手するにはダッシュボードをリロードしてください"
+"This dashboard was changed recently. Please reload dashboard to get "
+"latest version."
+msgstr "このダッシュボードは最近変更されました。最新の情報を入手するにはダッシュボードをリロードしてください。"
 
-#: superset/views/core.py:1267
+#: superset/views/core.py:1279
 #, python-format
 msgid "Could not load database driver: %(driver_name)s"
 msgstr "データベースドライバ: %(driver_name)s 読み込めませんでした"
 
-#: superset/views/core.py:1276
+#: superset/views/core.py:1288
 msgid ""
 "Invalid connection string, a valid string usually follows:\n"
 "'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-NAME'"
 msgstr ""
 
-#: superset/views/core.py:1632
+#: superset/views/core.py:1651
 msgid ""
-"Malformed request. slice_id or table_name and db_name arguments are expected"
+"Malformed request. slice_id or table_name and db_name arguments are "
+"expected"
 msgstr "不正なリクエスト。 slice_idまたはtable_nameおよびdb_name引数が必要です"
 
-#: superset/views/core.py:1642
+#: superset/views/core.py:1661
 #, python-format
 msgid "Chart %(id)s not found"
 msgstr "チャート %(id)s が見つかりません"
 
-#: superset/views/core.py:1655
+#: superset/views/core.py:1674
 #, python-format
 msgid "Table %(table)s wasn't found in the database %(db)s"
-msgstr "テーブル %(t)s はデータベース %(d)s　にありません"
+msgstr "テーブル %(table)s はデータベース %(db)s にありません"
 
-#: superset/views/core.py:1925
+#: superset/views/core.py:1908
 #, python-format
 msgid "Can't find User '%(name)s', please ask your admin to create one."
 msgstr "ユーザー ‘%(name)s’ が見つかりません。管理者に作成を依頼してください。"
 
-#: superset/views/core.py:1937
+#: superset/views/core.py:1920
 #, python-format
 msgid "Can't find DruidCluster with cluster_name = '%(name)s'"
 msgstr ""
 
-#: superset/views/core.py:2180
+#: superset/views/core.py:2163
 msgid "Data could not be deserialized. You may want to re-run the query."
 msgstr ""
 
-#: superset/views/core.py:2284
+#: superset/views/core.py:2270
 #, python-format
 msgid ""
 "%(validator)s was unable to check your query.\n"
@@ -2491,24 +2917,23 @@ msgid ""
 "Exception: %(ex)s"
 msgstr ""
 
-#: superset/views/core.py:2338
+#: superset/views/core.py:2324
 msgid ""
-"Failed to start remote query on a worker. Tell your administrator to verify "
-"the availability of the message queue."
+"Failed to start remote query on a worker. Tell your administrator to "
+"verify the availability of the message queue."
 msgstr ""
 
-#: superset/views/core.py:2502 superset/views/core.py:2504
+#: superset/views/core.py:2488 superset/views/core.py:2490
 msgid "Query record was not created as expected."
 msgstr ""
 
-#: superset/views/core.py:2541
+#: superset/views/core.py:2527
 #, python-format
 msgid "The parameter %(parameters)s in your query is undefined."
-msgid_plural ""
-"The following parameters in your query are undefined: %(parameters)s."
+msgid_plural "The following parameters in your query are undefined: %(parameters)s."
 msgstr[0] ""
 
-#: superset/views/core.py:2809
+#: superset/views/core.py:2791
 #, python-format
 msgid "%(user)s's profile"
 msgstr "%(user)s' のプロファイル"
@@ -2529,20 +2954,29 @@ msgstr "CSSテンプレートを編集"
 msgid "Template Name"
 msgstr "テンプレート名"
 
+#: superset/views/datasource.py:45
+msgid "Request missing data field."
+msgstr ""
+
+#: superset/views/datasource.py:81
+#, python-format
+msgid "Duplicate column name(s): %(columns)s"
+msgstr ""
+
 #: superset/views/dynamic_plugins.py:42
 msgid "A human-friendly name"
 msgstr ""
 
 #: superset/views/dynamic_plugins.py:43
 msgid ""
-"Used internally to identify the plugin. Should be set to the package name "
-"from the pluginʼs package.json"
+"Used internally to identify the plugin. Should be set to the package name"
+" from the pluginʼs package.json"
 msgstr ""
 
 #: superset/views/dynamic_plugins.py:47
 msgid ""
-"A full URL pointing to the location of the built plugin (could be hosted on "
-"a CDN for example)"
+"A full URL pointing to the location of the built plugin (could be hosted "
+"on a CDN for example)"
 msgstr ""
 
 #: superset/views/dynamic_plugins.py:53
@@ -2561,70 +2995,70 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-#: superset/views/schedules.py:183
+#: superset/views/schedules.py:187
 msgid "Schedule Email Reports for Dashboards"
 msgstr ""
 
-#: superset/views/schedules.py:185
+#: superset/views/schedules.py:189
 msgid "Manage Email Reports for Dashboards"
 msgstr ""
 
-#: superset/views/schedules.py:225 superset/views/schedules.py:288
+#: superset/views/schedules.py:229 superset/views/schedules.py:309
 msgid "Changed On"
 msgstr "変更日"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:275
-#: superset/views/schedules.py:227 superset/views/schedules.py:290
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:280
+#: superset/views/schedules.py:231 superset/views/schedules.py:311
 msgid "Active"
-msgstr ""
+msgstr "アクティブ"
 
-#: superset/views/schedules.py:228 superset/views/schedules.py:291
+#: superset/views/schedules.py:232 superset/views/schedules.py:312
 msgid "Crontab"
 msgstr ""
 
-#: superset/views/schedules.py:229 superset/views/schedules.py:292
+#: superset/views/schedules.py:233 superset/views/schedules.py:313
 msgid "Recipients"
 msgstr ""
 
-#: superset/views/schedules.py:230 superset/views/schedules.py:293
+#: superset/views/schedules.py:234 superset/views/schedules.py:314
 msgid "Slack Channel"
 msgstr ""
 
-#: superset/views/schedules.py:231 superset/views/schedules.py:294
+#: superset/views/schedules.py:235 superset/views/schedules.py:315
 msgid "Deliver As Group"
 msgstr ""
 
-#: superset/views/schedules.py:232 superset/views/schedules.py:295
+#: superset/views/schedules.py:236 superset/views/schedules.py:316
 msgid "Delivery Type"
 msgstr ""
 
-#: superset/views/schedules.py:244
+#: superset/views/schedules.py:265
 msgid "Schedule Email Reports for Charts"
-msgstr ""
+msgstr "チャートのメールレポートのスケジュール"
 
-#: superset/views/schedules.py:246
+#: superset/views/schedules.py:267
 msgid "Manage Email Reports for Charts"
-msgstr ""
+msgstr "チャートのメールレポートの管理"
 
-#: superset/views/schedules.py:296
+#: superset/views/schedules.py:317
 msgid "Email Format"
 msgstr "メールフォーマット"
 
 #: superset/views/sql_lab.py:41
 msgid "List Saved Query"
-msgstr "保存されたクエリのリスト"
+msgstr "保存したクエリのリスト"
 
 #: superset/views/sql_lab.py:42
 msgid "Show Saved Query"
-msgstr "保存されたクエリを表示"
+msgstr "保存したクエリを表示"
 
 #: superset/views/sql_lab.py:43
 msgid "Add Saved Query"
-msgstr "保存されたクエリを追加"
+msgstr "保存したクエリを追加"
 
 #: superset/views/sql_lab.py:44
 msgid "Edit Saved Query"
-msgstr "保存されたクエリの編集"
+msgstr "保存したクエリの編集"
 
 #: superset/views/sql_lab.py:75
 msgid "End Time"
@@ -2638,11 +3072,15 @@ msgstr ""
 msgid "Changed on"
 msgstr "変更日"
 
-#: superset/views/utils.py:492
+#: superset/views/utils.py:226
+msgid "The dataset associated with this chart no longer exists"
+msgstr ""
+
+#: superset/views/utils.py:505
 msgid "Could not determine datasource type"
 msgstr ""
 
-#: superset/views/utils.py:508
+#: superset/views/utils.py:521
 msgid "Could not find viz object"
 msgstr ""
 
@@ -2661,8 +3099,9 @@ msgstr "チャートを編集"
 #: superset/views/chart/mixin.py:64
 msgid ""
 "These parameters are generated dynamically when clicking the save or "
-"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."
+"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 ""
 
 #: superset/views/chart/mixin.py:70
@@ -2673,7 +3112,7 @@ msgstr ""
 
 #: superset/views/chart/mixin.py:82
 msgid "Last Modified"
-msgstr "最終更新日"
+msgstr "最終更新"
 
 #: superset/views/chart/mixin.py:84
 msgid "Parameters"
@@ -2695,79 +3134,90 @@ msgstr "ダッシュボードを追加"
 msgid "Edit Dashboard"
 msgstr "ダッシュボードを編集"
 
-#: superset/views/dashboard/mixin.py:46
+#: superset/views/dashboard/mixin.py:47
 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"
+"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 ""
 
-#: superset/views/dashboard/mixin.py:52
+#: superset/views/dashboard/mixin.py:53
 msgid ""
-"The CSS for individual dashboards can be altered here, or in the dashboard "
-"view where changes are immediately visible"
+"The CSS for individual dashboards can be altered here, or in the "
+"dashboard view where changes are immediately visible"
 msgstr "個々のダッシュボードのCSSは、ここもしくは変更がすぐに表示されるダッシュボードビューで変更できます"
 
-#: superset/views/dashboard/mixin.py:57
+#: superset/views/dashboard/mixin.py:58
 msgid "To get a readable URL for your dashboard"
 msgstr "ダッシュボードの読み取り可能なURLを取得するには"
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:414
-#: superset/views/dashboard/mixin.py:58
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:523
+#: superset/views/dashboard/mixin.py:59
 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."
+"overwrite button in the dashboard view. It is exposed here for reference "
+"and for power users who may want to alter specific parameters."
 msgstr ""
-
-#: superset/views/dashboard/mixin.py:64
-msgid "Owners is a list of users who can alter the dashboard."
-msgstr "所有者は、ダッシュボードを変更できるユーザーのリストです"
+"この JSON オブジェクトは、ダッシュボード ビューの [保存] または [上書き] "
+"ボタンをクリックすると動的に生成されます。これは、参照用と特定のパラメータを変更する可能性のあるパワーユーザーのために公開されています。"
 
 #: superset/views/dashboard/mixin.py:65
+msgid "Owners is a list of users who can alter the dashboard."
+msgstr "所有者は、ダッシュボードを変更できるユーザーのリストです。"
+
+#: superset/views/dashboard/mixin.py:66
+msgid ""
+"Roles is a list which defines access to the dashboard. Granting a role "
+"access to a dashboard will bypass dataset level checks.If no roles "
+"defined then the dashboard is available to all roles."
+msgstr ""
+
+#: superset/views/dashboard/mixin.py:71
 msgid ""
 "Determines whether or not this dashboard is visible in the list of all "
 "dashboards"
 msgstr "このダッシュボードがすべてのダッシュボードのリストに表示されるかどうかを決定します"
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:329
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:207
-#: superset/views/dashboard/mixin.py:73 superset/views/dashboard/views.py:146
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:464
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:214
+#: superset/views/dashboard/mixin.py:79 superset/views/dashboard/views.py:146
 msgid "Title"
 msgstr "タイトル"
 
-#: superset/views/dashboard/mixin.py:74
+#: superset/views/dashboard/mixin.py:80
 msgid "Slug"
 msgstr "スラッグ"
 
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:101
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:229
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:407
-#: superset/views/dashboard/mixin.py:77
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:101
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:237
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:412
+#: superset/views/dashboard/mixin.py:84
 msgid "Published"
 msgstr "公開"
 
-#: superset/views/dashboard/mixin.py:80
+#: superset/views/dashboard/mixin.py:87
 msgid "Position JSON"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/CssEditor.jsx:83
-#: superset/views/dashboard/mixin.py:81
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:82
+#: superset/views/dashboard/mixin.py:88
 msgid "CSS"
 msgstr ""
 
-#: superset/views/dashboard/mixin.py:83
+#: superset/views/dashboard/mixin.py:90
 msgid "Underlying Tables"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:110
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:327
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:567
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:316
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:520
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:313
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:346
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:600
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:114
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:342
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:598
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:97
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:321
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:541
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:329
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:357
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:619
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:507
 #: superset/views/dashboard/views.py:66
 msgid "Export"
 msgstr "エクスポート"
@@ -2786,12 +3236,12 @@ msgstr ""
 
 #: superset/views/database/forms.py:94
 msgid "Select a CSV file to be uploaded to a database."
-msgstr ""
+msgstr "データベースにアップロードする CSV ファイルを選択します。"
 
 #: superset/views/database/forms.py:103 superset/views/database/forms.py:292
 #, python-format
 msgid "Only the following file extensions are allowed: %(allowed_extensions)s"
-msgstr ""
+msgstr "次のファイル拡張子のみが許可されます: %(allowed_extensions)s"
 
 #: superset/views/database/forms.py:119 superset/views/database/forms.py:316
 msgid "Specify a schema (if database flavor supports this)."
@@ -2799,11 +3249,11 @@ msgstr ""
 
 #: superset/views/database/forms.py:124
 msgid "Delimiter"
-msgstr ""
+msgstr "区切り文字"
 
 #: superset/views/database/forms.py:125
 msgid "Delimiter used by CSV file (for whitespace use \\s+)."
-msgstr ""
+msgstr "CSV ファイルで使用する区切り文字 (空白文字の場合は \\s+ を使用)。"
 
 #: superset/views/database/forms.py:130 superset/views/database/forms.py:321
 msgid "Table Exists"
@@ -2811,8 +3261,8 @@ msgstr ""
 
 #: superset/views/database/forms.py:131 superset/views/database/forms.py:322
 msgid ""
-"If table exists do one of the following: Fail (do nothing), Replace (drop "
-"and recreate table) or Append (insert data)."
+"If table exists do one of the following: Fail (do nothing), Replace (drop"
+" and recreate table) or Append (insert data)."
 msgstr ""
 
 #: superset/views/database/forms.py:137 superset/views/database/forms.py:328
@@ -2833,8 +3283,8 @@ msgstr ""
 
 #: superset/views/database/forms.py:145 superset/views/database/forms.py:336
 msgid ""
-"Row containing the headers to use as column names (0 is first line of data). "
-"Leave empty if there is no header row."
+"Row containing the headers to use as column names (0 is first line of "
+"data). Leave empty if there is no header row."
 msgstr ""
 
 #: superset/views/database/forms.py:154 superset/views/database/forms.py:345
@@ -2843,8 +3293,8 @@ msgstr ""
 
 #: superset/views/database/forms.py:155 superset/views/database/forms.py:346
 msgid ""
-"Column to use as the row labels of the dataframe. Leave empty if no index "
-"column."
+"Column to use as the row labels of the dataframe. Leave empty if no index"
+" column."
 msgstr ""
 
 #: superset/views/database/forms.py:163 superset/views/database/forms.py:354
@@ -2925,8 +3375,8 @@ msgstr ""
 
 #: superset/views/database/forms.py:208 superset/views/database/forms.py:388
 msgid ""
-"Column label for index column(s). If None is given and Dataframe Index is "
-"True, Index Names are used."
+"Column label for index column(s). If None is given and Dataframe Index is"
+" True, Index Names are used."
 msgstr ""
 
 #: superset/views/database/forms.py:216 superset/views/database/forms.py:396
@@ -2935,9 +3385,9 @@ msgstr ""
 
 #: superset/views/database/forms.py:218 superset/views/database/forms.py:398
 msgid ""
-"Json list of the values that should be treated as null. Examples: [\"\"], "
-"[\"None\", \"N/A\"], [\"nan\", \"null\"]. Warning: Hive database supports "
-"only single value. Use [\"\"] for empty string."
+"Json list of the values that should be treated as null. Examples: [\"\"],"
+" [\"None\", \"N/A\"], [\"nan\", \"null\"]. Warning: Hive database "
+"supports only single value. Use [\"\"] for empty string."
 msgstr ""
 
 #: superset/views/database/forms.py:277
@@ -2960,222 +3410,220 @@ msgstr ""
 msgid "Strings used for sheet names (default is the first sheet)."
 msgstr ""
 
-#: superset/views/database/mixins.py:33
+#: superset/views/database/mixins.py:34
 msgid "Show Database"
 msgstr "データベースを表示"
 
-#: superset/views/database/mixins.py:34
+#: superset/views/database/mixins.py:35
 msgid "Add Database"
 msgstr "データベースを追加"
 
-#: superset/views/database/mixins.py:35
+#: superset/views/database/mixins.py:36
 msgid "Edit Database"
 msgstr "データベースを編集"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:466
-#: superset/views/database/mixins.py:103
+#: superset/views/database/mixins.py:104
 msgid "Expose this DB in SQL Lab"
 msgstr ""
 
-#: superset/views/database/mixins.py:104
+#: superset/views/database/mixins.py:105
 msgid ""
 "Operate the database in asynchronous mode, meaning  that the queries are "
 "executed on remote workers as opposed to on the web server itself. This "
-"assumes that you have a Celery worker setup as well as a results backend. "
-"Refer to the installation docs for more information."
+"assumes that you have a Celery worker setup as well as a results backend."
+" Refer to the installation docs for more information."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:479
-#: superset/views/database/mixins.py:112
+#: superset/views/database/mixins.py:113
 msgid "Allow CREATE TABLE AS option in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:493
-#: superset/views/database/mixins.py:113
+#: superset/views/database/mixins.py:114
 msgid "Allow CREATE VIEW AS option in SQL Lab"
 msgstr ""
 
-#: superset/views/database/mixins.py:114
+#: superset/views/database/mixins.py:115
 msgid ""
-"Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...) in "
-"SQL Lab"
+"Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...) in"
+" SQL Lab"
 msgstr ""
 
-#: superset/views/database/mixins.py:119
+#: superset/views/database/mixins.py:120
 msgid ""
 "When allowing CREATE TABLE AS option in SQL Lab, this option forces the "
 "table to be created in this schema"
 msgstr ""
 
-#: superset/views/database/mixins.py:162
+#: superset/views/database/mixins.py:163
 msgid ""
 "If Presto, all the queries in SQL Lab are going to be executed as the "
-"currently logged on user who must have permission to run them.<br/>If Hive "
-"and hive.server2.enable.doAs is enabled, will run the queries as service "
-"account, but impersonate the currently logged on user via hive.server2.proxy."
-"user property."
+"currently logged on user who must have permission to run them.<br/>If "
+"Hive and hive.server2.enable.doAs is enabled, will run the queries as "
+"service account, but impersonate the currently logged on user via "
+"hive.server2.proxy.user property."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:523
-#: superset/views/database/mixins.py:169
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:434
+#: superset/views/database/mixins.py:170
 msgid ""
 "Allow SQL Lab to fetch a list of all tables and all views across all "
-"database schemas. For large data warehouse with thousands of tables, this "
-"can be expensive and put strain on the system."
+"database schemas. For large data warehouse with thousands of tables, this"
+" can be expensive and put strain on the system."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:428
-#: superset/views/database/mixins.py:174
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:469
+#: superset/views/database/mixins.py:175
 msgid ""
-"Duration (in seconds) of the caching timeout for charts of this database. A "
-"timeout of 0 indicates that the cache never expires. Note this defaults to "
-"the global timeout if undefined."
-msgstr ""
+"Duration (in seconds) of the caching timeout for charts of this database."
+" A timeout of 0 indicates that the cache never expires. Note this "
+"defaults to the global timeout if undefined."
+msgstr "このデータベースのチャートに対するキャッシュのタイムアウト期間（秒）。タイムアウトが0の場合は、キャッシュが失効しないことを意味します。未定義の場合は、グローバル・タイムアウトがデフォルト値になることに注意してください。"
 
-#: superset/views/database/mixins.py:179
+#: superset/views/database/mixins.py:180
 msgid "If selected, please set the schemas allowed for csv upload in Extra."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:253
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:358
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:465
-#: superset/views/database/mixins.py:185
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:269
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:374
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:342
+#: superset/views/database/mixins.py:186
 msgid "Expose in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:477
-#: superset/views/database/mixins.py:186
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:361
+#: superset/views/database/mixins.py:187
 msgid "Allow CREATE TABLE AS"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:491
-#: superset/views/database/mixins.py:187
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:377
+#: superset/views/database/mixins.py:188
 msgid "Allow CREATE VIEW AS"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:505
-#: superset/views/database/mixins.py:188
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:415
+#: superset/views/database/mixins.py:189
 msgid "Allow DML"
 msgstr ""
 
-#: superset/views/database/mixins.py:189
+#: superset/views/database/mixins.py:190
 msgid "CTAS Schema"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:384
-#: superset/views/database/mixins.py:193
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:283
+#: superset/views/database/mixins.py:194
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: superset/views/database/mixins.py:194
+#: superset/views/database/mixins.py:195
 msgid "Chart Cache Timeout"
 msgstr ""
 
-#: superset/views/database/mixins.py:196
+#: superset/views/database/mixins.py:197
 msgid "Secure Extra"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:582
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:587
-#: superset/views/database/mixins.py:197
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:537
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:542
+#: superset/views/database/mixins.py:198
 msgid "Root certificate"
 msgstr ""
 
-#: superset/views/database/mixins.py:198
+#: superset/views/database/mixins.py:199
 msgid "Async Execution"
 msgstr ""
 
-#: superset/views/database/mixins.py:199
+#: superset/views/database/mixins.py:200
 msgid "Impersonate the logged on user"
 msgstr ""
 
-#: superset/views/database/mixins.py:200
+#: superset/views/database/mixins.py:201
 msgid "Allow Csv Upload"
 msgstr ""
 
-#: superset/views/database/mixins.py:202
+#: superset/views/database/mixins.py:203
 msgid "Allow Multi Schema Metadata Fetch"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:201
-#: superset/views/database/mixins.py:203
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:217
+#: superset/views/database/mixins.py:204
 msgid "Backend"
 msgstr ""
 
-#: superset/views/database/mixins.py:243 superset/views/database/mixins.py:267
+#: superset/views/database/mixins.py:244 superset/views/database/mixins.py:268
 #, python-format
 msgid "Extra field cannot be decoded by JSON. %(msg)s"
 msgstr ""
 
 #: superset/views/database/validators.py:40
 msgid ""
-"Invalid connection string, a valid string usually follows:'DRIVER://USER:"
-"PASSWORD@DB-HOST/DATABASE-NAME'<p>Example:'postgresql://user:password@your-"
-"postgres-db/database'</p>"
+"Invalid connection string, a valid string usually "
+"follows:'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-"
+"NAME'<p>Example:'postgresql://user:password@your-postgres-"
+"db/database'</p>"
 msgstr ""
 
-#: superset/views/database/views.py:114
+#: superset/views/database/views.py:115
 msgid "CSV to Database configuration"
 msgstr ""
 
-#: superset/views/database/views.py:132
+#: superset/views/database/views.py:133
 #, python-format
 msgid ""
-"Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed for "
-"csv uploads. Please contact your Superset Admin."
+"Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed "
+"for csv uploads. Please contact your Superset Admin."
 msgstr ""
 
-#: superset/views/database/views.py:142
+#: superset/views/database/views.py:143
 msgid ""
-"You cannot specify a namespace both in the name of the table: \"%(csv_table."
-"table)s\" and in the schema field: \"%(csv_table.schema)s\". Please remove "
-"one"
+"You cannot specify a namespace both in the name of the table: "
+"\"%(csv_table.table)s\" and in the schema field: "
+"\"%(csv_table.schema)s\". Please remove one"
 msgstr ""
 
-#: superset/views/database/views.py:250
+#: superset/views/database/views.py:236
 #, python-format
 msgid ""
-"Unable to upload CSV file \"%(filename)s\" to table \"%(table_name)s\" in "
-"database \"%(db_name)s\". Error message: %(error_msg)s"
+"Unable to upload CSV file \"%(filename)s\" to table \"%(table_name)s\" in"
+" database \"%(db_name)s\". Error message: %(error_msg)s"
 msgstr ""
 
-#: superset/views/database/views.py:263
+#: superset/views/database/views.py:248
 #, python-format
 msgid ""
 "CSV file \"%(csv_filename)s\" uploaded to table \"%(table_name)s\" in "
 "database \"%(db_name)s\""
 msgstr ""
 
-#: superset/views/database/views.py:274
+#: superset/views/database/views.py:259
 msgid "Excel to Database configuration"
 msgstr ""
 
-#: superset/views/database/views.py:289
+#: superset/views/database/views.py:274
 #, python-format
 msgid ""
-"Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed for "
-"excel uploads. Please contact your Superset Admin."
+"Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed "
+"for excel uploads. Please contact your Superset Admin."
 msgstr ""
 
-#: superset/views/database/views.py:299
+#: superset/views/database/views.py:284
 msgid ""
 "You cannot specify a namespace both in the name of the table: "
-"\"%(excel_table.table)s\" and in the schema field: \"%(excel_table.schema)s"
-"\". Please remove one"
+"\"%(excel_table.table)s\" and in the schema field: "
+"\"%(excel_table.schema)s\". Please remove one"
 msgstr ""
 
-#: superset/views/database/views.py:402
+#: superset/views/database/views.py:377
 #, python-format
 msgid ""
-"Unable to upload Excel file \"%(filename)s\" to table \"%(table_name)s\" in "
-"database \"%(db_name)s\". Error message: %(error_msg)s"
+"Unable to upload Excel file \"%(filename)s\" to table \"%(table_name)s\" "
+"in database \"%(db_name)s\". Error message: %(error_msg)s"
 msgstr ""
 
-#: superset/views/database/views.py:415
+#: superset/views/database/views.py:389
 #, python-format
 msgid ""
-"Excel file \"%(excel_filename)s\" uploaded to table \"%(table_name)s\" in "
-"database \"%(db_name)s\""
+"Excel file \"%(excel_filename)s\" uploaded to table \"%(table_name)s\" in"
+" database \"%(db_name)s\""
 msgstr ""
 
 #: superset/views/log/__init__.py:21
@@ -3202,188 +3650,196 @@ msgstr "アクション"
 msgid "dttm"
 msgstr ""
 
-#: superset-frontend/src/CRUD/CollectionTable.tsx:317
+#: superset-frontend/src/CRUD/CollectionTable.tsx:323
 msgid "Add item"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:103
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:106
 msgid "The query couldn't be loaded"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:156
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:159
 msgid ""
 "Your query has been scheduled. To see details of your query, navigate to "
 "Saved queries"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:163
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:166
 msgid "Your query could not be scheduled"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:191
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:298
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:194
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:301
 msgid "Failed at retrieving results"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:229
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:255
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:232
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:258
 msgid ""
-"An error occurred while storing the latest query id in the backend. Please "
-"contact your administrator if this problem persists."
+"An error occurred while storing the latest query id in the backend. "
+"Please contact your administrator if this problem persists."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:342
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:375
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:345
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:385
 msgid "Unknown error"
-msgstr ""
+msgstr "不明なエラー"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:393
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:403
 msgid "Query was stopped."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:422
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:432
 msgid ""
-"Unable to migrate table schema state to backend. Superset will retry later. "
+"Unable to migrate table schema state to backend. Superset will retry "
+"later. Please contact your administrator if this problem persists."
+msgstr ""
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:450
+msgid ""
+"Unable to migrate query state to backend. Superset will retry later. "
 "Please contact your administrator if this problem persists."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:440
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:496
 msgid ""
-"Unable to migrate query state to backend. Superset will retry later. Please "
-"contact your administrator if this problem persists."
+"Unable to migrate query editor state to backend. Superset will retry "
+"later. Please contact your administrator if this problem persists."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:486
-msgid ""
-"Unable to migrate query editor state to backend. Superset will retry later. "
-"Please contact your administrator if this problem persists."
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:529
+msgid "Unable to add a new tab to the backend. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:519
-msgid ""
-"Unable to add a new tab to the backend. Please contact your administrator."
-msgstr ""
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:536
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:546
 #: superset-frontend/src/SqlLab/reducers/sqlLab.js:74
 #, python-format
 msgid "Copy of %s"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:563
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:573
 msgid ""
 "An error occurred while setting the active tab. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:649
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:660
 msgid "An error occurred while fetching tab state"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:677
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:696
 msgid ""
-"An error occurred while removing tab. Please contact your administrator."
+"An error occurred while hiding the left bar. Please contact your "
+"administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:701
-msgid ""
-"An error occurred while removing query. Please contact your administrator."
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:718
+msgid "An error occurred while removing tab. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:724
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:742
+msgid "An error occurred while removing query. Please contact your administrator."
+msgstr ""
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:765
 msgid ""
 "An error occurred while setting the tab database ID. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:749
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:790
 msgid ""
 "An error occurred while setting the tab schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:782
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:823
 msgid ""
 "An error occurred while setting the tab autorun. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:807
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:899
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:848
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:940
 msgid ""
 "An error occurred while setting the tab title. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:829
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:870
 msgid "Your query was saved"
-msgstr ""
+msgstr "クエリが保存されました"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:833
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:874
 msgid "Your query could not be saved"
-msgstr ""
+msgstr "クエリを保存できませんでした"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:845
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:886
 msgid "Your query was updated"
-msgstr ""
+msgstr "クエリが更新されました"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:849
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:890
 msgid "Your query could not be updated"
-msgstr ""
+msgstr "クエリを更新できませんでした"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:868
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:909
 msgid ""
-"An error occurred while storing your query in the backend. To avoid losing "
-"your changes, please save your query using the \"Save Query\" button."
+"An error occurred while storing your query in the backend. To avoid "
+"losing your changes, please save your query using the \"Save Query\" "
+"button."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:928
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:969
 msgid ""
-"An error occurred while setting the tab template parameters. Please contact "
-"your administrator."
+"An error occurred while setting the tab template parameters. Please "
+"contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:989
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1014
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1027
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1052
 msgid "An error occurred while fetching table metadata"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1055
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1093
 msgid ""
 "An error occurred while fetching table metadata. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1103
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1141
 msgid ""
 "An error occurred while expanding the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1127
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1165
 msgid ""
 "An error occurred while collapsing the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1150
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1188
 msgid ""
 "An error occurred while removing the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1183
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1221
 msgid "Shared query"
 msgstr "クエリを共有"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1245
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1283
 msgid "The datasource couldn't be loaded"
-msgstr ""
+msgstr "データ ソースを読み込めませんでした"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1275
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1297
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1313
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1335
 msgid "An error occurred while creating the data source"
-msgstr ""
+msgstr "データ ソースの作成中にエラーが発生しました"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1356
+msgid "An error occurred while fetching function names."
+msgstr "関数名の取得中にエラーが発生しました。"
 
 #: superset-frontend/src/SqlLab/components/App.jsx:76
 msgid ""
@@ -3392,152 +3848,148 @@ msgid ""
 "            2,\n"
 "          )} KB out of ${LOCALSTORAGE_MAX_USAGE_KB} KB. storage space.\n"
 " To keep SQL Lab from crashing, please delete some query tabs.\n"
-" You can re-access these queries by using the Save feature before you delete "
-"the tab. Note that you will need to close other SQL Lab windows before you "
-"do this."
+" You can re-access these queries by using the Save feature before you "
+"delete the tab. Note that you will need to close other SQL Lab windows "
+"before you do this."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:85
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:87
 msgid "Estimate selected query cost"
-msgstr ""
+msgstr "選択したクエリコストの見積"
 
-#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:86
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:88
 msgid "Estimate cost"
-msgstr ""
+msgstr "見積コスト"
 
-#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:90
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:92
 msgid "Cost estimate"
-msgstr ""
+msgstr "コストの見積もり"
 
 #: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:73
 msgid "Creating a data source and creating a new tab"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:81
-#: superset-frontend/src/components/TableLoader.tsx:60
+#: superset-frontend/src/components/TableLoader/index.tsx:48
 msgid "An error occurred"
-msgstr ""
+msgstr "エラーが発生しました"
 
 #: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:92
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:156
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:163
 msgid "Explore the result set in the data exploration view"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:99
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:163
-msgid "Explore"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:108
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:111
 #, python-format
 msgid "This query took %s seconds to run, "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:110
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:113
 #, python-format
 msgid "and the explore view times out at %s seconds "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:114
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:117
 msgid "following this flow will most likely lead to your query timing out. "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:117
-msgid ""
-"We recommend your summarize your data further before following that flow. "
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:120
+msgid "We recommend your summarize your data further before following that flow. "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:120
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:123
 msgid "If activated you can use the "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:122
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:125
 msgid "feature to store a summarized data set that you can then explore."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:134
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:141
 msgid "Column name(s) "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:138
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:145
 msgid ""
 "cannot be used as a column name. The column name/alias \"__timestamp\"\n"
-"          is reserved for the main temporal expression, and column aliases "
-"ending with\n"
+"          is reserved for the main temporal expression, and column "
+"aliases ending with\n"
 "          double underscores followed by a numeric value (e.g. "
 "\"my_col__1\") are reserved\n"
-"          for deduplicating duplicate column names. Please use aliases to "
-"rename the\n"
+"          for deduplicating duplicate column names. Please use aliases to"
+" rename the\n"
 "          invalid column names."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/HighlightedSql.jsx:85
-msgid "Raw SQL"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/HighlightedSql.jsx:95
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:77
 msgid "Source SQL"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/HighlightedSql.jsx:108
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:719
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:301
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:83
+msgid "Raw SQL"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:102
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:741
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:303
 msgid "SQL"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QueryHistory.jsx:52
+#: superset-frontend/src/SqlLab/components/QueryHistory.tsx:50
 msgid "No query history yet..."
-msgstr ""
+msgstr "クエリ履歴はまだありません。"
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:193
-#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:101
-#: superset-frontend/src/components/DatabaseSelector.tsx:151
-msgid "It seems you don't have access to any database"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:220
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:132
 msgid "An error occurred when refreshing queries"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:235
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:180
+#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:117
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:156
+msgid "It seems you don't have access to any database"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:195
 msgid "Filter by user"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:244
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:204
 msgid "Filter by database"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:253
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:213
 msgid "Query search string"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:259
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:219
 msgid "[From]-"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:271
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:231
 msgid "[To]-"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:280
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:240
 msgid "Filter by status"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/QueryTable.jsx:128
-#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.jsx:34
-#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:134
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:301
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:120
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:343
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:332
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:329
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:362
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:211
+#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx:35
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:75
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:135
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:306
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:126
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:358
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:84
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:337
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:345
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:373
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:213
 msgid "Edit"
 msgstr "編集"
 
 #: superset-frontend/src/SqlLab/components/QueryTable.jsx:147
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:258
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:301
 msgid "View results"
 msgstr "結果を見る"
 
@@ -3557,188 +4009,186 @@ msgstr "新しいタブでクエリを実行"
 msgid "Remove query from log"
 msgstr "ログからクエリを削除"
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:255
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:278
 msgid "An error occurred saving dataset"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:449
-msgid ".CSV"
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:475
+msgid "Download to CSV"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:458
-msgid "Clipboard"
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:484
+msgid "Copy to Clipboard"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:469
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:495
 msgid "Filter results"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:501
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:510
+#, python-format
+msgid "%s rows returned"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:515
+#, python-format
+msgid ""
+"The number of results displayed is limited to %s. Please add\n"
+"            additional limits/filters or download to csv to see more rows"
+" up to\n"
+"            the %s limit."
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:545
+msgid "Query was stopped"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:551
 msgid "Database error"
 msgstr "データベースエラー"
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:525
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:578
 msgid "was created"
 msgstr "作成されました"
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:532
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:585
 msgid "Query in a new tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:575
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:631
 msgid "The query returned no data"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:593
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:648
 msgid "Fetch data preview"
 msgstr "データプレビューを読み込み"
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:605
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:659
 msgid "Refetch results"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:626
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:680
 msgid "Track job"
 msgstr "ジョブ履歴"
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:46
-#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:80
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:49
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:66
 msgid "Stop"
 msgstr "中止"
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:51
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:54
 msgid "Run selection"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:53
-#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:90
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:56
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:76
 msgid "Run"
-msgstr ""
+msgstr "実行"
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:103
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:111
 msgid "Stop running (Ctrl + x)"
-msgstr ""
+msgstr "実行を停止 (Ctrl + x)"
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:104
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:112
 msgid "Run query (Ctrl + Return)"
-msgstr ""
+msgstr "クエリを実行 (Ctrl + Return)"
 
 #: superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx:108
 msgid "Save & Explore"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx:123
+#: superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx:120
 msgid "Overwrite & Explore"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:70
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:86
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:71
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:110
 msgid "Undefined"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:163
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:169
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:184
-#: superset-frontend/src/dashboard/components/Header.jsx:468
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:289
-#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:139
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:223
-#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:539
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:475
-#: superset-frontend/src/datasource/DatasourceModal.tsx:211
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:187
-#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:108
-#: superset-frontend/src/explore/components/SaveModal.tsx:197
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:210
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:447
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1042
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:255
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:207
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:164
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:170
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:185
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:88
+#: superset-frontend/src/dashboard/components/Header/index.jsx:468
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:424
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:148
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:225
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:543
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:162
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:91
+#: superset-frontend/src/datasource/DatasourceModal.tsx:216
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:182
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:109
+#: superset-frontend/src/explore/components/SaveModal.tsx:203
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:222
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:466
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:979
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:279
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:231
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:225
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:343
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:252
 msgid "Save"
 msgstr "保存"
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:163
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:169
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:233
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:164
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:170
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:240
 msgid "Save as"
 msgstr "別名で保存"
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:172
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:173
 msgid "Save query"
 msgstr "クエリを保存"
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:184
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:185
 msgid "Save as new"
 msgstr "新規保存"
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:193
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:194
 msgid "Update"
 msgstr "更新"
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:152
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:150
 msgid "Label for your query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:165
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:163
 msgid "Write a description for your query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:201
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:197
 msgid "Schedule query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:211
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:222
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:207
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:227
 msgid "Schedule"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:77
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:58
 msgid "There was an error with your request"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:91
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:72
 msgid "Please save the query to enable sharing"
-msgstr ""
+msgstr "共有を有効にするにはクエリを保存して下さい"
 
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:113
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:85
+msgid "Copy query link to your clipboard"
+msgstr "クエリのlinkをクリップボードにコピー"
+
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:86
+msgid "Save the query to enable this feature"
+msgstr "この機能を有効にするためクエリを保存する"
+
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:97
 msgid "Copy link"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:129
-msgid "Copy query link to your clipboard"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:130
-msgid "Save the query to copy the link"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:127
-msgid "No stored results found, you need to re-run your query"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:148
-msgid "Run a query to display results here"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:153
-#, python-format
-msgid "Preview: `%s`"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:177
-msgid "Results"
-msgstr "結果"
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:180
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:100
-msgid "Query history"
-msgstr "クエリ履歴"
-
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:285
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:295
-#: superset-frontend/src/components/RefreshChartOverlay.tsx:48
+#: superset-frontend/src/chart/Chart.jsx:238
 msgid "Run query"
 msgstr "クエリ実行"
 
@@ -3755,136 +4205,146 @@ msgstr ""
 msgid "Stop query"
 msgstr "クエリを中止"
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:499
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:497
 msgid "Schedule the query periodically"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:500
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:498
 msgid "You must run the query successfully first"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:568
-#, python-format
-msgid ""
-"It appears that the number of rows in the query results displayed\n"
-"           was limited on the server side to\n"
-"           the %s limit."
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:503
+msgid "Autocomplete"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:597
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:581
 msgid "CREATE TABLE AS"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:610
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:594
 msgid "CREATE VIEW AS"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:645
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:629
 msgid "Estimate the cost before running a query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:159
+#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:204
 msgid "Reset state"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:237
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:240
 msgid "Enter a new title for the tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:263
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:266
 #, python-format
 msgid "Untitled Query %s"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:338
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:341
 msgid "Close tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:344
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:347
 msgid "Rename tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:350
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:353
 msgid "Expand tool bar"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:350
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:353
 msgid "Hide tool bar"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:359
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:362
 msgid "Close all other tabs"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:365
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:368
 msgid "Duplicate tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:113
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:422
+msgid "New tab (Ctrl + q)"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:423
+msgid "New tab (Ctrl + t)"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:103
 msgid "Copy partition query to clipboard"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:131
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:121
 msgid "latest partition:"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:149
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:139
 msgid "Keys for table"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:158
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:148
 #, python-format
 msgid "View keys & indexes (%s)"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:175
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:165
 msgid "Sort columns alphabetically"
-msgstr ""
+msgstr "列をアルファベット順に並び替え"
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:176
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:166
 msgid "Original table column order"
-msgstr ""
+msgstr "元のテーブル列順で表示"
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:188
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:178
 msgid "Copy SELECT statement to the clipboard"
-msgstr ""
+msgstr "SELECT文をクリップボードにコピー"
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:194
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:184
 msgid "Show CREATE VIEW statement"
-msgstr ""
+msgstr "CREATE VIEW文を表示"
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:195
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:185
 msgid "CREATE VIEW statement"
-msgstr ""
+msgstr "CREATE VIEW文"
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:201
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:191
 msgid "Remove table preview"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:81
-msgid "Assign a set of parameters as"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:83
-msgid "below (example:"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:85
-msgid "), and they become available in your SQL (example:"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:87
-msgid ") by using"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:127
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:99
 msgid "Edit template parameters"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:134
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:109
 msgid "Invalid JSON"
 msgstr ""
 
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:116
+msgid "No stored results found, you need to re-run your query"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:138
+msgid "Run a query to display results here"
+msgstr "クエリを実行すると結果がここに表示されます"
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:147
+#, python-format
+msgid "Preview: `%s`"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:172
+msgid "Results"
+msgstr "結果"
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:175
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:102
+msgid "Query history"
+msgstr "クエリ履歴"
+
 #: superset-frontend/src/addSlice/AddSliceContainer.tsx:94
 msgid "Create a new chart"
 msgstr "新しいチャートを作成"
@@ -3896,478 +4356,417 @@ msgstr "データセットを選択"
 
 #: superset-frontend/src/addSlice/AddSliceContainer.tsx:118
 msgid ""
-"If the dataset you are looking for is not available in the list, follow the "
-"instructions on how to add it in the Superset tutorial."
+"If the dataset you are looking for is not available in the list, follow "
+"the instructions on how to add it in the Superset tutorial."
 msgstr "探しているデータセットがリストにない場合は、Supersetチュートリアルでデータセットを追加する方法についての説明に従ってください。"
 
 #: superset-frontend/src/addSlice/AddSliceContainer.tsx:132
 msgid "Choose a visualization type"
-msgstr "チャートの可視化形式を選んでください"
+msgstr "可視化形式を選択"
 
 #: superset-frontend/src/addSlice/AddSliceContainer.tsx:147
 msgid "Create new chart"
 msgstr "新しいチャートを作成"
 
-#: superset-frontend/src/chart/chartAction.js:505
+#: superset-frontend/src/chart/chartAction.js:540
 msgid "An error occurred while loading the SQL"
-msgstr ""
+msgstr "SQL のロード中にエラーが発生しました"
 
-#: superset-frontend/src/chart/chartReducer.js:71
-msgid "Updating chart was stopped"
-msgstr ""
-
-#: superset-frontend/src/chart/chartReducer.js:91
-#, python-format
-msgid "An error occurred while rendering the visualization: %s"
-msgstr ""
-
-#: superset-frontend/src/chart/chartReducer.js:103
-#: superset-frontend/src/chart/chartReducer.js:167
-msgid "Network error."
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:26
-#: superset-frontend/src/common/components/CronPicker.tsx:34
-msgid "every"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:27
-msgid "every month"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:28
-msgid "every day of the month"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:29
-msgid "day of the month"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:30
-msgid "every day of the week"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:31
-msgid "day of the week"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:32
-msgid "every hour"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:33
-msgid "every minute UTC"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:35
-msgid "year"
-msgstr "年"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:36
-msgid "month"
-msgstr "月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:37
-msgid "week"
-msgstr "週"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:38
-msgid "day"
-msgstr "日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:39
-msgid "hour"
-msgstr "時間"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:40
-msgid "minute"
-msgstr "分"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:41
-msgid "reboot"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:42
-msgid "Every"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:43
-msgid "in"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:44
-#: superset-frontend/src/common/components/CronPicker.tsx:45
-msgid "on"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:46
-msgid "and"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:47
-#: superset-frontend/src/common/components/CronPicker.tsx:49
-msgid "at"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:48
-msgid ":"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:50
-msgid "minute(s) UTC"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:51
-msgid "Invalid cron expression"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:52
-msgid "Clear"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:55
-msgid "Sunday"
-msgstr "日曜日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:56
-msgid "Monday"
-msgstr "月曜日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:57
-msgid "Tuesday"
-msgstr "火曜日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:58
-msgid "Wednesday"
-msgstr "水曜日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:59
-msgid "Thursday"
-msgstr "木曜日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:60
-msgid "Friday"
-msgstr "金曜日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:61
-msgid "Saturday"
-msgstr "土曜日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:65
-msgid "January"
-msgstr "1月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:66
-msgid "February"
-msgstr "2月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:67
-msgid "March"
-msgstr "3月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:68
-msgid "April"
-msgstr "4月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:69
-msgid "May"
-msgstr "5月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:70
-msgid "June"
-msgstr "6月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:71
-msgid "July"
-msgstr "7月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:72
-msgid "August"
-msgstr "8月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:73
-msgid "September"
-msgstr "9月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:74
-msgid "October"
-msgstr "10月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:75
-msgid "November"
-msgstr "11月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:76
-msgid "December"
-msgstr "12月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:80
-msgid "SUN"
-msgstr "日"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:81
-msgid "MON"
-msgstr "月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:82
-msgid "TUE"
-msgstr "火"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:83
-msgid "WED"
-msgstr "水"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:84
-msgid "THU"
-msgstr "木"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:85
-msgid "FRI"
-msgstr "金"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:86
-msgid "SAT"
-msgstr "土"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:90
-msgid "JAN"
-msgstr "1月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:91
-msgid "FEB"
-msgstr "2月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:92
-msgid "MAR"
-msgstr "3月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:93
-msgid "APR"
-msgstr "4月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:94
-msgid "MAY"
-msgstr "5月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:95
-msgid "JUN"
-msgstr "6月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:96
-msgid "JUL"
-msgstr "7月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:97
-msgid "AUG"
-msgstr "8月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:98
-msgid "SEP"
-msgstr "9月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:99
-msgid "OCT"
-msgstr "10月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:100
-msgid "NOV"
-msgstr "11月"
-
-#: superset-frontend/src/common/components/CronPicker.tsx:101
-msgid "DEC"
-msgstr "12月"
-
-#: superset-frontend/src/common/components/Modal/Modal.tsx:128
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:771
-msgid "OK"
-msgstr ""
-
-#: superset-frontend/src/components/AlteredSliceTag.jsx:177
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:177
 msgid "Click to see difference"
-msgstr ""
+msgstr "クリックして差分を確認"
 
-#: superset-frontend/src/components/AlteredSliceTag.jsx:182
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:182
 msgid "Altered"
-msgstr ""
+msgstr "変更"
 
-#: superset-frontend/src/components/AlteredSliceTag.jsx:199
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:199
 msgid "Chart changes"
-msgstr ""
+msgstr "チャートの変更点"
 
-#: superset-frontend/src/components/AnchorLink.jsx:88
+#: superset-frontend/src/components/AnchorLink/index.jsx:88
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:267
 msgid "Superset chart"
 msgstr ""
 
-#: superset-frontend/src/components/AnchorLink.jsx:89
+#: superset-frontend/src/components/AnchorLink/index.jsx:89
 msgid "Check out this chart in dashboard:"
 msgstr ""
 
-#: superset-frontend/src/components/AsyncSelect.jsx:41
-#: superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx:47
+#: superset-frontend/src/components/AsyncSelect/index.jsx:41
+#: superset-frontend/src/explore/components/controls/SelectAsyncControl/index.jsx:47
 msgid "Select ..."
 msgstr ""
 
-#: superset-frontend/src/components/CachedLabel.jsx:45
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:30
 msgid "Loaded data cached"
 msgstr ""
 
-#: superset-frontend/src/components/CachedLabel.jsx:49
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:34
 msgid "Loaded from cache"
 msgstr ""
 
-#: superset-frontend/src/components/CachedLabel.jsx:54
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:39
 msgid "Click to force-refresh"
 msgstr ""
 
-#: superset-frontend/src/components/CachedLabel.jsx:80
+#: superset-frontend/src/components/CachedLabel/index.tsx:51
 msgid "cached"
 msgstr ""
 
-#: superset-frontend/src/components/CertifiedIconWithTooltip.tsx:40
+#: superset-frontend/src/components/CertifiedIcon/index.tsx:42
 #, python-format
 msgid "Certified by %s"
 msgstr ""
 
-#: superset-frontend/src/components/CopyToClipboard.jsx:42
-#: superset-frontend/src/components/URLShortLinkButton.jsx:65
-#: superset-frontend/src/components/URLShortLinkModal.tsx:89
-#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:103
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:43
+#: superset-frontend/src/components/URLShortLinkButton/index.jsx:65
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:106
 msgid "Copy to clipboard"
 msgstr ""
 
-#: superset-frontend/src/components/CopyToClipboard.jsx:89
-msgid "Copied!"
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:75
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:53
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:104
+msgid "Copied to clipboard!"
 msgstr ""
 
-#: superset-frontend/src/components/CopyToClipboard.jsx:93
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:79
 msgid "Sorry, your browser does not support copying. Use Ctrl / Cmd + C!"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:126
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:27
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:35
+msgid "every"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:28
+msgid "every month"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:29
+msgid "every day of the month"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:30
+msgid "day of the month"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:31
+msgid "every day of the week"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:32
+msgid "day of the week"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:33
+msgid "every hour"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:34
+msgid "every minute UTC"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:36
+msgid "year"
+msgstr "年"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:37
+msgid "month"
+msgstr "月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:38
+msgid "week"
+msgstr "週"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:39
+msgid "day"
+msgstr "日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:40
+msgid "hour"
+msgstr "時間"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:41
+msgid "minute"
+msgstr "分"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:42
+msgid "reboot"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:43
+msgid "Every"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:44
+msgid "in"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:45
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:46
+msgid "on"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:47
+msgid "and"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:48
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:50
+msgid "at"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:49
+msgid ":"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:51
+msgid "minute(s) UTC"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:52
+msgid "Invalid cron expression"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:53
+msgid "Clear"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:56
+msgid "Sunday"
+msgstr "日曜日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:57
+msgid "Monday"
+msgstr "月曜日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:58
+msgid "Tuesday"
+msgstr "火曜日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:59
+msgid "Wednesday"
+msgstr "水曜日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:60
+msgid "Thursday"
+msgstr "木曜日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:61
+msgid "Friday"
+msgstr "金曜日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:62
+msgid "Saturday"
+msgstr "土曜日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:66
+msgid "January"
+msgstr "1月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:67
+msgid "February"
+msgstr "2月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:68
+msgid "March"
+msgstr "3月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:69
+msgid "April"
+msgstr "4月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:70
+msgid "May"
+msgstr "5月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:71
+msgid "June"
+msgstr "6月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:72
+msgid "July"
+msgstr "7月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:73
+msgid "August"
+msgstr "8月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:74
+msgid "September"
+msgstr "9月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:75
+msgid "October"
+msgstr "10月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:76
+msgid "November"
+msgstr "11月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:77
+msgid "December"
+msgstr "12月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:81
+msgid "SUN"
+msgstr "日"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:82
+msgid "MON"
+msgstr "月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:83
+msgid "TUE"
+msgstr "火"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:84
+msgid "WED"
+msgstr "水"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:85
+msgid "THU"
+msgstr "木"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:86
+msgid "FRI"
+msgstr "金"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:87
+msgid "SAT"
+msgstr "土"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:91
+msgid "JAN"
+msgstr "1月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:92
+msgid "FEB"
+msgstr "2月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:93
+msgid "MAR"
+msgstr "3月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:94
+msgid "APR"
+msgstr "4月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:95
+msgid "MAY"
+msgstr "5月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:96
+msgid "JUN"
+msgstr "6月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:97
+msgid "JUL"
+msgstr "7月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:98
+msgid "AUG"
+msgstr "8月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:99
+msgid "SEP"
+msgstr "9月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:100
+msgid "OCT"
+msgstr "10月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:101
+msgid "NOV"
+msgstr "11月"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:102
+msgid "DEC"
+msgstr "12月"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:131
 msgid "Error while fetching schema list"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:227
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:232
 msgid "Error while fetching database list"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:234
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:239
 msgid "Database:"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:240
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:245
 msgid "Select a database"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:253
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:258
 msgid "Force refresh schema list"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:260
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:265
 #, python-format
 msgid "Select a schema (%s)"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:265
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:270
 msgid "Schema:"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:279
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:284
 msgid "datasource"
 msgstr "データソース"
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:281
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:286
 msgid "schema"
 msgstr "スキーマ"
 
-#: superset-frontend/src/components/DeleteModal.tsx:61
+#: superset-frontend/src/components/DeleteModal/index.tsx:61
 msgid "delete"
 msgstr "削除"
 
-#: superset-frontend/src/components/DeleteModal.tsx:69
+#: superset-frontend/src/components/DeleteModal/index.tsx:69
 #: superset-frontend/src/components/ImportModal/index.tsx:239
 #, python-format
 msgid "Type \"%s\" to confirm"
 msgstr ""
 
-#: superset-frontend/src/components/DeleteModal.tsx:81
+#: superset-frontend/src/components/DeleteModal/index.tsx:81
 msgid "DELETE"
-msgstr ""
+msgstr "削除"
 
-#: superset-frontend/src/components/EditableTitle.tsx:181
+#: superset-frontend/src/components/EditableTitle/index.tsx:195
 msgid "Click to edit"
 msgstr ""
 
-#: superset-frontend/src/components/EditableTitle.tsx:183
+#: superset-frontend/src/components/EditableTitle/index.tsx:197
 msgid "You don't have the rights to alter this title."
 msgstr ""
 
-#: superset-frontend/src/components/ErrorBoundary.jsx:51
+#: superset-frontend/src/components/ErrorBoundary/index.jsx:51
 #: superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx:26
 msgid "Unexpected error"
 msgstr ""
 
-#: superset-frontend/src/components/FaveStar.tsx:70
-msgid "Click to favorite/unfavorite"
-msgstr ""
-
-#: superset-frontend/src/components/OmniContainer.jsx:44
-msgid "An error occurred while fetching dashboards"
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:170
-msgid "Error while fetching table list"
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:312
-#: superset-frontend/src/components/TableSelector.tsx:329
-msgid "Select table or type table name"
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:343
-msgid "Type to search ..."
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:345
-msgid "Select table "
-msgstr "データソースを選択"
-
-#: superset-frontend/src/components/TableSelector.tsx:365
-msgid "Force refresh table list"
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:375
-msgid "See table schema"
-msgstr ""
-
-#: superset-frontend/src/components/URLShortLinkButton.jsx:59
-#: superset-frontend/src/components/URLShortLinkModal.tsx:77
-#, python-format
-msgid "%s%s"
-msgstr ""
-
-#: superset-frontend/src/components/URLShortLinkModal.tsx:83
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:249
-msgid "Share dashboard"
-msgstr "ダッシュボードを共有"
-
 #: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:46
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:63
 msgid "This may be triggered by:"
 msgstr ""
 
-#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:56
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:58
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:73
 msgid "Please reach out to the Chart Owner for assistance."
 msgstr ""
 
-#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:67
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:69
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:84
 #, python-format
 msgid "Chart Owner: %s"
 msgstr ""
 
-#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:81
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:83
 #, python-format
 msgid "%s Error"
 msgstr ""
@@ -4387,10 +4786,10 @@ msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:189
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:535
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:197
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:435
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:209
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:454
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:60
 msgid "This was triggered by:"
@@ -4398,7 +4797,7 @@ msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:76
 msgid "Did you mean:"
-msgstr ""
+msgstr "もしかして:"
 
 #: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:87
 #, python-format
@@ -4412,22 +4811,26 @@ msgstr "パラメータエラー"
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:47
 #, python-format
 msgid ""
-"We’re having trouble loading this visualization. Queries are set to timeout "
-"after %s second."
+"We’re having trouble loading this visualization. Queries are set to "
+"timeout after %s second."
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:53
 #, python-format
 msgid ""
-"We’re having trouble loading these results. Queries are set to timeout after "
-"%s second."
+"We’re having trouble loading these results. Queries are set to timeout "
+"after %s second."
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:98
 msgid "Timeout error"
 msgstr "タイムアウトエラー"
 
-#: superset-frontend/src/components/FilterableTable/FilterableTable.tsx:317
+#: superset-frontend/src/components/FaveStar/index.tsx:77
+msgid "Click to favorite/unfavorite"
+msgstr "クリックしてお気に入りに追加/解除"
+
+#: superset-frontend/src/components/FilterableTable/FilterableTable.tsx:316
 msgid "Cell content"
 msgstr ""
 
@@ -4445,25 +4848,33 @@ msgstr "上書き"
 
 #: superset-frontend/src/components/ImportModal/index.tsx:266
 msgid "Import"
-msgstr ""
+msgstr "インポート"
 
 #: superset-frontend/src/components/ImportModal/index.tsx:270
 #, python-format
 msgid "Import %s"
-msgstr ""
+msgstr "インポート %s"
 
 #: superset-frontend/src/components/LastUpdated/index.tsx:74
 #, python-format
 msgid "Last Updated %s"
+msgstr "最終更新 %s"
+
+#: superset-frontend/src/components/ListView/CardSortSelect.tsx:103
+msgid "Sort:"
 msgstr ""
 
-#: superset-frontend/src/components/ListView/ListView.tsx:246
+#: superset-frontend/src/components/ListView/ListView.tsx:239
 #, python-format
 msgid "%s Selected"
 msgstr ""
 
-#: superset-frontend/src/components/ListView/ListView.tsx:348
+#: superset-frontend/src/components/ListView/ListView.tsx:344
 msgid "Deselect all"
+msgstr "すべての選択を解除"
+
+#: superset-frontend/src/components/ListView/ListView.tsx:393
+msgid "No Data"
 msgstr ""
 
 #: superset-frontend/src/components/ListView/ListView.tsx:414
@@ -4472,25 +4883,61 @@ msgstr ""
 msgid "%s-%s of %s"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:180
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:134
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1050
+#: superset-frontend/src/components/Menu/Menu.tsx:196
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:155
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1087
 msgid "Settings"
 msgstr "設定"
 
-#: superset-frontend/src/components/Menu/Menu.tsx:228
+#: superset-frontend/src/components/Menu/Menu.tsx:244
 msgid "About"
-msgstr "概要"
+msgstr ""
 
 #: superset-frontend/src/components/Menu/NewMenu.tsx:26
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:114
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:111
 msgid "SQL query"
 msgstr "SQLクエリ"
 
+#: superset-frontend/src/components/Modal/Modal.tsx:129
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:772
+msgid "OK"
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:172
+msgid "Error while fetching table list"
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:320
+#: superset-frontend/src/components/TableSelector/index.tsx:337
+msgid "Select table or type table name"
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:351
+msgid "Type to search ..."
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:353
+msgid "Select table "
+msgstr "テーブルを選択 "
+
+#: superset-frontend/src/components/TableSelector/index.tsx:373
+msgid "Force refresh table list"
+msgstr "テーブルリストを強制更新"
+
+#: superset-frontend/src/components/TableSelector/index.tsx:383
+msgid "See table schema"
+msgstr "テーブルスキーマを参照"
+
+#: superset-frontend/src/components/URLShortLinkButton/index.jsx:59
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:114
+#, python-format
+msgid "%s%s"
+msgstr ""
+
 #: superset-frontend/src/dashboard/actions/dashboardLayout.js:180
 msgid ""
-"There is not enough space for this component. Try decreasing its width, or "
-"increasing the destination width."
+"There is not enough space for this component. Try decreasing its width, "
+"or increasing the destination width."
 msgstr "このコンポーネント用の十分なスペースがありません。幅を狭くするか、移動先の幅を大きくしてみてください。"
 
 #: superset-frontend/src/dashboard/actions/dashboardLayout.js:211
@@ -4501,34 +4948,34 @@ msgstr "トップレベルのタブをネストされたタブに移動できま
 msgid "This chart has been moved to a different filter scope."
 msgstr "このチャートは別のフィルタスコープに移動されました。"
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:78
+#: superset-frontend/src/dashboard/actions/dashboardState.js:80
 msgid "There was an issue fetching the favorite status of this dashboard."
 msgstr "このダッシュボードのお気に入りのステータスを取得する際に問題が発生しました。"
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:99
+#: superset-frontend/src/dashboard/actions/dashboardState.js:101
 msgid "There was an issue favoriting this dashboard."
 msgstr "このダッシュボードのお気に入りする際に問題が発生しました。"
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:121
+#: superset-frontend/src/dashboard/actions/dashboardState.js:123
 msgid "This dashboard is now ${nowPublished}"
 msgstr "このダッシュボードは現在 ${nowPublished}"
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:127
+#: superset-frontend/src/dashboard/actions/dashboardState.js:129
 msgid "You do not have permissions to edit this dashboard."
-msgstr "このダッシュボードを編集する権限がありません"
+msgstr "このダッシュボードを編集する権限がありません。"
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:203
+#: superset-frontend/src/dashboard/actions/dashboardState.js:227
 msgid "This dashboard was saved successfully."
-msgstr "このダッシュボードは正常に保存されました"
+msgstr "このダッシュボードは正常に保存されました。"
 
-#: superset-frontend/src/dashboard/actions/sliceEntities.js:113
-#: superset-frontend/src/dashboard/reducers/sliceEntities.js:59
+#: superset-frontend/src/dashboard/actions/sliceEntities.js:111
+#: superset-frontend/src/dashboard/reducers/sliceEntities.js:65
 msgid "Could not fetch all saved charts"
-msgstr "保存されたすべてのチャートを取得できませんでした"
+msgstr "保存したすべてのチャートを取得できませんでした"
 
-#: superset-frontend/src/dashboard/actions/sliceEntities.js:118
+#: superset-frontend/src/dashboard/actions/sliceEntities.js:116
 msgid "Sorry there was an error fetching saved charts: "
-msgstr "保存したグラフの取得中にエラーが発生しました。:"
+msgstr "保存したグラフの取得中にエラーが発生しました: "
 
 #: superset-frontend/src/dashboard/components/AddSliceCard.jsx:69
 msgid "Visualization"
@@ -4553,195 +5000,28 @@ msgid ""
 msgstr "ここで選択したカラーパレットは、このダッシュボードの個々のグラフに適用される色を上書きします"
 
 #: superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx:56
-#: superset-frontend/src/explore/controlPanels/sections.jsx:78
+#: superset-frontend/src/explore/controlPanels/sections.tsx:79
 #: superset-frontend/src/explore/controls.jsx:482
 msgid "Color scheme"
 msgstr "配色"
 
-#: superset-frontend/src/dashboard/components/CssEditor.jsx:67
-msgid "Load a template"
-msgstr "テンプレートの読み込み"
-
-#: superset-frontend/src/dashboard/components/CssEditor.jsx:70
-msgid "Load a CSS template"
-msgstr "CSSテンプレートの読み込み"
-
-#: superset-frontend/src/dashboard/components/CssEditor.jsx:88
-msgid "Live CSS editor"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/Dashboard.jsx:84
+#: superset-frontend/src/dashboard/components/Dashboard.jsx:86
 msgid "You have unsaved changes."
-msgstr "未保存の変更があります."
-
-#: superset-frontend/src/dashboard/components/Header.jsx:250
-#, python-format
-msgid ""
-"This dashboard is currently force refreshing; the next force refresh will be "
-"in %s."
-msgstr "このダッシュボードは現在強制的に更新されています。次の強制更新は %s。"
-
-#: superset-frontend/src/dashboard/components/Header.jsx:330
-msgid "Your dashboard is too large. Please reduce the size before save it."
-msgstr "ダッシュボードが大きすぎます。保存する前にサイズを小さくしてください"
-
-#: superset-frontend/src/dashboard/components/Header.jsx:459
-msgid "Discard changes"
-msgstr "変更を破棄"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:123
-msgid "An error occurred while fetching available CSS templates"
-msgstr "利用可能なCSSテンプレートの取得中にエラーが発生しました"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:204
-msgid "Superset dashboard"
-msgstr "Supersetダッシュボード"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:206
-msgid "Check out this dashboard: "
-msgstr "このダッシュボードを確認してください: "
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:257
-msgid "Refresh dashboard"
-msgstr "ダッシュボードを更新"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:267
-msgid "Set auto-refresh interval"
-msgstr "自動更新間隔を設定"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:275
-msgid "Set filter mapping"
-msgstr "フィルタマッピングを設定"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:282
-msgid "Edit dashboard properties"
-msgstr "ダッシュボードのプロパティを編集"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:289
-msgid "Edit CSS"
-msgstr "CSSを編集"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:299
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:251
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:197
-msgid "Download as image"
-msgstr "画像としてダウンロード"
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:305
-msgid "Toggle fullscreen"
-msgstr "フルスクリーン切り替え"
+msgstr "未保存の変更があります。"
 
 #: superset-frontend/src/dashboard/components/MissingChart.jsx:31
 msgid ""
-"There is no chart definition associated with this component, could it have "
-"been deleted?"
-msgstr "このコンポーネントに関連付けられているチャート定義はありません。削除された可能性がありますか？"
+"There is no chart definition associated with this component, could it "
+"have been deleted?"
+msgstr "このコンポーネントに関連付けられているチャート定義はありません。削除されたのでしょうか？"
 
 #: superset-frontend/src/dashboard/components/MissingChart.jsx:36
 msgid "Delete this container and save to remove this message."
 msgstr "このコンテナを削除し、保存してこのメ​​ッセージを削除します。"
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:69
-#: superset-frontend/src/dashboard/components/nativeFilters/ColumnSelect.tsx:82
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:105
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:453
-#: superset-frontend/src/datasource/DatasourceModal.tsx:123
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:66
-msgid "An error has occurred"
-msgstr "エラーが発生しました"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:77
-#: superset-frontend/src/dashboard/components/nativeFilters/ColumnSelect.tsx:84
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:107
-msgid "You do not have permission to edit this dashboard"
-msgstr "このダッシュボードを編集する権限がありません"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:144
-msgid "A valid color scheme is required"
-msgstr "有効な配色が必要です"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:271
-msgid "The dashboard has been saved"
-msgstr "ダッシュボードが保存されました"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:289
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:463
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:762
-#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:437
-msgid "Apply"
-msgstr "適用"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:295
-msgid "Dashboard properties"
-msgstr "ダッシュボードのプロパティ"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:324
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:197
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:270
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:224
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:242
-msgid "Basic information"
-msgstr "基本情報"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:341
-msgid "URL slug"
-msgstr "URLスラッグ"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:351
-msgid "A readable URL for your dashboard"
-msgstr "ダッシュボードの読み取り可能なURL"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:357
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:258
-msgid "Access"
-msgstr "アクセス"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:371
-msgid ""
-"Owners is a list of users who can alter the dashboard. Searchable by name or "
-"username."
-msgstr "所有者は、ダッシュボードを変更できるユーザーのリストです。名前またはユーザー名で検索可能"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:377
-msgid "Colors"
-msgstr "色"
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:394
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:596
-msgid "Advanced"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:400
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:319
-msgid "JSON metadata"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:33
-msgid ""
-"This dashboard is not published, it will not show up in the list of "
-"dashboards. Click here to publish this dashboard."
-msgstr "このダッシュボードは公開されていないため、ダッシュボードのリストには表示されません。このダッシュボードを公開するには、ここをクリックしてください。"
-
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:38
-msgid ""
-"This dashboard is not published which means it will not show up in the list "
-"of dashboards. Favorite it to see it there or access it by using the URL "
-"directly."
-msgstr "このダッシュボードは公開されていないため、ダッシュボードのリストには表示されません。お気に入りに追加して表示するか、URLを直接使用してアクセスします"
-
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:43
-msgid "This dashboard is published. Click to make it a draft."
-msgstr "このダッシュボードは公開されています。クリックして下書きにします"
-
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:72
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:83
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:229
-msgid "Draft"
-msgstr "下書き"
-
 #: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:29
 msgid "Don't refresh"
-msgstr "更新しないでください"
+msgstr "更新しない"
 
 #: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:30
 msgid "10 seconds"
@@ -4787,36 +5067,36 @@ msgstr "更新間隔"
 msgid "Refresh frequency"
 msgstr "更新頻度"
 
-#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:130
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:133
 msgid "Are you sure you want to proceed?"
 msgstr "続行してもよろしいですか？"
 
-#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:139
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:148
 msgid "Save for this session"
 msgstr "このセッションのために保存"
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:159
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:161
 msgid "You must pick a name for the new dashboard"
 msgstr "新しいダッシュボードの名前を選択する必要があります"
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:181
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:183
 msgid "Save dashboard"
 msgstr "ダッシュボードを保存"
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:190
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:192
 #, python-format
 msgid "Overwrite Dashboard [%s]"
 msgstr "ダッシュボード [%s] を上書き"
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:198
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:200
 msgid "Save as:"
 msgstr "別名で保存:"
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:202
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:204
 msgid "[dashboard name]"
-msgstr ""
+msgstr "[ダッシュボード名]"
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:212
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:214
 msgid "also copy (duplicate) charts"
 msgstr "チャートも複製する"
 
@@ -4824,75 +5104,286 @@ msgstr "チャートも複製する"
 msgid "Filter your charts"
 msgstr "チャートを検索"
 
-#: superset-frontend/src/dashboard/components/SliceHeader.jsx:75
-msgid "Annotation layers are still loading."
-msgstr "注釈レイヤーはまだ読み込み中です"
-
-#: superset-frontend/src/dashboard/components/SliceHeader.jsx:76
-msgid "One ore more annotation layers failed loading."
-msgstr "1つ以上の注釈レイヤーの読み込みに失敗しました"
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:185
-#, python-format
-msgid "Cached %s"
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:65
+msgid "Cross Filter Scoping"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:188
-#, python-format
-msgid "Fetched %s"
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:66
+msgid "Load a template"
+msgstr "テンプレートの読み込み"
+
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:69
+msgid "Load a CSS template"
+msgstr "CSSテンプレートの読み込み"
+
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:87
+msgid "Live CSS editor"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:202
-msgid "Minimize chart"
-msgstr "チャートを最小化"
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:164
+#, python-format
+msgid "Applied Cross Filters (%d)"
+msgstr "適用したクロス フィルター (%d)"
 
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:202
-msgid "Maximize chart"
-msgstr "チャートを最大化"
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:215
-msgid "Force refresh"
-msgstr "強制更新"
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:225
-msgid "Toggle chart description"
-msgstr "チャートの説明を切り替え"
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:231
-msgid "View chart in Explore"
-msgstr "チャートを表示"
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:243
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:244
-msgid "Share chart"
-msgstr "チャートを共有"
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:255
-msgid "Export CSV"
-msgstr "CSVで出力"
-
-#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel.tsx:169
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:188
 #, python-format
 msgid "Applied Filters (%d)"
-msgstr "適用されたフィルタ (%d)"
+msgstr "適用したフィルタ (%d)"
 
-#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel.tsx:190
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:209
 #, python-format
 msgid "Incompatible Filters (%d)"
 msgstr "互換性のないフィルタ (%d)"
 
-#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel.tsx:214
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:233
 #, python-format
 msgid "Unset Filters (%d)"
 msgstr "フィルタ (%d) の設定を解除"
 
+#: superset-frontend/src/dashboard/components/Header/index.jsx:248
+#, python-format
+msgid ""
+"This dashboard is currently force refreshing; the next force refresh will"
+" be in %s."
+msgstr "このダッシュボードは現在強制的に更新されています。次の強制更新は %s。"
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:328
+msgid "Your dashboard is too large. Please reduce the size before save it."
+msgstr "ダッシュボードが大きすぎます。保存する前にサイズを小さくしてください。"
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:459
+msgid "Discard changes"
+msgstr "変更を破棄"
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:485
+msgid "Edit dashboard"
+msgstr "ダッシュボードを編集"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:125
+msgid "An error occurred while fetching available CSS templates"
+msgstr "利用可能なCSSテンプレートの取得中にエラーが発生しました"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:206
+msgid "Superset dashboard"
+msgstr "Supersetダッシュボード"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:208
+msgid "Check out this dashboard: "
+msgstr "このダッシュボードを確認してください: "
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:249
+msgid "Copy dashboard URL"
+msgstr "ダッシュボードURLをコピー"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:250
+msgid "Share dashboard by email"
+msgstr "ダッシュボードをメールで共有"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:262
+msgid "Refresh dashboard"
+msgstr "ダッシュボードを更新"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:272
+msgid "Set auto-refresh interval"
+msgstr "自動更新間隔を設定"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:280
+msgid "Set filter mapping"
+msgstr "フィルタマッピングを設定"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:287
+msgid "Edit dashboard properties"
+msgstr "ダッシュボードのプロパティを編集"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:294
+msgid "Edit CSS"
+msgstr "CSSを編集"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:304
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:276
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:184
+msgid "Download as image"
+msgstr "画像としてダウンロード"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:310
+msgid "Toggle fullscreen"
+msgstr "フルスクリーン切り替え"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:72
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx:88
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:135
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:472
+#: superset-frontend/src/datasource/DatasourceModal.tsx:129
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:61
+msgid "An error has occurred"
+msgstr "エラーが発生しました"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:80
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx:90
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:137
+msgid "You do not have permission to edit this dashboard"
+msgstr "このダッシュボードを編集する権限がありません"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:150
+msgid "A valid color scheme is required"
+msgstr "有効な配色が必要です"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:309
+msgid "The dashboard has been saved"
+msgstr "ダッシュボードが保存されました"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:329
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:365
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:253
+msgid "Access"
+msgstr "アクセス"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:343
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:383
+msgid ""
+"Owners is a list of users who can alter the dashboard. Searchable by name"
+" or username."
+msgstr "所有者は、ダッシュボードを変更できるユーザーのリストです。名前またはユーザー名で検索できます。"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:349
+msgid "Colors"
+msgstr "色"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:402
+msgid ""
+"Roles is a list which defines access to the dashboard. Granting a role "
+"access to a dashboard will bypass dataset level checks. If no roles "
+"defined then the dashboard is available to all roles."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:424
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:136
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:763
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:432
+msgid "Apply"
+msgstr "適用"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:430
+msgid "Dashboard properties"
+msgstr "ダッシュボードのプロパティ"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:459
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:192
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:294
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:248
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:242
+msgid "Basic information"
+msgstr "基本情報"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:476
+msgid "URL slug"
+msgstr "URLスラッグ"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:486
+msgid "A readable URL for your dashboard"
+msgstr "ダッシュボード用の読みやすいURL"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:503
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:615
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:322
+msgid "Advanced"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:509
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:342
+msgid "JSON metadata"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:33
+msgid ""
+"This dashboard is not published, it will not show up in the list of "
+"dashboards. Click here to publish this dashboard."
+msgstr "このダッシュボードは公開されていないため、ダッシュボードのリストには表示されません。このダッシュボードを公開するには、ここをクリックしてください。"
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:38
+msgid ""
+"This dashboard is not published which means it will not show up in the "
+"list of dashboards. Favorite it to see it there or access it by using the"
+" URL directly."
+msgstr "このダッシュボードは公開されていないため、ダッシュボードのリストには表示されません。お気に入りに追加して表示するか、URLを直接使用してアクセスします。"
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:43
+msgid "This dashboard is published. Click to make it a draft."
+msgstr "このダッシュボードは公開されています。クリックして下書きにします。"
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:72
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:83
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:237
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:413
+msgid "Draft"
+msgstr "下書き"
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:61
+msgid "Annotation layers are still loading."
+msgstr "注釈レイヤーはまだ読み込み中です。"
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:62
+msgid "One ore more annotation layers failed loading."
+msgstr "1つ以上の注釈レイヤーの読み込みに失敗しました。"
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:156
+msgid "Emitted values"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:208
+#, python-format
+msgid "Cached %s"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:211
+#, python-format
+msgid "Fetched %s"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:225
+msgid "Minimize chart"
+msgstr "チャートを最小化"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:225
+msgid "Maximize chart"
+msgstr "チャートを最大化"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:238
+msgid "Force refresh"
+msgstr "強制更新"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:248
+msgid "Toggle chart description"
+msgstr "チャートの説明を切り替え"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:254
+msgid "View chart in Explore"
+msgstr "チャートを表示"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:265
+msgid "Copy chart URL"
+msgstr "チャートのURLをコピー"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:266
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:170
+msgid "Share chart by email"
+msgstr "チャートをメールで共有"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:280
+msgid "Export CSV"
+msgstr "CSVで出力"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:285
+msgid "Cross-filter scoping"
+msgstr ""
+
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:464
 msgid "Search..."
-msgstr "検索"
+msgstr "検索…"
 
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:495
 msgid "No filter is selected."
-msgstr "フィルタは選択されていません"
+msgstr "フィルタは選択されていません。"
 
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:496
 msgid "Editing 1 filter:"
@@ -4901,7 +5392,7 @@ msgstr "1つのフィルタを編集する:"
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:498
 #, python-format
 msgid "Batch editing %d filters:"
-msgstr " ％d フィルタのバッチ編集:"
+msgstr " %d フィルタのバッチ編集:"
 
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:512
 msgid "Configure filter scopes"
@@ -4909,7 +5400,7 @@ msgstr "フィルタスコープを構成する"
 
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:519
 msgid "There are no filters in this dashboard."
-msgstr "このダッシュボードにはフィルターはありません"
+msgstr "このダッシュボードにはフィルターはありません。"
 
 #: superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx:36
 msgid "Expand all"
@@ -4919,16 +5410,15 @@ msgstr "すべて展開"
 msgid "Collapse all"
 msgstr "すべて折りたたむ"
 
-#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:81
+#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:78
 msgid "This markdown component has an error."
-msgstr "このマークダウンコンポーネントにエラーがあります"
+msgstr "このマークダウンコンポーネントにエラーがあります。"
 
-#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:181
-msgid ""
-"This markdown component has an error. Please revert your recent changes."
+#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:170
+msgid "This markdown component has an error. Please revert your recent changes."
 msgstr "このマークダウンコンポーネントにエラーがあります。最近の変更を元に戻してください。"
 
-#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:153
+#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:171
 msgid "Delete dashboard tab?"
 msgstr "ダッシュボードタブを削除しますか？"
 
@@ -4948,126 +5438,210 @@ msgstr "行"
 msgid "Tabs"
 msgstr "タブ"
 
-#: superset-frontend/src/dashboard/components/gridComponents/new/NewMarkdown.jsx:31
-msgid "Markdown"
-msgstr "マークダウン"
-
-#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.jsx:38
+#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx:39
 msgid "Preview"
 msgstr "プレビュー"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/CancelConfirmationAlert.tsx:92
-msgid "Yes, cancel"
-msgstr "はい、キャンセルします"
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:55
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:106
+#: superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx:68
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:220
+msgid "Sorry, your browser does not support copying."
+msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/CancelConfirmationAlert.tsx:100
-msgid "Keep editing"
-msgstr "編集を続ける"
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:65
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:117
+msgid "Sorry, something went wrong. Try again later."
+msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/CascadePopover.tsx:121
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:252
+msgid "All Filters (${filterValues.length})"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:271
+msgid "Filter Sets (${filterSetFilterValues.length})"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx:160
 msgid "Select parent filters"
 msgstr "親フィルタを選択する"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:455
-msgid "Reset all"
-msgstr "すべてリセット"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx:94
+msgid "Check configuration"
+msgstr "設定を確認"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:117
-msgid "You have removed this filter."
-msgstr "このフィルタを削除しました。"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx:134
+msgid "Cannot load filter"
+msgstr "フィルタを読み込めません"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:120
-msgid "Restore filter"
-msgstr "フィルタを復元"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:124
+msgid "Editing filter set:"
+msgstr "フィルタセットを編集:"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:138
-msgid "Filter name"
-msgstr "フィルタ名"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:148
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:83
+msgid "Filter set with this name already exists"
+msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:140
-msgid "Name is required"
-msgstr "名前が必要です"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:149
+msgid "Filter set already exists"
+msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:149
-msgid "Datasource is required"
-msgstr "データソースが必要です"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:170
+#, python-format
+msgid "This filter set is identical to: \"%s\""
+msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:168
-msgid "Field"
-msgstr "フィールド"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:77
+msgid "Remove invalid filters"
+msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:180
-msgid "Parent filter"
-msgstr "親フィルタ"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:78
+msgid "Rebuild"
+msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:186
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:87
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:75
+#, python-format
+msgid "Filters (%d)"
+msgstr "フィルター (%d)"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:90
+msgid "This filter doesn't exist in dashboard. It will not be applied."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:94
+msgid "Filter metadata changed in dashboard. It will not be applied."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:105
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:257
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:98
 msgid "None"
 msgstr "なし"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:198
-msgid "Apply changes instantly"
-msgstr "変更を即座に適用する"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:81
+msgid "Please filter set name"
+msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:206
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:215
-msgid "Allow multiple selections"
-msgstr "複数の選択を許可する"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:96
+msgid "Create"
+msgstr "作成"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:214
-msgid "Inverse selection"
-msgstr "逆選択"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:111
+msgid "Create new filter set"
+msgstr "新しいフィルタ セットの作成"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:222
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:251
-msgid "Required"
-msgstr "必須"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/index.tsx:76
+msgid "New filter set"
+msgstr "新しいフィルタ セット"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:464
-msgid "Are you sure you want to cancel?"
-msgstr "キャンセルしてもよろしいですか？"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:126
+msgid "Clear all"
+msgstr "すべてクリア"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:465
-msgid "will not be saved."
-msgstr "保存されません"
-
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:483
-msgid "Filter configuration and scoping"
-msgstr "フィルタの構成とスコープ"
-
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:516
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl.jsx:361
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:143
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx:361
 msgid "Add filter"
 msgstr "フィルタを追加"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:528
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:152
 msgid "(Removed)"
 msgstr "(削除)"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:537
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:161
 msgid "Undo?"
 msgstr "元に戻しますか？"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:68
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx:168
+msgid "New filter"
+msgstr "新しいフィルタ"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx:206
+msgid "Filters configuration and scoping"
+msgstr "フィルタの構成とスコープ"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:159
+msgid "Filter name"
+msgstr "フィルタ名"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:161
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:167
+msgid "Name is required"
+msgstr "名前が必要です"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:169
+msgid "Filter Type"
+msgstr "フィルタタイプ"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:193
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:467
+#: superset-frontend/src/explore/controls.jsx:195
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:247
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:451
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:489
+msgid "Dataset"
+msgstr "データセット"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:194
+msgid "Dataset is required"
+msgstr "データセットが必要です"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:250
+msgid "Parent filter"
+msgstr "親フィルタ"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:266
+msgid "Default Value"
+msgstr "デフォルト値"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:290
+msgid "Apply changes instantly"
+msgstr "変更を即座に適用する"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx:39
+msgid "You have removed this filter."
+msgstr "このフィルタを削除しました。"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx:46
+msgid "Restore Filter"
+msgstr "フィルタを復元"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:67
 msgid "Scoping"
 msgstr "スコープ"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:83
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:83
 msgid "Apply to all panels"
 msgstr "すべてのパネルに適用"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:85
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:85
 msgid "Apply to specific panels"
 msgstr "特定のパネルに適用"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:91
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:91
 msgid "Only selected panels will be affected by this filter"
 msgstr "選択したパネルのみがこのフィルターの影響を受けます"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:92
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:92
 msgid "All panels with this column will be affected by this filter"
 msgstr "この列のすべてのパネルは、このフィルターの影響を受けます"
 
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx:55
+msgid "Yes, cancel"
+msgstr "はい、キャンセルします"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx:63
+msgid "Keep editing"
+msgstr "編集を続ける"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:69
+msgid "Are you sure you want to cancel?"
+msgstr "キャンセルしてもよろしいですか？"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:70
+msgid "will not be saved."
+msgstr "保存されません。"
+
 #: superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js:44
 msgid "All filters"
 msgstr "すべてのフィルタ"
@@ -5076,76 +5650,83 @@ msgstr "すべてのフィルタ"
 msgid "All charts"
 msgstr "すべてのチャート"
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:38
-msgid ""
-"Warning! Changing the dataset may break the chart if the metadata does not "
-"exist."
+#: superset-frontend/src/dashboard/util/newComponentFactory.js:56
+#: superset-frontend/src/dashboard/util/newComponentFactory.js:57
+msgid "Tab title"
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:42
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:39
 msgid ""
-"Changing the dataset may break the chart if the chart relies on columns or "
-"metadata that does not exist in the target dataset"
+"Warning! Changing the dataset may break the chart if the metadata does "
+"not exist."
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:114
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:116
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:663
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:43
+msgid ""
+"Changing the dataset may break the chart if the chart relies on columns "
+"or metadata that does not exist in the target dataset"
+msgstr "データセットを変更すると、ターゲットのデータセットに存在しないカラムやメタデータに依存しているチャートが壊れることがあります"
+
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:115
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:64
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:125
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:682
 msgid "dataset"
-msgstr ""
+msgstr "データセット"
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:223
-#: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:162
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:224
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:173
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:252
 msgid "Change dataset"
-msgstr ""
+msgstr "データセットを変更"
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:250
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:254
 msgid "Warning!"
-msgstr ""
+msgstr "警告!"
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:260
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:266
 msgid "Search / Filter"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:91
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:110
 msgid "Physical (table or view)"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:92
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:111
 msgid "Virtual (SQL)"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:135
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:838
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:154
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:866
 msgid "SQL expression"
-msgstr ""
+msgstr "SQL 式"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:167
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:210
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:186
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:229
 msgid "Data type"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:175
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:194
 msgid "Datetime format"
-msgstr ""
+msgstr "日時フォーマット"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:179
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:198
 msgid "The pattern of timestamp format. For strings use "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:181
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:200
 msgid "Python datetime string pattern"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:183
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:202
 msgid " expression which needs to adhere to the "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:185
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:204
 msgid "ISO 8601"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:187
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:206
 msgid ""
 " standard to ensure that the lexicographical ordering\n"
 "                      coincides with the chronological ordering. If the\n"
@@ -5156,216 +5737,223 @@ msgid ""
 "Note\n"
 "                      currently time zones are not supported. If time is "
 "stored\n"
-"                      in epoch format, put `epoch_s` or `epoch_ms`. If no "
-"pattern\n"
+"                      in epoch format, put `epoch_s` or `epoch_ms`. If no"
+" pattern\n"
 "                      is specified we fall back to using the optional "
 "defaults on a per\n"
 "                      database/column name level via the extra parameter."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:211
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:230
 msgid "Is dimension"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:213
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:232
 msgid "Is filterable"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:434
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:453
 #, python-format
 msgid "Modified columns: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:439
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:458
 #, python-format
 msgid "Removed columns: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:444
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:463
 #, python-format
 msgid "New columns added: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:447
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:466
 msgid "Metadata has been synced"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:482
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:501
 #, python-format
 msgid "Column name [%s] is duplicated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:488
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:507
 #, python-format
 msgid "Metric name [%s] is duplicated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:497
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:516
 #, python-format
 msgid "Calculated column [%s] requires an expression"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:512
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:531
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:262
 msgid "Basic"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:525
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:544
 msgid "Default URL"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:526
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:545
 msgid "Default URL to redirect to when accessing from the dataset list page"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:533
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:552
 msgid "Autocomplete filters"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:534
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:553
 msgid "Whether to populate autocomplete filters options"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:540
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:559
 msgid "Autocomplete query predicate"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:541
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:560
 msgid ""
-"When using \"Autocomplete filters\", this can be used to improve performance "
-"of the query fetching the values. Use this option to apply a predicate "
-"(WHERE clause) to the query selecting the distinct values from the table. "
-"Typically the intent would be to limit the scan by applying a relative time "
-"filter on a partitioned or indexed time-related field."
+"When using \"Autocomplete filters\", this can be used to improve "
+"performance of the query fetching the values. Use this option to apply a "
+"predicate (WHERE clause) to the query selecting the distinct values from "
+"the table. Typically the intent would be to limit the scan by applying a "
+"relative time filter on a partitioned or indexed time-related field."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:555
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:574
 msgid ""
-"Extra data to specify table metadata. Currently supports certification data "
-"of the format: `{ \"certification\": { \"certified_by\": \"Data Platform Team"
-"\", \"details\": \"This table is the source of truth.\" } }`."
+"Extra data to specify table metadata. Currently supports metadata of the "
+"format: `{ \"certification\": { \"certified_by\": \"Data Platform Team\","
+" \"details\": \"This table is the source of truth.\" }, "
+"\"warning_markdown\": \"This is a warning.\" }`."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:573
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:592
 msgid "Owners of the dataset"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:602
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:238
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:621
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:233
 msgid "Cache timeout"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:603
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:622
 msgid "The duration of time in seconds before the cache is invalidated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:610
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:629
 msgid "Hours offset"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:632
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:631
+msgid ""
+"The number of hours, negative or positive, to shift the time column. This"
+" can be used to move UTC time to local time."
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:654
 msgid "Spatial"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:684
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:706
 msgid "virtual"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:705
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:712
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:727
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:734
 msgid "Dataset name"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:720
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:742
 msgid ""
-"When specifying SQL, the datasource acts as a view. Superset will use this "
-"statement as a subquery while grouping and filtering on the generated parent "
-"queries."
+"When specifying SQL, the datasource acts as a view. Superset will use "
+"this statement as a subquery while grouping and filtering on the "
+"generated parent queries."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:743
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:765
 msgid "The JSON metric or post aggregation definition."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:758
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:780
 msgid "Physical"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:788
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:810
 msgid ""
-"The pointer to a physical table (or view). Keep in mind that the chart is "
-"associated to this Superset logical table, and this logical table points the "
-"physical table referenced here."
+"The pointer to a physical table (or view). Keep in mind that the chart is"
+" associated to this Superset logical table, and this logical table points"
+" the physical table referenced here."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:807
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:829
 msgid "Click the lock to make changes."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:810
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:832
 msgid "Click the lock to prevent further changes."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:860
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:888
 msgid "D3 format"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:866
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:874
-msgid "Warning message"
-msgstr ""
-
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:868
-msgid "Warning message to display in the metric selector"
-msgstr ""
-
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:879
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:887
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:894
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:902
 msgid "Certified by"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:881
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:896
 msgid "Person or group that has certified this metric"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:892
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:898
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:907
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:913
 msgid "Certification details"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:894
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:909
 msgid "Details of the certification"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:963
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:918
+msgid "Warning"
+msgstr "警告"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:920
+msgid "Optional warning about use of this metric"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:999
 msgid "Be careful."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:964
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1000
 msgid ""
-"Changing these settings will affect all charts using this dataset, including "
-"charts owned by other people."
+"Changing these settings will affect all charts using this dataset, "
+"including charts owned by other people."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:976
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1121
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:267
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1013
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1058
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:278
 msgid "Source"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1009
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1046
 msgid "Sync columns from source"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1027
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1064
 msgid "Calculated columns"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:114
-#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:92
+#: superset-frontend/src/datasource/DatasourceModal.tsx:120
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:96
 msgid "The dataset has been saved"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:150
+#: superset-frontend/src/datasource/DatasourceModal.tsx:156
 msgid ""
 "The dataset configuration exposed here\n"
 "                affects all the charts using this dataset.\n"
@@ -5374,46 +5962,24 @@ msgid ""
 "                in undesirable ways."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:157
+#: superset-frontend/src/datasource/DatasourceModal.tsx:162
 msgid "Are you sure you want to save and apply changes?"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:163
+#: superset-frontend/src/datasource/DatasourceModal.tsx:168
 msgid "Confirm save"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:176
+#: superset-frontend/src/datasource/DatasourceModal.tsx:181
 msgid "Edit Dataset "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:193
+#: superset-frontend/src/datasource/DatasourceModal.tsx:198
 msgid "Use legacy datasource editor"
 msgstr ""
 
-#: superset-frontend/src/explore/constants.js:80
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:389
-msgid "Time range"
-msgstr "時間範囲"
-
-#: superset-frontend/src/explore/constants.js:81
-msgid "Time column"
-msgstr "時間列"
-
-#: superset-frontend/src/explore/constants.js:82
-msgid "Time grain"
-msgstr "時間単位"
-
-#: superset-frontend/src/explore/constants.js:83
-msgid "Origin"
-msgstr ""
-
-#: superset-frontend/src/explore/constants.js:84
-msgid "Time granularity"
-msgstr "時間粒度"
-
 #: superset-frontend/src/explore/controls.jsx:113
-msgid ""
-"A reference to the [Time] configuration, taking granularity into account"
+msgid "A reference to the [Time] configuration, taking granularity into account"
 msgstr ""
 
 #: superset-frontend/src/explore/controls.jsx:123
@@ -5428,18 +5994,10 @@ msgstr ""
 msgid "One or many metrics to display"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:419
-#: superset-frontend/src/explore/controls.jsx:195
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:233
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:436
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:478
-msgid "Dataset"
-msgstr "データセット"
-
 #: superset-frontend/src/explore/controls.jsx:206
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:220
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:234
 msgid "Visualization type"
-msgstr "可視化タイプ"
+msgstr "可視化方式"
 
 #: superset-frontend/src/explore/controls.jsx:208
 msgid "The type of visualization to display"
@@ -5485,110 +6043,115 @@ msgstr ""
 
 #: superset-frontend/src/explore/controls.jsx:293
 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`"
+"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 ""
 
 #: superset-frontend/src/explore/controls.jsx:303
 msgid ""
-"The time column for the visualization. Note that you can define arbitrary "
-"expression that return a DATETIME column in the table. Also note that the "
-"filter below is applied against this column or expression"
-msgstr ""
+"The time column for the visualization. Note that you can define arbitrary"
+" expression that return a DATETIME column in the table. Also note that "
+"the filter below is applied against this column or expression"
+msgstr "可視化のための時間カラム。テーブルのDATETIME列を返す任意の式を定義することができます。この列または式に対して以下のフィルターが適用されることに注意してください"
 
 #: superset-frontend/src/explore/controls.jsx:333
 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 Superset "
-"source code."
+"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 Superset source code."
 msgstr ""
 
 #: superset-frontend/src/explore/controls.jsx:349
 msgid "Last week"
-msgstr ""
+msgstr "先週"
 
 #: superset-frontend/src/explore/controls.jsx:350
 msgid ""
-"The time range for the visualization. All relative times, e.g. \"Last month"
-"\", \"Last 7 days\", \"now\", etc. are evaluated on the server using the "
-"server's local time (sans timezone). All tooltips and placeholder times are "
-"expressed in UTC (sans timezone). The timestamps are then evaluated by the "
-"database using the engine's local timezone. Note one can explicitly set the "
-"timezone per the ISO 8601 format if specifying either the start and/or end "
-"time."
+"The time range for the visualization. All relative times, e.g. \"Last "
+"month\", \"Last 7 days\", \"now\", etc. are evaluated on the server using"
+" the server's local time (sans timezone). All tooltips and placeholder "
+"times are expressed in UTC (sans timezone). The timestamps are then "
+"evaluated by the database using the engine's local timezone. Note one can"
+" explicitly set the timezone per the ISO 8601 format if specifying either"
+" the start and/or end time."
 msgstr ""
+"可視化の期間。すべての相対時間( e.g. “Last month”, “Last 7 days”, “now”, etc "
+")はサーバーのローカル時間(sans timezone)を使用して評価されます。すべてのツールヒントとプレースホルダー時間は UTC (sans "
+"timezone) "
+"で表されます。タイムスタンプは、エンジンのローカルタイムゾーンを使用してデータベースによって評価されます。開始時刻や終了時刻を指定する場合は "
+"ISO 8601 形式に従ってタイムゾーンを明示的に設定できます。"
 
-#: superset-frontend/src/explore/controls.jsx:366
+#: superset-frontend/src/explore/controls.jsx:367
 msgid "Row limit"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:375
+#: superset-frontend/src/explore/controls.jsx:376
 msgid "Series limit"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:378
+#: superset-frontend/src/explore/controls.jsx:379
 msgid ""
 "Limits the number of time series that get displayed. A sub query (or an "
 "extra phase where sub queries are not supported) is applied to limit the "
-"number of time series that get fetched and displayed. This feature is useful "
-"when grouping by high cardinality dimension(s)."
+"number of time series that get fetched and displayed. This feature is "
+"useful when grouping by high cardinality dimension(s)."
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:388
+#: superset-frontend/src/explore/controls.jsx:389
 msgid "Sort by"
 msgstr "並び替え"
 
-#: superset-frontend/src/explore/controls.jsx:391
+#: superset-frontend/src/explore/controls.jsx:392
 msgid "Metric used to define the top series"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:401
+#: superset-frontend/src/explore/controls.jsx:402
 msgid "Series"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:404
+#: superset-frontend/src/explore/controls.jsx:405
 msgid ""
-"Defines the grouping of entities. Each series is shown as a specific color "
-"on the chart and has a legend toggle"
+"Defines the grouping of entities. Each series is shown as a specific "
+"color on the chart and has a legend toggle"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:413
+#: superset-frontend/src/explore/controls.jsx:414
 msgid "Entity"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:417
+#: superset-frontend/src/explore/controls.jsx:418
 msgid "This defines the element to be plotted on the chart"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:422
+#: superset-frontend/src/explore/controls.jsx:423
 msgid "X Axis"
 msgstr "X軸"
 
-#: superset-frontend/src/explore/controls.jsx:423
+#: superset-frontend/src/explore/controls.jsx:424
 msgid "Metric assigned to the [X] axis"
-msgstr ""
+msgstr "[X] 軸に割り当てられた指標"
 
-#: superset-frontend/src/explore/controls.jsx:429
+#: superset-frontend/src/explore/controls.jsx:430
 msgid "Y Axis"
 msgstr "Y軸"
 
-#: superset-frontend/src/explore/controls.jsx:431
+#: superset-frontend/src/explore/controls.jsx:432
 msgid "Metric assigned to the [Y] axis"
-msgstr ""
+msgstr "[Y] 軸に割り当てられた指標"
 
-#: superset-frontend/src/explore/controls.jsx:436
+#: superset-frontend/src/explore/controls.jsx:437
 msgid "Bubble size"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:443
+#: superset-frontend/src/explore/controls.jsx:444
 msgid "Y Axis Format"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:455
+#: superset-frontend/src/explore/controls.jsx:456
 msgid ""
-"When `Calculation type` is set to \"Percentage change\", the Y Axis Format "
-"is forced to `.1%`"
+"When `Calculation type` is set to \"Percentage change\", the Y Axis "
+"Format is forced to `.1%`"
 msgstr ""
 
 #: superset-frontend/src/explore/controls.jsx:486
@@ -5600,8 +6163,8 @@ msgid "Color map"
 msgstr ""
 
 #: superset-frontend/src/explore/components/ControlHeader.jsx:56
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:310
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:239
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:333
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:263
 msgid "description"
 msgstr ""
 
@@ -5611,73 +6174,41 @@ msgstr ""
 
 #: superset-frontend/src/explore/components/ControlHeader.jsx:67
 msgid "Changing this control takes effect instantly"
-msgstr ""
+msgstr "この変更は即座に反映されます"
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:251
+#: superset-frontend/src/explore/components/ControlPanelsContainer.tsx:311
 msgid "Customize"
 msgstr "カスタマイズ"
 
-#: superset-frontend/src/explore/components/DataTableControl.tsx:93
-msgid "rows retrieved"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:131
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:98
-msgid "Sorry, An error occurred"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:217
-msgid "No data"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:261
-msgid "View samples"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:209
-msgid "Search Metrics & Columns"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:222
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:235
-#, python-format
-msgid "Showing %s of %s"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:118
-msgid "New chart"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:177
-msgid "Edit properties"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:183
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:185
-msgid "View query"
-msgstr "クエリを見る"
-
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:193
-msgid "Run in SQL Lab"
-msgstr "SQLラボで実行"
-
-#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:113
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:116
 msgid "Height"
 msgstr "高さ"
 
-#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:127
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:130
 msgid "Width"
 msgstr "幅"
 
-#: superset-frontend/src/explore/components/ExploreActionButtons.jsx:87
-msgid "Export to .json"
-msgstr "jsonで出力"
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:94
+msgid "Copy chart URL to clipboard"
+msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreActionButtons.jsx:100
-msgid "Export to .csv format"
-msgstr "csvで出力"
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:101
+msgid "Loading..."
+msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreChartHeader.jsx:102
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:112
+msgid "Superset Chart"
+msgstr ""
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:177
+msgid "Export to .JSON format"
+msgstr ""
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:183
+msgid "Export to .CSV format"
+msgstr ""
+
+#: superset-frontend/src/explore/components/ExploreChartHeader.jsx:101
 #, python-format
 msgid "%s - untitled"
 msgstr ""
@@ -5686,39 +6217,14 @@ msgstr ""
 msgid "Edit chart properties"
 msgstr "チャートのプロパティを編集"
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:345
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:378
 msgid "Control labeled "
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:449
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:497
 msgid "Open Datasource tab"
 msgstr "データソースタブを開く"
 
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:68
-msgid "You do not have permission to edit this chart"
-msgstr "このチャートを編集する権限がありません"
-
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:229
-msgid ""
-"The description can be displayed as widget headers in the dashboard view. "
-"Supports markdown."
-msgstr ""
-
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:236
-msgid "Configuration"
-msgstr ""
-
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:253
-msgid ""
-"Duration (in seconds) of the caching timeout for this chart. Note this "
-"defaults to the dataset's timeout if undefined."
-msgstr ""
-
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:273
-msgid ""
-"A list of users who can alter the chart. Searchable by name or username."
-msgstr ""
-
 #: superset-frontend/src/explore/components/RowCountLabel.jsx:35
 msgid "rows"
 msgstr "行"
@@ -5727,201 +6233,135 @@ msgstr "行"
 msgid "Limit reached"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:32
+#: superset-frontend/src/explore/components/SaveModal.tsx:34
 msgid "**Select** a dashboard OR **create** a new one"
-msgstr ""
+msgstr "ダッシュボードを **選択** または **新規作成**"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:129
+#: superset-frontend/src/explore/components/SaveModal.tsx:131
 msgid "Please enter a chart name"
 msgstr "チャート名を入力してください"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:170
+#: superset-frontend/src/explore/components/SaveModal.tsx:172
 msgid "Save chart"
 msgstr "チャートを保存"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:185
+#: superset-frontend/src/explore/components/SaveModal.tsx:191
 msgid "Save & go to dashboard"
 msgstr "保存してダッシュボードに移動"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:196
+#: superset-frontend/src/explore/components/SaveModal.tsx:202
 msgid "Save as new chart"
 msgstr "新しいチャートとして保存"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:225
+#: superset-frontend/src/explore/components/SaveModal.tsx:235
 msgid "Save (Overwrite)"
 msgstr "上書き保存"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:235
+#: superset-frontend/src/explore/components/SaveModal.tsx:244
 msgid "Save as ..."
 msgstr "別名で保存"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:240
+#: superset-frontend/src/explore/components/SaveModal.tsx:249
 msgid "Chart name"
 msgstr "チャート名"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:252
+#: superset-frontend/src/explore/components/SaveModal.tsx:261
 msgid "Add to dashboard"
 msgstr "新しいダッシュボードに追加"
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:601
-msgid "Display configuration"
+#: superset-frontend/src/explore/components/DataTableControl/index.tsx:97
+msgid "rows retrieved"
+msgstr "行を取得"
+
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:166
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:96
+msgid "Sorry, An error occurred"
+msgstr "エラーが発生しました"
+
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:256
+#: superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx:146
+#: superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx:64
+msgid "No data"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:602
-msgid "Configure your how you overlay is displayed here."
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:307
+msgid "View samples"
+msgstr "サンプルを表示"
+
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:196
+msgid "Search Metrics & Columns"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:606
-msgid "Style"
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:210
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:232
+#, python-format
+msgid "Showing %s of %s"
+msgstr "Showing %s of %s"
+
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:117
+msgid "New chart"
+msgstr "新しいチャート"
+
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:164
+msgid "Edit properties"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:620
-msgid "Opacity"
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:170
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:172
+msgid "View query"
+msgstr "クエリを見る"
+
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:180
+msgid "Run in SQL Lab"
+msgstr "SQL Labで実行"
+
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:63
+msgid "You do not have permission to edit this chart"
+msgstr "このチャートを編集する権限がありません"
+
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:224
+msgid ""
+"The description can be displayed as widget headers in the dashboard view."
+" Supports markdown."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:632
-msgid "Color"
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:231
+msgid "Configuration"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:651
-msgid "Line width"
-msgstr "線の幅"
-
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:701
-msgid "Layer configuration"
-msgstr "レイヤー構成"
-
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:702
-msgid "Configure the basics of your Annotation Layer."
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:248
+msgid ""
+"Duration (in seconds) of the caching timeout for this chart. Note this "
+"defaults to the dataset's timeout if undefined."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:710
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:737
-msgid "Mandatory"
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:268
+msgid "A list of users who can alter the chart. Searchable by name or username."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:714
-msgid "Hide layer"
-msgstr "レイヤーを隠す"
-
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:720
-msgid "Choose the annotation layer type"
-msgstr "注釈レイヤーのタイプを選んでください"
-
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:721
-msgid "Annotation layer type"
-msgstr "注釈レイヤーのタイプ"
-
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:753
-msgid "Remove"
-msgstr "削除"
-
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:166
-msgid "Edit annotation layer"
-msgstr "注釈レイヤーを編集"
-
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:191
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:203
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:219
-msgid "Add annotation layer"
-msgstr "注釈レイヤーを追加"
-
-#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:73
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:74
 msgid "`Min` value should be numeric or empty"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:76
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:77
 msgid "`Max` value should be numeric or empty"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:95
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:96
 msgid "Min"
 msgstr "最小値"
 
-#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:104
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:105
 msgid "Max"
 msgstr "最大値"
 
-#: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:159
-msgid "Edit dataset"
-msgstr "データセットを編集"
-
-#: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:163
-msgid "View in SQL Lab"
-msgstr "SQLラボで表示"
-
-#: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:190
-msgid "More dataset related options"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/DateFilterControl.jsx:80
-msgid ""
-"Superset supports smart date parsing. Strings like `3 weeks ago`, `last "
-"sunday`, or `2 weeks from now` can be used."
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:167
-msgid "Default"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:168
-msgid ""
-"(optional) default value for the filter, when using the multiple option, you "
-"can use a semicolon-delimited list of options."
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:184
-msgid "Sort metric"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:185
-msgid "Metric to sort the results by"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:204
-msgid "Sort ascending"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:205
-msgid "Check for sorting ascending"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:217
-msgid ""
-"Multiple selections allowed, otherwise filter is limited to a single value"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:231
-msgid "Search all filter options"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:232
-msgid ""
-"By default, each filter loads at most 1000 choices at the initial page load. "
-"Check this box if you have more than 1000 filter values and want to enable "
-"dynamically searching that loads filter values as users type (may add stress "
-"to your database)."
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:252
-msgid "User must select a value for this filter"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:281
-msgid "Filter configuration"
-msgstr "フィルタ構成"
-
-#: superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx:45
-msgid "Error while fetching data"
-msgstr "データの取得中にエラーが発生しました"
-
 #: superset-frontend/src/explore/components/controls/SelectControl.jsx:76
-#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:404
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:399
 msgid "No results found"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:267
-#: superset-frontend/src/explore/components/controls/SelectControl.jsx:237
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:272
+#: superset-frontend/src/explore/components/controls/SelectControl.jsx:241
 #, python-format
 msgid "%s option(s)"
 msgstr ""
@@ -5948,158 +6388,413 @@ msgid ""
 "details"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:200
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:202
 msgid "Geohash"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:104
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:105
 msgid "textarea"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:135
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:136
 msgid "in modal"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl.jsx:48
-#: superset-frontend/src/explore/controlPanels/TimeTable.js:38
-msgid "Time series columns"
-msgstr ""
-
 #: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:105
 msgid "This visualization type is not supported."
-msgstr ""
+msgstr "この可視化方式はサポートされていません。"
 
-#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:201
+#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:199
 msgid "Click to change visualization type"
-msgstr "クリックして可視化のタイプを変更"
+msgstr "クリックして可視化方式を変更"
 
-#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:214
+#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:216
 msgid "Select a visualization type"
-msgstr "可視化のタイプを選んでください"
+msgstr "可視化方式を選んでください"
 
-#: superset-frontend/src/explore/components/controls/withAsyncVerification.tsx:199
+#: superset-frontend/src/explore/components/controls/withAsyncVerification.tsx:201
 #, python-format
 msgid "Failed to verify select options: %s"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:262
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:462
+msgid "Annotation Slice Configuration"
+msgstr "注釈スライスの構成"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:463
+msgid ""
+"This section allows you to configure how to use the slice\n"
+"               to generate annotations."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:603
+msgid "Display configuration"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:604
+msgid "Configure your how you overlay is displayed here."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:608
+msgid "Style"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:622
+msgid "Opacity"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:634
+msgid "Color"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:653
+msgid "Line width"
+msgstr "線の幅"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:702
+msgid "Layer configuration"
+msgstr "レイヤー構成"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:703
+msgid "Configure the basics of your Annotation Layer."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:711
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:738
+msgid "Mandatory"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:715
+msgid "Hide layer"
+msgstr "レイヤーを隠す"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:721
+msgid "Choose the annotation layer type"
+msgstr "注釈レイヤーのタイプを選んでください"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:722
+msgid "Annotation layer type"
+msgstr "注釈レイヤーのタイプ"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:754
+msgid "Remove"
+msgstr "削除"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:167
+msgid "Edit annotation layer"
+msgstr "注釈レイヤーを編集"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:198
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:210
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:243
+msgid "Add annotation layer"
+msgstr "注釈レイヤーを追加"
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:59
+msgid "Empty collection"
+msgstr "空のコレクション"
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:63
+msgid "Add an item"
+msgstr "アイテムを追加"
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:141
+msgid "Remove item"
+msgstr "アイテムを削除"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:170
+msgid "Edit dataset"
+msgstr "データセットを編集"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:175
+msgid "View in SQL Lab"
+msgstr "SQL Labで表示"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:222
+msgid "More dataset related options"
+msgstr "データセットに関連するその他のオプション"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:236
+msgid "Missing dataset"
+msgstr "データセットが見つかりません"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:241
+msgid "The dataset linked to this chart may have been deleted."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:279
 msgid "RANGE TYPE"
 msgstr "範囲のタイプ"
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:285
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:302
 msgid "Actual time range"
-msgstr ""
+msgstr "実際の期間"
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:306
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:323
 msgid "CANCEL"
 msgstr "キャンセル"
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:315
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:333
 msgid "APPLY"
 msgstr "適用"
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:324
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:342
 msgid "Edit time range"
-msgstr "時間範囲を編集"
+msgstr "期間を編集"
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:51
-msgid "Configure advanced time range"
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:58
+msgid "Configure Advanced Time Range "
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:52
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:124
-msgid "START"
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:64
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:114
+msgid "START (INCLUSIVE)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:58
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:176
-msgid "END"
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:66
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:116
+msgid "Start date included in time range"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CalendarFrame.tsx:40
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:76
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:172
+msgid "END (EXCLUSIVE)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:78
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:174
+msgid "End date excluded from time range"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx:43
 msgid "Configure Time Range: Previous..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CommonFrame.tsx:35
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CommonFrame.tsx:41
 msgid "Configure Time Range: Last..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:121
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:110
 msgid "Configure custom time range"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:151
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:202
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:146
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:203
 msgid "Relative quantity"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:229
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:230
 msgid "Anchor to"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:238
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:239
 msgid "NOW"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:241
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:242
 msgid "Date/Time"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:159
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:367
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:29
+msgid "Return to specific datetime."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:30
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:44
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:62
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:76
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:89
+msgid "Syntax"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:34
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:49
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:67
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:81
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:95
+msgid "Example"
+msgstr "例"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:43
+msgid "Moves the given set of dates by a specified interval."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:58
+msgid "Truncates the specified date to the accuracy specified by the date unit."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:75
+msgid "Get the last date by the date unit."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:88
+msgid "Get the specify date for the holiday"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx:318
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx:271
+msgid "Drop columns or metrics"
+msgstr "列または指標を削除する"
+
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx:58
+msgid "Drop columns"
+msgstr "列を削除する"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:167
+msgid "Default"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:168
+msgid ""
+"(optional) default value for the filter, when using the multiple option, "
+"you can use a semicolon-delimited list of options."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:184
+msgid "Sort metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:185
+msgid "Metric to sort the results by"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:204
+msgid "Sort ascending"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:205
+msgid "Check for sorting ascending"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:215
+msgid "Allow multiple selections"
+msgstr "複数の選択を許可する"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:217
+msgid "Multiple selections allowed, otherwise filter is limited to a single value"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:231
+msgid "Search all filter options"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:232
+msgid ""
+"By default, each filter loads at most 1000 choices at the initial page "
+"load. Check this box if you have more than 1000 filter values and want to"
+" enable dynamically searching that loads filter values as users type (may"
+" add stress to your database)."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:251
+msgid "Required"
+msgstr "必須"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:252
+msgid "User must select a value for this filter"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:281
+msgid "Filter configuration"
+msgstr "フィルタ構成"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:170
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:378
 msgid "Simple"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:176
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:399
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:187
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:418
 msgid "Custom SQL"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:282
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:292
 msgid "No such column found. To filter on a metric, try the Custom SQL tab."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:291
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:301
 #, python-format
 msgid "%s column(s) and metric(s)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:301
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:286
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:311
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:293
 #, python-format
 msgid "%s column(s)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:302
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:312
 msgid "To filter on a metric, use Custom SQL tab."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:307
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:319
 #, python-format
 msgid "%s operator(s)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:326
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:340
 msgid "Type a value here"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:385
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:418
 msgid "Filter value (case sensitive)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:92
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:96
 msgid "choose WHERE or HAVING..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:127
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:132
 msgid "Filters by columns"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:129
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:134
 msgid "Filters by metrics"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger.tsx:94
+#: superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx:149
+msgid "Fixed"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx:165
+msgid "Based on a metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx:73
+msgid "My metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx:409
+msgid "Add metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:304
+#, python-format
+msgid "%s aggregates(s)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:313
+#, python-format
+msgid "%s saved metric(s)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:353
+msgid "Saved"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:356
+msgid "Saved metric"
+msgstr "保存した指標"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:381
+msgid "column"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:401
+msgid "aggregate"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/OptionControls/index.tsx:276
 msgid ""
 "\n"
 "                This filter was inherited from the dashboard's context.\n"
@@ -6107,38 +6802,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:297
-#, python-format
-msgid "%s aggregates(s)"
-msgstr ""
+#: superset-frontend/src/explore/components/controls/SelectAsyncControl/index.jsx:45
+msgid "Error while fetching data"
+msgstr "データの取得中にエラーが発生しました"
 
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:306
-#, python-format
-msgid "%s saved metric(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:346
-msgid "Saved"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:349
-msgid "Saved metric"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:370
-msgid "column"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:386
-msgid "aggregate"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx:73
-msgid "My metric"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx:402
-msgid "Add metric"
+#: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:49
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:38
+msgid "Time series columns"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/Separator.js:25
@@ -6152,187 +6822,208 @@ msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/Separator.js:37
 msgid "Pick your favorite markup language"
-msgstr ""
+msgstr "お気に入りのマークアップ言語を選択"
 
 #: superset-frontend/src/explore/controlPanels/Separator.js:47
 msgid "Put your code here"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/TimeTable.js:26
-#: superset-frontend/src/explore/controlPanels/sections.jsx:112
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:142
+#: superset-frontend/src/explore/controlPanels/sections.tsx:113
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:179
 msgid "Query"
 msgstr "クエリ"
 
-#: superset-frontend/src/explore/controlPanels/TimeTable.js:49
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:50
 msgid "URL"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/TimeTable.js:50
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:51
 msgid ""
-"Templated link, it's possible to include {{ metric }} or other values coming "
-"from the controls."
+"Templated link, it's possible to include {{ metric }} or other values "
+"coming from the controls."
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:24
-#: superset-frontend/src/explore/controlPanels/sections.jsx:83
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:189
+#: superset-frontend/src/explore/controlPanels/sections.tsx:25
+#: superset-frontend/src/explore/controlPanels/sections.tsx:84
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:191
 msgid "Time"
 msgstr "時間"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:26
-#: superset-frontend/src/explore/controlPanels/sections.jsx:84
+#: superset-frontend/src/explore/controlPanels/sections.tsx:27
+#: superset-frontend/src/explore/controlPanels/sections.tsx:85
 msgid "Time related form attributes"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:31
+#: superset-frontend/src/explore/controlPanels/sections.tsx:32
 msgid "Chart type"
 msgstr "チャートタイプ"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:41
+#: superset-frontend/src/explore/controlPanels/sections.tsx:42
 msgid "Chart ID"
 msgstr "チャートID"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:43
+#: superset-frontend/src/explore/controlPanels/sections.tsx:44
 msgid "The id of the active chart"
-msgstr ""
+msgstr "アクティブなチャートのID"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:50
+#: superset-frontend/src/explore/controlPanels/sections.tsx:51
 msgid "Cache Timeout (seconds)"
-msgstr ""
+msgstr "キャッシュタイムアウト (秒)"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:52
+#: superset-frontend/src/explore/controlPanels/sections.tsx:53
 msgid "The number of seconds before expiring the cache"
-msgstr ""
+msgstr "キャッシュを期限切れにするまでの秒数"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:59
+#: superset-frontend/src/explore/controlPanels/sections.tsx:60
 msgid "URL parameters"
 msgstr "URLパラメータ"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:61
+#: superset-frontend/src/explore/controlPanels/sections.tsx:62
 msgid "Extra parameters for use in jinja templated queries"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:68
+#: superset-frontend/src/explore/controlPanels/sections.tsx:69
 msgid "Time range endpoints"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:70
+#: superset-frontend/src/explore/controlPanels/sections.tsx:71
 msgid "Time range endpoints (SIP-15)"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:90
+#: superset-frontend/src/explore/controlPanels/sections.tsx:91
 msgid "Annotations and layers"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:124
+#: superset-frontend/src/explore/controlPanels/sections.tsx:125
 msgid "Sort descending"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:126
+#: superset-frontend/src/explore/controlPanels/sections.tsx:127
 msgid "Whether to sort descending or ascending"
-msgstr ""
+msgstr "降順または昇順でソートするかどうか"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:133
+#: superset-frontend/src/explore/controlPanels/sections.tsx:134
 msgid "Contribution"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:135
+#: superset-frontend/src/explore/controlPanels/sections.tsx:136
 msgid "Compute the contribution to the total"
-msgstr ""
+msgstr "全体への寄与度を算出"
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:143
+#: superset-frontend/src/explore/controlPanels/sections.tsx:144
 msgid "Advanced analytics"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:145
+#: superset-frontend/src/explore/controlPanels/sections.tsx:146
 msgid ""
 "This section contains options that allow for advanced analytical post "
 "processing of query results"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:151
+#: superset-frontend/src/explore/controlPanels/sections.tsx:152
 msgid "Rolling window"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:157
+#: superset-frontend/src/explore/controlPanels/sections.tsx:158
 msgid "Rolling function"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:166
+#: superset-frontend/src/explore/controlPanels/sections.tsx:167
 msgid ""
-"Defines a rolling window function to apply, works along with the [Periods] "
-"text box"
+"Defines a rolling window function to apply, works along with the "
+"[Periods] text box"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:176
+#: superset-frontend/src/explore/controlPanels/sections.tsx:177
 msgid "Periods"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:178
+#: superset-frontend/src/explore/controlPanels/sections.tsx:179
 msgid ""
 "Defines the size of the rolling window function, relative to the time "
 "granularity selected"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:188
+#: superset-frontend/src/explore/controlPanels/sections.tsx:189
 msgid "Min periods"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:190
+#: superset-frontend/src/explore/controlPanels/sections.tsx:191
 msgid ""
-"The minimum number of rolling periods required to show a value. For instance "
-"if you do a cumulative sum on 7 days you may want your \"Min Period\" to be "
-"7, so that all data points shown are the total of 7 periods. This will hide "
-"the \"ramp up\" taking place over the first 7 periods"
+"The minimum number of rolling periods required to show a value. For "
+"instance if you do a cumulative sum on 7 days you may want your \"Min "
+"Period\" to be 7, so that all data points shown are the total of 7 "
+"periods. This will hide the \"ramp up\" taking place over the first 7 "
+"periods"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:200
+#: superset-frontend/src/explore/controlPanels/sections.tsx:201
 msgid "Time comparison"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:208
+#: superset-frontend/src/explore/controlPanels/sections.tsx:209
 msgid "Time shift"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:219
+#: superset-frontend/src/explore/controlPanels/sections.tsx:220
 msgid ""
-"Overlay one or more timeseries from a relative time period. Expects relative "
-"time deltas in natural language (example:  24 hours, 7 days, 52 weeks, 365 "
-"days). Free text is supported."
+"Overlay one or more timeseries from a relative time period. Expects "
+"relative time deltas in natural language (example:  24 hours, 7 days, 52 "
+"weeks, 365 days). Free text is supported."
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:231
+#: superset-frontend/src/explore/controlPanels/sections.tsx:232
 msgid "Calculation type"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:239
+#: superset-frontend/src/explore/controlPanels/sections.tsx:240
 msgid ""
-"How to display time shifts: as individual lines; as the absolute difference "
-"between the main time series and each time shift; as the percentage change; "
-"or as the ratio between series and time shifts."
+"How to display time shifts: as individual lines; as the absolute "
+"difference between the main time series and each time shift; as the "
+"percentage change; or as the ratio between series and time shifts."
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:247
+#: superset-frontend/src/explore/controlPanels/sections.tsx:248
 msgid "Python functions"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:256
+#: superset-frontend/src/explore/controlPanels/sections.tsx:257
 msgid "Rule"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:259
+#: superset-frontend/src/explore/controlPanels/sections.tsx:260
 msgid "Pandas resample rule"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:267
+#: superset-frontend/src/explore/controlPanels/sections.tsx:268
 msgid "Method"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:277
+#: superset-frontend/src/explore/controlPanels/sections.tsx:278
 msgid "Pandas resample method"
 msgstr ""
 
+#: superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx:60
+msgid "No columns"
+msgstr ""
+
+#: superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx:61
+#: superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx:147
+#: superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx:74
+#: superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx:65
+#, python-format
+msgid "%s option"
+msgstr ""
+
+#: superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx:74
+msgid "Chosen non-numeric column"
+msgstr ""
+
+#: superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx:73
+msgid "No time columns"
+msgstr ""
+
 #: superset-frontend/src/profile/components/App.tsx:48
 msgid "Favorites"
 msgstr "お気に入り"
@@ -6365,326 +7056,322 @@ msgstr "お気に入りのチャートはまだありません。星をクリッ
 msgid "No favorite dashboards yet, go click on stars!"
 msgstr "お気に入りのダッシュボードはまだありません。星をクリックしてください！"
 
-#: superset-frontend/src/profile/components/UserInfo.tsx:39
+#: superset-frontend/src/profile/components/UserInfo.tsx:44
 msgid "Profile picture provided by Gravatar"
 msgstr "Gravatarが提供するプロフィール写真"
 
-#: superset-frontend/src/profile/components/UserInfo.tsx:57
+#: superset-frontend/src/profile/components/UserInfo.tsx:63
 msgid "joined"
-msgstr "参加しました"
+msgstr "参加"
 
-#: superset-frontend/src/profile/components/UserInfo.tsx:69
+#: superset-frontend/src/profile/components/UserInfo.tsx:75
 msgid "id:"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/utils.tsx:149
+#: superset-frontend/src/views/CRUD/utils.tsx:145
 msgid "There was an error fetching your recent activity:"
 msgstr "最近のアクティビティの取得中にエラーが発生しました:"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:147
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:109
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:92
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:93
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:131
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:511
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:178
-#: superset-frontend/src/views/CRUD/utils.tsx:202
-#: superset-frontend/src/views/CRUD/utils.tsx:257
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:164
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:152
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:108
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:95
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:96
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:139
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:530
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:233
+#: superset-frontend/src/views/CRUD/utils.tsx:198
+#: superset-frontend/src/views/CRUD/utils.tsx:263
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:166
 #, python-format
 msgid "Deleted: %s"
-msgstr "削除: %s"
+msgstr "削除しました: %s"
 
-#: superset-frontend/src/views/CRUD/utils.tsx:205
+#: superset-frontend/src/views/CRUD/utils.tsx:201
 #, python-format
 msgid "There was an issue deleting: %s"
 msgstr "削除中に問題が発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:150
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:113
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:95
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:97
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:137
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:515
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:181
-#: superset-frontend/src/views/CRUD/utils.tsx:261
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:167
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:155
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:112
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:98
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:100
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:145
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:534
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:236
+#: superset-frontend/src/views/CRUD/utils.tsx:267
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:169
 #, python-format
 msgid "There was an issue deleting %s: %s"
-msgstr "削除中に問題が発生しました: %s"
+msgstr "%s の削除中に問題が発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:544
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:80
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:452
 msgid "report"
 msgstr "レポート"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:80
 msgid "alert"
 msgstr "アラート"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:82
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:108
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:117
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:107
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:116
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:72
 msgid "reports"
 msgstr "レポート"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:82
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
 msgid "alerts"
 msgstr "アラート"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:165
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:170
 #, python-format
 msgid "There was an issue deleting the selected %s: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:213
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:218
 msgid "Last run"
 msgstr "前回の実行"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:245
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1331
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:250
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1282
 msgid "Notification method"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:292
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:297
 msgid "Execution log"
 msgstr "実行ログ"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:320
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:195
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:250
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:359
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:229
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:348
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:346
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:378
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:316
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:349
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:325
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:194
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:253
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:374
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:232
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:353
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:362
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:389
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:318
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:404
 msgid "Actions"
 msgstr "アクション"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:347
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:218
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:278
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:513
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:262
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:472
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:468
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:133
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:352
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:217
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:281
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:535
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:265
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:484
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:479
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:170
 msgid "Bulk select"
 msgstr "一括選択"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:361
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:366
 #, python-format
 msgid "No %s yet"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:368
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:213
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:287
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:273
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:391
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:192
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:273
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:251
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:380
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:264
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:373
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:216
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:290
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:287
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:406
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:195
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:276
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:259
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:385
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:280
 msgid "Created by"
 msgstr "作成者"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:377
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:382
 #, python-format
 msgid "An error occurred while fetching created by values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:384
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:230
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:401
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:389
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:238
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:406
 msgid "Status"
 msgstr "状態"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:390
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:395
 msgid "${AlertState.success}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:391
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:396
 msgid "${AlertState.working}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:392
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:397
 msgid "${AlertState.error}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:393
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:398
 msgid "${AlertState.noop}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:394
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:399
 msgid "${AlertState.grace}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:411
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:416
 msgid "Alerts & reports"
 msgstr "アラートとレポート"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:421
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:427
 msgid "Reports"
 msgstr "レポート"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:445
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:453
 #, python-format
 msgid "This action will permanently delete %s."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:456
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:464
 #, python-format
 msgid "Delete %s?"
-msgstr "削除"
+msgstr "%s を削除しますか?"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:460
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:305
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:361
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:72
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:297
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:550
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:325
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:94
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:283
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:501
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:581
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:435
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:468
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:304
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:369
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:75
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:311
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:581
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:328
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:104
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:291
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:522
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:600
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:490
 msgid "Please confirm"
 msgstr "確認してください"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:461
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:469
 #, python-format
 msgid "Are you sure you want to delete the selected %s?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:56
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:67
 msgid "< (Smaller than)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:60
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:71
 msgid "> (Larger than)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:64
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:75
 msgid "<= (Smaller or equal)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:68
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:79
 msgid ">= (Larger or equal)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:72
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:83
 msgid "== (Is equal)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:76
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:87
 msgid "!= (Is not equal)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:80
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:91
 msgid "Not null"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:91
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:102
 msgid "30 days"
 msgstr "30日"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:95
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:106
 msgid "60 days"
 msgstr "60日"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:99
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:110
 msgid "90 days"
 msgstr "90日"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:345
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:357
 msgid "Add notification method"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:346
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:358
 msgid "Add delivery method"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:461
-msgid "Recipients are separated by \",\" or \";\""
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1042
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:255
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:207
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:979
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:279
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:231
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:225
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:343
-#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:112
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:252
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:106
 msgid "Add"
 msgstr "追加"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1054
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:991
 msgid "Edit ${isReport ? 'Report' : 'Alert'}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1055
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:992
 msgid "Add ${isReport ? 'Report' : 'Alert'}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1063
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1071
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1000
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1008
 msgid "Report name"
 msgstr "レポート名"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1063
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1071
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1000
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1008
 msgid "Alert name"
 msgstr "アラート名"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1117
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1054
 msgid "Alert condition"
 msgstr "アラート状態"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1161
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1098
 msgid "Trigger Alert If..."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1185
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1201
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:123
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1122
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1138
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:140
 msgid "Value"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1213
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1150
 msgid "Report schedule"
 msgstr "レポートスケジュール"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1214
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1151
 msgid "Alert condition schedule"
 msgstr "アラート状態スケジュール"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1224
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1162
 msgid "Schedule settings"
 msgstr "スケジュール設定"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1228
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1166
 msgid "Log retention"
 msgstr "ログの保持"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1252
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1190
 msgid "Working timeout"
 msgstr "作業タイムアウト"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1260
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1273
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1199
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1214
 msgid "Time in seconds"
 msgstr "秒単位の時間"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1267
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1207
 msgid "Grace period"
 msgstr "猶予期間"
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1282
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1224
 msgid "Message content"
 msgstr "メッセージ内容"
 
@@ -6693,27 +7380,31 @@ msgid "log"
 msgstr "ログ"
 
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:94
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:355
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:357
 msgid "State"
 msgstr "状態"
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:100
-msgid "Scheduled at"
-msgstr ""
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:105
+msgid "Execution ID"
+msgstr "実行 ID"
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:108
-msgid "Start at"
-msgstr "開始時間"
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:117
+msgid "Scheduled at (UTC)"
+msgstr "スケジュール設定時刻 (UTC)"
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:118
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:125
+msgid "Start at (UTC)"
+msgstr "開始時刻 (UTC)"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:135
 msgid "Duration"
 msgstr "期限"
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:127
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:144
 msgid "Error message"
 msgstr "エラーメッセージ"
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:139
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:156
 msgid "${alertResource?.type}"
 msgstr ""
 
@@ -6721,39 +7412,43 @@ msgstr ""
 msgid "CRON expression"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:62
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:64
 msgid "Report sent"
 msgstr "レポートが送信されました"
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:63
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:65
 msgid "Alert triggered, notification sent"
 msgstr "アラートが発動し、通知が送信されました"
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:69
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:71
 msgid "Report sending"
 msgstr "レポート送信"
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:70
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:72
 msgid "Alert running"
 msgstr "アラート発動中"
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:76
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:78
 msgid "Report failed"
 msgstr "レポートに失敗しました"
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:77
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:79
 msgid "Alert failed"
 msgstr "アラートに失敗しました"
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:82
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:92
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:84
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:94
 msgid "Nothing triggered"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:87
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:89
 msgid "Alert Triggered, In Grace Period"
 msgstr "アラート発動、猶予期間中"
 
+#: superset-frontend/src/views/CRUD/alert/components/NotificationMethod.tsx:162
+msgid "Recipients are separated by \",\" or \";\""
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx:38
 msgid "${RecipientIconName.email}"
 msgstr ""
@@ -6762,69 +7457,70 @@ msgstr ""
 msgid "${RecipientIconName.slack}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:65
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:64
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:110
 msgid "annotation"
 msgstr "注釈"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:133
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:132
 #, python-format
 msgid "There was an issue deleting the selected annotations: %s"
 msgstr "選択した注釈の削除で問題が発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:180
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:179
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:289
 msgid "Edit annotation"
 msgstr "注釈を編集する"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:187
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:186
 msgid "Delete annotation"
 msgstr "注釈を削除する"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:208
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:254
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:207
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:253
 msgid "Annotation"
 msgstr "注釈"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:260
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:259
 msgid "No annotation yet"
 msgstr "注釈はまだありません"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:269
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:268
 msgid "Annotation Layer ${annotationLayerName}"
 msgstr "注釈レイヤー ${annotationLayerName}"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:291
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:290
 msgid ""
-"Are you sure you want to delete ${annotationCurrentlyDeleting?.short_descr}?"
+"Are you sure you want to delete "
+"${annotationCurrentlyDeleting?.short_descr}?"
 msgstr " ${annotationCurrentlyDeleting?.short_descr} を削除してもよろしいですか？"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:301
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:300
 msgid "Delete Annotation?"
 msgstr "注釈を削除しますか？"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:306
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:305
 msgid "Are you sure you want to delete the selected annotations?"
 msgstr "選択した注釈を削除してもよろしいですか？"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:289
 msgid "Add annotation"
 msgstr "注釈を追加"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:274
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:298
 msgid "Annotation name"
 msgstr "注釈名"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:286
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:310
 msgid "date"
 msgstr "日付"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:307
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:330
 msgid "Additional information"
 msgstr "追加情報"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:314
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:243
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:337
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:267
 msgid "Description (this can be seen in the list)"
 msgstr "説明(これはリストで見ることができます)"
 
@@ -6832,158 +7528,193 @@ msgstr "説明(これはリストで見ることができます)"
 msgid "annotation_layer"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:218
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:242
 msgid "Edit annotation layer properties"
 msgstr "注釈レイヤーのプロパティを編集"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:228
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:252
 msgid "Annotation layer name"
 msgstr "注釈レイヤー名"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:67
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:339
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:70
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:347
 msgid "Annotation layers"
 msgstr "注釈レイヤー"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:112
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:115
 #, python-format
 msgid "There was an issue deleting the selected layers: %s"
 msgstr "選択したレイヤーの削除で問題が発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:181
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:257
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:158
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:279
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:184
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:271
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:161
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:295
 msgid "Last modified"
-msgstr "最終更新日"
+msgstr "最終更新"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:206
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:184
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:285
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:209
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:187
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:340
 msgid "Created on"
 msgstr "作成日"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:231
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:210
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:234
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:213
 msgid "Edit template"
 msgstr "テンプレートを編集"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:240
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:219
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:243
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:222
 msgid "Delete template"
 msgstr "テンプレートを削除"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:266
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:323
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:269
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:326
 msgid "Annotation layer"
 msgstr "注釈レイヤー"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:296
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:282
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:370
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:299
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:285
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:425
 #, python-format
 msgid "An error occurred while fetching dataset datasource values: %s"
-msgstr "データセット・データソース値の取得中にエラーが発生しました"
+msgstr "データセット・データソース値の取得中にエラーが発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:329
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:332
 msgid "No annotation layers yet"
 msgstr "注釈レイヤーはまだありません"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:349
-msgid "This action will permanently delete the layer."
-msgstr "このアクションにより、レイヤーが完全に削除されます"
-
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:357
+msgid "This action will permanently delete the layer."
+msgstr "このアクションにより、レイヤーが完全に削除されます。"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:365
 msgid "Delete Layer?"
 msgstr "本当にレイヤーを削除しますか？"
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:362
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:370
 msgid "Are you sure you want to delete the selected layers?"
-msgstr "選択されたレイヤーを削除してもよろしいですか？"
+msgstr "選択したレイヤーを削除してもよろしいですか？"
 
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:75
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:300
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:97
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:286
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:78
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:314
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:107
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:294
 msgid "Are you sure you want to delete"
 msgstr "削除してもよろしいですか"
 
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:137
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:143
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:151
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:160
 #, python-format
 msgid "Last modified %s"
-msgstr "最終更新日 %s"
+msgstr "最終更新 %s"
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:53
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:59
 msgid ""
 "The passwords for the databases below are needed in order to import them "
 "together with the charts. Please note that the \"Secure Extra\" and "
-"\"Certificate\" sections of the database configuration are not present in "
-"export files, and should be added manually after the import if they are "
+"\"Certificate\" sections of the database configuration are not present in"
+" export files, and should be added manually after the import if they are "
 "needed."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:60
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:66
 msgid ""
-"You are importing one or more charts that already exist. Overwriting might "
-"cause you to lose some of your work. Are you sure you want to overwrite?"
+"You are importing one or more charts that already exist. Overwriting "
+"might cause you to lose some of your work. Are you sure you want to "
+"overwrite?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:180
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:190
 #, python-format
 msgid "There was an issue deleting the selected charts: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:247
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:220
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:292
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:261
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:227
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:303
 msgid "Modified by"
 msgstr "更新者"
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:370
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:359
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:390
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:385
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:364
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:401
 msgid "Owner"
 msgstr "所有者"
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:380
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:389
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:410
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:431
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:455
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:368
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:389
+msgid "All"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:395
 #, python-format
 msgid "An error occurred while fetching chart owners values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:401
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:416
 #, python-format
 msgid "An error occurred while fetching chart created by values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:412
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:427
 msgid "Viz type"
 msgstr "可視化タイプ"
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:444
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:459
 #, python-format
 msgid "An error occurred while fetching chart dataset values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:454
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:412
-#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:133
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:111
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:136
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:469
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:417
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:139
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:114
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:140
 msgid "Favorite"
 msgstr "お気に入り"
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:461
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:419
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:474
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:410
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:422
+msgid "Any"
+msgstr "任意"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:476
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:424
 msgid "Yes"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:462
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:420
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:477
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:425
 msgid "No"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:551
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:492
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:440
+msgid "Alphabetical"
+msgstr "ABC順"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:498
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:446
+msgid "Recently modified"
+msgstr "更新"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:504
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:452
+msgid "Least recently modified"
+msgstr "最終更新"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:559
+msgid "Import charts"
+msgstr "チャートのインポート"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:582
 msgid "Are you sure you want to delete the selected charts?"
 msgstr "選択したチャートを削除してもよろしいですか？"
 
@@ -7001,102 +7732,101 @@ msgstr "CSSテンプレートを追加する"
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:246
 msgid "CSS template name"
-msgstr "テンプレート名"
+msgstr "CSSテンプレート名"
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:258
 msgid "css"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:66
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:240
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:69
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:243
 msgid "CSS templates"
 msgstr "CSSテンプレート"
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:115
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:118
 #, python-format
 msgid "There was an issue deleting the selected templates: %s"
-msgstr ""
+msgstr "選択したテンプレートの削除で問題が発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:151
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:154
 #, python-format
 msgid "Last modified by %s"
 msgstr "最終更新者 %s"
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:249
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:252
 msgid "CSS template"
 msgstr "CSSテンプレート"
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:313
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:316
 msgid "This action will permanently delete the template."
 msgstr "このアクションにより、テンプレートが完全に削除されます。"
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:321
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:324
 msgid "Delete Template?"
-msgstr "CSSテンプレート"
+msgstr "テンプレートを削除しますか?"
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:326
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:329
 msgid "Are you sure you want to delete the selected templates?"
 msgstr "選択したテンプレートを削除してもよろしいですか？"
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:50
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:150
+msgid "published"
+msgstr "公開"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:150
+msgid "draft"
+msgstr "下書き"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:52
 msgid ""
 "The passwords for the databases below are needed in order to import them "
 "together with the dashboards. Please note that the \"Secure Extra\" and "
-"\"Certificate\" sections of the database configuration are not present in "
-"export files, and should be added manually after the import if they are "
+"\"Certificate\" sections of the database configuration are not present in"
+" export files, and should be added manually after the import if they are "
 "needed."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:57
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:59
 msgid ""
 "You are importing one or more dashboards that already exist. Overwriting "
 "might cause you to lose some of your work. Are you sure you want to "
 "overwrite?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:159
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:85
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:165
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:88
 #, python-format
 msgid "An error occurred while fetching dashboards: %s"
 msgstr "ダッシュボードの取得中にエラーが発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:176
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:183
 msgid "There was an issue deleting the selected dashboards: "
-msgstr "選択したダッシュボードの削除で問題が発生しました。:"
+msgstr "選択したダッシュボードの削除で問題が発生しました。: "
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:369
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:374
 #, python-format
 msgid "An error occurred while fetching dashboard owner values: %s"
 msgstr "ダッシュボードの所有者の値の取得中にエラーが発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:390
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:395
 #, python-format
 msgid "An error occurred while fetching dashboard created by values: %s"
-msgstr "値によって作成されたダッシュボードの取得中にエラーが発生しました: %s"
+msgstr "作成したダッシュボードの取得中にエラーが発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:408
-msgid "Unpublished"
-msgstr "未公開"
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:502
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:523
 msgid "Are you sure you want to delete the selected dashboards?"
 msgstr "選択したダッシュボードを削除してもよろしいですか？"
 
-#: superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx:68
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:165
-msgid "Sorry, your browser does not support copying."
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx:73
 msgid "SQL Copied!"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:37
 msgid ""
-"The passwords for the databases below are needed in order to import them. "
-"Please note that the \"Secure Extra\" and \"Certificate\" sections of the "
-"database configuration are not present in export files, and should be added "
-"manually after the import if they are needed."
+"The passwords for the databases below are needed in order to import them."
+" Please note that the \"Secure Extra\" and \"Certificate\" sections of "
+"the database configuration are not present in export files, and should be"
+" added manually after the import if they are needed."
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:43
@@ -7106,412 +7836,419 @@ msgid ""
 "overwrite?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:78
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:441
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:149
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:86
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:457
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:80
 msgid "database"
 msgstr "データベース"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:118
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:126
 #, python-format
 msgid "An error occurred while fetching database related data: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:210
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:372
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:443
-msgid "Asynchronous query execution"
-msgstr ""
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:190
+msgid "Import databases"
+msgstr "データベースのインポート"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:213
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:375
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:226
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:388
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:483
+msgid "Asynchronous query execution"
+msgstr "非同期でのクエリ実行"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:229
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:391
 msgid "AQE"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:228
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:244
 msgid "Allow data manipulation language"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:231
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:247
 msgid "DML"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:243
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:259
 msgid "CSV upload"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:303
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:319
 msgid "Delete database"
 msgstr "データベースを削除"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:410
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:426
 #, python-format
 msgid ""
-"The database %s is linked to %s charts that appear on %s dashboards. Are you "
-"sure you want to continue? Deleting the database will break those objects."
+"The database %s is linked to %s charts that appear on %s dashboards. Are "
+"you sure you want to continue? Deleting the database will break those "
+"objects."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:423
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:439
 msgid "Delete Database?"
 msgstr "データベースを削除しますか？"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:156
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:87
 msgid "Please enter a SQLAlchemy URI to test"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:176
-msgid "Connection looks good!"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:189
-msgid "ERROR: Connection failed. "
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:307
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:212
 #, python-format
 msgid "Sorry there was an error fetching database information: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:255
 msgid "Edit database"
 msgstr "データベースを編集"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:255
 msgid "Add database"
 msgstr "データベースを追加"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:361
-msgid "Connection"
-msgstr ""
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:265
+msgid "Display Name"
+msgstr "表示名"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:369
-msgid "Database name"
-msgstr "データベース名"
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:377
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:273
 msgid "Name your dataset"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:393
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:278
+msgid "Pick a name to help you identify this database."
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:292
 msgid "dialect+driver://username:password@host:port/database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:399
-msgid "Test connection"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:403
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:299
 msgid "Refer to the "
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:409
-msgid "SQLAlchemy docs"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:411
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:307
 msgid " for more information on how to structure your URI."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:415
-msgid "Performance"
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:319
+msgid "Test connection"
+msgstr "接続のテスト"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:345
+msgid "Allow this database to be queried in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:417
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:423
-msgid "Chart cache timeout"
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:364
+msgid "Allow creation of new tables based on queries"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:445
-msgid ""
-"Operate the database in asynchronous mode, meaning that the queries are "
-"executed on remote workers as opposed to on the web server itself. This "
-"assumes that you have a Celery worker setup as well as a results backend. "
-"Refer to the installation docs for more information."
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:380
+msgid "Allow creation of new views based on queries"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:455
-msgid "SQL Lab settings"
-msgstr "SQLラボ設定"
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:507
-msgid "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...)"
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:389
+msgid "CTAS & CVAS SCHEMA"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:521
-msgid "Allow multi schema metadata fetch"
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:396
+msgid "Search or select schema"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:533
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:539
-msgid "CTAS schema"
-msgstr "CTASスキーマ"
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:544
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:401
 msgid ""
 "When allowing CREATE TABLE AS option in SQL Lab, this option forces the "
 "table to be created in this schema."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:553
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:558
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:642
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:418
+msgid ""
+"Allow manipulation of the database using non-SELECT statements such as "
+"UPDATE, DELETE, CREATE, etc."
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:431
+msgid "Allow multi schema metadata fetch"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:458
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:464
+msgid "Chart cache timeout"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:486
+msgid ""
+"Operate the database in asynchronous mode, meaning that the queries are "
+"executed on remote workers as opposed to on the web server itself. This "
+"assumes that you have a Celery worker setup as well as a results backend."
+" Refer to the installation docs for more information."
+msgstr "データベースを非同期モードで動作させます。Webサーバー自体ではなくリモートワーカーでクエリを実行します。この機能はCeleryワーカーと結果バックエンドがセットアップされていることを前提としています。詳細についてはインストールドキュメントを参照してください。"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:508
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:513
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:605
 msgid "Secure extra"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:568
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:523
 msgid "JSON string containing additional connection configuration."
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:528
+msgid ""
+"This is used to provide connection information for systems like Hive, "
+"Presto, and BigQuery, which do not conform to the username:password "
+"syntax normally used by SQLAlchemy."
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:547
+msgid ""
+"Optional CA_BUNDLE contents to validate HTTPS requests. Only available on"
+" certain database engines."
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:570
+msgid "Impersonate Logged In User (Presto & Hive)"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:573
 msgid ""
-"This is used to provide connection information for systems like Hive, "
-"Presto, and BigQuery, which do not conform to the username:password syntax "
-"normally used by SQLAlchemy."
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:592
-msgid ""
-"Optional CA_BUNDLE contents to validate HTTPS requests. Only available on "
-"certain database engines."
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:608
-msgid "Impersonate Logged In User (Presto & Hive)"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:610
-msgid ""
 "If Presto, all the queries in SQL Lab are going to be executed as the "
-"currently logged on user who must have permission to run them. If Hive and "
-"hive.server2.enable.doAs is enabled, will run the queries as service "
-"account, but impersonate the currently logged on user via hive.server2.proxy."
-"user property."
+"currently logged on user who must have permission to run them. If Hive "
+"and hive.server2.enable.doAs is enabled, will run the queries as service "
+"account, but impersonate the currently logged on user via "
+"hive.server2.proxy.user property."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:628
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:590
 msgid "Allow data upload"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:630
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:593
 msgid "If selected, please set the schemas allowed for data upload in Extra."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:650
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:613
 msgid "JSON string containing extra configuration elements."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:653
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:616
 msgid ""
-"1. The engine_params object gets unpacked into the sqlalchemy.create_engine "
-"call, while the metadata_params gets unpacked into the sqlalchemy.MetaData "
-"call."
+"1. The engine_params object gets unpacked into the "
+"sqlalchemy.create_engine call, while the metadata_params gets unpacked "
+"into the sqlalchemy.MetaData call."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:660
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:623
 msgid ""
 "2. The metadata_cache_timeout is a cache timeout setting in seconds for "
-"metadata fetch of this database. Specify it as \"metadata_cache_timeout\": "
-"{\"schema_cache_timeout\": 600, \"table_cache_timeout\": 600}. If unset, "
-"cache will not be enabled for the functionality. A timeout of 0 indicates "
-"that the cache never expires."
+"metadata fetch of this database. Specify it as "
+"\"metadata_cache_timeout\": {\"schema_cache_timeout\": 600, "
+"\"table_cache_timeout\": 600}. If unset, cache will not be enabled for "
+"the functionality. A timeout of 0 indicates that the cache never expires."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:669
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:632
 msgid ""
-"3. The schemas_allowed_for_csv_upload is a comma separated list of schemas "
-"that CSVs are allowed to upload to. Specify it as "
+"3. The schemas_allowed_for_csv_upload is a comma separated list of "
+"schemas that CSVs are allowed to upload to. Specify it as "
 "\"schemas_allowed_for_csv_upload\": [\"public\", \"csv_upload\"]. If "
 "database flavor does not support schema or any schema is allowed to be "
 "accessed, just leave the list empty."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:678
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:641
 msgid ""
-"4. The version field is a string specifying this db's version. This should "
-"be used with Presto DBs so that the syntax is correct."
+"4. The version field is a string specifying this db's version. This "
+"should be used with Presto DBs so that the syntax is correct."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:684
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:647
 msgid ""
-"5. The allows_virtual_table_explore field is a boolean specifying whether or "
-"not the Explore button in SQL Lab results is shown."
+"5. The allows_virtual_table_explore field is a boolean specifying whether"
+" or not the Explore button in SQL Lab results is shown."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:100
-#, python-format
-msgid "Error while saving dataset: %s"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:117
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:111
 msgid "Add dataset"
 msgstr "データセットを追加"
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:53
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:58
 msgid ""
 "The passwords for the databases below are needed in order to import them "
 "together with the datasets. Please note that the \"Secure Extra\" and "
-"\"Certificate\" sections of the database configuration are not present in "
-"export files, and should be added manually after the import if they are "
+"\"Certificate\" sections of the database configuration are not present in"
+" export files, and should be added manually after the import if they are "
 "needed."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:60
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:65
 msgid ""
-"You are importing one or more datasets that already exist. Overwriting might "
-"cause you to lose some of your work. Are you sure you want to overwrite?"
+"You are importing one or more datasets that already exist. Overwriting "
+"might cause you to lose some of your work. Are you sure you want to "
+"overwrite?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:165
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:174
 msgid "An error occurred while fetching dataset related data"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:185
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:194
 #, python-format
 msgid "An error occurred while fetching dataset related data: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:204
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:213
 msgid "Physical dataset"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:214
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:221
 msgid "Virtual dataset"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:399
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:410
 #, python-format
 msgid "An error occurred while fetching dataset owner values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:418
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:429
 #, python-format
 msgid "An error occurred while fetching datasets: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:433
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:365
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:390
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:444
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:367
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:445
 #, python-format
 msgid "An error occurred while fetching schema values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:533
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:502
+msgid "Import datasets"
+msgstr "データセットのインポート"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:552
 #, python-format
 msgid "There was an issue deleting the selected datasets: %s"
-msgstr ""
+msgstr "選択したデータセットの削除に問題が発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:556
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:575
 #, python-format
 msgid ""
-"The dataset %s is linked to %s charts that appear on %s dashboards. Are you "
-"sure you want to continue? Deleting the dataset will break those objects."
+"The dataset %s is linked to %s charts that appear on %s dashboards. Are "
+"you sure you want to continue? Deleting the dataset will break those "
+"objects."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:569
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:588
 msgid "Delete Dataset?"
-msgstr "本当にデータセットを削除しますか？"
+msgstr "データセットを削除しますか?"
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:582
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:601
 msgid "Are you sure you want to delete the selected datasets?"
-msgstr ""
+msgstr "選択したデータセットを削除しますか?"
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:632
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:651
 msgid "0 Selected"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:635
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:654
 #, python-format
 msgid "%s Selected (Virtual)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:642
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:661
 #, python-format
 msgid "%s Selected (Physical)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:649
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:668
 #, python-format
 msgid "%s Selected (%s Physical, %s Virtual)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:120
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:122
 #, python-format
 msgid "There was an issue previewing the selected query. %s"
-msgstr ""
+msgstr "選択したクエリのプレビュー中に問題が発生しました。 %s"
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:149
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:151
 msgid "Success"
-msgstr ""
+msgstr "成功"
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:154
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:156
 msgid "Failed"
-msgstr ""
+msgstr "失敗"
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:159
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:161
 msgid "Running"
-msgstr ""
+msgstr "実行中"
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:164
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:166
 msgid "Offline"
-msgstr ""
+msgstr "オフライン"
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:169
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:171
 msgid "Scheduled"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:212
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:214
 #, python-format
 msgid "Duration: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:225
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:227
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:147
 msgid "Tab name"
-msgstr ""
+msgstr "タブ名"
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:257
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:241
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:259
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:296
 msgid "TABLES"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:296
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:298
 msgid "Rows"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:324
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:326
 msgid "Open query in SQL Lab"
-msgstr "SQLラボでクエリを開く"
+msgstr "SQL Labでクエリを開く"
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:348
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:382
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:350
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:384
 #, python-format
 msgid "An error occurred while fetching database values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:395
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:391
+msgid "Time range"
+msgstr "期間"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:397
 msgid "Search by query text"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:119
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:315
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:367
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:98
 msgid "Query preview"
-msgstr ""
+msgstr "クエリプレビュー"
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:127
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:106
 msgid "Previous"
-msgstr ""
+msgstr "前"
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:135
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:114
 msgid "Next"
-msgstr ""
+msgstr "次"
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:143
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:122
 msgid "Open in SQL Lab"
-msgstr "SQLラボで開く"
+msgstr "SQL Labで開く"
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:156
 msgid "User query"
@@ -7519,138 +8256,196 @@ msgstr "ユーザークエリ"
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:164
 msgid "Executed query"
-msgstr "実行されたクエリ"
+msgstr "実行したクエリ"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:87
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:145
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:55
+msgid ""
+"The passwords for the databases below are needed in order to import them "
+"together with the saved queries. Please note that the \"Secure Extra\" "
+"and \"Certificate\" sections of the database configuration are not "
+"present in export files, and should be added manually after the import if"
+" they are needed."
+msgstr ""
+"保存したクエリと一緒にインポートするには、以下のデータベースのパスワードが必要です。データベース構成の ”Secure Extra” と "
+"”Certificate” セクションはエクスポートファイルに存在せず、必要に応じてインポート後に手動で追加する必要がある点に注意してください。"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:62
+msgid ""
+"You are importing one or more saved queries that already exist. "
+"Overwriting might cause you to lose some of your work. Are you sure you "
+"want to overwrite?"
+msgstr "既に存在する 1 つ以上の保存済みクエリをインポートしています。上書きすると、作業の一部が失われる可能性があります。上書きしますか?"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:107
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:234
 msgid "Saved queries"
-msgstr "保存されたクエリ"
+msgstr "保存したクエリ"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:116
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:153
 #, python-format
 msgid "There was an issue previewing the selected query %s"
-msgstr ""
+msgstr "選択したクエリのプレビュー中に問題が発生しました %s"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:162
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:191
+msgid "Import queries"
+msgstr "クエリのインポート"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:217
 msgid "Link Copied!"
-msgstr ""
+msgstr "リンクをコピーしました!"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:198
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:253
 #, python-format
 msgid "There was an issue deleting the selected queries: %s"
-msgstr ""
+msgstr "選択したクエリの削除に問題が発生しました: %s"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:323
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:374
 msgid "Edit query"
 msgstr "クエリを編集"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:331
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:381
 msgid "Copy query URL"
-msgstr ""
+msgstr "クエリ URL のコピー"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:339
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:388
+msgid "Export query"
+msgstr "クエリのエクスポート"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:395
 msgid "Delete query"
 msgstr "クエリを削除"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:411
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:239
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:466
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:243
 msgid "This action will permanently delete the saved query."
-msgstr ""
+msgstr "この操作を実行すると、保存したクエリは完全に削除されます。"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:421
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:251
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:476
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:255
 msgid "Delete Query?"
 msgstr "クエリを削除しますか？"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:436
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:491
 msgid "Are you sure you want to delete the selected queries?"
-msgstr ""
+msgstr "選択したクエリを削除しますか?"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:534
+msgid "queries"
+msgstr "クエリ"
 
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:126
 msgid "Query name"
 msgstr "クエリ名"
 
-#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:110
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:99
+msgid "[Untitled]"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:100
+msgid "Unknown"
+msgstr "不明"
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:175
 msgid "Edited"
-msgstr "編集したもの"
+msgstr "編集した項目"
 
-#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:117
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:183
 msgid "Created"
-msgstr "作成したもの"
+msgstr "作成した項目"
 
-#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:127
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:193
 msgid "Viewed"
-msgstr "表示したもの"
+msgstr "表示した項目"
 
-#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:135
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:201
 msgid "Examples"
 msgstr "例"
 
-#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:139
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:143
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:268
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:145
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:147
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:272
 msgid "Mine"
-msgstr "私のもの"
+msgstr "個人用"
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:72
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:70
 msgid "Recently viewed charts, dashboards, and saved queries will appear here"
 msgstr "最近表示したグラフ、ダッシュボード、保存したクエリがここに表示されます"
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:77
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:75
 msgid "Recently created charts, dashboards, and saved queries will appear here"
 msgstr "最近作成したグラフ、ダッシュボード、保存したクエリがここに表示されます"
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:82
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:80
 msgid "Recent example charts, dashboards, and saved queries will appear here"
-msgstr "最近のチャート、ダッシュボード、保存されたクエリの例がここに表示されます"
+msgstr "最近のチャート、ダッシュボード、保存したクエリの例がここに表示されます"
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:87
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:85
 msgid "Recently edited charts, dashboards, and saved queries will appear here"
 msgstr "最近編集したグラフ、ダッシュボード、保存したクエリがここに表示されます"
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:115
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:112
 msgid ""
 "${tableName\n"
-"                        .split('')\n"
-"                        .slice(0, tableName.length - 1)\n"
-"                        .join('')}\n"
+"                      .split('')\n"
+"                      .slice(0, tableName.length - 1)\n"
+"                      .join('')}\n"
 "                    "
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:135
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:131
 msgid "You don't have any favorites yet!"
-msgstr "まだお気に入りはありません！"
+msgstr "まだお気に入りはありません!"
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:147
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:143
 msgid "SQL Lab queries"
-msgstr "SQLラボクエリ"
+msgstr "SQL Labクエリ"
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:148
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:144
 msgid "${tableName}"
-msgstr "テーブル名"
+msgstr ""
 
 #: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:125
 msgid "query"
 msgstr "クエリ"
 
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:221
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:223
 msgid "Share"
 msgstr "共有"
 
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:307
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:312
 #, python-format
 msgid "Last run %s"
 msgstr "前回の実行 %s"
 
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:125
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:147
+#, python-format
+msgid "There was an issue fetching your recent activity: %s"
+msgstr "最近のアクティビティの取得中に問題が発生しました: %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:160
+#, python-format
+msgid "There was an issues fetching your dashboards: %s"
+msgstr "ダッシュボードの取得中に問題が発生しました: %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:169
+#, python-format
+msgid "There was an issues fetching your chart: %s"
+msgstr "チャートの取得中に問題が発生しました: %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:178
+#, python-format
+msgid "There was an issues fetching your saved queries: %s"
+msgstr "保存したクエリの取得中に問題が発生しました: %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:211
 msgid "Recents"
 msgstr "最近"
 
-#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:276
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:272
 msgid "Select start and end date"
 msgstr "開始日と終了日を選択"
 
-#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:382
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:378
 #, python-format
 msgid "Type or Select [%s]"
 msgstr "入力または選択 [%s]"
diff --git a/superset/translations/messages.pot b/superset/translations/messages.pot
index 707b7ab65..c14487bd8 100644
--- a/superset/translations/messages.pot
+++ b/superset/translations/messages.pot
@@ -19,179 +19,228 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-22 15:56-0300\n"
+"POT-Creation-Date: 2021-04-26 02:49+0900\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
-#: superset/app.py:225
+#: superset/app.py:232
 msgid "Home"
 msgstr ""
 
-#: superset/app.py:230 superset/views/annotations.py:119
+#: superset/app.py:237 superset/views/annotations.py:119
 msgid "Annotation Layers"
 msgstr ""
 
-#: superset/app.py:233 superset/app.py:277 superset/app.py:286
-#: superset/app.py:339 superset/app.py:420 superset/app.py:428
-#: superset/app.py:438 superset/app.py:450
+#: superset/app.py:240 superset/app.py:284 superset/app.py:293
+#: superset/app.py:346 superset/app.py:431 superset/app.py:439
+#: superset/app.py:452 superset/app.py:464
 msgid "Manage"
 msgstr ""
 
-#: superset-frontend/src/profile/components/Security.tsx:46 superset/app.py:239
-#: superset/views/database/mixins.py:32
+#: superset-frontend/src/profile/components/Security.tsx:46 superset/app.py:246
+#: superset/views/database/mixins.py:33
 msgid "Databases"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:247
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:251
-#: superset/app.py:242 superset/app.py:251 superset/app.py:375
-#: superset/app.py:390 superset/app.py:478 superset/app.py:487
-#: superset/app.py:500 superset/app.py:509
+#: superset-frontend/src/explore/components/ControlPanelsContainer.tsx:300
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:293
+#: superset/app.py:249 superset/app.py:258 superset/app.py:382
+#: superset/app.py:397 superset/app.py:492 superset/app.py:501
+#: superset/app.py:514 superset/app.py:523
 msgid "Data"
 msgstr ""
 
-#: superset-frontend/src/profile/components/Security.tsx:60 superset/app.py:247
+#: superset-frontend/src/profile/components/Security.tsx:60 superset/app.py:254
 msgid "Datasets"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/BuilderComponentPane.tsx:77
 #: superset-frontend/src/profile/components/CreatedContent.tsx:76
 #: superset-frontend/src/profile/components/Favorites.tsx:77
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:540
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:152 superset/app.py:258
-#: superset/views/chart/mixin.py:26 superset/views/dashboard/mixin.py:75
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:571
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:246 superset/app.py:265
+#: superset/views/chart/mixin.py:26 superset/views/dashboard/mixin.py:81
 msgid "Charts"
 msgstr ""
 
 #: superset-frontend/src/profile/components/CreatedContent.tsx:73
 #: superset-frontend/src/profile/components/Favorites.tsx:74
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:499
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:134 superset/app.py:266
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:520
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:223 superset/app.py:273
 #: superset/views/chart/mixin.py:79 superset/views/dashboard/mixin.py:25
 msgid "Dashboards"
 msgstr ""
 
-#: superset/app.py:275
+#: superset/app.py:282
 msgid "Plugins"
 msgstr ""
 
-#: superset/app.py:283 superset/views/css_templates.py:38
+#: superset/app.py:290 superset/views/css_templates.py:38
 msgid "CSS Templates"
 msgstr ""
 
-#: superset/app.py:293
+#: superset/app.py:300
 msgid "Row level security"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:551
-#: superset/app.py:295 superset/app.py:406 superset/app.py:464
+#: superset/app.py:302 superset/app.py:413 superset/app.py:478
 msgid "Security"
 msgstr ""
 
-#: superset/app.py:335
+#: superset/app.py:342
 msgid "Import Dashboards"
 msgstr ""
 
-#: superset/app.py:344
+#: superset/app.py:351
 msgid "SQL Editor"
 msgstr ""
 
-#: superset/app.py:349 superset/app.py:364
+#: superset/app.py:356 superset/app.py:371
 msgid "SQL Lab"
 msgstr ""
 
-#: superset/app.py:352
+#: superset/app.py:359
 msgid "Saved Queries"
 msgstr ""
 
-#: superset/app.py:359
+#: superset/app.py:366
 msgid "Query History"
 msgstr ""
 
-#: superset/app.py:371
+#: superset/app.py:378
 msgid "Upload a CSV"
 msgstr ""
 
-#: superset/app.py:386
+#: superset/app.py:393
 msgid "Upload Excel"
 msgstr ""
 
-#: superset/app.py:404
+#: superset/app.py:411
 msgid "Action Log"
 msgstr ""
 
-#: superset/app.py:418
+#: superset/app.py:429
 msgid "Dashboard Emails"
 msgstr ""
 
-#: superset/app.py:426
+#: superset/app.py:437
 msgid "Chart Email Schedules"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:415 superset/app.py:436
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:420 superset/app.py:450
 msgid "Alerts"
 msgstr ""
 
-#: superset/app.py:448
+#: superset/app.py:462
 msgid "Alerts & Reports"
 msgstr ""
 
-#: superset/app.py:462
+#: superset/app.py:476
 msgid "Access requests"
 msgstr ""
 
-#: superset/app.py:476 superset/connectors/druid/views.py:257
+#: superset/app.py:490 superset/connectors/druid/views.py:257
 msgid "Druid Datasources"
 msgstr ""
 
-#: superset/app.py:484 superset/connectors/druid/views.py:195
+#: superset/app.py:498 superset/connectors/druid/views.py:195
 msgid "Druid Clusters"
 msgstr ""
 
-#: superset/app.py:497
+#: superset/app.py:511
 msgid "Scan New Datasources"
 msgstr ""
 
-#: superset/app.py:506
+#: superset/app.py:520
 msgid "Refresh Druid Metadata"
 msgstr ""
 
-#: superset/errors.py:64
+#: superset/errors.py:78
 msgid "Issue 1000 - The datasource is too large to query."
 msgstr ""
 
-#: superset/errors.py:68
+#: superset/errors.py:82
 msgid "Issue 1001 - The database is under an unusual load."
 msgstr ""
 
-#: superset/errors.py:74
+#: superset/errors.py:88
 msgid "Issue 1002 - The database returned an unexpected error."
 msgstr ""
 
-#: superset/errors.py:80 superset/errors.py:95
+#: superset/errors.py:94 superset/errors.py:109 superset/errors.py:124
 msgid ""
 "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was "
 "a misspelling or a typo."
 msgstr ""
 
-#: superset/errors.py:87
+#: superset/errors.py:101
 msgid "Issue 1004 - The column was deleted or renamed in the database."
 msgstr ""
 
-#: superset/errors.py:102
+#: superset/errors.py:116
 msgid "Issue 1005 - The table was deleted or renamed in the database."
 msgstr ""
 
-#: superset/errors.py:110
+#: superset/errors.py:131
+msgid "Issue 1005 - The schema was deleted or renamed in the database."
+msgstr ""
+
+#: superset/errors.py:139
 msgid "Issue 1006 - One or more parameters specified in the query are missing."
 msgstr ""
 
-#: superset/databases/schemas.py:168 superset/exceptions.py:125
+#: superset/errors.py:148
+msgid "Issue 1007 - The hostname provided can't be resolved."
+msgstr ""
+
+#: superset/errors.py:152
+msgid "Issue 1008 - The port is closed."
+msgstr ""
+
+#: superset/errors.py:157
+msgid ""
+"Issue 1009 - The host might be down, and can't be reached on the provided"
+" port."
+msgstr ""
+
+#: superset/errors.py:166
+msgid "Issue 1010 - Superset encountered an error while running a command."
+msgstr ""
+
+#: superset/errors.py:174
+msgid "Issue 1011 - Superset encountered an unexpected error."
+msgstr ""
+
+#: superset/errors.py:180
+msgid ""
+"Issue 1012 - The username provided when connecting to a database is not "
+"valid."
+msgstr ""
+
+#: superset/errors.py:189
+msgid ""
+"Issue 1013 - The password provided when connecting to a database is not "
+"valid."
+msgstr ""
+
+#: superset/errors.py:198
+msgid "Issue 1014 - Either the username or the password is wrong."
+msgstr ""
+
+#: superset/errors.py:202 superset/errors.py:211
+msgid "Issue 1015 - Either the database is spelled incorrectly or does not exist."
+msgstr ""
+
+#: superset/errors.py:220
+msgid "Issue 1017 - User doesn't have the proper permissions."
+msgstr ""
+
+#: superset/databases/schemas.py:165 superset/exceptions.py:137
 msgid "Invalid certificate"
 msgstr ""
 
@@ -215,370 +264,348 @@ msgstr ""
 msgid "Unsupported template value for key %(key)s"
 msgstr ""
 
-#: superset/sql_lab.py:173
+#: superset/sql_lab.py:168
+msgid ""
+"SQL Lab timeout. This environment's policy is to kill queries after {} "
+"seconds."
+msgstr ""
+
+#: superset/sql_lab.py:196
 msgid "Only `SELECT` statements are allowed against this database"
 msgstr ""
 
-#: superset/sql_lab.py:341
+#: superset/sql_lab.py:355
 msgid ""
 "CTAS (create table as select) can only be run with a query where the last"
 " statement is a SELECT. Please make sure your query has a SELECT as its "
 "last statement. Then, try running your query again."
 msgstr ""
 
-#: superset/sql_lab.py:353
+#: superset/sql_lab.py:367
 msgid ""
 "CVAS (create view as select) can only be run with a query with a single "
 "SELECT statement. Please make sure your query has only a SELECT "
 "statement. Then, try running your query again."
 msgstr ""
 
-#: superset/viz.py:125 superset/viz_sip38.py:126
+#: superset/viz.py:131
 msgid "Viz is missing a datasource"
 msgstr ""
 
-#: superset/viz.py:238
+#: superset/viz.py:237
 msgid ""
 "Applied rolling window did not return any data. Please make sure the "
 "source query satisfies the minimum periods defined in the rolling window."
 msgstr ""
 
-#: superset/utils/date_parser.py:257 superset/viz.py:376
-#: superset/viz_sip38.py:376
+#: superset/utils/date_parser.py:264 superset/viz.py:355
 msgid "From date cannot be larger than to date"
 msgstr ""
 
-#: superset/viz.py:527
+#: superset/viz.py:521
 msgid "Cached value not found"
 msgstr ""
 
-#: superset/common/query_context.py:395 superset/viz.py:542
+#: superset/common/query_context.py:356 superset/viz.py:537
 #, python-format
 msgid "Columns missing in datasource: %(invalid_columns)s"
 msgstr ""
 
-#: superset/viz.py:654 superset/viz_sip38.py:598
+#: superset/viz.py:649
 msgid "Table View"
 msgstr ""
 
-#: superset/viz.py:676
+#: superset/viz.py:671
 msgid ""
 "You cannot use [Columns] in combination with [Group "
 "By]/[Metrics]/[Percentage Metrics]. Please choose one or the other."
 msgstr ""
 
-#: superset/viz.py:713 superset/viz_sip38.py:611
+#: superset/viz.py:708
 msgid "Pick a granularity in the Time section or uncheck 'Include Time'"
 msgstr ""
 
-#: superset/viz.py:786 superset/viz_sip38.py:713
+#: superset/viz.py:781
 msgid "Time Table View"
 msgstr ""
 
-#: superset/viz.py:795 superset/viz.py:1648 superset/viz_sip38.py:722
-#: superset/viz_sip38.py:1605
+#: superset/viz.py:790 superset/viz.py:1734
 msgid "Pick at least one metric"
 msgstr ""
 
-#: superset/viz.py:799 superset/viz_sip38.py:726
+#: superset/viz.py:794
 msgid "When using 'Group By' you are limited to use a single metric"
 msgstr ""
 
-#: superset/viz.py:828 superset/viz_sip38.py:755
+#: superset/viz.py:823
 msgid "Pivot Table"
 msgstr ""
 
-#: superset/viz.py:845 superset/viz_sip38.py:771
+#: superset/viz.py:840
 msgid "Please choose at least one 'Group by' field "
 msgstr ""
 
-#: superset/viz.py:857 superset/viz_sip38.py:783
+#: superset/viz.py:852
 msgid "Please choose at least one metric"
 msgstr ""
 
-#: superset/viz.py:859 superset/viz_sip38.py:785
+#: superset/viz.py:854
 msgid "Group By' and 'Columns' can't overlap"
 msgstr ""
 
-#: superset/viz.py:954 superset/viz_sip38.py:837
+#: superset/viz.py:956
 msgid "Treemap"
 msgstr ""
 
-#: superset/viz.py:986 superset/viz_sip38.py:869
+#: superset/viz.py:999
 msgid "Calendar Heatmap"
 msgstr ""
 
-#: superset/viz.py:1066 superset/viz_sip38.py:1030
+#: superset/viz.py:1091
 msgid "Bubble Chart"
 msgstr ""
 
-#: superset/viz.py:1088 superset/viz_sip38.py:1046
+#: superset/viz.py:1113
 msgid "Please use 3 different metric labels"
 msgstr ""
 
-#: superset/viz.py:1090 superset/viz_sip38.py:1048
+#: superset/viz.py:1115
 msgid "Pick a metric for x, y and size"
 msgstr ""
 
-#: superset/viz.py:1117 superset/viz_sip38.py:1075
+#: superset/viz.py:1142
 msgid "Bullet Chart"
 msgstr ""
 
-#: superset/viz.py:1127 superset/viz_sip38.py:1085
+#: superset/viz.py:1152
 msgid "Pick a metric to display"
 msgstr ""
 
-#: superset/viz.py:1145 superset/viz_sip38.py:1101
+#: superset/viz.py:1170
 msgid "Big Number with Trendline"
 msgstr ""
 
-#: superset/viz.py:1153 superset/viz.py:1187 superset/viz_sip38.py:1109
-#: superset/viz_sip38.py:1140
+#: superset/viz.py:1178 superset/viz.py:1212
 msgid "Pick a metric!"
 msgstr ""
 
-#: superset/viz.py:1179 superset/viz_sip38.py:1132
+#: superset/viz.py:1204
 msgid "Big Number"
 msgstr ""
 
-#: superset/viz.py:1201 superset/viz_sip38.py:1154
+#: superset/viz.py:1226
 msgid "Time Series - Line Chart"
 msgstr ""
 
-#: superset/viz.py:1271 superset/viz.py:1488 superset/viz_sip38.py:1219
-#: superset/viz_sip38.py:1433
+#: superset/viz.py:1296 superset/viz.py:1562
 msgid "Pick a time granularity for your time series"
 msgstr ""
 
-#: superset/viz.py:1330 superset/viz_sip38.py:1275
+#: superset/viz.py:1355
 msgid ""
 "An enclosed time range (both start and end) must be specified when using "
 "a Time Comparison."
 msgstr ""
 
-#: superset/viz.py:1400 superset/viz_sip38.py:1345
+#: superset/viz.py:1427
 msgid "Time Series - Multiple Line Charts"
 msgstr ""
 
-#: superset/viz.py:1430 superset/viz_sip38.py:1375
+#: superset/viz.py:1504
 msgid "Time Series - Dual Axis Line Chart"
 msgstr ""
 
-#: superset/viz.py:1440 superset/viz_sip38.py:1385
+#: superset/viz.py:1514
 msgid "Pick a metric for left axis!"
 msgstr ""
 
-#: superset/viz.py:1442 superset/viz_sip38.py:1387
+#: superset/viz.py:1516
 msgid "Pick a metric for right axis!"
 msgstr ""
 
-#: superset/viz.py:1445 superset/viz_sip38.py:1390
+#: superset/viz.py:1519
 msgid "Please choose different metrics on left and right axis"
 msgstr ""
 
-#: superset/viz.py:1505 superset/viz_sip38.py:1450
+#: superset/viz.py:1579
 msgid "Time Series - Bar Chart"
 msgstr ""
 
-#: superset/viz.py:1514 superset/viz_sip38.py:1459
+#: superset/viz.py:1588
 msgid "Time Series - Period Pivot"
 msgstr ""
 
-#: superset/viz.py:1561 superset/viz_sip38.py:1506
+#: superset/viz.py:1635
 msgid "Time Series - Percent Change"
 msgstr ""
 
-#: superset/viz.py:1569 superset/viz_sip38.py:1514
+#: superset/viz.py:1643
 msgid "Time Series - Stacked"
 msgstr ""
 
-#: superset/viz.py:1579 superset/viz_sip38.py:1543
+#: superset/viz.py:1664
 msgid "Histogram"
 msgstr ""
 
-#: superset/viz.py:1589 superset/viz_sip38.py:1552
+#: superset/viz.py:1674
 msgid "Must have at least one numeric column specified"
 msgstr ""
 
-#: superset/viz.py:1635 superset/viz_sip38.py:1596
+#: superset/viz.py:1721
 msgid "Distribution - Bar Chart"
 msgstr ""
 
-#: superset/viz.py:1645
+#: superset/viz.py:1731
 msgid "Can't have overlap between Series and Breakdowns"
 msgstr ""
 
-#: superset/viz.py:1650 superset/viz_sip38.py:1607
+#: superset/viz.py:1736
 msgid "Pick at least one field for [Series]"
 msgstr ""
 
-#: superset/viz.py:1702 superset/viz_sip38.py:1659
+#: superset/viz.py:1802
 msgid "Sunburst"
 msgstr ""
 
-#: superset/viz.py:1748 superset/viz_sip38.py:1703
+#: superset/viz.py:1850
 msgid "Sankey"
 msgstr ""
 
-#: superset/viz.py:1756
+#: superset/viz.py:1858
 msgid "Pick exactly 2 columns as [Source / Target]"
 msgstr ""
 
-#: superset/viz.py:1800 superset/viz_sip38.py:1736
+#: superset/viz.py:1902
 msgid ""
 "There's a loop in your Sankey, please provide a tree. Here's a faulty "
 "link: {}"
 msgstr ""
 
-#: superset/viz.py:1813 superset/viz.py:1836 superset/viz_sip38.py:1749
-#: superset/viz_sip38.py:1770
+#: superset/viz.py:1915
 msgid "Directed Force Layout"
 msgstr ""
 
-#: superset/viz.py:1820 superset/viz_sip38.py:1756
-msgid "Pick exactly 2 columns to 'Group By'"
-msgstr ""
-
-#: superset/viz.py:1869 superset/viz_sip38.py:1802
+#: superset/viz.py:1950
 msgid "Country Map"
 msgstr ""
 
-#: superset/viz.py:1898 superset/viz_sip38.py:1823
+#: superset/viz.py:1987
 msgid "World Map"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:438
-#: superset-frontend/src/explore/controls.jsx:467 superset/viz.py:1956
-#: superset/viz_sip38.py:1873
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:103
+#: superset-frontend/src/explore/controls.jsx:468 superset/viz.py:2047
 msgid "Filters"
 msgstr ""
 
-#: superset/viz.py:1974 superset/viz_sip38.py:1891
+#: superset/viz.py:2067
 msgid "Invalid filter configuration, please select a column"
 msgstr ""
 
-#: superset/viz.py:2018 superset/viz_sip38.py:1952
+#: superset/viz.py:2115
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: superset/viz.py:2040 superset/viz_sip38.py:1968
+#: superset/viz.py:2144
 msgid "Heatmap"
 msgstr ""
 
-#: superset/viz.py:2096 superset/viz_sip38.py:2017
+#: superset/viz.py:2204
 msgid "Horizon Charts"
 msgstr ""
 
-#: superset/viz.py:2108 superset/viz_sip38.py:2029
+#: superset/viz.py:2228
 msgid "Mapbox"
 msgstr ""
 
-#: superset/viz.py:2120 superset/viz_sip38.py:2041
+#: superset/viz.py:2240
 msgid "[Longitude] and [Latitude] must be set"
 msgstr ""
 
-#: superset/viz.py:2127 superset/viz_sip38.py:2048
+#: superset/viz.py:2247
 msgid "Must have a [Group By] column to have 'count' as the [Label]"
 msgstr ""
 
-#: superset/viz.py:2147 superset/viz_sip38.py:2068
+#: superset/viz.py:2267
 msgid "Choice of [Label] must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2155 superset/viz_sip38.py:2075
+#: superset/viz.py:2275
 msgid "Choice of [Point Radius] must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2163 superset/viz_sip38.py:2082
+#: superset/viz.py:2283
 msgid "[Longitude] and [Latitude] columns must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2243 superset/viz_sip38.py:2162
+#: superset/viz.py:2363
 msgid "Deck.gl - Multiple Layers"
 msgstr ""
 
-#: superset/viz.py:2283 superset/viz.py:2315 superset/viz_sip38.py:2218
+#: superset/viz.py:2403 superset/viz.py:2435
 msgid "Bad spatial key"
 msgstr ""
 
-#: superset/viz.py:2301 superset/viz_sip38.py:2204
+#: superset/viz.py:2421
 #, python-format
 msgid "Invalid spatial point encountered: %s"
 msgstr ""
 
-#: superset/viz.py:2337 superset/viz_sip38.py:2240
+#: superset/viz.py:2457
 msgid ""
 "Encountered invalid NULL spatial entry,"
 "                                        please consider filtering those "
 "out"
 msgstr ""
 
-#: superset/viz.py:2427 superset/viz_sip38.py:2311
+#: superset/viz.py:2547
 msgid "Deck.gl - Scatter plot"
 msgstr ""
 
-#: superset/viz.py:2476 superset/viz_sip38.py:2358
+#: superset/viz.py:2596
 msgid "Deck.gl - Screen Grid"
 msgstr ""
 
-#: superset/viz.py:2502 superset/viz_sip38.py:2384
+#: superset/viz.py:2622
 msgid "Deck.gl - 3D Grid"
 msgstr ""
 
-#: superset/viz.py:2532 superset/viz_sip38.py:2411
+#: superset/viz.py:2652
 msgid "Deck.gl - Paths"
 msgstr ""
 
-#: superset/viz.py:2580 superset/viz_sip38.py:2456
+#: superset/viz.py:2700
 msgid "Deck.gl - Polygon"
 msgstr ""
 
-#: superset/viz.py:2609 superset/viz_sip38.py:2485
+#: superset/viz.py:2729
 msgid "Deck.gl - 3D HEX"
 msgstr ""
 
-#: superset/viz.py:2628 superset/viz_sip38.py:2501
+#: superset/viz.py:2748
 msgid "Deck.gl - GeoJSON"
 msgstr ""
 
-#: superset/viz.py:2647 superset/viz_sip38.py:2513
+#: superset/viz.py:2767
 msgid "Deck.gl - Arc"
 msgstr ""
 
-#: superset/viz.py:2682 superset/viz_sip38.py:2548
+#: superset/viz.py:2802
 msgid "Event flow"
 msgstr ""
 
-#: superset/viz.py:2714 superset/viz_sip38.py:2580
+#: superset/viz.py:2834
 msgid "Time Series - Paired t-test"
 msgstr ""
 
-#: superset/viz.py:2769 superset/viz_sip38.py:2635
+#: superset/viz.py:2901
 msgid "Time Series - Nightingale Rose Chart"
 msgstr ""
 
-#: superset/viz.py:2804 superset/viz_sip38.py:2670
+#: superset/viz.py:2947
 msgid "Partition Diagram"
 msgstr ""
 
-#: superset/viz_sip38.py:623
-msgid ""
-"Choose either fields to [Group By] and [Metrics] and/or [Percentage "
-"Metrics], or [Columns], not both"
-msgstr ""
-
-#: superset/viz_sip38.py:943
-msgid "Box Plot"
-msgstr ""
-
-#: superset/viz_sip38.py:1524
-msgid "Distribution - NVD3 - Pie Chart"
-msgstr ""
-
-#: superset/viz_sip38.py:1929
-msgid "iFrame"
-msgstr ""
-
 #: superset/annotation_layers/api.py:346
 #, python-format
 msgid "Deleted %(num)d annotation layer"
@@ -662,7 +689,7 @@ msgid "Annotation layer has associated annotations."
 msgstr ""
 
 #: superset/annotation_layers/commands/exceptions.py:66
-#: superset/reports/commands/exceptions.py:133
+#: superset/reports/commands/exceptions.py:137
 msgid "Name must be unique"
 msgstr ""
 
@@ -673,40 +700,40 @@ msgid_plural "Deleted %(num)d charts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: superset/charts/api.py:563
+#: superset/charts/api.py:557
 msgid "Request is not JSON"
 msgstr ""
 
-#: superset/charts/api.py:571 superset/charts/api.py:643
+#: superset/charts/api.py:568 superset/charts/api.py:638
 #, python-format
 msgid "Request is incorrect: %(error)s"
 msgstr ""
 
-#: superset/charts/schemas.py:487
+#: superset/charts/schemas.py:510
 msgid "`confidence_interval` must be between 0 and 1 (exclusive)"
 msgstr ""
 
-#: superset/charts/schemas.py:553
+#: superset/charts/schemas.py:576
 msgid ""
 "lower percentile must be greater than 0 and less than 100. Must be lower "
 "than upper percentile."
 msgstr ""
 
-#: superset/charts/schemas.py:568
+#: superset/charts/schemas.py:591
 msgid ""
 "upper percentile must be greater than 0 and less than 100. Must be higher"
 " than lower percentile."
 msgstr ""
 
-#: superset/charts/schemas.py:848
+#: superset/charts/schemas.py:871
 msgid "`width` must be greater or equal to 0"
 msgstr ""
 
-#: superset/charts/schemas.py:938
-msgid "`row_limit` must be greater than or equal to 1"
+#: superset/charts/schemas.py:986
+msgid "`row_limit` must be greater than or equal to 0"
 msgstr ""
 
-#: superset/charts/schemas.py:944
+#: superset/charts/schemas.py:993
 msgid "`row_offset` must be greater than or equal to 0"
 msgstr ""
 
@@ -719,92 +746,124 @@ msgstr ""
 msgid "There are associated alerts or reports: %s,"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:37
-#: superset/datasets/commands/exceptions.py:38
+#: superset/charts/commands/exceptions.py:38
+#, python-format
+msgid ""
+"Time string is unclear. Please specify [%(human_readable)s ago] or "
+"[%(human_readable)s later]."
+msgstr ""
+
+#: superset/charts/commands/exceptions.py:51
+#, python-format
+msgid "Cannot parse time string [%(human_readable)s]"
+msgstr ""
+
+#: superset/charts/commands/exceptions.py:65
+#: superset/datasets/commands/exceptions.py:41
 #: superset/reports/commands/exceptions.py:35
 msgid "Database does not exist"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:46
+#: superset/charts/commands/exceptions.py:74
 msgid "Dashboards do not exist"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:56
+#: superset/charts/commands/exceptions.py:84
 msgid "Datasource type is required when datasource_id is given"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:66
+#: superset/charts/commands/exceptions.py:94
 msgid "Chart parameters are invalid."
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:70
+#: superset/charts/commands/exceptions.py:98
 msgid "Chart could not be created."
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:74
+#: superset/charts/commands/exceptions.py:102
 msgid "Chart could not be updated."
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:78
+#: superset/charts/commands/exceptions.py:106
 msgid "Chart could not be deleted."
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:82
-#: superset/charts/commands/exceptions.py:102
+#: superset/charts/commands/exceptions.py:110
+#: superset/charts/commands/exceptions.py:130
 #: superset/dashboards/commands/exceptions.py:57
 #: superset/dashboards/commands/exceptions.py:69
-#: superset/databases/commands/exceptions.py:116
+#: superset/databases/commands/exceptions.py:117
 msgid "There are associated alerts or reports"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:86
+#: superset/charts/commands/exceptions.py:114
 msgid "Changing this chart is forbidden"
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:90
+#: superset/charts/commands/exceptions.py:118
 msgid "Charts could not be deleted."
 msgstr ""
 
-#: superset/charts/commands/exceptions.py:106
+#: superset/charts/commands/exceptions.py:134
 msgid "Import chart failed for an unknown reason"
 msgstr ""
 
 #: superset/commands/exceptions.py:85
-#: superset/datasets/commands/exceptions.py:141
+#: superset/datasets/commands/exceptions.py:144
 msgid "Owners are invalid"
 msgstr ""
 
 #: superset/commands/exceptions.py:92
+msgid "Some roles do not exist"
+msgstr ""
+
+#: superset/commands/exceptions.py:99
+#: superset/datasets/commands/exceptions.py:149
 msgid "Dataset does not exist"
 msgstr ""
 
-#: superset/common/query_object.py:301
+#: superset/common/query_actions.py:183
+msgid "Invalid result type: %(result_type)"
+msgstr ""
+
+#: superset/common/query_context.py:276
+msgid "The chart does not exist"
+msgstr ""
+
+#: superset/common/query_object.py:260
+#, python-format
+msgid ""
+"Duplicate column/metric labels: %(labels)s. Please make sure all columns "
+"and metrics have a unique label."
+msgstr ""
+
+#: superset/common/query_object.py:359
 msgid "`operation` property of post processing object undefined"
 msgstr ""
 
-#: superset/common/query_object.py:305
+#: superset/common/query_object.py:363
 #, python-format
 msgid "Unsupported post processing operation: %(operation)s"
 msgstr ""
 
-#: superset/connectors/druid/models.py:240
+#: superset/connectors/druid/models.py:239
 msgid "Adding new datasource [{}]"
 msgstr ""
 
-#: superset/connectors/druid/models.py:243
+#: superset/connectors/druid/models.py:242
 msgid "Refreshing datasource [{}]"
 msgstr ""
 
-#: superset/connectors/druid/models.py:1054
+#: superset/connectors/druid/models.py:1053
 msgid "Metric(s) {} must be aggregations."
 msgstr ""
 
-#: superset/connectors/druid/models.py:1476
+#: superset/connectors/druid/models.py:1471
 msgid "Unsupported extraction function: "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:994
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:231
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1031
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:228
 #: superset-frontend/src/explore/controls.jsx:251
 #: superset/connectors/druid/views.py:56 superset/connectors/sqla/views.py:63
 msgid "Columns"
@@ -823,21 +882,21 @@ msgid "Edit Druid Column"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx:31
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:209
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:137
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:222
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:228
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:137
 #: superset-frontend/src/explore/components/controls/SpatialControl.jsx:193
 #: superset/connectors/druid/views.py:77 superset/connectors/sqla/views.py:134
 msgid "Column"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:261
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:439
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:272
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:450
 #: superset/connectors/druid/views.py:78 superset/connectors/druid/views.py:174
-#: superset/connectors/sqla/views.py:143 superset/connectors/sqla/views.py:239
+#: superset/connectors/sqla/views.py:143 superset/connectors/sqla/views.py:251
 msgid "Type"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:148
 #: superset/connectors/druid/views.py:79 superset/views/access_requests.py:43
 #: superset/views/chart/mixin.py:80
 msgid "Datasource"
@@ -857,10 +916,10 @@ msgid ""
 "view."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:983
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:218
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1020
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:206
 #: superset-frontend/src/explore/controls.jsx:153
-#: superset/connectors/druid/views.py:143 superset/connectors/sqla/views.py:193
+#: superset/connectors/druid/views.py:143 superset/connectors/sqla/views.py:205
 msgid "Metrics"
 msgstr ""
 
@@ -876,28 +935,28 @@ msgstr ""
 msgid "Edit Druid Metric"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:836
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:864
 #: superset-frontend/src/explore/controls.jsx:172
 #: superset-frontend/src/explore/controls.jsx:173
-#: superset/connectors/druid/views.py:171 superset/connectors/sqla/views.py:236
+#: superset/connectors/druid/views.py:171 superset/connectors/sqla/views.py:248
 msgid "Metric"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:128
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:161
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:156
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:160
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:518
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:850
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:854
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:214
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1094
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1100
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:153
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:158
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:129
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:159
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:175
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:179
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:537
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:878
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:882
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:209
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1031
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1037
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:152
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:161
 #: superset/connectors/druid/views.py:172
 #: superset/connectors/druid/views.py:325 superset/connectors/sqla/views.py:136
-#: superset/connectors/sqla/views.py:237 superset/connectors/sqla/views.py:464
+#: superset/connectors/sqla/views.py:249 superset/connectors/sqla/views.py:488
 #: superset/views/annotations.py:80 superset/views/annotations.py:128
 #: superset/views/chart/mixin.py:81 superset/views/sql_lab.py:73
 msgid "Description"
@@ -905,11 +964,11 @@ msgstr ""
 
 #: superset/connectors/druid/views.py:173
 #: superset/connectors/druid/views.py:220 superset/connectors/sqla/views.py:135
-#: superset/connectors/sqla/views.py:238
+#: superset/connectors/sqla/views.py:250
 msgid "Verbose Name"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:740
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:762
 #: superset/connectors/druid/views.py:175 superset/views/log/__init__.py:33
 msgid "JSON"
 msgstr ""
@@ -918,7 +977,7 @@ msgstr ""
 msgid "Druid Datasource"
 msgstr ""
 
-#: superset/connectors/druid/views.py:177 superset/connectors/sqla/views.py:244
+#: superset/connectors/druid/views.py:177 superset/connectors/sqla/views.py:256
 msgid "Warning Message"
 msgstr ""
 
@@ -959,7 +1018,7 @@ msgid "Broker Endpoint"
 msgstr ""
 
 #: superset/connectors/druid/views.py:221
-#: superset/connectors/druid/views.py:331 superset/connectors/sqla/views.py:459
+#: superset/connectors/druid/views.py:331 superset/connectors/sqla/views.py:483
 #: superset/views/chart/mixin.py:77
 msgid "Cache Timeout"
 msgstr ""
@@ -995,7 +1054,7 @@ msgstr ""
 msgid "Edit Druid Datasource"
 msgstr ""
 
-#: superset/connectors/druid/views.py:283 superset/connectors/sqla/views.py:391
+#: superset/connectors/druid/views.py:283 superset/connectors/sqla/views.py:415
 msgid ""
 "The list of charts associated with this table. By altering this "
 "datasource, you may change how these associated charts behave. Also note "
@@ -1004,7 +1063,7 @@ msgid ""
 "datasource for a chart, overwrite the chart from the 'explore view'"
 msgstr ""
 
-#: superset/connectors/druid/views.py:292 superset/connectors/sqla/views.py:400
+#: superset/connectors/druid/views.py:292 superset/connectors/sqla/views.py:424
 msgid "Timezone offset (in hours) for this datasource"
 msgstr ""
 
@@ -1016,7 +1075,7 @@ msgid ""
 "filter will be populated based on the distinct value over the past week"
 msgstr ""
 
-#: superset/connectors/druid/views.py:305 superset/connectors/sqla/views.py:423
+#: superset/connectors/druid/views.py:305 superset/connectors/sqla/views.py:447
 msgid ""
 "Whether to populate the filter's dropdown in the explore view's filter "
 "section with a list of distinct values fetched from the backend on the "
@@ -1036,7 +1095,7 @@ msgid ""
 "to the cluster timeout if undefined."
 msgstr ""
 
-#: superset/connectors/druid/views.py:322 superset/connectors/sqla/views.py:449
+#: superset/connectors/druid/views.py:322 superset/connectors/sqla/views.py:473
 msgid "Associated Charts"
 msgstr ""
 
@@ -1048,15 +1107,16 @@ msgstr ""
 msgid "Cluster"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:358
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:572
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:260
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:261
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1078
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:262
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:307
-#: superset/connectors/druid/views.py:326 superset/connectors/sqla/views.py:462
-#: superset/views/chart/mixin.py:83 superset/views/dashboard/mixin.py:76
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:330
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:370
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:591
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:255
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:266
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1015
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:270
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:318
+#: superset/connectors/druid/views.py:326 superset/connectors/sqla/views.py:486
+#: superset/views/chart/mixin.py:83 superset/views/dashboard/mixin.py:82
 msgid "Owners"
 msgstr ""
 
@@ -1064,11 +1124,11 @@ msgstr ""
 msgid "Is Hidden"
 msgstr ""
 
-#: superset/connectors/druid/views.py:328 superset/connectors/sqla/views.py:455
+#: superset/connectors/druid/views.py:328 superset/connectors/sqla/views.py:479
 msgid "Enable Filter Select"
 msgstr ""
 
-#: superset/connectors/druid/views.py:329 superset/connectors/sqla/views.py:457
+#: superset/connectors/druid/views.py:329 superset/connectors/sqla/views.py:481
 msgid "Default Endpoint"
 msgstr ""
 
@@ -1084,17 +1144,17 @@ msgstr ""
 msgid "Fetch Values From"
 msgstr ""
 
-#: superset/connectors/druid/views.py:334 superset/connectors/sqla/views.py:451
+#: superset/connectors/druid/views.py:334 superset/connectors/sqla/views.py:475
 msgid "Changed By"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/AddSliceCard.jsx:65
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:240
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:282
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:295
-#: superset/connectors/druid/views.py:335 superset/connectors/sqla/views.py:342
-#: superset/connectors/sqla/views.py:468 superset/views/dashboard/mixin.py:79
-#: superset/views/dashboard/views.py:148 superset/views/database/mixins.py:201
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:248
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:293
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:350
+#: superset/connectors/druid/views.py:335 superset/connectors/sqla/views.py:366
+#: superset/connectors/sqla/views.py:492 superset/views/dashboard/mixin.py:86
+#: superset/views/dashboard/views.py:148 superset/views/database/mixins.py:202
 #: superset/views/sql_lab.py:74
 msgid "Modified"
 msgstr ""
@@ -1103,68 +1163,98 @@ msgstr ""
 msgid "Refreshed metadata from cluster [{}]"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:634
+#: superset/connectors/sqla/models.py:637
 msgid "Only `SELECT` statements are allowed"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:643
+#: superset/connectors/sqla/models.py:646
 msgid "Only single queries supported"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:739
+#: superset/connectors/sqla/models.py:730
 #, python-format
 msgid "Error in jinja expression in fetch values predicate: %(msg)s"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:797
-#, python-format
-msgid "Error in jinja expression in FROM clause: %(msg)s"
-msgstr ""
-
-#: superset/connectors/sqla/models.py:806
-msgid "Virtual dataset query cannot consist of multiple statements"
-msgstr ""
-
-#: superset/connectors/sqla/models.py:815
+#: superset/connectors/sqla/models.py:812
 msgid "Virtual dataset query must be read-only"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:871
+#: superset/connectors/sqla/models.py:829
+#, python-format
+msgid "Error while rendering virtual dataset query: %(msg)s"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:836
+msgid "Virtual dataset query cannot be empty"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:839
+msgid "Virtual dataset query cannot consist of multiple statements"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:940
 #, python-format
 msgid "Error in jinja expression in RLS filters: %(msg)s"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:931
+#: superset/connectors/sqla/models.py:1003
 msgid ""
 "Datetime column not provided as part table configuration and is required "
 "by this type of chart"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:941
+#: superset/connectors/sqla/models.py:1009
 msgid "Empty query?"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:951
-#: superset/connectors/sqla/models.py:1273
+#: superset/connectors/sqla/models.py:1020
+#: superset/connectors/sqla/models.py:1401
 #, python-format
 msgid "Metric '%(metric)s' does not exist"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:1101
+#: superset/connectors/sqla/models.py:1060
+#, python-format
+msgid "Unknown column used in orderby: %(col)s"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1102
+#, python-format
+msgid "Time column \"%(col)s\" does not exist in dataset"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1183
+msgid "Filter value list cannot be empty"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1204
+msgid "Must specify a value for filters with comparison operators"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1225
 #, python-format
 msgid "Invalid filter operation type: %(op)s"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:1112
+#: superset/connectors/sqla/models.py:1236
 #, python-format
 msgid "Error in jinja expression in WHERE clause: %(msg)s"
 msgstr ""
 
-#: superset/connectors/sqla/models.py:1124
+#: superset/connectors/sqla/models.py:1248
 #, python-format
 msgid "Error in jinja expression in HAVING clause: %(msg)s"
 msgstr ""
 
+#: superset/connectors/sqla/models.py:1371
+msgid "Database does not support subqueries"
+msgstr ""
+
+#: superset/connectors/sqla/models.py:1446
+msgid "Db engine did not return all queried columns"
+msgstr ""
+
 #: superset/connectors/sqla/views.py:64
 msgid "Show Column"
 msgstr ""
@@ -1190,9 +1280,9 @@ msgid ""
 "most case users should not need to alter this."
 msgstr ""
 
-#: superset-frontend/src/components/TableSelector.tsx:392
-#: superset/connectors/sqla/views.py:139 superset/connectors/sqla/views.py:241
-#: superset/connectors/sqla/views.py:450 superset/views/chart/mixin.py:87
+#: superset-frontend/src/components/TableSelector/index.tsx:400
+#: superset/connectors/sqla/views.py:139 superset/connectors/sqla/views.py:253
+#: superset/connectors/sqla/views.py:474 superset/views/chart/mixin.py:87
 msgid "Table"
 msgstr ""
 
@@ -1200,7 +1290,7 @@ msgstr ""
 msgid "Expression"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:212
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:231
 #: superset/connectors/sqla/views.py:141
 msgid "Is temporal"
 msgstr ""
@@ -1213,51 +1303,50 @@ msgstr ""
 msgid "Invalid date/timestamp format"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:194
+#: superset/connectors/sqla/views.py:206
 msgid "Show Metric"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:195
+#: superset/connectors/sqla/views.py:207
 msgid "Add Metric"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:196
+#: superset/connectors/sqla/views.py:208
 msgid "Edit Metric"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:240
+#: superset/connectors/sqla/views.py:252
 msgid "SQL Expression"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:242
+#: superset/connectors/sqla/views.py:254
 msgid "D3 Format"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:554
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:599
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:637
-#: superset/connectors/sqla/views.py:243 superset/connectors/sqla/views.py:467
-#: superset/views/database/mixins.py:195
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:573
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:600
+#: superset/connectors/sqla/views.py:255 superset/connectors/sqla/views.py:491
+#: superset/views/database/mixins.py:196
 msgid "Extra"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:285
+#: superset/connectors/sqla/views.py:309
 msgid "Row level security filter"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:286
+#: superset/connectors/sqla/views.py:310
 msgid "Show Row level security filter"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:287
+#: superset/connectors/sqla/views.py:311
 msgid "Add Row level security filter"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:288
+#: superset/connectors/sqla/views.py:312
 msgid "Edit Row level security filter"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:306
+#: superset/connectors/sqla/views.py:330
 msgid ""
 "Regular filters add where clauses to queries if a user belongs to a role "
 "referenced in the filter. Base filters apply filters to all queries "
@@ -1265,18 +1354,18 @@ msgid ""
 "users can see if no RLS filters within a filter group apply to them."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:312
+#: superset/connectors/sqla/views.py:336
 msgid "These are the tables this filter will be applied to."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:313
+#: superset/connectors/sqla/views.py:337
 msgid ""
 "For regular filters, these are the roles this filter will be applied to. "
 "For base filters, these are the roles that the filter DOES NOT apply to, "
 "e.g. Admin if admin should see all data."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:319
+#: superset/connectors/sqla/views.py:343
 msgid ""
 "Filters with the same group key will be ORed together within the group, "
 "while different filter groups will be ANDed together. Undefined group "
@@ -1288,7 +1377,7 @@ msgid ""
 " 'Europe')."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:329
+#: superset/connectors/sqla/views.py:353
 msgid ""
 "This is the condition that will be added to the WHERE clause. For "
 "example, to only return rows for a particular client, you might define a "
@@ -1297,172 +1386,173 @@ msgid ""
 "the clause `1 = 0` (always false)."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:276
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:260
-#: superset/connectors/sqla/views.py:338 superset/connectors/sqla/views.py:357
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:278
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:315
+#: superset/connectors/sqla/views.py:362 superset/connectors/sqla/views.py:381
 msgid "Tables"
 msgstr ""
 
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:389
 #: superset-frontend/src/profile/components/Security.tsx:35
-#: superset/connectors/sqla/views.py:339
+#: superset/connectors/sqla/views.py:363 superset/views/dashboard/mixin.py:83
 msgid "Roles"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:340
+#: superset/connectors/sqla/views.py:364
 msgid "Clause"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:341 superset/views/chart/mixin.py:78
-#: superset/views/dashboard/mixin.py:78 superset/views/dashboard/views.py:147
-#: superset/views/database/mixins.py:191
+#: superset/connectors/sqla/views.py:365 superset/views/chart/mixin.py:78
+#: superset/views/dashboard/mixin.py:85 superset/views/dashboard/views.py:147
+#: superset/views/database/mixins.py:192
 msgid "Creator"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:358
+#: superset/connectors/sqla/views.py:382
 msgid "Show Table"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:359
+#: superset/connectors/sqla/views.py:383
 msgid "Import a table definition"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:360
+#: superset/connectors/sqla/views.py:384
 msgid "Edit Table"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:401
+#: superset/connectors/sqla/views.py:425
 msgid "Name of the table that exists in the source database"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:402
+#: superset/connectors/sqla/views.py:426
 msgid "Schema, as used only in some databases like Postgres, Redshift and DB2"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:409
+#: superset/connectors/sqla/views.py:433
 msgid ""
 "This fields acts a Superset view, meaning that Superset will run a query "
 "against this string as a subquery."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:413
+#: superset/connectors/sqla/views.py:437
 msgid ""
 "Predicate applied when fetching distinct value to populate the filter "
 "control component. Supports jinja template syntax. Applies only when "
 "`Enable Filter Select` is on."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:419
+#: superset/connectors/sqla/views.py:443
 msgid "Redirects to this endpoint when clicking on the table from the table list"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:428
+#: superset/connectors/sqla/views.py:452
 msgid "Whether the table was generated by the 'Visualize' flow in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:617
-#: superset/connectors/sqla/views.py:431
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:639
+#: superset/connectors/sqla/views.py:455
 msgid ""
 "A set of parameters that become available in the query using Jinja "
 "templating syntax"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:435
+#: superset/connectors/sqla/views.py:459
 msgid ""
 "Duration (in seconds) of the caching timeout for this table. A timeout of"
 " 0 indicates that the cache never expires. Note this defaults to the "
 "database timeout if undefined."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:165
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:197
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:409
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:230
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:338
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:213
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:360
-#: superset/connectors/sqla/views.py:452 superset/connectors/sqla/views.py:453
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:173
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:213
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:420
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:232
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:340
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:268
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:415
+#: superset/connectors/sqla/views.py:476 superset/connectors/sqla/views.py:477
 #: superset/templates/superset/import_dashboards.html:53
 #: superset/views/database/forms.py:112 superset/views/database/forms.py:309
-#: superset/views/database/mixins.py:190 superset/views/sql_lab.py:72
+#: superset/views/database/mixins.py:191 superset/views/sql_lab.py:72
 msgid "Database"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:454 superset/views/database/mixins.py:192
+#: superset/connectors/sqla/views.py:478 superset/views/database/mixins.py:193
 msgid "Last Changed"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:272
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:424
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:239
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:223
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:380
-#: superset/connectors/sqla/views.py:456 superset/views/database/forms.py:118
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:283
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:435
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:241
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:278
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:435
+#: superset/connectors/sqla/views.py:480 superset/views/database/forms.py:118
 #: superset/views/database/forms.py:315
 msgid "Schema"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:458
+#: superset/connectors/sqla/views.py:482
 msgid "Offset"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:460 superset/views/database/forms.py:87
+#: superset/connectors/sqla/views.py:484 superset/views/database/forms.py:87
 #: superset/views/database/forms.py:276
 msgid "Table Name"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:461
+#: superset/connectors/sqla/views.py:485
 msgid "Fetch Values Predicate"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:463
+#: superset/connectors/sqla/views.py:487
 msgid "Main Datetime Column"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:465
+#: superset/connectors/sqla/views.py:489
 msgid "SQL Lab View"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:125
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:616
-#: superset/connectors/sqla/views.py:466
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:94
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:638
+#: superset/connectors/sqla/views.py:490
 msgid "Template parameters"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:495
+#: superset/connectors/sqla/views.py:526
 msgid ""
 "The table was created. As part of this two-phase configuration process, "
 "you should now click the edit button by the new table to configure it."
 msgstr ""
 
-#: superset/connectors/sqla/views.py:520
+#: superset/connectors/sqla/views.py:551
 msgid "Refresh Metadata"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:520
+#: superset/connectors/sqla/views.py:551
 msgid "Refresh column metadata"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:554
+#: superset/connectors/sqla/views.py:588
 #, python-format
 msgid "Metadata refreshed for the following table(s): %(tables)s"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:564
+#: superset/connectors/sqla/views.py:598
 #, python-format
 msgid "The following tables added new columns: %(tables)s"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:575
+#: superset/connectors/sqla/views.py:609
 #, python-format
 msgid "The following tables removed columns: %(tables)s"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:586
+#: superset/connectors/sqla/views.py:620
 #, python-format
 msgid "The following tables update column metadata: %(tables)s"
 msgstr ""
 
-#: superset/connectors/sqla/views.py:593
+#: superset/connectors/sqla/views.py:627
 #, python-format
 msgid "Unable to refresh metadata for the following table(s): %(tables)s"
 msgstr ""
@@ -1482,17 +1572,21 @@ msgstr ""
 msgid "CSS template not found."
 msgstr ""
 
-#: superset/dashboards/api.py:453
+#: superset/dashboards/api.py:606
 #, python-format
 msgid "Deleted %(num)d dashboard"
 msgid_plural "Deleted %(num)d dashboards"
 msgstr[0] ""
 msgstr[1] ""
 
-#: superset/dashboards/filters.py:32
+#: superset/dashboards/filters.py:35
 msgid "Title or Slug"
 msgstr ""
 
+#: superset/dashboards/filters.py:153
+msgid "Role"
+msgstr ""
+
 #: superset/dashboards/commands/exceptions.py:37
 msgid "Must be unique"
 msgstr ""
@@ -1529,6 +1623,10 @@ msgstr ""
 msgid "Import dashboard failed for an unknown reason"
 msgstr ""
 
+#: superset/dashboards/commands/exceptions.py:81
+msgid "You don't have access to this dashboard."
+msgstr ""
+
 #: superset/dashboards/commands/importers/v0.py:303
 msgid "No data in file"
 msgstr ""
@@ -1537,98 +1635,112 @@ msgstr ""
 msgid "Table name undefined"
 msgstr ""
 
-#: superset/databases/schemas.py:140
+#: superset/databases/schemas.py:143
 msgid ""
 "Invalid connection string, a valid string usually follows: "
 "driver://user:password@database-host/database-name"
 msgstr ""
 
-#: superset/databases/schemas.py:150
-msgid "SQLite database cannot be used as a data source for security reasons."
-msgstr ""
-
-#: superset/databases/schemas.py:181 superset/databases/schemas.py:196
+#: superset/databases/schemas.py:178 superset/databases/schemas.py:193
 #, python-format
 msgid "Field cannot be decoded by JSON. %(msg)s"
 msgstr ""
 
-#: superset/databases/schemas.py:204
+#: superset/databases/schemas.py:201
 #, python-format
 msgid ""
 "The metadata_params in Extra field is not configured correctly. The key "
 "%(key)s is invalid."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:31
+#: superset/databases/schemas.py:248
+msgid ""
+"An engine must be specified when passing individual parameters to a "
+"database."
+msgstr ""
+
+#: superset/databases/schemas.py:259
+#, python-format
+msgid "Engine \"%(engine)s\" is not a valid engine."
+msgstr ""
+
+#: superset/databases/schemas.py:265
+#, python-format
+msgid ""
+"Engine spec \"%(engine_spec)s\" does not support being configured via "
+"individual parameters."
+msgstr ""
+
+#: superset/databases/commands/exceptions.py:32
 msgid "Database parameters are invalid."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:41
+#: superset/databases/commands/exceptions.py:42
 msgid "A database with the same name already exists"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:169
-#: superset/databases/commands/exceptions.py:49
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:223
+#: superset/databases/commands/exceptions.py:50
 msgid "Field is required"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:61
+#: superset/databases/commands/exceptions.py:62
 msgid "Field cannot be decoded by JSON.  %{json_error}s"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:78
-#: superset/views/database/mixins.py:251
+#: superset/databases/commands/exceptions.py:79
+#: superset/views/database/mixins.py:252
 msgid ""
 "The metadata_params in Extra field is not configured correctly. The key "
 "%{key}s is invalid."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:90
+#: superset/databases/commands/exceptions.py:91
 msgid "Database not found."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:94
+#: superset/databases/commands/exceptions.py:95
 msgid "Database could not be created."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:98
+#: superset/databases/commands/exceptions.py:99
 msgid "Database could not be updated."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:104
-#: superset/databases/commands/exceptions.py:120 superset/views/core.py:1284
+#: superset/databases/commands/exceptions.py:105
+#: superset/databases/commands/exceptions.py:122 superset/views/core.py:1296
 msgid "Connection failed, please check your connection settings"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:108
+#: superset/databases/commands/exceptions.py:109
 msgid "Cannot delete a database that has tables attached"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:112
+#: superset/databases/commands/exceptions.py:113
 msgid "Database could not be deleted."
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:124
+#: superset/databases/commands/exceptions.py:126
 msgid "Stopped an unsafe database connection"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:128
+#: superset/databases/commands/exceptions.py:130
 msgid "Could not load database driver"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:132 superset/views/core.py:1292
+#: superset/databases/commands/exceptions.py:135 superset/views/core.py:1304
 msgid "Unexpected error occurred, please check your logs for details"
 msgstr ""
 
-#: superset/databases/commands/exceptions.py:136
+#: superset/databases/commands/exceptions.py:139
 msgid "Import database failed for an unknown reason"
 msgstr ""
 
-#: superset/databases/commands/test_connection.py:69
+#: superset/databases/commands/test_connection.py:95
 msgid "Could not load database driver: {}"
 msgstr ""
 
-#: superset/datasets/api.py:631
+#: superset/datasets/api.py:634
 #, python-format
 msgid "Deleted %(num)d dataset"
 msgid_plural "Deleted %(num)d datasets"
@@ -1639,116 +1751,343 @@ msgstr[1] ""
 msgid "Null or Empty"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:47
+#: superset/datasets/columns/commands/exceptions.py:23
+msgid "Dataset column not found."
+msgstr ""
+
+#: superset/datasets/columns/commands/exceptions.py:27
+msgid "Dataset column delete failed."
+msgstr ""
+
+#: superset/datasets/columns/commands/exceptions.py:31
+#: superset/datasets/metrics/commands/exceptions.py:31
+msgid "Changing this dataset is forbidden."
+msgstr ""
+
+#: superset/datasets/commands/exceptions.py:32
+#, python-format
+msgid "Dataset %(name)s already exists"
+msgstr ""
+
+#: superset/datasets/commands/exceptions.py:50
 msgid "Database not allowed to change"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:67
+#: superset/datasets/commands/exceptions.py:70
 msgid "One or more columns do not exist"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:77
+#: superset/datasets/commands/exceptions.py:80
 msgid "One or more columns are duplicated"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:87
+#: superset/datasets/commands/exceptions.py:90
 msgid "One or more columns already exist"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:96
+#: superset/datasets/commands/exceptions.py:99
 msgid "One or more metrics do not exist"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:106
+#: superset/datasets/commands/exceptions.py:109
 msgid "One or more metrics are duplicated"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:116
+#: superset/datasets/commands/exceptions.py:119
 msgid "One or more metrics already exist"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:127
+#: superset/datasets/commands/exceptions.py:130
 #, python-format
 msgid ""
 "Table [%(table_name)s] could not be found, please double check your "
 "database connection, schema, and table name"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:149
+#: superset/datasets/commands/exceptions.py:153
 msgid "Dataset parameters are invalid."
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:153
+#: superset/datasets/commands/exceptions.py:157
 msgid "Dataset could not be created."
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:157
-#: superset/datasets/commands/exceptions.py:169
+#: superset/datasets/commands/exceptions.py:161
+#: superset/datasets/commands/exceptions.py:173
 msgid "Dataset could not be updated."
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:161
+#: superset/datasets/commands/exceptions.py:165
 msgid "Dataset could not be deleted."
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:165
+#: superset/datasets/commands/exceptions.py:169
 msgid "Dataset(s) could not be bulk deleted."
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:173
+#: superset/datasets/commands/exceptions.py:177
 msgid "Changing this dataset is forbidden"
 msgstr ""
 
-#: superset/datasets/commands/exceptions.py:177
+#: superset/datasets/commands/exceptions.py:181
 msgid "Import dataset failed for an unknown reason"
 msgstr ""
 
-#: superset/db_engine_specs/presto.py:834
-msgid "Unknown Presto Error"
+#: superset/datasets/metrics/commands/exceptions.py:23
+msgid "Dataset metric not found."
 msgstr ""
 
-#: superset/db_engine_specs/presto.py:1052
+#: superset/datasets/metrics/commands/exceptions.py:27
+msgid "Dataset metric delete failed."
+msgstr ""
+
+#: superset/db_engine_specs/base.py:86
+msgid "Original value"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:87
+msgid "Second"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:88
+msgid "Minute"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:89
+msgid "5 minute"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:90
+msgid "10 minute"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:91
+msgid "15 minute"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:92
+msgid "Half hour"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:93
+msgid "Hour"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:94
+msgid "Day"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:95
+msgid "Week"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:96
+msgid "Month"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:97
+msgid "Quarter"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:98
+msgid "Year"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:99
+msgid "Week starting sunday"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:100
+msgid "Week starting monday"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:101
+msgid "Week ending saturday"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:102
+msgid "Week_ending sunday"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:1276
+msgid "Username"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:1277
+msgid "Password"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:1278
+msgid "Hostname or IP address"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:1279
+msgid "Database port"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:1280
+msgid "Database name"
+msgstr ""
+
+#: superset/db_engine_specs/base.py:1282
+msgid "Additinal parameters"
+msgstr ""
+
+#: superset/db_engine_specs/bigquery.py:100
+msgid ""
+"We were unable to connect to your database. Please confirm that your "
+"service account has the Viewer and Job User roles on the project."
+msgstr ""
+
+#: superset/db_engine_specs/mssql.py:69
+#, python-format
+msgid ""
+"Either the username \"%(username)s\", password, or database name "
+"\"%(database)s\" is incorrect."
+msgstr ""
+
+#: superset/db_engine_specs/mssql.py:76
+#: superset/db_engine_specs/postgres.py:112
+#: superset/db_engine_specs/presto.py:195
+#: superset/db_engine_specs/redshift.py:58
+#, python-format
+msgid "The hostname \"%(hostname)s\" cannot be resolved."
+msgstr ""
+
+#: superset/db_engine_specs/mssql.py:80
+#: superset/db_engine_specs/postgres.py:116
+#: superset/db_engine_specs/presto.py:206
+#: superset/db_engine_specs/redshift.py:62
+#, python-format
+msgid "Port %(port)s on hostname \"%(hostname)s\" refused the connection."
+msgstr ""
+
+#: superset/db_engine_specs/mssql.py:84
+#: superset/db_engine_specs/postgres.py:120
+#: superset/db_engine_specs/presto.py:199
+#: superset/db_engine_specs/redshift.py:66
+#, python-format
+msgid ""
+"The host \"%(hostname)s\" might be down, and can't be reached on port "
+"%(port)s."
+msgstr ""
+
+#: superset/db_engine_specs/mysql.py:112 superset/db_engine_specs/presto.py:191
+#: superset/db_engine_specs/redshift.py:54
+#, python-format
+msgid "Either the username \"%(username)s\" or the password is incorrect."
+msgstr ""
+
+#: superset/db_engine_specs/mysql.py:116
+#, python-format
+msgid "Unknown MySQL server host \"%(hostname)s\"."
+msgstr ""
+
+#: superset/db_engine_specs/mysql.py:120
+#, python-format
+msgid "The host \"%(hostname)s\" might be down and can't be reached."
+msgstr ""
+
+#: superset/db_engine_specs/mysql.py:124
+#: superset/db_engine_specs/postgres.py:127
+#, python-format
+msgid "Unable to connect to database \"%(database)s\"."
+msgstr ""
+
+#: superset/db_engine_specs/postgres.py:104
+#, python-format
+msgid "The username \"%(username)s\" does not exist."
+msgstr ""
+
+#: superset/db_engine_specs/postgres.py:108
+#, python-format
+msgid "The password provided for username \"%(username)s\" is incorrect."
+msgstr ""
+
+#: superset/db_engine_specs/presto.py:170
 #, python-format
 msgid ""
 "We can't seem to resolve the column \"%(column_name)s\" at line "
 "%(location)s."
 msgstr ""
 
-#: superset/db_engine_specs/presto.py:1069
+#: superset/db_engine_specs/presto.py:177
 #, python-format
 msgid ""
 "The table \"%(table_name)s\" does not exist. A valid table must be used "
 "to run this query."
 msgstr ""
 
-#: superset/queries/saved_queries/api.py:188
+#: superset/db_engine_specs/presto.py:184
+#, python-format
+msgid ""
+"The schema \"%(schema_name)s\" does not exist. A valid schema must be "
+"used to run this query."
+msgstr ""
+
+#: superset/db_engine_specs/presto.py:210
+#, python-format
+msgid "Unable to connect to catalog named \"%(catalog_name)s\"."
+msgstr ""
+
+#: superset/db_engine_specs/presto.py:997
+msgid "Unknown Presto Error"
+msgstr ""
+
+#: superset/db_engine_specs/redshift.py:73
+#, python-format
+msgid ""
+"We were unable to connect to your database named \"%(database)s\". Please"
+" verify your database name and try again."
+msgstr ""
+
+#: superset/models/sql_types/base.py:50
+#, python-format
+msgid "Temporal expression not supported for type: %(col_type)s"
+msgstr ""
+
+#: superset/queries/saved_queries/api.py:197
 #, python-format
 msgid "Deleted %(num)d saved query"
 msgid_plural "Deleted %(num)d saved queries"
 msgstr[0] ""
 msgstr[1] ""
 
-#: superset/queries/saved_queries/commands/exceptions.py:23
+#: superset/queries/saved_queries/commands/exceptions.py:28
 msgid "Saved queries could not be deleted."
 msgstr ""
 
-#: superset/queries/saved_queries/commands/exceptions.py:27
+#: superset/queries/saved_queries/commands/exceptions.py:32
 msgid "Saved query not found."
 msgstr ""
 
-#: superset/reports/api.py:417
+#: superset/queries/saved_queries/commands/exceptions.py:36
+msgid "Import saved query failed for an unknown reason."
+msgstr ""
+
+#: superset/queries/saved_queries/commands/exceptions.py:40
+msgid "Saved query parameters are invalid."
+msgstr ""
+
+#: superset/reports/api.py:422
 #, python-format
 msgid "Deleted %(num)d report schedule"
 msgid_plural "Deleted %(num)d report schedules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: superset/reports/commands/alert.py:74
+#: superset/reports/schemas.py:166 superset/reports/schemas.py:172
+#: superset/reports/schemas.py:178 superset/reports/schemas.py:245
+#: superset/reports/schemas.py:251 superset/reports/schemas.py:258
+msgid "Value must be greater than 0"
+msgstr ""
+
+#: superset/reports/commands/alert.py:96
 #, python-format
 msgid "Alert query returned more then one row. %s rows returned"
 msgstr ""
 
-#: superset/reports/commands/alert.py:83
+#: superset/reports/commands/alert.py:105
 #, python-format
 msgid "Alert query returned more then one column. %s columns returned"
 msgstr ""
@@ -1806,79 +2145,109 @@ msgid "Report Schedule execution failed when generating a screenshot."
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:116
-msgid "Report Schedule execution got an unexpected error."
+msgid "Report Schedule execution failed when generating a csv."
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:120
-msgid "Report Schedule is still working, refusing to re-compute."
+msgid "Report Schedule execution got an unexpected error."
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:124
+msgid "Report Schedule is still working, refusing to re-compute."
+msgstr ""
+
+#: superset/reports/commands/exceptions.py:128
 msgid "Report Schedule reached a working timeout."
 msgstr ""
 
-#: superset/reports/commands/exceptions.py:138
+#: superset/reports/commands/exceptions.py:142
 msgid "Alert query returned more then one row."
 msgstr ""
 
-#: superset/reports/commands/exceptions.py:143
+#: superset/reports/commands/exceptions.py:147
 msgid "Alert validator config error."
 msgstr ""
 
-#: superset/reports/commands/exceptions.py:147
+#: superset/reports/commands/exceptions.py:151
 msgid "Alert query returned more then one column."
 msgstr ""
 
-#: superset/reports/commands/exceptions.py:151
+#: superset/reports/commands/exceptions.py:155
 msgid "Alert query returned a non-number value."
 msgstr ""
 
-#: superset/reports/commands/exceptions.py:155
+#: superset/reports/commands/exceptions.py:159
 msgid "Alert found an error while executing a query."
 msgstr ""
 
-#: superset/reports/commands/exceptions.py:159
-msgid "Alert fired during grace period."
-msgstr ""
-
 #: superset/reports/commands/exceptions.py:163
-msgid "Alert ended grace period."
+msgid "A timeout occurred while executing the query."
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:167
-msgid "Alert on grace period"
+msgid "A timeout occurred while taking a screenshot."
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:171
-msgid "Report Schedule sellenium user not found"
+msgid "A timeout occurred while generating a csv."
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:175
-msgid "Report Schedule state not found"
+msgid "Alert fired during grace period."
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:179
-msgid "Report schedule unexpected error"
+msgid "Alert ended grace period."
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:183
-msgid "Changing this report is forbidden"
+msgid "Alert on grace period"
 msgstr ""
 
 #: superset/reports/commands/exceptions.py:187
+msgid "Report Schedule sellenium user not found"
+msgstr ""
+
+#: superset/reports/commands/exceptions.py:191
+msgid "Report Schedule state not found"
+msgstr ""
+
+#: superset/reports/commands/exceptions.py:195
+msgid "Report schedule unexpected error"
+msgstr ""
+
+#: superset/reports/commands/exceptions.py:199
+msgid "Changing this report is forbidden"
+msgstr ""
+
+#: superset/reports/commands/exceptions.py:203
 msgid "An error occurred while pruning logs "
 msgstr ""
 
-#: superset/reports/notifications/email.py:59 superset/tasks/schedules.py:185
+#: superset/reports/notifications/email.py:55
 #, python-format
 msgid ""
 "\n"
-"            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n"
-"            <img src=\"cid:%(msgid)s\">\n"
+"            Error: %(text)s\n"
 "            "
 msgstr ""
 
-#: superset/reports/notifications/email.py:70 superset/tasks/schedules.py:294
+#: superset/reports/notifications/email.py:79
+#, python-format
+msgid ""
+"\n"
+"            <p>%(description)s</p>\n"
+"            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n"
+"            %(img_tag)s\n"
+"            "
+msgstr ""
+
+#: superset/reports/notifications/email.py:86 superset/tasks/schedules.py:362
+#, python-format
+msgid "%(name)s.csv"
+msgstr ""
+
+#: superset/reports/notifications/email.py:90 superset/tasks/schedules.py:294
 #: superset/tasks/schedules.py:463
 #, python-format
 msgid "%(prefix)s %(title)s"
@@ -1890,10 +2259,29 @@ msgid ""
 "\n"
 "            *%(name)s*\n"
 "\n"
+"            %(description)s\n"
+"\n"
+"            Error: %(text)s\n"
+"            "
+msgstr ""
+
+#: superset/reports/notifications/slack.py:64
+#, python-format
+msgid ""
+"\n"
+"            *%(name)s*\n"
+"\n"
+"            %(description)s\n"
+"\n"
 "            <%(url)s|Explore in Superset>\n"
 "            "
 msgstr ""
 
+#: superset/security/analytics_db_safety.py:44
+#, python-format
+msgid "%(dialect)s cannot be used as a data source for security reasons."
+msgstr ""
+
 #: superset/tasks/schedules.py:160
 #, python-format
 msgid ""
@@ -1909,9 +2297,13 @@ msgstr ""
 msgid "<b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>"
 msgstr ""
 
-#: superset/tasks/schedules.py:362
+#: superset/tasks/schedules.py:185
 #, python-format
-msgid "%(name)s.csv"
+msgid ""
+"\n"
+"            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n"
+"            <img src=\"cid:%(msgid)s\">\n"
+"            "
 msgstr ""
 
 #: superset/tasks/schedules.py:370
@@ -1933,46 +2325,46 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1144
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1081
 #: superset/templates/appbuilder/navbar_right.html:38
 msgid "SQL Query"
 msgstr ""
 
 #: superset-frontend/src/components/Menu/NewMenu.tsx:31
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:383
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:211
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:522
-#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:148
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:387
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:225
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:545
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:154
 #: superset/templates/appbuilder/navbar_right.html:39
 #: superset/views/chart/mixin.py:85 superset/views/chart/views.py:114
-#: superset/views/schedules.py:286
+#: superset/views/schedules.py:307
 msgid "Chart"
 msgstr ""
 
 #: superset-frontend/src/components/Menu/NewMenu.tsx:36
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:481
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:494
 #: superset/templates/appbuilder/navbar_right.html:40
-#: superset/views/dashboard/mixin.py:72 superset/views/dashboard/views.py:145
-#: superset/views/schedules.py:223
+#: superset/views/dashboard/mixin.py:78 superset/views/dashboard/views.py:145
+#: superset/views/schedules.py:227
 msgid "Dashboard"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:212
+#: superset-frontend/src/components/Menu/Menu.tsx:231
 #: superset/templates/appbuilder/navbar_right.html:109
 msgid "Profile"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:217
+#: superset-frontend/src/components/Menu/Menu.tsx:235
 #: superset/templates/appbuilder/navbar_right.html:110
 msgid "Info"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:220
+#: superset-frontend/src/components/Menu/Menu.tsx:238
 #: superset/templates/appbuilder/navbar_right.html:111
 msgid "Logout"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:276
+#: superset-frontend/src/components/Menu/Menu.tsx:290
 #: superset/templates/appbuilder/navbar_right.html:126
 msgid "Login"
 msgstr ""
@@ -1989,17 +2381,17 @@ msgstr ""
 msgid "Filter List"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:296
-#: superset-frontend/src/explore/components/DataTableControl.tsx:73
-#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:226
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:398
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:306
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:466
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:292
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:424
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:388
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:450
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:397
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:256
+#: superset-frontend/src/explore/components/DataTableControl/index.tsx:77
+#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:228
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:403
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:309
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:481
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:295
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:429
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:404
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:461
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:452
 #: superset/templates/appbuilder/general/widgets/search.html:40
 msgid "Search"
 msgstr ""
@@ -2008,6 +2400,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:508
 #: superset/templates/superset/import_dashboards.html:21
 msgid "Import dashboards"
 msgstr ""
@@ -2042,15 +2435,18 @@ msgstr ""
 msgid "Request Permissions"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:176
-#: superset-frontend/src/common/components/Modal/Modal.tsx:145
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:305
-#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:142
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:472
-#: superset-frontend/src/datasource/DatasourceModal.tsx:202
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:175
-#: superset-frontend/src/explore/components/SaveModal.tsx:174
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:749
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:177
+#: superset-frontend/src/components/Modal/Modal.tsx:146
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:80
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:440
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:151
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:142
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:76
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:83
+#: superset-frontend/src/datasource/DatasourceModal.tsx:207
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:170
+#: superset-frontend/src/explore/components/SaveModal.tsx:180
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:750
 #: superset/templates/superset/request_access.html:34
 msgid "Cancel"
 msgstr ""
@@ -2063,113 +2459,125 @@ msgstr ""
 msgid "Test Connection"
 msgstr ""
 
-#: superset/utils/core.py:794
+#: superset/utils/core.py:882
 #, python-format
 msgid "[Superset] Access to the datasource %(name)s was granted"
 msgstr ""
 
-#: superset/utils/date_parser.py:378
-msgid "Unable to find such a holiday: [{}]"
+#: superset/utils/date_parser.py:386
+#, python-format
+msgid "Unable to find such a holiday: [%(holiday)s]"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:136
+#: superset/utils/pandas_postprocessing.py:137
 msgid "Referenced columns not available in DataFrame."
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:161
+#: superset/utils/pandas_postprocessing.py:162
 #, python-format
 msgid "Column referenced by aggregate is undefined: %(column)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:168
+#: superset/utils/pandas_postprocessing.py:169
 #, python-format
 msgid "Operator undefined for aggregator: %(name)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:177
+#: superset/utils/pandas_postprocessing.py:178
 #, python-format
 msgid "Invalid numpy function: %(operator)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:245
+#: superset/utils/pandas_postprocessing.py:246
 msgid "Pivot operation requires at least one index"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:249
+#: superset/utils/pandas_postprocessing.py:250
 msgid "Pivot operation must include at least one aggregate"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:357
+#: superset/utils/pandas_postprocessing.py:358
 msgid "Undefined window for rolling operation"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:372
+#: superset/utils/pandas_postprocessing.py:373
 #, python-format
 msgid "Invalid rolling_type: %(type)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:378
+#: superset/utils/pandas_postprocessing.py:379
 #, python-format
 msgid "Invalid options for %(rolling_type)s: %(options)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:463
+#: superset/utils/pandas_postprocessing.py:464
 #, python-format
 msgid "Invalid cumulative operator: %(operator)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:489
+#: superset/utils/pandas_postprocessing.py:490
 msgid "Invalid geohash string"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:512
+#: superset/utils/pandas_postprocessing.py:513
 msgid "Invalid longitude/latitude"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:554
+#: superset/utils/pandas_postprocessing.py:555
 msgid "Invalid geodetic string"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:616
-msgid "`fbprophet` package not installed"
+#: superset/utils/pandas_postprocessing.py:588
+#, python-format
+msgid ""
+"Column \"%(column)s\" is not numeric or does not exists in the query "
+"results."
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:667
+#: superset/utils/pandas_postprocessing.py:598
+msgid "`rename_columns` must have the same length as `columns`."
+msgstr ""
+
+#: superset/utils/pandas_postprocessing.py:641
+msgid "`prophet` package not installed"
+msgstr ""
+
+#: superset/utils/pandas_postprocessing.py:692
 msgid "Time grain missing"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:670
+#: superset/utils/pandas_postprocessing.py:695
 #, python-format
 msgid "Unsupported time grain: %(time_grain)s"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:676
+#: superset/utils/pandas_postprocessing.py:701
 msgid "Periods must be a positive integer value"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:679
+#: superset/utils/pandas_postprocessing.py:704
 msgid "Confidence interval must be between 0 and 1 (exclusive)"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:682
+#: superset/utils/pandas_postprocessing.py:707
 msgid "DataFrame must include temporal column"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:684
+#: superset/utils/pandas_postprocessing.py:709
 msgid "DataFrame include at least one series"
 msgstr ""
 
-#: superset/utils/pandas_postprocessing.py:773
+#: superset/utils/pandas_postprocessing.py:798
 msgid ""
 "percentiles must be a list or tuple with two numeric values, of which the"
 " first is lower than the second value"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:208
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:282
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:372
+#: superset-frontend/src/components/Menu/Menu.tsx:228
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:284
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:374
 #: superset/views/access_requests.py:40 superset/views/log/__init__.py:30
-#: superset/views/schedules.py:226 superset/views/schedules.py:289
+#: superset/views/schedules.py:230 superset/views/schedules.py:310
 #: superset/views/sql_lab.py:71
 msgid "User"
 msgstr ""
@@ -2186,47 +2594,56 @@ msgstr ""
 msgid "Roles to grant"
 msgstr ""
 
-#: superset/views/access_requests.py:45 superset/views/schedules.py:224
-#: superset/views/schedules.py:287
+#: superset/views/access_requests.py:45 superset/views/schedules.py:228
+#: superset/views/schedules.py:308
 msgid "Created On"
 msgstr ""
 
-#: superset/views/alerts.py:59
+#: superset/views/alerts.py:63
 msgid "List Observations"
 msgstr ""
 
-#: superset/views/alerts.py:60
+#: superset/views/alerts.py:64
 msgid "Show Observation"
 msgstr ""
 
-#: superset/views/alerts.py:67
+#: superset/views/alerts.py:71
 msgid "Error Message"
 msgstr ""
 
-#: superset/views/alerts.py:165
+#: superset/views/alerts.py:168
 msgid "Log Retentions (days)"
 msgstr ""
 
-#: superset/views/alerts.py:174
+#: superset/views/alerts.py:177
 msgid "A semicolon ';' delimited list of email addresses"
 msgstr ""
 
-#: superset/views/alerts.py:175
+#: superset/views/alerts.py:178
 msgid "How long to keep the logs around for this alert"
 msgstr ""
 
-#: superset/views/alerts.py:176
+#: superset/views/alerts.py:179
 msgid ""
 "Once an alert is triggered, how long, in seconds, before Superset nags "
 "you again."
 msgstr ""
 
-#: superset/views/alerts.py:180
+#: superset/views/alerts.py:183
 msgid ""
 "A SQL statement that defines whether the alert should get triggered or "
 "not. The query is expected to return either NULL or a number value."
 msgstr ""
 
+#: superset/views/alerts.py:220 superset/views/schedules.py:244
+#: superset/views/schedules.py:325
+msgid ""
+"This feature is deprecated and will be removed on 2.0. Take a look at the"
+" replacement feature <a "
+"href='https://superset.apache.org/docs/installation/alerts-"
+"reports'>Alerts & Reports documentation</a>"
+msgstr ""
+
 #: superset/views/annotations.py:40
 msgid "annotation start time or end time is required."
 msgstr ""
@@ -2255,28 +2672,28 @@ msgstr ""
 msgid "Layer"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:148
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:146
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:150
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:837
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:845
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:157
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:149
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:146
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:165
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:169
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:865
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:873
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:157
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:148
 #: superset/views/annotations.py:79 superset/views/sql_lab.py:70
 msgid "Label"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:161
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:160
 #: superset/views/annotations.py:81
 msgid "Start"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:170
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:169
 #: superset/views/annotations.py:82
 msgid "End"
 msgstr ""
 
-#: superset/views/annotations.py:83 superset/views/dashboard/mixin.py:82
+#: superset/views/annotations.py:83 superset/views/dashboard/mixin.py:89
 msgid "JSON Metadata"
 msgstr ""
 
@@ -2292,212 +2709,213 @@ msgstr ""
 msgid "Edit Annotation Layer"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:119
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:200
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:706
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:218
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:132
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:131
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:252
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:209
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:120
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:195
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:707
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:223
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:135
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:134
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:263
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:264
 #: superset/views/annotations.py:128 superset/views/chart/mixin.py:86
 msgid "Name"
 msgstr ""
 
-#: superset/views/base.py:207
-#, python-format
-msgid "Dataset %(name)s already exists"
-msgstr ""
-
-#: superset/views/base.py:227
+#: superset/views/base.py:235
 msgid ""
 "Table [%{table}s] could not be found, please double check your database "
 "connection, schema, and table name, error: {}"
 msgstr ""
 
-#: superset/views/base.py:378
+#: superset/views/base.py:462
 msgid "json isn't valid"
 msgstr ""
 
-#: superset/views/base.py:389
+#: superset/views/base.py:473
 msgid "Export to YAML"
 msgstr ""
 
-#: superset/views/base.py:389
+#: superset/views/base.py:473
 msgid "Export to YAML?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:310
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:472
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:315
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:370
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:98
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:309
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:559
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:336
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:295
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:512
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:330
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:592
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:444
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:230
-#: superset/views/base.py:446
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:120
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:82
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:315
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:480
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:314
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:378
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:101
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:323
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:590
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:339
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:130
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:303
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:533
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:341
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:611
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:499
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:232
+#: superset/views/base.py:530
 msgid "Delete"
 msgstr ""
 
-#: superset/views/base.py:446
+#: superset/views/base.py:530
 msgid "Delete all Really?"
 msgstr ""
 
-#: superset/views/base_api.py:100
+#: superset/views/base_api.py:107
 msgid "Is favorite"
 msgstr ""
 
-#: superset/views/core.py:161
+#: superset/views/core.py:163
 msgid "The data source seems to have been deleted"
 msgstr ""
 
-#: superset/views/core.py:162
+#: superset/views/core.py:164
 msgid "The user seems to have been deleted"
 msgstr ""
 
-#: superset/views/core.py:277
+#: superset/views/core.py:279
 msgid "Access was requested"
 msgstr ""
 
-#: superset/views/core.py:331
+#: superset/views/core.py:333
 msgid "The access requests seem to have been deleted"
 msgstr ""
 
-#: superset/views/core.py:343
+#: superset/views/core.py:345
 #, python-format
 msgid ""
 "%(user)s was granted the role %(role)s that gives access to the "
 "%(datasource)s"
 msgstr ""
 
-#: superset/views/core.py:366
+#: superset/views/core.py:368
 #, python-format
 msgid "Role %(r)s was extended to provide the access to the datasource %(ds)s"
 msgstr ""
 
-#: superset/views/core.py:383
+#: superset/views/core.py:385
 msgid "You have no permission to approve this request"
 msgstr ""
 
-#: superset/views/core.py:634
+#: superset/views/core.py:636
 #, python-format
 msgid ""
 "Cannot import dashboard: %(db_error)s.\n"
 "Make sure to create the database before importing the dashboard."
 msgstr ""
 
-#: superset/views/core.py:645
+#: superset/views/core.py:647
 msgid "An unknown error occurred. Please contact your Superset administrator"
 msgstr ""
 
-#: superset/views/core.py:710
-#, python-format
-msgid "Error occurred when opening the chart: %(error)s"
+#: superset/views/core.py:719
+msgid "[Missing Dataset]"
 msgstr ""
 
-#: superset/views/core.py:764 superset/views/core.py:770
-#: superset/views/core.py:917 superset/views/core.py:935
+#: superset/views/core.py:759 superset/views/core.py:765
+#: superset/views/core.py:926 superset/views/core.py:944
 msgid "You don't have the rights to "
 msgstr ""
 
-#: superset/views/core.py:764 superset/views/core.py:918
+#: superset/views/core.py:759 superset/views/core.py:927
 msgid "alter this "
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:129
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:600
-#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:64
-#: superset/views/core.py:764 superset/views/core.py:770
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:139
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:631
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:66
+#: superset/views/core.py:759 superset/views/core.py:765
 msgid "chart"
 msgstr ""
 
-#: superset/views/core.py:770 superset/views/core.py:936
+#: superset/views/core.py:765 superset/views/core.py:945
 msgid "create a "
 msgstr ""
 
-#: superset/views/core.py:810
+#: superset/views/core.py:815
 #, python-format
 msgid "Explore - %(table)s"
 msgstr ""
 
-#: superset/views/core.py:893
+#: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:99
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:170
+#: superset/views/core.py:817
+msgid "Explore"
+msgstr ""
+
+#: superset/views/core.py:902
 msgid "Chart [{}] has been saved"
 msgstr ""
 
-#: superset/views/core.py:897
+#: superset/views/core.py:906
 msgid "Chart [{}] has been overwritten"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:102
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:563
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:55
-#: superset/views/core.py:919 superset/views/core.py:937
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:108
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:584
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:56
+#: superset/views/core.py:928 superset/views/core.py:946
 msgid "dashboard"
 msgstr ""
 
-#: superset/views/core.py:924
+#: superset/views/core.py:933
 msgid "Chart [{}] was added to dashboard [{}]"
 msgstr ""
 
-#: superset/views/core.py:946
+#: superset/views/core.py:955
 msgid "Dashboard [{}] just got created and chart [{}] was added to it"
 msgstr ""
 
-#: superset/views/core.py:1174
+#: superset/views/core.py:1186
 msgid ""
 "This dashboard was changed recently. Please reload dashboard to get "
 "latest version."
 msgstr ""
 
-#: superset/views/core.py:1267
+#: superset/views/core.py:1279
 #, python-format
 msgid "Could not load database driver: %(driver_name)s"
 msgstr ""
 
-#: superset/views/core.py:1276
+#: superset/views/core.py:1288
 msgid ""
 "Invalid connection string, a valid string usually follows:\n"
 "'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-NAME'"
 msgstr ""
 
-#: superset/views/core.py:1632
+#: superset/views/core.py:1651
 msgid ""
 "Malformed request. slice_id or table_name and db_name arguments are "
 "expected"
 msgstr ""
 
-#: superset/views/core.py:1642
+#: superset/views/core.py:1661
 #, python-format
 msgid "Chart %(id)s not found"
 msgstr ""
 
-#: superset/views/core.py:1655
+#: superset/views/core.py:1674
 #, python-format
 msgid "Table %(table)s wasn't found in the database %(db)s"
 msgstr ""
 
-#: superset/views/core.py:1925
+#: superset/views/core.py:1908
 #, python-format
 msgid "Can't find User '%(name)s', please ask your admin to create one."
 msgstr ""
 
-#: superset/views/core.py:1937
+#: superset/views/core.py:1920
 #, python-format
 msgid "Can't find DruidCluster with cluster_name = '%(name)s'"
 msgstr ""
 
-#: superset/views/core.py:2180
+#: superset/views/core.py:2163
 msgid "Data could not be deserialized. You may want to re-run the query."
 msgstr ""
 
-#: superset/views/core.py:2284
+#: superset/views/core.py:2270
 #, python-format
 msgid ""
 "%(validator)s was unable to check your query.\n"
@@ -2505,24 +2923,24 @@ msgid ""
 "Exception: %(ex)s"
 msgstr ""
 
-#: superset/views/core.py:2338
+#: superset/views/core.py:2324
 msgid ""
 "Failed to start remote query on a worker. Tell your administrator to "
 "verify the availability of the message queue."
 msgstr ""
 
-#: superset/views/core.py:2502 superset/views/core.py:2504
+#: superset/views/core.py:2488 superset/views/core.py:2490
 msgid "Query record was not created as expected."
 msgstr ""
 
-#: superset/views/core.py:2541
+#: superset/views/core.py:2527
 #, python-format
 msgid "The parameter %(parameters)s in your query is undefined."
 msgid_plural "The following parameters in your query are undefined: %(parameters)s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: superset/views/core.py:2809
+#: superset/views/core.py:2791
 #, python-format
 msgid "%(user)s's profile"
 msgstr ""
@@ -2543,6 +2961,15 @@ msgstr ""
 msgid "Template Name"
 msgstr ""
 
+#: superset/views/datasource.py:45
+msgid "Request missing data field."
+msgstr ""
+
+#: superset/views/datasource.py:81
+#, python-format
+msgid "Duplicate column name(s): %(columns)s"
+msgstr ""
+
 #: superset/views/dynamic_plugins.py:42
 msgid "A human-friendly name"
 msgstr ""
@@ -2575,52 +3002,52 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-#: superset/views/schedules.py:183
+#: superset/views/schedules.py:187
 msgid "Schedule Email Reports for Dashboards"
 msgstr ""
 
-#: superset/views/schedules.py:185
+#: superset/views/schedules.py:189
 msgid "Manage Email Reports for Dashboards"
 msgstr ""
 
-#: superset/views/schedules.py:225 superset/views/schedules.py:288
+#: superset/views/schedules.py:229 superset/views/schedules.py:309
 msgid "Changed On"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:275
-#: superset/views/schedules.py:227 superset/views/schedules.py:290
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:280
+#: superset/views/schedules.py:231 superset/views/schedules.py:311
 msgid "Active"
 msgstr ""
 
-#: superset/views/schedules.py:228 superset/views/schedules.py:291
+#: superset/views/schedules.py:232 superset/views/schedules.py:312
 msgid "Crontab"
 msgstr ""
 
-#: superset/views/schedules.py:229 superset/views/schedules.py:292
+#: superset/views/schedules.py:233 superset/views/schedules.py:313
 msgid "Recipients"
 msgstr ""
 
-#: superset/views/schedules.py:230 superset/views/schedules.py:293
+#: superset/views/schedules.py:234 superset/views/schedules.py:314
 msgid "Slack Channel"
 msgstr ""
 
-#: superset/views/schedules.py:231 superset/views/schedules.py:294
+#: superset/views/schedules.py:235 superset/views/schedules.py:315
 msgid "Deliver As Group"
 msgstr ""
 
-#: superset/views/schedules.py:232 superset/views/schedules.py:295
+#: superset/views/schedules.py:236 superset/views/schedules.py:316
 msgid "Delivery Type"
 msgstr ""
 
-#: superset/views/schedules.py:244
+#: superset/views/schedules.py:265
 msgid "Schedule Email Reports for Charts"
 msgstr ""
 
-#: superset/views/schedules.py:246
+#: superset/views/schedules.py:267
 msgid "Manage Email Reports for Charts"
 msgstr ""
 
-#: superset/views/schedules.py:296
+#: superset/views/schedules.py:317
 msgid "Email Format"
 msgstr ""
 
@@ -2652,11 +3079,15 @@ msgstr ""
 msgid "Changed on"
 msgstr ""
 
-#: superset/views/utils.py:492
+#: superset/views/utils.py:226
+msgid "The dataset associated with this chart no longer exists"
+msgstr ""
+
+#: superset/views/utils.py:505
 msgid "Could not determine datasource type"
 msgstr ""
 
-#: superset/views/utils.py:508
+#: superset/views/utils.py:521
 msgid "Could not find viz object"
 msgstr ""
 
@@ -2710,86 +3141,89 @@ msgstr ""
 msgid "Edit Dashboard"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/Header.jsx:485
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal/FiltersList.tsx:56
-msgid "Edit dashboard"
-msgstr ""
-
-#: superset/views/dashboard/mixin.py:46
+#: superset/views/dashboard/mixin.py:47
 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 ""
 
-#: superset/views/dashboard/mixin.py:52
+#: superset/views/dashboard/mixin.py:53
 msgid ""
 "The CSS for individual dashboards can be altered here, or in the "
 "dashboard view where changes are immediately visible"
 msgstr ""
 
-#: superset/views/dashboard/mixin.py:57
+#: superset/views/dashboard/mixin.py:58
 msgid "To get a readable URL for your dashboard"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:414
-#: superset/views/dashboard/mixin.py:58
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:523
+#: superset/views/dashboard/mixin.py:59
 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 ""
 
-#: superset/views/dashboard/mixin.py:64
+#: superset/views/dashboard/mixin.py:65
 msgid "Owners is a list of users who can alter the dashboard."
 msgstr ""
 
-#: superset/views/dashboard/mixin.py:65
+#: superset/views/dashboard/mixin.py:66
+msgid ""
+"Roles is a list which defines access to the dashboard. Granting a role "
+"access to a dashboard will bypass dataset level checks.If no roles "
+"defined then the dashboard is available to all roles."
+msgstr ""
+
+#: superset/views/dashboard/mixin.py:71
 msgid ""
 "Determines whether or not this dashboard is visible in the list of all "
 "dashboards"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:329
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:207
-#: superset/views/dashboard/mixin.py:73 superset/views/dashboard/views.py:146
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:464
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:214
+#: superset/views/dashboard/mixin.py:79 superset/views/dashboard/views.py:146
 msgid "Title"
 msgstr ""
 
-#: superset/views/dashboard/mixin.py:74
+#: superset/views/dashboard/mixin.py:80
 msgid "Slug"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:101
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:229
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:407
-#: superset/views/dashboard/mixin.py:77
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:101
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:237
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:412
+#: superset/views/dashboard/mixin.py:84
 msgid "Published"
 msgstr ""
 
-#: superset/views/dashboard/mixin.py:80
+#: superset/views/dashboard/mixin.py:87
 msgid "Position JSON"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/CssEditor.jsx:83
-#: superset/views/dashboard/mixin.py:81
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:82
+#: superset/views/dashboard/mixin.py:88
 msgid "CSS"
 msgstr ""
 
-#: superset/views/dashboard/mixin.py:83
+#: superset/views/dashboard/mixin.py:90
 msgid "Underlying Tables"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:110
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:327
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:567
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:316
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:520
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:313
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:346
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:600
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:114
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:342
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:598
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:97
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:321
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:541
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:329
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:357
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:619
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:507
 #: superset/views/dashboard/views.py:66
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:88
 msgid "Export"
 msgstr ""
 
@@ -2981,24 +3415,23 @@ msgstr ""
 msgid "Strings used for sheet names (default is the first sheet)."
 msgstr ""
 
-#: superset/views/database/mixins.py:33
+#: superset/views/database/mixins.py:34
 msgid "Show Database"
 msgstr ""
 
-#: superset/views/database/mixins.py:34
+#: superset/views/database/mixins.py:35
 msgid "Add Database"
 msgstr ""
 
-#: superset/views/database/mixins.py:35
+#: superset/views/database/mixins.py:36
 msgid "Edit Database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:466
-#: superset/views/database/mixins.py:103
+#: superset/views/database/mixins.py:104
 msgid "Expose this DB in SQL Lab"
 msgstr ""
 
-#: superset/views/database/mixins.py:104
+#: superset/views/database/mixins.py:105
 msgid ""
 "Operate the database in asynchronous mode, meaning  that the queries are "
 "executed on remote workers as opposed to on the web server itself. This "
@@ -3006,29 +3439,27 @@ msgid ""
 " Refer to the installation docs for more information."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:479
-#: superset/views/database/mixins.py:112
+#: superset/views/database/mixins.py:113
 msgid "Allow CREATE TABLE AS option in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:493
-#: superset/views/database/mixins.py:113
+#: superset/views/database/mixins.py:114
 msgid "Allow CREATE VIEW AS option in SQL Lab"
 msgstr ""
 
-#: superset/views/database/mixins.py:114
+#: superset/views/database/mixins.py:115
 msgid ""
 "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...) in"
 " SQL Lab"
 msgstr ""
 
-#: superset/views/database/mixins.py:119
+#: superset/views/database/mixins.py:120
 msgid ""
 "When allowing CREATE TABLE AS option in SQL Lab, this option forces the "
 "table to be created in this schema"
 msgstr ""
 
-#: superset/views/database/mixins.py:162
+#: superset/views/database/mixins.py:163
 msgid ""
 "If Presto, all the queries in SQL Lab are going to be executed as the "
 "currently logged on user who must have permission to run them.<br/>If "
@@ -3037,93 +3468,93 @@ msgid ""
 "hive.server2.proxy.user property."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:523
-#: superset/views/database/mixins.py:169
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:434
+#: superset/views/database/mixins.py:170
 msgid ""
 "Allow SQL Lab to fetch a list of all tables and all views across all "
 "database schemas. For large data warehouse with thousands of tables, this"
 " can be expensive and put strain on the system."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:428
-#: superset/views/database/mixins.py:174
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:469
+#: superset/views/database/mixins.py:175
 msgid ""
 "Duration (in seconds) of the caching timeout for charts of this database."
 " A timeout of 0 indicates that the cache never expires. Note this "
 "defaults to the global timeout if undefined."
 msgstr ""
 
-#: superset/views/database/mixins.py:179
+#: superset/views/database/mixins.py:180
 msgid "If selected, please set the schemas allowed for csv upload in Extra."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:253
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:358
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:465
-#: superset/views/database/mixins.py:185
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:269
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:374
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:342
+#: superset/views/database/mixins.py:186
 msgid "Expose in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:477
-#: superset/views/database/mixins.py:186
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:361
+#: superset/views/database/mixins.py:187
 msgid "Allow CREATE TABLE AS"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:491
-#: superset/views/database/mixins.py:187
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:377
+#: superset/views/database/mixins.py:188
 msgid "Allow CREATE VIEW AS"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:505
-#: superset/views/database/mixins.py:188
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:415
+#: superset/views/database/mixins.py:189
 msgid "Allow DML"
 msgstr ""
 
-#: superset/views/database/mixins.py:189
+#: superset/views/database/mixins.py:190
 msgid "CTAS Schema"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:384
-#: superset/views/database/mixins.py:193
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:283
+#: superset/views/database/mixins.py:194
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: superset/views/database/mixins.py:194
+#: superset/views/database/mixins.py:195
 msgid "Chart Cache Timeout"
 msgstr ""
 
-#: superset/views/database/mixins.py:196
+#: superset/views/database/mixins.py:197
 msgid "Secure Extra"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:582
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:587
-#: superset/views/database/mixins.py:197
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:537
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:542
+#: superset/views/database/mixins.py:198
 msgid "Root certificate"
 msgstr ""
 
-#: superset/views/database/mixins.py:198
+#: superset/views/database/mixins.py:199
 msgid "Async Execution"
 msgstr ""
 
-#: superset/views/database/mixins.py:199
+#: superset/views/database/mixins.py:200
 msgid "Impersonate the logged on user"
 msgstr ""
 
-#: superset/views/database/mixins.py:200
+#: superset/views/database/mixins.py:201
 msgid "Allow Csv Upload"
 msgstr ""
 
-#: superset/views/database/mixins.py:202
+#: superset/views/database/mixins.py:203
 msgid "Allow Multi Schema Metadata Fetch"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:201
-#: superset/views/database/mixins.py:203
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:217
+#: superset/views/database/mixins.py:204
 msgid "Backend"
 msgstr ""
 
-#: superset/views/database/mixins.py:243 superset/views/database/mixins.py:267
+#: superset/views/database/mixins.py:244 superset/views/database/mixins.py:268
 #, python-format
 msgid "Extra field cannot be decoded by JSON. %(msg)s"
 msgstr ""
@@ -3136,64 +3567,64 @@ msgid ""
 "db/database'</p>"
 msgstr ""
 
-#: superset/views/database/views.py:114
+#: superset/views/database/views.py:115
 msgid "CSV to Database configuration"
 msgstr ""
 
-#: superset/views/database/views.py:132
+#: superset/views/database/views.py:133
 #, python-format
 msgid ""
 "Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed "
 "for csv uploads. Please contact your Superset Admin."
 msgstr ""
 
-#: superset/views/database/views.py:142
+#: superset/views/database/views.py:143
 msgid ""
 "You cannot specify a namespace both in the name of the table: "
 "\"%(csv_table.table)s\" and in the schema field: "
 "\"%(csv_table.schema)s\". Please remove one"
 msgstr ""
 
-#: superset/views/database/views.py:250
+#: superset/views/database/views.py:236
 #, python-format
 msgid ""
 "Unable to upload CSV file \"%(filename)s\" to table \"%(table_name)s\" in"
 " database \"%(db_name)s\". Error message: %(error_msg)s"
 msgstr ""
 
-#: superset/views/database/views.py:263
+#: superset/views/database/views.py:248
 #, python-format
 msgid ""
 "CSV file \"%(csv_filename)s\" uploaded to table \"%(table_name)s\" in "
 "database \"%(db_name)s\""
 msgstr ""
 
-#: superset/views/database/views.py:274
+#: superset/views/database/views.py:259
 msgid "Excel to Database configuration"
 msgstr ""
 
-#: superset/views/database/views.py:289
+#: superset/views/database/views.py:274
 #, python-format
 msgid ""
 "Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed "
 "for excel uploads. Please contact your Superset Admin."
 msgstr ""
 
-#: superset/views/database/views.py:299
+#: superset/views/database/views.py:284
 msgid ""
 "You cannot specify a namespace both in the name of the table: "
 "\"%(excel_table.table)s\" and in the schema field: "
 "\"%(excel_table.schema)s\". Please remove one"
 msgstr ""
 
-#: superset/views/database/views.py:402
+#: superset/views/database/views.py:377
 #, python-format
 msgid ""
 "Unable to upload Excel file \"%(filename)s\" to table \"%(table_name)s\" "
 "in database \"%(db_name)s\". Error message: %(error_msg)s"
 msgstr ""
 
-#: superset/views/database/views.py:415
+#: superset/views/database/views.py:389
 #, python-format
 msgid ""
 "Excel file \"%(excel_filename)s\" uploaded to table \"%(table_name)s\" in"
@@ -3224,187 +3655,197 @@ msgstr ""
 msgid "dttm"
 msgstr ""
 
-#: superset-frontend/src/CRUD/CollectionTable.tsx:317
+#: superset-frontend/src/CRUD/CollectionTable.tsx:323
 msgid "Add item"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:103
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:106
 msgid "The query couldn't be loaded"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:156
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:159
 msgid ""
 "Your query has been scheduled. To see details of your query, navigate to "
 "Saved queries"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:163
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:166
 msgid "Your query could not be scheduled"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:191
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:298
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:194
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:301
 msgid "Failed at retrieving results"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:229
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:255
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:232
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:258
 msgid ""
 "An error occurred while storing the latest query id in the backend. "
 "Please contact your administrator if this problem persists."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:342
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:375
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:345
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:385
 msgid "Unknown error"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:393
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:403
 msgid "Query was stopped."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:422
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:432
 msgid ""
 "Unable to migrate table schema state to backend. Superset will retry "
 "later. Please contact your administrator if this problem persists."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:440
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:450
 msgid ""
 "Unable to migrate query state to backend. Superset will retry later. "
 "Please contact your administrator if this problem persists."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:486
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:496
 msgid ""
 "Unable to migrate query editor state to backend. Superset will retry "
 "later. Please contact your administrator if this problem persists."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:519
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:529
 msgid "Unable to add a new tab to the backend. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:536
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:546
 #: superset-frontend/src/SqlLab/reducers/sqlLab.js:74
 #, python-format
 msgid "Copy of %s"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:563
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:573
 msgid ""
 "An error occurred while setting the active tab. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:649
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:660
 msgid "An error occurred while fetching tab state"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:677
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:696
+msgid ""
+"An error occurred while hiding the left bar. Please contact your "
+"administrator."
+msgstr ""
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:718
 msgid "An error occurred while removing tab. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:701
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:742
 msgid "An error occurred while removing query. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:724
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:765
 msgid ""
 "An error occurred while setting the tab database ID. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:749
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:790
 msgid ""
 "An error occurred while setting the tab schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:782
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:823
 msgid ""
 "An error occurred while setting the tab autorun. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:807
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:899
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:848
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:940
 msgid ""
 "An error occurred while setting the tab title. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:829
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:870
 msgid "Your query was saved"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:833
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:874
 msgid "Your query could not be saved"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:845
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:886
 msgid "Your query was updated"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:849
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:890
 msgid "Your query could not be updated"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:868
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:909
 msgid ""
 "An error occurred while storing your query in the backend. To avoid "
 "losing your changes, please save your query using the \"Save Query\" "
 "button."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:928
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:969
 msgid ""
 "An error occurred while setting the tab template parameters. Please "
 "contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:989
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1014
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1027
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1052
 msgid "An error occurred while fetching table metadata"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1055
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1093
 msgid ""
 "An error occurred while fetching table metadata. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1103
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1141
 msgid ""
 "An error occurred while expanding the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1127
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1165
 msgid ""
 "An error occurred while collapsing the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1150
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1188
 msgid ""
 "An error occurred while removing the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1183
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1221
 msgid "Shared query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1245
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1283
 msgid "The datasource couldn't be loaded"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1275
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1297
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1313
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1335
 msgid "An error occurred while creating the data source"
 msgstr ""
 
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1356
+msgid "An error occurred while fetching function names."
+msgstr ""
+
 #: superset-frontend/src/SqlLab/components/App.jsx:76
 msgid ""
 "SQL Lab uses your browser's local storage to store queries and results.\n"
@@ -3417,15 +3858,15 @@ msgid ""
 "before you do this."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:85
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:87
 msgid "Estimate selected query cost"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:86
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:88
 msgid "Estimate cost"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:90
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:92
 msgid "Cost estimate"
 msgstr ""
 
@@ -3434,51 +3875,46 @@ msgid "Creating a data source and creating a new tab"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:81
-#: superset-frontend/src/components/TableLoader.tsx:60
+#: superset-frontend/src/components/TableLoader/index.tsx:48
 msgid "An error occurred"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:92
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:156
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:163
 msgid "Explore the result set in the data exploration view"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:99
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:163
-msgid "Explore"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:108
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:111
 #, python-format
 msgid "This query took %s seconds to run, "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:110
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:113
 #, python-format
 msgid "and the explore view times out at %s seconds "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:114
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:117
 msgid "following this flow will most likely lead to your query timing out. "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:117
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:120
 msgid "We recommend your summarize your data further before following that flow. "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:120
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:123
 msgid "If activated you can use the "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:122
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:125
 msgid "feature to store a summarized data set that you can then explore."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:134
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:141
 msgid "Column name(s) "
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:138
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:145
 msgid ""
 "cannot be used as a column name. The column name/alias \"__timestamp\"\n"
 "          is reserved for the main temporal expression, and column "
@@ -3490,74 +3926,75 @@ msgid ""
 "          invalid column names."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/HighlightedSql.jsx:85
-msgid "Raw SQL"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/HighlightedSql.jsx:95
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:77
 msgid "Source SQL"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/HighlightedSql.jsx:108
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:719
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:301
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:83
+msgid "Raw SQL"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:102
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:741
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:303
 msgid "SQL"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QueryHistory.jsx:52
+#: superset-frontend/src/SqlLab/components/QueryHistory.tsx:50
 msgid "No query history yet..."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:193
-#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:101
-#: superset-frontend/src/components/DatabaseSelector.tsx:151
-msgid "It seems you don't have access to any database"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:220
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:132
 msgid "An error occurred when refreshing queries"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:235
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:180
+#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:117
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:156
+msgid "It seems you don't have access to any database"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:195
 msgid "Filter by user"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:244
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:204
 msgid "Filter by database"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:253
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:213
 msgid "Query search string"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:259
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:219
 msgid "[From]-"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:271
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:231
 msgid "[To]-"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/QuerySearch.jsx:280
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:240
 msgid "Filter by status"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/QueryTable.jsx:128
-#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.jsx:34
-#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:134
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:301
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:120
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:343
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:332
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:329
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:362
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:211
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:79
+#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx:35
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:75
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:135
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:306
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:126
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:358
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:84
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:337
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:345
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:373
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:213
 msgid "Edit"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/QueryTable.jsx:147
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:258
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:301
 msgid "View results"
 msgstr ""
 
@@ -3577,69 +4014,87 @@ msgstr ""
 msgid "Remove query from log"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:255
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:278
 msgid "An error occurred saving dataset"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:449
-msgid ".CSV"
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:475
+msgid "Download to CSV"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:458
-msgid "Clipboard"
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:484
+msgid "Copy to Clipboard"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:469
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:495
 msgid "Filter results"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:501
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:510
+#, python-format
+msgid "%s rows returned"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:515
+#, python-format
+msgid ""
+"The number of results displayed is limited to %s. Please add\n"
+"            additional limits/filters or download to csv to see more rows"
+" up to\n"
+"            the %s limit."
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:545
+msgid "Query was stopped"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:551
 msgid "Database error"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:525
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:578
 msgid "was created"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:532
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:585
 msgid "Query in a new tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:575
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:631
 msgid "The query returned no data"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:593
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:648
 msgid "Fetch data preview"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:605
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:659
 msgid "Refetch results"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ResultSet.tsx:626
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:680
 msgid "Track job"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:46
-#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:80
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:49
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:66
 msgid "Stop"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:51
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:54
 msgid "Run selection"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:53
-#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:90
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:56
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:76
 msgid "Run"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:103
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:111
 msgid "Stop running (Ctrl + x)"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:104
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:112
 msgid "Run query (Ctrl + Return)"
 msgstr ""
 
@@ -3647,118 +4102,98 @@ msgstr ""
 msgid "Save & Explore"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx:123
+#: superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx:120
 msgid "Overwrite & Explore"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:70
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:86
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:71
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:110
 msgid "Undefined"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:163
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:169
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:184
-#: superset-frontend/src/dashboard/components/Header.jsx:468
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:289
-#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:139
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:223
-#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:539
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:475
-#: superset-frontend/src/datasource/DatasourceModal.tsx:211
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:187
-#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:108
-#: superset-frontend/src/explore/components/SaveModal.tsx:197
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:210
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:447
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1042
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:255
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:207
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:164
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:170
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:185
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:88
+#: superset-frontend/src/dashboard/components/Header/index.jsx:468
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:424
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:148
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:225
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:543
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:162
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:91
+#: superset-frontend/src/datasource/DatasourceModal.tsx:216
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:182
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:109
+#: superset-frontend/src/explore/components/SaveModal.tsx:203
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:222
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:466
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:979
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:279
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:231
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:225
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:343
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:252
 msgid "Save"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:163
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:169
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:233
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:164
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:170
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:240
 msgid "Save as"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:172
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:173
 msgid "Save query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:184
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:185
 msgid "Save as new"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:193
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:194
 msgid "Update"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:152
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:150
 msgid "Label for your query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:165
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:163
 msgid "Write a description for your query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:201
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:197
 msgid "Schedule query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:211
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:222
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:207
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:227
 msgid "Schedule"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:77
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:58
 msgid "There was an error with your request"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:91
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:72
 msgid "Please save the query to enable sharing"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:113
-msgid "Copy link"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:129
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:85
 msgid "Copy query link to your clipboard"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx:130
-msgid "Save the query to copy the link"
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:86
+msgid "Save the query to enable this feature"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:127
-msgid "No stored results found, you need to re-run your query"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:148
-msgid "Run a query to display results here"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:153
-#, python-format
-msgid "Preview: `%s`"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:177
-msgid "Results"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:180
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:100
-msgid "Query history"
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:97
+msgid "Copy link"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:285
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:295
-#: superset-frontend/src/components/RefreshChartOverlay.tsx:48
+#: superset-frontend/src/chart/Chart.jsx:238
 msgid "Run query"
 msgstr ""
 
@@ -3775,136 +4210,146 @@ msgstr ""
 msgid "Stop query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:499
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:497
 msgid "Schedule the query periodically"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:500
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:498
 msgid "You must run the query successfully first"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:568
-#, python-format
-msgid ""
-"It appears that the number of rows in the query results displayed\n"
-"           was limited on the server side to\n"
-"           the %s limit."
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:503
+msgid "Autocomplete"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:597
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:581
 msgid "CREATE TABLE AS"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:610
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:594
 msgid "CREATE VIEW AS"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:645
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:629
 msgid "Estimate the cost before running a query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:159
+#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:204
 msgid "Reset state"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:237
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:240
 msgid "Enter a new title for the tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:263
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:266
 #, python-format
 msgid "Untitled Query %s"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:338
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:341
 msgid "Close tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:344
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:347
 msgid "Rename tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:350
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:353
 msgid "Expand tool bar"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:350
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:353
 msgid "Hide tool bar"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:359
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:362
 msgid "Close all other tabs"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:365
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:368
 msgid "Duplicate tab"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:113
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:422
+msgid "New tab (Ctrl + q)"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:423
+msgid "New tab (Ctrl + t)"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:103
 msgid "Copy partition query to clipboard"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:131
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:121
 msgid "latest partition:"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:149
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:139
 msgid "Keys for table"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:158
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:148
 #, python-format
 msgid "View keys & indexes (%s)"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:175
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:165
 msgid "Sort columns alphabetically"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:176
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:166
 msgid "Original table column order"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:188
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:178
 msgid "Copy SELECT statement to the clipboard"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:194
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:184
 msgid "Show CREATE VIEW statement"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:195
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:185
 msgid "CREATE VIEW statement"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TableElement.jsx:201
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:191
 msgid "Remove table preview"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:81
-msgid "Assign a set of parameters as"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:83
-msgid "below (example:"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:85
-msgid "), and they become available in your SQL (example:"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:87
-msgid ") by using"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:127
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:99
 msgid "Edit template parameters"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:134
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:109
 msgid "Invalid JSON"
 msgstr ""
 
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:116
+msgid "No stored results found, you need to re-run your query"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:138
+msgid "Run a query to display results here"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:147
+#, python-format
+msgid "Preview: `%s`"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:172
+msgid "Results"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:175
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:102
+msgid "Query history"
+msgstr ""
+
 #: superset-frontend/src/addSlice/AddSliceContainer.tsx:94
 msgid "Create a new chart"
 msgstr ""
@@ -3928,466 +4373,405 @@ msgstr ""
 msgid "Create new chart"
 msgstr ""
 
-#: superset-frontend/src/chart/chartAction.js:505
+#: superset-frontend/src/chart/chartAction.js:540
 msgid "An error occurred while loading the SQL"
 msgstr ""
 
-#: superset-frontend/src/chart/chartReducer.js:71
-msgid "Updating chart was stopped"
-msgstr ""
-
-#: superset-frontend/src/chart/chartReducer.js:91
-#, python-format
-msgid "An error occurred while rendering the visualization: %s"
-msgstr ""
-
-#: superset-frontend/src/chart/chartReducer.js:103
-#: superset-frontend/src/chart/chartReducer.js:167
-msgid "Network error."
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:26
-#: superset-frontend/src/common/components/CronPicker.tsx:34
-msgid "every"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:27
-msgid "every month"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:28
-msgid "every day of the month"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:29
-msgid "day of the month"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:30
-msgid "every day of the week"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:31
-msgid "day of the week"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:32
-msgid "every hour"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:33
-msgid "every minute UTC"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:35
-msgid "year"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:36
-msgid "month"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:37
-msgid "week"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:38
-msgid "day"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:39
-msgid "hour"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:40
-msgid "minute"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:41
-msgid "reboot"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:42
-msgid "Every"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:43
-msgid "in"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:44
-#: superset-frontend/src/common/components/CronPicker.tsx:45
-msgid "on"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:46
-msgid "and"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:47
-#: superset-frontend/src/common/components/CronPicker.tsx:49
-msgid "at"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:48
-msgid ":"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:50
-msgid "minute(s) UTC"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:51
-msgid "Invalid cron expression"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:52
-msgid "Clear"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:55
-msgid "Sunday"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:56
-msgid "Monday"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:57
-msgid "Tuesday"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:58
-msgid "Wednesday"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:59
-msgid "Thursday"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:60
-msgid "Friday"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:61
-msgid "Saturday"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:65
-msgid "January"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:66
-msgid "February"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:67
-msgid "March"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:68
-msgid "April"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:69
-msgid "May"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:70
-msgid "June"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:71
-msgid "July"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:72
-msgid "August"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:73
-msgid "September"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:74
-msgid "October"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:75
-msgid "November"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:76
-msgid "December"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:80
-msgid "SUN"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:81
-msgid "MON"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:82
-msgid "TUE"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:83
-msgid "WED"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:84
-msgid "THU"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:85
-msgid "FRI"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:86
-msgid "SAT"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:90
-msgid "JAN"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:91
-msgid "FEB"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:92
-msgid "MAR"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:93
-msgid "APR"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:94
-msgid "MAY"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:95
-msgid "JUN"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:96
-msgid "JUL"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:97
-msgid "AUG"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:98
-msgid "SEP"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:99
-msgid "OCT"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:100
-msgid "NOV"
-msgstr ""
-
-#: superset-frontend/src/common/components/CronPicker.tsx:101
-msgid "DEC"
-msgstr ""
-
-#: superset-frontend/src/common/components/Modal/Modal.tsx:128
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:771
-msgid "OK"
-msgstr ""
-
-#: superset-frontend/src/components/AlteredSliceTag.jsx:177
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:177
 msgid "Click to see difference"
 msgstr ""
 
-#: superset-frontend/src/components/AlteredSliceTag.jsx:182
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:182
 msgid "Altered"
 msgstr ""
 
-#: superset-frontend/src/components/AlteredSliceTag.jsx:199
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:199
 msgid "Chart changes"
 msgstr ""
 
-#: superset-frontend/src/components/AnchorLink.jsx:88
+#: superset-frontend/src/components/AnchorLink/index.jsx:88
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:267
 msgid "Superset chart"
 msgstr ""
 
-#: superset-frontend/src/components/AnchorLink.jsx:89
+#: superset-frontend/src/components/AnchorLink/index.jsx:89
 msgid "Check out this chart in dashboard:"
 msgstr ""
 
-#: superset-frontend/src/components/AsyncSelect.jsx:41
-#: superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx:47
+#: superset-frontend/src/components/AsyncSelect/index.jsx:41
+#: superset-frontend/src/explore/components/controls/SelectAsyncControl/index.jsx:47
 msgid "Select ..."
 msgstr ""
 
-#: superset-frontend/src/components/CachedLabel.jsx:45
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:30
 msgid "Loaded data cached"
 msgstr ""
 
-#: superset-frontend/src/components/CachedLabel.jsx:49
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:34
 msgid "Loaded from cache"
 msgstr ""
 
-#: superset-frontend/src/components/CachedLabel.jsx:54
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:39
 msgid "Click to force-refresh"
 msgstr ""
 
-#: superset-frontend/src/components/CachedLabel.jsx:80
+#: superset-frontend/src/components/CachedLabel/index.tsx:51
 msgid "cached"
 msgstr ""
 
-#: superset-frontend/src/components/CertifiedIconWithTooltip.tsx:40
+#: superset-frontend/src/components/CertifiedIcon/index.tsx:42
 #, python-format
 msgid "Certified by %s"
 msgstr ""
 
-#: superset-frontend/src/components/CopyToClipboard.jsx:42
-#: superset-frontend/src/components/URLShortLinkButton.jsx:65
-#: superset-frontend/src/components/URLShortLinkModal.tsx:89
-#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:103
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:43
+#: superset-frontend/src/components/URLShortLinkButton/index.jsx:65
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:106
 msgid "Copy to clipboard"
 msgstr ""
 
-#: superset-frontend/src/components/CopyToClipboard.jsx:89
-msgid "Copied!"
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:75
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:53
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:104
+msgid "Copied to clipboard!"
 msgstr ""
 
-#: superset-frontend/src/components/CopyToClipboard.jsx:93
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:79
 msgid "Sorry, your browser does not support copying. Use Ctrl / Cmd + C!"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:126
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:27
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:35
+msgid "every"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:28
+msgid "every month"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:29
+msgid "every day of the month"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:30
+msgid "day of the month"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:31
+msgid "every day of the week"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:32
+msgid "day of the week"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:33
+msgid "every hour"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:34
+msgid "every minute UTC"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:36
+msgid "year"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:37
+msgid "month"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:38
+msgid "week"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:39
+msgid "day"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:40
+msgid "hour"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:41
+msgid "minute"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:42
+msgid "reboot"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:43
+msgid "Every"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:44
+msgid "in"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:45
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:46
+msgid "on"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:47
+msgid "and"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:48
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:50
+msgid "at"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:49
+msgid ":"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:51
+msgid "minute(s) UTC"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:52
+msgid "Invalid cron expression"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:53
+msgid "Clear"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:56
+msgid "Sunday"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:57
+msgid "Monday"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:58
+msgid "Tuesday"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:59
+msgid "Wednesday"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:60
+msgid "Thursday"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:61
+msgid "Friday"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:62
+msgid "Saturday"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:66
+msgid "January"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:67
+msgid "February"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:68
+msgid "March"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:69
+msgid "April"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:70
+msgid "May"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:71
+msgid "June"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:72
+msgid "July"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:73
+msgid "August"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:74
+msgid "September"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:75
+msgid "October"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:76
+msgid "November"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:77
+msgid "December"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:81
+msgid "SUN"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:82
+msgid "MON"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:83
+msgid "TUE"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:84
+msgid "WED"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:85
+msgid "THU"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:86
+msgid "FRI"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:87
+msgid "SAT"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:91
+msgid "JAN"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:92
+msgid "FEB"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:93
+msgid "MAR"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:94
+msgid "APR"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:95
+msgid "MAY"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:96
+msgid "JUN"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:97
+msgid "JUL"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:98
+msgid "AUG"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:99
+msgid "SEP"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:100
+msgid "OCT"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:101
+msgid "NOV"
+msgstr ""
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:102
+msgid "DEC"
+msgstr ""
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:131
 msgid "Error while fetching schema list"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:227
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:232
 msgid "Error while fetching database list"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:234
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:239
 msgid "Database:"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:240
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:245
 msgid "Select a database"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:253
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:258
 msgid "Force refresh schema list"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:260
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:265
 #, python-format
 msgid "Select a schema (%s)"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:265
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:270
 msgid "Schema:"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:279
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:284
 msgid "datasource"
 msgstr ""
 
-#: superset-frontend/src/components/DatabaseSelector.tsx:281
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:286
 msgid "schema"
 msgstr ""
 
-#: superset-frontend/src/components/DeleteModal.tsx:61
+#: superset-frontend/src/components/DeleteModal/index.tsx:61
 msgid "delete"
 msgstr ""
 
-#: superset-frontend/src/components/DeleteModal.tsx:69
+#: superset-frontend/src/components/DeleteModal/index.tsx:69
 #: superset-frontend/src/components/ImportModal/index.tsx:239
 #, python-format
 msgid "Type \"%s\" to confirm"
 msgstr ""
 
-#: superset-frontend/src/components/DeleteModal.tsx:81
+#: superset-frontend/src/components/DeleteModal/index.tsx:81
 msgid "DELETE"
 msgstr ""
 
-#: superset-frontend/src/components/EditableTitle.tsx:181
+#: superset-frontend/src/components/EditableTitle/index.tsx:195
 msgid "Click to edit"
 msgstr ""
 
-#: superset-frontend/src/components/EditableTitle.tsx:183
+#: superset-frontend/src/components/EditableTitle/index.tsx:197
 msgid "You don't have the rights to alter this title."
 msgstr ""
 
-#: superset-frontend/src/components/ErrorBoundary.jsx:51
+#: superset-frontend/src/components/ErrorBoundary/index.jsx:51
 #: superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx:26
 msgid "Unexpected error"
 msgstr ""
 
-#: superset-frontend/src/components/FaveStar.tsx:70
-msgid "Click to favorite/unfavorite"
-msgstr ""
-
-#: superset-frontend/src/components/OmniContainer.jsx:44
-msgid "An error occurred while fetching dashboards"
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:170
-msgid "Error while fetching table list"
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:312
-#: superset-frontend/src/components/TableSelector.tsx:329
-msgid "Select table or type table name"
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:343
-msgid "Type to search ..."
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:345
-msgid "Select table "
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:365
-msgid "Force refresh table list"
-msgstr ""
-
-#: superset-frontend/src/components/TableSelector.tsx:375
-msgid "See table schema"
-msgstr ""
-
-#: superset-frontend/src/components/URLShortLinkButton.jsx:59
-#: superset-frontend/src/components/URLShortLinkModal.tsx:77
-#, python-format
-msgid "%s%s"
-msgstr ""
-
-#: superset-frontend/src/components/URLShortLinkModal.tsx:83
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:249
-msgid "Share dashboard"
-msgstr ""
-
 #: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:46
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:63
 msgid "This may be triggered by:"
 msgstr ""
 
-#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:56
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:58
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:73
 msgid "Please reach out to the Chart Owner for assistance."
 msgstr ""
 
-#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:67
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:69
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:84
 #, python-format
 msgid "Chart Owner: %s"
 msgstr ""
 
-#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:81
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:83
 #, python-format
 msgid "%s Error"
 msgstr ""
@@ -4407,8 +4791,8 @@ msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:189
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:535
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:197
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:435
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:209
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:454
 msgid "Close"
 msgstr ""
 
@@ -4447,7 +4831,11 @@ msgstr ""
 msgid "Timeout error"
 msgstr ""
 
-#: superset-frontend/src/components/FilterableTable/FilterableTable.tsx:317
+#: superset-frontend/src/components/FaveStar/index.tsx:77
+msgid "Click to favorite/unfavorite"
+msgstr ""
+
+#: superset-frontend/src/components/FilterableTable/FilterableTable.tsx:316
 msgid "Cell content"
 msgstr ""
 
@@ -4477,36 +4865,80 @@ msgstr ""
 msgid "Last Updated %s"
 msgstr ""
 
-#: superset-frontend/src/components/ListView/ListView.tsx:246
+#: superset-frontend/src/components/ListView/CardSortSelect.tsx:103
+msgid "Sort:"
+msgstr ""
+
+#: superset-frontend/src/components/ListView/ListView.tsx:239
 #, python-format
 msgid "%s Selected"
 msgstr ""
 
-#: superset-frontend/src/components/ListView/ListView.tsx:348
+#: superset-frontend/src/components/ListView/ListView.tsx:344
 msgid "Deselect all"
 msgstr ""
 
+#: superset-frontend/src/components/ListView/ListView.tsx:393
+msgid "No Data"
+msgstr ""
+
 #: superset-frontend/src/components/ListView/ListView.tsx:414
 #: superset-frontend/src/components/TableView/TableView.tsx:183
 #, python-format
 msgid "%s-%s of %s"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:180
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:134
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1050
+#: superset-frontend/src/components/Menu/Menu.tsx:196
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:155
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1087
 msgid "Settings"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/Menu.tsx:228
+#: superset-frontend/src/components/Menu/Menu.tsx:244
 msgid "About"
 msgstr ""
 
 #: superset-frontend/src/components/Menu/NewMenu.tsx:26
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:114
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:111
 msgid "SQL query"
 msgstr ""
 
+#: superset-frontend/src/components/Modal/Modal.tsx:129
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:772
+msgid "OK"
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:172
+msgid "Error while fetching table list"
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:320
+#: superset-frontend/src/components/TableSelector/index.tsx:337
+msgid "Select table or type table name"
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:351
+msgid "Type to search ..."
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:353
+msgid "Select table "
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:373
+msgid "Force refresh table list"
+msgstr ""
+
+#: superset-frontend/src/components/TableSelector/index.tsx:383
+msgid "See table schema"
+msgstr ""
+
+#: superset-frontend/src/components/URLShortLinkButton/index.jsx:59
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:114
+#, python-format
+msgid "%s%s"
+msgstr ""
+
 #: superset-frontend/src/dashboard/actions/dashboardLayout.js:180
 msgid ""
 "There is not enough space for this component. Try decreasing its width, "
@@ -4521,32 +4953,32 @@ msgstr ""
 msgid "This chart has been moved to a different filter scope."
 msgstr ""
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:78
+#: superset-frontend/src/dashboard/actions/dashboardState.js:80
 msgid "There was an issue fetching the favorite status of this dashboard."
 msgstr ""
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:99
+#: superset-frontend/src/dashboard/actions/dashboardState.js:101
 msgid "There was an issue favoriting this dashboard."
 msgstr ""
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:121
+#: superset-frontend/src/dashboard/actions/dashboardState.js:123
 msgid "This dashboard is now ${nowPublished}"
 msgstr ""
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:127
+#: superset-frontend/src/dashboard/actions/dashboardState.js:129
 msgid "You do not have permissions to edit this dashboard."
 msgstr ""
 
-#: superset-frontend/src/dashboard/actions/dashboardState.js:203
+#: superset-frontend/src/dashboard/actions/dashboardState.js:227
 msgid "This dashboard was saved successfully."
 msgstr ""
 
-#: superset-frontend/src/dashboard/actions/sliceEntities.js:113
-#: superset-frontend/src/dashboard/reducers/sliceEntities.js:59
+#: superset-frontend/src/dashboard/actions/sliceEntities.js:111
+#: superset-frontend/src/dashboard/reducers/sliceEntities.js:65
 msgid "Could not fetch all saved charts"
 msgstr ""
 
-#: superset-frontend/src/dashboard/actions/sliceEntities.js:118
+#: superset-frontend/src/dashboard/actions/sliceEntities.js:116
 msgid "Sorry there was an error fetching saved charts: "
 msgstr ""
 
@@ -4573,84 +5005,15 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx:56
-#: superset-frontend/src/explore/controlPanels/sections.jsx:78
+#: superset-frontend/src/explore/controlPanels/sections.tsx:79
 #: superset-frontend/src/explore/controls.jsx:482
 msgid "Color scheme"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/CssEditor.jsx:67
-msgid "Load a template"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/CssEditor.jsx:70
-msgid "Load a CSS template"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/CssEditor.jsx:88
-msgid "Live CSS editor"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/Dashboard.jsx:84
+#: superset-frontend/src/dashboard/components/Dashboard.jsx:86
 msgid "You have unsaved changes."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/Header.jsx:250
-#, python-format
-msgid ""
-"This dashboard is currently force refreshing; the next force refresh will"
-" be in %s."
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/Header.jsx:330
-msgid "Your dashboard is too large. Please reduce the size before save it."
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/Header.jsx:459
-msgid "Discard changes"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:123
-msgid "An error occurred while fetching available CSS templates"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:204
-msgid "Superset dashboard"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:206
-msgid "Check out this dashboard: "
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:257
-msgid "Refresh dashboard"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:267
-msgid "Set auto-refresh interval"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:275
-msgid "Set filter mapping"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:282
-msgid "Edit dashboard properties"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:289
-msgid "Edit CSS"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:299
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:251
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:197
-msgid "Download as image"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:305
-msgid "Toggle fullscreen"
-msgstr ""
-
 #: superset-frontend/src/dashboard/components/MissingChart.jsx:31
 msgid ""
 "There is no chart definition associated with this component, could it "
@@ -4661,104 +5024,6 @@ msgstr ""
 msgid "Delete this container and save to remove this message."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:69
-#: superset-frontend/src/dashboard/components/nativeFilters/ColumnSelect.tsx:82
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:105
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:453
-#: superset-frontend/src/datasource/DatasourceModal.tsx:123
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:66
-msgid "An error has occurred"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:77
-#: superset-frontend/src/dashboard/components/nativeFilters/ColumnSelect.tsx:84
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:107
-msgid "You do not have permission to edit this dashboard"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:144
-msgid "A valid color scheme is required"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:271
-msgid "The dashboard has been saved"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:289
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:463
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:762
-#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:437
-msgid "Apply"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:295
-msgid "Dashboard properties"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:324
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:197
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:270
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:224
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:242
-msgid "Basic information"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:341
-msgid "URL slug"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:351
-msgid "A readable URL for your dashboard"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:357
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:258
-msgid "Access"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:371
-msgid ""
-"Owners is a list of users who can alter the dashboard. Searchable by name"
-" or username."
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:377
-msgid "Colors"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:394
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:596
-msgid "Advanced"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:400
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:319
-msgid "JSON metadata"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:33
-msgid ""
-"This dashboard is not published, it will not show up in the list of "
-"dashboards. Click here to publish this dashboard."
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:38
-msgid ""
-"This dashboard is not published which means it will not show up in the "
-"list of dashboards. Favorite it to see it there or access it by using the"
-" URL directly."
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:43
-msgid "This dashboard is published. Click to make it a draft."
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:72
-#: superset-frontend/src/dashboard/components/PublishedStatus.jsx:83
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:229
-msgid "Draft"
-msgstr ""
-
 #: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:29
 msgid "Don't refresh"
 msgstr ""
@@ -4807,36 +5072,36 @@ msgstr ""
 msgid "Refresh frequency"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:130
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:133
 msgid "Are you sure you want to proceed?"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:139
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:148
 msgid "Save for this session"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:159
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:161
 msgid "You must pick a name for the new dashboard"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:181
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:183
 msgid "Save dashboard"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:190
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:192
 #, python-format
 msgid "Overwrite Dashboard [%s]"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:198
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:200
 msgid "Save as:"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:202
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:204
 msgid "[dashboard name]"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SaveModal.tsx:212
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:214
 msgid "also copy (duplicate) charts"
 msgstr ""
 
@@ -4844,68 +5109,279 @@ msgstr ""
 msgid "Filter your charts"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SliceHeader.jsx:75
-msgid "Annotation layers are still loading."
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:65
+msgid "Cross Filter Scoping"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SliceHeader.jsx:76
-msgid "One ore more annotation layers failed loading."
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:66
+msgid "Load a template"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:185
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:69
+msgid "Load a CSS template"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:87
+msgid "Live CSS editor"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:164
 #, python-format
-msgid "Cached %s"
+msgid "Applied Cross Filters (%d)"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:188
-#, python-format
-msgid "Fetched %s"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:202
-msgid "Minimize chart"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:202
-msgid "Maximize chart"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:215
-msgid "Force refresh"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:225
-msgid "Toggle chart description"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:231
-msgid "View chart in Explore"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:243
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:244
-msgid "Share chart"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:255
-msgid "Export CSV"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel.tsx:169
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:188
 #, python-format
 msgid "Applied Filters (%d)"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel.tsx:190
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:209
 #, python-format
 msgid "Incompatible Filters (%d)"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel.tsx:214
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:233
 #, python-format
 msgid "Unset Filters (%d)"
 msgstr ""
 
+#: superset-frontend/src/dashboard/components/Header/index.jsx:248
+#, python-format
+msgid ""
+"This dashboard is currently force refreshing; the next force refresh will"
+" be in %s."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:328
+msgid "Your dashboard is too large. Please reduce the size before save it."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:459
+msgid "Discard changes"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:485
+msgid "Edit dashboard"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:125
+msgid "An error occurred while fetching available CSS templates"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:206
+msgid "Superset dashboard"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:208
+msgid "Check out this dashboard: "
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:249
+msgid "Copy dashboard URL"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:250
+msgid "Share dashboard by email"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:262
+msgid "Refresh dashboard"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:272
+msgid "Set auto-refresh interval"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:280
+msgid "Set filter mapping"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:287
+msgid "Edit dashboard properties"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:294
+msgid "Edit CSS"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:304
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:276
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:184
+msgid "Download as image"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:310
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:72
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx:88
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:135
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:472
+#: superset-frontend/src/datasource/DatasourceModal.tsx:129
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:61
+msgid "An error has occurred"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:80
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx:90
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:137
+msgid "You do not have permission to edit this dashboard"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:150
+msgid "A valid color scheme is required"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:309
+msgid "The dashboard has been saved"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:329
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:365
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:253
+msgid "Access"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:343
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:383
+msgid ""
+"Owners is a list of users who can alter the dashboard. Searchable by name"
+" or username."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:349
+msgid "Colors"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:402
+msgid ""
+"Roles is a list which defines access to the dashboard. Granting a role "
+"access to a dashboard will bypass dataset level checks. If no roles "
+"defined then the dashboard is available to all roles."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:424
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:136
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:763
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:432
+msgid "Apply"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:430
+msgid "Dashboard properties"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:459
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:192
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:294
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:248
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:242
+msgid "Basic information"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:476
+msgid "URL slug"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:486
+msgid "A readable URL for your dashboard"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:503
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:615
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:322
+msgid "Advanced"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:509
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:342
+msgid "JSON metadata"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:33
+msgid ""
+"This dashboard is not published, it will not show up in the list of "
+"dashboards. Click here to publish this dashboard."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:38
+msgid ""
+"This dashboard is not published which means it will not show up in the "
+"list of dashboards. Favorite it to see it there or access it by using the"
+" URL directly."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:43
+msgid "This dashboard is published. Click to make it a draft."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:72
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:83
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:237
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:413
+msgid "Draft"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:61
+msgid "Annotation layers are still loading."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:62
+msgid "One ore more annotation layers failed loading."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:156
+msgid "Emitted values"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:208
+#, python-format
+msgid "Cached %s"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:211
+#, python-format
+msgid "Fetched %s"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:225
+msgid "Minimize chart"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:225
+msgid "Maximize chart"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:238
+msgid "Force refresh"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:248
+msgid "Toggle chart description"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:254
+msgid "View chart in Explore"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:265
+msgid "Copy chart URL"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:266
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:170
+msgid "Share chart by email"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:280
+msgid "Export CSV"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:285
+msgid "Cross-filter scoping"
+msgstr ""
+
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:464
 msgid "Search..."
 msgstr ""
@@ -4939,15 +5415,15 @@ msgstr ""
 msgid "Collapse all"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:81
+#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:78
 msgid "This markdown component has an error."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:181
+#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:170
 msgid "This markdown component has an error. Please revert your recent changes."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:153
+#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:171
 msgid "Delete dashboard tab?"
 msgstr ""
 
@@ -4967,122 +5443,210 @@ msgstr ""
 msgid "Tabs"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.jsx:38
+#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx:39
 msgid "Preview"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/CancelConfirmationAlert.tsx:92
-msgid "Yes, cancel"
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:55
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:106
+#: superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx:68
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:220
+msgid "Sorry, your browser does not support copying."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/CancelConfirmationAlert.tsx:100
-msgid "Keep editing"
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:65
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:117
+msgid "Sorry, something went wrong. Try again later."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/CascadePopover.tsx:121
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:252
+msgid "All Filters (${filterValues.length})"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:271
+msgid "Filter Sets (${filterSetFilterValues.length})"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx:160
 msgid "Select parent filters"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:455
-msgid "Reset all"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx:94
+msgid "Check configuration"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:117
-msgid "You have removed this filter."
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx:134
+msgid "Cannot load filter"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:120
-msgid "Restore filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:124
+msgid "Editing filter set:"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:138
-msgid "Filter name"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:148
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:83
+msgid "Filter set with this name already exists"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:140
-msgid "Name is required"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:149
+msgid "Filter set already exists"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:149
-msgid "Datasource is required"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:170
+#, python-format
+msgid "This filter set is identical to: \"%s\""
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:168
-msgid "Field"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:77
+msgid "Remove invalid filters"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:180
-msgid "Parent filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:78
+msgid "Rebuild"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:186
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:87
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:75
+#, python-format
+msgid "Filters (%d)"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:90
+msgid "This filter doesn't exist in dashboard. It will not be applied."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:94
+msgid "Filter metadata changed in dashboard. It will not be applied."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:105
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:257
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:98
 msgid "None"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:198
-msgid "Apply changes instantly"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:81
+msgid "Please filter set name"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:206
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:215
-msgid "Allow multiple selections"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:96
+msgid "Create"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:214
-msgid "Inverse selection"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:111
+msgid "Create new filter set"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:222
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:251
-msgid "Required"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/index.tsx:76
+msgid "New filter set"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:464
-msgid "Are you sure you want to cancel?"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:126
+msgid "Clear all"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:465
-msgid "will not be saved."
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:483
-msgid "Filter configuration and scoping"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:516
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl.jsx:361
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:143
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx:361
 msgid "Add filter"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:528
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:152
 msgid "(Removed)"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:537
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:161
 msgid "Undo?"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:68
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx:168
+msgid "New filter"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx:206
+msgid "Filters configuration and scoping"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:159
+msgid "Filter name"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:161
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:167
+msgid "Name is required"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:169
+msgid "Filter Type"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:193
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:467
+#: superset-frontend/src/explore/controls.jsx:195
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:247
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:451
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:489
+msgid "Dataset"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:194
+msgid "Dataset is required"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:250
+msgid "Parent filter"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:266
+msgid "Default Value"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:290
+msgid "Apply changes instantly"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx:39
+msgid "You have removed this filter."
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx:46
+msgid "Restore Filter"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:67
 msgid "Scoping"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:83
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:83
 msgid "Apply to all panels"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:85
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:85
 msgid "Apply to specific panels"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:91
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:91
 msgid "Only selected panels will be affected by this filter"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:92
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:92
 msgid "All panels with this column will be affected by this filter"
 msgstr ""
 
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx:55
+msgid "Yes, cancel"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx:63
+msgid "Keep editing"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:69
+msgid "Are you sure you want to cancel?"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:70
+msgid "will not be saved."
+msgstr ""
+
 #: superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js:44
 msgid "All filters"
 msgstr ""
@@ -5091,76 +5655,83 @@ msgstr ""
 msgid "All charts"
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:38
+#: superset-frontend/src/dashboard/util/newComponentFactory.js:56
+#: superset-frontend/src/dashboard/util/newComponentFactory.js:57
+msgid "Tab title"
+msgstr ""
+
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:39
 msgid ""
 "Warning! Changing the dataset may break the chart if the metadata does "
 "not exist."
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:42
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:43
 msgid ""
 "Changing the dataset may break the chart if the chart relies on columns "
 "or metadata that does not exist in the target dataset"
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:114
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:116
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:663
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:115
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:64
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:125
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:682
 msgid "dataset"
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:223
-#: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:162
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:224
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:173
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:252
 msgid "Change dataset"
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:250
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:254
 msgid "Warning!"
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:260
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:266
 msgid "Search / Filter"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:91
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:110
 msgid "Physical (table or view)"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:92
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:111
 msgid "Virtual (SQL)"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:135
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:838
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:154
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:866
 msgid "SQL expression"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:167
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:210
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:186
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:229
 msgid "Data type"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:175
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:194
 msgid "Datetime format"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:179
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:198
 msgid "The pattern of timestamp format. For strings use "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:181
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:200
 msgid "Python datetime string pattern"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:183
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:202
 msgid " expression which needs to adhere to the "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:185
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:204
 msgid "ISO 8601"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:187
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:206
 msgid ""
 " standard to ensure that the lexicographical ordering\n"
 "                      coincides with the chronological ordering. If the\n"
@@ -5178,73 +5749,74 @@ msgid ""
 "                      database/column name level via the extra parameter."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:211
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:230
 msgid "Is dimension"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:213
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:232
 msgid "Is filterable"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:434
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:453
 #, python-format
 msgid "Modified columns: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:439
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:458
 #, python-format
 msgid "Removed columns: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:444
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:463
 #, python-format
 msgid "New columns added: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:447
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:466
 msgid "Metadata has been synced"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:482
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:501
 #, python-format
 msgid "Column name [%s] is duplicated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:488
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:507
 #, python-format
 msgid "Metric name [%s] is duplicated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:497
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:516
 #, python-format
 msgid "Calculated column [%s] requires an expression"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:512
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:531
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:262
 msgid "Basic"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:525
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:544
 msgid "Default URL"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:526
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:545
 msgid "Default URL to redirect to when accessing from the dataset list page"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:533
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:552
 msgid "Autocomplete filters"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:534
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:553
 msgid "Whether to populate autocomplete filters options"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:540
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:559
 msgid "Autocomplete query predicate"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:541
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:560
 msgid ""
 "When using \"Autocomplete filters\", this can be used to improve "
 "performance of the query fetching the values. Use this option to apply a "
@@ -5253,135 +5825,140 @@ msgid ""
 "relative time filter on a partitioned or indexed time-related field."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:555
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:574
 msgid ""
-"Extra data to specify table metadata. Currently supports certification "
-"data of the format: `{ \"certification\": { \"certified_by\": \"Data "
-"Platform Team\", \"details\": \"This table is the source of truth.\" } "
-"}`."
+"Extra data to specify table metadata. Currently supports metadata of the "
+"format: `{ \"certification\": { \"certified_by\": \"Data Platform Team\","
+" \"details\": \"This table is the source of truth.\" }, "
+"\"warning_markdown\": \"This is a warning.\" }`."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:573
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:592
 msgid "Owners of the dataset"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:602
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:238
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:621
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:233
 msgid "Cache timeout"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:603
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:622
 msgid "The duration of time in seconds before the cache is invalidated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:610
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:629
 msgid "Hours offset"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:632
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:631
+msgid ""
+"The number of hours, negative or positive, to shift the time column. This"
+" can be used to move UTC time to local time."
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:654
 msgid "Spatial"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:684
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:706
 msgid "virtual"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:705
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:712
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:727
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:734
 msgid "Dataset name"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:720
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:742
 msgid ""
 "When specifying SQL, the datasource acts as a view. Superset will use "
 "this statement as a subquery while grouping and filtering on the "
 "generated parent queries."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:743
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:765
 msgid "The JSON metric or post aggregation definition."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:758
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:780
 msgid "Physical"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:788
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:810
 msgid ""
 "The pointer to a physical table (or view). Keep in mind that the chart is"
 " associated to this Superset logical table, and this logical table points"
 " the physical table referenced here."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:807
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:829
 msgid "Click the lock to make changes."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:810
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:832
 msgid "Click the lock to prevent further changes."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:860
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:888
 msgid "D3 format"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:866
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:874
-msgid "Warning message"
-msgstr ""
-
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:868
-msgid "Warning message to display in the metric selector"
-msgstr ""
-
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:879
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:887
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:894
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:902
 msgid "Certified by"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:881
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:896
 msgid "Person or group that has certified this metric"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:892
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:898
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:907
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:913
 msgid "Certification details"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:894
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:909
 msgid "Details of the certification"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:963
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:918
+msgid "Warning"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:920
+msgid "Optional warning about use of this metric"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:999
 msgid "Be careful."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:964
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1000
 msgid ""
 "Changing these settings will affect all charts using this dataset, "
 "including charts owned by other people."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:976
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1121
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:267
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1013
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1058
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:278
 msgid "Source"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1009
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1046
 msgid "Sync columns from source"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1027
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1064
 msgid "Calculated columns"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:114
-#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:92
+#: superset-frontend/src/datasource/DatasourceModal.tsx:120
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:96
 msgid "The dataset has been saved"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:150
+#: superset-frontend/src/datasource/DatasourceModal.tsx:156
 msgid ""
 "The dataset configuration exposed here\n"
 "                affects all the charts using this dataset.\n"
@@ -5390,43 +5967,22 @@ msgid ""
 "                in undesirable ways."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:157
+#: superset-frontend/src/datasource/DatasourceModal.tsx:162
 msgid "Are you sure you want to save and apply changes?"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:163
+#: superset-frontend/src/datasource/DatasourceModal.tsx:168
 msgid "Confirm save"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:176
+#: superset-frontend/src/datasource/DatasourceModal.tsx:181
 msgid "Edit Dataset "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceModal.tsx:193
+#: superset-frontend/src/datasource/DatasourceModal.tsx:198
 msgid "Use legacy datasource editor"
 msgstr ""
 
-#: superset-frontend/src/explore/constants.js:80
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:389
-msgid "Time range"
-msgstr ""
-
-#: superset-frontend/src/explore/constants.js:81
-msgid "Time column"
-msgstr ""
-
-#: superset-frontend/src/explore/constants.js:82
-msgid "Time grain"
-msgstr ""
-
-#: superset-frontend/src/explore/constants.js:83
-msgid "Origin"
-msgstr ""
-
-#: superset-frontend/src/explore/constants.js:84
-msgid "Time granularity"
-msgstr ""
-
 #: superset-frontend/src/explore/controls.jsx:113
 msgid "A reference to the [Time] configuration, taking granularity into account"
 msgstr ""
@@ -5443,16 +5999,8 @@ msgstr ""
 msgid "One or many metrics to display"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:419
-#: superset-frontend/src/explore/controls.jsx:195
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:233
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:436
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:478
-msgid "Dataset"
-msgstr ""
-
 #: superset-frontend/src/explore/controls.jsx:206
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:220
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:234
 msgid "Visualization type"
 msgstr ""
 
@@ -5534,15 +6082,15 @@ msgid ""
 " the start and/or end time."
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:366
+#: superset-frontend/src/explore/controls.jsx:367
 msgid "Row limit"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:375
+#: superset-frontend/src/explore/controls.jsx:376
 msgid "Series limit"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:378
+#: superset-frontend/src/explore/controls.jsx:379
 msgid ""
 "Limits the number of time series that get displayed. A sub query (or an "
 "extra phase where sub queries are not supported) is applied to limit the "
@@ -5550,57 +6098,57 @@ msgid ""
 "useful when grouping by high cardinality dimension(s)."
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:388
+#: superset-frontend/src/explore/controls.jsx:389
 msgid "Sort by"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:391
+#: superset-frontend/src/explore/controls.jsx:392
 msgid "Metric used to define the top series"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:401
+#: superset-frontend/src/explore/controls.jsx:402
 msgid "Series"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:404
+#: superset-frontend/src/explore/controls.jsx:405
 msgid ""
 "Defines the grouping of entities. Each series is shown as a specific "
 "color on the chart and has a legend toggle"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:413
+#: superset-frontend/src/explore/controls.jsx:414
 msgid "Entity"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:417
+#: superset-frontend/src/explore/controls.jsx:418
 msgid "This defines the element to be plotted on the chart"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:422
+#: superset-frontend/src/explore/controls.jsx:423
 msgid "X Axis"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:423
+#: superset-frontend/src/explore/controls.jsx:424
 msgid "Metric assigned to the [X] axis"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:429
+#: superset-frontend/src/explore/controls.jsx:430
 msgid "Y Axis"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:431
+#: superset-frontend/src/explore/controls.jsx:432
 msgid "Metric assigned to the [Y] axis"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:436
+#: superset-frontend/src/explore/controls.jsx:437
 msgid "Bubble size"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:443
+#: superset-frontend/src/explore/controls.jsx:444
 msgid "Y Axis Format"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:455
+#: superset-frontend/src/explore/controls.jsx:456
 msgid ""
 "When `Calculation type` is set to \"Percentage change\", the Y Axis "
 "Format is forced to `.1%`"
@@ -5615,8 +6163,8 @@ msgid "Color map"
 msgstr ""
 
 #: superset-frontend/src/explore/components/ControlHeader.jsx:56
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:310
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:239
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:333
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:263
 msgid "description"
 msgstr ""
 
@@ -5628,71 +6176,39 @@ msgstr ""
 msgid "Changing this control takes effect instantly"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:251
+#: superset-frontend/src/explore/components/ControlPanelsContainer.tsx:311
 msgid "Customize"
 msgstr ""
 
-#: superset-frontend/src/explore/components/DataTableControl.tsx:93
-msgid "rows retrieved"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:131
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:98
-msgid "Sorry, An error occurred"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:217
-msgid "No data"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:261
-msgid "View samples"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:209
-msgid "Search Metrics & Columns"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:222
-#: superset-frontend/src/explore/components/DatasourcePanel.tsx:235
-#, python-format
-msgid "Showing %s of %s"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:118
-msgid "New chart"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:177
-msgid "Edit properties"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:183
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:185
-msgid "View query"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DisplayQueryButton.jsx:193
-msgid "Run in SQL Lab"
-msgstr ""
-
-#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:113
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:116
 msgid "Height"
 msgstr ""
 
-#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:127
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:130
 msgid "Width"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreActionButtons.jsx:87
-msgid "Export to .json"
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:94
+msgid "Copy chart URL to clipboard"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreActionButtons.jsx:100
-msgid "Export to .csv format"
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:101
+msgid "Loading..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreChartHeader.jsx:102
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:112
+msgid "Superset Chart"
+msgstr ""
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:177
+msgid "Export to .JSON format"
+msgstr ""
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:183
+msgid "Export to .CSV format"
+msgstr ""
+
+#: superset-frontend/src/explore/components/ExploreChartHeader.jsx:101
 #, python-format
 msgid "%s - untitled"
 msgstr ""
@@ -5701,38 +6217,14 @@ msgstr ""
 msgid "Edit chart properties"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:345
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:378
 msgid "Control labeled "
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:449
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:497
 msgid "Open Datasource tab"
 msgstr ""
 
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:68
-msgid "You do not have permission to edit this chart"
-msgstr ""
-
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:229
-msgid ""
-"The description can be displayed as widget headers in the dashboard view."
-" Supports markdown."
-msgstr ""
-
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:236
-msgid "Configuration"
-msgstr ""
-
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:253
-msgid ""
-"Duration (in seconds) of the caching timeout for this chart. Note this "
-"defaults to the dataset's timeout if undefined."
-msgstr ""
-
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:273
-msgid "A list of users who can alter the chart. Searchable by name or username."
-msgstr ""
-
 #: superset-frontend/src/explore/components/RowCountLabel.jsx:35
 msgid "rows"
 msgstr ""
@@ -5741,200 +6233,135 @@ msgstr ""
 msgid "Limit reached"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:32
+#: superset-frontend/src/explore/components/SaveModal.tsx:34
 msgid "**Select** a dashboard OR **create** a new one"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:129
+#: superset-frontend/src/explore/components/SaveModal.tsx:131
 msgid "Please enter a chart name"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:170
+#: superset-frontend/src/explore/components/SaveModal.tsx:172
 msgid "Save chart"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:185
+#: superset-frontend/src/explore/components/SaveModal.tsx:191
 msgid "Save & go to dashboard"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:196
+#: superset-frontend/src/explore/components/SaveModal.tsx:202
 msgid "Save as new chart"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:225
+#: superset-frontend/src/explore/components/SaveModal.tsx:235
 msgid "Save (Overwrite)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:235
+#: superset-frontend/src/explore/components/SaveModal.tsx:244
 msgid "Save as ..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:240
+#: superset-frontend/src/explore/components/SaveModal.tsx:249
 msgid "Chart name"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:252
+#: superset-frontend/src/explore/components/SaveModal.tsx:261
 msgid "Add to dashboard"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:601
-msgid "Display configuration"
+#: superset-frontend/src/explore/components/DataTableControl/index.tsx:97
+msgid "rows retrieved"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:602
-msgid "Configure your how you overlay is displayed here."
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:166
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:96
+msgid "Sorry, An error occurred"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:606
-msgid "Style"
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:256
+#: superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx:146
+#: superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx:64
+msgid "No data"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:620
-msgid "Opacity"
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:307
+msgid "View samples"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:632
-msgid "Color"
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:196
+msgid "Search Metrics & Columns"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:651
-msgid "Line width"
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:210
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:232
+#, python-format
+msgid "Showing %s of %s"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:701
-msgid "Layer configuration"
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:117
+msgid "New chart"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:702
-msgid "Configure the basics of your Annotation Layer."
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:164
+msgid "Edit properties"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:710
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:737
-msgid "Mandatory"
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:170
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:172
+msgid "View query"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:714
-msgid "Hide layer"
+#: superset-frontend/src/explore/components/DisplayQueryButton/index.jsx:180
+msgid "Run in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:720
-msgid "Choose the annotation layer type"
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:63
+msgid "You do not have permission to edit this chart"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:721
-msgid "Annotation layer type"
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:224
+msgid ""
+"The description can be displayed as widget headers in the dashboard view."
+" Supports markdown."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:753
-msgid "Remove"
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:231
+msgid "Configuration"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:166
-msgid "Edit annotation layer"
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:248
+msgid ""
+"Duration (in seconds) of the caching timeout for this chart. Note this "
+"defaults to the dataset's timeout if undefined."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:191
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:203
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:219
-msgid "Add annotation layer"
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:268
+msgid "A list of users who can alter the chart. Searchable by name or username."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:73
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:74
 msgid "`Min` value should be numeric or empty"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:76
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:77
 msgid "`Max` value should be numeric or empty"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:95
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:96
 msgid "Min"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:104
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:105
 msgid "Max"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:159
-msgid "Edit dataset"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:163
-msgid "View in SQL Lab"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:190
-msgid "More dataset related options"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/DateFilterControl.jsx:80
-msgid ""
-"Superset supports smart date parsing. Strings like `3 weeks ago`, `last "
-"sunday`, or `2 weeks from now` can be used."
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:167
-msgid "Default"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:168
-msgid ""
-"(optional) default value for the filter, when using the multiple option, "
-"you can use a semicolon-delimited list of options."
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:184
-msgid "Sort metric"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:185
-msgid "Metric to sort the results by"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:204
-msgid "Sort ascending"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:205
-msgid "Check for sorting ascending"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:217
-msgid "Multiple selections allowed, otherwise filter is limited to a single value"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:231
-msgid "Search all filter options"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:232
-msgid ""
-"By default, each filter loads at most 1000 choices at the initial page "
-"load. Check this box if you have more than 1000 filter values and want to"
-" enable dynamically searching that loads filter values as users type (may"
-" add stress to your database)."
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:252
-msgid "User must select a value for this filter"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:281
-msgid "Filter configuration"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx:45
-msgid "Error while fetching data"
-msgstr ""
-
 #: superset-frontend/src/explore/components/controls/SelectControl.jsx:76
-#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:404
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:399
 msgid "No results found"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:267
-#: superset-frontend/src/explore/components/controls/SelectControl.jsx:237
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:272
+#: superset-frontend/src/explore/components/controls/SelectControl.jsx:241
 #, python-format
 msgid "%s option(s)"
 msgstr ""
@@ -5961,158 +6388,413 @@ msgid ""
 "details"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:200
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:202
 msgid "Geohash"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:104
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:105
 msgid "textarea"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:135
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:136
 msgid "in modal"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl.jsx:48
-#: superset-frontend/src/explore/controlPanels/TimeTable.js:38
-msgid "Time series columns"
-msgstr ""
-
 #: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:105
 msgid "This visualization type is not supported."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:201
+#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:199
 msgid "Click to change visualization type"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:214
+#: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:216
 msgid "Select a visualization type"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/withAsyncVerification.tsx:199
+#: superset-frontend/src/explore/components/controls/withAsyncVerification.tsx:201
 #, python-format
 msgid "Failed to verify select options: %s"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:262
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:462
+msgid "Annotation Slice Configuration"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:463
+msgid ""
+"This section allows you to configure how to use the slice\n"
+"               to generate annotations."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:603
+msgid "Display configuration"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:604
+msgid "Configure your how you overlay is displayed here."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:608
+msgid "Style"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:622
+msgid "Opacity"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:634
+msgid "Color"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:653
+msgid "Line width"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:702
+msgid "Layer configuration"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:703
+msgid "Configure the basics of your Annotation Layer."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:711
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:738
+msgid "Mandatory"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:715
+msgid "Hide layer"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:721
+msgid "Choose the annotation layer type"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:722
+msgid "Annotation layer type"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:754
+msgid "Remove"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:167
+msgid "Edit annotation layer"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:198
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:210
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:243
+msgid "Add annotation layer"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:59
+msgid "Empty collection"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:63
+msgid "Add an item"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:141
+msgid "Remove item"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:170
+msgid "Edit dataset"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:175
+msgid "View in SQL Lab"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:222
+msgid "More dataset related options"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:236
+msgid "Missing dataset"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:241
+msgid "The dataset linked to this chart may have been deleted."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:279
 msgid "RANGE TYPE"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:285
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:302
 msgid "Actual time range"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:306
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:323
 msgid "CANCEL"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:315
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:333
 msgid "APPLY"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx:324
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:342
 msgid "Edit time range"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:51
-msgid "Configure advanced time range"
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:58
+msgid "Configure Advanced Time Range "
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:52
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:124
-msgid "START"
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:64
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:114
+msgid "START (INCLUSIVE)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:58
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:176
-msgid "END"
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:66
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:116
+msgid "Start date included in time range"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CalendarFrame.tsx:40
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:76
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:172
+msgid "END (EXCLUSIVE)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:78
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:174
+msgid "End date excluded from time range"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx:43
 msgid "Configure Time Range: Previous..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CommonFrame.tsx:35
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CommonFrame.tsx:41
 msgid "Configure Time Range: Last..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:121
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:110
 msgid "Configure custom time range"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:151
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:202
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:146
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:203
 msgid "Relative quantity"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:229
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:230
 msgid "Anchor to"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:238
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:239
 msgid "NOW"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:241
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:242
 msgid "Date/Time"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:159
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:367
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:29
+msgid "Return to specific datetime."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:30
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:44
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:62
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:76
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:89
+msgid "Syntax"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:34
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:49
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:67
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:81
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:95
+msgid "Example"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:43
+msgid "Moves the given set of dates by a specified interval."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:58
+msgid "Truncates the specified date to the accuracy specified by the date unit."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:75
+msgid "Get the last date by the date unit."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:88
+msgid "Get the specify date for the holiday"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx:318
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx:271
+msgid "Drop columns or metrics"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx:58
+msgid "Drop columns"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:167
+msgid "Default"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:168
+msgid ""
+"(optional) default value for the filter, when using the multiple option, "
+"you can use a semicolon-delimited list of options."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:184
+msgid "Sort metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:185
+msgid "Metric to sort the results by"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:204
+msgid "Sort ascending"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:205
+msgid "Check for sorting ascending"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:215
+msgid "Allow multiple selections"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:217
+msgid "Multiple selections allowed, otherwise filter is limited to a single value"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:231
+msgid "Search all filter options"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:232
+msgid ""
+"By default, each filter loads at most 1000 choices at the initial page "
+"load. Check this box if you have more than 1000 filter values and want to"
+" enable dynamically searching that loads filter values as users type (may"
+" add stress to your database)."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:251
+msgid "Required"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:252
+msgid "User must select a value for this filter"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:281
+msgid "Filter configuration"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:170
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:378
 msgid "Simple"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:176
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:399
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:187
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:418
 msgid "Custom SQL"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:282
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:292
 msgid "No such column found. To filter on a metric, try the Custom SQL tab."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:291
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:301
 #, python-format
 msgid "%s column(s) and metric(s)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:301
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:286
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:311
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:293
 #, python-format
 msgid "%s column(s)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:302
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:312
 msgid "To filter on a metric, use Custom SQL tab."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:307
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:319
 #, python-format
 msgid "%s operator(s)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:326
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:340
 msgid "Type a value here"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:385
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:418
 msgid "Filter value (case sensitive)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:92
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:96
 msgid "choose WHERE or HAVING..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:127
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:132
 msgid "Filters by columns"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:129
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:134
 msgid "Filters by metrics"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger.tsx:94
+#: superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx:149
+msgid "Fixed"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx:165
+msgid "Based on a metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx:73
+msgid "My metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx:409
+msgid "Add metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:304
+#, python-format
+msgid "%s aggregates(s)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:313
+#, python-format
+msgid "%s saved metric(s)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:353
+msgid "Saved"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:356
+msgid "Saved metric"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:381
+msgid "column"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:401
+msgid "aggregate"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/OptionControls/index.tsx:276
 msgid ""
 "\n"
 "                This filter was inherited from the dashboard's context.\n"
@@ -6120,38 +6802,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:297
-#, python-format
-msgid "%s aggregates(s)"
+#: superset-frontend/src/explore/components/controls/SelectAsyncControl/index.jsx:45
+msgid "Error while fetching data"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:306
-#, python-format
-msgid "%s saved metric(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:346
-msgid "Saved"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:349
-msgid "Saved metric"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:370
-msgid "column"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:386
-msgid "aggregate"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx:73
-msgid "My metric"
-msgstr ""
-
-#: superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx:402
-msgid "Add metric"
+#: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:49
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:38
+msgid "Time series columns"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/Separator.js:25
@@ -6172,127 +6829,127 @@ msgid "Put your code here"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/TimeTable.js:26
-#: superset-frontend/src/explore/controlPanels/sections.jsx:112
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:142
+#: superset-frontend/src/explore/controlPanels/sections.tsx:113
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:179
 msgid "Query"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/TimeTable.js:49
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:50
 msgid "URL"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/TimeTable.js:50
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:51
 msgid ""
 "Templated link, it's possible to include {{ metric }} or other values "
 "coming from the controls."
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:24
-#: superset-frontend/src/explore/controlPanels/sections.jsx:83
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:189
+#: superset-frontend/src/explore/controlPanels/sections.tsx:25
+#: superset-frontend/src/explore/controlPanels/sections.tsx:84
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:191
 msgid "Time"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:26
-#: superset-frontend/src/explore/controlPanels/sections.jsx:84
+#: superset-frontend/src/explore/controlPanels/sections.tsx:27
+#: superset-frontend/src/explore/controlPanels/sections.tsx:85
 msgid "Time related form attributes"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:31
+#: superset-frontend/src/explore/controlPanels/sections.tsx:32
 msgid "Chart type"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:41
+#: superset-frontend/src/explore/controlPanels/sections.tsx:42
 msgid "Chart ID"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:43
+#: superset-frontend/src/explore/controlPanels/sections.tsx:44
 msgid "The id of the active chart"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:50
+#: superset-frontend/src/explore/controlPanels/sections.tsx:51
 msgid "Cache Timeout (seconds)"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:52
+#: superset-frontend/src/explore/controlPanels/sections.tsx:53
 msgid "The number of seconds before expiring the cache"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:59
+#: superset-frontend/src/explore/controlPanels/sections.tsx:60
 msgid "URL parameters"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:61
+#: superset-frontend/src/explore/controlPanels/sections.tsx:62
 msgid "Extra parameters for use in jinja templated queries"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:68
+#: superset-frontend/src/explore/controlPanels/sections.tsx:69
 msgid "Time range endpoints"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:70
+#: superset-frontend/src/explore/controlPanels/sections.tsx:71
 msgid "Time range endpoints (SIP-15)"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:90
+#: superset-frontend/src/explore/controlPanels/sections.tsx:91
 msgid "Annotations and layers"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:124
+#: superset-frontend/src/explore/controlPanels/sections.tsx:125
 msgid "Sort descending"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:126
+#: superset-frontend/src/explore/controlPanels/sections.tsx:127
 msgid "Whether to sort descending or ascending"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:133
+#: superset-frontend/src/explore/controlPanels/sections.tsx:134
 msgid "Contribution"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:135
+#: superset-frontend/src/explore/controlPanels/sections.tsx:136
 msgid "Compute the contribution to the total"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:143
+#: superset-frontend/src/explore/controlPanels/sections.tsx:144
 msgid "Advanced analytics"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:145
+#: superset-frontend/src/explore/controlPanels/sections.tsx:146
 msgid ""
 "This section contains options that allow for advanced analytical post "
 "processing of query results"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:151
+#: superset-frontend/src/explore/controlPanels/sections.tsx:152
 msgid "Rolling window"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:157
+#: superset-frontend/src/explore/controlPanels/sections.tsx:158
 msgid "Rolling function"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:166
+#: superset-frontend/src/explore/controlPanels/sections.tsx:167
 msgid ""
 "Defines a rolling window function to apply, works along with the "
 "[Periods] text box"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:176
+#: superset-frontend/src/explore/controlPanels/sections.tsx:177
 msgid "Periods"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:178
+#: superset-frontend/src/explore/controlPanels/sections.tsx:179
 msgid ""
 "Defines the size of the rolling window function, relative to the time "
 "granularity selected"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:188
+#: superset-frontend/src/explore/controlPanels/sections.tsx:189
 msgid "Min periods"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:190
+#: superset-frontend/src/explore/controlPanels/sections.tsx:191
 msgid ""
 "The minimum number of rolling periods required to show a value. For "
 "instance if you do a cumulative sum on 7 days you may want your \"Min "
@@ -6301,52 +6958,72 @@ msgid ""
 "periods"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:200
+#: superset-frontend/src/explore/controlPanels/sections.tsx:201
 msgid "Time comparison"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:208
+#: superset-frontend/src/explore/controlPanels/sections.tsx:209
 msgid "Time shift"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:219
+#: superset-frontend/src/explore/controlPanels/sections.tsx:220
 msgid ""
 "Overlay one or more timeseries from a relative time period. Expects "
 "relative time deltas in natural language (example:  24 hours, 7 days, 52 "
 "weeks, 365 days). Free text is supported."
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:231
+#: superset-frontend/src/explore/controlPanels/sections.tsx:232
 msgid "Calculation type"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:239
+#: superset-frontend/src/explore/controlPanels/sections.tsx:240
 msgid ""
 "How to display time shifts: as individual lines; as the absolute "
 "difference between the main time series and each time shift; as the "
 "percentage change; or as the ratio between series and time shifts."
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:247
+#: superset-frontend/src/explore/controlPanels/sections.tsx:248
 msgid "Python functions"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:256
+#: superset-frontend/src/explore/controlPanels/sections.tsx:257
 msgid "Rule"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:259
+#: superset-frontend/src/explore/controlPanels/sections.tsx:260
 msgid "Pandas resample rule"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:267
+#: superset-frontend/src/explore/controlPanels/sections.tsx:268
 msgid "Method"
 msgstr ""
 
-#: superset-frontend/src/explore/controlPanels/sections.jsx:277
+#: superset-frontend/src/explore/controlPanels/sections.tsx:278
 msgid "Pandas resample method"
 msgstr ""
 
+#: superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx:60
+msgid "No columns"
+msgstr ""
+
+#: superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx:61
+#: superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx:147
+#: superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx:74
+#: superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx:65
+#, python-format
+msgid "%s option"
+msgstr ""
+
+#: superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx:74
+msgid "Chosen non-numeric column"
+msgstr ""
+
+#: superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx:73
+msgid "No time columns"
+msgstr ""
+
 #: superset-frontend/src/profile/components/App.tsx:48
 msgid "Favorites"
 msgstr ""
@@ -6379,326 +7056,322 @@ msgstr ""
 msgid "No favorite dashboards yet, go click on stars!"
 msgstr ""
 
-#: superset-frontend/src/profile/components/UserInfo.tsx:39
+#: superset-frontend/src/profile/components/UserInfo.tsx:44
 msgid "Profile picture provided by Gravatar"
 msgstr ""
 
-#: superset-frontend/src/profile/components/UserInfo.tsx:57
+#: superset-frontend/src/profile/components/UserInfo.tsx:63
 msgid "joined"
 msgstr ""
 
-#: superset-frontend/src/profile/components/UserInfo.tsx:69
+#: superset-frontend/src/profile/components/UserInfo.tsx:75
 msgid "id:"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/utils.tsx:149
+#: superset-frontend/src/views/CRUD/utils.tsx:145
 msgid "There was an error fetching your recent activity:"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:147
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:109
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:92
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:93
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:131
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:511
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:178
-#: superset-frontend/src/views/CRUD/utils.tsx:202
-#: superset-frontend/src/views/CRUD/utils.tsx:257
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:164
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:152
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:108
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:95
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:96
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:139
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:530
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:233
+#: superset-frontend/src/views/CRUD/utils.tsx:198
+#: superset-frontend/src/views/CRUD/utils.tsx:263
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:166
 #, python-format
 msgid "Deleted: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/utils.tsx:205
+#: superset-frontend/src/views/CRUD/utils.tsx:201
 #, python-format
 msgid "There was an issue deleting: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:150
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:113
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:95
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:97
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:137
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:515
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:181
-#: superset-frontend/src/views/CRUD/utils.tsx:261
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:167
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:155
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:112
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:98
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:100
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:145
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:534
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:236
+#: superset-frontend/src/views/CRUD/utils.tsx:267
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:169
 #, python-format
 msgid "There was an issue deleting %s: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:544
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:80
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:452
 msgid "report"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:80
 msgid "alert"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:82
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:108
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:117
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:107
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:116
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:72
 msgid "reports"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:82
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
 msgid "alerts"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:165
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:170
 #, python-format
 msgid "There was an issue deleting the selected %s: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:213
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:218
 msgid "Last run"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:245
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1331
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:250
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1282
 msgid "Notification method"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:292
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:297
 msgid "Execution log"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:320
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:195
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:250
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:359
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:229
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:348
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:346
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:378
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:316
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:349
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:325
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:194
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:253
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:374
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:232
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:353
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:362
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:389
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:318
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:404
 msgid "Actions"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:347
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:218
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:278
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:513
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:262
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:472
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:468
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:133
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:352
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:217
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:281
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:535
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:265
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:484
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:479
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:170
 msgid "Bulk select"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:361
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:366
 #, python-format
 msgid "No %s yet"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:368
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:213
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:287
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:273
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:391
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:192
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:273
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:251
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:380
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:264
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:373
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:216
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:290
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:287
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:406
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:195
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:276
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:259
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:385
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:280
 msgid "Created by"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:377
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:382
 #, python-format
 msgid "An error occurred while fetching created by values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:384
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:230
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:401
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:389
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:238
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:406
 msgid "Status"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:390
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:395
 msgid "${AlertState.success}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:391
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:396
 msgid "${AlertState.working}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:392
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:397
 msgid "${AlertState.error}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:393
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:398
 msgid "${AlertState.noop}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:394
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:399
 msgid "${AlertState.grace}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:411
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:416
 msgid "Alerts & reports"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:421
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:427
 msgid "Reports"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:445
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:453
 #, python-format
 msgid "This action will permanently delete %s."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:456
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:464
 #, python-format
 msgid "Delete %s?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:460
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:305
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:361
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:72
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:297
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:550
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:325
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:94
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:283
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:501
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:581
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:435
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:468
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:304
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:369
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:75
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:311
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:581
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:328
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:104
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:291
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:522
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:600
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:490
 msgid "Please confirm"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:461
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:469
 #, python-format
 msgid "Are you sure you want to delete the selected %s?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:56
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:67
 msgid "< (Smaller than)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:60
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:71
 msgid "> (Larger than)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:64
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:75
 msgid "<= (Smaller or equal)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:68
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:79
 msgid ">= (Larger or equal)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:72
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:83
 msgid "== (Is equal)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:76
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:87
 msgid "!= (Is not equal)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:80
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:91
 msgid "Not null"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:91
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:102
 msgid "30 days"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:95
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:106
 msgid "60 days"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:99
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:110
 msgid "90 days"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:345
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:357
 msgid "Add notification method"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:346
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:358
 msgid "Add delivery method"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:461
-msgid "Recipients are separated by \",\" or \";\""
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1042
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:255
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:207
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:979
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:279
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:231
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:225
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:343
-#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:112
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:252
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:106
 msgid "Add"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1054
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:991
 msgid "Edit ${isReport ? 'Report' : 'Alert'}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1055
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:992
 msgid "Add ${isReport ? 'Report' : 'Alert'}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1063
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1071
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1000
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1008
 msgid "Report name"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1063
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1071
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1000
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1008
 msgid "Alert name"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1117
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1054
 msgid "Alert condition"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1161
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1098
 msgid "Trigger Alert If..."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1185
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1201
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:123
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1122
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1138
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:140
 msgid "Value"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1213
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1150
 msgid "Report schedule"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1214
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1151
 msgid "Alert condition schedule"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1224
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1162
 msgid "Schedule settings"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1228
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1166
 msgid "Log retention"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1252
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1190
 msgid "Working timeout"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1260
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1273
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1199
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1214
 msgid "Time in seconds"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1267
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1207
 msgid "Grace period"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1282
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1224
 msgid "Message content"
 msgstr ""
 
@@ -6707,27 +7380,31 @@ msgid "log"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:94
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:355
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:357
 msgid "State"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:100
-msgid "Scheduled at"
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:105
+msgid "Execution ID"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:108
-msgid "Start at"
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:117
+msgid "Scheduled at (UTC)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:118
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:125
+msgid "Start at (UTC)"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:135
 msgid "Duration"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:127
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:144
 msgid "Error message"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:139
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:156
 msgid "${alertResource?.type}"
 msgstr ""
 
@@ -6735,39 +7412,43 @@ msgstr ""
 msgid "CRON expression"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:62
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:64
 msgid "Report sent"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:63
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:65
 msgid "Alert triggered, notification sent"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:69
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:71
 msgid "Report sending"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:70
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:72
 msgid "Alert running"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:76
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:78
 msgid "Report failed"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:77
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:79
 msgid "Alert failed"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:82
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:92
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:84
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:94
 msgid "Nothing triggered"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:87
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:89
 msgid "Alert Triggered, In Grace Period"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/alert/components/NotificationMethod.tsx:162
+msgid "Recipients are separated by \",\" or \";\""
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx:38
 msgid "${RecipientIconName.email}"
 msgstr ""
@@ -6776,70 +7457,70 @@ msgstr ""
 msgid "${RecipientIconName.slack}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:65
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:64
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:110
 msgid "annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:133
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:132
 #, python-format
 msgid "There was an issue deleting the selected annotations: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:180
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:179
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:289
 msgid "Edit annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:187
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:186
 msgid "Delete annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:208
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:254
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:207
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:253
 msgid "Annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:260
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:259
 msgid "No annotation yet"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:269
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:268
 msgid "Annotation Layer ${annotationLayerName}"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:291
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:290
 msgid ""
 "Are you sure you want to delete "
 "${annotationCurrentlyDeleting?.short_descr}?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:301
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:300
 msgid "Delete Annotation?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:306
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:305
 msgid "Are you sure you want to delete the selected annotations?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:289
 msgid "Add annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:274
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:298
 msgid "Annotation name"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:286
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:310
 msgid "date"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:307
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:330
 msgid "Additional information"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:314
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:243
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:337
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:267
 msgid "Description (this can be seen in the list)"
 msgstr ""
 
@@ -6847,89 +7528,89 @@ msgstr ""
 msgid "annotation_layer"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:218
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:242
 msgid "Edit annotation layer properties"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:228
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:252
 msgid "Annotation layer name"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:67
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:339
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:70
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:347
 msgid "Annotation layers"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:112
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:115
 #, python-format
 msgid "There was an issue deleting the selected layers: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:181
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:257
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:158
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:279
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:184
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:271
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:161
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:295
 msgid "Last modified"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:206
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:184
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:285
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:209
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:187
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:340
 msgid "Created on"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:231
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:210
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:234
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:213
 msgid "Edit template"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:240
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:219
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:243
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:222
 msgid "Delete template"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:266
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:323
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:269
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:326
 msgid "Annotation layer"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:296
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:282
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:370
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:299
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:285
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:425
 #, python-format
 msgid "An error occurred while fetching dataset datasource values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:329
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:332
 msgid "No annotation layers yet"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:349
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:357
 msgid "This action will permanently delete the layer."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:357
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:365
 msgid "Delete Layer?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:362
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:370
 msgid "Are you sure you want to delete the selected layers?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:75
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:300
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:97
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:286
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:78
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:314
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:107
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:294
 msgid "Are you sure you want to delete"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:137
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:143
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:151
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:160
 #, python-format
 msgid "Last modified %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:53
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:59
 msgid ""
 "The passwords for the databases below are needed in order to import them "
 "together with the charts. Please note that the \"Secure Extra\" and "
@@ -6938,68 +7619,102 @@ msgid ""
 "needed."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:60
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:66
 msgid ""
 "You are importing one or more charts that already exist. Overwriting "
 "might cause you to lose some of your work. Are you sure you want to "
 "overwrite?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:180
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:190
 #, python-format
 msgid "There was an issue deleting the selected charts: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:247
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:220
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:292
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:261
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:227
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:303
 msgid "Modified by"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:370
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:359
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:390
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:385
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:364
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:401
 msgid "Owner"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:380
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:389
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:410
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:431
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:455
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:368
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:389
+msgid "All"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:395
 #, python-format
 msgid "An error occurred while fetching chart owners values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:401
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:416
 #, python-format
 msgid "An error occurred while fetching chart created by values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:412
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:427
 msgid "Viz type"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:444
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:459
 #, python-format
 msgid "An error occurred while fetching chart dataset values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:454
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:412
-#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:133
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:111
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:136
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:469
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:417
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:139
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:114
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:140
 msgid "Favorite"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:461
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:419
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:474
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:410
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:422
+msgid "Any"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:476
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:424
 msgid "Yes"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:462
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:420
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:477
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:425
 msgid "No"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:551
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:492
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:440
+msgid "Alphabetical"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:498
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:446
+msgid "Recently modified"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:504
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:452
+msgid "Least recently modified"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:559
+msgid "Import charts"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:582
 msgid "Are you sure you want to delete the selected charts?"
 msgstr ""
 
@@ -7023,38 +7738,46 @@ msgstr ""
 msgid "css"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:66
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:240
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:69
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:243
 msgid "CSS templates"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:115
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:118
 #, python-format
 msgid "There was an issue deleting the selected templates: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:151
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:154
 #, python-format
 msgid "Last modified by %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:249
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:252
 msgid "CSS template"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:313
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:316
 msgid "This action will permanently delete the template."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:321
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:324
 msgid "Delete Template?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:326
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:329
 msgid "Are you sure you want to delete the selected templates?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:50
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:150
+msgid "published"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:150
+msgid "draft"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:52
 msgid ""
 "The passwords for the databases below are needed in order to import them "
 "together with the dashboards. Please note that the \"Secure Extra\" and "
@@ -7063,46 +7786,37 @@ msgid ""
 "needed."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:57
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:59
 msgid ""
 "You are importing one or more dashboards that already exist. Overwriting "
 "might cause you to lose some of your work. Are you sure you want to "
 "overwrite?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:159
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:85
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:165
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:88
 #, python-format
 msgid "An error occurred while fetching dashboards: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:176
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:183
 msgid "There was an issue deleting the selected dashboards: "
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:369
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:374
 #, python-format
 msgid "An error occurred while fetching dashboard owner values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:390
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:395
 #, python-format
 msgid "An error occurred while fetching dashboard created by values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:408
-msgid "Unpublished"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:502
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:523
 msgid "Are you sure you want to delete the selected dashboards?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx:68
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:165
-msgid "Sorry, your browser does not support copying."
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx:73
 msgid "SQL Copied!"
 msgstr ""
@@ -7122,45 +7836,49 @@ msgid ""
 "overwrite?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:78
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:441
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:149
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:86
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:457
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:80
 msgid "database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:118
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:126
 #, python-format
 msgid "An error occurred while fetching database related data: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:210
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:372
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:443
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:190
+msgid "Import databases"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:226
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:388
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:483
 msgid "Asynchronous query execution"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:213
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:375
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:229
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:391
 msgid "AQE"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:228
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:244
 msgid "Allow data manipulation language"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:231
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:247
 msgid "DML"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:243
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:259
 msgid "CSV upload"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:303
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:319
 msgid "Delete database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:410
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:426
 #, python-format
 msgid ""
 "The database %s is linked to %s charts that appear on %s dashboards. Are "
@@ -7168,77 +7886,97 @@ msgid ""
 "objects."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:423
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:439
 msgid "Delete Database?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:156
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:87
 msgid "Please enter a SQLAlchemy URI to test"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:176
-msgid "Connection looks good!"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:189
-msgid "ERROR: Connection failed. "
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:307
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:212
 #, python-format
 msgid "Sorry there was an error fetching database information: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:255
 msgid "Edit database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:255
 msgid "Add database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:361
-msgid "Connection"
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:265
+msgid "Display Name"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:369
-msgid "Database name"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:377
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:273
 msgid "Name your dataset"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:393
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:278
+msgid "Pick a name to help you identify this database."
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:292
 msgid "dialect+driver://username:password@host:port/database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:399
-msgid "Test connection"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:403
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:299
 msgid "Refer to the "
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:409
-msgid "SQLAlchemy docs"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:411
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:307
 msgid " for more information on how to structure your URI."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:415
-msgid "Performance"
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:319
+msgid "Test connection"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:417
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:423
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:345
+msgid "Allow this database to be queried in SQL Lab"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:364
+msgid "Allow creation of new tables based on queries"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:380
+msgid "Allow creation of new views based on queries"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:389
+msgid "CTAS & CVAS SCHEMA"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:396
+msgid "Search or select schema"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:401
+msgid ""
+"When allowing CREATE TABLE AS option in SQL Lab, this option forces the "
+"table to be created in this schema."
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:418
+msgid ""
+"Allow manipulation of the database using non-SELECT statements such as "
+"UPDATE, DELETE, CREATE, etc."
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:431
+msgid "Allow multi schema metadata fetch"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:458
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:464
 msgid "Chart cache timeout"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:445
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:486
 msgid ""
 "Operate the database in asynchronous mode, meaning that the queries are "
 "executed on remote workers as opposed to on the web server itself. This "
@@ -7246,57 +7984,34 @@ msgid ""
 " Refer to the installation docs for more information."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:455
-msgid "SQL Lab settings"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:507
-msgid "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...)"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:521
-msgid "Allow multi schema metadata fetch"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:533
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:539
-msgid "CTAS schema"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:544
-msgid ""
-"When allowing CREATE TABLE AS option in SQL Lab, this option forces the "
-"table to be created in this schema."
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:553
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:558
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:642
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:508
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:513
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:605
 msgid "Secure extra"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:568
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:523
 msgid "JSON string containing additional connection configuration."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:573
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:528
 msgid ""
 "This is used to provide connection information for systems like Hive, "
 "Presto, and BigQuery, which do not conform to the username:password "
 "syntax normally used by SQLAlchemy."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:592
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:547
 msgid ""
 "Optional CA_BUNDLE contents to validate HTTPS requests. Only available on"
 " certain database engines."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:608
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:570
 msgid "Impersonate Logged In User (Presto & Hive)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:610
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:573
 msgid ""
 "If Presto, all the queries in SQL Lab are going to be executed as the "
 "currently logged on user who must have permission to run them. If Hive "
@@ -7305,26 +8020,26 @@ msgid ""
 "hive.server2.proxy.user property."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:628
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:590
 msgid "Allow data upload"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:630
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:593
 msgid "If selected, please set the schemas allowed for data upload in Extra."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:650
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:613
 msgid "JSON string containing extra configuration elements."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:653
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:616
 msgid ""
 "1. The engine_params object gets unpacked into the "
 "sqlalchemy.create_engine call, while the metadata_params gets unpacked "
 "into the sqlalchemy.MetaData call."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:660
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:623
 msgid ""
 "2. The metadata_cache_timeout is a cache timeout setting in seconds for "
 "metadata fetch of this database. Specify it as "
@@ -7333,7 +8048,7 @@ msgid ""
 "the functionality. A timeout of 0 indicates that the cache never expires."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:669
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:632
 msgid ""
 "3. The schemas_allowed_for_csv_upload is a comma separated list of "
 "schemas that CSVs are allowed to upload to. Specify it as "
@@ -7342,28 +8057,23 @@ msgid ""
 "accessed, just leave the list empty."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:678
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:641
 msgid ""
 "4. The version field is a string specifying this db's version. This "
 "should be used with Presto DBs so that the syntax is correct."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:684
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:647
 msgid ""
 "5. The allows_virtual_table_explore field is a boolean specifying whether"
 " or not the Explore button in SQL Lab results is shown."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:100
-#, python-format
-msgid "Error while saving dataset: %s"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:117
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:111
 msgid "Add dataset"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:53
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:58
 msgid ""
 "The passwords for the databases below are needed in order to import them "
 "together with the datasets. Please note that the \"Secure Extra\" and "
@@ -7372,53 +8082,57 @@ msgid ""
 "needed."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:60
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:65
 msgid ""
 "You are importing one or more datasets that already exist. Overwriting "
 "might cause you to lose some of your work. Are you sure you want to "
 "overwrite?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:165
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:174
 msgid "An error occurred while fetching dataset related data"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:185
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:194
 #, python-format
 msgid "An error occurred while fetching dataset related data: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:204
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:213
 msgid "Physical dataset"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:214
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:221
 msgid "Virtual dataset"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:399
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:410
 #, python-format
 msgid "An error occurred while fetching dataset owner values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:418
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:429
 #, python-format
 msgid "An error occurred while fetching datasets: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:433
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:365
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:390
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:444
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:367
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:445
 #, python-format
 msgid "An error occurred while fetching schema values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:533
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:502
+msgid "Import datasets"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:552
 #, python-format
 msgid "There was an issue deleting the selected datasets: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:556
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:575
 #, python-format
 msgid ""
 "The dataset %s is linked to %s charts that appear on %s dashboards. Are "
@@ -7426,93 +8140,97 @@ msgid ""
 "objects."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:569
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:588
 msgid "Delete Dataset?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:582
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:601
 msgid "Are you sure you want to delete the selected datasets?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:632
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:651
 msgid "0 Selected"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:635
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:654
 #, python-format
 msgid "%s Selected (Virtual)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:642
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:661
 #, python-format
 msgid "%s Selected (Physical)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:649
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:668
 #, python-format
 msgid "%s Selected (%s Physical, %s Virtual)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:120
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:122
 #, python-format
 msgid "There was an issue previewing the selected query. %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:149
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:151
 msgid "Success"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:154
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:156
 msgid "Failed"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:159
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:161
 msgid "Running"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:164
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:166
 msgid "Offline"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:169
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:171
 msgid "Scheduled"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:212
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:214
 #, python-format
 msgid "Duration: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:225
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:227
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:147
 msgid "Tab name"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:257
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:241
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:259
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:296
 msgid "TABLES"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:296
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:298
 msgid "Rows"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:324
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:326
 msgid "Open query in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:348
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:382
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:350
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:384
 #, python-format
 msgid "An error occurred while fetching database values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:395
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:391
+msgid "Time range"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:397
 msgid "Search by query text"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:119
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:315
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:367
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:98
 msgid "Query preview"
 msgstr ""
@@ -7540,111 +8258,147 @@ msgstr ""
 msgid "Executed query"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:87
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:145
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:55
+msgid ""
+"The passwords for the databases below are needed in order to import them "
+"together with the saved queries. Please note that the \"Secure Extra\" "
+"and \"Certificate\" sections of the database configuration are not "
+"present in export files, and should be added manually after the import if"
+" they are needed."
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:62
+msgid ""
+"You are importing one or more saved queries that already exist. "
+"Overwriting might cause you to lose some of your work. Are you sure you "
+"want to overwrite?"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:107
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:234
 msgid "Saved queries"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:116
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:153
 #, python-format
 msgid "There was an issue previewing the selected query %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:162
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:191
+msgid "Import queries"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:217
 msgid "Link Copied!"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:198
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:253
 #, python-format
 msgid "There was an issue deleting the selected queries: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:323
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:374
 msgid "Edit query"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:331
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:381
 msgid "Copy query URL"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:339
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:388
+msgid "Export query"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:395
 msgid "Delete query"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:411
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:239
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:466
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:243
 msgid "This action will permanently delete the saved query."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:421
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:251
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:476
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:255
 msgid "Delete Query?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:436
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:491
 msgid "Are you sure you want to delete the selected queries?"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:534
+msgid "queries"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:126
 msgid "Query name"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:110
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:99
+msgid "[Untitled]"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:100
+msgid "Unknown"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:175
 msgid "Edited"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:117
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:183
 msgid "Created"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:127
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:193
 msgid "Viewed"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:135
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:201
 msgid "Examples"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:139
-#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:143
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:268
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:145
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:147
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:272
 msgid "Mine"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:72
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:70
 msgid "Recently viewed charts, dashboards, and saved queries will appear here"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:77
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:75
 msgid "Recently created charts, dashboards, and saved queries will appear here"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:82
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:80
 msgid "Recent example charts, dashboards, and saved queries will appear here"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:87
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:85
 msgid "Recently edited charts, dashboards, and saved queries will appear here"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:115
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:112
 msgid ""
 "${tableName\n"
-"                        .split('')\n"
-"                        .slice(0, tableName.length - 1)\n"
-"                        .join('')}\n"
+"                      .split('')\n"
+"                      .slice(0, tableName.length - 1)\n"
+"                      .join('')}\n"
 "                    "
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:135
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:131
 msgid "You don't have any favorites yet!"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:147
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:143
 msgid "SQL Lab queries"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:148
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:144
 msgid "${tableName}"
 msgstr ""
 
@@ -7652,24 +8406,44 @@ msgstr ""
 msgid "query"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:221
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:223
 msgid "Share"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:307
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:312
 #, python-format
 msgid "Last run %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:125
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:147
+#, python-format
+msgid "There was an issue fetching your recent activity: %s"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:160
+#, python-format
+msgid "There was an issues fetching your dashboards: %s"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:169
+#, python-format
+msgid "There was an issues fetching your chart: %s"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:178
+#, python-format
+msgid "There was an issues fetching your saved queries: %s"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:211
 msgid "Recents"
 msgstr ""
 
-#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:276
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:272
 msgid "Select start and end date"
 msgstr ""
 
-#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:382
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:378
 #, python-format
 msgid "Type or Select [%s]"
 msgstr ""
@@ -7747,49 +8521,3 @@ msgstr ""
 #: superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js:24
 msgid "Time-series Table"
 msgstr ""
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:385
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:364
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:378
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:399
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:420
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:444
-msgid "All"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:406
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:418
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:463
-msgid "Any"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:436
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:481
-msgid "Alphabetical"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:442
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:487
-msgid "Recently modified"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:448
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:493
-msgid "Least recently modified"
-msgstr ""
-
-#: superset-frontend/src/components/ListView/ListView.tsx:393
-msgid "No Data"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:138
-msgid "published"
-msgstr ""
-
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:138
-msgid "draft"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:506
-msgid "Autocomplete"
-msgstr ""