You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2021/01/25 13:16:04 UTC

[superset] branch master updated: Update translation files after capitalization PRs (1-9) (#12696)

This is an automated email from the ASF dual-hosted git repository.

villebro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 878f123  Update translation files after capitalization PRs (1-9) (#12696)
878f123 is described below

commit 878f1238bad49b53bc947ef21c14cca1dd0b89fc
Author: Michael S. Molina <70...@users.noreply.github.com>
AuthorDate: Mon Jan 25 10:15:38 2021 -0300

    Update translation files after capitalization PRs (1-9) (#12696)
---
 superset/translations/de/LC_MESSAGES/messages.json |  419 ++--
 superset/translations/de/LC_MESSAGES/messages.po   | 1318 +++++-----
 superset/translations/en/LC_MESSAGES/messages.json |  411 +--
 superset/translations/en/LC_MESSAGES/messages.po   | 1256 +++++-----
 superset/translations/es/LC_MESSAGES/messages.json |  415 ++--
 superset/translations/es/LC_MESSAGES/messages.po   | 1338 +++++-----
 superset/translations/fr/LC_MESSAGES/messages.json |  423 ++--
 superset/translations/fr/LC_MESSAGES/messages.po   | 1296 +++++-----
 superset/translations/it/LC_MESSAGES/messages.json |  415 ++--
 superset/translations/it/LC_MESSAGES/messages.po   | 1332 +++++-----
 superset/translations/ja/LC_MESSAGES/messages.json |  411 +--
 superset/translations/ja/LC_MESSAGES/messages.po   | 1322 +++++-----
 superset/translations/ko/LC_MESSAGES/messages.json |  411 +--
 superset/translations/ko/LC_MESSAGES/messages.po   | 1308 +++++-----
 superset/translations/messages.pot                 | 1254 +++++-----
 .../translations/pt_BR/LC_MESSAGES/messages.json   |  435 ++--
 .../translations/pt_BR/LC_MESSAGES/messages.po     | 2627 ++++++++++----------
 superset/translations/ru/LC_MESSAGES/messages.json |  415 ++--
 superset/translations/ru/LC_MESSAGES/messages.po   | 1302 +++++-----
 superset/translations/zh/LC_MESSAGES/messages.json |  415 ++--
 superset/translations/zh/LC_MESSAGES/messages.po   | 1292 +++++-----
 21 files changed, 10271 insertions(+), 9544 deletions(-)

diff --git a/superset/translations/de/LC_MESSAGES/messages.json b/superset/translations/de/LC_MESSAGES/messages.json
index 07e2e2d..61175cb 100644
--- a/superset/translations/de/LC_MESSAGES/messages.json
+++ b/superset/translations/de/LC_MESSAGES/messages.json
@@ -194,6 +194,7 @@
       ],
       "Name must be unique": [""],
       "Deleted %(num)d chart": ["", "Deleted %(num)d charts"],
+      "Request is not JSON": [""],
       "Request is incorrect: %(error)s": [""],
       "`confidence_interval` must be between 0 and 1 (exclusive)": [""],
       "lower percentile must be greater than 0 and less than 100. Must be lower than upper percentile.": [
@@ -914,17 +915,9 @@
       "Edit Log": ["Spalte bearbeiten"],
       "Action": ["Aktion"],
       "dttm": [""],
-      "Add Item": ["Datenbank einfügen"],
+      "Add item": ["Datenbank einfügen"],
       "The query couldn't be loaded": [""],
-      "Your query was saved": ["Ihre Abfrage wurde gespeichert"],
-      "Your query could not be saved": [
-        "Ihre Abfrage konnte nicht gespeichert werden"
-      ],
-      "Your query was updated": ["Ihre Abfrage wurde gespeichert"],
-      "Your query could not be updated": [
-        "Ihre Abfrage konnte nicht gespeichert werden"
-      ],
-      "Your query has been scheduled. To see details of your query, navigate to Saved Queries": [
+      "Your query has been scheduled. To see details of your query, navigate to Saved queries": [
         ""
       ],
       "Your query could not be scheduled": [
@@ -973,6 +966,14 @@
       "An error occurred while setting the tab title. Please contact your administrator.": [
         ""
       ],
+      "Your query was saved": ["Ihre Abfrage wurde gespeichert"],
+      "Your query could not be saved": [
+        "Ihre Abfrage konnte nicht gespeichert werden"
+      ],
+      "Your query was updated": ["Ihre Abfrage wurde gespeichert"],
+      "Your query could not be updated": [
+        "Ihre Abfrage konnte nicht gespeichert werden"
+      ],
       "An error occurred while storing your query in the backend. To avoid losing your changes, please save your query using the \"Save Query\" button.": [
         ""
       ],
@@ -1000,9 +1001,9 @@
       "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": [""],
       "Explore the result set in the data exploration view": [""],
@@ -1034,7 +1035,7 @@
       "[To]-": [""],
       "Filter by status": [""],
       "Edit": [""],
-      "view results": [""],
+      "View results": [""],
       "Data preview": [""],
       "Overwrite text in the editor with a query on this table": [""],
       "Run query in a new tab": [""],
@@ -1042,16 +1043,16 @@
       "An error occurred saving dataset": [""],
       ".CSV": [""],
       "Clipboard": [""],
-      "Filter Results": [""],
-      "Database Error": ["Datenbank"],
+      "Filter results": ["Tabellenname"],
+      "Database error": ["Datenbank"],
       "was created": [""],
       "Query in a new tab": [""],
       "The query returned no data": [""],
       "Fetch data preview": [""],
-      "Refetch Results": [""],
-      "Track Job": [""],
+      "Refetch results": [""],
+      "Track job": [""],
       "Stop": ["Stopp"],
-      "Run Selection": [""],
+      "Run selection": ["Verbindungstest"],
       "Run": [""],
       "Stop running (Ctrl + x)": [""],
       "Run query (Ctrl + Return)": [""],
@@ -1060,12 +1061,12 @@
       "Undefined": [""],
       "Save": [""],
       "Save as": ["Speichern als"],
-      "Save Query": [""],
-      "Save As New": ["Scheibe speichern"],
+      "Save query": ["Gespeicherte Abfrage anzeigen"],
+      "Save as new": ["Scheibe speichern"],
       "Update": [""],
       "Label for your query": [""],
       "Write a description for your query": [""],
-      "Schedule Query": ["Gespeicherte Abfrage anzeigen"],
+      "Schedule query": ["Gespeicherte Abfrage anzeigen"],
       "Schedule": [""],
       "There was an error with your request": [""],
       "Please save the query to enable sharing": [""],
@@ -1076,9 +1077,10 @@
       "Run a query to display results here": [""],
       "Preview: `%s`": [""],
       "Results": [""],
+      "Query history": ["Abfragen suchen"],
       "Run query": [""],
       "New tab": [""],
-      "Untitled Query": [""],
+      "Untitled query": ["Benutzer Rollen"],
       "Stop query": ["Leere Abfrage?"],
       "Schedule the query periodically": [""],
       "You must run the query successfully first": [""],
@@ -1088,7 +1090,7 @@
       "CREATE TABLE AS": [""],
       "CREATE VIEW AS": [""],
       "Estimate the cost before running a query": [""],
-      "Reset State": [""],
+      "Reset state": [""],
       "Enter a new title for the tab": [""],
       "Untitled Query %s": [""],
       "Close tab": [""],
@@ -1111,7 +1113,6 @@
       "below (example:": [""],
       "), and they become available in your SQL (example:": [""],
       ") by using": [""],
-      "Template Parameters": ["Vorlagename"],
       "Edit template parameters": [""],
       "Invalid JSON": [""],
       "Create a new chart": ["Erstellte Inhalt"],
@@ -1223,7 +1224,6 @@
       "An error occurred while fetching dashboards": [
         "Fehler bei Anmerkungstufeabruf"
       ],
-      "Run Query": [""],
       "Error while fetching table list": [""],
       "Select table or type table name": [""],
       "Type to search ...": [""],
@@ -1231,28 +1231,27 @@
       "Force refresh table list": ["Aktualisierung erzwingen"],
       "See table schema": [""],
       "%s%s": [""],
-      "Share Dashboard": ["Dashboard speichern"],
+      "Share dashboard": ["Dashboard speichern"],
       "This may be triggered by:": [""],
       "Please reach out to the Chart Owner for assistance.": [""],
       "Chart Owner: %s": [""],
       "%s Error": ["Fehler"],
-      "See More": [""],
-      "See Less": [""],
-      "Copy Message": [""],
+      "See more": [""],
+      "See less": [""],
+      "Copy message": ["Warnmeldung"],
       "Close": [""],
-      "Unexpected Error": [""],
       "This was triggered by:": [""],
       "Did you mean:": [""],
       "%(suggestion)s instead of \"%(undefinedParameter)s?\"": [""],
-      "Parameter Error": ["Parameter"],
+      "Parameter error": ["Parameter"],
       "We’re having trouble loading this visualization. Queries are set to timeout after %s second.": [
         ""
       ],
       "We’re having trouble loading these results. Queries are set to timeout after %s second.": [
         ""
       ],
-      "Timeout Error": [""],
-      "Cell Content": ["Erstellte Inhalt"],
+      "Timeout error": [""],
+      "Cell content": ["Erstellte Inhalt"],
       "The import was successful": ["Dashboard wurde erfolgreich gespeichert"],
       "OVERWRITE": [""],
       "Overwrite": ["Überschreiben Scheibe %s"],
@@ -1260,10 +1259,11 @@
       "Import %s": ["Importieren"],
       "Last Updated %s": [""],
       "%s Selected": [""],
-      "Deselect All": [""],
+      "Deselect all": ["Wirklich alle löschen?"],
       "%s-%s of %s": [""],
       "Settings": [""],
       "About": [""],
+      "SQL query": ["Abfrage"],
       "There is not enough space for this component. Try decreasing its width, or increasing the destination width.": [
         ""
       ],
@@ -1289,10 +1289,10 @@
       "Any color palette selected here will override the colors applied to this dashboard's individual charts": [
         ""
       ],
-      "Color Scheme": ["Farbschema"],
+      "Color scheme": ["Farbschema"],
       "Load a template": ["Vorlage laden"],
       "Load a CSS template": ["CSS Vorlage laden"],
-      "Live CSS Editor": [""],
+      "Live CSS editor": [""],
       "You have unsaved changes.": [""],
       "This dashboard is currently force refreshing; the next force refresh will be in %s.": [
         ""
@@ -1300,18 +1300,17 @@
       "Your dashboard is too large. Please reduce the size before save it.": [
         ""
       ],
-      "Discard Changes": [""],
+      "Discard changes": ["Bearbeitet am"],
       "An error occurred while fetching available CSS templates": [""],
-      "Superset Dashboard": ["Dashboard speichern"],
+      "Superset dashboard": ["Dashboard speichern"],
       "Check out this dashboard: ": ["Speichern & zum Dashboard gehen"],
-      "Share dashboard": ["Dashboard speichern"],
       "Refresh dashboard": ["Keine Dashboards"],
       "Set auto-refresh interval": ["Aktualisierung Zwischenzeit"],
       "Set filter mapping": [""],
       "Edit dashboard properties": ["Dashboardeigenschaften bearbeiten"],
       "Edit CSS": ["Schiebe bearbeiten"],
       "Download as image": [""],
-      "Toggle FullScreen": [""],
+      "Toggle fullscreen": [""],
       "There is no chart definition associated with this component, could it have been deleted?": [
         ""
       ],
@@ -1325,9 +1324,9 @@
         "Dashboard wurde erfolgreich gespeichert"
       ],
       "Apply": [""],
-      "Dashboard Properties": ["Dashboardeigenschaften bearbeiten"],
-      "Basic Information": [""],
-      "URL Slug": [""],
+      "Dashboard properties": ["Dashboardeigenschaften bearbeiten"],
+      "Basic information": [""],
+      "URL slug": [""],
       "A readable URL for your dashboard": ["Speichern & zum Dashboard gehen"],
       "Access": ["Keine Zugriff!"],
       "Owners is a list of users who can alter the dashboard. Searchable by name or username.": [
@@ -1335,6 +1334,7 @@
       ],
       "Colors": [""],
       "Advanced": [""],
+      "JSON metadata": ["Keine Dashboards"],
       "This dashboard is not published, it will not show up in the list of dashboards. Click here to publish this dashboard.": [
         ""
       ],
@@ -1353,12 +1353,12 @@
       "6 hours": ["Stunde"],
       "12 hours": ["Stunde"],
       "24 hours": ["Stunde"],
-      "Refresh Interval": ["Aktualisierung Zwischenzeit"],
+      "Refresh interval": ["Aktualisierung Zwischenzeit"],
       "Refresh frequency": [""],
       "Are you sure you want to proceed?": [""],
       "Save for this session": [""],
       "You must pick a name for the new dashboard": [""],
-      "Save Dashboard": ["Dashboard speichern"],
+      "Save dashboard": ["Dashboard speichern"],
       "Overwrite Dashboard [%s]": [""],
       "Save as:": ["Speichern als:"],
       "[dashboard name]": [""],
@@ -1370,11 +1370,11 @@
       "One ore more annotation layers failed loading.": [""],
       "Cached %s": [""],
       "Fetched %s": [""],
-      "Minimize Chart": [""],
-      "Maximize Chart": [""],
+      "Minimize chart": ["Diagramm bewegen"],
+      "Maximize chart": ["Diagramm untersuchen"],
       "Force refresh": ["Aktualisierung erzwingen"],
       "Toggle chart description": ["Diagramm Beschreibung umschalten"],
-      "View Chart in Explore": [""],
+      "View chart in Explore": ["Überschreiben Scheibe %s"],
       "Share chart": ["Diagramm untersuchen"],
       "Export CSV": ["Exportieren als CSV"],
       "Applied Filters (%d)": [""],
@@ -1400,30 +1400,33 @@
       "Row": [""],
       "Tabs": [""],
       "Preview": [""],
-      "Select Parent Filters": ["Anmerkungstufe auswählen"],
-      "Reset All": [""],
+      "Yes, cancel": [""],
+      "Keep editing": [""],
+      "Select parent filters": ["Anmerkungstufe auswählen"],
+      "Reset all": [""],
       "You have removed this filter.": [""],
-      "Restore Filter": [""],
-      "Filter Name": ["Tabellenname"],
+      "Restore filter": [""],
+      "Filter name": ["Tabellenname"],
       "Name is required": [""],
       "Datasource is required": ["Datenquellen"],
       "Field": [""],
-      "Default Value": [""],
-      "Parent Filter": [""],
+      "Parent filter": ["Anmerkungstufe auswählen"],
       "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": [""],
+      "Add filter": ["Druid Cluster einfügen"],
+      "(Removed)": [""],
+      "Undo?": [""],
       "Scoping": [""],
       "Apply to all panels": [""],
       "Apply to specific panels": [""],
       "Only selected panels will be affected by this filter": [""],
       "All panels with this column will be affected by this filter": [""],
-      "Filter Configuration and Scoping": [""],
-      "Add Filter": [""],
-      "(Removed)": [""],
-      "Undo?": [""],
       "All filters": [""],
       "All charts": ["Diagramm untersuchen"],
       "Warning! Changing the dataset may break the chart if the metadata does not exist.": [
@@ -1433,22 +1436,23 @@
         ""
       ],
       "dataset": [""],
-      "Change Dataset": [""],
+      "Change dataset": ["Metrik auswählen"],
       "Warning!": ["Warnmeldung"],
       "Search / Filter": [""],
       "Physical (table or view)": [""],
       "Virtual (SQL)": [""],
-      "Data Type": ["Typ"],
+      "SQL expression": [""],
+      "Data type": ["Typ"],
+      "Datetime format": [""],
       "The pattern of timestamp format. For strings use ": [""],
-      "python datetime string pattern": [""],
+      "Python datetime string pattern": [""],
       " expression which needs to adhere to the ": [""],
       "ISO 8601": [""],
       " standard to ensure that the lexicographical ordering\n                      coincides with the chronological ordering. If the\n                      timestamp format does not adhere to the ISO 8601 standard\n                      you will need to define an expression and type for\n                      transforming the string into a date or timestamp. Note\n                      currently time zones are not supported. If time is stored\n                      in epoch format, put  [...]
         ""
       ],
-      "Is Dimension": [""],
-      "Is Temporal": [""],
-      "Is Filterable": [""],
+      "Is dimension": [""],
+      "Is filterable": ["Druid Cluster einfügen"],
       "Modified columns: %s": [""],
       "Removed columns: %s": [""],
       "New columns added: %s": [""],
@@ -1463,7 +1467,7 @@
       ],
       "Autocomplete filters": [""],
       "Whether to populate autocomplete filters options": [""],
-      "Autocomplete Query Predicate": [""],
+      "Autocomplete query predicate": [""],
       "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.": [
         ""
       ],
@@ -1471,11 +1475,12 @@
         ""
       ],
       "Owners of the dataset": [""],
+      "Cache timeout": [""],
       "The duration of time in seconds before the cache is invalidated": [""],
       "Hours offset": [""],
       "Spatial": [""],
       "virtual": [""],
-      "dataset name": [""],
+      "Dataset name": ["Datenbank"],
       "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.": [
         ""
       ],
@@ -1486,10 +1491,12 @@
       ],
       "Click the lock to make changes.": [""],
       "Click the lock to prevent further changes.": [""],
+      "D3 format": [""],
+      "Warning message": ["Warnmeldung"],
       "Warning message to display in the metric selector": [""],
-      "Certified By": [""],
+      "Certified by": ["Geändert"],
       "Person or group that has certified this metric": [""],
-      "Certification Details": [""],
+      "Certification details": [""],
       "Details of the certification": [""],
       "Be careful.": [""],
       "Changing these settings will affect all charts using this dataset, including charts owned by other people.": [
@@ -1497,7 +1504,7 @@
       ],
       "Source": [""],
       "Sync columns from source": [""],
-      "Calculated Columns": ["Spalten auflisten"],
+      "Calculated columns": ["Spalten auflisten"],
       "The dataset has been saved": [""],
       "The dataset configuration exposed here\n                affects all the charts using this dataset.\n                Be mindful that changing settings\n                here may affect other charts\n                in undesirable ways.": [
         ""
@@ -1505,7 +1512,7 @@
       "Are you sure you want to save and apply changes?": [""],
       "Confirm save": [""],
       "Edit Dataset ": ["Datenbank bearbeiten"],
-      "Use Legacy Datasource Editor": [""],
+      "Use legacy datasource editor": [""],
       "Time range": [""],
       "Time column": ["Zeitspalte"],
       "Time grain": [""],
@@ -1568,33 +1575,8 @@
       "When `Calculation type` is set to \"Percentage change\", the Y Axis Format is forced to `.1%`": [
         ""
       ],
-      "Color scheme": ["Farbschema"],
       "The color scheme for rendering chart": [""],
       "Color map": ["Farbschema"],
-      "Simple": [""],
-      "Custom SQL": [""],
-      "%s option(s)": [""],
-      "No such column found. To filter on a metric, try the Custom SQL tab.": [
-        ""
-      ],
-      "%s column(s) and metric(s)": [""],
-      "%s column(s)": ["Spalten auflisten"],
-      "To filter on a metric, use Custom SQL tab.": [""],
-      "%s operators(s)": [""],
-      "type a value here": [""],
-      "Filter value (case sensitive)": [""],
-      "choose WHERE or HAVING...": [""],
-      "filters by columns": ["Spalten auflisten"],
-      "filters by metrics": ["Metriken auflisten"],
-      "\n                This filter was inherited from the dashboard's context.\n                It won't be saved when saving the chart.\n              ": [
-        ""
-      ],
-      "%s aggregates(s)": [""],
-      "%s saved metric(s)": [""],
-      "column": ["Spalte"],
-      "aggregate": [""],
-      "Saved": ["Speichern als"],
-      "Saved metric": ["Gespeicherte Abfragen"],
       "description": ["Beschreibung"],
       "bolt": [""],
       "Changing this control takes effect instantly": [""],
@@ -1602,7 +1584,6 @@
       "rows retrieved": [""],
       "Sorry, An error occurred": [""],
       "No data": ["Keine Dashboards"],
-      "View results": [""],
       "View samples": [""],
       "Search Metrics & Columns": [""],
       "Showing %s of %s": [""],
@@ -1617,7 +1598,7 @@
       "%s - untitled": ["%s - unbenannt"],
       "Edit chart properties": ["Dashboardeigenschaften bearbeiten"],
       "Control labeled ": [""],
-      "Open Datasource Tab": ["Datenquelle"],
+      "Open Datasource tab": ["Datenquelle"],
       "You do not have permission to edit this chart": [
         "Sie haben keine Zugriff auf diese Datenquelle"
       ],
@@ -1635,32 +1616,33 @@
       "Limit reached": [""],
       "**Select** a dashboard OR **create** a new one": [""],
       "Please enter a chart name": ["Bitte Dashboardname eingeben"],
-      "Save Chart": ["Speichern als"],
+      "Save chart": ["Speichern als"],
       "Save & go to dashboard": ["Speichern & zum Dashboard gehen"],
       "Save as new chart": ["Dashboard speichern"],
       "Save (Overwrite)": ["Gespeicherte Abfragen"],
       "Save as ...": ["Speichern als"],
       "Chart name": ["Von Zeit"],
       "Add to dashboard": ["Schiebe zum neuen Dashboard hinzufügen"],
-      "Add filter": ["Druid Cluster einfügen"],
       "Display configuration": [""],
       "Configure your how you overlay is displayed here.": [""],
       "Style": [""],
       "Opacity": [""],
       "Color": [""],
-      "Line Width": ["Breite"],
-      "Layer Configuration": [""],
+      "Line width": ["Breite"],
+      "Layer configuration": [""],
       "Configure the basics of your Annotation Layer.": [""],
       "Mandatory": [""],
-      "Hide Layer": [""],
-      "Choose the Annotation Layer Type": ["Anmerkungstufe"],
-      "Annotation Layer Type": ["Anmerkungstufe"],
+      "Hide layer": [""],
+      "Choose the annotation layer type": ["Anmerkungstufe"],
+      "Annotation layer type": ["Anmerkungstufe"],
       "Remove": [""],
+      "Edit annotation layer": ["Anmerkungstufe"],
+      "Add annotation layer": ["Anmerkungstufe"],
       "`Min` value should be numeric or empty": [""],
       "`Max` value should be numeric or empty": [""],
       "Min": [""],
       "Max": [""],
-      "Edit Dataset": ["Datenbank bearbeiten"],
+      "Edit dataset": ["Datenbank bearbeiten"],
       "View in SQL Lab": [""],
       "More dataset related options": [""],
       "Superset supports smart date parsing. Strings like `3 weeks ago`, `last sunday`, or `2 weeks from now` can be used.": [
@@ -1670,23 +1652,22 @@
       "(optional) default value for the filter, when using the multiple option, you can use a semicolon-delimited list of options.": [
         ""
       ],
-      "Sort Metric": ["Metrik anzeigen"],
+      "Sort metric": ["Metrik anzeigen"],
       "Metric to sort the results by": [""],
-      "Sort Ascending": [""],
+      "Sort ascending": [""],
       "Check for sorting ascending": [""],
-      "Allow Multiple Selections": [""],
       "Multiple selections allowed, otherwise filter is limited to a single value": [
         ""
       ],
-      "Search All Filter Options": [""],
+      "Search all filter options": [""],
       "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).": [
         ""
       ],
       "User must select a value for this filter": [""],
-      "Filter Configuration": [""],
-      "Add metric": ["Metrik einfügen"],
+      "Filter configuration": ["Verbindungstest"],
       "Error while fetching data": [""],
       "No results found": ["Keine Datensätze gefunden"],
+      "%s option(s)": [""],
       "Invalid lat/long configuration.": [""],
       "Reverse lat/long ": [""],
       "Longitude & Latitude columns": [""],
@@ -1697,7 +1678,7 @@
       "Geohash": [""],
       "textarea": [""],
       "in modal": [""],
-      "Time Series Columns": ["Zeitspalte"],
+      "Time series columns": ["Zeitspalte"],
       "This visualization type is not supported.": [""],
       "Click to change visualization type": ["Visualisierungstyp wählen"],
       "Select a visualization type": ["Visualisierungstyp wählen"],
@@ -1707,18 +1688,43 @@
       "CANCEL": [""],
       "APPLY": [""],
       "Edit time range": [""],
-      "Configure Advanced Time Range": [""],
+      "Configure advanced time range": [""],
       "START": [""],
       "END": [""],
       "Configure Time Range: Previous...": [""],
       "Configure Time Range: Last...": [""],
-      "Configure Custom Time Range": [""],
+      "Configure custom time range": [""],
       "Relative quantity": [""],
-      "ANCHOR TO": [""],
+      "Anchor to": [""],
       "NOW": [""],
       "Date/Time": ["Von Zeit"],
+      "Simple": [""],
+      "Custom SQL": [""],
+      "No such column found. To filter on a metric, try the Custom SQL tab.": [
+        ""
+      ],
+      "%s column(s) and metric(s)": [""],
+      "%s column(s)": ["Spalten auflisten"],
+      "To filter on a metric, use Custom SQL tab.": [""],
+      "%s operators(s)": [""],
+      "Type a value here": [""],
+      "Filter value (case sensitive)": [""],
+      "choose WHERE or HAVING...": [""],
+      "Filters by columns": ["Spalten auflisten"],
+      "Filters by metrics": ["Metriken auflisten"],
+      "\n                This filter was inherited from the dashboard's context.\n                It won't be saved when saving the chart.\n              ": [
+        ""
+      ],
+      "%s aggregates(s)": [""],
+      "%s saved metric(s)": [""],
+      "Saved": ["Speichern als"],
+      "Saved metric": ["Gespeicherte Abfragen"],
+      "column": ["Spalte"],
+      "aggregate": [""],
+      "My metric": ["Metrik"],
+      "Add metric": ["Metrik einfügen"],
       "Code": [""],
-      "Markup Type": [""],
+      "Markup type": [""],
       "Pick your favorite markup language": [""],
       "Put your code here": [""],
       "Query": ["Abfrage"],
@@ -1728,26 +1734,26 @@
       ],
       "Time": [""],
       "Time related form attributes": [""],
-      "Chart Type": [""],
+      "Chart type": ["Von Zeit"],
       "Chart ID": [""],
       "The id of the active chart": [""],
       "Cache Timeout (seconds)": [""],
       "The number of seconds before expiring the cache": [""],
-      "URL Parameters": ["Parameter"],
+      "URL parameters": ["Parameter"],
       "Extra parameters for use in jinja templated queries": [""],
       "Time range endpoints": [""],
       "Time range endpoints (SIP-15)": [""],
-      "Annotations and Layers": ["Anmerkungstufe"],
-      "Sort Descending": [""],
+      "Annotations and layers": ["Anmerkungstufe"],
+      "Sort descending": [""],
       "Whether to sort descending or ascending": [""],
       "Contribution": [""],
       "Compute the contribution to the total": [""],
-      "Advanced Analytics": [""],
+      "Advanced analytics": [""],
       "This section contains options that allow for advanced analytical post processing of query results": [
         ""
       ],
-      "Rolling Window": [""],
-      "Rolling Function": [""],
+      "Rolling window": [""],
+      "Rolling function": ["Verbindungstest"],
       "Defines a rolling window function to apply, works along with the [Periods] text box": [
         ""
       ],
@@ -1755,12 +1761,12 @@
       "Defines the size of the rolling window function, relative to the time granularity selected": [
         ""
       ],
-      "Min Periods": [""],
+      "Min 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": [
         ""
       ],
-      "Time Comparison": ["Zeitspalte"],
-      "Time Shift": [""],
+      "Time comparison": ["Zeitspalte"],
+      "Time shift": [""],
       "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.": [
         ""
       ],
@@ -1768,14 +1774,14 @@
       "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.": [
         ""
       ],
-      "Python Functions": [""],
+      "Python functions": ["Verbindungstest"],
       "Rule": [""],
       "Pandas resample rule": [""],
       "Method": [""],
       "Pandas resample method": [""],
       "Favorites": ["Favoriten"],
-      "Created Content": ["Erstellte Inhalt"],
-      "Recent Activity": ["Kürzliche Aktivitäten"],
+      "Created content": ["Erstellte Inhalt"],
+      "Recent activity": ["Kürzliche Aktivitäten"],
       "Security & Access": ["Sicherheit & Zugriff"],
       "No charts": ["Diagramm bewegen"],
       "No dashboards": ["Keine Dashboards"],
@@ -1797,13 +1803,13 @@
       "reports": ["Importieren"],
       "alerts": [""],
       "There was an issue deleting the selected %s: %s": [""],
-      "Last Run": ["Bearbeitet am"],
-      "Notification Method": [""],
-      "Execution Log": ["Aktionsprotokoll"],
+      "Last run": ["Bearbeitet am"],
+      "Notification method": ["Anmerkungstufe"],
+      "Execution log": ["Aktionsprotokoll"],
       "Actions": ["Aktion"],
-      "Bulk Select": [""],
+      "Bulk select": [""],
       "No %s yet": [""],
-      "Created By": ["Bearbeitet von"],
+      "Created by": ["Bearbeitet von"],
       "An error occurred while fetching created by values: %s": [""],
       "Status": [""],
       "${AlertState.success}": [""],
@@ -1811,6 +1817,7 @@
       "${AlertState.error}": [""],
       "${AlertState.noop}": [""],
       "${AlertState.grace}": [""],
+      "Alerts & reports": ["Importieren"],
       "Reports": ["Importieren"],
       "This action will permanently delete %s.": [""],
       "Delete %s?": ["Löschen"],
@@ -1820,9 +1827,9 @@
       "> (Larger than)": [""],
       "<= (Smaller or equal)": [""],
       ">= (Larger or equal)": [""],
-      "== (Is Equal)": [""],
-      "!= (Is Not Equal)": [""],
-      "Not Null": [""],
+      "== (Is equal)": [""],
+      "!= (Is not equal)": [""],
+      "Not null": [""],
       "30 days": [""],
       "60 days": [""],
       "90 days": [""],
@@ -1832,39 +1839,41 @@
       "Add": [""],
       "Edit ${isReport ? 'Report' : 'Alert'}": [""],
       "Add ${isReport ? 'Report' : 'Alert'}": [""],
-      "Report Name": ["Vorlagename"],
-      "Alert Name": ["Tabellenname"],
-      "Alert Condition": ["Verbindungstest"],
+      "Report name": ["Vorlagename"],
+      "Alert name": ["Tabellenname"],
+      "Alert condition": ["Verbindungstest"],
       "Trigger Alert If...": [""],
       "Value": [""],
-      "Report Schedule": [""],
-      "Alert Condition Schedule": [""],
-      "Schedule Settings": [""],
-      "Log Retention": [""],
-      "Working Timeout": [""],
+      "Report schedule": ["Importieren"],
+      "Alert condition schedule": ["Verbindungstest"],
+      "Schedule settings": ["Gespeicherte Abfrage anzeigen"],
+      "Log retention": [""],
+      "Working timeout": [""],
       "Time in seconds": ["10 Sekunden"],
-      "Grace Period": [""],
-      "Message Content": ["Erstellte Inhalt"],
+      "Grace period": [""],
+      "Message content": ["Erstellte Inhalt"],
       "log": [""],
       "State": [""],
       "Scheduled at": [""],
-      "Start At": ["Von Zeit"],
+      "Start at": ["Von Zeit"],
       "Duration": [""],
+      "Error message": ["Warnmeldung"],
       "${alertResource?.type}": [""],
-      "CRON Expression": [""],
-      "Report Sent": [""],
-      "Alert Triggered, Notification Sent": [""],
-      "Report Sending": [""],
-      "Alert Running": [""],
-      "Report Failed": [""],
-      "Alert Failed": [""],
-      "Nothing Triggered": [""],
+      "CRON expression": [""],
+      "Report sent": ["Importieren"],
+      "Alert triggered, notification sent": [""],
+      "Report sending": ["Importieren"],
+      "Alert running": ["Verbindungstest"],
+      "Report failed": ["Vorlagename"],
+      "Alert failed": ["Tabellenname"],
+      "Nothing triggered": [""],
       "Alert Triggered, In Grace Period": [""],
       "${RecipientIconName.email}": [""],
       "${RecipientIconName.slack}": [""],
       "annotation": ["Anmerkungen"],
       "There was an issue deleting the selected annotations: %s": [""],
-      "Delete Annotation": ["Anmerkungen"],
+      "Edit annotation": ["Anmerkungen"],
+      "Delete annotation": ["Anmerkungen"],
       "Annotation": ["Anmerkungen"],
       "No annotation yet": ["Anmerkungstufe"],
       "Annotation Layer ${annotationLayerName}": [""],
@@ -1873,25 +1882,26 @@
       ],
       "Delete Annotation?": ["Anmerkungen"],
       "Are you sure you want to delete the selected annotations?": [""],
-      "annotation name": ["Anmerkungstufe"],
+      "Add annotation": ["Anmerkungen"],
+      "Annotation name": ["Anmerkungstufe"],
       "date": [""],
-      "Additional Information": [""],
+      "Additional information": ["Anmerkungen"],
       "Description (this can be seen in the list)": [""],
-      "json metadata": [""],
       "annotation_layer": ["Anmerkungstufe"],
-      "Edit Annotation Layer Properties": ["Anmerkungstufe"],
-      "annotation layer name": ["Anmerkungstufe"],
-      "annotation layers": ["Anmerkungstufe"],
+      "Edit annotation layer properties": ["Anmerkungstufe"],
+      "Annotation layer name": ["Anmerkungstufe"],
+      "Annotation layers": ["Anmerkungstufe"],
       "There was an issue deleting the selected layers: %s": [""],
+      "Last modified": ["Geändert"],
+      "Created on": ["Schöpfer"],
       "Edit template": ["Vorlage laden"],
       "Delete template": ["Vorlage laden"],
-      "Annotation Layer": ["Anmerkungstufe"],
+      "Annotation layer": ["Anmerkungstufe"],
       "An error occurred while fetching dataset datasource values: %s": [""],
       "No annotation layers yet": ["Anmerkungstufe"],
       "This action will permanently delete the layer.": [""],
       "Delete Layer?": ["Wirklich alle löschen?"],
       "Are you sure you want to delete the selected layers?": [""],
-      "Please Confirm": [""],
       "Are you sure you want to delete": [""],
       "Last modified %s": ["Geändert"],
       "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.": [
@@ -1901,24 +1911,25 @@
         ""
       ],
       "There was an issue deleting the selected charts: %s": [""],
-      "Modified By": ["Geändert"],
+      "Modified by": ["Geändert"],
       "Owner": [""],
       "An error occurred while fetching chart owners values: %s": [""],
       "An error occurred while fetching chart created by values: %s": [""],
-      "Viz Type": ["Typ"],
+      "Viz type": ["Typ"],
       "An error occurred while fetching chart dataset values: %s": [""],
       "Favorite": ["Favoriten"],
       "Yes": [""],
       "No": [""],
       "Are you sure you want to delete the selected charts?": [""],
       "css_template": [""],
-      "Edit CSS Template Properties": ["CSS Vorlagen"],
-      "css template name": ["Vorlagename"],
+      "Edit CSS template properties": ["CSS Vorlagen"],
+      "Add CSS template": ["CSS Vorlagen"],
+      "CSS template name": ["Vorlagename"],
       "css": [""],
-      "css templates": ["CSS Vorlagen"],
+      "CSS templates": ["CSS Vorlagen"],
       "There was an issue deleting the selected templates: %s": [""],
       "Last modified by %s": ["Geändert"],
-      "Css Template": ["CSS Vorlagen"],
+      "CSS template": ["CSS Vorlagen"],
       "This action will permanently delete the template.": [""],
       "Delete Template?": ["CSS Vorlagen"],
       "Are you sure you want to delete the selected templates?": [""],
@@ -1944,11 +1955,11 @@
       ],
       "database": ["Datenbank"],
       "An error occurred while fetching database related data: %s": [""],
-      "Asynchronous Query Execution": [""],
+      "Asynchronous query execution": [""],
       "AQE": [""],
-      "Allow Data Manipulation Language": [""],
+      "Allow data manipulation language": [""],
       "DML": [""],
-      "CSV Upload": [""],
+      "CSV upload": [""],
       "Delete database": ["Datenbank"],
       "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.": [
         ""
@@ -1958,29 +1969,35 @@
       "Connection looks good!": [""],
       "ERROR: Connection failed. ": [""],
       "Sorry there was an error fetching database information: %s": [""],
+      "Edit database": ["Datenbank bearbeiten"],
+      "Add database": ["Datenbank einfügen"],
       "Connection": ["Verbindungstest"],
-      "Database Name": ["Datenbank"],
+      "Database name": ["Datenbank"],
       "Name your dataset": [""],
       "dialect+driver://username:password@host:port/database": [""],
+      "Test connection": ["Verbindungstest"],
       "Refer to the ": [""],
       "SQLAlchemy docs": [""],
       " for more information on how to structure your URI.": [""],
       "Performance": [""],
+      "Chart cache timeout": ["Von Zeit"],
       "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.": [
         ""
       ],
-      "SQL Lab Settings": [""],
+      "SQL Lab settings": ["Tabellenansicht"],
       "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...)": [
         ""
       ],
+      "Allow multi schema metadata fetch": [""],
+      "CTAS schema": ["Farbschema"],
       "When allowing CREATE TABLE AS option in SQL Lab, this option forces the table to be created in this schema.": [
         ""
       ],
+      "Secure extra": ["Sicherheit"],
       "JSON string containing additional connection configuration.": [""],
       "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.": [
         ""
       ],
-      "Root Certificate": [""],
       "Optional CA_BUNDLE contents to validate HTTPS requests. Only available on certain database engines.": [
         ""
       ],
@@ -1988,7 +2005,7 @@
       "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.": [
         ""
       ],
-      "Allow Data Upload": [""],
+      "Allow data upload": [""],
       "If selected, please set the schemas allowed for data upload in Extra.": [
         ""
       ],
@@ -2009,7 +2026,7 @@
         ""
       ],
       "Error while saving dataset: %s": ["Fehler bei Anmerkungstufeabruf"],
-      "Add Dataset": ["Datenbank einfügen"],
+      "Add dataset": ["Datenbank einfügen"],
       "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.": [
         ""
       ],
@@ -2022,8 +2039,8 @@
       "An error occurred while fetching dataset related data: %s": [
         "Fehler bei Anmerkungstufeabruf"
       ],
-      "Physical Dataset": [""],
-      "Virtual Dataset": ["Datenbank bearbeiten"],
+      "Physical dataset": ["Metrik auswählen"],
+      "Virtual dataset": ["Datenbank bearbeiten"],
       "An error occurred while fetching dataset owner values: %s": [
         "Fehler bei Anmerkungstufeabruf"
       ],
@@ -2048,32 +2065,31 @@
       "Offline": [""],
       "Scheduled": [""],
       "Duration: %s": [""],
-      "Tab Name": ["Tabellenname"],
+      "Tab name": ["Tabellenname"],
       "TABLES": [""],
       "Rows": [""],
       "Open query in SQL Lab": ["Bearbeiten in SQL Editor"],
       "An error occurred while fetching database values: %s": [
         "Fehler bei Anmerkungstufeabruf"
       ],
-      "Time Range": [""],
       "Search by query text": [""],
-      "Query Preview": ["Abfragen"],
+      "Query preview": ["Abfragen"],
       "Previous": [""],
       "Next": [""],
       "Open in SQL Lab": ["Bearbeiten in SQL Editor"],
       "User query": ["Benutzer Rollen"],
       "Executed query": ["Leere Abfrage?"],
+      "Saved queries": ["Gespeicherte Abfragen"],
       "There was an issue previewing the selected query %s": [""],
       "Link Copied!": [""],
       "There was an issue deleting the selected queries: %s": [""],
-      "Query preview": ["Abfragen"],
       "Edit query": ["Leere Abfrage?"],
       "Copy query URL": ["Leere Abfrage?"],
       "Delete query": ["Löschen"],
       "This action will permanently delete the saved query.": [""],
       "Delete Query?": ["Wirklich alle löschen?"],
       "Are you sure you want to delete the selected queries?": [""],
-      "Query Name": ["Abfrage"],
+      "Query name": ["Abfrage"],
       "Edited": ["Tabelle bearbeiten"],
       "Created": ["Schöpfer"],
       "Viewed": [""],
@@ -2091,14 +2107,13 @@
       "Recently edited charts, dashboards, and saved queries will appear here": [
         ""
       ],
-      "SQL QUERY": [""],
       "${tableName\n                        .split('')\n                        .slice(0, tableName.length - 1)\n                        .join('')}\n                    ": [
         ""
       ],
       "You don't have any favorites yet!": [
         "Sie haben keine Zugriff auf diese Datenquelle"
       ],
-      "SQL LAB QUERIES": [""],
+      "SQL Lab queries": ["Tabellenansicht"],
       "${tableName}": ["Tabellenname"],
       "query": ["Abfrage"],
       "Share": [""],
@@ -2106,24 +2121,24 @@
       "Recents": [""],
       "Select start and end date": ["Anmerkungstufe auswählen"],
       "Type or Select [%s]": [""],
-      "Filter Box": [""],
-      "Filters Configuration": [""],
+      "Filter box": ["Tabellenname"],
+      "Filters configuration": ["Verbindungstest"],
       "Filter configuration for the filter box": [""],
-      "Date Filter": [""],
+      "Date filter": ["Druid Cluster einfügen"],
       "Whether to include a time filter": [""],
-      "Instant Filtering": [""],
+      "Instant filtering": [""],
       "Check to apply filters instantly as they change instead of displaying [Apply] button": [
         ""
       ],
-      "Show SQL Granularity Dropdown": [""],
-      "Check to include SQL Granularity dropdown": [""],
-      "Show SQL Time Column": ["Zeitspalte"],
-      "Check to include Time Column dropdown": [""],
-      "Show Druid Granularity Dropdown": [""],
-      "Check to include Druid Granularity dropdown": [""],
-      "Show Druid Time Origin": ["Druid Metrik anzeigen"],
-      "Check to include Time Origin dropdown": [""],
-      "Limit Selector Values": [""],
+      "Show SQL granularity dropdown": [""],
+      "Check to include SQL granularity dropdown": [""],
+      "Show SQL time column": ["Zeitspalte"],
+      "Check to include time column dropdown": [""],
+      "Show Druid granularity dropdown": [""],
+      "Check to include Druid granularity dropdown": [""],
+      "Show Druid time origin": ["Druid Metrik anzeigen"],
+      "Check to include time origin dropdown": [""],
+      "Limit selector values": [""],
       "These filters apply to the values available in the dropdowns": [""],
       "Time-series Table": [""]
     }
diff --git a/superset/translations/de/LC_MESSAGES/messages.po b/superset/translations/de/LC_MESSAGES/messages.po
index d24dfa0..8aecafa 100644
--- a/superset/translations/de/LC_MESSAGES/messages.po
+++ b/superset/translations/de/LC_MESSAGES/messages.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-19 07:47-0300\n"
+"POT-Creation-Date: 2021-01-22 15:56-0300\n"
 "PO-Revision-Date: 2017-10-20 14:36+0100\n"
 "Last-Translator: FULL NAME <EM...@ADDRESS>\n"
 "Language-Team: de <LL...@li.org>\n"
@@ -33,7 +33,6 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:339
 #: superset/app.py:230 superset/views/annotations.py:119
 msgid "Annotation Layers"
 msgstr "Anmerkungstufe"
@@ -49,8 +48,8 @@ msgstr "Einstellungen"
 msgid "Databases"
 msgstr "Datenbanken"
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:245
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:250
+#: 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
@@ -82,7 +81,6 @@ msgstr "Dashboards"
 msgid "Plugins"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:240
 #: superset/app.py:283 superset/views/css_templates.py:38
 msgid "CSS Templates"
 msgstr "CSS Vorlagen"
@@ -108,13 +106,10 @@ msgstr ""
 msgid "SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:87
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:145 superset/app.py:352
+#: superset/app.py:352
 msgid "Saved Queries"
 msgstr "Gespeicherte Abfragen"
 
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:180
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:100
 #: superset/app.py:359
 msgid "Query History"
 msgstr ""
@@ -143,7 +138,7 @@ msgstr ""
 msgid "Alerts"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:411 superset/app.py:448
+#: superset/app.py:448
 msgid "Alerts & Reports"
 msgstr ""
 
@@ -418,152 +413,152 @@ msgstr ""
 msgid "Pick at least one field for [Series]"
 msgstr ""
 
-#: superset/viz.py:1701 superset/viz_sip38.py:1659
+#: superset/viz.py:1702 superset/viz_sip38.py:1659
 msgid "Sunburst"
 msgstr ""
 
-#: superset/viz.py:1747 superset/viz_sip38.py:1703
+#: superset/viz.py:1748 superset/viz_sip38.py:1703
 msgid "Sankey"
 msgstr ""
 
-#: superset/viz.py:1755
+#: superset/viz.py:1756
 msgid "Pick exactly 2 columns as [Source / Target]"
 msgstr ""
 
-#: superset/viz.py:1799 superset/viz_sip38.py:1736
+#: superset/viz.py:1800 superset/viz_sip38.py:1736
 msgid ""
 "There's a loop in your Sankey, please provide a tree. Here's a faulty link: "
 "{}"
 msgstr ""
 
-#: superset/viz.py:1812 superset/viz.py:1835 superset/viz_sip38.py:1749
+#: superset/viz.py:1813 superset/viz.py:1836 superset/viz_sip38.py:1749
 #: superset/viz_sip38.py:1770
 msgid "Directed Force Layout"
 msgstr ""
 
-#: superset/viz.py:1819 superset/viz_sip38.py:1756
+#: superset/viz.py:1820 superset/viz_sip38.py:1756
 msgid "Pick exactly 2 columns to 'Group By'"
 msgstr ""
 
-#: superset/viz.py:1868 superset/viz_sip38.py:1802
+#: superset/viz.py:1869 superset/viz_sip38.py:1802
 msgid "Country Map"
 msgstr ""
 
-#: superset/viz.py:1897 superset/viz_sip38.py:1823
+#: superset/viz.py:1898 superset/viz_sip38.py:1823
 msgid "World Map"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:438
-#: superset-frontend/src/explore/controls.jsx:467 superset/viz.py:1955
+#: superset-frontend/src/explore/controls.jsx:467 superset/viz.py:1956
 #: superset/viz_sip38.py:1873
 msgid "Filters"
 msgstr ""
 
-#: superset/viz.py:1973 superset/viz_sip38.py:1891
+#: superset/viz.py:1974 superset/viz_sip38.py:1891
 msgid "Invalid filter configuration, please select a column"
 msgstr ""
 
-#: superset/viz.py:2017 superset/viz_sip38.py:1952
+#: superset/viz.py:2018 superset/viz_sip38.py:1952
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: superset/viz.py:2039 superset/viz_sip38.py:1968
+#: superset/viz.py:2040 superset/viz_sip38.py:1968
 msgid "Heatmap"
 msgstr ""
 
-#: superset/viz.py:2095 superset/viz_sip38.py:2017
+#: superset/viz.py:2096 superset/viz_sip38.py:2017
 msgid "Horizon Charts"
 msgstr ""
 
-#: superset/viz.py:2107 superset/viz_sip38.py:2029
+#: superset/viz.py:2108 superset/viz_sip38.py:2029
 msgid "Mapbox"
 msgstr ""
 
-#: superset/viz.py:2119 superset/viz_sip38.py:2041
+#: superset/viz.py:2120 superset/viz_sip38.py:2041
 msgid "[Longitude] and [Latitude] must be set"
 msgstr ""
 
-#: superset/viz.py:2126 superset/viz_sip38.py:2048
+#: superset/viz.py:2127 superset/viz_sip38.py:2048
 msgid "Must have a [Group By] column to have 'count' as the [Label]"
 msgstr ""
 
-#: superset/viz.py:2146 superset/viz_sip38.py:2068
+#: superset/viz.py:2147 superset/viz_sip38.py:2068
 msgid "Choice of [Label] must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2154 superset/viz_sip38.py:2075
+#: superset/viz.py:2155 superset/viz_sip38.py:2075
 msgid "Choice of [Point Radius] must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2162 superset/viz_sip38.py:2082
+#: superset/viz.py:2163 superset/viz_sip38.py:2082
 msgid "[Longitude] and [Latitude] columns must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2242 superset/viz_sip38.py:2162
+#: superset/viz.py:2243 superset/viz_sip38.py:2162
 msgid "Deck.gl - Multiple Layers"
 msgstr ""
 
-#: superset/viz.py:2282 superset/viz.py:2314 superset/viz_sip38.py:2218
+#: superset/viz.py:2283 superset/viz.py:2315 superset/viz_sip38.py:2218
 msgid "Bad spatial key"
 msgstr ""
 
-#: superset/viz.py:2300 superset/viz_sip38.py:2204
+#: superset/viz.py:2301 superset/viz_sip38.py:2204
 #, python-format
 msgid "Invalid spatial point encountered: %s"
 msgstr ""
 
-#: superset/viz.py:2336 superset/viz_sip38.py:2240
+#: superset/viz.py:2337 superset/viz_sip38.py:2240
 msgid ""
 "Encountered invalid NULL spatial "
 "entry,                                        please consider filtering "
 "those out"
 msgstr ""
 
-#: superset/viz.py:2426 superset/viz_sip38.py:2311
+#: superset/viz.py:2427 superset/viz_sip38.py:2311
 msgid "Deck.gl - Scatter plot"
 msgstr ""
 
-#: superset/viz.py:2475 superset/viz_sip38.py:2358
+#: superset/viz.py:2476 superset/viz_sip38.py:2358
 msgid "Deck.gl - Screen Grid"
 msgstr ""
 
-#: superset/viz.py:2501 superset/viz_sip38.py:2384
+#: superset/viz.py:2502 superset/viz_sip38.py:2384
 msgid "Deck.gl - 3D Grid"
 msgstr ""
 
-#: superset/viz.py:2531 superset/viz_sip38.py:2411
+#: superset/viz.py:2532 superset/viz_sip38.py:2411
 msgid "Deck.gl - Paths"
 msgstr ""
 
-#: superset/viz.py:2579 superset/viz_sip38.py:2456
+#: superset/viz.py:2580 superset/viz_sip38.py:2456
 msgid "Deck.gl - Polygon"
 msgstr ""
 
-#: superset/viz.py:2608 superset/viz_sip38.py:2485
+#: superset/viz.py:2609 superset/viz_sip38.py:2485
 msgid "Deck.gl - 3D HEX"
 msgstr ""
 
-#: superset/viz.py:2627 superset/viz_sip38.py:2501
+#: superset/viz.py:2628 superset/viz_sip38.py:2501
 msgid "Deck.gl - GeoJSON"
 msgstr ""
 
-#: superset/viz.py:2646 superset/viz_sip38.py:2513
+#: superset/viz.py:2647 superset/viz_sip38.py:2513
 msgid "Deck.gl - Arc"
 msgstr ""
 
-#: superset/viz.py:2681 superset/viz_sip38.py:2548
+#: superset/viz.py:2682 superset/viz_sip38.py:2548
 msgid "Event flow"
 msgstr ""
 
-#: superset/viz.py:2713 superset/viz_sip38.py:2580
+#: superset/viz.py:2714 superset/viz_sip38.py:2580
 msgid "Time Series - Paired t-test"
 msgstr ""
 
-#: superset/viz.py:2768 superset/viz_sip38.py:2635
+#: superset/viz.py:2769 superset/viz_sip38.py:2635
 msgid "Time Series - Nightingale Rose Chart"
 msgstr ""
 
-#: superset/viz.py:2803 superset/viz_sip38.py:2670
+#: superset/viz.py:2804 superset/viz_sip38.py:2670
 msgid "Partition Diagram"
 msgstr ""
 
@@ -679,7 +674,11 @@ msgid_plural "Deleted %(num)d charts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: superset/charts/api.py:566 superset/charts/api.py:638
+#: superset/charts/api.py:563
+msgid "Request is not JSON"
+msgstr ""
+
+#: superset/charts/api.py:571 superset/charts/api.py:643
 #, python-format
 msgid "Request is incorrect: %(error)s"
 msgstr ""
@@ -805,7 +804,7 @@ msgstr ""
 msgid "Unsupported extraction function: "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:988
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:994
 #: superset-frontend/src/explore/components/DatasourcePanel.tsx:231
 #: superset-frontend/src/explore/controls.jsx:251
 #: superset/connectors/druid/views.py:56 superset/connectors/sqla/views.py:63
@@ -825,7 +824,7 @@ msgid "Edit Druid Column"
 msgstr "Druid Spalte bearbeiten"
 
 #: superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx:31
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:204
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:209
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:137
 #: superset-frontend/src/explore/components/controls/SpatialControl.jsx:193
 #: superset/connectors/druid/views.py:77 superset/connectors/sqla/views.py:134
@@ -839,7 +838,7 @@ msgstr "Spalte"
 msgid "Type"
 msgstr "Typ"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:163
+#: 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"
@@ -858,7 +857,7 @@ msgid ""
 "Whether this column is exposed in the `Filters` section of the explore view."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:977
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:983
 #: superset-frontend/src/explore/components/DatasourcePanel.tsx:218
 #: superset-frontend/src/explore/controls.jsx:153
 #: superset/connectors/druid/views.py:143 superset/connectors/sqla/views.py:193
@@ -877,7 +876,7 @@ msgstr "Druid Metrik einfügen"
 msgid "Edit Druid Metric"
 msgstr "Druid Metric bearbeiten"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:831
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:836
 #: 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
@@ -886,11 +885,11 @@ msgstr "Metrik"
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:128
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:161
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:151
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:155
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:513
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:845
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:849
+#: 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
@@ -910,7 +909,7 @@ msgstr ""
 msgid "Verbose Name"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:735
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:740
 #: superset/connectors/druid/views.py:175 superset/views/log/__init__.py:33
 msgid "JSON"
 msgstr "JSON"
@@ -919,8 +918,6 @@ msgstr "JSON"
 msgid "Druid Datasource"
 msgstr "Druid Datenquelle"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:861
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:869
 #: superset/connectors/druid/views.py:177 superset/connectors/sqla/views.py:244
 msgid "Warning Message"
 msgstr "Warnmeldung"
@@ -961,8 +958,6 @@ msgstr ""
 msgid "Broker Endpoint"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:597
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:238
 #: superset/connectors/druid/views.py:221
 #: superset/connectors/druid/views.py:331 superset/connectors/sqla/views.py:459
 #: superset/views/chart/mixin.py:77
@@ -1052,7 +1047,7 @@ msgid "Cluster"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:358
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:567
+#: 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
@@ -1203,11 +1198,11 @@ msgstr "Tabellen"
 msgid "Expression"
 msgstr ""
 
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:212
 #: superset/connectors/sqla/views.py:141
 msgid "Is temporal"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:170
 #: superset/connectors/sqla/views.py:142
 msgid "Datetime Format"
 msgstr ""
@@ -1228,18 +1223,15 @@ msgstr "Metrik einfügen"
 msgid "Edit Metric"
 msgstr "Metrik bearbeiten"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:130
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:833
 #: superset/connectors/sqla/views.py:240
 msgid "SQL Expression"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:855
 #: superset/connectors/sqla/views.py:242
 msgid "D3 Format"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:549
+#: 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
@@ -1365,7 +1357,7 @@ msgstr ""
 msgid "Whether the table was generated by the 'Visualize' flow in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:612
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:617
 #: superset/connectors/sqla/views.py:431
 msgid ""
 "A set of parameters that become available in the query using Jinja "
@@ -1428,7 +1420,8 @@ msgstr ""
 msgid "SQL Lab View"
 msgstr "Tabellenansicht"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:611
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:125
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:616
 #: superset/connectors/sqla/views.py:466
 msgid "Template parameters"
 msgstr "Vorlagename"
@@ -1572,7 +1565,7 @@ msgstr ""
 msgid "A database with the same name already exists"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:184
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:169
 #: superset/databases/commands/exceptions.py:49
 msgid "Field is required"
 msgstr ""
@@ -1873,7 +1866,7 @@ msgstr ""
 msgid "An error occurred while pruning logs "
 msgstr ""
 
-#: superset/reports/notifications/email.py:59 superset/tasks/schedules.py:182
+#: superset/reports/notifications/email.py:59 superset/tasks/schedules.py:185
 #, python-format
 msgid ""
 "\n"
@@ -1882,8 +1875,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: superset/reports/notifications/email.py:70 superset/tasks/schedules.py:291
-#: superset/tasks/schedules.py:460
+#: superset/reports/notifications/email.py:70 superset/tasks/schedules.py:294
+#: superset/tasks/schedules.py:463
 #, python-format
 msgid "%(prefix)s %(title)s"
 msgstr ""
@@ -1898,7 +1891,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: superset/tasks/schedules.py:157
+#: superset/tasks/schedules.py:160
 #, python-format
 msgid ""
 "\n"
@@ -1908,17 +1901,17 @@ msgid ""
 "        "
 msgstr ""
 
-#: superset/tasks/schedules.py:169 superset/tasks/schedules.py:360
+#: superset/tasks/schedules.py:172 superset/tasks/schedules.py:363
 #, python-format
 msgid "<b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>"
 msgstr ""
 
-#: superset/tasks/schedules.py:359
+#: superset/tasks/schedules.py:362
 #, python-format
 msgid "%(name)s.csv"
 msgstr ""
 
-#: superset/tasks/schedules.py:367
+#: superset/tasks/schedules.py:370
 #, python-format
 msgid ""
 "\n"
@@ -1928,7 +1921,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: superset/tasks/schedules.py:654
+#: superset/tasks/schedules.py:656
 #, python-format
 msgid "[Alert] %(label)s"
 msgstr ""
@@ -1937,7 +1930,6 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/NewMenu.tsx:26
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1144
 #: superset/templates/appbuilder/navbar_right.html:38
 msgid "SQL Query"
@@ -2048,13 +2040,13 @@ msgid "Request Permissions"
 msgstr "Berechtigung anfordern"
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:176
-#: superset-frontend/src/common/components/Modal/Modal.tsx:144
+#: 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:437
-#: superset-frontend/src/datasource/DatasourceModal.tsx:211
+#: 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:169
+#: superset-frontend/src/explore/components/SaveModal.tsx:174
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:749
 #: superset/templates/superset/request_access.html:34
 msgid "Cancel"
@@ -2064,7 +2056,6 @@ msgstr ""
 msgid "Use the edit buttom to change this field"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:399
 #: superset/templates/superset/models/database/macros.html:22
 msgid "Test Connection"
 msgstr "Verbindungstest"
@@ -2192,9 +2183,6 @@ msgstr "Datenbank URL"
 msgid "Roles to grant"
 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/views/access_requests.py:45 superset/views/schedules.py:224
 #: superset/views/schedules.py:287
 msgid "Created On"
@@ -2208,7 +2196,6 @@ msgstr "Metriken auflisten"
 msgid "Show Observation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:127
 #: superset/views/alerts.py:67
 msgid "Error Message"
 msgstr "Warnmeldung"
@@ -2253,13 +2240,10 @@ msgstr "Anmerkungen"
 msgid "Show Annotation"
 msgstr "Anmerkungen"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
 #: superset/views/annotations.py:62
 msgid "Add Annotation"
 msgstr "Anmerkungen"
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:180
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
 #: superset/views/annotations.py:63
 msgid "Edit Annotation"
 msgstr "Anmerkungen"
@@ -2269,10 +2253,10 @@ msgid "Layer"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:148
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:141
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:145
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:832
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:840
+#: 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/views/annotations.py:79 superset/views/sql_lab.py:70
@@ -2289,7 +2273,6 @@ msgstr "Von Zeit"
 msgid "End"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:400
 #: superset/views/annotations.py:83 superset/views/dashboard/mixin.py:82
 msgid "JSON Metadata"
 msgstr ""
@@ -2298,14 +2281,10 @@ msgstr ""
 msgid "Show Annotation Layer"
 msgstr "Anmerkungstufe"
 
-#: 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
 #: superset/views/annotations.py:121
 msgid "Add Annotation Layer"
 msgstr "Anmerkungstufe"
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:166
 #: superset/views/annotations.py:122
 msgid "Edit Annotation Layer"
 msgstr "Anmerkungstufe"
@@ -2548,7 +2527,6 @@ msgstr ""
 msgid "Show CSS Template"
 msgstr "CSS Vorlagen"
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:237
 #: superset/views/css_templates.py:40
 msgid "Add CSS Template"
 msgstr "CSS Vorlagen"
@@ -2670,11 +2648,11 @@ msgstr ""
 msgid "Changed on"
 msgstr "Bearbeitet am"
 
-#: superset/views/utils.py:485
+#: superset/views/utils.py:492
 msgid "Could not determine datasource type"
 msgstr ""
 
-#: superset/views/utils.py:501
+#: superset/views/utils.py:508
 msgid "Could not find viz object"
 msgstr ""
 
@@ -2703,10 +2681,6 @@ msgid ""
 "defaults to the datasource/table timeout if undefined."
 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/views/chart/mixin.py:82
 msgid "Last Modified"
 msgstr "Geändert"
@@ -2715,7 +2689,6 @@ msgstr "Geändert"
 msgid "Parameters"
 msgstr "Parameter"
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:220
 #: superset/views/chart/mixin.py:88
 msgid "Visualization Type"
 msgstr "Visualisierungstyp"
@@ -3001,12 +2974,10 @@ msgstr ""
 msgid "Show Database"
 msgstr "Datenbank anzeigen"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
 #: superset/views/database/mixins.py:34
 msgid "Add Database"
 msgstr "Datenbank einfügen"
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
 #: superset/views/database/mixins.py:35
 msgid "Edit Database"
 msgstr "Datenbank bearbeiten"
@@ -3097,8 +3068,6 @@ msgstr ""
 msgid "Allow DML"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:533
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:539
 #: superset/views/database/mixins.py:189
 msgid "CTAS Schema"
 msgstr ""
@@ -3108,19 +3077,16 @@ msgstr ""
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:417
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:423
 #: superset/views/database/mixins.py:194
 msgid "Chart Cache Timeout"
 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/views/database/mixins.py:196
 msgid "Secure Extra"
 msgstr "Sicherheit"
 
+#: 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
 msgid "Root certificate"
 msgstr ""
@@ -3137,7 +3103,6 @@ msgstr ""
 msgid "Allow Csv Upload"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:521
 #: superset/views/database/mixins.py:202
 msgid "Allow Multi Schema Metadata Fetch"
 msgstr ""
@@ -3247,186 +3212,186 @@ msgstr "Aktion"
 msgid "dttm"
 msgstr ""
 
-#: superset-frontend/src/CRUD/CollectionTable.tsx:294
-msgid "Add Item"
+#: superset-frontend/src/CRUD/CollectionTable.tsx:317
+msgid "Add item"
 msgstr "Datenbank einfügen"
 
 #: superset-frontend/src/SqlLab/actions/sqlLab.js:103
 msgid "The query couldn't be loaded"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:155
-msgid "Your query was saved"
-msgstr "Ihre Abfrage wurde gespeichert"
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:158
-msgid "Your query could not be saved"
-msgstr "Ihre Abfrage konnte nicht gespeichert werden"
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:173
-msgid "Your query was updated"
-msgstr "Ihre Abfrage wurde gespeichert"
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:175
-msgid "Your query could not be updated"
-msgstr "Ihre Abfrage konnte nicht gespeichert werden"
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:190
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:156
 msgid ""
 "Your query has been scheduled. To see details of your query, navigate to "
-"Saved Queries"
+"Saved queries"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:197
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:163
 msgid "Your query could not be scheduled"
 msgstr "Ihre Abfrage konnte nicht gespeichert werden"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:225
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:332
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:191
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:298
 msgid "Failed at retrieving results"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:263
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:289
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:229
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:255
 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:376
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:409
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:342
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:375
 msgid "Unknown error"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:427
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:393
 msgid "Query was stopped."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:456
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:422
 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:474
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:440
 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:520
+#: 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."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:553
+#: 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:570
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:536
 #: superset-frontend/src/SqlLab/reducers/sqlLab.js:74
 #, python-format
 msgid "Copy of %s"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:597
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:563
 msgid ""
 "An error occurred while setting the active tab. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:683
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:649
 msgid "An error occurred while fetching tab state"
 msgstr "Fehler bei Anmerkungstufeabruf"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:711
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:677
 msgid ""
 "An error occurred while removing tab. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:735
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:701
 msgid ""
 "An error occurred while removing query. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:758
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:724
 msgid ""
 "An error occurred while setting the tab database ID. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:783
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:749
 msgid ""
 "An error occurred while setting the tab schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:816
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:782
 msgid ""
 "An error occurred while setting the tab autorun. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:841
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:895
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:807
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:899
 msgid ""
 "An error occurred while setting the tab title. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:864
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:829
+msgid "Your query was saved"
+msgstr "Ihre Abfrage wurde gespeichert"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:833
+msgid "Your query could not be saved"
+msgstr "Ihre Abfrage konnte nicht gespeichert werden"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:845
+msgid "Your query was updated"
+msgstr "Ihre Abfrage wurde gespeichert"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:849
+msgid "Your query could not be updated"
+msgstr "Ihre Abfrage konnte nicht gespeichert werden"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:868
 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:924
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:928
 msgid ""
 "An error occurred while setting the tab template parameters. Please contact "
 "your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:985
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1010
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:989
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1014
 msgid "An error occurred while fetching table metadata"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1051
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1055
 msgid ""
 "An error occurred while fetching table metadata. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1099
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1103
 msgid ""
 "An error occurred while expanding the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1123
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1127
 msgid ""
 "An error occurred while collapsing the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1146
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1150
 msgid ""
 "An error occurred while removing the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1179
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1183
 msgid "Shared query"
 msgstr "Gespeicherte Abfrage anzeigen"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1241
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1245
 msgid "The datasource couldn't be loaded"
 msgstr "Ihre Abfrage konnte nicht gespeichert werden"
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1271
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1293
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1275
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1297
 msgid "An error occurred while creating the data source"
 msgstr ""
 
@@ -3443,15 +3408,15 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:85
-msgid "Estimate Selected Query Cost"
+msgid "Estimate selected query cost"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:86
-msgid "Estimate Cost"
+msgid "Estimate cost"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:90
-msgid "Cost Estimate"
+msgid "Cost estimate"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:73
@@ -3525,7 +3490,7 @@ msgid "Source SQL"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/HighlightedSql.jsx:108
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:714
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:719
 #: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:301
 msgid "SQL"
 msgstr ""
@@ -3582,7 +3547,8 @@ msgid "Edit"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/QueryTable.jsx:147
-msgid "view results"
+#: superset-frontend/src/explore/components/DataTablesPane.tsx:258
+msgid "View results"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/QueryTable.jsx:150
@@ -3614,11 +3580,11 @@ msgid "Clipboard"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:469
-msgid "Filter Results"
-msgstr ""
+msgid "Filter results"
+msgstr "Tabellenname"
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:501
-msgid "Database Error"
+msgid "Database error"
 msgstr "Datenbank"
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:525
@@ -3638,11 +3604,11 @@ msgid "Fetch data preview"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:605
-msgid "Refetch Results"
+msgid "Refetch results"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:626
-msgid "Track Job"
+msgid "Track job"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:46
@@ -3651,8 +3617,8 @@ msgid "Stop"
 msgstr "Stopp"
 
 #: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:51
-msgid "Run Selection"
-msgstr ""
+msgid "Run selection"
+msgstr "Verbindungstest"
 
 #: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:53
 #: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:90
@@ -3688,13 +3654,13 @@ msgstr ""
 #: 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:440
-#: superset-frontend/src/datasource/DatasourceModal.tsx:204
-#: superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx:210
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:430
+#: 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:192
+#: 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
@@ -3710,11 +3676,11 @@ msgid "Save as"
 msgstr "Speichern als"
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:172
-msgid "Save Query"
-msgstr ""
+msgid "Save query"
+msgstr "Gespeicherte Abfrage anzeigen"
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:184
-msgid "Save As New"
+msgid "Save as new"
 msgstr "Scheibe speichern"
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:193
@@ -3730,7 +3696,7 @@ msgid "Write a description for your query"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:201
-msgid "Schedule Query"
+msgid "Schedule query"
 msgstr "Gespeicherte Abfrage anzeigen"
 
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:211
@@ -3775,8 +3741,14 @@ msgstr ""
 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 "Abfragen suchen"
+
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:285
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:295
+#: superset-frontend/src/components/RefreshChartOverlay.tsx:48
 msgid "Run query"
 msgstr ""
 
@@ -3786,8 +3758,8 @@ msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:309
 #: superset-frontend/src/SqlLab/reducers/getInitialState.js:44
-msgid "Untitled Query"
-msgstr ""
+msgid "Untitled query"
+msgstr "Benutzer Rollen"
 
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:317
 msgid "Stop query"
@@ -3822,7 +3794,7 @@ msgid "Estimate the cost before running a query"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:159
-msgid "Reset State"
+msgid "Reset state"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:237
@@ -3915,10 +3887,6 @@ msgstr ""
 msgid ") by using"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:125
-msgid "Template Parameters"
-msgstr "Vorlagename"
-
 #: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:127
 msgid "Edit template parameters"
 msgstr ""
@@ -4219,7 +4187,7 @@ msgstr ""
 msgid "DEC"
 msgstr ""
 
-#: superset-frontend/src/common/components/Modal/Modal.tsx:127
+#: superset-frontend/src/common/components/Modal/Modal.tsx:128
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:771
 msgid "OK"
 msgstr ""
@@ -4345,6 +4313,7 @@ msgid "You don't have the rights to alter this title."
 msgstr ""
 
 #: superset-frontend/src/components/ErrorBoundary.jsx:51
+#: superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx:26
 msgid "Unexpected error"
 msgstr ""
 
@@ -4356,10 +4325,6 @@ msgstr ""
 msgid "An error occurred while fetching dashboards"
 msgstr "Fehler bei Anmerkungstufeabruf"
 
-#: superset-frontend/src/components/RefreshChartOverlay.tsx:48
-msgid "Run Query"
-msgstr ""
-
 #: superset-frontend/src/components/TableSelector.tsx:170
 msgid "Error while fetching table list"
 msgstr ""
@@ -4392,7 +4357,8 @@ msgid "%s%s"
 msgstr ""
 
 #: superset-frontend/src/components/URLShortLinkModal.tsx:83
-msgid "Share Dashboard"
+#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:249
+msgid "Share dashboard"
 msgstr "Dashboard speichern"
 
 #: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:46
@@ -4418,28 +4384,24 @@ msgstr "Fehler"
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:123
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:139
-msgid "See More"
+msgid "See more"
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:152
-msgid "See Less"
+msgid "See less"
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:181
-msgid "Copy Message"
-msgstr ""
+msgid "Copy message"
+msgstr "Warnmeldung"
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:189
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:535
-#: superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx:197
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:418
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:197
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:435
 msgid "Close"
 msgstr ""
 
-#: superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx:26
-msgid "Unexpected Error"
-msgstr ""
-
 #: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:60
 msgid "This was triggered by:"
 msgstr ""
@@ -4454,7 +4416,7 @@ msgid "%(suggestion)s instead of \"%(undefinedParameter)s?\""
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:114
-msgid "Parameter Error"
+msgid "Parameter error"
 msgstr "Parameter"
 
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:47
@@ -4472,11 +4434,11 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:98
-msgid "Timeout Error"
+msgid "Timeout error"
 msgstr ""
 
 #: superset-frontend/src/components/FilterableTable/FilterableTable.tsx:317
-msgid "Cell Content"
+msgid "Cell content"
 msgstr "Erstellte Inhalt"
 
 #: superset-frontend/src/components/ImportModal/index.tsx:182
@@ -4511,18 +4473,18 @@ msgid "%s Selected"
 msgstr ""
 
 #: superset-frontend/src/components/ListView/ListView.tsx:348
-msgid "Deselect All"
-msgstr ""
+msgid "Deselect all"
+msgstr "Wirklich alle löschen?"
 
 #: superset-frontend/src/components/ListView/ListView.tsx:414
-#: superset-frontend/src/components/TableView/TableView.tsx:173
+#: 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:149
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1037
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:134
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1050
 msgid "Settings"
 msgstr ""
 
@@ -4530,6 +4492,11 @@ msgstr ""
 msgid "About"
 msgstr ""
 
+#: superset-frontend/src/components/Menu/NewMenu.tsx:26
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:114
+msgid "SQL query"
+msgstr "Abfrage"
+
 #: superset-frontend/src/dashboard/actions/dashboardLayout.js:180
 msgid ""
 "There is not enough space for this component. Try decreasing its width, or "
@@ -4597,7 +4564,8 @@ msgstr ""
 
 #: superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx:56
 #: superset-frontend/src/explore/controlPanels/sections.jsx:78
-msgid "Color Scheme"
+#: superset-frontend/src/explore/controls.jsx:482
+msgid "Color scheme"
 msgstr "Farbschema"
 
 #: superset-frontend/src/dashboard/components/CssEditor.jsx:67
@@ -4609,7 +4577,7 @@ msgid "Load a CSS template"
 msgstr "CSS Vorlage laden"
 
 #: superset-frontend/src/dashboard/components/CssEditor.jsx:88
-msgid "Live CSS Editor"
+msgid "Live CSS editor"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/Dashboard.jsx:84
@@ -4628,25 +4596,21 @@ 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 ""
+msgid "Discard changes"
+msgstr "Bearbeitet am"
 
 #: 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"
+msgid "Superset dashboard"
 msgstr "Dashboard speichern"
 
 #: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:206
 msgid "Check out this dashboard: "
 msgstr "Speichern & zum Dashboard gehen"
 
-#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:249
-msgid "Share dashboard"
-msgstr "Dashboard speichern"
-
 #: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:257
 msgid "Refresh dashboard"
 msgstr "Keine Dashboards"
@@ -4674,7 +4638,7 @@ msgid "Download as image"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:305
-msgid "Toggle FullScreen"
+msgid "Toggle fullscreen"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/MissingChart.jsx:31
@@ -4689,8 +4653,8 @@ 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:113
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:448
+#: 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"
@@ -4698,7 +4662,7 @@ 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:115
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:107
 msgid "You do not have permission to edit this dashboard"
 msgstr "Sie haben keine Zugriff auf diese Datenquelle"
 
@@ -4718,7 +4682,7 @@ msgid "Apply"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:295
-msgid "Dashboard Properties"
+msgid "Dashboard properties"
 msgstr "Dashboardeigenschaften bearbeiten"
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:324
@@ -4726,11 +4690,11 @@ msgstr "Dashboardeigenschaften bearbeiten"
 #: 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"
+msgid "Basic information"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:341
-msgid "URL Slug"
+msgid "URL slug"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:351
@@ -4753,10 +4717,15 @@ msgid "Colors"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:394
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:591
+#: 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 "Keine Dashboards"
+
 #: superset-frontend/src/dashboard/components/PublishedStatus.jsx:33
 msgid ""
 "This dashboard is not published, it will not show up in the list of "
@@ -4821,7 +4790,7 @@ msgid "24 hours"
 msgstr "Stunde"
 
 #: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:115
-msgid "Refresh Interval"
+msgid "Refresh interval"
 msgstr "Aktualisierung Zwischenzeit"
 
 #: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:118
@@ -4841,7 +4810,7 @@ msgid "You must pick a name for the new dashboard"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SaveModal.tsx:181
-msgid "Save Dashboard"
+msgid "Save dashboard"
 msgstr "Dashboard speichern"
 
 #: superset-frontend/src/dashboard/components/SaveModal.tsx:190
@@ -4884,12 +4853,12 @@ msgid "Fetched %s"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:202
-msgid "Minimize Chart"
-msgstr ""
+msgid "Minimize chart"
+msgstr "Diagramm bewegen"
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:202
-msgid "Maximize Chart"
-msgstr ""
+msgid "Maximize chart"
+msgstr "Diagramm untersuchen"
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:215
 msgid "Force refresh"
@@ -4900,8 +4869,8 @@ msgid "Toggle chart description"
 msgstr "Diagramm Beschreibung umschalten"
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:231
-msgid "View Chart in Explore"
-msgstr ""
+msgid "View chart in Explore"
+msgstr "Überschreiben Scheibe %s"
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:243
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:244
@@ -4969,7 +4938,7 @@ msgid ""
 "This markdown component has an error. Please revert your recent changes."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:169
+#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:153
 msgid "Delete dashboard tab?"
 msgstr "Bitte Dashboardname eingeben"
 
@@ -4993,102 +4962,116 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
+#: superset-frontend/src/dashboard/components/nativeFilters/CancelConfirmationAlert.tsx:92
+msgid "Yes, cancel"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/CancelConfirmationAlert.tsx:100
+msgid "Keep editing"
+msgstr ""
+
 #: superset-frontend/src/dashboard/components/nativeFilters/CascadePopover.tsx:121
-msgid "Select Parent Filters"
+msgid "Select parent filters"
 msgstr "Anmerkungstufe auswählen"
 
 #: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:455
-msgid "Reset All"
+msgid "Reset all"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:132
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:117
 msgid "You have removed this filter."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:135
-msgid "Restore Filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:120
+msgid "Restore filter"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:153
-msgid "Filter Name"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:138
+msgid "Filter name"
 msgstr "Tabellenname"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:155
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:140
 msgid "Name is required"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:164
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:149
 msgid "Datasource is required"
 msgstr "Datenquellen"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:183
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:168
 msgid "Field"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:196
-msgid "Default Value"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:203
-msgid "Parent Filter"
-msgstr ""
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:180
+msgid "Parent filter"
+msgstr "Anmerkungstufe auswählen"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:209
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:186
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:87
 msgid "None"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:221
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:198
 msgid "Apply changes instantly"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:229
+#: 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/FilterConfigForm.tsx:237
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:214
 msgid "Inverse selection"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:245
+#: 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/FilterConfigForm.tsx:247
-msgid "Scoping"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:464
+msgid "Are you sure you want to cancel?"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:257
-msgid "Apply to all panels"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:465
+msgid "will not be saved."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:259
-msgid "Apply to specific panels"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:483
+msgid "Filter configuration and scoping"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:267
-msgid "Only selected panels will be affected by this filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:516
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl.jsx:361
+msgid "Add filter"
+msgstr "Druid Cluster einfügen"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:528
+msgid "(Removed)"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:268
-msgid "All panels with this column will be affected by this filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:537
+msgid "Undo?"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:429
-msgid "Filter Configuration and Scoping"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:68
+msgid "Scoping"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:468
-msgid "Add Filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:83
+msgid "Apply to all panels"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:480
-msgid "(Removed)"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:85
+msgid "Apply to specific panels"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:489
-msgid "Undo?"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:91
+msgid "Only selected panels will be affected by this filter"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:92
+msgid "All panels with this column will be affected by this filter"
 msgstr ""
 
 #: superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js:44
@@ -5119,47 +5102,56 @@ msgstr ""
 
 #: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:223
 #: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:162
-msgid "Change Dataset"
-msgstr ""
+msgid "Change dataset"
+msgstr "Metrik auswählen"
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:248
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:250
 msgid "Warning!"
 msgstr "Warnmeldung"
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:258
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:260
 msgid "Search / Filter"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:87
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:91
 msgid "Physical (table or view)"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:88
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:92
 msgid "Virtual (SQL)"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:162
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:205
-msgid "Data Type"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:135
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:838
+msgid "SQL expression"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:167
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:210
+msgid "Data type"
 msgstr "Typ"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:174
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:175
+msgid "Datetime format"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:179
 msgid "The pattern of timestamp format. For strings use "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:176
-msgid "python datetime string pattern"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:181
+msgid "Python datetime string pattern"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:178
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:183
 msgid " expression which needs to adhere to the "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:180
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:185
 msgid "ISO 8601"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:182
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:187
 msgid ""
 " standard to ensure that the lexicographical ordering\n"
 "                      coincides with the chronological ordering. If the\n"
@@ -5177,77 +5169,73 @@ msgid ""
 "                      database/column name level via the extra parameter."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:206
-msgid "Is Dimension"
-msgstr ""
-
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:207
-msgid "Is Temporal"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:211
+msgid "Is dimension"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:208
-msgid "Is Filterable"
-msgstr ""
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:213
+msgid "Is filterable"
+msgstr "Druid Cluster einfügen"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:429
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:434
 #, python-format
 msgid "Modified columns: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:434
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:439
 #, python-format
 msgid "Removed columns: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:439
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:444
 #, python-format
 msgid "New columns added: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:442
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:447
 msgid "Metadata has been synced"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:477
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:482
 #, python-format
 msgid "Column name [%s] is duplicated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:483
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:488
 #, python-format
 msgid "Metric name [%s] is duplicated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:492
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:497
 #, python-format
 msgid "Calculated column [%s] requires an expression"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:507
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:512
 msgid "Basic"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:520
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:525
 msgid "Default URL"
 msgstr "Datenbank URL"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:521
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:526
 msgid "Default URL to redirect to when accessing from the dataset list page"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:528
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:533
 msgid "Autocomplete filters"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:529
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:534
 msgid "Whether to populate autocomplete filters options"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:535
-msgid "Autocomplete Query Predicate"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:540
+msgid "Autocomplete query predicate"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:536
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:541
 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 "
@@ -5256,112 +5244,126 @@ msgid ""
 "filter on a partitioned or indexed time-related field."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:550
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:555
 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.\" } }`."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:568
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:573
 msgid "Owners of the dataset"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:598
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:602
+#: superset-frontend/src/explore/components/PropertiesModal.tsx:238
+msgid "Cache timeout"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:603
 msgid "The duration of time in seconds before the cache is invalidated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:605
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:610
 msgid "Hours offset"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:627
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:632
 msgid "Spatial"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:679
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:684
 msgid "virtual"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:700
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:707
-msgid "dataset name"
-msgstr ""
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:705
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:712
+msgid "Dataset name"
+msgstr "Datenbank"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:715
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:720
 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:738
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:743
 msgid "The JSON metric or post aggregation definition."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:753
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:758
 msgid "Physical"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:783
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:788
 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:802
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:807
 msgid "Click the lock to make changes."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:805
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:810
 msgid "Click the lock to prevent further changes."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:863
-msgid "Warning message to display in the metric selector"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:860
+msgid "D3 format"
 msgstr ""
 
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:866
 #: superset-frontend/src/datasource/DatasourceEditor.jsx:874
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:882
-msgid "Certified By"
+msgid "Warning message"
+msgstr "Warnmeldung"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:868
+msgid "Warning message to display in the metric selector"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:876
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:879
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:887
+msgid "Certified by"
+msgstr "Geändert"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:881
 msgid "Person or group that has certified this metric"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:887
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:893
-msgid "Certification Details"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:892
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:898
+msgid "Certification details"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:889
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:894
 msgid "Details of the certification"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:957
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:963
 msgid "Be careful."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:958
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:964
 msgid ""
 "Changing these settings will affect all charts using this dataset, including "
 "charts owned by other people."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:970
+#: 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
 msgid "Source"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1005
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1009
 msgid "Sync columns from source"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1014
-msgid "Calculated Columns"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1027
+msgid "Calculated columns"
 msgstr "Spalten auflisten"
 
 #: superset-frontend/src/datasource/DatasourceModal.tsx:114
@@ -5391,10 +5393,11 @@ msgid "Edit Dataset "
 msgstr "Datenbank bearbeiten"
 
 #: superset-frontend/src/datasource/DatasourceModal.tsx:193
-msgid "Use Legacy Datasource Editor"
+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 ""
 
@@ -5431,7 +5434,7 @@ msgstr ""
 msgid "One or many metrics to display"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:416
+#: 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
@@ -5440,6 +5443,7 @@ msgid "Dataset"
 msgstr "Datenbank"
 
 #: superset-frontend/src/explore/controls.jsx:206
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:220
 msgid "Visualization type"
 msgstr "Visualisierungstyp"
 
@@ -5593,10 +5597,6 @@ msgid ""
 "is forced to `.1%`"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:482
-msgid "Color scheme"
-msgstr "Farbschema"
-
 #: superset-frontend/src/explore/controls.jsx:486
 msgid "The color scheme for rendering chart"
 msgstr ""
@@ -5605,100 +5605,6 @@ msgstr ""
 msgid "Color map"
 msgstr "Farbschema"
 
-#: superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx:159
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:329
-msgid "Simple"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx:176
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:382
-msgid "Custom SQL"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:267
-#: superset-frontend/src/explore/components/controls/SelectControl.jsx:237
-#, python-format
-msgid "%s option(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:282
-msgid "No such column found. To filter on a metric, try the Custom SQL tab."
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:291
-#, python-format
-msgid "%s column(s) and metric(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:301
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:265
-#, python-format
-msgid "%s column(s)"
-msgstr "Spalten auflisten"
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:302
-msgid "To filter on a metric, use Custom SQL tab."
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:307
-#, python-format
-msgid "%s operators(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:326
-msgid "type a value here"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:385
-msgid "Filter value (case sensitive)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx:92
-msgid "choose WHERE or HAVING..."
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx:127
-msgid "filters by columns"
-msgstr "Spalten auflisten"
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx:129
-msgid "filters by metrics"
-msgstr "Metriken auflisten"
-
-#: superset-frontend/src/explore/components/AdhocFilterPopoverTrigger.tsx:94
-msgid ""
-"\n"
-"                This filter was inherited from the dashboard's context.\n"
-"                It won't be saved when saving the chart.\n"
-"              "
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:276
-#, python-format
-msgid "%s aggregates(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:285
-#, python-format
-msgid "%s saved metric(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:332
-msgid "column"
-msgstr "Spalte"
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:348
-msgid "aggregate"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:359
-msgid "Saved"
-msgstr "Speichern als"
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:362
-msgid "Saved metric"
-msgstr "Gespeicherte Abfragen"
-
 #: 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
@@ -5713,7 +5619,7 @@ msgstr ""
 msgid "Changing this control takes effect instantly"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:249
+#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:251
 msgid "Customize"
 msgstr ""
 
@@ -5721,20 +5627,16 @@ msgstr ""
 msgid "rows retrieved"
 msgstr ""
 
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:130
+#: 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:216
+#: superset-frontend/src/explore/components/DataTablesPane.tsx:217
 msgid "No data"
 msgstr "Keine Dashboards"
 
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:257
-msgid "View results"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:260
+#: superset-frontend/src/explore/components/DataTablesPane.tsx:261
 msgid "View samples"
 msgstr ""
 
@@ -5790,12 +5692,12 @@ msgstr "%s - unbenannt"
 msgid "Edit chart properties"
 msgstr "Dashboardeigenschaften bearbeiten"
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:342
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:345
 msgid "Control labeled "
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:446
-msgid "Open Datasource Tab"
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:449
+msgid "Open Datasource tab"
 msgstr "Datenquelle"
 
 #: superset-frontend/src/explore/components/PropertiesModal.tsx:68
@@ -5839,38 +5741,34 @@ msgstr ""
 msgid "Please enter a chart name"
 msgstr "Bitte Dashboardname eingeben"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:165
-msgid "Save Chart"
+#: superset-frontend/src/explore/components/SaveModal.tsx:170
+msgid "Save chart"
 msgstr "Speichern als"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:180
+#: superset-frontend/src/explore/components/SaveModal.tsx:185
 msgid "Save & go to dashboard"
 msgstr "Speichern & zum Dashboard gehen"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:191
+#: superset-frontend/src/explore/components/SaveModal.tsx:196
 msgid "Save as new chart"
 msgstr "Dashboard speichern"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:220
+#: superset-frontend/src/explore/components/SaveModal.tsx:225
 msgid "Save (Overwrite)"
 msgstr "Gespeicherte Abfragen"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:230
+#: superset-frontend/src/explore/components/SaveModal.tsx:235
 msgid "Save as ..."
 msgstr "Speichern als"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:235
+#: superset-frontend/src/explore/components/SaveModal.tsx:240
 msgid "Chart name"
 msgstr "Von Zeit"
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:247
+#: superset-frontend/src/explore/components/SaveModal.tsx:252
 msgid "Add to dashboard"
 msgstr "Schiebe zum neuen Dashboard hinzufügen"
 
-#: superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx:361
-msgid "Add filter"
-msgstr "Druid Cluster einfügen"
-
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:601
 msgid "Display configuration"
 msgstr ""
@@ -5892,11 +5790,11 @@ msgid "Color"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:651
-msgid "Line Width"
+msgid "Line width"
 msgstr "Breite"
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:701
-msgid "Layer Configuration"
+msgid "Layer configuration"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:702
@@ -5909,21 +5807,31 @@ msgid "Mandatory"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:714
-msgid "Hide Layer"
+msgid "Hide layer"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:720
-msgid "Choose the Annotation Layer Type"
+msgid "Choose the annotation layer type"
 msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:721
-msgid "Annotation Layer Type"
+msgid "Annotation layer type"
 msgstr "Anmerkungstufe"
 
 #: 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 "Anmerkungstufe"
+
+#: 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 "Anmerkungstufe"
+
 #: superset-frontend/src/explore/components/controls/BoundsControl.jsx:73
 msgid "`Min` value should be numeric or empty"
 msgstr ""
@@ -5941,7 +5849,7 @@ msgid "Max"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:159
-msgid "Edit Dataset"
+msgid "Edit dataset"
 msgstr "Datenbank bearbeiten"
 
 #: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:163
@@ -5969,7 +5877,7 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:184
-msgid "Sort Metric"
+msgid "Sort metric"
 msgstr "Metrik anzeigen"
 
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:185
@@ -5977,24 +5885,20 @@ msgid "Metric to sort the results by"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:204
-msgid "Sort Ascending"
+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:215
-msgid "Allow Multiple Selections"
-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"
+msgid "Search all filter options"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:232
@@ -6010,12 +5914,8 @@ 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/MetricsControl.jsx:383
-msgid "Add metric"
-msgstr "Metrik einfügen"
+msgid "Filter configuration"
+msgstr "Verbindungstest"
 
 #: superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx:45
 msgid "Error while fetching data"
@@ -6026,6 +5926,12 @@ msgstr ""
 msgid "No results found"
 msgstr "Keine Datensätze gefunden"
 
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:267
+#: superset-frontend/src/explore/components/controls/SelectControl.jsx:237
+#, python-format
+msgid "%s option(s)"
+msgstr ""
+
 #: superset-frontend/src/explore/components/controls/SpatialControl.jsx:82
 msgid "Invalid lat/long configuration."
 msgstr ""
@@ -6062,7 +5968,7 @@ msgstr ""
 
 #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl.jsx:48
 #: superset-frontend/src/explore/controlPanels/TimeTable.js:38
-msgid "Time Series Columns"
+msgid "Time series columns"
 msgstr "Zeitspalte"
 
 #: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:105
@@ -6103,7 +6009,7 @@ msgid "Edit time range"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:51
-msgid "Configure Advanced Time Range"
+msgid "Configure advanced time range"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:52
@@ -6125,7 +6031,7 @@ msgid "Configure Time Range: Last..."
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:121
-msgid "Configure Custom Time Range"
+msgid "Configure custom time range"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:151
@@ -6134,7 +6040,7 @@ msgid "Relative quantity"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:229
-msgid "ANCHOR TO"
+msgid "Anchor to"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:238
@@ -6145,13 +6051,109 @@ msgstr ""
 msgid "Date/Time"
 msgstr "Von Zeit"
 
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:159
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:367
+msgid "Simple"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:176
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:399
+msgid "Custom SQL"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:282
+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
+#, 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
+#, python-format
+msgid "%s column(s)"
+msgstr "Spalten auflisten"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:302
+msgid "To filter on a metric, use Custom SQL tab."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:307
+#, python-format
+msgid "%s operators(s)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:326
+msgid "Type a value here"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:385
+msgid "Filter value (case sensitive)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:92
+msgid "choose WHERE or HAVING..."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:127
+msgid "Filters by columns"
+msgstr "Spalten auflisten"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:129
+msgid "Filters by metrics"
+msgstr "Metriken auflisten"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger.tsx:94
+msgid ""
+"\n"
+"                This filter was inherited from the dashboard's context.\n"
+"                It won't be saved when saving the chart.\n"
+"              "
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:297
+#, python-format
+msgid "%s aggregates(s)"
+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 "Speichern als"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:349
+msgid "Saved metric"
+msgstr "Gespeicherte Abfragen"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:370
+msgid "column"
+msgstr "Spalte"
+
+#: 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 "Metrik"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx:402
+msgid "Add metric"
+msgstr "Metrik einfügen"
+
 #: superset-frontend/src/explore/controlPanels/Separator.js:25
 #: superset-frontend/src/explore/controlPanels/Separator.js:46
 msgid "Code"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/Separator.js:32
-msgid "Markup Type"
+msgid "Markup type"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/Separator.js:37
@@ -6190,8 +6192,8 @@ msgid "Time related form attributes"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:31
-msgid "Chart Type"
-msgstr ""
+msgid "Chart type"
+msgstr "Von Zeit"
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:41
 msgid "Chart ID"
@@ -6210,7 +6212,7 @@ msgid "The number of seconds before expiring the cache"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:59
-msgid "URL Parameters"
+msgid "URL parameters"
 msgstr "Parameter"
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:61
@@ -6226,11 +6228,11 @@ msgid "Time range endpoints (SIP-15)"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:90
-msgid "Annotations and Layers"
+msgid "Annotations and layers"
 msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:124
-msgid "Sort Descending"
+msgid "Sort descending"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:126
@@ -6246,7 +6248,7 @@ msgid "Compute the contribution to the total"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:143
-msgid "Advanced Analytics"
+msgid "Advanced analytics"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:145
@@ -6256,12 +6258,12 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:151
-msgid "Rolling Window"
+msgid "Rolling window"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:157
-msgid "Rolling Function"
-msgstr ""
+msgid "Rolling function"
+msgstr "Verbindungstest"
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:166
 msgid ""
@@ -6280,7 +6282,7 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:188
-msgid "Min Periods"
+msgid "Min periods"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:190
@@ -6292,11 +6294,11 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:200
-msgid "Time Comparison"
+msgid "Time comparison"
 msgstr "Zeitspalte"
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:208
-msgid "Time Shift"
+msgid "Time shift"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:219
@@ -6318,8 +6320,8 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:247
-msgid "Python Functions"
-msgstr ""
+msgid "Python functions"
+msgstr "Verbindungstest"
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:256
 msgid "Rule"
@@ -6342,11 +6344,11 @@ msgid "Favorites"
 msgstr "Favoriten"
 
 #: superset-frontend/src/profile/components/App.tsx:62
-msgid "Created Content"
+msgid "Created content"
 msgstr "Erstellte Inhalt"
 
 #: superset-frontend/src/profile/components/App.tsx:76
-msgid "Recent Activity"
+msgid "Recent activity"
 msgstr "Kürzliche Aktivitäten"
 
 #: superset-frontend/src/profile/components/App.tsx:90
@@ -6443,16 +6445,16 @@ msgid "There was an issue deleting the selected %s: %s"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:213
-msgid "Last Run"
+msgid "Last run"
 msgstr "Bearbeitet am"
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:245
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1331
-msgid "Notification Method"
-msgstr ""
+msgid "Notification method"
+msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:292
-msgid "Execution Log"
+msgid "Execution log"
 msgstr "Aktionsprotokoll"
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:320
@@ -6476,7 +6478,7 @@ msgstr "Aktion"
 #: 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
-msgid "Bulk Select"
+msgid "Bulk select"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:361
@@ -6494,7 +6496,7 @@ msgstr ""
 #: 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
-msgid "Created By"
+msgid "Created by"
 msgstr "Bearbeitet von"
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:377
@@ -6528,6 +6530,10 @@ msgstr ""
 msgid "${AlertState.grace}"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:411
+msgid "Alerts & reports"
+msgstr "Importieren"
+
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:421
 msgid "Reports"
 msgstr "Importieren"
@@ -6545,8 +6551,12 @@ msgstr "Löschen"
 #: 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
@@ -6575,15 +6585,15 @@ msgid ">= (Larger or equal)"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:72
-msgid "== (Is Equal)"
+msgid "== (Is equal)"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:76
-msgid "!= (Is Not Equal)"
+msgid "!= (Is not equal)"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:80
-msgid "Not Null"
+msgid "Not null"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:91
@@ -6629,16 +6639,16 @@ msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1063
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1071
-msgid "Report Name"
+msgid "Report name"
 msgstr "Vorlagename"
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1063
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1071
-msgid "Alert Name"
+msgid "Alert name"
 msgstr "Tabellenname"
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1117
-msgid "Alert Condition"
+msgid "Alert condition"
 msgstr "Verbindungstest"
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1161
@@ -6652,23 +6662,23 @@ msgid "Value"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1213
-msgid "Report Schedule"
-msgstr ""
+msgid "Report schedule"
+msgstr "Importieren"
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1214
-msgid "Alert Condition Schedule"
-msgstr ""
+msgid "Alert condition schedule"
+msgstr "Verbindungstest"
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1224
-msgid "Schedule Settings"
-msgstr ""
+msgid "Schedule settings"
+msgstr "Gespeicherte Abfrage anzeigen"
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1228
-msgid "Log Retention"
+msgid "Log retention"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1252
-msgid "Working Timeout"
+msgid "Working timeout"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1260
@@ -6677,11 +6687,11 @@ msgid "Time in seconds"
 msgstr "10 Sekunden"
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1267
-msgid "Grace Period"
+msgid "Grace period"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1282
-msgid "Message Content"
+msgid "Message content"
 msgstr "Erstellte Inhalt"
 
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:63
@@ -6698,48 +6708,52 @@ msgid "Scheduled at"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:108
-msgid "Start At"
+msgid "Start at"
 msgstr "Von Zeit"
 
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:118
 msgid "Duration"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:127
+msgid "Error message"
+msgstr "Warnmeldung"
+
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:139
 msgid "${alertResource?.type}"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx:77
-msgid "CRON Expression"
+msgid "CRON expression"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:62
-msgid "Report Sent"
-msgstr ""
+msgid "Report sent"
+msgstr "Importieren"
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:63
-msgid "Alert Triggered, Notification Sent"
+msgid "Alert triggered, notification sent"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:69
-msgid "Report Sending"
-msgstr ""
+msgid "Report sending"
+msgstr "Importieren"
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:70
-msgid "Alert Running"
-msgstr ""
+msgid "Alert running"
+msgstr "Verbindungstest"
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:76
-msgid "Report Failed"
-msgstr ""
+msgid "Report failed"
+msgstr "Vorlagename"
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:77
-msgid "Alert Failed"
-msgstr ""
+msgid "Alert failed"
+msgstr "Tabellenname"
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:82
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:92
-msgid "Nothing Triggered"
+msgid "Nothing triggered"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:87
@@ -6764,8 +6778,13 @@ msgstr "Anmerkungen"
 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
+msgid "Edit annotation"
+msgstr "Anmerkungen"
+
 #: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:187
-msgid "Delete Annotation"
+msgid "Delete annotation"
 msgstr "Anmerkungen"
 
 #: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:208
@@ -6794,8 +6813,12 @@ msgstr "Anmerkungen"
 msgid "Are you sure you want to delete the selected annotations?"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
+msgid "Add annotation"
+msgstr "Anmerkungen"
+
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:274
-msgid "annotation name"
+msgid "Annotation name"
 msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:286
@@ -6803,32 +6826,29 @@ msgid "date"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:307
-msgid "Additional Information"
-msgstr ""
+msgid "Additional information"
+msgstr "Anmerkungen"
 
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:314
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:243
 msgid "Description (this can be seen in the list)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:319
-msgid "json metadata"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:107
 msgid "annotation_layer"
 msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:218
-msgid "Edit Annotation Layer Properties"
+msgid "Edit annotation layer properties"
 msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:228
-msgid "annotation layer name"
+msgid "Annotation layer name"
 msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:67
-msgid "annotation layers"
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:339
+msgid "Annotation layers"
 msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:112
@@ -6836,6 +6856,19 @@ msgstr "Anmerkungstufe"
 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
+msgid "Last modified"
+msgstr "Geändert"
+
+#: 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
+msgid "Created on"
+msgstr "Schöpfer"
+
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:231
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:210
 msgid "Edit template"
@@ -6848,7 +6881,7 @@ msgstr "Vorlage laden"
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:266
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:323
-msgid "Annotation Layer"
+msgid "Annotation layer"
 msgstr "Anmerkungstufe"
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:296
@@ -6874,13 +6907,6 @@ msgstr "Wirklich alle löschen?"
 msgid "Are you sure you want to delete the selected layers?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:72
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:297
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:94
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:283
-msgid "Please Confirm"
-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
@@ -6917,7 +6943,7 @@ 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
-msgid "Modified By"
+msgid "Modified by"
 msgstr "Geändert"
 
 #: superset-frontend/src/views/CRUD/chart/ChartList.tsx:370
@@ -6937,7 +6963,7 @@ msgid "An error occurred while fetching chart created by values: %s"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/chart/ChartList.tsx:412
-msgid "Viz Type"
+msgid "Viz type"
 msgstr "Typ"
 
 #: superset-frontend/src/views/CRUD/chart/ChartList.tsx:444
@@ -6972,11 +6998,15 @@ msgid "css_template"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:236
-msgid "Edit CSS Template Properties"
+msgid "Edit CSS template properties"
+msgstr "CSS Vorlagen"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:237
+msgid "Add CSS template"
 msgstr "CSS Vorlagen"
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:246
-msgid "css template name"
+msgid "CSS template name"
 msgstr "Vorlagename"
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:258
@@ -6984,7 +7014,8 @@ msgid "css"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:66
-msgid "css templates"
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:240
+msgid "CSS templates"
 msgstr "CSS Vorlagen"
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:115
@@ -6998,7 +7029,7 @@ msgid "Last modified by %s"
 msgstr "Geändert"
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:249
-msgid "Css Template"
+msgid "CSS template"
 msgstr "CSS Vorlagen"
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:313
@@ -7095,7 +7126,7 @@ 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"
+msgid "Asynchronous query execution"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:213
@@ -7104,7 +7135,7 @@ msgid "AQE"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:228
-msgid "Allow Data Manipulation Language"
+msgid "Allow data manipulation language"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:231
@@ -7112,7 +7143,7 @@ msgid "DML"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:243
-msgid "CSV Upload"
+msgid "CSV upload"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:303
@@ -7147,12 +7178,20 @@ msgstr ""
 msgid "Sorry there was an error fetching database information: %s"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
+msgid "Edit database"
+msgstr "Datenbank bearbeiten"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
+msgid "Add database"
+msgstr "Datenbank einfügen"
+
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:361
 msgid "Connection"
 msgstr "Verbindungstest"
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:369
-msgid "Database Name"
+msgid "Database name"
 msgstr "Datenbank"
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:377
@@ -7163,6 +7202,10 @@ msgstr ""
 msgid "dialect+driver://username:password@host:port/database"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:399
+msgid "Test connection"
+msgstr "Verbindungstest"
+
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:403
 msgid "Refer to the "
 msgstr ""
@@ -7179,6 +7222,11 @@ msgstr ""
 msgid "Performance"
 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"
+msgstr "Von Zeit"
+
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:445
 msgid ""
 "Operate the database in asynchronous mode, meaning that the queries are "
@@ -7188,19 +7236,34 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:455
-msgid "SQL Lab Settings"
-msgstr ""
+msgid "SQL Lab settings"
+msgstr "Tabellenansicht"
 
 #: 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 "Farbschema"
+
 #: 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
+msgid "Secure extra"
+msgstr "Sicherheit"
+
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:568
 msgid "JSON string containing additional connection configuration."
 msgstr ""
@@ -7212,11 +7275,6 @@ msgid ""
 "normally used by SQLAlchemy."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:582
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:587
-msgid "Root Certificate"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:592
 msgid ""
 "Optional CA_BUNDLE contents to validate HTTPS requests. Only available on "
@@ -7237,7 +7295,7 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:628
-msgid "Allow Data Upload"
+msgid "Allow data upload"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:630
@@ -7291,7 +7349,7 @@ msgid "Error while saving dataset: %s"
 msgstr "Fehler bei Anmerkungstufeabruf"
 
 #: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:117
-msgid "Add Dataset"
+msgid "Add dataset"
 msgstr "Datenbank einfügen"
 
 #: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:53
@@ -7319,11 +7377,11 @@ msgid "An error occurred while fetching dataset related data: %s"
 msgstr "Fehler bei Anmerkungstufeabruf"
 
 #: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:204
-msgid "Physical Dataset"
-msgstr ""
+msgid "Physical dataset"
+msgstr "Metrik auswählen"
 
 #: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:214
-msgid "Virtual Dataset"
+msgid "Virtual dataset"
 msgstr "Datenbank bearbeiten"
 
 #: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:399
@@ -7414,7 +7472,7 @@ msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:225
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:147
-msgid "Tab Name"
+msgid "Tab name"
 msgstr "Tabellenname"
 
 #: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:257
@@ -7436,17 +7494,14 @@ msgstr "Bearbeiten in SQL Editor"
 msgid "An error occurred while fetching database values: %s"
 msgstr "Fehler bei Anmerkungstufeabruf"
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:389
-msgid "Time Range"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:395
 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/SavedQueryPreviewModal.tsx:98
-msgid "Query Preview"
+msgid "Query preview"
 msgstr "Abfragen"
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:127
@@ -7472,6 +7527,11 @@ msgstr "Benutzer Rollen"
 msgid "Executed query"
 msgstr "Leere Abfrage?"
 
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:87
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:145
+msgid "Saved queries"
+msgstr "Gespeicherte Abfragen"
+
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:116
 #, python-format
 msgid "There was an issue previewing the selected query %s"
@@ -7486,10 +7546,6 @@ msgstr ""
 msgid "There was an issue deleting the selected queries: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:315
-msgid "Query preview"
-msgstr "Abfragen"
-
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:323
 msgid "Edit query"
 msgstr "Leere Abfrage?"
@@ -7517,7 +7573,7 @@ msgid "Are you sure you want to delete the selected queries?"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:126
-msgid "Query Name"
+msgid "Query name"
 msgstr "Abfrage"
 
 #: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:110
@@ -7558,10 +7614,6 @@ msgstr ""
 msgid "Recently edited charts, dashboards, and saved queries will appear here"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:114
-msgid "SQL QUERY"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:115
 msgid ""
 "${tableName\n"
@@ -7576,8 +7628,8 @@ msgid "You don't have any favorites yet!"
 msgstr "Sie haben keine Zugriff auf diese Datenquelle"
 
 #: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:147
-msgid "SQL LAB QUERIES"
-msgstr ""
+msgid "SQL Lab queries"
+msgstr "Tabellenansicht"
 
 #: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:148
 msgid "${tableName}"
@@ -7610,27 +7662,27 @@ msgid "Type or Select [%s]"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js:25
-msgid "Filter Box"
-msgstr ""
+msgid "Filter box"
+msgstr "Tabellenname"
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:27
-msgid "Filters Configuration"
-msgstr ""
+msgid "Filters configuration"
+msgstr "Verbindungstest"
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:36
 msgid "Filter configuration for the filter box"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:49
-msgid "Date Filter"
-msgstr ""
+msgid "Date filter"
+msgstr "Druid Cluster einfügen"
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:51
 msgid "Whether to include a time filter"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:58
-msgid "Instant Filtering"
+msgid "Instant filtering"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:61
@@ -7640,39 +7692,39 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:72
-msgid "Show SQL Granularity Dropdown"
+msgid "Show SQL granularity dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:74
-msgid "Check to include SQL Granularity dropdown"
+msgid "Check to include SQL granularity dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:81
-msgid "Show SQL Time Column"
+msgid "Show SQL time column"
 msgstr "Zeitspalte"
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:83
-msgid "Check to include Time Column dropdown"
+msgid "Check to include time column dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:92
-msgid "Show Druid Granularity Dropdown"
+msgid "Show Druid granularity dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:94
-msgid "Check to include Druid Granularity dropdown"
+msgid "Check to include Druid granularity dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:101
-msgid "Show Druid Time Origin"
+msgid "Show Druid time origin"
 msgstr "Druid Metrik anzeigen"
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:103
-msgid "Check to include Time Origin dropdown"
+msgid "Check to include time origin dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:113
-msgid "Limit Selector Values"
+msgid "Limit selector values"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:114
diff --git a/superset/translations/en/LC_MESSAGES/messages.json b/superset/translations/en/LC_MESSAGES/messages.json
index 7ef26d3..e9e28a8 100644
--- a/superset/translations/en/LC_MESSAGES/messages.json
+++ b/superset/translations/en/LC_MESSAGES/messages.json
@@ -175,6 +175,7 @@
       "Annotation layer has associated annotations.": [""],
       "Name must be unique": [""],
       "Deleted %(num)d chart": ["", "Deleted %(num)d charts"],
+      "Request is not JSON": [""],
       "Request is incorrect: %(error)s": [""],
       "`confidence_interval` must be between 0 and 1 (exclusive)": [""],
       "lower percentile must be greater than 0 and less than 100. Must be lower than upper percentile.": [
@@ -854,13 +855,9 @@
       "Edit Log": [""],
       "Action": [""],
       "dttm": [""],
-      "Add Item": [""],
+      "Add item": [""],
       "The query couldn't be loaded": [""],
-      "Your query was saved": [""],
-      "Your query could not be saved": [""],
-      "Your query was updated": [""],
-      "Your query could not be updated": [""],
-      "Your query has been scheduled. To see details of your query, navigate to Saved Queries": [
+      "Your query has been scheduled. To see details of your query, navigate to Saved queries": [
         ""
       ],
       "Your query could not be scheduled": [""],
@@ -905,6 +902,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": [""],
       "An error occurred while storing your query in the backend. To avoid losing your changes, please save your query using the \"Save Query\" button.": [
         ""
       ],
@@ -930,9 +931,9 @@
       "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": [""],
       "Explore the result set in the data exploration view": [""],
@@ -964,7 +965,7 @@
       "[To]-": [""],
       "Filter by status": [""],
       "Edit": [""],
-      "view results": [""],
+      "View results": [""],
       "Data preview": [""],
       "Overwrite text in the editor with a query on this table": [""],
       "Run query in a new tab": [""],
@@ -972,16 +973,16 @@
       "An error occurred saving dataset": [""],
       ".CSV": [""],
       "Clipboard": [""],
-      "Filter Results": [""],
-      "Database Error": [""],
+      "Filter results": [""],
+      "Database error": [""],
       "was created": [""],
       "Query in a new tab": [""],
       "The query returned no data": [""],
       "Fetch data preview": [""],
-      "Refetch Results": [""],
-      "Track Job": [""],
+      "Refetch results": [""],
+      "Track job": [""],
       "Stop": [""],
-      "Run Selection": [""],
+      "Run selection": [""],
       "Run": [""],
       "Stop running (Ctrl + x)": [""],
       "Run query (Ctrl + Return)": [""],
@@ -990,12 +991,12 @@
       "Undefined": [""],
       "Save": [""],
       "Save as": [""],
-      "Save Query": [""],
-      "Save As New": [""],
+      "Save query": [""],
+      "Save as new": [""],
       "Update": [""],
       "Label for your query": [""],
       "Write a description for your query": [""],
-      "Schedule Query": [""],
+      "Schedule query": [""],
       "Schedule": [""],
       "There was an error with your request": [""],
       "Please save the query to enable sharing": [""],
@@ -1006,9 +1007,10 @@
       "Run a query to display results here": [""],
       "Preview: `%s`": [""],
       "Results": [""],
+      "Query history": [""],
       "Run query": [""],
       "New tab": [""],
-      "Untitled Query": [""],
+      "Untitled query": [""],
       "Stop query": [""],
       "Schedule the query periodically": [""],
       "You must run the query successfully first": [""],
@@ -1018,7 +1020,7 @@
       "CREATE TABLE AS": [""],
       "CREATE VIEW AS": [""],
       "Estimate the cost before running a query": [""],
-      "Reset State": [""],
+      "Reset state": [""],
       "Enter a new title for the tab": [""],
       "Untitled Query %s": [""],
       "Close tab": [""],
@@ -1041,7 +1043,6 @@
       "below (example:": [""],
       "), and they become available in your SQL (example:": [""],
       ") by using": [""],
-      "Template Parameters": [""],
       "Edit template parameters": [""],
       "Invalid JSON": [""],
       "Create a new chart": [""],
@@ -1149,7 +1150,6 @@
       "Unexpected error": [""],
       "Click to favorite/unfavorite": [""],
       "An error occurred while fetching dashboards": [""],
-      "Run Query": [""],
       "Error while fetching table list": [""],
       "Select table or type table name": [""],
       "Type to search ...": [""],
@@ -1157,28 +1157,27 @@
       "Force refresh table list": [""],
       "See table schema": [""],
       "%s%s": [""],
-      "Share Dashboard": [""],
+      "Share dashboard": [""],
       "This may be triggered by:": [""],
       "Please reach out to the Chart Owner for assistance.": [""],
       "Chart Owner: %s": [""],
       "%s Error": [""],
-      "See More": [""],
-      "See Less": [""],
-      "Copy Message": [""],
+      "See more": [""],
+      "See less": [""],
+      "Copy message": [""],
       "Close": [""],
-      "Unexpected Error": [""],
       "This was triggered by:": [""],
       "Did you mean:": [""],
       "%(suggestion)s instead of \"%(undefinedParameter)s?\"": [""],
-      "Parameter Error": [""],
+      "Parameter error": [""],
       "We’re having trouble loading this visualization. Queries are set to timeout after %s second.": [
         ""
       ],
       "We’re having trouble loading these results. Queries are set to timeout after %s second.": [
         ""
       ],
-      "Timeout Error": [""],
-      "Cell Content": [""],
+      "Timeout error": [""],
+      "Cell content": [""],
       "The import was successful": [""],
       "OVERWRITE": [""],
       "Overwrite": [""],
@@ -1186,10 +1185,11 @@
       "Import %s": [""],
       "Last Updated %s": [""],
       "%s Selected": [""],
-      "Deselect All": [""],
+      "Deselect all": [""],
       "%s-%s of %s": [""],
       "Settings": [""],
       "About": [""],
+      "SQL query": [""],
       "There is not enough space for this component. Try decreasing its width, or increasing the destination width.": [
         ""
       ],
@@ -1211,10 +1211,10 @@
       "Any color palette selected here will override the colors applied to this dashboard's individual charts": [
         ""
       ],
-      "Color Scheme": [""],
+      "Color scheme": [""],
       "Load a template": [""],
       "Load a CSS template": [""],
-      "Live CSS Editor": [""],
+      "Live CSS editor": [""],
       "You have unsaved changes.": [""],
       "This dashboard is currently force refreshing; the next force refresh will be in %s.": [
         ""
@@ -1222,18 +1222,17 @@
       "Your dashboard is too large. Please reduce the size before save it.": [
         ""
       ],
-      "Discard Changes": [""],
+      "Discard changes": [""],
       "An error occurred while fetching available CSS templates": [""],
-      "Superset Dashboard": [""],
+      "Superset dashboard": [""],
       "Check out this dashboard: ": [""],
-      "Share dashboard": [""],
       "Refresh dashboard": [""],
       "Set auto-refresh interval": [""],
       "Set filter mapping": [""],
       "Edit dashboard properties": [""],
       "Edit CSS": [""],
       "Download as image": [""],
-      "Toggle FullScreen": [""],
+      "Toggle fullscreen": [""],
       "There is no chart definition associated with this component, could it have been deleted?": [
         ""
       ],
@@ -1243,9 +1242,9 @@
       "A valid color scheme is required": [""],
       "The dashboard has been saved": [""],
       "Apply": [""],
-      "Dashboard Properties": [""],
-      "Basic Information": [""],
-      "URL Slug": [""],
+      "Dashboard properties": [""],
+      "Basic information": [""],
+      "URL slug": [""],
       "A readable URL for your dashboard": [""],
       "Access": [""],
       "Owners is a list of users who can alter the dashboard. Searchable by name or username.": [
@@ -1253,6 +1252,7 @@
       ],
       "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.": [
         ""
       ],
@@ -1271,12 +1271,12 @@
       "6 hours": [""],
       "12 hours": [""],
       "24 hours": [""],
-      "Refresh Interval": [""],
+      "Refresh interval": [""],
       "Refresh frequency": [""],
       "Are you sure you want to proceed?": [""],
       "Save for this session": [""],
       "You must pick a name for the new dashboard": [""],
-      "Save Dashboard": [""],
+      "Save dashboard": [""],
       "Overwrite Dashboard [%s]": [""],
       "Save as:": [""],
       "[dashboard name]": [""],
@@ -1286,11 +1286,11 @@
       "One ore more annotation layers failed loading.": [""],
       "Cached %s": [""],
       "Fetched %s": [""],
-      "Minimize Chart": [""],
-      "Maximize Chart": [""],
+      "Minimize chart": [""],
+      "Maximize chart": [""],
       "Force refresh": [""],
       "Toggle chart description": [""],
-      "View Chart in Explore": [""],
+      "View chart in Explore": [""],
       "Share chart": [""],
       "Export CSV": [""],
       "Applied Filters (%d)": [""],
@@ -1314,30 +1314,33 @@
       "Row": [""],
       "Tabs": [""],
       "Preview": [""],
-      "Select Parent Filters": [""],
-      "Reset All": [""],
+      "Yes, cancel": [""],
+      "Keep editing": [""],
+      "Select parent filters": [""],
+      "Reset all": [""],
       "You have removed this filter.": [""],
-      "Restore Filter": [""],
-      "Filter Name": [""],
+      "Restore filter": [""],
+      "Filter name": [""],
       "Name is required": [""],
       "Datasource is required": [""],
       "Field": [""],
-      "Default Value": [""],
-      "Parent Filter": [""],
+      "Parent filter": [""],
       "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": [""],
+      "Add filter": [""],
+      "(Removed)": [""],
+      "Undo?": [""],
       "Scoping": [""],
       "Apply to all panels": [""],
       "Apply to specific panels": [""],
       "Only selected panels will be affected by this filter": [""],
       "All panels with this column will be affected by this filter": [""],
-      "Filter Configuration and Scoping": [""],
-      "Add Filter": [""],
-      "(Removed)": [""],
-      "Undo?": [""],
       "All filters": [""],
       "All charts": [""],
       "Warning! Changing the dataset may break the chart if the metadata does not exist.": [
@@ -1347,22 +1350,23 @@
         ""
       ],
       "dataset": [""],
-      "Change Dataset": [""],
+      "Change dataset": [""],
       "Warning!": [""],
       "Search / Filter": [""],
       "Physical (table or view)": [""],
       "Virtual (SQL)": [""],
-      "Data Type": [""],
+      "SQL expression": [""],
+      "Data type": [""],
+      "Datetime format": [""],
       "The pattern of timestamp format. For strings use ": [""],
-      "python datetime string pattern": [""],
+      "Python datetime string pattern": [""],
       " expression which needs to adhere to the ": [""],
       "ISO 8601": [""],
       " standard to ensure that the lexicographical ordering\n                      coincides with the chronological ordering. If the\n                      timestamp format does not adhere to the ISO 8601 standard\n                      you will need to define an expression and type for\n                      transforming the string into a date or timestamp. Note\n                      currently time zones are not supported. If time is stored\n                      in epoch format, put  [...]
         ""
       ],
-      "Is Dimension": [""],
-      "Is Temporal": [""],
-      "Is Filterable": [""],
+      "Is dimension": [""],
+      "Is filterable": [""],
       "Modified columns: %s": [""],
       "Removed columns: %s": [""],
       "New columns added: %s": [""],
@@ -1377,7 +1381,7 @@
       ],
       "Autocomplete filters": [""],
       "Whether to populate autocomplete filters options": [""],
-      "Autocomplete Query Predicate": [""],
+      "Autocomplete query predicate": [""],
       "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.": [
         ""
       ],
@@ -1385,11 +1389,12 @@
         ""
       ],
       "Owners of the dataset": [""],
+      "Cache timeout": [""],
       "The duration of time in seconds before the cache is invalidated": [""],
       "Hours offset": [""],
       "Spatial": [""],
       "virtual": [""],
-      "dataset name": [""],
+      "Dataset name": [""],
       "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.": [
         ""
       ],
@@ -1400,10 +1405,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": [""],
+      "Certified by": [""],
       "Person or group that has certified this metric": [""],
-      "Certification Details": [""],
+      "Certification details": [""],
       "Details of the certification": [""],
       "Be careful.": [""],
       "Changing these settings will affect all charts using this dataset, including charts owned by other people.": [
@@ -1411,7 +1418,7 @@
       ],
       "Source": [""],
       "Sync columns from source": [""],
-      "Calculated Columns": [""],
+      "Calculated columns": [""],
       "The dataset has been saved": [""],
       "The dataset configuration exposed here\n                affects all the charts using this dataset.\n                Be mindful that changing settings\n                here may affect other charts\n                in undesirable ways.": [
         ""
@@ -1419,7 +1426,7 @@
       "Are you sure you want to save and apply changes?": [""],
       "Confirm save": [""],
       "Edit Dataset ": [""],
-      "Use Legacy Datasource Editor": [""],
+      "Use legacy datasource editor": [""],
       "Time range": [""],
       "Time column": [""],
       "Time grain": [""],
@@ -1480,33 +1487,8 @@
       "When `Calculation type` is set to \"Percentage change\", the Y Axis Format is forced to `.1%`": [
         ""
       ],
-      "Color scheme": [""],
       "The color scheme for rendering chart": [""],
       "Color map": [""],
-      "Simple": [""],
-      "Custom SQL": [""],
-      "%s option(s)": [""],
-      "No such column found. To filter on a metric, try the Custom SQL tab.": [
-        ""
-      ],
-      "%s column(s) and metric(s)": [""],
-      "%s column(s)": [""],
-      "To filter on a metric, use Custom SQL tab.": [""],
-      "%s operators(s)": [""],
-      "type a value here": [""],
-      "Filter value (case sensitive)": [""],
-      "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              ": [
-        ""
-      ],
-      "%s aggregates(s)": [""],
-      "%s saved metric(s)": [""],
-      "column": [""],
-      "aggregate": [""],
-      "Saved": [""],
-      "Saved metric": [""],
       "description": [""],
       "bolt": [""],
       "Changing this control takes effect instantly": [""],
@@ -1514,7 +1496,6 @@
       "rows retrieved": [""],
       "Sorry, An error occurred": [""],
       "No data": [""],
-      "View results": [""],
       "View samples": [""],
       "Search Metrics & Columns": [""],
       "Showing %s of %s": [""],
@@ -1529,7 +1510,7 @@
       "%s - untitled": [""],
       "Edit chart properties": [""],
       "Control labeled ": [""],
-      "Open Datasource Tab": [""],
+      "Open Datasource tab": [""],
       "You do not have permission to edit this chart": [""],
       "The description can be displayed as widget headers in the dashboard view. Supports markdown.": [
         ""
@@ -1545,32 +1526,33 @@
       "Limit reached": [""],
       "**Select** a dashboard OR **create** a new one": [""],
       "Please enter a chart name": [""],
-      "Save Chart": [""],
+      "Save chart": [""],
       "Save & go to dashboard": [""],
       "Save as new chart": [""],
       "Save (Overwrite)": [""],
       "Save as ...": [""],
       "Chart name": [""],
       "Add to dashboard": [""],
-      "Add filter": [""],
       "Display configuration": [""],
       "Configure your how you overlay is displayed here.": [""],
       "Style": [""],
       "Opacity": [""],
       "Color": [""],
-      "Line Width": [""],
-      "Layer Configuration": [""],
+      "Line width": [""],
+      "Layer configuration": [""],
       "Configure the basics of your Annotation Layer.": [""],
       "Mandatory": [""],
-      "Hide Layer": [""],
-      "Choose the Annotation Layer Type": [""],
-      "Annotation Layer Type": [""],
+      "Hide layer": [""],
+      "Choose the annotation layer type": [""],
+      "Annotation layer type": [""],
       "Remove": [""],
+      "Edit annotation layer": [""],
+      "Add annotation layer": [""],
       "`Min` value should be numeric or empty": [""],
       "`Max` value should be numeric or empty": [""],
       "Min": [""],
       "Max": [""],
-      "Edit Dataset": [""],
+      "Edit dataset": [""],
       "View in SQL Lab": [""],
       "More dataset related options": [""],
       "Superset supports smart date parsing. Strings like `3 weeks ago`, `last sunday`, or `2 weeks from now` can be used.": [
@@ -1580,23 +1562,22 @@
       "(optional) default value for the filter, when using the multiple option, you can use a semicolon-delimited list of options.": [
         ""
       ],
-      "Sort Metric": [""],
+      "Sort metric": [""],
       "Metric to sort the results by": [""],
-      "Sort Ascending": [""],
+      "Sort ascending": [""],
       "Check for sorting ascending": [""],
-      "Allow Multiple Selections": [""],
       "Multiple selections allowed, otherwise filter is limited to a single value": [
         ""
       ],
-      "Search All Filter Options": [""],
+      "Search all filter options": [""],
       "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).": [
         ""
       ],
       "User must select a value for this filter": [""],
-      "Filter Configuration": [""],
-      "Add metric": [""],
+      "Filter configuration": [""],
       "Error while fetching data": [""],
       "No results found": [""],
+      "%s option(s)": [""],
       "Invalid lat/long configuration.": [""],
       "Reverse lat/long ": [""],
       "Longitude & Latitude columns": [""],
@@ -1607,7 +1588,7 @@
       "Geohash": [""],
       "textarea": [""],
       "in modal": [""],
-      "Time Series Columns": [""],
+      "Time series columns": [""],
       "This visualization type is not supported.": [""],
       "Click to change visualization type": [""],
       "Select a visualization type": [""],
@@ -1617,18 +1598,43 @@
       "CANCEL": [""],
       "APPLY": [""],
       "Edit time range": [""],
-      "Configure Advanced Time Range": [""],
+      "Configure advanced time range": [""],
       "START": [""],
       "END": [""],
       "Configure Time Range: Previous...": [""],
       "Configure Time Range: Last...": [""],
-      "Configure Custom Time Range": [""],
+      "Configure custom time range": [""],
       "Relative quantity": [""],
-      "ANCHOR TO": [""],
+      "Anchor to": [""],
       "NOW": [""],
       "Date/Time": [""],
+      "Simple": [""],
+      "Custom SQL": [""],
+      "No such column found. To filter on a metric, try the Custom SQL tab.": [
+        ""
+      ],
+      "%s column(s) and metric(s)": [""],
+      "%s column(s)": [""],
+      "To filter on a metric, use Custom SQL tab.": [""],
+      "%s operators(s)": [""],
+      "Type a value here": [""],
+      "Filter value (case sensitive)": [""],
+      "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              ": [
+        ""
+      ],
+      "%s aggregates(s)": [""],
+      "%s saved metric(s)": [""],
+      "Saved": [""],
+      "Saved metric": [""],
+      "column": [""],
+      "aggregate": [""],
+      "My metric": [""],
+      "Add metric": [""],
       "Code": [""],
-      "Markup Type": [""],
+      "Markup type": [""],
       "Pick your favorite markup language": [""],
       "Put your code here": [""],
       "Query": [""],
@@ -1638,26 +1644,26 @@
       ],
       "Time": [""],
       "Time related form attributes": [""],
-      "Chart Type": [""],
+      "Chart type": [""],
       "Chart ID": [""],
       "The id of the active chart": [""],
       "Cache Timeout (seconds)": [""],
       "The number of seconds before expiring the cache": [""],
-      "URL Parameters": [""],
+      "URL parameters": [""],
       "Extra parameters for use in jinja templated queries": [""],
       "Time range endpoints": [""],
       "Time range endpoints (SIP-15)": [""],
-      "Annotations and Layers": [""],
-      "Sort Descending": [""],
+      "Annotations and layers": [""],
+      "Sort descending": [""],
       "Whether to sort descending or ascending": [""],
       "Contribution": [""],
       "Compute the contribution to the total": [""],
-      "Advanced Analytics": [""],
+      "Advanced analytics": [""],
       "This section contains options that allow for advanced analytical post processing of query results": [
         ""
       ],
-      "Rolling Window": [""],
-      "Rolling Function": [""],
+      "Rolling window": [""],
+      "Rolling function": [""],
       "Defines a rolling window function to apply, works along with the [Periods] text box": [
         ""
       ],
@@ -1665,12 +1671,12 @@
       "Defines the size of the rolling window function, relative to the time granularity selected": [
         ""
       ],
-      "Min Periods": [""],
+      "Min 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": [
         ""
       ],
-      "Time Comparison": [""],
-      "Time Shift": [""],
+      "Time comparison": [""],
+      "Time shift": [""],
       "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.": [
         ""
       ],
@@ -1678,14 +1684,14 @@
       "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.": [
         ""
       ],
-      "Python Functions": [""],
+      "Python functions": [""],
       "Rule": [""],
       "Pandas resample rule": [""],
       "Method": [""],
       "Pandas resample method": [""],
       "Favorites": [""],
-      "Created Content": [""],
-      "Recent Activity": [""],
+      "Created content": [""],
+      "Recent activity": [""],
       "Security & Access": [""],
       "No charts": [""],
       "No dashboards": [""],
@@ -1703,13 +1709,13 @@
       "reports": [""],
       "alerts": [""],
       "There was an issue deleting the selected %s: %s": [""],
-      "Last Run": [""],
-      "Notification Method": [""],
-      "Execution Log": [""],
+      "Last run": [""],
+      "Notification method": [""],
+      "Execution log": [""],
       "Actions": [""],
-      "Bulk Select": [""],
+      "Bulk select": [""],
       "No %s yet": [""],
-      "Created By": [""],
+      "Created by": [""],
       "An error occurred while fetching created by values: %s": [""],
       "Status": [""],
       "${AlertState.success}": [""],
@@ -1717,6 +1723,7 @@
       "${AlertState.error}": [""],
       "${AlertState.noop}": [""],
       "${AlertState.grace}": [""],
+      "Alerts & reports": [""],
       "Reports": [""],
       "This action will permanently delete %s.": [""],
       "Delete %s?": [""],
@@ -1726,9 +1733,9 @@
       "> (Larger than)": [""],
       "<= (Smaller or equal)": [""],
       ">= (Larger or equal)": [""],
-      "== (Is Equal)": [""],
-      "!= (Is Not Equal)": [""],
-      "Not Null": [""],
+      "== (Is equal)": [""],
+      "!= (Is not equal)": [""],
+      "Not null": [""],
       "30 days": [""],
       "60 days": [""],
       "90 days": [""],
@@ -1738,39 +1745,41 @@
       "Add": [""],
       "Edit ${isReport ? 'Report' : 'Alert'}": [""],
       "Add ${isReport ? 'Report' : 'Alert'}": [""],
-      "Report Name": [""],
-      "Alert Name": [""],
-      "Alert Condition": [""],
+      "Report name": [""],
+      "Alert name": [""],
+      "Alert condition": [""],
       "Trigger Alert If...": [""],
       "Value": [""],
-      "Report Schedule": [""],
-      "Alert Condition Schedule": [""],
-      "Schedule Settings": [""],
-      "Log Retention": [""],
-      "Working Timeout": [""],
+      "Report schedule": [""],
+      "Alert condition schedule": [""],
+      "Schedule settings": [""],
+      "Log retention": [""],
+      "Working timeout": [""],
       "Time in seconds": [""],
-      "Grace Period": [""],
-      "Message Content": [""],
+      "Grace period": [""],
+      "Message content": [""],
       "log": [""],
       "State": [""],
       "Scheduled at": [""],
-      "Start At": [""],
+      "Start at": [""],
       "Duration": [""],
+      "Error message": [""],
       "${alertResource?.type}": [""],
-      "CRON Expression": [""],
-      "Report Sent": [""],
-      "Alert Triggered, Notification Sent": [""],
-      "Report Sending": [""],
-      "Alert Running": [""],
-      "Report Failed": [""],
-      "Alert Failed": [""],
-      "Nothing Triggered": [""],
+      "CRON expression": [""],
+      "Report sent": [""],
+      "Alert triggered, notification sent": [""],
+      "Report sending": [""],
+      "Alert running": [""],
+      "Report failed": [""],
+      "Alert failed": [""],
+      "Nothing triggered": [""],
       "Alert Triggered, In Grace Period": [""],
       "${RecipientIconName.email}": [""],
       "${RecipientIconName.slack}": [""],
       "annotation": [""],
       "There was an issue deleting the selected annotations: %s": [""],
-      "Delete Annotation": [""],
+      "Edit annotation": [""],
+      "Delete annotation": [""],
       "Annotation": [""],
       "No annotation yet": [""],
       "Annotation Layer ${annotationLayerName}": [""],
@@ -1779,25 +1788,26 @@
       ],
       "Delete Annotation?": [""],
       "Are you sure you want to delete the selected annotations?": [""],
-      "annotation name": [""],
+      "Add annotation": [""],
+      "Annotation name": [""],
       "date": [""],
-      "Additional Information": [""],
+      "Additional information": [""],
       "Description (this can be seen in the list)": [""],
-      "json metadata": [""],
       "annotation_layer": [""],
-      "Edit Annotation Layer Properties": [""],
-      "annotation layer name": [""],
-      "annotation layers": [""],
+      "Edit annotation layer properties": [""],
+      "Annotation layer name": [""],
+      "Annotation layers": [""],
       "There was an issue deleting the selected layers: %s": [""],
+      "Last modified": [""],
+      "Created on": [""],
       "Edit template": [""],
       "Delete template": [""],
-      "Annotation Layer": [""],
+      "Annotation layer": [""],
       "An error occurred while fetching dataset datasource values: %s": [""],
       "No annotation layers yet": [""],
       "This action will permanently delete the layer.": [""],
       "Delete Layer?": [""],
       "Are you sure you want to delete the selected layers?": [""],
-      "Please Confirm": [""],
       "Are you sure you want to delete": [""],
       "Last modified %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.": [
@@ -1807,24 +1817,25 @@
         ""
       ],
       "There was an issue deleting the selected charts: %s": [""],
-      "Modified By": [""],
+      "Modified by": [""],
       "Owner": [""],
       "An error occurred while fetching chart owners values: %s": [""],
       "An error occurred while fetching chart created by values: %s": [""],
-      "Viz Type": [""],
+      "Viz type": [""],
       "An error occurred while fetching chart dataset values: %s": [""],
       "Favorite": [""],
       "Yes": [""],
       "No": [""],
       "Are you sure you want to delete the selected charts?": [""],
       "css_template": [""],
-      "Edit CSS Template Properties": [""],
-      "css template name": [""],
+      "Edit CSS template properties": [""],
+      "Add CSS template": [""],
+      "CSS template name": [""],
       "css": [""],
-      "css templates": [""],
+      "CSS templates": [""],
       "There was an issue deleting the selected templates: %s": [""],
       "Last modified by %s": [""],
-      "Css Template": [""],
+      "CSS template": [""],
       "This action will permanently delete the template.": [""],
       "Delete Template?": [""],
       "Are you sure you want to delete the selected templates?": [""],
@@ -1850,11 +1861,11 @@
       ],
       "database": [""],
       "An error occurred while fetching database related data: %s": [""],
-      "Asynchronous Query Execution": [""],
+      "Asynchronous query execution": [""],
       "AQE": [""],
-      "Allow Data Manipulation Language": [""],
+      "Allow data manipulation language": [""],
       "DML": [""],
-      "CSV Upload": [""],
+      "CSV upload": [""],
       "Delete database": [""],
       "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.": [
         ""
@@ -1864,29 +1875,35 @@
       "Connection looks good!": [""],
       "ERROR: Connection failed. ": [""],
       "Sorry there was an error fetching database information: %s": [""],
+      "Edit database": [""],
+      "Add database": [""],
       "Connection": [""],
-      "Database Name": [""],
+      "Database name": [""],
       "Name your dataset": [""],
       "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.": [
         ""
       ],
-      "SQL Lab Settings": [""],
+      "SQL Lab settings": [""],
       "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...)": [
         ""
       ],
+      "Allow multi schema metadata fetch": [""],
+      "CTAS schema": [""],
       "When allowing CREATE TABLE AS option in SQL Lab, this option forces the table to be created in this schema.": [
         ""
       ],
+      "Secure extra": [""],
       "JSON string containing additional connection configuration.": [""],
       "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.": [
         ""
       ],
-      "Root Certificate": [""],
       "Optional CA_BUNDLE contents to validate HTTPS requests. Only available on certain database engines.": [
         ""
       ],
@@ -1894,7 +1911,7 @@
       "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.": [
         ""
       ],
-      "Allow Data Upload": [""],
+      "Allow data upload": [""],
       "If selected, please set the schemas allowed for data upload in Extra.": [
         ""
       ],
@@ -1915,7 +1932,7 @@
         ""
       ],
       "Error while saving dataset: %s": [""],
-      "Add Dataset": [""],
+      "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.": [
         ""
       ],
@@ -1924,8 +1941,8 @@
       ],
       "An error occurred while fetching dataset related data": [""],
       "An error occurred while fetching dataset related data: %s": [""],
-      "Physical Dataset": [""],
-      "Virtual Dataset": [""],
+      "Physical dataset": [""],
+      "Virtual dataset": [""],
       "An error occurred while fetching dataset owner values: %s": [""],
       "An error occurred while fetching datasets: %s": [""],
       "An error occurred while fetching schema values: %s": [""],
@@ -1946,30 +1963,29 @@
       "Offline": [""],
       "Scheduled": [""],
       "Duration: %s": [""],
-      "Tab Name": [""],
+      "Tab name": [""],
       "TABLES": [""],
       "Rows": [""],
       "Open query in SQL Lab": [""],
       "An error occurred while fetching database values: %s": [""],
-      "Time Range": [""],
       "Search by query text": [""],
-      "Query Preview": [""],
+      "Query preview": [""],
       "Previous": [""],
       "Next": [""],
       "Open in 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": [""],
-      "Query preview": [""],
       "Edit query": [""],
       "Copy query URL": [""],
       "Delete query": [""],
       "This action will permanently delete the saved query.": [""],
       "Delete Query?": [""],
       "Are you sure you want to delete the selected queries?": [""],
-      "Query Name": [""],
+      "Query name": [""],
       "Edited": [""],
       "Created": [""],
       "Viewed": [""],
@@ -1987,12 +2003,11 @@
       "Recently edited charts, dashboards, and saved queries will appear here": [
         ""
       ],
-      "SQL QUERY": [""],
       "${tableName\n                        .split('')\n                        .slice(0, tableName.length - 1)\n                        .join('')}\n                    ": [
         ""
       ],
       "You don't have any favorites yet!": [""],
-      "SQL LAB QUERIES": [""],
+      "SQL Lab queries": [""],
       "${tableName}": [""],
       "query": [""],
       "Share": [""],
@@ -2000,24 +2015,24 @@
       "Recents": [""],
       "Select start and end date": [""],
       "Type or Select [%s]": [""],
-      "Filter Box": [""],
-      "Filters Configuration": [""],
+      "Filter box": [""],
+      "Filters configuration": [""],
       "Filter configuration for the filter box": [""],
-      "Date Filter": [""],
+      "Date filter": [""],
       "Whether to include a time filter": [""],
-      "Instant Filtering": [""],
+      "Instant filtering": [""],
       "Check to apply filters instantly as they change instead of displaying [Apply] button": [
         ""
       ],
-      "Show SQL Granularity Dropdown": [""],
-      "Check to include SQL Granularity dropdown": [""],
-      "Show SQL Time Column": [""],
-      "Check to include Time Column dropdown": [""],
-      "Show Druid Granularity Dropdown": [""],
-      "Check to include Druid Granularity dropdown": [""],
-      "Show Druid Time Origin": [""],
-      "Check to include Time Origin dropdown": [""],
-      "Limit Selector Values": [""],
+      "Show SQL granularity dropdown": [""],
+      "Check to include SQL granularity dropdown": [""],
+      "Show SQL time column": [""],
+      "Check to include time column dropdown": [""],
+      "Show Druid granularity dropdown": [""],
+      "Check to include Druid granularity dropdown": [""],
+      "Show Druid time origin": [""],
+      "Check to include time origin dropdown": [""],
+      "Limit selector values": [""],
       "These filters apply to the values available in the dropdowns": [""],
       "Time-series Table": [""]
     }
diff --git a/superset/translations/en/LC_MESSAGES/messages.po b/superset/translations/en/LC_MESSAGES/messages.po
index f8b4c94..7158ff0 100644
--- a/superset/translations/en/LC_MESSAGES/messages.po
+++ b/superset/translations/en/LC_MESSAGES/messages.po
@@ -17,22 +17,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-19 07:47-0300\n"
+"POT-Creation-Date: 2021-01-22 15:56-0300\n"
 "PO-Revision-Date: 2016-05-02 08:49-0700\n"
 "Last-Translator: FULL NAME <EM...@ADDRESS>\n"
-"Language: en\n"
 "Language-Team: en <LL...@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "Generated-By: Babel 2.8.0\n"
 
 #: superset/app.py:225
 msgid "Home"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:339
 #: superset/app.py:230 superset/views/annotations.py:119
 msgid "Annotation Layers"
 msgstr ""
@@ -48,8 +47,8 @@ msgstr ""
 msgid "Databases"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:245
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:250
+#: 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
@@ -81,7 +80,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:240
 #: superset/app.py:283 superset/views/css_templates.py:38
 msgid "CSS Templates"
 msgstr ""
@@ -107,13 +105,10 @@ msgstr ""
 msgid "SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:87
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:145 superset/app.py:352
+#: superset/app.py:352
 msgid "Saved Queries"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:180
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:100
 #: superset/app.py:359
 msgid "Query History"
 msgstr ""
@@ -142,7 +137,7 @@ msgstr ""
 msgid "Alerts"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:411 superset/app.py:448
+#: superset/app.py:448
 msgid "Alerts & Reports"
 msgstr ""
 
@@ -417,152 +412,152 @@ msgstr ""
 msgid "Pick at least one field for [Series]"
 msgstr ""
 
-#: superset/viz.py:1701 superset/viz_sip38.py:1659
+#: superset/viz.py:1702 superset/viz_sip38.py:1659
 msgid "Sunburst"
 msgstr ""
 
-#: superset/viz.py:1747 superset/viz_sip38.py:1703
+#: superset/viz.py:1748 superset/viz_sip38.py:1703
 msgid "Sankey"
 msgstr ""
 
-#: superset/viz.py:1755
+#: superset/viz.py:1756
 msgid "Pick exactly 2 columns as [Source / Target]"
 msgstr ""
 
-#: superset/viz.py:1799 superset/viz_sip38.py:1736
+#: superset/viz.py:1800 superset/viz_sip38.py:1736
 msgid ""
 "There's a loop in your Sankey, please provide a tree. Here's a faulty link: "
 "{}"
 msgstr ""
 
-#: superset/viz.py:1812 superset/viz.py:1835 superset/viz_sip38.py:1749
+#: superset/viz.py:1813 superset/viz.py:1836 superset/viz_sip38.py:1749
 #: superset/viz_sip38.py:1770
 msgid "Directed Force Layout"
 msgstr ""
 
-#: superset/viz.py:1819 superset/viz_sip38.py:1756
+#: superset/viz.py:1820 superset/viz_sip38.py:1756
 msgid "Pick exactly 2 columns to 'Group By'"
 msgstr ""
 
-#: superset/viz.py:1868 superset/viz_sip38.py:1802
+#: superset/viz.py:1869 superset/viz_sip38.py:1802
 msgid "Country Map"
 msgstr ""
 
-#: superset/viz.py:1897 superset/viz_sip38.py:1823
+#: superset/viz.py:1898 superset/viz_sip38.py:1823
 msgid "World Map"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:438
-#: superset-frontend/src/explore/controls.jsx:467 superset/viz.py:1955
+#: superset-frontend/src/explore/controls.jsx:467 superset/viz.py:1956
 #: superset/viz_sip38.py:1873
 msgid "Filters"
 msgstr ""
 
-#: superset/viz.py:1973 superset/viz_sip38.py:1891
+#: superset/viz.py:1974 superset/viz_sip38.py:1891
 msgid "Invalid filter configuration, please select a column"
 msgstr ""
 
-#: superset/viz.py:2017 superset/viz_sip38.py:1952
+#: superset/viz.py:2018 superset/viz_sip38.py:1952
 msgid "Parallel Coordinates"
 msgstr ""
 
-#: superset/viz.py:2039 superset/viz_sip38.py:1968
+#: superset/viz.py:2040 superset/viz_sip38.py:1968
 msgid "Heatmap"
 msgstr ""
 
-#: superset/viz.py:2095 superset/viz_sip38.py:2017
+#: superset/viz.py:2096 superset/viz_sip38.py:2017
 msgid "Horizon Charts"
 msgstr ""
 
-#: superset/viz.py:2107 superset/viz_sip38.py:2029
+#: superset/viz.py:2108 superset/viz_sip38.py:2029
 msgid "Mapbox"
 msgstr ""
 
-#: superset/viz.py:2119 superset/viz_sip38.py:2041
+#: superset/viz.py:2120 superset/viz_sip38.py:2041
 msgid "[Longitude] and [Latitude] must be set"
 msgstr ""
 
-#: superset/viz.py:2126 superset/viz_sip38.py:2048
+#: superset/viz.py:2127 superset/viz_sip38.py:2048
 msgid "Must have a [Group By] column to have 'count' as the [Label]"
 msgstr ""
 
-#: superset/viz.py:2146 superset/viz_sip38.py:2068
+#: superset/viz.py:2147 superset/viz_sip38.py:2068
 msgid "Choice of [Label] must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2154 superset/viz_sip38.py:2075
+#: superset/viz.py:2155 superset/viz_sip38.py:2075
 msgid "Choice of [Point Radius] must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2162 superset/viz_sip38.py:2082
+#: superset/viz.py:2163 superset/viz_sip38.py:2082
 msgid "[Longitude] and [Latitude] columns must be present in [Group By]"
 msgstr ""
 
-#: superset/viz.py:2242 superset/viz_sip38.py:2162
+#: superset/viz.py:2243 superset/viz_sip38.py:2162
 msgid "Deck.gl - Multiple Layers"
 msgstr ""
 
-#: superset/viz.py:2282 superset/viz.py:2314 superset/viz_sip38.py:2218
+#: superset/viz.py:2283 superset/viz.py:2315 superset/viz_sip38.py:2218
 msgid "Bad spatial key"
 msgstr ""
 
-#: superset/viz.py:2300 superset/viz_sip38.py:2204
+#: superset/viz.py:2301 superset/viz_sip38.py:2204
 #, python-format
 msgid "Invalid spatial point encountered: %s"
 msgstr ""
 
-#: superset/viz.py:2336 superset/viz_sip38.py:2240
+#: superset/viz.py:2337 superset/viz_sip38.py:2240
 msgid ""
 "Encountered invalid NULL spatial "
 "entry,                                        please consider filtering "
 "those out"
 msgstr ""
 
-#: superset/viz.py:2426 superset/viz_sip38.py:2311
+#: superset/viz.py:2427 superset/viz_sip38.py:2311
 msgid "Deck.gl - Scatter plot"
 msgstr ""
 
-#: superset/viz.py:2475 superset/viz_sip38.py:2358
+#: superset/viz.py:2476 superset/viz_sip38.py:2358
 msgid "Deck.gl - Screen Grid"
 msgstr ""
 
-#: superset/viz.py:2501 superset/viz_sip38.py:2384
+#: superset/viz.py:2502 superset/viz_sip38.py:2384
 msgid "Deck.gl - 3D Grid"
 msgstr ""
 
-#: superset/viz.py:2531 superset/viz_sip38.py:2411
+#: superset/viz.py:2532 superset/viz_sip38.py:2411
 msgid "Deck.gl - Paths"
 msgstr ""
 
-#: superset/viz.py:2579 superset/viz_sip38.py:2456
+#: superset/viz.py:2580 superset/viz_sip38.py:2456
 msgid "Deck.gl - Polygon"
 msgstr ""
 
-#: superset/viz.py:2608 superset/viz_sip38.py:2485
+#: superset/viz.py:2609 superset/viz_sip38.py:2485
 msgid "Deck.gl - 3D HEX"
 msgstr ""
 
-#: superset/viz.py:2627 superset/viz_sip38.py:2501
+#: superset/viz.py:2628 superset/viz_sip38.py:2501
 msgid "Deck.gl - GeoJSON"
 msgstr ""
 
-#: superset/viz.py:2646 superset/viz_sip38.py:2513
+#: superset/viz.py:2647 superset/viz_sip38.py:2513
 msgid "Deck.gl - Arc"
 msgstr ""
 
-#: superset/viz.py:2681 superset/viz_sip38.py:2548
+#: superset/viz.py:2682 superset/viz_sip38.py:2548
 msgid "Event flow"
 msgstr ""
 
-#: superset/viz.py:2713 superset/viz_sip38.py:2580
+#: superset/viz.py:2714 superset/viz_sip38.py:2580
 msgid "Time Series - Paired t-test"
 msgstr ""
 
-#: superset/viz.py:2768 superset/viz_sip38.py:2635
+#: superset/viz.py:2769 superset/viz_sip38.py:2635
 msgid "Time Series - Nightingale Rose Chart"
 msgstr ""
 
-#: superset/viz.py:2803 superset/viz_sip38.py:2670
+#: superset/viz.py:2804 superset/viz_sip38.py:2670
 msgid "Partition Diagram"
 msgstr ""
 
@@ -678,7 +673,11 @@ msgid_plural "Deleted %(num)d charts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: superset/charts/api.py:566 superset/charts/api.py:638
+#: superset/charts/api.py:563
+msgid "Request is not JSON"
+msgstr ""
+
+#: superset/charts/api.py:571 superset/charts/api.py:643
 #, python-format
 msgid "Request is incorrect: %(error)s"
 msgstr ""
@@ -804,7 +803,7 @@ msgstr ""
 msgid "Unsupported extraction function: "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:988
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:994
 #: superset-frontend/src/explore/components/DatasourcePanel.tsx:231
 #: superset-frontend/src/explore/controls.jsx:251
 #: superset/connectors/druid/views.py:56 superset/connectors/sqla/views.py:63
@@ -824,7 +823,7 @@ msgid "Edit Druid Column"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx:31
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:204
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:209
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:137
 #: superset-frontend/src/explore/components/controls/SpatialControl.jsx:193
 #: superset/connectors/druid/views.py:77 superset/connectors/sqla/views.py:134
@@ -838,7 +837,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:163
+#: 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,7 +856,7 @@ msgid ""
 "Whether this column is exposed in the `Filters` section of the explore view."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:977
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:983
 #: superset-frontend/src/explore/components/DatasourcePanel.tsx:218
 #: superset-frontend/src/explore/controls.jsx:153
 #: superset/connectors/druid/views.py:143 superset/connectors/sqla/views.py:193
@@ -876,7 +875,7 @@ msgstr ""
 msgid "Edit Druid Metric"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:831
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:836
 #: 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
@@ -885,11 +884,11 @@ msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:128
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:161
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:151
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:155
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:513
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:845
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:849
+#: 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
@@ -909,7 +908,7 @@ msgstr ""
 msgid "Verbose Name"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:735
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:740
 #: superset/connectors/druid/views.py:175 superset/views/log/__init__.py:33
 msgid "JSON"
 msgstr ""
@@ -918,8 +917,6 @@ msgstr ""
 msgid "Druid Datasource"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:861
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:869
 #: superset/connectors/druid/views.py:177 superset/connectors/sqla/views.py:244
 msgid "Warning Message"
 msgstr ""
@@ -960,8 +957,6 @@ msgstr ""
 msgid "Broker Endpoint"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:597
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:238
 #: superset/connectors/druid/views.py:221
 #: superset/connectors/druid/views.py:331 superset/connectors/sqla/views.py:459
 #: superset/views/chart/mixin.py:77
@@ -1051,7 +1046,7 @@ msgid "Cluster"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:358
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:567
+#: 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
@@ -1202,11 +1197,11 @@ msgstr ""
 msgid "Expression"
 msgstr ""
 
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:212
 #: superset/connectors/sqla/views.py:141
 msgid "Is temporal"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:170
 #: superset/connectors/sqla/views.py:142
 msgid "Datetime Format"
 msgstr ""
@@ -1227,18 +1222,15 @@ msgstr ""
 msgid "Edit Metric"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:130
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:833
 #: superset/connectors/sqla/views.py:240
 msgid "SQL Expression"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:855
 #: superset/connectors/sqla/views.py:242
 msgid "D3 Format"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:549
+#: 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
@@ -1364,7 +1356,7 @@ msgstr ""
 msgid "Whether the table was generated by the 'Visualize' flow in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:612
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:617
 #: superset/connectors/sqla/views.py:431
 msgid ""
 "A set of parameters that become available in the query using Jinja "
@@ -1427,7 +1419,8 @@ msgstr ""
 msgid "SQL Lab View"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:611
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:125
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:616
 #: superset/connectors/sqla/views.py:466
 msgid "Template parameters"
 msgstr ""
@@ -1571,7 +1564,7 @@ msgstr ""
 msgid "A database with the same name already exists"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:184
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:169
 #: superset/databases/commands/exceptions.py:49
 msgid "Field is required"
 msgstr ""
@@ -1872,7 +1865,7 @@ msgstr ""
 msgid "An error occurred while pruning logs "
 msgstr ""
 
-#: superset/reports/notifications/email.py:59 superset/tasks/schedules.py:182
+#: superset/reports/notifications/email.py:59 superset/tasks/schedules.py:185
 #, python-format
 msgid ""
 "\n"
@@ -1881,8 +1874,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: superset/reports/notifications/email.py:70 superset/tasks/schedules.py:291
-#: superset/tasks/schedules.py:460
+#: superset/reports/notifications/email.py:70 superset/tasks/schedules.py:294
+#: superset/tasks/schedules.py:463
 #, python-format
 msgid "%(prefix)s %(title)s"
 msgstr ""
@@ -1897,7 +1890,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: superset/tasks/schedules.py:157
+#: superset/tasks/schedules.py:160
 #, python-format
 msgid ""
 "\n"
@@ -1907,17 +1900,17 @@ msgid ""
 "        "
 msgstr ""
 
-#: superset/tasks/schedules.py:169 superset/tasks/schedules.py:360
+#: superset/tasks/schedules.py:172 superset/tasks/schedules.py:363
 #, python-format
 msgid "<b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>"
 msgstr ""
 
-#: superset/tasks/schedules.py:359
+#: superset/tasks/schedules.py:362
 #, python-format
 msgid "%(name)s.csv"
 msgstr ""
 
-#: superset/tasks/schedules.py:367
+#: superset/tasks/schedules.py:370
 #, python-format
 msgid ""
 "\n"
@@ -1927,7 +1920,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: superset/tasks/schedules.py:654
+#: superset/tasks/schedules.py:656
 #, python-format
 msgid "[Alert] %(label)s"
 msgstr ""
@@ -1936,7 +1929,6 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: superset-frontend/src/components/Menu/NewMenu.tsx:26
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1144
 #: superset/templates/appbuilder/navbar_right.html:38
 msgid "SQL Query"
@@ -2047,13 +2039,13 @@ msgid "Request Permissions"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:176
-#: superset-frontend/src/common/components/Modal/Modal.tsx:144
+#: 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:437
-#: superset-frontend/src/datasource/DatasourceModal.tsx:211
+#: 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:169
+#: superset-frontend/src/explore/components/SaveModal.tsx:174
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:749
 #: superset/templates/superset/request_access.html:34
 msgid "Cancel"
@@ -2063,7 +2055,6 @@ msgstr ""
 msgid "Use the edit buttom to change this field"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:399
 #: superset/templates/superset/models/database/macros.html:22
 msgid "Test Connection"
 msgstr ""
@@ -2191,9 +2182,6 @@ msgstr ""
 msgid "Roles to grant"
 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/views/access_requests.py:45 superset/views/schedules.py:224
 #: superset/views/schedules.py:287
 msgid "Created On"
@@ -2207,7 +2195,6 @@ msgstr ""
 msgid "Show Observation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:127
 #: superset/views/alerts.py:67
 msgid "Error Message"
 msgstr ""
@@ -2252,13 +2239,10 @@ msgstr ""
 msgid "Show Annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
 #: superset/views/annotations.py:62
 msgid "Add Annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:180
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
 #: superset/views/annotations.py:63
 msgid "Edit Annotation"
 msgstr ""
@@ -2268,10 +2252,10 @@ msgid "Layer"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:148
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:141
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:145
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:832
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:840
+#: 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/views/annotations.py:79 superset/views/sql_lab.py:70
@@ -2288,7 +2272,6 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:400
 #: superset/views/annotations.py:83 superset/views/dashboard/mixin.py:82
 msgid "JSON Metadata"
 msgstr ""
@@ -2297,14 +2280,10 @@ msgstr ""
 msgid "Show 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
 #: superset/views/annotations.py:121
 msgid "Add Annotation Layer"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:166
 #: superset/views/annotations.py:122
 msgid "Edit Annotation Layer"
 msgstr ""
@@ -2547,7 +2526,6 @@ msgstr ""
 msgid "Show CSS Template"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:237
 #: superset/views/css_templates.py:40
 msgid "Add CSS Template"
 msgstr ""
@@ -2669,11 +2647,11 @@ msgstr ""
 msgid "Changed on"
 msgstr ""
 
-#: superset/views/utils.py:485
+#: superset/views/utils.py:492
 msgid "Could not determine datasource type"
 msgstr ""
 
-#: superset/views/utils.py:501
+#: superset/views/utils.py:508
 msgid "Could not find viz object"
 msgstr ""
 
@@ -2702,10 +2680,6 @@ msgid ""
 "defaults to the datasource/table timeout if undefined."
 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/views/chart/mixin.py:82
 msgid "Last Modified"
 msgstr ""
@@ -2714,7 +2688,6 @@ msgstr ""
 msgid "Parameters"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:220
 #: superset/views/chart/mixin.py:88
 msgid "Visualization Type"
 msgstr ""
@@ -3000,12 +2973,10 @@ msgstr ""
 msgid "Show Database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
 #: superset/views/database/mixins.py:34
 msgid "Add Database"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
 #: superset/views/database/mixins.py:35
 msgid "Edit Database"
 msgstr ""
@@ -3096,8 +3067,6 @@ msgstr ""
 msgid "Allow DML"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:533
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:539
 #: superset/views/database/mixins.py:189
 msgid "CTAS Schema"
 msgstr ""
@@ -3107,19 +3076,16 @@ msgstr ""
 msgid "SQLAlchemy URI"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:417
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:423
 #: superset/views/database/mixins.py:194
 msgid "Chart Cache Timeout"
 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/views/database/mixins.py:196
 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
 msgid "Root certificate"
 msgstr ""
@@ -3136,7 +3102,6 @@ msgstr ""
 msgid "Allow Csv Upload"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:521
 #: superset/views/database/mixins.py:202
 msgid "Allow Multi Schema Metadata Fetch"
 msgstr ""
@@ -3246,186 +3211,186 @@ msgstr ""
 msgid "dttm"
 msgstr ""
 
-#: superset-frontend/src/CRUD/CollectionTable.tsx:294
-msgid "Add Item"
+#: superset-frontend/src/CRUD/CollectionTable.tsx:317
+msgid "Add item"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/actions/sqlLab.js:103
 msgid "The query couldn't be loaded"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:155
-msgid "Your query was saved"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:158
-msgid "Your query could not be saved"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:173
-msgid "Your query was updated"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:175
-msgid "Your query could not be updated"
-msgstr ""
-
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:190
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:156
 msgid ""
 "Your query has been scheduled. To see details of your query, navigate to "
-"Saved Queries"
+"Saved queries"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:197
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:163
 msgid "Your query could not be scheduled"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:225
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:332
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:191
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:298
 msgid "Failed at retrieving results"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:263
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:289
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:229
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:255
 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:376
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:409
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:342
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:375
 msgid "Unknown error"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:427
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:393
 msgid "Query was stopped."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:456
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:422
 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:474
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:440
 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:520
+#: 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."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:553
+#: 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:570
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:536
 #: superset-frontend/src/SqlLab/reducers/sqlLab.js:74
 #, python-format
 msgid "Copy of %s"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:597
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:563
 msgid ""
 "An error occurred while setting the active tab. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:683
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:649
 msgid "An error occurred while fetching tab state"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:711
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:677
 msgid ""
 "An error occurred while removing tab. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:735
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:701
 msgid ""
 "An error occurred while removing query. Please contact your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:758
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:724
 msgid ""
 "An error occurred while setting the tab database ID. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:783
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:749
 msgid ""
 "An error occurred while setting the tab schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:816
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:782
 msgid ""
 "An error occurred while setting the tab autorun. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:841
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:895
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:807
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:899
 msgid ""
 "An error occurred while setting the tab title. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:864
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:829
+msgid "Your query was saved"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:833
+msgid "Your query could not be saved"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:845
+msgid "Your query was updated"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:849
+msgid "Your query could not be updated"
+msgstr ""
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:868
 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:924
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:928
 msgid ""
 "An error occurred while setting the tab template parameters. Please contact "
 "your administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:985
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1010
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:989
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1014
 msgid "An error occurred while fetching table metadata"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1051
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1055
 msgid ""
 "An error occurred while fetching table metadata. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1099
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1103
 msgid ""
 "An error occurred while expanding the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1123
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1127
 msgid ""
 "An error occurred while collapsing the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1146
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1150
 msgid ""
 "An error occurred while removing the table schema. Please contact your "
 "administrator."
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1179
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1183
 msgid "Shared query"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1241
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1245
 msgid "The datasource couldn't be loaded"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1271
-#: superset-frontend/src/SqlLab/actions/sqlLab.js:1293
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1275
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1297
 msgid "An error occurred while creating the data source"
 msgstr ""
 
@@ -3442,15 +3407,15 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:85
-msgid "Estimate Selected Query Cost"
+msgid "Estimate selected query cost"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:86
-msgid "Estimate Cost"
+msgid "Estimate cost"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:90
-msgid "Cost Estimate"
+msgid "Cost estimate"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:73
@@ -3524,7 +3489,7 @@ msgid "Source SQL"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/HighlightedSql.jsx:108
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:714
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:719
 #: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:301
 msgid "SQL"
 msgstr ""
@@ -3581,7 +3546,8 @@ msgid "Edit"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/QueryTable.jsx:147
-msgid "view results"
+#: superset-frontend/src/explore/components/DataTablesPane.tsx:258
+msgid "View results"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/QueryTable.jsx:150
@@ -3613,11 +3579,11 @@ msgid "Clipboard"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:469
-msgid "Filter Results"
+msgid "Filter results"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:501
-msgid "Database Error"
+msgid "Database error"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:525
@@ -3637,11 +3603,11 @@ msgid "Fetch data preview"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:605
-msgid "Refetch Results"
+msgid "Refetch results"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ResultSet.tsx:626
-msgid "Track Job"
+msgid "Track job"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:46
@@ -3650,7 +3616,7 @@ msgid "Stop"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:51
-msgid "Run Selection"
+msgid "Run selection"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:53
@@ -3687,13 +3653,13 @@ msgstr ""
 #: 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:440
-#: superset-frontend/src/datasource/DatasourceModal.tsx:204
-#: superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx:210
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:430
+#: 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:192
+#: 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
@@ -3709,11 +3675,11 @@ msgid "Save as"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:172
-msgid "Save Query"
+msgid "Save query"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:184
-msgid "Save As New"
+msgid "Save as new"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:193
@@ -3729,7 +3695,7 @@ msgid "Write a description for your query"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:201
-msgid "Schedule Query"
+msgid "Schedule query"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:211
@@ -3774,8 +3740,14 @@ msgstr ""
 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
 msgid "Run query"
 msgstr ""
 
@@ -3785,7 +3757,7 @@ msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:309
 #: superset-frontend/src/SqlLab/reducers/getInitialState.js:44
-msgid "Untitled Query"
+msgid "Untitled query"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:317
@@ -3821,7 +3793,7 @@ msgid "Estimate the cost before running a query"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:159
-msgid "Reset State"
+msgid "Reset state"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:237
@@ -3914,10 +3886,6 @@ msgstr ""
 msgid ") by using"
 msgstr ""
 
-#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:125
-msgid "Template Parameters"
-msgstr ""
-
 #: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:127
 msgid "Edit template parameters"
 msgstr ""
@@ -4218,7 +4186,7 @@ msgstr ""
 msgid "DEC"
 msgstr ""
 
-#: superset-frontend/src/common/components/Modal/Modal.tsx:127
+#: superset-frontend/src/common/components/Modal/Modal.tsx:128
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:771
 msgid "OK"
 msgstr ""
@@ -4344,6 +4312,7 @@ msgid "You don't have the rights to alter this title."
 msgstr ""
 
 #: superset-frontend/src/components/ErrorBoundary.jsx:51
+#: superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx:26
 msgid "Unexpected error"
 msgstr ""
 
@@ -4355,10 +4324,6 @@ msgstr ""
 msgid "An error occurred while fetching dashboards"
 msgstr ""
 
-#: superset-frontend/src/components/RefreshChartOverlay.tsx:48
-msgid "Run Query"
-msgstr ""
-
 #: superset-frontend/src/components/TableSelector.tsx:170
 msgid "Error while fetching table list"
 msgstr ""
@@ -4391,7 +4356,8 @@ msgid "%s%s"
 msgstr ""
 
 #: superset-frontend/src/components/URLShortLinkModal.tsx:83
-msgid "Share Dashboard"
+#: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:249
+msgid "Share dashboard"
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:46
@@ -4417,28 +4383,24 @@ msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:123
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:139
-msgid "See More"
+msgid "See more"
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:152
-msgid "See Less"
+msgid "See less"
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:181
-msgid "Copy Message"
+msgid "Copy message"
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:189
 #: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:535
-#: superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx:197
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:418
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:197
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:435
 msgid "Close"
 msgstr ""
 
-#: superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx:26
-msgid "Unexpected Error"
-msgstr ""
-
 #: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:60
 msgid "This was triggered by:"
 msgstr ""
@@ -4453,7 +4415,7 @@ msgid "%(suggestion)s instead of \"%(undefinedParameter)s?\""
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:114
-msgid "Parameter Error"
+msgid "Parameter error"
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:47
@@ -4471,11 +4433,11 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:98
-msgid "Timeout Error"
+msgid "Timeout error"
 msgstr ""
 
 #: superset-frontend/src/components/FilterableTable/FilterableTable.tsx:317
-msgid "Cell Content"
+msgid "Cell content"
 msgstr ""
 
 #: superset-frontend/src/components/ImportModal/index.tsx:182
@@ -4510,18 +4472,18 @@ msgid "%s Selected"
 msgstr ""
 
 #: superset-frontend/src/components/ListView/ListView.tsx:348
-msgid "Deselect All"
+msgid "Deselect all"
 msgstr ""
 
 #: superset-frontend/src/components/ListView/ListView.tsx:414
-#: superset-frontend/src/components/TableView/TableView.tsx:173
+#: 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:149
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1037
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:134
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1050
 msgid "Settings"
 msgstr ""
 
@@ -4529,6 +4491,11 @@ msgstr ""
 msgid "About"
 msgstr ""
 
+#: superset-frontend/src/components/Menu/NewMenu.tsx:26
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:114
+msgid "SQL query"
+msgstr ""
+
 #: superset-frontend/src/dashboard/actions/dashboardLayout.js:180
 msgid ""
 "There is not enough space for this component. Try decreasing its width, or "
@@ -4596,7 +4563,8 @@ msgstr ""
 
 #: superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx:56
 #: superset-frontend/src/explore/controlPanels/sections.jsx:78
-msgid "Color Scheme"
+#: superset-frontend/src/explore/controls.jsx:482
+msgid "Color scheme"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/CssEditor.jsx:67
@@ -4608,7 +4576,7 @@ msgid "Load a CSS template"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/CssEditor.jsx:88
-msgid "Live CSS Editor"
+msgid "Live CSS editor"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/Dashboard.jsx:84
@@ -4627,7 +4595,7 @@ 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"
+msgid "Discard changes"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:123
@@ -4635,17 +4603,13 @@ msgid "An error occurred while fetching available CSS templates"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:204
-msgid "Superset Dashboard"
+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:249
-msgid "Share dashboard"
-msgstr ""
-
 #: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:257
 msgid "Refresh dashboard"
 msgstr ""
@@ -4673,7 +4637,7 @@ msgid "Download as image"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx:305
-msgid "Toggle FullScreen"
+msgid "Toggle fullscreen"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/MissingChart.jsx:31
@@ -4688,8 +4652,8 @@ 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:113
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:448
+#: 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"
@@ -4697,7 +4661,7 @@ 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:115
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:107
 msgid "You do not have permission to edit this dashboard"
 msgstr ""
 
@@ -4717,7 +4681,7 @@ msgid "Apply"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:295
-msgid "Dashboard Properties"
+msgid "Dashboard properties"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:324
@@ -4725,11 +4689,11 @@ msgstr ""
 #: 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"
+msgid "Basic information"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:341
-msgid "URL Slug"
+msgid "URL slug"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:351
@@ -4752,10 +4716,15 @@ msgid "Colors"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:394
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:591
+#: 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 "
@@ -4820,7 +4789,7 @@ msgid "24 hours"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:115
-msgid "Refresh Interval"
+msgid "Refresh interval"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:118
@@ -4840,7 +4809,7 @@ msgid "You must pick a name for the new dashboard"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SaveModal.tsx:181
-msgid "Save Dashboard"
+msgid "Save dashboard"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SaveModal.tsx:190
@@ -4883,11 +4852,11 @@ msgid "Fetched %s"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:202
-msgid "Minimize Chart"
+msgid "Minimize chart"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:202
-msgid "Maximize Chart"
+msgid "Maximize chart"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:215
@@ -4899,7 +4868,7 @@ msgid "Toggle chart description"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:231
-msgid "View Chart in Explore"
+msgid "View chart in Explore"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/SliceHeaderControls.jsx:243
@@ -4968,7 +4937,7 @@ msgid ""
 "This markdown component has an error. Please revert your recent changes."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:169
+#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:153
 msgid "Delete dashboard tab?"
 msgstr ""
 
@@ -4992,102 +4961,116 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
+#: superset-frontend/src/dashboard/components/nativeFilters/CancelConfirmationAlert.tsx:92
+msgid "Yes, cancel"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/CancelConfirmationAlert.tsx:100
+msgid "Keep editing"
+msgstr ""
+
 #: superset-frontend/src/dashboard/components/nativeFilters/CascadePopover.tsx:121
-msgid "Select Parent Filters"
+msgid "Select parent filters"
 msgstr ""
 
 #: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:455
-msgid "Reset All"
+msgid "Reset all"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:132
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:117
 msgid "You have removed this filter."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:135
-msgid "Restore Filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:120
+msgid "Restore filter"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:153
-msgid "Filter Name"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:138
+msgid "Filter name"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:155
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:140
 msgid "Name is required"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:164
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:149
 msgid "Datasource is required"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:183
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:168
 msgid "Field"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:196
-msgid "Default Value"
-msgstr ""
-
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:203
-msgid "Parent Filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:180
+msgid "Parent filter"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:209
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:186
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:87
 msgid "None"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:221
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:198
 msgid "Apply changes instantly"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:229
+#: 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/FilterConfigForm.tsx:237
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:214
 msgid "Inverse selection"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:245
+#: 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/FilterConfigForm.tsx:247
-msgid "Scoping"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:464
+msgid "Are you sure you want to cancel?"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:257
-msgid "Apply to all panels"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:465
+msgid "will not be saved."
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:259
-msgid "Apply to specific panels"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:483
+msgid "Filter configuration and scoping"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:267
-msgid "Only selected panels will be affected by this filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:516
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl.jsx:361
+msgid "Add filter"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:268
-msgid "All panels with this column will be affected by this filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:528
+msgid "(Removed)"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:429
-msgid "Filter Configuration and Scoping"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:537
+msgid "Undo?"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:468
-msgid "Add Filter"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:68
+msgid "Scoping"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:480
-msgid "(Removed)"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:83
+msgid "Apply to all panels"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigModal.tsx:489
-msgid "Undo?"
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:85
+msgid "Apply to specific panels"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:91
+msgid "Only selected panels will be affected by this filter"
+msgstr ""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterScope.tsx:92
+msgid "All panels with this column will be affected by this filter"
 msgstr ""
 
 #: superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js:44
@@ -5118,47 +5101,56 @@ msgstr ""
 
 #: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:223
 #: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:162
-msgid "Change Dataset"
+msgid "Change dataset"
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:248
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:250
 msgid "Warning!"
 msgstr ""
 
-#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:258
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:260
 msgid "Search / Filter"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:87
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:91
 msgid "Physical (table or view)"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:88
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:92
 msgid "Virtual (SQL)"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:162
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:205
-msgid "Data Type"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:135
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:838
+msgid "SQL expression"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:167
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:210
+msgid "Data type"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:174
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:175
+msgid "Datetime format"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:179
 msgid "The pattern of timestamp format. For strings use "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:176
-msgid "python datetime string pattern"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:181
+msgid "Python datetime string pattern"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:178
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:183
 msgid " expression which needs to adhere to the "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:180
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:185
 msgid "ISO 8601"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:182
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:187
 msgid ""
 " standard to ensure that the lexicographical ordering\n"
 "                      coincides with the chronological ordering. If the\n"
@@ -5176,77 +5168,73 @@ msgid ""
 "                      database/column name level via the extra parameter."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:206
-msgid "Is Dimension"
-msgstr ""
-
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:207
-msgid "Is Temporal"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:211
+msgid "Is dimension"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:208
-msgid "Is Filterable"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:213
+msgid "Is filterable"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:429
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:434
 #, python-format
 msgid "Modified columns: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:434
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:439
 #, python-format
 msgid "Removed columns: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:439
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:444
 #, python-format
 msgid "New columns added: %s"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:442
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:447
 msgid "Metadata has been synced"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:477
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:482
 #, python-format
 msgid "Column name [%s] is duplicated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:483
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:488
 #, python-format
 msgid "Metric name [%s] is duplicated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:492
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:497
 #, python-format
 msgid "Calculated column [%s] requires an expression"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:507
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:512
 msgid "Basic"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:520
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:525
 msgid "Default URL"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:521
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:526
 msgid "Default URL to redirect to when accessing from the dataset list page"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:528
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:533
 msgid "Autocomplete filters"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:529
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:534
 msgid "Whether to populate autocomplete filters options"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:535
-msgid "Autocomplete Query Predicate"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:540
+msgid "Autocomplete query predicate"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:536
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:541
 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 "
@@ -5255,112 +5243,126 @@ msgid ""
 "filter on a partitioned or indexed time-related field."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:550
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:555
 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.\" } }`."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:568
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:573
 msgid "Owners of the dataset"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:598
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:602
+#: superset-frontend/src/explore/components/PropertiesModal.tsx:238
+msgid "Cache timeout"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:603
 msgid "The duration of time in seconds before the cache is invalidated"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:605
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:610
 msgid "Hours offset"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:627
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:632
 msgid "Spatial"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:679
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:684
 msgid "virtual"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:700
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:707
-msgid "dataset name"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:705
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:712
+msgid "Dataset name"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:715
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:720
 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:738
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:743
 msgid "The JSON metric or post aggregation definition."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:753
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:758
 msgid "Physical"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:783
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:788
 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:802
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:807
 msgid "Click the lock to make changes."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:805
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:810
 msgid "Click the lock to prevent further changes."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:863
-msgid "Warning message to display in the metric selector"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:860
+msgid "D3 format"
 msgstr ""
 
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:866
 #: superset-frontend/src/datasource/DatasourceEditor.jsx:874
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:882
-msgid "Certified By"
+msgid "Warning message"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:876
-msgid "Person or group that has certified this metric"
+#: 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:893
-msgid "Certification Details"
+msgid "Certified by"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:881
+msgid "Person or group that has certified this metric"
+msgstr ""
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:892
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:898
+msgid "Certification details"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:889
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:894
 msgid "Details of the certification"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:957
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:963
 msgid "Be careful."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:958
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:964
 msgid ""
 "Changing these settings will affect all charts using this dataset, including "
 "charts owned by other people."
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:970
+#: 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
 msgid "Source"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1005
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1009
 msgid "Sync columns from source"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:1014
-msgid "Calculated Columns"
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1027
+msgid "Calculated columns"
 msgstr ""
 
 #: superset-frontend/src/datasource/DatasourceModal.tsx:114
@@ -5390,10 +5392,11 @@ msgid "Edit Dataset "
 msgstr ""
 
 #: superset-frontend/src/datasource/DatasourceModal.tsx:193
-msgid "Use Legacy Datasource Editor"
+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 ""
 
@@ -5430,7 +5433,7 @@ msgstr ""
 msgid "One or many metrics to display"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:416
+#: 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
@@ -5439,6 +5442,7 @@ msgid "Dataset"
 msgstr ""
 
 #: superset-frontend/src/explore/controls.jsx:206
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:220
 msgid "Visualization type"
 msgstr ""
 
@@ -5592,10 +5596,6 @@ msgid ""
 "is forced to `.1%`"
 msgstr ""
 
-#: superset-frontend/src/explore/controls.jsx:482
-msgid "Color scheme"
-msgstr ""
-
 #: superset-frontend/src/explore/controls.jsx:486
 msgid "The color scheme for rendering chart"
 msgstr ""
@@ -5604,100 +5604,6 @@ msgstr ""
 msgid "Color map"
 msgstr ""
 
-#: superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx:159
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:329
-msgid "Simple"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx:176
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:382
-msgid "Custom SQL"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:267
-#: superset-frontend/src/explore/components/controls/SelectControl.jsx:237
-#, python-format
-msgid "%s option(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:282
-msgid "No such column found. To filter on a metric, try the Custom SQL tab."
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:291
-#, python-format
-msgid "%s column(s) and metric(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:301
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:265
-#, python-format
-msgid "%s column(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:302
-msgid "To filter on a metric, use Custom SQL tab."
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:307
-#, python-format
-msgid "%s operators(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:326
-msgid "type a value here"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx:385
-msgid "Filter value (case sensitive)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx:92
-msgid "choose WHERE or HAVING..."
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx:127
-msgid "filters by columns"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx:129
-msgid "filters by metrics"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocFilterPopoverTrigger.tsx:94
-msgid ""
-"\n"
-"                This filter was inherited from the dashboard's context.\n"
-"                It won't be saved when saving the chart.\n"
-"              "
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:276
-#, python-format
-msgid "%s aggregates(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:285
-#, python-format
-msgid "%s saved metric(s)"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:332
-msgid "column"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:348
-msgid "aggregate"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:359
-msgid "Saved"
-msgstr ""
-
-#: superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx:362
-msgid "Saved metric"
-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
@@ -5712,7 +5618,7 @@ msgstr ""
 msgid "Changing this control takes effect instantly"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:249
+#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:251
 msgid "Customize"
 msgstr ""
 
@@ -5720,20 +5626,16 @@ msgstr ""
 msgid "rows retrieved"
 msgstr ""
 
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:130
+#: 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:216
+#: superset-frontend/src/explore/components/DataTablesPane.tsx:217
 msgid "No data"
 msgstr ""
 
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:257
-msgid "View results"
-msgstr ""
-
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:260
+#: superset-frontend/src/explore/components/DataTablesPane.tsx:261
 msgid "View samples"
 msgstr ""
 
@@ -5789,12 +5691,12 @@ msgstr ""
 msgid "Edit chart properties"
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:342
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:345
 msgid "Control labeled "
 msgstr ""
 
-#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:446
-msgid "Open Datasource Tab"
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:449
+msgid "Open Datasource tab"
 msgstr ""
 
 #: superset-frontend/src/explore/components/PropertiesModal.tsx:68
@@ -5838,38 +5740,34 @@ msgstr ""
 msgid "Please enter a chart name"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:165
-msgid "Save Chart"
+#: superset-frontend/src/explore/components/SaveModal.tsx:170
+msgid "Save chart"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:180
+#: superset-frontend/src/explore/components/SaveModal.tsx:185
 msgid "Save & go to dashboard"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:191
+#: superset-frontend/src/explore/components/SaveModal.tsx:196
 msgid "Save as new chart"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:220
+#: superset-frontend/src/explore/components/SaveModal.tsx:225
 msgid "Save (Overwrite)"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:230
+#: superset-frontend/src/explore/components/SaveModal.tsx:235
 msgid "Save as ..."
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:235
+#: superset-frontend/src/explore/components/SaveModal.tsx:240
 msgid "Chart name"
 msgstr ""
 
-#: superset-frontend/src/explore/components/SaveModal.tsx:247
+#: superset-frontend/src/explore/components/SaveModal.tsx:252
 msgid "Add to dashboard"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx:361
-msgid "Add filter"
-msgstr ""
-
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:601
 msgid "Display configuration"
 msgstr ""
@@ -5891,11 +5789,11 @@ msgid "Color"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:651
-msgid "Line Width"
+msgid "Line width"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:701
-msgid "Layer Configuration"
+msgid "Layer configuration"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:702
@@ -5908,21 +5806,31 @@ msgid "Mandatory"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:714
-msgid "Hide Layer"
+msgid "Hide layer"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:720
-msgid "Choose the Annotation Layer Type"
+msgid "Choose the annotation layer type"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:721
-msgid "Annotation Layer Type"
+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
 msgid "`Min` value should be numeric or empty"
 msgstr ""
@@ -5940,7 +5848,7 @@ msgid "Max"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:159
-msgid "Edit Dataset"
+msgid "Edit dataset"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DatasourceControl.jsx:163
@@ -5968,7 +5876,7 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:184
-msgid "Sort Metric"
+msgid "Sort metric"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:185
@@ -5976,24 +5884,20 @@ msgid "Metric to sort the results by"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:204
-msgid "Sort Ascending"
+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:215
-msgid "Allow Multiple Selections"
-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"
+msgid "Search all filter options"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:232
@@ -6009,11 +5913,7 @@ 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/MetricsControl.jsx:383
-msgid "Add metric"
+msgid "Filter configuration"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx:45
@@ -6025,6 +5925,12 @@ msgstr ""
 msgid "No results found"
 msgstr ""
 
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:267
+#: superset-frontend/src/explore/components/controls/SelectControl.jsx:237
+#, python-format
+msgid "%s option(s)"
+msgstr ""
+
 #: superset-frontend/src/explore/components/controls/SpatialControl.jsx:82
 msgid "Invalid lat/long configuration."
 msgstr ""
@@ -6061,7 +5967,7 @@ msgstr ""
 
 #: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl.jsx:48
 #: superset-frontend/src/explore/controlPanels/TimeTable.js:38
-msgid "Time Series Columns"
+msgid "Time series columns"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/VizTypeControl.jsx:105
@@ -6102,7 +6008,7 @@ msgid "Edit time range"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:51
-msgid "Configure Advanced Time Range"
+msgid "Configure advanced time range"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/AdvancedFrame.tsx:52
@@ -6124,7 +6030,7 @@ msgid "Configure Time Range: Last..."
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:121
-msgid "Configure Custom Time Range"
+msgid "Configure custom time range"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:151
@@ -6133,7 +6039,7 @@ msgid "Relative quantity"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:229
-msgid "ANCHOR TO"
+msgid "Anchor to"
 msgstr ""
 
 #: superset-frontend/src/explore/components/controls/DateFilterControl/frame/CustomFrame.tsx:238
@@ -6144,13 +6050,109 @@ msgstr ""
 msgid "Date/Time"
 msgstr ""
 
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:159
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:367
+msgid "Simple"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover.jsx:176
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:399
+msgid "Custom SQL"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:282
+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
+#, 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
+#, python-format
+msgid "%s column(s)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:302
+msgid "To filter on a metric, use Custom SQL tab."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:307
+#, python-format
+msgid "%s operators(s)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:326
+msgid "Type a value here"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent.jsx:385
+msgid "Filter value (case sensitive)"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:92
+msgid "choose WHERE or HAVING..."
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:127
+msgid "Filters by columns"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent.jsx:129
+msgid "Filters by metrics"
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger.tsx:94
+msgid ""
+"\n"
+"                This filter was inherited from the dashboard's context.\n"
+"                It won't be saved when saving the chart.\n"
+"              "
+msgstr ""
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover.jsx:297
+#, python-format
+msgid "%s aggregates(s)"
+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"
+msgstr ""
+
 #: superset-frontend/src/explore/controlPanels/Separator.js:25
 #: superset-frontend/src/explore/controlPanels/Separator.js:46
 msgid "Code"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/Separator.js:32
-msgid "Markup Type"
+msgid "Markup type"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/Separator.js:37
@@ -6189,7 +6191,7 @@ msgid "Time related form attributes"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:31
-msgid "Chart Type"
+msgid "Chart type"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:41
@@ -6209,7 +6211,7 @@ msgid "The number of seconds before expiring the cache"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:59
-msgid "URL Parameters"
+msgid "URL parameters"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:61
@@ -6225,11 +6227,11 @@ msgid "Time range endpoints (SIP-15)"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:90
-msgid "Annotations and Layers"
+msgid "Annotations and layers"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:124
-msgid "Sort Descending"
+msgid "Sort descending"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:126
@@ -6245,7 +6247,7 @@ msgid "Compute the contribution to the total"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:143
-msgid "Advanced Analytics"
+msgid "Advanced analytics"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:145
@@ -6255,11 +6257,11 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:151
-msgid "Rolling Window"
+msgid "Rolling window"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:157
-msgid "Rolling Function"
+msgid "Rolling function"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:166
@@ -6279,7 +6281,7 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:188
-msgid "Min Periods"
+msgid "Min periods"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:190
@@ -6291,11 +6293,11 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:200
-msgid "Time Comparison"
+msgid "Time comparison"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:208
-msgid "Time Shift"
+msgid "Time shift"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:219
@@ -6317,7 +6319,7 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:247
-msgid "Python Functions"
+msgid "Python functions"
 msgstr ""
 
 #: superset-frontend/src/explore/controlPanels/sections.jsx:256
@@ -6341,11 +6343,11 @@ msgid "Favorites"
 msgstr ""
 
 #: superset-frontend/src/profile/components/App.tsx:62
-msgid "Created Content"
+msgid "Created content"
 msgstr ""
 
 #: superset-frontend/src/profile/components/App.tsx:76
-msgid "Recent Activity"
+msgid "Recent activity"
 msgstr ""
 
 #: superset-frontend/src/profile/components/App.tsx:90
@@ -6442,16 +6444,16 @@ msgid "There was an issue deleting the selected %s: %s"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:213
-msgid "Last Run"
+msgid "Last run"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:245
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1331
-msgid "Notification Method"
+msgid "Notification method"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:292
-msgid "Execution Log"
+msgid "Execution log"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:320
@@ -6475,7 +6477,7 @@ msgstr ""
 #: 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
-msgid "Bulk Select"
+msgid "Bulk select"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:361
@@ -6493,7 +6495,7 @@ msgstr ""
 #: 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
-msgid "Created By"
+msgid "Created by"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:377
@@ -6527,6 +6529,10 @@ msgstr ""
 msgid "${AlertState.grace}"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:411
+msgid "Alerts & reports"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/alert/AlertList.tsx:421
 msgid "Reports"
 msgstr ""
@@ -6544,8 +6550,12 @@ 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
@@ -6574,15 +6584,15 @@ msgid ">= (Larger or equal)"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:72
-msgid "== (Is Equal)"
+msgid "== (Is equal)"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:76
-msgid "!= (Is Not Equal)"
+msgid "!= (Is not equal)"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:80
-msgid "Not Null"
+msgid "Not null"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:91
@@ -6628,16 +6638,16 @@ msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1063
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1071
-msgid "Report Name"
+msgid "Report name"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1063
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1071
-msgid "Alert Name"
+msgid "Alert name"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1117
-msgid "Alert Condition"
+msgid "Alert condition"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1161
@@ -6651,23 +6661,23 @@ msgid "Value"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1213
-msgid "Report Schedule"
+msgid "Report schedule"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1214
-msgid "Alert Condition Schedule"
+msgid "Alert condition schedule"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1224
-msgid "Schedule Settings"
+msgid "Schedule settings"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1228
-msgid "Log Retention"
+msgid "Log retention"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1252
-msgid "Working Timeout"
+msgid "Working timeout"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1260
@@ -6676,11 +6686,11 @@ msgid "Time in seconds"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1267
-msgid "Grace Period"
+msgid "Grace period"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1282
-msgid "Message Content"
+msgid "Message content"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:63
@@ -6697,48 +6707,52 @@ msgid "Scheduled at"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:108
-msgid "Start At"
+msgid "Start at"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:118
 msgid "Duration"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:127
+msgid "Error message"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:139
 msgid "${alertResource?.type}"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx:77
-msgid "CRON Expression"
+msgid "CRON expression"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:62
-msgid "Report Sent"
+msgid "Report sent"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:63
-msgid "Alert Triggered, Notification Sent"
+msgid "Alert triggered, notification sent"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:69
-msgid "Report Sending"
+msgid "Report sending"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:70
-msgid "Alert Running"
+msgid "Alert running"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:76
-msgid "Report Failed"
+msgid "Report failed"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:77
-msgid "Alert Failed"
+msgid "Alert failed"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:82
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:92
-msgid "Nothing Triggered"
+msgid "Nothing triggered"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:87
@@ -6763,8 +6777,13 @@ msgstr ""
 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
+msgid "Edit annotation"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:187
-msgid "Delete Annotation"
+msgid "Delete annotation"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:208
@@ -6793,8 +6812,12 @@ msgstr ""
 msgid "Are you sure you want to delete the selected annotations?"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
+msgid "Add annotation"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:274
-msgid "annotation name"
+msgid "Annotation name"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:286
@@ -6802,7 +6825,7 @@ msgid "date"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:307
-msgid "Additional Information"
+msgid "Additional information"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:314
@@ -6810,24 +6833,21 @@ msgstr ""
 msgid "Description (this can be seen in the list)"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:319
-msgid "json metadata"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:107
 msgid "annotation_layer"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:218
-msgid "Edit Annotation Layer Properties"
+msgid "Edit annotation layer properties"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:228
-msgid "annotation layer name"
+msgid "Annotation layer name"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:67
-msgid "annotation layers"
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:339
+msgid "Annotation layers"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:112
@@ -6835,6 +6855,19 @@ msgstr ""
 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
+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
+msgid "Created on"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:231
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:210
 msgid "Edit template"
@@ -6847,7 +6880,7 @@ msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:266
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:323
-msgid "Annotation Layer"
+msgid "Annotation layer"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:296
@@ -6873,13 +6906,6 @@ msgstr ""
 msgid "Are you sure you want to delete the selected layers?"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:72
-#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:297
-#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:94
-#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:283
-msgid "Please Confirm"
-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
@@ -6916,7 +6942,7 @@ 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
-msgid "Modified By"
+msgid "Modified by"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/chart/ChartList.tsx:370
@@ -6936,7 +6962,7 @@ msgid "An error occurred while fetching chart created by values: %s"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/chart/ChartList.tsx:412
-msgid "Viz Type"
+msgid "Viz type"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/chart/ChartList.tsx:444
@@ -6971,11 +6997,15 @@ msgid "css_template"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:236
-msgid "Edit CSS Template Properties"
+msgid "Edit CSS template properties"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:237
+msgid "Add CSS template"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:246
-msgid "css template name"
+msgid "CSS template name"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:258
@@ -6983,7 +7013,8 @@ msgid "css"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:66
-msgid "css templates"
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:240
+msgid "CSS templates"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:115
@@ -6997,7 +7028,7 @@ msgid "Last modified by %s"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:249
-msgid "Css Template"
+msgid "CSS template"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:313
@@ -7094,7 +7125,7 @@ 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"
+msgid "Asynchronous query execution"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:213
@@ -7103,7 +7134,7 @@ msgid "AQE"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:228
-msgid "Allow Data Manipulation Language"
+msgid "Allow data manipulation language"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:231
@@ -7111,7 +7142,7 @@ msgid "DML"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:243
-msgid "CSV Upload"
+msgid "CSV upload"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:303
@@ -7146,12 +7177,20 @@ msgstr ""
 msgid "Sorry there was an error fetching database information: %s"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
+msgid "Edit database"
+msgstr ""
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:349
+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:369
-msgid "Database Name"
+msgid "Database name"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:377
@@ -7162,6 +7201,10 @@ msgstr ""
 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
 msgid "Refer to the "
 msgstr ""
@@ -7178,6 +7221,11 @@ msgstr ""
 msgid "Performance"
 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"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:445
 msgid ""
 "Operate the database in asynchronous mode, meaning that the queries are "
@@ -7187,19 +7235,34 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:455
-msgid "SQL Lab Settings"
+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
+msgid "Secure extra"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:568
 msgid "JSON string containing additional connection configuration."
 msgstr ""
@@ -7211,11 +7274,6 @@ msgid ""
 "normally used by SQLAlchemy."
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:582
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:587
-msgid "Root Certificate"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:592
 msgid ""
 "Optional CA_BUNDLE contents to validate HTTPS requests. Only available on "
@@ -7236,7 +7294,7 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:628
-msgid "Allow Data Upload"
+msgid "Allow data upload"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:630
@@ -7290,7 +7348,7 @@ msgid "Error while saving dataset: %s"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:117
-msgid "Add Dataset"
+msgid "Add dataset"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:53
@@ -7318,11 +7376,11 @@ msgid "An error occurred while fetching dataset related data: %s"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:204
-msgid "Physical Dataset"
+msgid "Physical dataset"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:214
-msgid "Virtual Dataset"
+msgid "Virtual dataset"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:399
@@ -7413,7 +7471,7 @@ msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:225
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:147
-msgid "Tab Name"
+msgid "Tab name"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:257
@@ -7435,17 +7493,14 @@ msgstr ""
 msgid "An error occurred while fetching database values: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:389
-msgid "Time Range"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:395
 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/SavedQueryPreviewModal.tsx:98
-msgid "Query Preview"
+msgid "Query preview"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:127
@@ -7471,6 +7526,11 @@ msgstr ""
 msgid "Executed query"
 msgstr ""
 
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:87
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:145
+msgid "Saved queries"
+msgstr ""
+
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:116
 #, python-format
 msgid "There was an issue previewing the selected query %s"
@@ -7485,10 +7545,6 @@ msgstr ""
 msgid "There was an issue deleting the selected queries: %s"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:315
-msgid "Query preview"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:323
 msgid "Edit query"
 msgstr ""
@@ -7516,7 +7572,7 @@ msgid "Are you sure you want to delete the selected queries?"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:126
-msgid "Query Name"
+msgid "Query name"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:110
@@ -7557,10 +7613,6 @@ msgstr ""
 msgid "Recently edited charts, dashboards, and saved queries will appear here"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:114
-msgid "SQL QUERY"
-msgstr ""
-
 #: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:115
 msgid ""
 "${tableName\n"
@@ -7575,7 +7627,7 @@ msgid "You don't have any favorites yet!"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:147
-msgid "SQL LAB QUERIES"
+msgid "SQL Lab queries"
 msgstr ""
 
 #: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:148
@@ -7609,11 +7661,11 @@ msgid "Type or Select [%s]"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js:25
-msgid "Filter Box"
+msgid "Filter box"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:27
-msgid "Filters Configuration"
+msgid "Filters configuration"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:36
@@ -7621,7 +7673,7 @@ msgid "Filter configuration for the filter box"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:49
-msgid "Date Filter"
+msgid "Date filter"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:51
@@ -7629,7 +7681,7 @@ msgid "Whether to include a time filter"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:58
-msgid "Instant Filtering"
+msgid "Instant filtering"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:61
@@ -7639,39 +7691,39 @@ msgid ""
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:72
-msgid "Show SQL Granularity Dropdown"
+msgid "Show SQL granularity dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:74
-msgid "Check to include SQL Granularity dropdown"
+msgid "Check to include SQL granularity dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:81
-msgid "Show SQL Time Column"
+msgid "Show SQL time column"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:83
-msgid "Check to include Time Column dropdown"
+msgid "Check to include time column dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:92
-msgid "Show Druid Granularity Dropdown"
+msgid "Show Druid granularity dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:94
-msgid "Check to include Druid Granularity dropdown"
+msgid "Check to include Druid granularity dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:101
-msgid "Show Druid Time Origin"
+msgid "Show Druid time origin"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:103
-msgid "Check to include Time Origin dropdown"
+msgid "Check to include time origin dropdown"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:113
-msgid "Limit Selector Values"
+msgid "Limit selector values"
 msgstr ""
 
 #: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:114
diff --git a/superset/translations/es/LC_MESSAGES/messages.json b/superset/translations/es/LC_MESSAGES/messages.json
index 3d22a09..b8e088d 100644
--- a/superset/translations/es/LC_MESSAGES/messages.json
+++ b/superset/translations/es/LC_MESSAGES/messages.json
@@ -243,6 +243,7 @@
       "Annotation layer has associated annotations.": [""],
       "Name must be unique": [""],
       "Deleted %(num)d chart": ["", "Deleted %(num)d charts"],
+      "Request is not JSON": [""],
       "Request is incorrect: %(error)s": [""],
       "`confidence_interval` must be between 0 and 1 (exclusive)": [""],
       "lower percentile must be greater than 0 and less than 100. Must be lower than upper percentile.": [
@@ -997,13 +998,9 @@
       "Edit Log": [""],
       "Action": ["Acción"],
       "dttm": ["dttm"],
-      "Add Item": [""],
+      "Add item": ["Filtros"],
       "The query couldn't be loaded": ["No se pudo cargar la consulta."],
-      "Your query was saved": ["Tu consulta fue guardada"],
-      "Your query could not be saved": ["Tu consulta no pudo ser guardada"],
-      "Your query was updated": [""],
-      "Your query could not be updated": [""],
-      "Your query has been scheduled. To see details of your query, navigate to Saved Queries": [
+      "Your query has been scheduled. To see details of your query, navigate to Saved queries": [
         ""
       ],
       "Your query could not be scheduled": [""],
@@ -1048,6 +1045,10 @@
       "An error occurred while setting the tab title. Please contact your administrator.": [
         ""
       ],
+      "Your query was saved": ["Tu consulta fue guardada"],
+      "Your query could not be saved": ["Tu consulta no pudo ser guardada"],
+      "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.": [
         ""
       ],
@@ -1075,9 +1076,9 @@
       "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": [""],
       "Explore the result set in the data exploration view": [""],
@@ -1111,7 +1112,7 @@
       "[To]-": ["[A]-"],
       "Filter by status": ["Filtrar por estado"],
       "Edit": ["Editar"],
-      "view results": ["ver resultados"],
+      "View results": ["Ver resultados"],
       "Data preview": ["Previsualización de Datos"],
       "Overwrite text in the editor with a query on this table": [""],
       "Run query in a new tab": ["Ejecutar consulta en otra pestaña"],
@@ -1121,16 +1122,16 @@
       ],
       ".CSV": [""],
       "Clipboard": [""],
-      "Filter Results": [""],
-      "Database Error": ["Base de datos"],
+      "Filter results": ["ver resultados"],
+      "Database error": ["Base de datos"],
       "was created": [""],
       "Query in a new tab": [""],
       "The query returned no data": [""],
       "Fetch data preview": [""],
-      "Refetch Results": [""],
-      "Track Job": [""],
+      "Refetch results": ["ver resultados"],
+      "Track job": [""],
       "Stop": [""],
-      "Run Selection": [""],
+      "Run selection": ["Probar Conexión"],
       "Run": ["Ejecutar"],
       "Stop running (Ctrl + x)": [""],
       "Run query (Ctrl + Return)": [""],
@@ -1139,14 +1140,14 @@
       "Undefined": ["Indefinido"],
       "Save": ["Guardar"],
       "Save as": ["Guardar como"],
-      "Save Query": ["Guardar Consulta"],
-      "Save As New": ["Guardar como"],
+      "Save query": ["Guardar Consulta"],
+      "Save as new": ["Guardar como"],
       "Update": [""],
       "Label for your query": ["Etiqueta para tu consulta"],
       "Write a description for your query": [
         "Escribe una descripción para tu consulta"
       ],
-      "Schedule Query": [""],
+      "Schedule query": ["Guardar Consulta"],
       "Schedule": [""],
       "There was an error with your request": [""],
       "Please save the query to enable sharing": [""],
@@ -1161,9 +1162,10 @@
       ],
       "Preview: `%s`": ["Previsualizar `%s`"],
       "Results": ["Resultados"],
+      "Query history": ["Historial de la Consulta"],
       "Run query": ["Ejecutar query"],
       "New tab": ["Nueva pestaña"],
-      "Untitled Query": ["Consulta sin Nombre"],
+      "Untitled query": ["Consulta sin Nombre"],
       "Stop query": ["Parar query"],
       "Schedule the query periodically": [""],
       "You must run the query successfully first": [""],
@@ -1173,7 +1175,7 @@
       "CREATE TABLE AS": ["Permitir CREATE TABLE AS"],
       "CREATE VIEW AS": ["Permitir CREATE TABLE AS"],
       "Estimate the cost before running a query": [""],
-      "Reset State": ["Restablecer estado"],
+      "Reset state": ["Restablecer estado"],
       "Enter a new title for the tab": [
         "Ingresa un nuevo título para la pestaña"
       ],
@@ -1202,7 +1204,6 @@
       "below (example:": [""],
       "), and they become available in your SQL (example:": [""],
       ") by using": [""],
-      "Template Parameters": [""],
       "Edit template parameters": [""],
       "Invalid JSON": [""],
       "Create a new chart": ["Crear un nuevo Gráfico"],
@@ -1324,7 +1325,6 @@
       "An error occurred while fetching dashboards": [
         "Se produjo un error al crear el origen de datos"
       ],
-      "Run Query": ["Ejecutar Query"],
       "Error while fetching table list": [
         "Error recuperando la lista de tablas"
       ],
@@ -1334,28 +1334,27 @@
       "Force refresh table list": [""],
       "See table schema": [""],
       "%s%s": [""],
-      "Share Dashboard": [""],
+      "Share dashboard": ["Compartir dashboard"],
       "This may be triggered by:": [""],
       "Please reach out to the Chart Owner for assistance.": [""],
       "Chart Owner: %s": ["El Gráfico ha cambiado"],
       "%s Error": ["Error"],
-      "See More": [""],
-      "See Less": [""],
-      "Copy Message": [""],
+      "See more": [""],
+      "See less": [""],
+      "Copy message": ["Mensaje de Aviso"],
       "Close": ["Cerrar"],
-      "Unexpected Error": [""],
       "This was triggered by:": [""],
       "Did you mean:": [""],
       "%(suggestion)s instead of \"%(undefinedParameter)s?\"": [""],
-      "Parameter Error": ["Parámetros"],
+      "Parameter error": ["Parámetros"],
       "We’re having trouble loading this visualization. Queries are set to timeout after %s second.": [
         ""
       ],
       "We’re having trouble loading these results. Queries are set to timeout after %s second.": [
         ""
       ],
-      "Timeout Error": [""],
-      "Cell Content": [""],
+      "Timeout error": [""],
+      "Cell content": ["Contenido Creado"],
       "The import was successful": ["Sin éxito"],
       "OVERWRITE": [""],
       "Overwrite": [""],
@@ -1363,10 +1362,11 @@
       "Import %s": ["Importar Dashboards"],
       "Last Updated %s": [""],
       "%s Selected": [""],
-      "Deselect All": [""],
+      "Deselect all": ["¿Realmente quieres borrar todo?"],
       "%s-%s of %s": [""],
       "Settings": ["Configuracion"],
       "About": [""],
+      "SQL query": ["Parar query"],
       "There is not enough space for this component. Try decreasing its width, or increasing the destination width.": [
         ""
       ],
@@ -1390,10 +1390,10 @@
       "Any color palette selected here will override the colors applied to this dashboard's individual charts": [
         ""
       ],
-      "Color Scheme": ["Esquema de Color"],
+      "Color scheme": ["Esquema de Color"],
       "Load a template": ["Cargar una plantilla"],
       "Load a CSS template": ["Cargar una plantilla CSS"],
-      "Live CSS Editor": ["Editor CSS"],
+      "Live CSS editor": ["Editor CSS"],
       "You have unsaved changes.": ["Tienes cambios no guardados."],
       "This dashboard is currently force refreshing; the next force refresh will be in %s.": [
         ""
@@ -1401,13 +1401,12 @@
       "Your dashboard is too large. Please reduce the size before save it.": [
         "Tu dashboard es demasiado grande, Por favor reduce el tamaño antes de guardar"
       ],
-      "Discard Changes": ["Descartar cambios"],
+      "Discard changes": ["Descartar cambios"],
       "An error occurred while fetching available CSS templates": [
         "Ha ocurrido un error cargando los CSS disponibles"
       ],
-      "Superset Dashboard": ["Dashboard Superset"],
+      "Superset dashboard": ["Dashboard Superset"],
       "Check out this dashboard: ": [""],
-      "Share dashboard": ["Compartir dashboard"],
       "Refresh dashboard": ["Auto actualizar el dashboard"],
       "Set auto-refresh interval": [
         "Configurar el intervalo de actualización del dashboard"
@@ -1416,7 +1415,7 @@
       "Edit dashboard properties": ["Editar las propiedades del dashboard"],
       "Edit CSS": ["Editar el CSS"],
       "Download as image": ["Descargar como imagen"],
-      "Toggle FullScreen": [""],
+      "Toggle fullscreen": [""],
       "There is no chart definition associated with this component, could it have been deleted?": [
         ""
       ],
@@ -1428,9 +1427,9 @@
       "A valid color scheme is required": [""],
       "The dashboard has been saved": ["El dashboard ha sido guardado"],
       "Apply": ["Aplicar"],
-      "Dashboard Properties": ["Propiedades del Dashboard"],
-      "Basic Information": ["Información Basica"],
-      "URL Slug": [""],
+      "Dashboard properties": ["Propiedades del Dashboard"],
+      "Basic information": ["Información Basica"],
+      "URL slug": [""],
       "A readable URL for your dashboard": [""],
       "Access": [""],
       "Owners is a list of users who can alter the dashboard. Searchable by name or username.": [
@@ -1438,6 +1437,7 @@
       ],
       "Colors": ["Colores"],
       "Advanced": ["Avanzado"],
+      "JSON metadata": ["Metadatos JSON"],
       "This dashboard is not published, it will not show up in the list of dashboards. Click here to publish this dashboard.": [
         "Este dashboard no es público, no serávisible en la lista de dashboards, Haz click aqui para publicarlo."
       ],
@@ -1458,14 +1458,14 @@
       "6 hours": ["6 horas"],
       "12 hours": ["12 horas"],
       "24 hours": ["24 horas"],
-      "Refresh Interval": ["Intérvalo de actualización"],
+      "Refresh interval": ["Intérvalo de actualización"],
       "Refresh frequency": [""],
       "Are you sure you want to proceed?": [""],
       "Save for this session": [""],
       "You must pick a name for the new dashboard": [
         "Debes elegir un nombre para el nuevo Dashboard"
       ],
-      "Save Dashboard": ["Guardar Dashboard"],
+      "Save dashboard": ["Guardar Dashboard"],
       "Overwrite Dashboard [%s]": ["Sobrescribir el Dashboard [%s]"],
       "Save as:": ["Guardar como:"],
       "[dashboard name]": ["[nombre del Dashboard]"],
@@ -1477,11 +1477,11 @@
       "One ore more annotation layers failed loading.": [""],
       "Cached %s": [""],
       "Fetched %s": [""],
-      "Minimize Chart": ["Minimizar"],
-      "Maximize Chart": ["Maximizar"],
+      "Minimize chart": ["Minimizar"],
+      "Maximize chart": ["Maximizar"],
       "Force refresh": ["Forzar actualización"],
       "Toggle chart description": ["Alternar la descripción del Dashboard"],
-      "View Chart in Explore": [""],
+      "View chart in Explore": [""],
       "Share chart": ["Compartir gráfico"],
       "Export CSV": ["Exportar CSV"],
       "Applied Filters (%d)": [""],
@@ -1505,30 +1505,37 @@
       "Row": ["Fila"],
       "Tabs": ["Pestaña"],
       "Preview": ["Previsualizar"],
-      "Select Parent Filters": ["Buscar / Filtrar"],
-      "Reset All": ["Restablecer estado"],
+      "Yes, cancel": [""],
+      "Keep editing": [""],
+      "Select parent filters": ["Buscar / Filtrar"],
+      "Reset all": ["Restablecer estado"],
       "You have removed this filter.": ["Tus gráficos & filtros"],
-      "Restore Filter": ["Filtro de Fecha"],
-      "Filter Name": ["Valor del Filtro"],
+      "Restore filter": ["Filtro de Fecha"],
+      "Filter name": ["Valor del Filtro"],
       "Name is required": [""],
       "Datasource is required": ["Fuentes de datos"],
       "Field": [""],
-      "Default Value": ["Por defecto"],
-      "Parent Filter": ["Filtro de Fecha"],
+      "Parent filter": ["Filtro de Fecha"],
       "None": [""],
       "Apply changes instantly": [""],
       "Allow multiple selections": [""],
       "Inverse selection": [""],
       "Required": [""],
+      "Are you sure you want to cancel?": [
+        "¿Estas seguro de que quieres guardar y aplicar los cambios?"
+      ],
+      "will not be saved.": [""],
+      "Filter configuration and scoping": [
+        "Configuración de filtro invalido, por favor selecciona una columna"
+      ],
+      "Add filter": ["Todos los filtros"],
+      "(Removed)": ["Eliminar"],
+      "Undo?": [""],
       "Scoping": [""],
       "Apply to all panels": [""],
       "Apply to specific panels": [""],
       "Only selected panels will be affected by this filter": [""],
       "All panels with this column will be affected by this filter": [""],
-      "Filter Configuration and Scoping": [""],
-      "Add Filter": ["Filtros"],
-      "(Removed)": ["Eliminar"],
-      "Undo?": [""],
       "All filters": ["Todos los filtros"],
       "All charts": ["Todos los gráficos"],
       "Warning! Changing the dataset may break the chart if the metadata does not exist.": [
@@ -1538,22 +1545,23 @@
         ""
       ],
       "dataset": [""],
-      "Change Dataset": ["Cambiar fuente"],
+      "Change dataset": ["Cambiar fuente"],
       "Warning!": ["Mensaje de Aviso"],
       "Search / Filter": ["Buscar / Filtrar"],
       "Physical (table or view)": ["Tabla física"],
       "Virtual (SQL)": [""],
-      "Data Type": ["Tipo de dato"],
+      "SQL expression": ["Expresión SQL"],
+      "Data type": ["Tipo de dato"],
+      "Datetime format": ["Formato FechaHora"],
       "The pattern of timestamp format. For strings use ": [""],
-      "python datetime string pattern": [""],
+      "Python datetime string pattern": [""],
       " expression which needs to adhere to the ": [""],
       "ISO 8601": [""],
       " standard to ensure that the lexicographical ordering\n                      coincides with the chronological ordering. If the\n                      timestamp format does not adhere to the ISO 8601 standard\n                      you will need to define an expression and type for\n                      transforming the string into a date or timestamp. Note\n                      currently time zones are not supported. If time is stored\n                      in epoch format, put  [...]
         ""
       ],
-      "Is Dimension": ["Es dimensión"],
-      "Is Temporal": ["Es temporal"],
-      "Is Filterable": ["Es filtrable"],
+      "Is dimension": ["Es dimensión"],
+      "Is filterable": ["Es filtrable"],
       "Modified columns: %s": [""],
       "Removed columns: %s": [""],
       "New columns added: %s": [""],
@@ -1568,7 +1576,7 @@
       ],
       "Autocomplete filters": [""],
       "Whether to populate autocomplete filters options": [""],
-      "Autocomplete Query Predicate": [""],
+      "Autocomplete query predicate": [""],
       "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.": [
         ""
       ],
@@ -1576,11 +1584,12 @@
         ""
       ],
       "Owners of the dataset": [""],
+      "Cache timeout": ["Tiempo de espera de caché"],
       "The duration of time in seconds before the cache is invalidated": [""],
       "Hours offset": [""],
       "Spatial": [""],
       "virtual": [""],
-      "dataset name": ["Nombre de la Fuente de Datos"],
+      "Dataset name": ["Nombre de la Fuente de Datos"],
       "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.": [
         ""
       ],
@@ -1591,10 +1600,12 @@
       ],
       "Click the lock to make changes.": [""],
       "Click the lock to prevent further changes.": [""],
+      "D3 format": ["Formato D3"],
+      "Warning message": ["Mensaje de Aviso"],
       "Warning message to display in the metric selector": [""],
-      "Certified By": [""],
+      "Certified by": [""],
       "Person or group that has certified this metric": [""],
-      "Certification Details": [""],
+      "Certification details": [""],
       "Details of the certification": [""],
       "Be careful.": [""],
       "Changing these settings will affect all charts using this dataset, including charts owned by other people.": [
@@ -1602,7 +1613,7 @@
       ],
       "Source": [""],
       "Sync columns from source": ["Sincronizar las columnas desde la fuente"],
-      "Calculated Columns": ["Columnas calculadas"],
+      "Calculated columns": ["Columnas calculadas"],
       "The dataset has been saved": [""],
       "The dataset configuration exposed here\n                affects all the charts using this dataset.\n                Be mindful that changing settings\n                here may affect other charts\n                in undesirable ways.": [
         ""
@@ -1612,7 +1623,7 @@
       ],
       "Confirm save": [""],
       "Edit Dataset ": ["Editar Base de Datos"],
-      "Use Legacy Datasource Editor": [""],
+      "Use legacy datasource editor": [""],
       "Time range": ["Periodo de tiempo"],
       "Time column": ["Columna de Tiempo"],
       "Time grain": ["Granularidad Temporal"],
@@ -1685,35 +1696,10 @@
       "When `Calculation type` is set to \"Percentage change\", the Y Axis Format is forced to `.1%`": [
         ""
       ],
-      "Color scheme": ["Esquema de Color"],
       "The color scheme for rendering chart": [
         "El esquema de color para la representación gráfica."
       ],
       "Color map": ["Color"],
-      "Simple": [""],
-      "Custom SQL": ["Customizar"],
-      "%s option(s)": ["opcion(es) %s"],
-      "No such column found. To filter on a metric, try the Custom SQL tab.": [
-        ""
-      ],
-      "%s column(s) and metric(s)": [""],
-      "%s column(s)": [""],
-      "To filter on a metric, use Custom SQL tab.": [""],
-      "%s operators(s)": [""],
-      "type a value here": [""],
-      "Filter value (case sensitive)": [""],
-      "choose WHERE or HAVING...": [""],
-      "filters by columns": ["Filtrar por estado"],
-      "filters by metrics": ["Filtrar por estado"],
-      "\n                This filter was inherited from the dashboard's context.\n                It won't be saved when saving the chart.\n              ": [
-        ""
-      ],
-      "%s aggregates(s)": [""],
-      "%s saved metric(s)": [""],
-      "column": ["Columna"],
-      "aggregate": [""],
-      "Saved": ["Guardar"],
-      "Saved metric": ["Consultas Guardadas"],
       "description": ["descripción"],
       "bolt": ["tornillo"],
       "Changing this control takes effect instantly": [""],
@@ -1721,7 +1707,6 @@
       "rows retrieved": ["lineas recogidas"],
       "Sorry, An error occurred": ["Lo siento, ha ocurrido un error"],
       "No data": ["No hay datos"],
-      "View results": ["Ver resultados"],
       "View samples": ["Ver ejemplos"],
       "Search Metrics & Columns": [""],
       "Showing %s of %s": [""],
@@ -1736,7 +1721,7 @@
       "%s - untitled": ["%s - sin título"],
       "Edit chart properties": [""],
       "Control labeled ": [""],
-      "Open Datasource Tab": ["Nombre de la Fuente de Datos"],
+      "Open Datasource tab": ["Nombre de la Fuente de Datos"],
       "You do not have permission to edit this chart": [
         "No tienes permiso para aprobar esta solicitud."
       ],
@@ -1756,27 +1741,28 @@
       "Please enter a chart name": [
         "Por favor introduce un nombre para el gráfico"
       ],
-      "Save Chart": ["Compartir gráfico"],
+      "Save chart": ["Compartir gráfico"],
       "Save & go to dashboard": ["Guardar e ir al Dashboard"],
       "Save as new chart": ["Crear un nuevo Gráfico"],
       "Save (Overwrite)": ["Consultas Guardadas"],
       "Save as ...": ["Guardar como"],
       "Chart name": ["El Gráfico ha cambiado"],
       "Add to dashboard": ["Añadir a un nuevo Dashboard"],
-      "Add filter": ["Todos los filtros"],
       "Display configuration": [""],
       "Configure your how you overlay is displayed here.": [""],
       "Style": [""],
       "Opacity": ["Opacidad"],
       "Color": ["Color"],
-      "Line Width": [""],
-      "Layer Configuration": [""],
+      "Line width": [""],
+      "Layer configuration": ["Configuración"],
       "Configure the basics of your Annotation Layer.": [""],
       "Mandatory": [""],
-      "Hide Layer": [""],
-      "Choose the Annotation Layer Type": [""],
-      "Annotation Layer Type": [""],
+      "Hide layer": [""],
+      "Choose the annotation layer type": ["Capas de Anotación"],
+      "Annotation layer type": ["Capas de Anotación"],
       "Remove": ["Eliminar"],
+      "Edit annotation layer": ["Capas de Anotación"],
+      "Add annotation layer": ["Capas de Anotación"],
       "`Min` value should be numeric or empty": [
         "El valor `Mín` debe ser numérico o vacío"
       ],
@@ -1785,7 +1771,7 @@
       ],
       "Min": ["Mín"],
       "Max": ["Máx"],
-      "Edit Dataset": ["Editar Base de Datos"],
+      "Edit dataset": ["Editar Base de Datos"],
       "View in SQL Lab": ["Ejecutar en Laboratiorio 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.": [
@@ -1795,23 +1781,22 @@
       "(optional) default value for the filter, when using the multiple option, you can use a semicolon-delimited list of options.": [
         ""
       ],
-      "Sort Metric": [""],
+      "Sort metric": ["Métrica de Color"],
       "Metric to sort the results by": [""],
-      "Sort Ascending": [""],
+      "Sort ascending": ["Orden Descendente"],
       "Check for sorting ascending": [""],
-      "Allow Multiple Selections": [""],
       "Multiple selections allowed, otherwise filter is limited to a single value": [
         ""
       ],
-      "Search All Filter Options": [""],
+      "Search all filter options": ["Buscar / Filtrar"],
       "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).": [
         ""
       ],
       "User must select a value for this filter": [""],
-      "Filter Configuration": [""],
-      "Add metric": ["Añadir Métrica"],
+      "Filter configuration": ["Configuración"],
       "Error while fetching data": ["Error recuperando datos"],
       "No results found": ["No se han encontrado resultados"],
+      "%s option(s)": ["opcion(es) %s"],
       "Invalid lat/long configuration.": [""],
       "Reverse lat/long ": [""],
       "Longitude & Latitude columns": [""],
@@ -1822,7 +1807,7 @@
       "Geohash": [""],
       "textarea": ["área de texto"],
       "in modal": ["en modal"],
-      "Time Series Columns": [""],
+      "Time series columns": ["Columna de Tiempo"],
       "This visualization type is not supported.": [""],
       "Click to change visualization type": [""],
       "Select a visualization type": ["Selecciona un tipo de visualización"],
@@ -1832,18 +1817,43 @@
       "CANCEL": [""],
       "APPLY": [""],
       "Edit time range": ["Periodo de tiempo"],
-      "Configure Advanced Time Range": [""],
+      "Configure advanced time range": [""],
       "START": [""],
       "END": [""],
       "Configure Time Range: Previous...": [""],
       "Configure Time Range: Last...": [""],
-      "Configure Custom Time Range": [""],
+      "Configure custom time range": ["Periodo de tiempo"],
       "Relative quantity": [""],
-      "ANCHOR TO": [""],
+      "Anchor to": [""],
       "NOW": [""],
       "Date/Time": ["Hora Inicio"],
+      "Simple": [""],
+      "Custom SQL": ["Customizar"],
+      "No such column found. To filter on a metric, try the Custom SQL tab.": [
+        ""
+      ],
+      "%s column(s) and metric(s)": [""],
+      "%s column(s)": [""],
+      "To filter on a metric, use Custom SQL tab.": [""],
+      "%s operators(s)": [""],
+      "Type a value here": [""],
+      "Filter value (case sensitive)": [""],
+      "choose WHERE or HAVING...": [""],
+      "Filters by columns": ["Filtrar por estado"],
+      "Filters by metrics": ["Filtrar por estado"],
+      "\n                This filter was inherited from the dashboard's context.\n                It won't be saved when saving the chart.\n              ": [
+        ""
+      ],
+      "%s aggregates(s)": [""],
+      "%s saved metric(s)": [""],
+      "Saved": ["Guardar"],
+      "Saved metric": ["Consultas Guardadas"],
+      "column": ["Columna"],
+      "aggregate": [""],
+      "My metric": ["Métrica"],
+      "Add metric": ["Añadir Métrica"],
       "Code": ["Código"],
-      "Markup Type": ["Tipo de Markup"],
+      "Markup type": ["Tipo de Markup"],
       "Pick your favorite markup language": [
         "Elige tu idioma favorito de markup"
       ],
@@ -1857,19 +1867,19 @@
       "Time related form attributes": [
         "Atributos de formulario relacionados con el tiempo"
       ],
-      "Chart Type": ["Tipo de dato"],
+      "Chart type": ["Tipo de dato"],
       "Chart ID": [""],
       "The id of the active chart": [""],
       "Cache Timeout (seconds)": ["Tiempo de espera de caché (segundos)"],
       "The number of seconds before expiring the cache": [
         "El número de segundos antes de caducar el caché."
       ],
-      "URL Parameters": [""],
+      "URL parameters": ["Parámetros"],
       "Extra parameters for use in jinja templated queries": [""],
       "Time range endpoints": [""],
       "Time range endpoints (SIP-15)": [""],
-      "Annotations and Layers": [""],
-      "Sort Descending": ["Orden Descendente"],
+      "Annotations and layers": ["Capas de Anotación"],
+      "Sort descending": ["Orden Descendente"],
       "Whether to sort descending or ascending": [
         "Ya sea orden descendente o ascendente"
       ],
@@ -1877,12 +1887,12 @@
       "Compute the contribution to the total": [
         "Calcular la contribución al total."
       ],
-      "Advanced Analytics": ["Analíticas Avanzadas"],
+      "Advanced analytics": ["Analíticas Avanzadas"],
       "This section contains options that allow for advanced analytical post processing of query results": [
         "Esta sección contiene opciones que permiten el procesamiento analítico avanzado de los resultados de la consulta"
       ],
-      "Rolling Window": [""],
-      "Rolling Function": [""],
+      "Rolling window": [""],
+      "Rolling function": ["Probar Conexión"],
       "Defines a rolling window function to apply, works along with the [Periods] text box": [
         "Define un una ventana de desplazamiento móvil para aplicar, funciona junto con el cuadro de texto [Periods]"
       ],
@@ -1890,12 +1900,12 @@
       "Defines the size of the rolling window function, relative to the time granularity selected": [
         "Define el tamaño de la función de ventana móvil, en relación con la granularidad de tiempo seleccionada"
       ],
-      "Min Periods": ["Periodos Mínimos"],
+      "Min periods": ["Periodos Mínimos"],
       "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": [
         "El número mínimo de períodos de desplazamiento necesarios para mostrar un valor. Por ejemplo, si realizas una suma acumulada en 7 días, es posible que quieras que tu \"Período mínimo\" sea 7, de modo que todos los puntos de datos mostrados sean el total de 7 períodos. Esto ocultará el \"incremento\" que tendrá lugar durante los primeros 7 períodos."
       ],
-      "Time Comparison": [""],
-      "Time Shift": ["Cambio de Hora"],
+      "Time comparison": ["Columna de Tiempo"],
+      "Time shift": ["Cambio de Hora"],
       "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.": [
         ""
       ],
@@ -1903,14 +1913,14 @@
       "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.": [
         ""
       ],
-      "Python Functions": [""],
+      "Python functions": ["Probar Conexión"],
       "Rule": [""],
       "Pandas resample rule": ["Regla de Remuestra Pandas"],
       "Method": [""],
       "Pandas resample method": [""],
       "Favorites": ["Favoritos"],
-      "Created Content": ["Contenido Creado"],
-      "Recent Activity": ["Actividad Reciente"],
+      "Created content": ["Contenido Creado"],
+      "Recent activity": ["Actividad Reciente"],
       "Security & Access": ["Seguridad & Acceso"],
       "No charts": [""],
       "No dashboards": [""],
@@ -1932,13 +1942,13 @@
       "reports": ["Vista"],
       "alerts": ["Alertas"],
       "There was an issue deleting the selected %s: %s": [""],
-      "Last Run": ["Último cambio"],
-      "Notification Method": [""],
-      "Execution Log": ["Registro Acciones"],
+      "Last run": ["Último cambio"],
+      "Notification method": ["Capas de Anotación"],
+      "Execution log": ["Registro Acciones"],
       "Actions": [""],
-      "Bulk Select": [""],
+      "Bulk select": [""],
       "No %s yet": [""],
-      "Created By": ["Creado el"],
+      "Created by": ["Creado el"],
       "An error occurred while fetching created by values: %s": [
         "Ha ocurrido un error cargando los CSS disponibles"
       ],
@@ -1948,6 +1958,7 @@
       "${AlertState.error}": [""],
       "${AlertState.noop}": [""],
       "${AlertState.grace}": [""],
+      "Alerts & reports": ["Vista"],
       "Reports": ["Vista"],
       "This action will permanently delete %s.": [""],
       "Delete %s?": ["Eliminar"],
@@ -1959,9 +1970,9 @@
       "> (Larger than)": [""],
       "<= (Smaller or equal)": [""],
       ">= (Larger or equal)": [""],
-      "== (Is Equal)": [""],
-      "!= (Is Not Equal)": [""],
-      "Not Null": [""],
+      "== (Is equal)": [""],
+      "!= (Is not equal)": [""],
+      "Not null": [""],
       "30 days": [""],
       "60 days": [""],
       "90 days": [""],
@@ -1971,39 +1982,41 @@
       "Add": [""],
       "Edit ${isReport ? 'Report' : 'Alert'}": [""],
       "Add ${isReport ? 'Report' : 'Alert'}": [""],
-      "Report Name": ["Nombre Plantilla"],
-      "Alert Name": ["Nombre Tabla"],
-      "Alert Condition": ["Probar Conexión"],
+      "Report name": ["Nombre Plantilla"],
+      "Alert name": ["Nombre Tabla"],
+      "Alert condition": ["Probar Conexión"],
       "Trigger Alert If...": [""],
       "Value": [""],
-      "Report Schedule": ["Programar Gráfico"],
-      "Alert Condition Schedule": [""],
-      "Schedule Settings": ["Configuracion"],
-      "Log Retention": [""],
-      "Working Timeout": [""],
+      "Report schedule": ["Programar Gráfico"],
+      "Alert condition schedule": ["Probar Conexión"],
+      "Schedule settings": ["Configuracion"],
+      "Log retention": [""],
+      "Working timeout": [""],
       "Time in seconds": ["10 segundos"],
-      "Grace Period": ["Periodos"],
-      "Message Content": ["Contenido Creado"],
+      "Grace period": ["Periodos"],
+      "Message content": ["Contenido Creado"],
       "log": [""],
       "State": ["Estado"],
       "Scheduled at": [""],
-      "Start At": ["Hora Inicio"],
+      "Start at": ["Hora Inicio"],
       "Duration": ["Configuración"],
+      "Error message": ["Mensaje de Aviso"],
       "${alertResource?.type}": [""],
-      "CRON Expression": ["Expresión"],
-      "Report Sent": [""],
-      "Alert Triggered, Notification Sent": [""],
-      "Report Sending": ["Orden Descendente"],
-      "Alert Running": [""],
-      "Report Failed": [""],
-      "Alert Failed": [""],
-      "Nothing Triggered": ["Sin filtros"],
+      "CRON expression": ["Expresión"],
+      "Report sent": ["Vista"],
+      "Alert triggered, notification sent": [""],
+      "Report sending": ["Orden Descendente"],
+      "Alert running": ["Probar Conexión"],
+      "Report failed": ["Nombre Plantilla"],
+      "Alert failed": ["Nombre Tabla"],
+      "Nothing triggered": ["Sin filtros"],
       "Alert Triggered, In Grace Period": [""],
       "${RecipientIconName.email}": [""],
       "${RecipientIconName.slack}": [""],
       "annotation": ["Anotaciones"],
       "There was an issue deleting the selected annotations: %s": [""],
-      "Delete Annotation": ["Anotaciones"],
+      "Edit annotation": ["Anotaciones"],
+      "Delete annotation": ["Anotaciones"],
       "Annotation": ["Anotaciones"],
       "No annotation yet": ["Capas de Anotación"],
       "Annotation Layer ${annotationLayerName}": [""],
@@ -2014,19 +2027,21 @@
       "Are you sure you want to delete the selected annotations?": [
         "¿Estas seguro de que quieres guardar y aplicar los cambios?"
       ],
-      "annotation name": ["Capas de Anotación"],
+      "Add annotation": ["Anotaciones"],
+      "Annotation name": ["Capas de Anotación"],
       "date": [""],
-      "Additional Information": ["Información Basica"],
+      "Additional information": ["Información Basica"],
       "Description (this can be seen in the list)": [""],
-      "json metadata": ["Metadatos JSON"],
       "annotation_layer": ["Capas de Anotación"],
-      "Edit Annotation Layer Properties": ["Capas de Anotación"],
-      "annotation layer name": ["Capas de Anotación"],
-      "annotation layers": ["Capas de Anotación"],
+      "Edit annotation layer properties": ["Capas de Anotación"],
+      "Annotation layer name": ["Capas de Anotación"],
+      "Annotation layers": ["Capas de Anotación"],
       "There was an issue deleting the selected layers: %s": [""],
+      "Last modified": ["Última modificación"],
+      "Created on": ["Creado el"],
       "Edit template": ["Cargar una plantilla"],
       "Delete template": ["Cargar una plantilla"],
-      "Annotation Layer": ["Capas de Anotación"],
+      "Annotation layer": ["Capas de Anotación"],
       "An error occurred while fetching dataset datasource values: %s": [
         "Se produjo un error al crear el origen de datos"
       ],
@@ -2036,7 +2051,6 @@
       "Are you sure you want to delete the selected layers?": [
         "¿Estas seguro de que quieres guardar y aplicar los cambios?"
       ],
-      "Please Confirm": [""],
       "Are you sure you want to delete": [""],
       "Last modified %s": ["Última modificación"],
       "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.": [
@@ -2046,7 +2060,7 @@
         ""
       ],
       "There was an issue deleting the selected charts: %s": [""],
-      "Modified By": [""],
+      "Modified by": ["Modificado"],
       "Owner": ["Propietarios"],
       "An error occurred while fetching chart owners values: %s": [
         "Ha ocurrido un error cargando los CSS disponibles"
@@ -2054,20 +2068,21 @@
       "An error occurred while fetching chart created by values: %s": [
         "Ha ocurrido un error cargando los CSS disponibles"
       ],
-      "Viz Type": ["Tipo"],
+      "Viz type": ["Tipo"],
       "An error occurred while fetching chart dataset values: %s": [""],
       "Favorite": ["Favoritos"],
       "Yes": [""],
       "No": [""],
       "Are you sure you want to delete the selected charts?": [""],
       "css_template": [""],
-      "Edit CSS Template Properties": ["Editar propiedades"],
-      "css template name": ["Nombre Plantilla"],
+      "Edit CSS template properties": ["Editar propiedades"],
+      "Add CSS template": ["Cargar una plantilla CSS"],
+      "CSS template name": ["Nombre Plantilla"],
       "css": [""],
-      "css templates": ["Plantillas CSS"],
+      "CSS templates": ["Plantillas CSS"],
       "There was an issue deleting the selected templates: %s": [""],
       "Last modified by %s": ["Última modificación"],
-      "Css Template": ["Plantillas CSS"],
+      "CSS template": ["Plantillas CSS"],
       "This action will permanently delete the template.": [""],
       "Delete Template?": ["Plantillas CSS"],
       "Are you sure you want to delete the selected templates?": [
@@ -2103,11 +2118,11 @@
       "An error occurred while fetching database related data: %s": [
         "Ha ocurrido un error cargando los CSS disponibles"
       ],
-      "Asynchronous Query Execution": [""],
+      "Asynchronous query execution": [""],
       "AQE": [""],
-      "Allow Data Manipulation Language": [""],
+      "Allow data manipulation language": [""],
       "DML": [""],
-      "CSV Upload": [""],
+      "CSV upload": [""],
       "Delete database": ["Selecciona una base de datos"],
       "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.": [
         ""
@@ -2119,29 +2134,35 @@
       "Connection looks good!": [""],
       "ERROR: Connection failed. ": [""],
       "Sorry there was an error fetching database information: %s": [""],
+      "Edit database": ["Editar Base de Datos"],
+      "Add database": ["Añadir Base de Datos"],
       "Connection": ["Probar Conexión"],
-      "Database Name": ["Nombre de la Fuente de Datos"],
+      "Database name": ["Nombre de la Fuente de Datos"],
       "Name your dataset": [""],
       "dialect+driver://username:password@host:port/database": [""],
+      "Test connection": ["Probar Conexión"],
       "Refer to the ": [""],
       "SQLAlchemy docs": ["URI SQLAlchemy"],
       " for more information on how to structure your URI.": [""],
       "Performance": [""],
+      "Chart cache timeout": ["Tiempo de espera de caché"],
       "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.": [
         ""
       ],
-      "SQL Lab Settings": ["Configuracion"],
+      "SQL Lab settings": ["Configuracion"],
       "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...)": [
         "Permitir que los usuarios ejecuten instrucciones que no sean SELECT (UPDATE, DELETE, CREATE, ...) en el laboratorio SQL"
       ],
+      "Allow multi schema metadata fetch": [""],
+      "CTAS schema": ["Esquema CTAS"],
       "When allowing CREATE TABLE AS option in SQL Lab, this option forces the table to be created in this schema.": [
         "Cuando se permite la opción CREATE TABLE AS en el laboratorio SQL, esta opción hace que la tabla se cree en este esquema"
       ],
+      "Secure extra": ["Seguridad"],
       "JSON string containing additional connection configuration.": [""],
       "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.": [
         ""
       ],
-      "Root Certificate": ["Certificado Invalido"],
       "Optional CA_BUNDLE contents to validate HTTPS requests. Only available on certain database engines.": [
         ""
       ],
@@ -2149,7 +2170,7 @@
       "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.": [
         ""
       ],
-      "Allow Data Upload": [""],
+      "Allow data upload": [""],
       "If selected, please set the schemas allowed for data upload in Extra.": [
         ""
       ],
@@ -2172,7 +2193,7 @@
       "Error while saving dataset: %s": [
         "Error recuperando la lista de bases de datos"
       ],
-      "Add Dataset": [""],
+      "Add dataset": ["Añadir Base de Datos"],
       "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.": [
         ""
       ],
@@ -2183,8 +2204,8 @@
       "An error occurred while fetching dataset related data: %s": [
         "Ha ocurrido un error cargando los CSS disponibles"
       ],
-      "Physical Dataset": [""],
-      "Virtual Dataset": [""],
+      "Physical dataset": ["Selecciona una base de datos"],
+      "Virtual dataset": ["Editar Base de Datos"],
       "An error occurred while fetching dataset owner values: %s": [
         "Ha ocurrido un error cargando los CSS disponibles"
       ],
@@ -2211,25 +2232,24 @@
       "Offline": [""],
       "Scheduled": [""],
       "Duration: %s": [""],
-      "Tab Name": ["Nombre Tabla"],
+      "Tab name": ["Nombre Tabla"],
       "TABLES": [""],
       "Rows": [""],
       "Open query in SQL Lab": ["Ejecutar en Laboratiorio SQL"],
       "An error occurred while fetching database values: %s": [
         "Ha ocurrido un error cargando los CSS disponibles"
       ],
-      "Time Range": ["Periodo de tiempo"],
       "Search by query text": [""],
-      "Query Preview": ["Previsualizar"],
+      "Query preview": ["Previsualización de Datos"],
       "Previous": ["Previsualizar"],
       "Next": [""],
       "Open in SQL Lab": ["Ejecutar en Laboratiorio SQL"],
       "User query": ["Ver querie"],
       "Executed query": ["¿Consulta vacía?"],
+      "Saved queries": ["Consultas Guardadas"],
       "There was an issue previewing the selected query %s": [""],
       "Link Copied!": ["Copiado!"],
       "There was an issue deleting the selected queries: %s": [""],
-      "Query preview": ["Previsualización de Datos"],
       "Edit query": ["¿Consulta vacía?"],
       "Copy query URL": ["Parar query"],
       "Delete query": ["Eliminar"],
@@ -2238,7 +2258,7 @@
       "Are you sure you want to delete the selected queries?": [
         "¿Estas seguro de que quieres guardar y aplicar los cambios?"
       ],
-      "Query Name": ["Consulta"],
+      "Query name": ["Consulta"],
       "Edited": ["Editar"],
       "Created": ["Creado el"],
       "Viewed": ["Ver querie"],
@@ -2256,12 +2276,11 @@
       "Recently edited charts, dashboards, and saved queries will appear here": [
         ""
       ],
-      "SQL QUERY": [""],
       "${tableName\n                        .split('')\n                        .slice(0, tableName.length - 1)\n                        .join('')}\n                    ": [
         ""
       ],
       "You don't have any favorites yet!": [""],
-      "SQL LAB QUERIES": [""],
+      "SQL Lab queries": ["Vista de Laboratorio SQL"],
       "${tableName}": ["Nombre Tabla"],
       "query": ["Consulta"],
       "Share": [""],
@@ -2269,24 +2288,24 @@
       "Recents": [""],
       "Select start and end date": ["Seleciona fecha de inicio y de fin"],
       "Type or Select [%s]": ["Escribe o Seleciona [%s]"],
-      "Filter Box": ["Caja de filtro"],
-      "Filters Configuration": [""],
+      "Filter box": ["Caja de filtro"],
+      "Filters configuration": ["Configuración"],
       "Filter configuration for the filter box": [""],
-      "Date Filter": ["Filtro de Fecha"],
+      "Date filter": ["Filtro de Fecha"],
       "Whether to include a time filter": ["Mostrar un filtro de tiempo"],
-      "Instant Filtering": ["Filtrado Instantáneo"],
+      "Instant filtering": ["Filtrado Instantáneo"],
       "Check to apply filters instantly as they change instead of displaying [Apply] button": [
         ""
       ],
-      "Show SQL Granularity Dropdown": [""],
-      "Check to include SQL Granularity dropdown": [""],
-      "Show SQL Time Column": [""],
-      "Check to include Time Column dropdown": [""],
-      "Show Druid Granularity Dropdown": [""],
-      "Check to include Druid Granularity dropdown": [""],
-      "Show Druid Time Origin": [""],
-      "Check to include Time Origin dropdown": [""],
-      "Limit Selector Values": [""],
+      "Show SQL granularity dropdown": [""],
+      "Check to include SQL granularity dropdown": [""],
+      "Show SQL time column": ["Mostrar Columna Druid"],
+      "Check to include time column dropdown": ["Mostrar un filtro de tiempo"],
+      "Show Druid granularity dropdown": [""],
+      "Check to include Druid granularity dropdown": [""],
+      "Show Druid time origin": ["Mostrar Métrica Druid"],
+      "Check to include time origin dropdown": ["Mostrar un filtro de tiempo"],
+      "Limit selector values": [""],
       "These filters apply to the values available in the dropdowns": [""],
       "Time-series Table": [""]
     }
diff --git a/superset/translations/es/LC_MESSAGES/messages.po b/superset/translations/es/LC_MESSAGES/messages.po
index 0077f05..19afda9 100644
--- a/superset/translations/es/LC_MESSAGES/messages.po
+++ b/superset/translations/es/LC_MESSAGES/messages.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-19 07:47-0300\n"
+"POT-Creation-Date: 2021-01-22 15:56-0300\n"
 "PO-Revision-Date: 2018-11-03 00:11+0100\n"
 "Last-Translator: Ruben Sastre <ru...@decathlon.com>\n"
 "Language-Team: Español; Castellano <>\n"
@@ -32,7 +32,6 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:339
 #: superset/app.py:230 superset/views/annotations.py:119
 msgid "Annotation Layers"
 msgstr "Capas de Anotación"
@@ -48,8 +47,8 @@ msgstr "Administrar"
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: superset-frontend/src/explore/components/ControlPanelsContainer.jsx:245
-#: superset-frontend/src/explore/components/DataTablesPane.tsx:250
+#: 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
@@ -81,7 +80,6 @@ msgstr "Dashboards"
 msgid "Plugins"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:240
 #: superset/app.py:283 superset/views/css_templates.py:38
 msgid "CSS Templates"
 msgstr "Plantillas CSS"
@@ -107,13 +105,10 @@ msgstr "Editor SQL"
 msgid "SQL Lab"
 msgstr "Laboratorio SQL"
 
-#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:87
-#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:145 superset/app.py:352
+#: superset/app.py:352
 msgid "Saved Queries"
 msgstr "Consultas Guardadas"
 
-#: superset-frontend/src/SqlLab/components/SouthPane.jsx:180
-#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:100
 #: superset/app.py:359
 msgid "Query History"
 msgstr "Historial de la Consulta"
@@ -142,7 +137,7 @@ msgstr "Programar Gráfico"
 msgid "Alerts"
 msgstr "Alertas"
 
-#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:411 superset/app.py:448
+#: superset/app.py:448
 msgid "Alerts & Reports"
 msgstr ""
 
@@ -420,19 +415,19 @@ msgstr "No se puede superponer Series y Distribuciones"
 msgid "Pick at least one field for [Series]"
 msgstr "Elige al menos un campo para [Series]"
 
-#: superset/viz.py:1701 superset/viz_sip38.py:1659
+#: superset/viz.py:1702 superset/viz_sip38.py:1659
 msgid "Sunburst"
 msgstr "Sunburst"
 
-#: superset/viz.py:1747 superset/viz_sip38.py:1703
+#: superset/viz.py:1748 superset/viz_sip38.py:1703
 msgid "Sankey"
 msgstr "Sankey"
 
-#: superset/viz.py:1755
+#: superset/viz.py:1756
 msgid "Pick exactly 2 columns as [Source / Target]"
 msgstr "Elige exactamente 2 columnas como [Origen / Destino]"
 
-#: superset/viz.py:1799 superset/viz_sip38.py:1736
+#: superset/viz.py:1800 superset/viz_sip38.py:1736
 msgid ""
 "There's a loop in your Sankey, please provide a tree. Here's a faulty link: "
 "{}"
@@ -440,136 +435,136 @@ msgstr ""
 "Hay un bucle en tu Sankey, por favor proporciona un árbol. Aquí hay un "
 "enlace defectuoso: {}"
 
-#: superset/viz.py:1812 superset/viz.py:1835 superset/viz_sip38.py:1749
+#: superset/viz.py:1813 superset/viz.py:1836 superset/viz_sip38.py:1749
 #: superset/viz_sip38.py:1770
 msgid "Directed Force Layout"
 msgstr "Disposición Dirigida Forzado"
 
-#: superset/viz.py:1819 superset/viz_sip38.py:1756
+#: superset/viz.py:1820 superset/viz_sip38.py:1756
 msgid "Pick exactly 2 columns to 'Group By'"
 msgstr "Elija exactamente 2 columnas para 'Agrupar por'"
 
-#: superset/viz.py:1868 superset/viz_sip38.py:1802
+#: superset/viz.py:1869 superset/viz_sip38.py:1802
 msgid "Country Map"
 msgstr "Mapa de País"
 
-#: superset/viz.py:1897 superset/viz_sip38.py:1823
+#: superset/viz.py:1898 superset/viz_sip38.py:1823
 msgid "World Map"
 msgstr "Mapa Mundial"
 
 #: superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx:438
-#: superset-frontend/src/explore/controls.jsx:467 superset/viz.py:1955
+#: superset-frontend/src/explore/controls.jsx:467 superset/viz.py:1956
 #: superset/viz_sip38.py:1873
 msgid "Filters"
 msgstr "Filtros"
 
-#: superset/viz.py:1973 superset/viz_sip38.py:1891
+#: superset/viz.py:1974 superset/viz_sip38.py:1891
 msgid "Invalid filter configuration, please select a column"
 msgstr "Configuración de filtro invalido, por favor selecciona una columna"
 
-#: superset/viz.py:2017 superset/viz_sip38.py:1952
+#: superset/viz.py:2018 superset/viz_sip38.py:1952
 msgid "Parallel Coordinates"
 msgstr "Coordenadas Paralelas"
 
-#: superset/viz.py:2039 superset/viz_sip38.py:1968
+#: superset/viz.py:2040 superset/viz_sip38.py:1968
 msgid "Heatmap"
 msgstr "Mapa de Calor"
 
-#: superset/viz.py:2095 superset/viz_sip38.py:2017
+#: superset/viz.py:2096 superset/viz_sip38.py:2017
 msgid "Horizon Charts"
 msgstr "Gráficos de Horizontes"
 
-#: superset/viz.py:2107 superset/viz_sip38.py:2029
+#: superset/viz.py:2108 superset/viz_sip38.py:2029
 msgid "Mapbox"
 msgstr "Caja de Mapa"
 
-#: superset/viz.py:2119 superset/viz_sip38.py:2041
+#: superset/viz.py:2120 superset/viz_sip38.py:2041
 msgid "[Longitude] and [Latitude] must be set"
 msgstr "Configura la [Longitud] y [Latitud]"
 
-#: superset/viz.py:2126 superset/viz_sip38.py:2048
+#: superset/viz.py:2127 superset/viz_sip38.py:2048
 msgid "Must have a [Group By] column to have 'count' as the [Label]"
 msgstr ""
 "Debe tener una columna [Agrupar por] para tener 'contar' como la [Etiqueta]"
 
-#: superset/viz.py:2146 superset/viz_sip38.py:2068
+#: superset/viz.py:2147 superset/viz_sip38.py:2068
 msgid "Choice of [Label] must be present in [Group By]"
 msgstr "La opción de [Etiqueta] debe estar presente en [Agrupar por]"
 
-#: superset/viz.py:2154 superset/viz_sip38.py:2075
+#: superset/viz.py:2155 superset/viz_sip38.py:2075
 msgid "Choice of [Point Radius] must be present in [Group By]"
 msgstr "La opción de [Radio de puntos] debe estar presente en [Agrupar por]"
 
-#: superset/viz.py:2162 superset/viz_sip38.py:2082
+#: superset/viz.py:2163 superset/viz_sip38.py:2082
 msgid "[Longitude] and [Latitude] columns must be present in [Group By]"
 msgstr ""
 "Las columnas [Longitud] y [Latitud] deben estar presentes en [Agrupar por]"
 
-#: superset/viz.py:2242 superset/viz_sip38.py:2162
+#: superset/viz.py:2243 superset/viz_sip38.py:2162
 msgid "Deck.gl - Multiple Layers"
 msgstr "Deck.gl - Capas Multiples"
 
-#: superset/viz.py:2282 superset/viz.py:2314 superset/viz_sip38.py:2218
+#: superset/viz.py:2283 superset/viz.py:2315 superset/viz_sip38.py:2218
 msgid "Bad spatial key"
 msgstr ""
 
-#: superset/viz.py:2300 superset/viz_sip38.py:2204
+#: superset/viz.py:2301 superset/viz_sip38.py:2204
 #, python-format
 msgid "Invalid spatial point encountered: %s"
 msgstr ""
 
-#: superset/viz.py:2336 superset/viz_sip38.py:2240
+#: superset/viz.py:2337 superset/viz_sip38.py:2240
 msgid ""
 "Encountered invalid NULL spatial "
 "entry,                                        please consider filtering "
 "those out"
 msgstr ""
 
-#: superset/viz.py:2426 superset/viz_sip38.py:2311
+#: superset/viz.py:2427 superset/viz_sip38.py:2311
 msgid "Deck.gl - Scatter plot"
 msgstr ""
 
-#: superset/viz.py:2475 superset/viz_sip38.py:2358
+#: superset/viz.py:2476 superset/viz_sip38.py:2358
 msgid "Deck.gl - Screen Grid"
 msgstr ""
 
-#: superset/viz.py:2501 superset/viz_sip38.py:2384
+#: superset/viz.py:2502 superset/viz_sip38.py:2384
 msgid "Deck.gl - 3D Grid"
 msgstr ""
 
-#: superset/viz.py:2531 superset/viz_sip38.py:2411
+#: superset/viz.py:2532 superset/viz_sip38.py:2411
 msgid "Deck.gl - Paths"
 msgstr ""
 
-#: superset/viz.py:2579 superset/viz_sip38.py:2456
+#: superset/viz.py:2580 superset/viz_sip38.py:2456
 msgid "Deck.gl - Polygon"
 msgstr ""
 
-#: superset/viz.py:2608 superset/viz_sip38.py:2485
+#: superset/viz.py:2609 superset/viz_sip38.py:2485
 msgid "Deck.gl - 3D HEX"
 msgstr ""
 
-#: superset/viz.py:2627 superset/viz_sip38.py:2501
+#: superset/viz.py:2628 superset/viz_sip38.py:2501
 msgid "Deck.gl - GeoJSON"
 msgstr ""
 
-#: superset/viz.py:2646 superset/viz_sip38.py:2513
+#: superset/viz.py:2647 superset/viz_sip38.py:2513
 msgid "Deck.gl - Arc"
 msgstr ""
 
-#: superset/viz.py:2681 superset/viz_sip38.py:2548
+#: superset/viz.py:2682 superset/viz_sip38.py:2548
 msgid "Event flow"
 msgstr "Flujo de Evento"
 
-#: superset/viz.py:2713 superset/viz_sip38.py:2580
+#: superset/viz.py:2714 superset/viz_sip38.py:2580
 msgid "Time Series - Paired t-test"
 msgstr "Serie Temporal - Prueba-T Pareada"
 
-#: superset/viz.py:2768 superset/viz_sip38.py:2635
+#: superset/viz.py:2769 superset/viz_sip38.py:2635
 msgid "Time Series - Nightingale Rose Chart"
 msgstr "Serie Temporal - Gráfico de Nightingale Rose"
 
-#: superset/viz.py:2803 superset/viz_sip38.py:2670
+#: superset/viz.py:2804 superset/viz_sip38.py:2670
 msgid "Partition Diagram"
 msgstr "Partición de diagrama"
 
@@ -687,7 +682,11 @@ msgid_plural "Deleted %(num)d charts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: superset/charts/api.py:566 superset/charts/api.py:638
+#: superset/charts/api.py:563
+msgid "Request is not JSON"
+msgstr ""
+
+#: superset/charts/api.py:571 superset/charts/api.py:643
 #, python-format
 msgid "Request is incorrect: %(error)s"
 msgstr ""
@@ -813,7 +812,7 @@ msgstr "la(s) métrica(s) {} tiene que ser agregaciones"
 msgid "Unsupported extraction function: "
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:988
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:994
 #: superset-frontend/src/explore/components/DatasourcePanel.tsx:231
 #: superset-frontend/src/explore/controls.jsx:251
 #: superset/connectors/druid/views.py:56 superset/connectors/sqla/views.py:63
@@ -833,7 +832,7 @@ msgid "Edit Druid Column"
 msgstr "Editar Columna Druid"
 
 #: superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx:31
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:204
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:209
 #: superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx:137
 #: superset-frontend/src/explore/components/controls/SpatialControl.jsx:193
 #: superset/connectors/druid/views.py:77 superset/connectors/sqla/views.py:134
@@ -847,7 +846,7 @@ msgstr "Columna"
 msgid "Type"
 msgstr "Tipo"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:163
+#: 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"
@@ -868,7 +867,7 @@ msgstr ""
 "Si esta columna está expuesta en la sección `Filtros` de la vista de "
 "exploración."
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:977
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:983
 #: superset-frontend/src/explore/components/DatasourcePanel.tsx:218
 #: superset-frontend/src/explore/controls.jsx:153
 #: superset/connectors/druid/views.py:143 superset/connectors/sqla/views.py:193
@@ -887,7 +886,7 @@ msgstr "Añadir Métricas Druid"
 msgid "Edit Druid Metric"
 msgstr "Editar Métricas Druid"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:831
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:836
 #: 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
@@ -896,11 +895,11 @@ msgstr "Métrica"
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:128
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:161
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:151
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:155
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:513
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:845
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:849
+#: 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
@@ -920,7 +919,7 @@ msgstr "Descripción"
 msgid "Verbose Name"
 msgstr "Nombre detallado"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:735
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:740
 #: superset/connectors/druid/views.py:175 superset/views/log/__init__.py:33
 msgid "JSON"
 msgstr "JSON"
@@ -929,8 +928,6 @@ msgstr "JSON"
 msgid "Druid Datasource"
 msgstr "Fuente de datos Druid"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:861
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:869
 #: superset/connectors/druid/views.py:177 superset/connectors/sqla/views.py:244
 msgid "Warning Message"
 msgstr "Mensaje de Aviso"
@@ -971,8 +968,6 @@ msgstr ""
 msgid "Broker Endpoint"
 msgstr "Endpoint Broker"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:597
-#: superset-frontend/src/explore/components/PropertiesModal.tsx:238
 #: superset/connectors/druid/views.py:221
 #: superset/connectors/druid/views.py:331 superset/connectors/sqla/views.py:459
 #: superset/views/chart/mixin.py:77
@@ -1071,7 +1066,7 @@ msgid "Cluster"
 msgstr "Cluster"
 
 #: superset-frontend/src/dashboard/components/PropertiesModal.jsx:358
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:567
+#: 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
@@ -1229,11 +1224,11 @@ msgstr "Tabla"
 msgid "Expression"
 msgstr "Expresión"
 
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:212
 #: superset/connectors/sqla/views.py:141
 msgid "Is temporal"
 msgstr "Es temporal"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:170
 #: superset/connectors/sqla/views.py:142
 msgid "Datetime Format"
 msgstr "Formato FechaHora"
@@ -1254,18 +1249,15 @@ msgstr "Añadir Métrica"
 msgid "Edit Metric"
 msgstr "Editar Métrica"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:130
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:833
 #: superset/connectors/sqla/views.py:240
 msgid "SQL Expression"
 msgstr "Expresión SQL"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:855
 #: superset/connectors/sqla/views.py:242
 msgid "D3 Format"
 msgstr "Formato D3"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:549
+#: 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
@@ -1398,7 +1390,7 @@ msgstr "Redirige a este punto al hacer clic en la tabla de la lista de tablas"
 msgid "Whether the table was generated by the 'Visualize' flow in SQL Lab"
 msgstr ""
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:612
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:617
 #: superset/connectors/sqla/views.py:431
 msgid ""
 "A set of parameters that become available in the query using Jinja "
@@ -1461,7 +1453,8 @@ msgstr "Columna principal de fecha y hora"
 msgid "SQL Lab View"
 msgstr "Vista de Laboratorio SQL"
 
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:611
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx:125
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:616
 #: superset/connectors/sqla/views.py:466
 msgid "Template parameters"
 msgstr "Parametros de plantilla"
@@ -1605,7 +1598,7 @@ msgstr "Los parametros del Gráfico son invalidos"
 msgid "A database with the same name already exists"
 msgstr "La fuente de datos %(name)s ya existe"
 
-#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:184
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterConfigForm.tsx:169
 #: superset/databases/commands/exceptions.py:49
 msgid "Field is required"
 msgstr ""
@@ -1906,7 +1899,7 @@ msgstr "No esta permitido modificar este Gráfico"
 msgid "An error occurred while pruning logs "
 msgstr "Ocurrió un error al crear la visualización: %s"
 
-#: superset/reports/notifications/email.py:59 superset/tasks/schedules.py:182
+#: superset/reports/notifications/email.py:59 superset/tasks/schedules.py:185
 #, python-format
 msgid ""
 "\n"
@@ -1915,8 +1908,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: superset/reports/notifications/email.py:70 superset/tasks/schedules.py:291
-#: superset/tasks/schedules.py:460
+#: superset/reports/notifications/email.py:70 superset/tasks/schedules.py:294
+#: superset/tasks/schedules.py:463
 #, python-format
 msgid "%(prefix)s %(title)s"
 msgstr ""
@@ -1931,7 +1924,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: superset/tasks/schedules.py:157
+#: superset/tasks/schedules.py:160
 #, python-format
 msgid ""
 "\n"
@@ -1941,17 +1934,17 @@ msgid ""
 "        "
 msgstr ""
 
-#: superset/tasks/schedules.py:169 superset/tasks/schedules.py:360
+#: superset/tasks/schedules.py:172 superset/tasks/schedules.py:363
 #, python-format
 msgid "<b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>"
 msgstr ""
 
-#: superset/tasks/schedules.py:359
+#: superset/tasks/schedules.py:362
 #, python-format
 msgid "%(name)s.csv"
 msgstr ""
 
-#: superset/tasks/schedules.py:367
+#: superset/tasks/schedules.py:370
 #, python-format
 msgid ""
 "\n"
@@ -1961,7 +1954,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: superset/tasks/schedules.py:654
+#: superset/tasks/schedules.py:656
 #, python-format
 msgid "[Alert] %(label)s"
 msgstr ""
@@ -1970,7 +1963,6 @@ msgstr ""
 msgid "New"
 msgstr "Nuevo"
 
-#: superset-frontend/src/components/Menu/NewMenu.tsx:26
 #: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1144
 #: superset/templates/appbuilder/navbar_right.html:38
 msgid "SQL Query"
@@ -2081,13 +2073,13 @@ msgid "Request Permissions"
 msgstr "Solicitar Permisos"
 
 #: superset-frontend/src/SqlLab/components/SaveQuery.tsx:176
-#: superset-frontend/src/common/components/Modal/Modal.tsx:144
+#: 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:437
-#: superset-frontend/src/datasource/DatasourceModal.tsx:211
+#: 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:169
+#: superset-frontend/src/explore/components/SaveModal.tsx:174
 #: superset-frontend/src/explore/components/controls/AnnotationLayer.jsx:749
 #: superset/templates/superset/request_access.html:34
 msgid "Cancel"
@@ -2097,7 +2089,6 @@ msgstr "Cancelar"
 msgid "Use the edit buttom to change this field"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:399
 #: superset/templates/superset/models/database/macros.html:22
 msgid "Test Connection"
 msgstr "Probar Conexión"
@@ -2225,9 +2216,6 @@ msgstr "URL de la Base de datos"
 msgid "Roles to grant"
 msgstr "Roles a conceder"
 
-#: 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/views/access_requests.py:45 superset/views/schedules.py:224
 #: superset/views/schedules.py:287
 msgid "Created On"
@@ -2241,7 +2229,6 @@ msgstr ""
 msgid "Show Observation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:127
 #: superset/views/alerts.py:67
 msgid "Error Message"
 msgstr "Mensaje de Aviso"
@@ -2286,13 +2273,10 @@ msgstr "Anotaciones"
 msgid "Show Annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
 #: superset/views/annotations.py:62
 msgid "Add Annotation"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:180
-#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:265
 #: superset/views/annotations.py:63
 msgid "Edit Annotation"
 msgstr ""
@@ -2302,10 +2286,10 @@ msgid "Layer"
 msgstr ""
 
 #: superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx:148
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:141
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:145
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:832
-#: superset-frontend/src/datasource/DatasourceEditor.jsx:840
+#: 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/views/annotations.py:79 superset/views/sql_lab.py:70
@@ -2322,7 +2306,6 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: superset-frontend/src/dashboard/components/PropertiesModal.jsx:400
 #: superset/views/annotations.py:83 superset/views/dashboard/mixin.py:82
 msgid "JSON Metadata"
 msgstr "Metadatos JSON"
@@ -2331,14 +2314,10 @@ msgstr "Metadatos JSON"
 msgid "Show 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
 #: superset/views/annotations.py:121
 msgid "Add Annotation Layer"
 msgstr ""
 
-#: superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx:166
 #: superset/views/annotations.py:122
 msgid "Edit Annotation Layer"
 msgstr ""
@@ -2587,7 +2566,6 @@ msgstr ""
 msgid "Show CSS Template"
 msgstr ""
 
-#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:237
 #: superset/views/css_templates.py:40
 msgid "Add CSS Template"
 msgstr ""
@@ -2709,11 +2687,11 @@ msgstr "Pop Tab Link"
 msgid "Changed on"
 msgstr "Cambiado el"
 
-#: superset/views/utils.py:485
+#: superset/views/utils.py:492
 msgid "Could not determine datasource type"
 msgstr ""
 
-#: superset/views/utils.py:501
+#: superset/views/utils.py:508
... 37604 lines suppressed ...