From f5148ef728ce649697c10fb7aa65982d7dd05638 Mon Sep 17 00:00:00 2001 From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:31:28 -0300 Subject: [PATCH] feat: Migrates Dual Line Chart to Mixed Chart (#23910) --- .../explore/visualizations/dual_line.test.js | 84 ---- .../DualLine/Stories.tsx | 29 -- .../legacy-preset-chart-nvd3/DualLine/data.ts | 390 ------------------ .../DualLine/stories/basic.tsx | 40 -- .../stories/verifyConsistentColors.tsx | 65 --- .../src/DualLine/controlPanel.ts | 77 ---- .../src/DualLine/images/example.jpg | Bin 121614 -> 0 bytes .../src/DualLine/images/thumbnail.png | Bin 15531 -> 0 bytes .../src/DualLine/images/thumbnailLarge.png | Bin 41864 -> 0 bytes .../src/DualLine/index.js | 47 --- .../legacy-preset-chart-nvd3/src/NVD3Vis.js | 9 +- .../legacy-preset-chart-nvd3/src/index.js | 1 - .../legacy-preset-chart-nvd3/src/preset.js | 2 - .../src/transformProps.js | 6 - .../VizTypeControl/VizTypeGallery.tsx | 1 - .../src/visualizations/presets/MainPreset.js | 2 - superset/examples/birth_names.py | 11 +- .../shared/migrate_viz/processors.py | 19 + ...e58e5c_migrate_dual_line_to_mixed_chart.py | 37 ++ .../translations/de/LC_MESSAGES/messages.json | 18 - .../translations/de/LC_MESSAGES/messages.po | 44 +- .../translations/en/LC_MESSAGES/messages.json | 10 - .../translations/en/LC_MESSAGES/messages.po | 50 +-- .../translations/es/LC_MESSAGES/messages.json | 14 - .../translations/es/LC_MESSAGES/messages.po | 52 +-- .../translations/fr/LC_MESSAGES/messages.json | 12 - .../translations/fr/LC_MESSAGES/messages.po | 52 +-- .../translations/it/LC_MESSAGES/messages.json | 14 - .../translations/it/LC_MESSAGES/messages.po | 52 +-- .../translations/ja/LC_MESSAGES/messages.json | 8 - .../translations/ja/LC_MESSAGES/messages.po | 52 +-- .../translations/ko/LC_MESSAGES/messages.json | 10 - .../translations/ko/LC_MESSAGES/messages.po | 50 +-- superset/translations/messages.pot | 50 +-- .../translations/nl/LC_MESSAGES/messages.json | 16 - .../translations/nl/LC_MESSAGES/messages.po | 50 +-- .../translations/pt/LC_MESSAGES/messages.json | 14 - .../translations/pt/LC_MESSAGES/messages.po | 52 +-- .../pt_BR/LC_MESSAGES/messages.json | 21 +- .../pt_BR/LC_MESSAGES/messages.po | 10 +- .../translations/ru/LC_MESSAGES/messages.json | 12 - .../translations/ru/LC_MESSAGES/messages.po | 50 +-- .../translations/sk/LC_MESSAGES/messages.json | 10 - .../translations/sk/LC_MESSAGES/messages.po | 50 +-- .../translations/sl/LC_MESSAGES/messages.json | 12 - .../translations/sl/LC_MESSAGES/messages.po | 52 +-- .../translations/zh/LC_MESSAGES/messages.json | 10 - .../translations/zh/LC_MESSAGES/messages.po | 50 +-- superset/viz.py | 76 ---- .../viz/dual_line_to_mixed_chart_test.py | 97 +++++ 50 files changed, 325 insertions(+), 1565 deletions(-) delete mode 100644 superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dual_line.test.js delete mode 100644 superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/Stories.tsx delete mode 100644 superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/data.ts delete mode 100644 superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/basic.tsx delete mode 100644 superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/verifyConsistentColors.tsx delete mode 100644 superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts delete mode 100644 superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/example.jpg delete mode 100644 superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png delete mode 100644 superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnailLarge.png delete mode 100644 superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js create mode 100644 superset/migrations/versions/2023-06-08_11-34_ae58e1e58e5c_migrate_dual_line_to_mixed_chart.py create mode 100644 tests/unit_tests/migrations/viz/dual_line_to_mixed_chart_test.py diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dual_line.test.js b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dual_line.test.js deleted file mode 100644 index d31196b95..000000000 --- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/dual_line.test.js +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -describe('Visualization > Dual Line', () => { - beforeEach(() => { - cy.intercept('POST', '/superset/explore_json/**').as('getJson'); - }); - - const DUAL_LINE_FORM_DATA = { - datasource: '3__table', - viz_type: 'dual_line', - slice_id: 58, - granularity_sqla: 'ds', - time_grain_sqla: 'P1D', - time_range: '100 years ago : now', - color_scheme: 'bnbColors', - x_axis_format: 'smart_date', - metric: 'sum__num', - y_axis_format: '.3s', - metric_2: 'count', - y_axis_2_format: '.3s', - adhoc_filters: [], - annotation_layers: [], - }; - - function verify(formData) { - cy.visitChartByParams(formData); - cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' }); - } - - it('should work', () => { - verify(DUAL_LINE_FORM_DATA); - cy.get('.chart-container svg path.nv-line').should('have.length', 2); - }); - - it('should work with filter', () => { - verify({ - ...DUAL_LINE_FORM_DATA, - adhoc_filters: [ - { - expressionType: 'SIMPLE', - subject: 'gender', - operator: '==', - comparator: 'girl', - clause: 'WHERE', - sqlExpression: null, - filterOptionName: 'filter_1ep6q50g8vk_48jj6qxdems', - }, - ], - }); - cy.get('.chart-container svg path.nv-line').should('have.length', 2); - }); - - it('should allow type to search color schemes and apply the scheme', () => { - verify(DUAL_LINE_FORM_DATA); - - cy.get('#controlSections-tab-display').click(); - cy.get('.Control[data-test="color_scheme"]').scrollIntoView(); - cy.get('.Control[data-test="color_scheme"] input[type="search"]') - .focus() - .type('supersetColors{enter}'); - cy.get( - '.Control[data-test="color_scheme"] .ant-select-selection-item [data-test="supersetColors"]', - ).should('exist'); - cy.get('.dual_line .nv-legend .nv-legend-symbol') - .first() - .should('have.css', 'fill', 'rgb(31, 168, 201)'); - }); -}); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/Stories.tsx deleted file mode 100644 index 232029029..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/Stories.tsx +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { DualLineChartPlugin } from '@superset-ui/legacy-preset-chart-nvd3'; - -new DualLineChartPlugin().configure({ key: 'dual-line' }).register(); - -export default { - title: 'Legacy Chart Plugins/legacy-preset-chart-nvd3/DualLine', -}; - -export { basic } from './stories/basic'; -export { verifyConsistentColors } from './stories/verifyConsistentColors'; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/data.ts b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/data.ts deleted file mode 100644 index 6cc99c0fc..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/data.ts +++ /dev/null @@ -1,390 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* eslint-disable sort-keys, no-magic-numbers */ -export default [ - { - key: 'avg__num', - classed: '', - values: [ - { - x: -157766400000.0, - y: 1435.6116838487972, - }, - { - x: -126230400000.0, - y: 1359.0295103957076, - }, - { - x: -94694400000.0, - y: 1291.0963777490297, - }, - { - x: -63158400000.0, - y: 1254.5405915670233, - }, - { - x: -31536000000.0, - y: 1244.9671332927571, - }, - { - x: 0.0, - y: 1248.7126843657818, - }, - { - x: 31536000000.0, - y: 1147.4195205479452, - }, - { - x: 63072000000.0, - y: 1036.6540632054175, - }, - { - x: 94694400000.0, - y: 980.8740906547285, - }, - { - x: 126230400000.0, - y: 971.1190345584201, - }, - { - x: 157766400000.0, - y: 947.5531453362256, - }, - { - x: 189302400000.0, - y: 962.4153005464481, - }, - { - x: 220924800000.0, - y: 1004.2832876712329, - }, - { - x: 252460800000.0, - y: 1000.6107784431138, - }, - { - x: 283996800000.0, - y: 1045.711965349215, - }, - { - x: 315532800000.0, - y: 1089.5097402597403, - }, - { - x: 347155200000.0, - y: 1094.7375201288244, - }, - { - x: 378691200000.0, - y: 1113.3569511540527, - }, - { - x: 410227200000.0, - y: 1117.585260892953, - }, - { - x: 441763200000.0, - y: 1117.1530230069557, - }, - { - x: 473385600000.0, - y: 1143.6297297297297, - }, - { - x: 504921600000.0, - y: 1131.3461538461538, - }, - { - x: 536457600000.0, - y: 1137.0865800865802, - }, - { - x: 567993600000.0, - y: 1144.3100483610963, - }, - { - x: 599616000000.0, - y: 1153.075821845175, - }, - { - x: 631152000000.0, - y: 1170.1328, - }, - { - x: 662688000000.0, - y: 1134.3757412398922, - }, - { - x: 694224000000.0, - y: 1102.478189749182, - }, - { - x: 725846400000.0, - y: 1065.1231527093596, - }, - { - x: 757382400000.0, - y: 1035.223574986165, - }, - { - x: 788918400000.0, - y: 997.9584026622297, - }, - { - x: 820454400000.0, - y: 976.4625698324022, - }, - { - x: 852076800000.0, - y: 953.0983698707139, - }, - { - x: 883612800000.0, - y: 961.3199079401611, - }, - { - x: 915148800000.0, - y: 962.3351032448378, - }, - { - x: 946684800000.0, - y: 967.1753012048192, - }, - { - x: 978307200000.0, - y: 955.8330218068536, - }, - { - x: 1009843200000.0, - y: 947.7684413085311, - }, - { - x: 1041379200000.0, - y: 951.2866622428667, - }, - { - x: 1072915200000.0, - y: 913.469184890656, - }, - { - x: 1104537600000.0, - y: 910.3797643797644, - }, - { - x: 1136073600000.0, - y: 910.0478229835832, - }, - { - x: 1167609600000.0, - y: 886.5323636363636, - }, - { - x: 1199145600000.0, - y: 854.5530769230769, - }, - ], - yAxis: 1, - type: 'line', - }, - { - key: 'sum__num', - classed: '', - values: [ - { - x: -157766400000.0, - y: 2088815, - }, - { - x: -126230400000.0, - y: 2026313, - }, - { - x: -94694400000.0, - y: 1996035, - }, - { - x: -63158400000.0, - y: 1993465, - }, - { - x: -31536000000.0, - y: 2045481, - }, - { - x: 0.0, - y: 2116568, - }, - { - x: 31536000000.0, - y: 2010279, - }, - { - x: 63072000000.0, - y: 1836951, - }, - { - x: 94694400000.0, - y: 1752822, - }, - { - x: 126230400000.0, - y: 1770350, - }, - { - x: 157766400000.0, - y: 1747288, - }, - { - x: 189302400000.0, - y: 1761220, - }, - { - x: 220924800000.0, - y: 1832817, - }, - { - x: 252460800000.0, - y: 1838122, - }, - { - x: 283996800000.0, - y: 1931430, - }, - { - x: 315532800000.0, - y: 2013414, - }, - { - x: 347155200000.0, - y: 2039496, - }, - { - x: 378691200000.0, - y: 2074184, - }, - { - x: 410227200000.0, - y: 2077591, - }, - { - x: 441763200000.0, - y: 2087959, - }, - { - x: 473385600000.0, - y: 2115715, - }, - { - x: 504921600000.0, - y: 2088465, - }, - { - x: 536457600000.0, - y: 2101336, - }, - { - x: 567993600000.0, - y: 2129561, - }, - { - x: 599616000000.0, - y: 2174701, - }, - { - x: 631152000000.0, - y: 2193999, - }, - { - x: 662688000000.0, - y: 2104267, - }, - { - x: 694224000000.0, - y: 2021945, - }, - { - x: 725846400000.0, - y: 1945980, - }, - { - x: 757382400000.0, - y: 1870649, - }, - { - x: 788918400000.0, - y: 1799319, - }, - { - x: 820454400000.0, - y: 1747868, - }, - { - x: 852076800000.0, - y: 1695562, - }, - { - x: 883612800000.0, - y: 1670774, - }, - { - x: 915148800000.0, - y: 1631158, - }, - { - x: 946684800000.0, - y: 1605511, - }, - { - x: 978307200000.0, - y: 1534112, - }, - { - x: 1009843200000.0, - y: 1477571, - }, - { - x: 1041379200000.0, - y: 1433589, - }, - { - x: 1072915200000.0, - y: 1378425, - }, - { - x: 1104537600000.0, - y: 1313678, - }, - { - x: 1136073600000.0, - y: 1274977, - }, - { - x: 1167609600000.0, - y: 1218982, - }, - { - x: 1199145600000.0, - y: 1110919, - }, - ], - yAxis: 2, - type: 'line', - }, -]; diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/basic.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/basic.tsx deleted file mode 100644 index aa58980f5..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/basic.tsx +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -export const basic = () => ( - -); diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/verifyConsistentColors.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/verifyConsistentColors.tsx deleted file mode 100644 index 779332ba1..000000000 --- a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-nvd3/DualLine/stories/verifyConsistentColors.tsx +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import dummyDatasource from '../../../../../shared/dummyDatasource'; -import data from '../data'; - -const reverseData = data.map(series => ({ - ...series, - yAxis: series.yAxis === 1 ? 2 : 1, -})); - -export const verifyConsistentColors = () => ( -
- - -
-); - -verifyConsistentColors.story = { - name: 'Swap y-axis with consistent color', -}; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts deleted file mode 100644 index 94137d1ae..000000000 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import { t } from '@superset-ui/core'; -import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; -import { - xAxisFormat, - yAxis2Format, - showLegend, - yAxisBounds, - yAxisShowMinmax, - yAxis2Bounds, - yAxis2ShowMinmax, -} from '../NVD3Controls'; - -const config: ControlPanelConfig = { - controlPanelSections: [ - sections.legacyTimeseriesTime, - { - label: t('Chart Options'), - expanded: true, - controlSetRows: [['color_scheme'], [showLegend], [xAxisFormat]], - }, - { - label: t('Y Axis 1'), - expanded: true, - controlSetRows: [ - ['metric'], - ['y_axis_format'], - [yAxisShowMinmax], - [yAxisBounds], - ], - }, - { - label: t('Y Axis 2'), - expanded: true, - controlSetRows: [ - ['metric_2'], - [yAxis2Format], - [yAxis2ShowMinmax], - [yAxis2Bounds], - ], - }, - { - label: t('Query'), - expanded: true, - controlSetRows: [['adhoc_filters']], - }, - sections.annotations, - ], - controlOverrides: { - metric: { - label: t('Left Axis Metric'), - description: t('Choose a metric for left axis'), - }, - y_axis_format: { - label: t('Left Axis Format'), - }, - }, -}; - -export default config; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/example.jpg b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/example.jpg deleted file mode 100644 index d8a13f67e8203a2ab38bcc6104d2b0c9a933a394..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121614 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 I349*?AB#whegFUf diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png deleted file mode 100644 index a62ecfbac4d334ea6c20a67381ed3121a1a6340d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15531 zcmb7rX*^Zm7xzB*x`u0>WtMr!6f(Oandh+#SCo0oOdL}gLoyU{NeH2gA#P-hh(d&G z$Pl5-A&=kxdHuY2-kiP9+UtAvI-j%8S>L_ZI*G=H*D2AgXaE4Ej<%*L0EqK00+1rl zo32v6zVpV-Sl|5G+1c6V=4NAKA%yHlbxNN)6>(Vqoeh;pJAb)GZRzg z<>k4#xo4SKH9n8eK7M@v{{7kZ_E}xS8G&$CSp4bJr^Lj>w^2niou9ihYF^qUjn#hm zh-LX4p|Yr+`!fqAke&ui{XLzSd* z=&9Vxarz%?vp)uN->0cPXfk^=C^zj{H}wBJ1idv0EAY6JTz8mUAv`dalhCyHH&tKP z8_FS@r~Uw4eq5_iv-R0}@AuKs=M!$sow?py@1XD}ns7Z?79Evz7u~In*)DxWmwlBR zr@xONOH8zlH{~bEoKcpl&%vqpW&-w~YCFAlmcHDxY0v2EB@+K(+?rf4{t?qGrOPWh z%SLJ1acv4}@*L;8k#hx%#(xXB3R8_qg;VR*O_j>(rRUJ?vxr&&^bc*l7xkaIsbE{T z=gpQ1F}(TMg5?{$4{pdmH+Yz-FYLl`5=-y@X{*%(N-~60^UTX$ntd1ME6^I>Lnm)S z1l=E6!b>Ru&eU*y9}@REdrH9cuFJf%Jklk@ke&iKhvq3h4n{7ccmernM!njMSrWpy?i0U!o8On9tpY$Q@M_4^7m*&6zataR^{C8dg_Wki$TdFu zk&`FPFz77ehakI=cv+iamO`AkC*sp?>rdiw3ky%XmTL!2uO~V7TB84)o?1k_Bd+kK z_&LZPOj-5IHqsUB3y*f2_}6ul^qV*o-p#mE@Iq~%kvFDfNjHksnXjME1}iLdQuuL! zGrCz`A?4Iez%8ce_3Gto#vXppJf5r!EWdrS^N-f=&8rx}XDc$OIVr(+QkwZbDV}#- zrfpj-zbQ05>SfDe4nqRthW=C9U9NT|?tVlQz^v;}|BT37N2yj)ziz&oZ4#8FS^YUs zqB=dPxo6}=_6;B7;}rnD{AN-&SsyBO7_J+~SvH7UZ7c4o&K#fZxiO!h+pC&me9R?s z3__(6t$vRlGX7zlkNcsE{o2Sj;eDg&8%~w0dI#DVC&7q06zp8-M?(0D((3HJ_`tL~ z2Sl*elTY%aZl#Q)+B=bru~(g)-(Nl(WI9s&vjo0;d|G!a)bX;f6&ge4nBJ;-H-TF- zUpxDU*Zz0#*x>zG-1x_z#dqKtdcgA{-N(L=4ZdZA0A!c)N+TIiq|lYQHWgX$KZI#Rk5sSGBQcfty`XK6x8knE3l^a1q7elMf%`eZ;VXq!wZ38$=1i}U8CY7> zlYo#o%5ZU%^^!aPxnvt;s)7Q&ZD%xWKl_Xcd=BWIL1L!`l(VSe@%0A~w{KW9)3iVb z3Ao)I>W%q;-rm2+Nd#_OQAe~-9JeDz-n^W=D-8biav|Y2)^a?E*+3`_+D^s%wne9( zc2PqZ$``{G06KHuq=qI#?+-r*xAy)5Q2R@WiuBO@3VhElj0jYIS|!)20{tJu#lYk4 zrmy_#knv`(Um5vf@HI6A{+M_-k%2ojDv=0&VzNB3-OnDH7GFwNsrH+ID#%GGf4UNFLKbukjv_wP0>z{GQvmxb@> zDcIPU19d<745gP`f))1sD{F8R{@HctQ0)Q)kPUQ_G{U6sP2}&Bd1Gw$o*a>3LL4OT zps@3?@2`-+Nsbo#s`#||4u=`|kMFn-fcvXI@Csr6w6})?YuWD#T+hf4Uy!MZoT-DW z$1%T!U~4{oOzOqX2hY|($jwA064-*5(Vqn#^TwzBh|&OYpU7u(5MnI>EP591J6kMc#ZFeGJt8e#^k~jW2)kT--QV*Q1ZjwNx`OIyiDDIhTi6jb>PfufiIoLLs zDwcS8n{st&0wD99ylt(AW}t^{i59FLDiJfm)Cj_H%tb>Ku6!>~^>$@dno$wo=3H5} z4ONZ&tNi+>uDseUVf>Cg3U4Pv6lH14&lVF?@@ulYv44&KsTr1i!?LcuK_AL|V|)`= zVx_G)&v(su{q6XG_2H9sWc0+SJh>MyqaN1)Pt}7-xvbl8oB4$u8q;nU1?I$9jkGmHjUOI zd>~P7bA0rBk(&3u>RXm!y3yPHu9o|oo8}kDI;1`z;VI?o0$*DK@9{rpO`36C?E2)I zswgNK8gBF5h93X3MX17EX*Im~5~l;LX1GTD<1D){UN_2P;E0SlXt+#jbE_!7s5H1c zf`HQAL=O3RNFxxR6{7psMSOMe4ocB4YC0?$^7e{WKrNTZ2HhVPS=G1i5kJ-r371nx zNI;V+zbW5^JH~@7PC7-th+=5WpB4M(*pdQB zB|7&yqDWc8intI3RBXMk5aT10Kb6!{jxohctA$EFo0SKie-_fquOqrhVuuj~SFV37 zp#87Wvxm%9{rdsmGjgX$KfD6TO?wN&5RHMw{<{iCFi?AH6GegF)#CO>0SV(1Szw18 z;TmNl!b@zB+obNS0DU_imL`Pp1$h>BD)6gt3R`c1jH#5Y@x|QH|Ap*@xY2cnSij@%!=|5kwsGk6 zwpZUAAjvn%$zN|0pR5jlD?APY0b?H*O-gQA!59fiBKS4xDS;?xXK#pq{>YmQKC>q= zNyW3iL&UwJpaR%{=yzMF5W7p_iDMBr!HMfv(odhy7gFr|F$nj3%^qwp07}wVJ1K4>y4TbN!`hJy>+fxT0fD+Pbn(Rj7 zw|B88Xl{*|cmoui^c(N>86hdJ!qR~tq9iu5gu^04WbMIyMY+$SfU&Y^9f{Yn!{g8!~^V|Zf!|ep55GH|Ho)-AIE7%R9 z(@(5LSUV8L>@;GYte{@C;iSw5Ze2Vd7#MSy zqfr9=LF=J)$?ASlCY?+%0x1byLXPBli~6Gc4O*5SVnu&M&F7T8rlbqB zK^w%@_z6z*(Zvbx`yqs*O+RIs8Xja7xF-e>FGv)~X_0dYP$hM$eK=0qN{b5Jo~z-p z*!jr6_N608I^*Nmw&Q|$d)gfvhi3`Y^ucQy<#vxHGp4@lK3Pv)Uq@T8ob}GWl@zLo zab%HzSxjvxd%#PM+%Cr5=+w}oKtSM?ahQ1^AoyBdpN5|qG>#?NB?92v*u3j zO+;|{jYWP^YcybuW8aBelqtG3FOpOH)7|}gG%K*RSXRtKVC0a)%S2+6)HKoBpDLtY z@VZ{L$Fai6f80IE!BV{MGO+RpL%i@&zJZ48M!lo%qPZ_s47&~i%&*TpB7ob}XrV;` z1@2kyuA71?50;naaNd;V?QnGZgZ8@Kw^KMU6&kGzs@*Fq9xua7zn}$VE)mA{f5nZ^wgG z#cm2DcYD;3NzYA7xR|xMiW;!2QqpoDFfGyR&-NP`F_o9UTt$sUaLW_nABQ%|RfEOF zg(?*0GJ1mq6brv;@yJHc; zH4xPR!4qp~siZdjAUFE3$S7_jb2cr=Ri z*{lp8EHU9Oqa~NKJYOL~j1*0vPrVA?Bn*W>bL9I5VKBOiu0R5x9qIXk1V~^UvJ?U# z-vuGb=cv_m1YRc)?*j<5`ffBmGWY#JIDlEHi97)AeCNS6V+^~w@gzg(bB|2^l`06* zFWF!+#TGB<3418SJx;#w;z}7P&F3~`} zWH}jr4;>5`(30~uiI;$o3zZNgNd|p4fyn~l^YfWb5tJk;#BK_3b|jMs5TT6AM&x(& zQNgCrt{Kt`!mKfx3&ZN9ghvQh@)xpb8WCv?J&o zbkX1y{u78HvGP*d0LzMKE(JG!fsX*pX*l8l;f|tJqX!y@|9tzw6Nw#>w+6m)6i~hy zC}`)N1}wX&l(aHBBmriS%oNlJNy^6?C!}Zq5=Kk`vvUCg7an!XIKkVYi33hV<2IEV zsNkXxIGPKpq`s!mmtU|0f}pa*B?7T%Q(XKYPvmO?J-(;j0l z7KEu;F>(1OG}4=8>e=B$F9CcQ_;)RzO^O<_H3zpjYH7epdeY6DqZAi1qm!O%j|5DV zyU5b&VgtyO4vRXQ`;H@L-NI+~l2UV6oRoqVF1^lF&n)lpKV_BZN1${NeHWM|QGUy3 zv>?E)la8xIXTW+vFz$t}o;+sMOna zj)H`o96lLribyQ}>Z=Z;Ep2Y}+VEniG!-OgiPF4b0T)xjdQUWu+!(^e65Vt!2e~%K zSuEd5NT_`9cnE(W8`h@{?!P}+3{X7%ZsbaW)uO=tB)>7rpTb2~D4_GR%uTU_ceSpF zCVFe)G$8C=FHxJJ^SPEN<_B}VxhS}n&P{ipmW=mxItuh%Bka+~jh3aee~lb%MeO=q z`Kyd?uO{>~ZY|6_9LADhvk@tRW7CxQl}e>3H+|7MQ9QL-eCmV5c%`M<7bS@W{_4V-U4vnlycnl`c4&K4QXCVvLwgYN9%xXD!eU< zg#tMNFyan8tgJGPqVTL;fSo8<6+q_FJh_6jwS(iwsA?ya~47B%Vs8wjiolfUMI z-%zp@uf9fN&)lrds){LKiEbp1TavKWM$Mvrh2Pf>%G1}oRP1m+@%=euOT%#;DlbiZ1acdZc2=tBjsK*4~Mkm?HpvnrFO5Tfe?c7+k-E2*D5UW^oJa{%e{1b;dM1YstWhY^2S zpCU+=7&Ft3>!1d@)arwe;y781Y_bi_;NUR}5qNC}v%-jTK_|Wd2|q4$vnLlydIwC- z%RF~mz8kqMENa(zaVFlj=0|I~W=6iXq_j1SR>tqEwMVKn`%IHM%5VAJ&iPmJeQ4&U z10r^v%AtjIV!!X1r;YPG?=Lj}{_mgq7=P8WW1#ZHOciHZYI9t7@`m&MF002IsL?-*M`u&UIF=Yfs; z@llnied<@1YhNGya+(PKeUy5@IUA*ZF=_i-)Yu6HB2=_`t8#WlTQe?7Q=Y~&9V;#Z1@*C-fJDqH zPr~byX!;m@SgQqbv}8zFIL)Cdn~$N+ln$i#HZD=A!sV-cK`=^WU_<9kPVP4j0s0Tm5exXt9V3P3SDe4YLytWL>fzYK==dtEx;m-Q6jBv zL6=urKp3nuORFf{_HT$Ae+RIxkzb>rVY|??c}^m$E|K7PEaMTmlr%GpI5r|{3e4C{ zwJ~u0LiL>y1aOkwq`+K`dT9)>{|UI&qI&`xSl~OvPGtCXs$ej93oZ?=?*=l{qWnN> z5gCjUiUn`b;Ax{43XHf$5UN3Z{dg=0hg@Gs=AdDNspwWjKuuKxsNZ4MLy;N?P<{Jv z+Q~}rN_E{7O6Wht+d%`XKiA(NzzyUDJ&^K0MEBPlU@Eh~0<>)^fl{5U-ypJg6dD?$kZ#}XQ#<4-TRPdp$(0kAd{yTG96#V*-)r82cNB%;B`v)rp zCyj_N;RsI@?sCE_Q;->iy9d(G-YPNgSz25|C;QVTjpvs1tcRU7DL=X?n`HZ9Q={eY zuSTVw+&L*ngj1tz)6DOmII!A8?`sa2rmY>&1ZgT|c2F)s_l4>`BbE-EhQ^Pvy1xV& z8uRI0&bytfl;v_UKG|Gu{rp}Q}^8M5+j=xlh^xcY7xrH!Yfkr1- zWDBCmY6!hPUcJ$M4uX;m5!})Nmy#{B<1PdvGhXOT9v>ZMQ0%VJ5s#$^hGuvBEichE z-kA9r%mBXm zZZab0_xjw`?>tiV#0B}97o^>8BGE@ll*OolT6^Xe34og&FyS3n{o;UtL*+&+AWnL5 z5+dx2>i#GMT(thw{O@n-8M9MI0ZEOWeZV-nV!&1cf=MZ-yFauSh37f?D!_Nl8Eo(n}ha?y) zEP%0-IZd}6MDtgHgA#}&g3BlZN`VOsJqX#c{C>jb=RU&)SogeDgzzj#{A+-DLn>(o zrZw^Q0KcHoYQpMuV9G~K`>tPmM1u=U(LAwhjpj~1ze=qE(FO|RWcyJU0al;ZqH9&R z{se=ntR{O1*gQlYK!A3qEpG5)k2Bw@22}iU`1Ms-=KM|)#DdMYO2E5NM)C__5Pyn) zfbg{4?trkjRSsD}b|QQafP%N2IsjAtHOj@Ffv~|#e265R+#5yUrDuGr2yVmimuckJ?mp81Bi7_XGSF$a^8Z~fShmKPJs+T64cAJ9{*5{ zPTjvnqJ{?TH4h+Q5=xYth7hBNW&w^S>2EnpktjsL_h*)LihIfo02E=i9=06Nl<3sU7NL4ZU?I;UZUYZXZ+OEjqOazuX`BP@(`~SQVQ?u)|?v5vp zQ1Mz2vTYo@0^dwc|CZ)dM!|XoL0a!>FfmAlm|-){zc=c)r_S=*Phe5KCvSL-#Vn^* zWU)!P^8BGHR}(QWIxM8j>c&Z(hLq%xci*JGT4r=rr&qGHH0?-zmot~K>+tmSG9Qyf zn>;N}UR$M{y0a}mF~p}Lx#Lv(I*PlKUkvqp(u!}mwzdx#H{ zX{v+8Qti~poI9DfC~DoVldU|=E?G38DI0MWvR;}HHqTczZmaN3F?q)Z?&T+1f8o}* z`JR9EIv`B*i?JO;rHS0P<$gMmXJ%RD4+-Ip@}H8KDKJnD49Ne}f-;=stWyx6h@F?% z%${tkkLber2klxQabftRr$F2g1P@&lq%RMs3cCu9k$69DAuuv5P$L2>Uf3gp4JaKo z!0Nr&E2nJW%a7m6BCwO(WS1@cm*^@Iwvkvqd%tj@DCxRrU9>7A-YXm?0bl4%3&CU+ z=?F21F6B@=b@p;Q4p$iL4fB8+V>e*ka|LndL%*7aYY_sOFYIQbi;z^OyU4ivRH3Gx_cmC}3)U zJ~jtU_ZBwMINE4csMdxSM+PRHMRO75*(Bi>@GsPpa3n7C!66a8bhVKaxVA=Jpa3P3 zX?qpG5UK700vFRwBBT>_h96c508 zcJ*Qhnnq!R+RqXcsIOjy#ORa?~@FpF~3M+szH9h8)I@5tOVf_01q^2 zhzhX;4;tQA1J`$d&L^`Za)od=eArDPxzh*AqWE`V_(FgyQ_(ZJxg)Z`3b=3oE=>pA zjTzhfRe%bqejV(Fap{4<-e^TM?t2icIW(drf^R}hN|5^#VSG+r11vlLA_oJ;?F%y# zoa!Ib&PXuP5?2OK3({U7as?4Gz&K}%9F5Uja-y3mm$cC>(368tfTgHg4dq%Fem9kf3gd?as721e!Y zScCKkzw%%drtuqA5PTu;`~h}n88KZ2{Iv+~wFToXH1?fX9~qdz*AamWg6FfjGHg>) zz{;|}?4XM$_t4a^_r%>7%_crKylu$fhvjj^m=?*t4n$iHYJTS^tXmz7JX8_|EO|Ym z(8%u=On>*R0NcPa zoF(8cUBobg#E0bfe1Y@Y8V3Vmes!OM<=vPNYA_hSq6@V5yEAV-dF&VX@uO)7k-==-KE;P>!Ks-J1L}xXG!$>2mQMpPJxMnpOyr`aEsi$2LA2&YZ9LU-BduY(1qUM=V{FpkGLzvt(>GWh-9Sxv;FU-FZ8gro+P z`}}J*Ka{F_a%Jg`zLYm`8aD=K>*Tub$%tG(oDbA05whh_hxTv0#DE{3=EL|$siU^l z+SMFa%6bGxgy7A&F+x@0of4o5rbPxT<9DZy*7X7+R!Q;u`K6J2Wa>B zd6*Z9@MqXTDMyl_>}u4RAL~E8)?&B0C||P6(ZnN3NeL5k^Mc449dXB=M@aui3bvi~ zh{K>l$-S3_Mi*Ut$#z=vh)#T~#T}(|%)`)`gva-JzVL4>vgHqYT|ik2BEqgisv}Wh zu_nM>mc}830h@uAeh$Rq=|p3g|#<7rTPiFd9NjD+2r1|t`tWKkf`D8mHY>(H+$!OgmJ>L-nZPPKq5=4b#7 z3{k0;AWzoy6)+D93_k|jxa`X}p>4Wtv1)*g<|K!|ihQvIVuEqU02I250@thz3r670 zcKN&xgw5lPC8)LAYgPq#e(gpCP?>n?U<={tV-^7}=w`-^Sd3fKMI0MIbD4M(!)IUS zFV%n%7OxV-q?e`}>YVV6JO|slkMp4I4UU#J1SytF#T42|>A%qmJ}x+_00zRX57Q9L zIdT6|HDGA5_hARwY#CEfEgNwF5<@V3!voSh2-#NPFLeCyA(GJLEqY57Fyzd#17pU} zO(cfPV?dk>iBaLzg0QV@@9dzB7}y(CJ9(?N2%&sOG{*{*>!u;_L2Rb22zV#>6ijYN zPt(B!h>7~G;K3V^sh?=W6L;S>a$V-Vo3EH9|N!goIAZg#B& z2}F2L1b|GFL`@MW#St!o$?4AlLa+tR$P17)lt0=CWFi*N*YqTFAQ9OALDmBBOfQ@i z0oL;9g8_s~^{~@`u+#&bFl~^g9hhY44gdt3CzM{5U^Uonk`)bOx=S{o!$aO>1h653 zegWfF3)D0M^G<2olLM&c0BoG#Z9%}Kjv)a-0kzG3#G3qOgEYs(w-3kWl~opu5mAKh7-Q|A})&o(4h8_n3%e&{T=c;^b+y~ z2q`M?`CbtLWp@P#S=vrUj`M@+b!JObfSDQxnA4A0Ca2PJ+(X1WSNXfRfSfJ*xvqNmKMu* zOGWOsPI`j8d4IB=wXf;}bmh(w8qklE%$FReDT>`M_|TfKnf12fP5Gcmw z-L4&hd$!qc+u0O)vvwQS_eRw5c%^#8ciYYdB32)(!cR7Sh)DsC4aB4`jc+FdiJG`08FiOTLF4bQamRz;lOwn#F8*R0*mjtD z;B8ofyQ24lYX4mKm?{ z+A{+zjW2{(+*{!T7eyy;0E*HW`yHTqgBjp_4$tdczZ7NyW7}m9NU~Yo)BWgh?R@8S z-~fcA>ybcTL7|NfxVl1VNU+2mON|7=J9Yr87~KF^ej?cc9{Gz(@_f^ErbG^}5m_Rz zt_J6INX8?xR7i}J7X^U|BrpXfU+6``?SFeAaR6ASkMeIYKlNt@anGMtBk>q60sxXZ z5{1av_yc2Ll;zF=T%))MF$g%{K9CvvmT1xoXsf)VhoO-|a({IQqYe+39RNcJUlxqu z2E-KiYytQR&%ZPJvRjjK8RY5{b`1eB=1d+>1{kp1t9P5ZmTn5cRFP$Llt^5ZDn3yh zX2@V|V^)4ga-N-BT`~lu7#}V|9KzW2+TKVLPod+|#$yDozW~s{vwko=;MTQZdO2Hz z%q#j2uxmGQ!2yD2Rq>QyaOlhJnS+pxD$J|~L{ljDjuM6Qam+opVrb`{C{m0(r7ad= zyNQ;d1~29u&dVC9l9Jy147*wnZ}Nl-qA+*VzyCpxOpwSE!QKy*2YjulC3|CJ~=zqwGDdrG?U+etIwt}D8raJ-dM-95~gxoi`jG^6cZ+`a!NuVOz zZi@u-%I?_9l49eW0|!3WKHy*c zIMz$?x}vIE8?+n)5{TxT-e^-&U*tJ)TV1>Va_e#@zokfx^yx1DF&VS84<9Jl(_klp z+do7%SN*Mg(9wiYHb9%$x-2KWS^YD^y!!CLAgA;LCJ1`WvzuosB*Ud{Sou0`?$71U^sc?4`_b)C78jG(zXu?Sb9hU;WTe ztIu2cPbfjv^Dz8*eX^(HBhGH!Rpy%{;PTJoROIb|Z`bNvP|bphPX>yUaI=HyNoWNG zTz#wX6x1%I&>A_h-!J2%Sj+;=8-=HCFEA%9FK(RvS z0EstxSzIQg+AU(RC|@wgU$ux=t2_I9G`Bny^a?EB*I~Sk_RmzLX-B(-D4aN1E-3YZ`&N!)`c6?vzD-&jm%Qm&aFkhWoM9V-GE zHkaOeiH21B{pOqwEYCVRVD_m?q*o7l)RNY#&eDN4#<3*Qb0Ar2@XoJT2uvi87Own$ zz0N}L_saeeQYrnh``-7sN>5)ull7kjdP`x$*t;o<#_??p$4oI{k4%Kuv~y~u>~AQG z>QBWEx^Mr8(VN^02_obD{>G8){WTlxqQc9Hi^&&H9ZEW`^-l!n>9H6ZoyC}+zyyv$wG8Vxxj`tz!CC5X6YY+gjz3%_HG^ z!XW-|O^&|vd|p#f_sIS5&(r<)=k}NaP3~uxQ!hmSPp7;@@mLv5zCv)Le9hcbkW^s5 z6d+9RZ%xQ=1FR1k=%OON3&x)tPzp$~6(1v?7Q8<$i$f``kI@ToB9ylrVdx$dzSE`4rq6dD$)cCWMhvcbAO84$rm z%nmk;A#tyNb#Beo6$5P*6*ieGoG8x!q}3@V1M;6d?m1h{yE9Z}-%Z(ceGboRzCU*+o|2x9i=X~QS0GKT_}WQFu-Cs&XhqDoQrCJwqjWTk z%}_SRQt=(t^E#jVJ6j_<+df-ef9HSQ)9*Uuz7oG{_v}-paU9u!~ z5WxX|2H5c;2YW~UMP^KW7M=bpHqVkjw4LyF(g zv`+MoDJSm4HwukyKJu@icMU60dTYOLK}OzDX1evCiRs;)kdB!z^A)EEJ=MeQMCsiw99*((pTZG?LF40$EqzHcP{*NYGFv{}r_&G;(AbGL zqYALLOu!&Q9VJHA;%j zS0<_KJzVTqUkXTl@ZdP$EJQvk*VFSIWIW#@=Q^tSczmO$$qtE|cu zGeMFMFZ`P%-<~q??PlaYW-YICa?i_HSS)T)>5GRJQ6V5n3H!a-^}w# zZRkf4m$?(`Kz5HkBjmLliupMn71s`i>ZqyoUp81d z$(X!s+5hgI*Ra-5ueDm@owu&dyzz?Lf6_(frO4Hru|0>^TimDYziN8A2S_KqDoWv@ z3^COB9H*+gp4I3xnaUd<;Nv%m1$tMlC7LcI5YN!s7L4XARNOslr~mjZO2d65toRu=Nazcl-1FW)lMU}X=Q~wp zQ~8?^13CHORWnVB+^a8Xg_|qWzR110bm?G}%(2Y+qjl!zZwxad27xcu3Ws zeb8U03yYoTLEMx+QCt7wr|g8u6JIR7V8&z81?YOIX0)uwULHL4FY*%TeEMnJl~rWf z%$K!*_NG}av4+ufz{BqKQCja;$K~Wy8U{U1Td5wQ)Xs!e0}sVpsSO;Bzv4~TcdP?G zY5$=ad;7_H;}io1(RDs`JVQjrvPZM#I!-!ir?jaRJtFhcP(-xuWk_p`gtFlVajH?e zKG8b^AkU%Jvfd+3E)DDd@Pvh4D;J-iPK65O&H$&4*MXoCKvA3s9#u|-~8u*(Q{i)a((B_78RS*z0J z1Ua>emE_$Zf|TEXJ|?B1G125wi(bz4*MBkOLbn@wXd*cpM{V}YIGl#NESe0%;kov4 zQX-|*Z^$I=LveJKv%!_z;2W$SPHHI{KGWld+=|Pf(-Hl=DBReS1QCZ;zr!OuO=Qfg zr^4zw$WHmNOWh%BOW`W*b|Ht@RM3TsR>dMVPBJ4m2lcuoA#MZikk6i9<&sApJ8AW? z;}IuUp}Xjtu@B!D+YTCfxHb^e-zq{gO6m(4CzrOx0_)+xZdxy*qn?`d)m>6VKpfZD zi7n?4HEWXb1!=`wF)Zfe7Z$6h*36Nb@7GHtgqW$S?$^7N=O1u$e4%xF^tmrc=8Xc0 z&nm|SYJmoduh$xFcHw^Hh5SzaL>7HnQNy0bOuS__ef}k*ETg*@U8J>R??b9Y$-dj( zdbDK*UT>QTcFf*mgn@Hc zzo$7JoQ5sD*;IOjadu8{Rlmg*-s?yvh4XX%-h*4UhQ z^!Tr%&>M2To1qu#PTD<&VoSXjI9m2*0)9@bZaEnVx)L_t+F0j!>(#X30>j-G-|pbv zep|{`FGc(y9-N_oDo(rfD$DmVL?SyqKYC(a*&(^iDL#qKv6(IT@#>4lAKpj zK|uvU2_mc@pu|-Hk$8va`R@0<=iGb$yB<9(J=N9KRW((=uC6uS!fZbmyBIqFa2+t- zdl-O-em^0YFJI$FdU%{~ZZFyx$NC-%I=iK#5*QtwXF$O|)J7 zeHENs{hi$u!hHj9Dgd2uZTzFJTZj`S+}Fo1SUX&I^M5F`@z3kSikm6_Aqnx;-E3`Y zLD}OUCjU2|y>7uSL0$nNUjBZRb-qr{{-Ghdn>Vj7 z^uPc7S5CKZum7`>U-19h7QR8n^(TtT3QCIqZ_`4&-2XqOtv~tiwEyhuzsu>YGt;*4 z3U~84vDeGj%`X@iO;1ZrMdv@u{6C)jA3^`eOzZzKQ+?O}ocTYV{EwOIl4zR;dAZ?A zT33ahvX0{aW9)y?>nN`4>3`_$zef4bC~g%!b{)n4ZDBq3O)H9%xY5}Hj86muaPY7H zLm)F-1RspCFgdz!ZEbCAY;1gd{Lk;-%o*m?XUHdt{X6vx_xx2Tgcde0LP*7lRZ@=~^x1pgShGf2$aCI#x#NXe4sI7O+*d!?_ zDK<7%PEPLjF)Vqv_vh-jp@`OF|7&k^>*zO&%Fo|RA{Zq@vHK%@5z793BFTJalxsB_BRlnlQwuen320X<7 zKmSU2l=t}@+c}r}i9BF;lDptO_YFz|cTj1qp+aT8etu4EY+ZdqW%A$p<+r1A&V}|@ z758iZvK1BEIwxxo712N7P~g8~qSagm`#u~WR+C$s!1{e?`pm-Hg~~d=aPnno_O!*3 z9?6|by?3;4QuMU^THk$o7x8VBpIvENbe-f}$gcq9KTPKA#Z8{+;eLD)Ndb+j_s)kr zrN(8~;Ph`sfAg&6fvuYNIcvL0o@diL(c5Pl??h^rs_l{ACNPsObl`J@ZsXv~a3$s7PtMgA-B+SJ+0HG*P1Uf|-~INl z0PW@rmXe3tY)T+oOCkb_ml@l} zZO<(PusHrb1r~?}lqEl3JdpMD!L5vUTv;Y!2?zQX9K^p!WSt+b6!s@F=EWX-dVb>& z!Oc1PZM2NKfbhWJX3Y7Vyi=KIXSBy7Ss2)UG-01RXJT7ghL6dv8v=Pus%8X(Mf8O$=r(TTYGq*8_1BW1V$ z*0Wo|;r!y8E7#GMO|w2%yd(B6q{*5KT2=NtI}j6}xU}5~ zQ}RwsgJ%|ou^9xqz^1g9y%tvr)qcN8=e&XPyxebG{xx|ufx}wafkfr(8`%MO8a1&& z4*Gbm03*%)=7$2dt3((m#>Eg5?vOD$gx)Fe|USOh?YgL+cU>nUnce^HAJ z4iwUDmGsp79p}{_WvSL6hvD3U1yZ5-tdpok@vNVJqGO8se5?T{>G%%EMljHx`u&$qGZ(6Jos4n!9SZ zxkdhEMu;=TR-y_!&nSe7ToY+GOwVX5LLHSOPF$&T*zh4uMlB=Ugfn>M-%2LmmfR96 z(b&-)EE*pah;AEOPVAA}GPWn^h}1jBjjXAZ*Y`f8#e2T`{)Ut1C7XJ>Mk_P6RE{80 zUQWBkj%8gdN5ak@!w@a%hcex5ka4JgE!dhI@{2IR%b&(wehDd~KST}5)51$iPB%?h zUn!eIot)>z+Kdk~!3*E_=iGDB@zlCd%`SP##_u|RTf+I`i{bZZds4zXjGC;Iv9uq= z4625bmJ(;FEbZh zj**os?B!c7yf{?@ru_X%r&V-MR=C(#D_*=FE}G<_vX%Mh$J`BnOhMPiNc8oRTittrGc@|mqwgqe&G~ow;tSKu2P|@( z^0w9jzx=*!aWi|w9i)P9L{taI1wI|0=@BdU**`mgfXOKkN z))>{)E-)s@VJQA#-&5`_8*@8*1zW#=KNzPF$8eT$OZmJ{>0+7`?@NteYlQH0?vrjg z&+<{q&Dp(d^Bc7v(*aPFUMJRaP>N=HcMQYc@*|$V{+_; z;|TqlzTxTi7t2H|Dnf2mH56Zc6_1rx|H*ql!V;&G>h>V0yrJ(-b417|%dtA~<-bRw zoD@Nm8JXyi@$`_GbYszj8vUCeDocU!Q|<<5HSy{8)9*v&K8=Z%N3Q<8fBkN&H1|q% z{~FJj(~F1w1>F<+%dr{_PyAWNv%~6-2yNBY1k3h+!pH9izH5@aT&p7Gs;iJt`Cqnt#l>k(eM<*?Th) zb@Yv&Vq@i*kf6$Jm_x+^w$<=$sT!Kdh9_^Q)Y#}J72vRaVP%thWkcWc-}x*Fx)%~h z@J?`w{xaWjvBbanw4c~j4hh|uu;o7&E|{IfuJ&$tdiDlCS<9yXSSRi4S8hJ6F)HQS zm#nW!ai8YLV<&GXMBLZr!OpXbZf@B~OsM=^-mu1T$E2*l7kM7^i{bkB%cs7Y6Dof^ z{BF56)gnZU53t4!p*ck#D!DF>d6TwzM{bix?{4*uJk0kd<6Cmp5f^6^dn`Uats3ks z6Pm4PwjZSj6ChhISoORL??b=I0F>@x1J3S2uRX@D4(RMmjbiuF=KuYw_v%H$+{9Rh zV%iK5%S}_BtQ7|oJDXnflkNuyjT3Gs{u`PC{22>2?7ra$&D~6!BYH`8D{c&}rzO_zizE1=X4f-ZXl!VTav%t*Wm2()gU;#Pa zD;rUI58`;|bT%*(cU_XDCvTNSVK`8djM7^W%IQd4{KQ?OZa+P?(+zY$8|UA!JR(H7v60~c2_o$!*}z=JHfrz-Q5M1Eqg zBLe0@(n1`&AVVRHh&jE+9?^NCIDQEe;LycqZPJh^4!OG9K_@#A35nP|6U5FG0uhcy zE&>lMveLh~;?{WX%30Mt;;W0Vl=f{WD;C#y{UQ-lM(H{VYk{~+yb;l~zVfB_ZN3rh zsSw;KzzzKi#Tw-X*??P+VDY?CZc1U5C2)16ekZ`4thq254BB^t61y>k%ZLUaJ*kk` z82T{0@%NGyV0yv0omUaZc>&zcU8%}mt7A_z6#eSIF4um1G8T%^vD`EM)l`%Y&?E0b zg>V63YPi>(q0ii#13DEd9ORfwB|=s}k30J%ou3Lnq+qBjYJ`ZfBH*`H@_56~$A^}* z7usL?M;8+5TEb)^b`6(xK9z+6{X_`ZesgqfBvC=Bdago}1thB)`64xd{;}abi4WHY zc($IWKv|*3eNW~NQG!Z9@vjM{Z&r_IkxFnY!u)GXgJ9SeV^Af!xHujvF0$Chh9^|dliq1 zH^G$9&^?4{o9d6iPSyx7?!6#_!sSP}fltp#@&6-98>_s*ROg9f0rDkfsJiR>FO}y-_jVhbRh8Df-_lDq88A0%u=tLBWQ< z&tBv?bHQw|LJBD1ugTKN4QTHRIJ(Do0Y!rt6Iyyh@6$I?>Jh7@BhDAjdMdJRM|B2b z?~>ZhlP%V5=;#x>8Okag>)iK5hp-H(hLu`p5=PPkKxn8Ohc}}F2T}G=faq+FEx?I@ zrW_mia@{i-5xcUv05vtBw5n8>8$Me4YA6ClEAqP?jKrxW>xEvN_)d@8$e=_l8&zMod@bv>uw|B0jjxz3)89*4!j zdItnwFu zGQE9qZZhcF~=H?<v={YJ&Rfdqr zUnHnF(J~d)z;&y!I3H*Q8o^!&*2o+wyj#2_)BL*;x2>1zmM{O*AR-P;5(9@cwZHA+ zZ!_2lsy8Gp53OYZ&<<_Kz=9Lo@=Qaj=I!Lotw_pK)g1q0JOv9rzQSTmySt*ck9(r( zZT5@*ljdl>;-h{-gi?Tzu(=W2WdE2kz@r|_HAadyDeWm$!uA>!Ogc$(P(ycKDg>pi z5GBP9owwH5p!)8E70E)atiEe_gos~$HfI4m;y>lBSuS++R|?;2%s7}&MPYQO%l%6+ zcB{2IlRloQtfDqwRBn+@NP6pEFe%^8Q=Kqdi+%=-U<~7R}LdYcq+$FPy3?p4h1cC#^=BB5f%cF zm(yLLJdWAQz&QA!E#|3-lCGkeeHo$7_FnYlE}`zk&uW24aee%c@zKLU$Q64`5tvh( zuWL*Fd*l8#NBk#h{Y{Z)j}Uc(dD@cE|R#^C9n8zk*cLhXz&TDPPYR0zGoflFkbdI?!}! z%`46A%yi8e1*yC&oyb(>PmU&P{D%HiG4w7T&Mp4@x_R_{+fBvKca9$c;I8rFHv<_0 zR&xFGVw*$j$QU-F`+5hv#mugzTR$qLO=(LLcmsimZ1SF~rDRs;c2 zktCElqV%Xpv0N{>RMqs8yp-m{xAD7cM+OvKdK|jgcu+r~Lo89AG27JiTLVr9Ih(C` zsa3$yTthSX!40LZNd}F<%2Ylxk%fa_2tmjmLulOLdb( zX!-z8{luf^T5`(Dh(>~nLW1%8M(_!k%Mo;Xzbo%z; zsF*vS>{YxsfZVQ0`g-yt!s~%_X%stdwRV~njt0#y!3ff4)Ush@0WWl-%BhSsUg3mjvOFIzmPqHDS4Vp#Jpsw*&+>>~JN^gz+$A{^CVQ)AlJpTQ9-qTQsA3{$|hHbMIs- zsc_z!`seA*jftH7SE>8R4BL$`@856zqHpQ3*u@WVnmZqnsoa3|M)?2arpNj}{`3mM z5I8H66WFhVhNnU{q zgBAj4E1-3oQJz2fKi6`%*DHUR-vCc8$4b_{(V915x7cbkwG|;_I?&>js|$kz7Q?w? z8VK%6b!APLV^^Lac49>YB8`=oembIE0%B^{PJg-Nk1n&o(S)D%SbhvxaP9lW11r*4 zue*M`7(@i$6yphn2z_u)b02>$e%s{(3Oa0#WNe-n>-AL$7=tba%jcwp*pycvaHRgN z@k;-i^gwzljg_mY&d6!NdUK-V~xw(c>;DZDUdX&dvFHVKS z!O0{W6z1)}<{1QRd>ZLu?qIt*Aq(lwRGyKm>#N~H9nnQ-KciJIo^)8x*W-i)yx%N62Rd)I1g>O^--f7xGT{NlUe=i^{(#nIAOcm6EMoFq6lZ^$}Z zi^8-i=$Sp^bsKnv8H+F;#Ynbm=rz~ip(%*bRNBM?k9n!NR`mA}9%BEtBQL_;UeqFh z;A+1X%|hFZ>FQBMkQ8>fHD%U^Fqw&Oy`?Z2*1cL9^w{WsMSo@KY8r>6qD%OY6i#|b zkvPmZ9eJ|mO?<)`r-S-OCxx=WnefvhC`E%*{Mq}63P?&>E>-il|LLi{>v9{RI5b5m z>F$AtMlj%2`iTQ(er=i?v^i_=v1BTmJ>Z1$jZM%8bZtA~Vt(+PU0B*Jt<&tlLVvI> zcQsHiThYzHlLshJM8J+tsFKK-f*KUpdFoZ854t)%SLhe1c+=UW7b(}on$ax zX+Ehf`b}&8AoNH}zf?w3B#?}ytB-K}D9GjBxfzOx@bbz%+`b369J}mQ0)%;~s{ZXw z$+GlA(x7a(JpFtV8FK~4FDFz2mH=ACT|oq?6M`xo4kD3ySqw@}NBRQg?A<;xHqJ}O z*WiUWfGOKg@FNfZY)c4tVrSaG-h$DAEx2=UL^86<3pn8FL5xhFKzLSc{%+iXSJ#M2 z<34VT&j@C;l}f~MkMp}rwMl{~MI4setyBUgpuOL}jHrt;gCI_Z(4Shk37#FnrZdml zvQn5?T#t;vftz06T0wzl2*v%l6}GM#M!?S~#AA{E7(hSNE79bRpCmNX#KTB>v=ul3Z~vU@qVP zIkpL|Z-#}H6BLxP5sEcDY|j8CGZ%v&ELgZ=yAcQ^!+fV`-Uiqi#f`Lc!ZqSUeSMC- z@O?i_D(PC3BaH1Ib^MnrdEo@4oV-ig48Ns8JL`@BE2b19jS#7Ofbu(m{%8C%s{wo` zP+vK?Ym}l z$Kwc*Y5-=PqE=$qwqdFO5v!L5roU?BwcO1-G&1!v*iDZFJW6v|YgN#1-~wHfWD{Q) z)tUwDZz4RgOzaX0zO|DOu1?oGh?1$TkofGL1^w-dO(YTR5|;#x)n`@OLzM`))Kprr z&=VvxH7@gFHn6-8V?_;Y7WOIdIC3HjqOf>xi(P}<+XW-GrEl$)!P(Z!iZ5G(M8#cs z(%nP})(N|0_tetxSOpLkvKD(`i z&gPxGv0R8>V~eX&d{g)kb@a8FPKo0;?W9`OQwTN}lBWPnJ2oD~f`oB@AS7Wk`-e7M z20UPTT00b3wFtRsskg|SezlUVAYA@$QO4}GLNdI#NlMG=O(5|Et6e%^LT0_U0SwJ+ zH$1@#_JPBq$vQVKY=<~GNdGq=d5GhW8?i;7uGI!SJHY95!u`akg+>Y6BMooo9R3Z* zB%oBnV|Z8D!I*DZ2eh(9sM%J!5Rf718;X!ewWdh;!FNGC_;<0w-CRiuR3ZUyw^Tdi zyX$N|t(B7`ek5kbuY|B63b>RRB$9fCt5;ezxv9#?Hfzy9w=<&OU z1yPCCE_xB}V??06e2rMR?57uJ%tn(BD_~w+zZg*iJK#mziA4RvaV4`|*9(Mx^@x6a zDDg7C>b)s`_MX;E_}az`iPxW@^l!jC>Dtv$(($g>@pS7K$DX&%#k7|59;cITxlgQB zxPNK4aNY0IBzAC+b#&y9PBD`a)k_2&x<Py$xv_I~ zDezW&veMUAo_vR|Tk+CAiuLz@t_^6PcQ2dO>d;ZU+sEA`l2`J$Y&-j86aC=WzqZ5Q zcZ$k9lYTuXi~Zt;(U;3RHn^m6_6u&Ae)!b9C!b6+VYwjBx80$Sr_edTB`fJ`%6>?F zHPv{!uUucU#V5DEC*~P3ZXaFz@%_oolZhQ? zYg^hgnPiHs+xfPuk4wdDTV0KX`7e8r+9Mx_wsR8}#7j54!EC+GI=i(o*7nm>zrBTx zf+#OrbZUVRJR1}}h0+P|g98um{op7NfQU$D7XdtyiWQM&SvK?IzBKz=`Yp{3lBWKm z6)2dl;P^n7#nHG5WSh?aAz|kF-V;p|h-P;39uk7ljCF~$ZeFM+LwLX`gz}Z3)H7)+ zh#22hKsLi$0#&C&fE*rx$E9L@TXvK&Qhga_C4qr{zfKDOL&he4>x?v6%>kjXEGF$#%u zeHI(AkO3p>xT{oc9F$W^HZi_R!!!L4M+w--#r-^3C0?_cNV;-n%Tyra3!#0HtB2QVM!YoRy6Sb(*!mppK{)3;FraNo#vEYTX~wSWDCsP4-o&g=2Lk;j{|k%10Dtg0BUK>HZhH#}RN1gsV~2oIqsKW;0V)Bn3Zz7ZJD%@E z5%3As;&uS2S<(lFE|QXoC;&~C3nu1JJvLaGXhL9sAAUbpdUp!}c-^4T{26g{j5cN> zb+TZQ8ivV-l$Z&o!9sm@R0L?e@U%=% zg24vNiN507B=7`%R;<`0cR~wjY@k%{K;I6IMqdeB3>=u{UNln2hqqpC|;Z^KE(#5j~=hC(}Sur0l@XZWw9C7MK-*cQLV22 zm2e3e>?iW5)2|aitQ~p|4j-l61-k1RD;Hx5p^uIF0?-8^A(#VFc2Y&N@wy+*iS|<) z1yz8bq)82K(8z4#R5u3t7XsZu!5+7O7@hh+xL6$?p7VI7dyX3yiQ-RIs<+StM&I7# z#X2k$p?XZTQuST?Kh_N_E zfJ6fD`a00HA)`RtdQQ{?e?dXH3AYfXH)5&&lL&k#Q`W^A58-qo1OOJuPuG=7GDYZD z#gu?f{J{bygM2t9E;`&-hpn;F`xnR*pzQ`~M;{49SYdN+vOCblL=YlBZ4W4UZe+hSf_dGBm)`XPsP@i=LDQFf4|xlv^v8LO^;dt}DDD ziVR*jZxe6$$YFdHrQg;V!$(6{;c#&F7l0-)5YL`BLg<;|NR&Ka{LD%*NKPz}VuLFG z`4MLUIPxcv%o9HSbGGqj+k8ISk?3{l7sXT_a2bG&=V_$q>Z5RAzGF9Ou645sJ?^}Rs9v4JZXP}t(f))mt9|7wP-gCql54E3Pn-g^O zlUC0D_$PfvE%$+?+nB^c(>tY+*D}l$eobTA`Ki4(I@;D6 zh={X>%Y%i#iW$%spMU;)d6V=P&3;Z@v6na1Ur_C)!`L9(spVSLroQO1f#wDZlX{#G{3Z|{DB?1F$oXcbBqIoFATbx9WId@(Pzs2 zR1I9Z6MuW9SStC;X}#W~+hRVL$G`V~;qgeW@mB$5+AUY$oUh0JXHk=K1y7^8iX*2h zY<8VkJ>lf>CdlM1-_h1Jht?CDb~@*+IcVu7JdG>t8mfQQ|EMJH6~~lJtl_-I$Cs=h zRBlFJElE_~r*`)~KDxl!An1&N(U zio~$t%U@=l-^m%hpzK|(NM^~R0{t}FcqMBKf>rXfLuiyvz-w`Tx%cyhAhL*8z$X^( z#XO39v*DKl>x`tK-^snbO}&cQ`q>u;Q(NEL$Upcbe?wqc_KZ{YQC3R`d9RWF;z@`_MfSfc7|`?Zz6eJ zxtVZi`1_%idwIcD%#^?b&)lkyrXSg7r(^pevQj<2;ZMP1?X%bIb|j5mSNN%MaF4}@ zcN?wtwptZ^Jk>Jg@w)-Vg6rzNCql}^BcfED^YrnC*bBe%nj2W@#xcL{Yz=wp)Gp3{ z53w`F=%o?PP4y0|JHOUWF`CZJj{8;Zurt-@Ep<=*r=k4YYp73j$WZfr?9kdix?u0n zGtR(rYNbT!@l~1k=-SEqRYM=5k4umY0^R!VKYH98Saiox?V+r$=y9X#=c11H)i>|B zE__YZa?XB}L4!gN+h_u<{os`Y!_Q*QOPR-}khnN1A6*q3zD;q$E}LD9%;RM z@w+|sl&4$fr=MvOGM760x0lP=@ZOViHn?(`bLYc%BjJPW`vY&Uz4tmXT7KmLMX(dJ zg$GfBf0~l^0EuSHQ(ig+%dyBhQFKxCx1-0S(tsk){&40)4l>yHjfpux< zZ6lYCVvplbLQhxl-XBafEfH-$Gn@)^wjSl}6z9&lx~p$3mn4?HQhF;ptU&3l=rzK^ zY7ZOX+*3_=1B!O=NM~)aCWkWLmOI$g>9UQ1qpz}jCp-EcKwN>sSVIgbg^5w{ zW9BllZ%n!Kii58tB<(vnl63y*?Lq0l#M|Gp5UysYPj;}Rt><{Ad-#UtJ?VEO z#SquEA}(8w}d`yMy@j z{t^clVL_9Zu#H-_+=;hm<6ye*Z)(+TR_ZtQI}V+qsT(fj>hhE$bUoqyh2kKOm!Akf zB*3HxiY2Ljwj19QzJk(n$o_U%Wry|ri=rfqG|5RKO+(!BeUhuD6W{B%-h~z_9?B*KP$oU$P>!!T&O- z7iJ>s65t730(d^*jNrFzZ0x28gnmDs1CP-^0D{Vs@nQBa|7Kg4&R)SU=t=l61$+Y4 zoB;3Hu->RAR{$BNqY^lIJNn=Jh+@4`2{(^HTlbN9ydYslwFgI&S}we>?sqrWypR_P z@TOka*ad~};t}9H1&Nb?_ez6JFoLnQ8-SADrzmeNV4Q`Mxett>EJPZ=JbWOA?LL7Y zJ2K%%_`;`WR1(fz0hbI^5!mz&M=Fexp!ewy)PbCJ6{iQPFl3C5JOW6*A9Y9X@iv@m zJdQ1adY6TvkS+m^d=P{eLP?mHw*rWeeryAahoA8F4;{aiqF1>J>$0!6*Z&|u=fp7< zxZ%_MO1PVdd49A>B|yj#0*^Yzfwx$|??7w(A~XbH>T?4V@g!jmIL@$mf@U|&f}{4W z^SGwlIiO$|hqb$$j-@9z2tnI+`LAT0wH(YA?&1QOFA@*as_<@2H^|%^rTL;0G zT$onwpHgnaqd>13J(ESlq5F4Dy3O5nJ$`L*TJw3H2cDhl=8%JsK77VuugMR&xu`3o zBnSI^`0s<1*B3|EO2QP|;>R6Du=8X#MBuS7&yLOL;@TSHfJO4u^eMp?j~3nEPqxj6 z)ZA!oT8e%Suv)Jbn9`X8JdzRXc6|jc<{7g22+*&#Y8EWX(9?;IXD0N_cLDQ0Q8=fITC-xRuSU4K$jz8O@c>bv< zOx1nZ$Ogc(%T_TLXr}l<;QS3WBAo*t1Nkk$tKb2&Pel5xeZ9uTlZUY0F+O~w>U>y@ z7(jm?#eulh8=%xC{1*Oxf|Z`tF#=#&wywn81AsNy;-`a#Ae8as6b}6&rE(40GNIj{ z1K1chkrXumPeCx8(B%pz(FTP8!kr-QDIy2$JD^RQrA{4wpNIA1P#FPkDRir>k6%bL zxY|v0;G+)8S7;xWPE@kLi~}1i4N|1k#{MI=rU-#ERV56){|!m#3UZ^jypdO177A zJ;D@973{)a$Xwo;pg&&FCI1C)!l7p2s#*x-*6n4{K^W0IIGqg(rcs1DPx1ru!IcBR z!V~~^WB@>Yg%iQcn@aMr<7#L5z-mHm69QQ6SdL&}E+>?6U_JyrHad?DzQi12!HmH* z_9sX8uMCFYKr&?E2F#>@@i6Wn%Q{b+RFY9LJl#}=Z+C!#;12x`cLpY1W}Xzu0-;5I zxWyPT(Tg2SuC5{!(|P7%y5Yq6lk+qGFbxvL?8qNc(5pkraK-H20_t;yKvDShF0S~@ z^(|Rf^DPIj+6BG}+8saYLIP&c+JXrU9RF#pho2CH+9~FUfzH~5_52HE5=_6oTJfeO znNQ=2rmdEE*zU?q0%bEbAbhr8S%$lNeFjP`UyzI53JakhL_XQ4ix2bE$*Qe)pJtSH%v~Mc3E1m@%I_pOkk{08O~^xv8hs~zl+AC|duHD~cA-za zJJeVG?x3Bci|XB_FGsFTD~?9ps7e$uGu*B&onKG@V0bmCa(Cj7J;3<@kAw6|z$`2Y zb)3+axqHm}=GFw$p{FgLrGk&}%Iy6tQ}l^#pD3JZ5+=vB2Jm{N@=8}cAVQ!}^J6ly z%nO$~P%0XpOr&Rig7aFMf{;_IdosVRr*HVzwvWpf^Cw(xD{eNEoA`YDlMX`Dy8r#} zMmB00bNkT#MPab+G)Ualv+=t`6Zhb;aHiD64$F4+;+5(mf&P%5L$IST}2zxVh(MrPy}4_ivlt zXKi@UabX){cN-d4TKGnXUYv=YM3@gQ)`ds&ew(`rj!wt9=awUXG%TF-nLIv7H;o)g zu)&sg)-GPr1`(Ht?3q8YCag+F?3TTXxzF){qgXM1^HIjXG6ls&VDWB?PQ1_Ugv|rL z;(zY-;XUzbkFG{h+r-@=*6bqlm_9{zer$Pv*-+Ka##l{i>y^U}%V&6VmvCGH?f7*Q zOSmAky)v4-v&DJZm2a!%P}a556LIHah60*SWR%BLIYZCFA+lqaK()U9bh4LMbI$wU z^#=eBVjB?8-*WBkQ0x8de7AJ!9p;1{SxQE82f;V+t%;EMwiNi@gYC06RXW>N!B&8EM zapL7Ax9G;f%MK}cz=04ptZJ&u{*oAUZO0~thSna)+?xmp!@&#u5Wp4>Spc?8d?oo* zn{CcIH7A_-Y%eJRGI~4%`z06FhdAhEe&Rfkx1wffzIzg(|BYgYJ{GLQ?cH%pfby{# zVX=KmiD#(5G-9KEz9Rv%Tp)P)c}r4L1}hQ#iIBgfX9Kj^O6!>SuLCpjw5f~v@x$YP z+S)+-o$lzJoZS3RDF+Yo18i`tl#2{EB#DX-St7@+&f)9JX#EYZ$5G2s7O19F8Eim+ z%GRz1We)2y)qRq$e+;z#b)|-K)7;m`Oq?dvq*-Lo8OX7n<6{&+iZ6XD{1C)`ddMIx zNsn-NLhS~VCNW>*$Su)z6-4V$zM0!$Le*hfFyCtxu^D^0~u znc-ndI3)hN&+p+{B6{P{5;?!;G% z0IdCyh6~^eD9ye9D$GU|62Q|aCW)g9G7V_K@MF!~i5;w?bgY4~ONpz;iH*|zD0>&+ zR_XRAc17bZD{;pWnMrI|OXyD-_#p(Z3lo%Eh>o1!2+#3^futlqv<2EQk+P$xbqt@t z7*WOzNE3#Z-@!%*wRtN&R9T1(Wamk^jzIrg z6^c6ct?5u8+yf+i33%Sjt2y66)2@eshvQ3=R9FsIg$-+F7JV= zw(2rt*2RDEEC4I&TBT#nBOvfR^>6HR(i5v{;;Tz(&;2W{b{eJJeY0gt2Jt%|Vj}GO z5hGJS$YTC*-`EJ0P=+uqcAeC zA#S~Meb-3^DK0Zb=fLwBDM%s*HntaL{dY6T!N?cMyd8FS@VPtxbG*o334&g`D`?q{8a{TQ? z$)Bb|EXl?dUL_w;i-zw*Vo1C67{@tYtb~yAj*sjD@Uq?Fqf}ObzmL4LR_fH}z<4*2 zFY)j7*r{iB&3hARzyG5FUHrQQowDaxSfRhAW|{q;xhKs;W1AT}_AK=A_b)%~vmQTr zEpgJ-Y5wIHU~bAJ{Dy$($GR6+T5Rb*MFMtWdXD$a>GIh;k1JEV&_ajWnG2?QxxA3U z;zoP&GBiZFfQ_ymeY^IPJ{#B;bcwC2je@Jq99sTtq0<4Ios2&7^0Y)#aonibm#It2 z`cL0I_P+nn=Lke?pN+QNHvKYCLi}Ys>|K+CKfhbNe{VgCJWt>OB8>&RE4u5nw(V-# z?NkEQ*Chy{_Vrzn@Z0iL$t~JB_g7t?1y>6aP|?tEARnoCU_1JQQAYYF5f22xrB*za@ZQ1qXfes?VAi+S_@4HD29Ty;h(*3Z?jtzabQ zX84=G&wq)Q`#$Ey;`e#}*m-!o?pf%K0};DED*}(zC!79EDY>;br_}3p=2j9j1`o~1 zSV|myS`ze#YpdtU_b*J-TKzwd%=aA;)YzdKUG*f_LDnhjIGMemFG0;aX7zn2Dcr{4 z#I?Hxg|BSx6dF7@pc`rk61UM47g-_%y%FVvH{9puazieoEAmW+B<>TAjUi1Td-fX}6i*ct#8@GE*Q@Q?-oAUH65r-zNCu{fUQ*cltd`Am<45`?&Oegpq)y?T;F&iM z&3@%Hc5T34Nl+*7O$C0u^6f971%VyBX_9L@l!nB#Ewi~a8#2SjAD{X6s5Ip*W$Cup z$#m3Hs$K|kCfuYU>I=dPL`tIsBMf1Tg~sgG_1vgopEt5l<7M3zXl+yEKj0I3cUA?c z<%NTI0)0salr9Xu6^mBTl5^YdjuNr+Z*+5@T>Hl6%Co*ETt3YaUL#Uhplrma58&E; z5&Yf2wu9QqkKa&`;~G6%QgkSywDru{j>-LtJa&cC8}Wv5E5X7_GA4N))``7|%q?sf z;T&FVsM!a-#Cv2&BEM8aF|R*F12T26Vqi1o@@Ah2v+#Ie_d`-?01G5nR-$dK9b?yfkdEy9nz8tVkq-0(A>*z z){?1L&zvUWEU-!2yn+bWLg|-RbKwZVY^iWxh6|jhF+7av7%AVwDjPJN82k+bk z@*zGVAdHPj%BzT^@-A6_{BrU?|1SW{p6I*el`e(E{Zk|0A(j4TJq>+4UZY2{07{?B z27J~AYBZjP!sSU8gQY`wt4%l}z8ml)xdFPi;km5)Fw998=%E3#r~7)=6|x)V4&Yhx z(T-0w6)YBc=ww~$6@0lmY3z*sI-?Qs`iycS+*qKlD?kIvZyqDkJ`|i_!CvvA7zD6V zbUohjVgrZ4G_{~5+5AS<77Ytd(gP@FL>((;}x$%07vZN!adJ_0y8sAy`U%om~s z3fWIkMzQd^JK}8RyUBD8H7rMfiU31HN$D6a?2Usp+cur~qnF06f4qy1#5wQA+UmVZVo8rWyci=to zf>Z&JzjfD`sMs!p2Y*eQ<4n3_@s6FnzYUSB?#BZIH7D!z;{{7-5);@5^^s6Myx}eX z!0*pPIZF4iGuZNBq~E6w0~rx0_d)2) zwq+rDRLXB#`LXd6O(VffeHh1bIkE`-Q5YkvWQ?7(TF(HKEHqWyA4TTtApbY~Epy=` zAz;bZojZg#DUBt2$Y3UW9bUu{?EA36&&VV-A<`~aJ^pN`vHnBn)i;oCJsSb#3gYE@ zmv6}>qKR~IQ!V%6Jp&?>(*!z z@JVL{b9t)-0r>1;)7lVnzEAzvr!A;K3APwMS!KX+ixYLNmPYW6pOOOUdg8Cr=<%!t zi>0%m*yGnx`~F+|;yxx$kAX!Gcsrlc?x2Bz<>^n)=qZC8|0)UI29F<7MF*2(*k&7_ z!rM>Xc0keSkh*?vy1(E_O?0z${g=(M3)#0LUK?>s%DvmZ^BFhyJ!7%_na#_Gyfe%c ztH9xpWA+KAI0@0QAI>E?{K~^`U0>*YH~}WP%!7i^l6zYvokX*PH>ZqxnjXFVi1+OP z%2S@H-H>i_fOLx(M7U;B-&36OP9^;9SG9Zi8G(3K=@rj|*#Q^NsRr}HOJ`ZmYk_nS zTg3$$xsHlV?iFr?w-=OHM4?Wqe1R4454*>5v*vvK%u-_=Ouc?($H@8L;PFnrR$I(q zJH|TT{pBk+=b7>lUMMVlB14AljEN-bm}z8iTvF%FP$NH+uw_?QBe|BApbAqeUnAle^l zq2Ds{drRD$$ zF4yW$VsKVNL=-FTF1Wz!^-4LdQZHq17H_scSQyUP8486Y*}dlXnt!76=jkMt{*+yE zUc*Z8pwxzjQ?cCJ>tD|w)SWtl@>e`sFL%a0>^KWA$xL?Ss`rHtr1h53+zZc0K0s>{ z@rZ`vDbAU%c9W9KTTc$(dRvu@deoyYFh&;^dyHhw43TDRtK!d)vs)5 zj4pFZdPp6TTG!?F4+*CPHM6ZhkYV`rbvKXZxt!$l%Rw*xSn0oN!~^C!satR zI+pMEPyX6BdG@&6=-AJJX5UMmBN9F*&o0F{Er0lBw|BobhG01PjApZe2FbtuZ2GQT z`4XDh>Yx$uhg{U#7N~ZDI-trXN=}cgcyQFW+8N4}G*|`tYlv`i(s%LZ-E! znPv>NMl?0o{?2bstkqViTJz_eI+y-Qo~=u3?8EqjsQQ7_No}7mzfWW(-8=97{$_AX z*)2Ayw7M(7FZVoezsQiHnO;|SWW4K4Owb9##Y23mTZwK;*BYrWdGpez6R>s-PCzLk-8b!qXIh1;@YF0fPxCQx2^nKkGh`s%iY8QvkbkTa z-z(bFNBrpuzZKKGDQ2ztg^&A7+woVz*Rka;>y*mMiC!vNu>H!VzfQemrz!K+F!~6U zKG^Asj{T)s2e&}6;(c(fTRs~xv(jHp^~5MeH;iRN_M@oP%U8k^J3ujpF#gN`G;#t^ z{CC-^S*7H6ne;>!v_Y|D#}SC#K3f9guBzUJ8{78X{M>P+jup21^jf^Gc7)J^QD;Mp z%97%e*TiGGL*ei_pZZL}Z~GH%u)z??aVR9F-@bN9(+Y#PdV`Yv3g?hpY8ewz1w5IL zZhZ3`GGXUOmQ|qXLtWYtz%%|zk;3=DO_3vyKI{~^gj|PvoD{v`?uDv5M=xtsGY|ee zN2^Fk2@iqT#?cY3_Z`;jn-PK$$ORyO^I0^OzSa^gLM2dJFop}5wJA{J|JEZv5e&Wk zvC*ZdRI9>#GDdn4sAnBn#|km3;lF2DU~`m79f1FtC^^s$aNerPwvlSs)4vuLFtv9l z0dCfJ6%BSjqZ>p|r)y2WsX+(=48_`A#o@J_!E|C`(!TJPr0_|b6jd1lyu_3Cd4u#A z&-8Y<`W)`Rwt+4zy*S`PTG&~@AJXY@XSXJdVXVJL(@gf-i$Qrw=+Q11JUykrh?8x= z_YXg)S1w%o=UsdM+C=HG;%nBds%%Nm{CPq$?>`bz5Gs?*md*rPnc*@Z z$VMV0(}@feb+x`gd;Up7>n_8eo{}Um%7|nYhHsshQLLQxNWEj?r$1k|8fzyK>S1AC1S1-2(yp^4FONk8SgCB&@}M6O1zZoHcF0=Y_Fh0 zEvI}E{O{qV%&RZn29u;;g(Ee!Vmk)RsPw2f-v+77qnt0Woh-V`9EqS7=!)h z+v^4N$W{As>c2vnGSPfbJ^^hKZe<%sgsjt_JuilC55K?S$-DJ(*tN&dw4J)k52WWF zTOI}V9?WD1B0pNdo+pmM!KdrA3=eMpTvG?3BU%sMHgOAQ%d_C$Ztx$Xrx}(UiY3wF zg{gZ%eC`m|u8k=!I!O5s+ML&73Ae06J`(?v*9FzhPJ`>av;PTxtk0S;0w+Dh5MlYi ziV^I|b*zS^t#V>=zK&C`cf4`qC6~D11O>o{u6=CBiYqI)fMEM1f|!eNBC>=R8HAgC zXXAe}&egw>t|suVhGvMy$h4~dx`u)KY{$?~BIuU16_98iS)EP)s6V}*|TT}P8RE1!;L*iCO+=|Wqa|>odNdGso=|Okr>dN~fr-x3bM#;vPXY3>p zDFm8W$5E9nxft=SJ1)RHA{-syhQ}#*_lKXOgH)lV9T_qCoPAUbzyG|*N~B5@6qoI( zjQC3VT9*Ns5P+Tw7ECDx1Mx&$;75rh;$I9_V*<)>i;9dZR{G*#E-+#~+FJXJZuT-u zpZi_*QPSR1j!pA6EcIks*EzlI;HiRFFAG8FGYyWxR&LN13t4b~aST9WpNCUB0s;43 zL-no4Xugmx<++v!h(%Qmfy>v0qPXEf;?w$A%xE%59y40~<30&8So_Lr+DsN=Hl(i; zK*ICj4K_SW3^R&_4D(|H)`axzpUM~DGt;0WMzO~je8Y}S2!l88gF|HMcT58Eo{k9r zTNuE7@F<uqwaJI?Skrv|(N%g)MhaOn# z*|wX_xcVY^6j9v?IEq9?(r+-~{UeZvrROGY#=+8u{vL0sJmP5;s;;EgQyp%TypgRN zo1!l+^#xQ`%3A7*MGIeu$yvx}zN8-Hva7|Kk)Ue2Cl2@@L;6Ov%Uu=%Yz;`##0ebr z?SZGTDt0DZmI;luC((Y00$lHS6QlGv*DfRPef0S9nH(OtD*0p;_1=x1zl2@p7{{qG z5obF4cL^Gs7|q3s)gZ1aACet9wDDC0y7=fPAAcQir|_>lC}6Ld|CSv#khV?;gfUU? z#+#88S-{imv%k%~I{Djbjy_7?(^&|3ZU+Be2sqSX(@uoz*}67n;P6!&9Dynw(X6UB zXUFURCDZMp^wGK3N?Reb<(U*Qkpvb6i<+?1vi?Y~BY_8s^%gP2Yij+e8ucgpZ(`9# zaaI0BD`eImtaRlEx%I*%JwTL*C5)Ccd`kFw5QHHJI6aZt`>IB!LtS4#t=c1#y>o`- zZ<*2Q@c!Is6%-ttI+lXM#<|bfP;BlUaU6q3@zcaML~{PJBJoo&NC^wSH-9b0`8k17 z^7nF^Gm<*0jYmZaR5?HEct?W?SDv^6RQdH&r=DijN!LCIn;!Y(|2HXkg`JFd?!;K$ z6OADDP-?Ia8~*(oS1>mopUEwP*1ErZ#&^G*;brzTSbXvdC_X2pvsK4YJ(^pBrRr2U;A+(mbGXNrIVFks1a)S{L-0d}KbI`fJngCCa?|uWg!Ufu! zLa=22he@)q%|Id)dUGWO)9bSEy6gq{1yGWD;;|?K%zhW4+OdG^U3+@4&@s`!%mQzY zl}i#6$@o~k=K>M0BheVra*tpfA2YkLL6e{<4nK%Z{Br(yHU`cLEY9}{{7VwErhLe+ zejcd2VPBQ%0qiZG@;)F#X-MLJfp%$VYV~GMx5Fej&!b{IT-OY~jQl7gLrhAb?CV7m zq{GM7Z`#BifKaO(fkOb3Cjo8~fH#ZH7Fu3%x^jc^HgyzYH8GA5Kms>_Q@Y8MK=~_n+|#^{gd}$pfAZcJrXimXan1^^I=vh4HzizrpFEw@YSgo=flqI z{9Y04IHmt%)d9fFQ62Gea2}qUSZtQwTFgA71bB0WMSL6GfmiP%G-B}DH>pENsIpf_ zH-99cMk838)cE$@iYnZtr`0jSF8x^ozJ0UJuVIi-escR4^AB&;A^-1>+`j zh@+s~ad}vJI#bT4@-3Kl&)G_j?$pjT1w>>D0&|FUKq#VJ&y6(rkPqZNmB$ijEj_du z@ZNZCWwEICYVu1+g+jCj>!D3kj26y%nYKk+e)SR;Vdxz_*UMl#Q`mOo^;FFfN(AXR zl(X(}xGVra`_BoQ^MO!3D28zS<2P_@ByNtGby>ao{bP#==})OkE25~q`s5b$E%RvoX8*r3GQ)(R`HHwm*1by}>|652 zzAARbiUrlF_=N|i&LJL{cSR^ue`jg<#S?$}R6VYIy8nBs#B0JSg}}hSQ0X#Ce}C(N zlr<@xQ=676BM?#nRA}zP9AE`TB&?Fn+)-Bh?QPy2m7MXN+ zg5Siwj8UQO*rKd|fWlUnhT(A-OslxP@7c6)r98aWkzRYtRdIwd^4$TbDtLHmr+S{B zppD$5R5mxwiw~9xzDVkve@CCxyXe)c4L1xO3!9~O8;@LTRbWXft`c)r+CR;FNBzEK zA#28UmWa?AmG=vM?*w8ph zs68Xft!AryUJqz!1pY-`s`bnh2LwS z4y2#rKEguFdfepy#v7Hps<14mr#;aT+$A?LECsRtQtKR4W3$~_uASoc>C^ZLR?9EzYTnsh>P;zqZQ1(uHD`qI#UC$Ien~VI7W8j z-l<(`sslc2thn8jIBk=MSbQ@?U50K@{{C^p`wgqB^tyhUp<-mp5f|+WBwF`d=gzl@ zRqKJXrRtEX!?>!^y&39%FDEK6DjMUk)#eolSG8fG-BenZrSA6P81w?&ftgYCW-C(k zN^|8Aql@dszb^QSbGYWl_9rpwrnmKI8`>NrL0gCH$R7?mjM2pSiP*hnnu-0}%S!&< zd(IFJ(nGLnT{XNpAb-EHtN;CJ`%a{?~&UP1=C7oNR5^#G{(5@%E}#q6!o z%E0k`nX28LMSOlbDbS5xYkbS}lg|U}lQU%6($LLXWOzQ-rw~A8GatKbj!}i(0;Ri+ zKxp(V*VjeG_M)4#o5pp*a6a@*rYsZXI5RybY>+@i8;dP{B7GcUKTpq|LuiKH0tBIs zy0eN=uYUPiilA%K%^knweG$oE@^M5Q0Y7J}%+88eaMN~g+Cr>J*OoKBMA~Ved!uf8 zB1}Na3k|(;>hf+GF*bUsP=yY-!TNta0A@aG=JXg6-7ush)aC$asb)H)NODX=60kYi?+ zdF;epQA^Nd0fxIlJB$h7{EcDHA#B_=*6$c*aGzmT7zU$-yYwFNni`B0yzPy}@Hcv| zjR@&B*y3yxsJObu1s=nkEKj_12Ee_C^K?IDM%!SOU7l~qaAHK@IJ8)7?Ir=uy*6Qh z4OfvL*C61xtMa#OU*DbdI-z5igfci8PYsf2p*^(2(jb4$xCp}~BSLNfJe7M`E*)lm zaqkZ16oU8dJ%<_5)=P&)8bQqh)61}nMN6wg5LYrzmj&nla0se3k zK*rSGt7CM`3`|LacEzdX+InnH_@O%v!&ZmKQyr1g|^8th- zmhmCjS5R=qop@@$v^kQy+*rrpeeU`BZ;l9IWozPl7kOh7)-wpyY5%LpqhX(?4Yf?^ zO^$zv_&!HHu5EO*?=;aZKw+nsw_N_Z)JTEL(O2HU6%UR`>L6==@2$Z*p?V7Z7mh;xCn-(K;Ngi@I7 zcS4hUZMXsG%AbOLfOE6f?1Nc}(uF=$L|WO42BfoP*L;IS(>G)oJ{tvRwT+ui4HRPF~JwZaz?u&cT zWBxn6E|T$yI|wwpZNgVW+3{U!=;#eKM^3lE(&7V)ocL^nXTPYTyR6uO+24Mn!3KWa zC$^FyMICgoK|eh@{xW7z5h%HXf!FGs1_bMqXhhIBBbkWJrU_)&Fy&F8xa|#M;J$h3 z>V<*X;++#=g!J*n;Ah){W3mL2eWed=%qGg=079t{7u%}SXLw_r;o z!pI0q2jKi~-~IHfF)#-8xeTfnz~OL~YHk?flxBnEkS7dy7Ubu1%x=#>v#P&z>q!)H ze56<5#00-N_RzzM-amr1n%%S_aj;SE>;aMJTY!7atZQAT14Q5^g1z1Cls%xR#`ns+ ziw+k*yLf9GJ@kYcFvA1kI2CUEQ_!&m2B`f5&UCZQ`SN8o8RD?=fh@uc4>UOU1JyH8 z4q@udmJj-XihO)#W2oS4HKpQg_zAR>UTL7m%OnufW7@_C)NgM;`2?G7uAivY8;?ac z5n+%3cll0%kqZ_l0CkqlC-fZY!6w{54_iu#8rY4_Ye2n_q5)aR38-Vv0Sj^V%EE9J zbJ*@A0?Dhn3^)dgGcj!r*PgK8R%WV92sz@p#)u6%ewKx%!f`Q9G&H(nWVh^Y>;(9D z`=B{Hth*4|8Sv+9?%lg#MVEv&))b4rZp#qc==TLuEBUOJyNG?5`*L5gjn%A%1T$G6tggDTh7yLw9GD^^=VUxKk);fG z6Sz8&Y9W@WM5JgR5B@>Im$d)yCYA1e_JXhzP`l46&w2x`FpNeA(xPL(iRo_`O?Q39 zAc|g}jKGW+8eRDdI|)$nw4R4Zd9vhzw*f8BI$Irn#zv!QupuloSN}PB0if;QssVW+FO**8afn?76r=w4jR0Q*PS|rFY10e_>3&%>UwB`1|KjX#&U3#u zmza=pLR!d=liUB z5nPFg`>srvo{cYs6VmwmDfVAkGe(rpuchp+&Rrv6*9oBW;ldD+%3gpymw|G!^GOs; zKg-=2htQ38FJ7F8*Zh2JL_pCW@U-78^ssqRa6int^BMpcGSaw-G_T|Jsa^8k>=#VWz%hD?HPUL|l(O+>GUL9dB zq-GA;yJXBI!MAps-pzKTSwMXTMC0;U#Wzqe8A~?ecpn_ zPZZ#^byvLcQKc){HSu!gh2&bkS^|zA`Vb1aj*}T=+Opqg7ud6W_m~9U$%K0l$c_a3 z+06_`I#}heF4UQ?C)^wn9`B&LBhtr*K4o%@1EDFKr!&aZ5v*MRj=kh>CFfioA=6YD z-eUNM=Kc5GW2>e};AZ`!apOmK$ZVAOeW&U8kh_3nbw%f;s(xAM^oTu8f#kw34>0f6 zbGwM?Pe>2Y7B2IAsrE`8n#wEdTh*dHC>(F^>BMFi^?$lZpv1^^S-mlY9}zWs7$RO` zpegWV?jiQs9cd6H+L)8zk{L05{d3J%BK0|EHsg9a>vSd=uS(cwD3!9<(>74nd_mTpF)^vhGx4@A&I0 zNA^r%PDe+B`-+Avy`aD&XXdcqyK3A|Du&d&6>XA&{H3Z$&4lt{c|Tb@e&f<&gJ!39 zR$wyp=#Kzz(DNdG2a&~d6CL3WFn`2~UiOA~Qd`wVi?pbVOsCw_^=Fw?-H~E_H#0uQ zJ#bbd*rl9`xzVuC^}a{6lkQh_A(t&nEFrV0pd0`8`$??b^@;h@{Snp*0W$lpN$%gf z$owmdc~IxxkC>Dy%lQeV$F`n=H@;ouByw;N1`(P0WyS2C~RI_~seCsOYu}6WjY==R>;io$-W9x)1?Qhadfq{t8a6JrL#N{&wb0 zr%ZYPcJZaBEahp>k3&q8+EN5Rj3%%4NdQ`Jto<%l!R(t@a7Bv@_8;aPMyq7nkn0!l z?sF7++e|0%PAukPn7LG*LS;thGlA0;Nr&%UwErCQVW1``bJOWG(u`J)n)#6L8?e_u zF59g@VejqRy_>N&_qFn_tt?JvpR(S!D^~7JOJYi-OE1{)~tOkx%z8uP1oWTo|BF?tSHE zX^1uJBQ^Exo|O*Y0N>faK@Z5=lv>%6f@|Igyf_Vu%Js`KVnS&hV<8`duC@U0jwI&vea~HQN@QirjR;^ zlO5}ai-z{$k?g6=#&;TTWE_nVDT}GT&WPF=ftkPaU|)%}{TeK2-n8z?env79g##-c z%Va$9`Daq(FcaNxhq#Ate1>(BcM0ZjcUT-Dffb{!+vouK&BO~?L|35qcG(Tup6U8* zkUpMuX;Y8RnI-S-_fA>ueZMwO*6+%j7+1Mh=U}7_G)WHQfd}RogCWVa0P?&_gj2Bg zfZ4#~#_tMYw(I!J_E)Km4<};b=FUYQ0xeKo2o-8XdsJpoMh$)*RHf{Lo3ZDvqmbuC zN|ii}NAFAXAkz#}w;OKfnZSyf%nUpMY?v9bSt6~i(2)d+PVDv$kb8TF<$EI3rXAm8 zqH&fob|b!;aXTj={V(t*V(nief1SxeK|D34Ze$(ba`S#&#|*(@%AD!jAvc9bk(hqv zUXK+cMFW0Hs8;jfWsI-IFedJtzXl)P{>T6A z5jq(3Qtlw6KMyh%qe+6|TQibt7L*_Mm`0ZJ&wie3g^0iFDSoVuiNgJHuu2J%%g~FI zk&+0ewq=VS_EVbrL-sCJg8yxHW`_Iq zI?^vjNH;ZkNoRhGeHn4*`4;YSQ4{N#?MLB6K41s!BYKA+&mBu?%4{_2O?0Xmha z+}s5+b=>da27pW%X^9^)Tkqb2ACu-wsX)nA`?wY2&R$vM$MUs{oaa%H`fl6{aoR8# z?U%hbyhx($?6p1%S5fhh_MkH7k`H+Ee6|n(+Hxa&Q6dD6f6>2~Hkm~Pxx2g;M}Hx? z)9tjze+&hGpaz+I;)K(!?%_6;I=309<7pim2xDpcK9d=4Rurfr{oppU?Osgq&Ek*V zl?6Dyh0vv_0*a!q7~X@?VR9}3Kc)W;`k#@#WnX?0Ck$>OObkM-H6fH6*FWC5&J96k z@tkl8EZkO)Mwz2GxbhV51B-sbPk^>47o9L7Wd|{^R}ksP6p3&GuL^gr6jBvQkj-QP zP&vzkL4J1Yy_yEHFh-MDITOR90UZ0ebBh?L0gSV+7~s;2IEXn6?}V)^qmc6J>RLtf zLrH{Jd!7Axkp#SI5!E4xF=%4E9cZR;8AvKnjQXc}Mdmpa_ue^;7022TLRAQgrJW}T z@KyUA18$GG^7f=F0JG1bOTh&DZGN0+bWxI@p>U{#+e9SX7Lce0Sum&zYy*>Fd=*eh+q2X9#Ee$wIBTAo1~9puFQ4u+*q47&)F1EdF; z1yAIGdes!=ZC`8slpfq~k!;yOlW7luq6J?{EP5HJ->%ZoK|n6>&`B*cm3vnifZAbT zMxJfcp?)b_Hf+wHAb@4WSBIzUup*5e!0`CKZ`#>u4C(G?LrB#3!e)n~8(@;;QQAX< z(4T}{dZ6~G7LmbeM9eFVu%^yUjp@O42PH%PU{LyP!DmG@8Z1_(Ufssh-DGEWhIzq~ zqsXCN1}LICRv6C?w#}k+OWaVJO;jgPQ}_NUY+5{y+=~l~49p(4a7rEn3M}=G5KKsT zQG?e@eq8kE=WQs)#BOTqAr5=^!Txv2)bK_)f^O$9%%VXNW#C^_a;Xbwx|?6O>52mH zMh1*dU=(hb>(e{=01oo?9jn$u;L6}G*}bm6<&IA zq#KhcxlGam__=B=CL+~|8=FSoPY~IALQ3x=Cyd3|bnUqX_F|b#(p&L9{WB07xxIQO z3YLZz6bY0{Qytb|M5)1Qh5)ycTNR*NQU|VEuy`2Edh;$uv5MlE^77lU@xrnPGU?wK z(z^@dI-toSe)TwbpST-HqW(4g9X7BxMI4mWNctq8?5JRVhEcfwj?`>{4(;l1y$%Lg z`x6!hO9BKgh}pZ@zuQ5L>LgPe+Fo2B*jEbBJu6ZY2HlqhEZHYX6z7LFM_|x5S+ik{ z&TEZ+$UcX+=f&IsqQ;$F`eH zQ)h4xZK=kZ)=9A9zGbbm_qeIUBYKBka|NSR9k)~FjAs~btNP`gjzi!{KH<>I>l8ni zx%MP0hNTZn=cv0To(hcao+*tlEs!grcd)Ld9J`xs%$aq}W+eJdPeRPXW0T;R2MyYB z&MKqKn(7MrzkX3oCbn=&HGbP^o)X?D0J9F8=M8IC?SmCL{D<8J9Yec6g#*rh>DL?j zm+KMG({}s% z`)SVJVs5wVj&;-Z5ucnJ#;Sb^kGCC7ij6O`^;ErpjN+k&v&B zRL@LI2tp394h{Q^?w2bl$;J{x6q5x(|M6j4PL4knqmCb+#Q*T`IqYFM7Icv2Uh2f* zHadG7&!791yOM`l2!00pl5c*~-CMwugMKW8N6nZ0(JA|@C)s#_w!}*!IPG z3Y&1aAx&*XvCk?{H1H5ck@awc^wH8$j@@@9f=uUhDFuCb@)L;N;ZMz2k|X{!C21Fb z^RJC;+Y1VQizwsQ`&Tc8`yJw4u`1g^v>%$|+Ef7VoyR|5q3>UBB!)1s%#IxhVcwqw zKZ*8TmyZyvk)Xqj6}$adBvnjxk{_$`iL$bD(JDgw9v)V?A0m&;d1LkgPF+QstS*z! zMtq^Wbxn46e9y>cJv-yWt2Y8aYz%%p6{-@&;TI#;{_>$-YKZ8&49juj+ z1~#^lwd3=4Gz%S_;cQO7wWq$scKLSz&)%`8jzb1$P>D(1ICo#RY-uOQWLQ(sFiJMcb2K%a?LHqzJ)pEEM+Hc$H`Zbz_Z$H**C$%@7%)Z!DK3jsHy| zs0YOkmT!-{ODOLCBouh}i58Q$ZKz%&H^hzHXVOJGmwlXK;99^y<6-{5CI&V+y5iyP zAYL5t2R_P(ykY$9IPqq^|U4vUNHjKb%r4tV~*JQoRAxI1eKd5 zA@dOpFlaqlN@ostbuQbJ21k%^uuhK0gJ(qhRWY>r&E`Nng&KN%Ak>Q@)He1>U{EEy zxUO>rty9UlcZtwyn}|h%b;_`WySy;gEoW}Q06CX7y=}kLQ*!v;{1|A{B&1--(zrvQ z_A3{?=x=yOHD9#y{d!GL4a}NZc?h)1wDsTX6Ur>me)$7$90tuWJ6ohAk3Qu?Lg8`0 zodn$hVdQxm)OO_@WQOEt%7T~?Le&iIezuonKljnYIF=L8nq>%-7{OhHbhPgWaoM}k z)1EuBDI&+_*K7n;I`bWoT4Xq(+bwCF4{P_R6hd_^S4?lJ4&novr`6@dV1nT~PNyak zA7aq1M9+^6etgs(2Yiq@v%Wl|$+is!W~wFK)gSW#LqR~&TLx++H?)ZJuz~2sTMJbU zh@5I&j>xHsLRVus-d32LwLHZ`U<}&i`$h^W;)~6tB_@}-RQB;I)`zxeGVb1nL5h=Q zG%MWo581{6MyvU4+Zv&m38x^19-v-pdmV?=JLwVcJrW+jKbzrgH4Ha~{aS!uM2bka z!e@9?*@pc(kjuN4+_cx13AUazLIF>4&@8AD+zP5wbOZ>M#BLsf?l0jJwKGZ<lT4I(_(0cA#-5P>#L5d5s6EC||K zn%cP9u+i5u3LJXGLFIG9>yWkcwe8I31`2 zp}SCF7x)eZYrbj`Q9R`iv)t=*gC|zJ0yYYI zmJXQSf4KN6<0j;j?U6Aa?`lPQUj1&(776@7G%=lCoaRCDu12jMO6B%FvZzfv*nefu zZWvSn4kdAWlaYrzzo3eF2~xJ~l-$N3R4IrITzdF(bZ3J}@$ZSL*OHeIFCcN&B=u;~ zs?GPDbtBZ@-a^1F!0Fv}ryv^hF8P=DF&zng+w7Dp7bN{Y)6)SbErJ0!-!|K;H#{;# zkxURCi#?p$Q9T(&-_@rfi;0B;jwb#lIpdpYcvJJTuCR7%dsAYPsKN|)olo5w=LdXTM-V*`y7btegL-8bU&b%0hAp(~ z_U~X1q#KUyYLsFE?{}Rh6EFHslr%lrec=?6#2nOX8M!-EE6Jtym;1y`hEBD%)lfLPM08l49MJA=Zt5Z63~R^vT9Mo zBtLSm;V>S3zqm?(CTtH91vq^%rWLwk!3>Q<>ksZvIZ9+skhtuPIN?lb)uHw4Pumk~ zYmw91F>i$@fwe?`-5><;(->{KZ)oQn-m>^E45$hSBZ-%7^GK!V4&s@oM;Z|iF+5Y< z_a42(Iq|$aEuDy`{EhBF0Pl6my%+9*lO2DNJ`oEGbUFvyoFj`niJRQ>O=S!ah4Ozj zm~-sd!_I$3a2wFt!Cq3PD`kK=`^}b)z`DZh6K4g!HL4VCTDk)gY|B?>7jlp|ELe;)-}1Hsr4Dt z#!q?DpHPKrH4dQ0F?^bn)EVPcT@i8}iGmXGDIQ+ypX*QZ1LI_Wt!>2z9QZu9sWMUktQ9&p5|5ksI?znf33aoWi`WaW4oVgz5b=4}ER8)r&G2*uF%juc8?B zGauWp1*k(GM&+u0GEU7D^CV(>q8g&;w0}URjVrgHp|XhA^*bk+wlHf) zavp3+i+>;YF8OGv6%=>v1KQpWfdO;EMD5UjmK;PN#3_JlTD%C#NmP{4`g7 zg<{0t>&~lQG0c!D!?wsI=GIWR&aMr_D9CM{FSQ%e{FF8BV5CpXpqNm-oP{#5)QJMX z%|j|m+zztr%(?C6^r+JEGp{HgxIP%8FVk+=tV>`e0t+|P4Xim|+Vin)GIYvce6X^r z$|3NJyKwpzkd97REnxdJB7QLbZ9uK9F?YkSkuPu>Md8Nn8Qlc$Ut39?pkq|D0Hb9z zM_%Uo6|znKcAJq}h=u@J)yfXA0qX0(14rG*dfSHaLg(9V>g*HF6%X4g`p1FlF~R?* zYqR=yI1?vr7NdHUQMDHJRZaI7UCrQ{c{Ehb(BvTjVV;k$=RmQL8%~S@-4{Lbk6p{M zq`Tiby`;J-rA4#Djg^b*zr$|=SqST1yj=VIL~hG11B2w0?u7m3;^LL*Wqr)tedtj6 z&>*1Vf?4U&FG|c^4ZnY%pZXA0om2B0qd7-h9Kl+*)mJ2}y|P02FvA@2)=`Iqja$~w zrvxPP4mK+YdmkHCFK>sw^RTBJ9<=bfZYgs*MYKGntN z4^y}^DKLl*ow(&T&~rOiRTK?skyXY%N;>paf~wo{y-I4DG8%@@}% zJNP1YVfdgo|F;3Tt5+ME%jSEtjCko(?w+YA+V|SDbAj71rl>XA_z0Bg3?>Ek zrG5C)+;_`!pX7m41vRhl9PbhnImgwm_Gj<$-SSu3m%@X8@YU9L4e#BbaA8^M&&Jxz z#i=CCo$uAcPWQix-(0epX*muYRaVxFPc^+W0=A4w}cUHT@Xb4s3Xy4UOFJI~~6%WsyywRC@emAYp3 zoVRzcf8SEe`7^tYHLM*fEBF=M>*vw5mfgR9pXS*E+%rGC5(-9T7c0)Ws40cOto=!H zi658_J^0-aLQh>Qy)vH@C+0T4mwkb4@I$JC-C|{AvhAi}<$iw{`V&5VX8l~R)sYup zKb?HHTeFZnvza_)I~yV}oYrgia{YILN>5+P+;f%Kcj^~&6g3yaa#TK)g@`ab#6a{Kib9k2TKdx65B=|+lZ{XZ;# zBDuX0`!pIDek|w>H1sjg>coNbvtCDE6~FbY@ZR!kBWu-_skfd7?N19`t_aTFecBsN zyH=OJn%1t+`q;U{(OG5W*S$rlzXX;r(S;0CQ2-K_#?|O}LsjE_Hq}b8vMy@FE6l%U zxcM~o;h7HxY%22vBaWbeyH;QJ6t}AX<$6b0Cc?KJyGugKe4=Ys` znQJN}DWnqd?@Pwq`fLkzVTs#!M{uF9O(JqqBk}DZvSD)GR<9ouuQ|r95U#gcNZsIu z{v7JK=)9D9ri0>-7&?S}0ocq^G0ALg);V0Bx;f19{Q(a@`g49uW8W8rffytwglz+*Fl2oJDsL)pOPt!zqK~m{I2ub2{XRO-0!ZqKCrXy8ShH`_Z-H{r!JwAkrXN zStGYe>0|8#_OCmj-CW2e#3W;=cH#B^ewztB_O#30pI#2=cx8@(7VWnhxW}YC9mSg~ zdH!qA$fH92nFg(#d_4vJm;Yq~?WdAG>rS2w?Em=%iT?h(#^sJ1@6-2_D0#s{CIJVk zwjUY1ITS=}W4iDE`oYi# z-rT#2>E(~@{;z-W5|kvW0HAq!MEuhKDz6FO3e6O`ao)NA->Aog#KQ-60KU)ef32bF zb5ppI={j*v?!Vvmp)kwlw(4%W{qaI58BGz?nbB<~lfNqLv*%8PjhJ7#^xwF(X94f$ z&kHMi3(pifZZ;1|ysVl;&kmx3E43%8>GbaH6(O{qcKKS79*T2S|Laf1!#=q&LyW!8x~JPaCyWoKpS}IKxSC^4yf1@L zFrfZlLmZZ6t363`@;E8_$#Fnjdh4=~NZ%3FZ&rq}W?p0eN{24~Boz%(Q#^gLvG!&db+Z_U@AbyQK|fm@Q!J!!<==Chpbk6|Y$Tnf^ylOK^lSx|63F zlX+|IjZzCGdidME7t(2W(HusXoyUg*gwS%eek+qTai%3M_~yE0_m$VjekAy~F2&2} zaUK3Bq5uCHyXvs0qNabBR2oDimJSK&ZlpuHyQRSe=~@u!?k#+iJ)w>8Um3M}g%lU8@Xr`MBRcjwL3W&`7}|h*;u~5J6__3CcsM@oju8Xfg)}k2 z@fPul%Z}zVHeibd+<1mdS)_T?52iH!7Qwhg0>1SO3~;PKQ^w|b3hhYN1T8i7pWXE# zke0nnQ(nxC(dt()kW?xwbFE~&dIB*jjuMC!g8V+oiz|GsJbO$=7WE=4r}@YLFCH79 z;$~izzD(F=7~{%TJPtu*R0FiRj71YIGh-cLdZtYUP^Q#wv02qi2pv7X(_3H0hz_E?PVN2D zWS!m@4H#?Abs?CFLuQHeXPLd!>M~DHV?f-{{AWvKUCTfGX)EBlIWnLy6M(xyl1N!n zxPmxKi)M!IMTYbcK$V()__Hk8mqSt^M&yt&nK;51krqTGD*!kHj<@ox$&FX#;Ol2N z5;|TTk6=M#rbF*ajepwjrK~@30$hl%9IhkS>4{$5@5=$95%4L*rwOOpeNR8ixq_9s zXkICENivK{gSUZz1c65R-Q5%3>$cWBc0}H5~a3-fq& z*rS;_qvC@c7ppRtMMf-}Ogj&Lk41|jxO|SXLe=Z6?$VF*6iGlkmu|i0_<1(~Eu-wq z>txR&6hGf%S4y?qO?aV{6fJ;Q{7Pkpu90Os&I|sC)vrPe*k>yzlyfG7Y0urQw@@FQ zD1&>7#PI_`ROGGwWARFwK?%@s5Ea^?)5mQyxn(A$cX;*{Di&5adq!7y8cSJboQN`OuIm3 zuNsPY$;rfshyhyTh~#)~7G}6Cc!VR6?&F%OT^xvX+Xd7fQ9stRv{1VasnPiif56;- zRl@E&xWD7B^2Jzp|8~Sc>4fXzSDckR(_hKrhS>||4>t#ACAj($0Dy1>OE$>){$lrX z6o*noct9(nTHtbdZbrZ2sIuBaiJ3g* z>5_%m1=kQeF{SDzLio{!#LoUc>0eQLQ35-5BK}yXa|myaAP0Q8<2#V}z21^9LK%Xf zdF(iW?3W$GE_M6_e+N>+X|4T9^WdhYaJa{x5#W<7xIy?gJgd>CAL*}y{E7w{A3Hj& zBP;R$?+6B@>~8sv1?2MQst`0u6+15iRy_cw|DC}AvAU`XB)dC1*Fgfr!NBz6M}QxS z#Kmm@_0sj(zbFFuWa-1ue{|^cJb(Y(?~j*6{LJV9HQ156aK7Kbf0PqI)|}^CFd%=I zruF-4K;}Xq_W+B=v>N(HGw?|!``p}5gazUs2>Uyrmm;uW{wbBIbwUvH-zI9`nV`CQ z;!2$_>Vn9QBgl+(MP5G-2598|SBMahSaWmyWpN;o z6N`a4hS2|KE@hqSH=J;iE&G1N(k*Qw0f^`bD$YDaYx+1@=|2{smnN{8h0ONnJ|jpk zLjbmlta^X)+U&1H9fraE!(L5j_P=n(%y>n<;T5Q&&J$==MFSF{Kr3ZhSem93@U0~c z0A3?(dA4(z62q@oAJJ~^4^2KF>^RbY8u{OAcS57;TJ7&Rjxqapm?1VVm6bKyK`K=ftG5%%Nc?4bPxBTpkXb<&=KB;A2XA}ecbB6zpGOGL_ zQ~mEmV^+d@I^NCxvk*nd?81@OJfa%5H4YVM#zcUfPY^DBg)caN0f1i!OMMziJJE6U zwz}!BTCjtC|ejlg=RdIAZ zj0oLfv8tV}7sdP=@3vk%g)PK{?Lj~inswkdYi(^p1u~zqX0x(E<)BCG=d{tLeSdT+5H=)EsZogc?Db*abbIF7*tnw2 zE5(-};E)qoGK?A%1DkRI*+*hslJ9xce)Gw^>hq&$)P98wk`SWo64`3UP9V-VzA0F46yaKr3#JHPEg1j4{1gWz+mf~EthtJ2r)8o%7a>pc`J3&MuKn-efOMe+l^ zEv0zCT0J8c^k4)(6Xf?KDS1r`E=2}{1n6c$8dKk6<)-fW8)8c-F4o2tpLYjlBHPZr z1_Ah%@{`x70AJDdQ=pP*N>@4p$?2Z{d^!%d1}#6FGIW}^`&9J33&-L>$Go4|o){ty zK9!OSq_v5@P^vP5^e{#zQTYPY{vuL>J4`@; z#0@9k*cA{_khtoJ41TO8c0qtKW)_{|y!8W7Qb!pQ8(e&lbT^A75z5nG7p_grke28) zHr%r&6BHbL{29}RwnR_-bP%_KBKpIG#2#bew${D(M%}5@i%6eB)Q}O4LpR5wVi++#a_Vxg$UJfm8M$Vu@y zeE(C7UX8l-K#e`c*^-y?`V3~*jB7H z;_;Nq%?AU(QZO5C!~Je)7@Ht3{V)%Da z^yQ|D2CF(JnAH0J;!5D7&*7T3<4+Xci1{I{s^u{SCSc$Km+LoP=jW92;-oci5~mw$ zI`%@Qol4QIc=shTSlvNRuIS%ng)6InZl%2Oo_0iyRXJ8RM4Jp|IQm3)mf#<0p{;N8 z`U3X0uDjE`EW$QmDce+Vh^APO#NYwb292+#NRDhwjmSOkHn~tER(zwpoql!TR_56! znAjGGPpiVE;@tVv zvbQ00ktageOVO!8_q<2pr{i@>uj z8*#n)y{kuYyjTt0dszOXx9PMQVE5i1%7U7CFfV-es3f;>wUKZ17c4Qu0oz&`7LO_t zWZ?WLsDmV!++h-vqgIjfq?HpZS|%16gbdELnr!MHg245jG%8kalm``Yc#bxb`xKQl z;`z9R)!@7%Axk%P>3uwdCP+ZkFY7khxNPP6*Gc~IBIXP;uaANCcfFZvA&1M&#UF^! zciw{8Xkx}0lp|;YrFdUEMe8mO@wX2aY3Iu(xfu6UTUpI-Y*P*KD~ zA0B>|wr^*^CZ+9_KGW&)H<+p97_{ya`^~?6Ys*Vo%}sb)QS-yADKRXAm<|eyMRGot z7D$%g);9L|pJYcBFeO$&Z=M zaPrDV!;D6y%5c+v$cW|RM+z}cV8n|g33_u(j7F1`o1UGQKsZi=Pgh;%AT4odBIVsQ zHdg5SmCo9HkT)R6qw<}bt#x{{yM#_*R{v5JOThS`0nf#jDzuq_!5swzgyF zX3}~65+k0QiPGcHK?KHUafZ|xQI}im!mg{q!K9xbu_Q<-p$FU zv1#_K&F7MfnKG-E9qj<;DBHD+cNlEZ)Smkm{;^IYX{TZS?auREnvIFWD*JMiquyo3#0I^`jhD3?xlzY5ZX`HhPD8cPd*%TsGHWD1kY5n;7mk<`a z9*J+RSy9fy+NM*;=9b*3FG|~WU)0uQ6TYU+caN9>ML|Q!!+lNl@SCOuSQed9xFzkH ztvEEMQStfd@Ss^^l9!Ku z$4?q;2UmWFu~=kA#b`$;$5wWdCA_Tj`~bHnem4UGAY*WW&lU{R=C8YJ)@IKB6Th_wtgAR zhL>5xnwvRS(EymO>1K{l2pC6}aJs;bxR6mrO1gjQ@mLwI9ovY{c-T#qerdnFVR>)J z$h;SZXk&m+Sz&hLV?qa@dQGJ1;`io7p)9Fv46&?<9Ig6KMRZNydFpay-rI?JKBAJo zGDS3a&!5VL5auEiLg#d$)G@wEqfk6N5$9S#Y$b7ls`K%Iv`iS{$MvZB9au{pw zW`+U@`XD*kEaT&c9-q)>8{H_PZD(5}qmjuZ@_0zz;mL*U;8uu@EqVVe zmh|C_apn{?v|YVGlg>sf3Z<1JdR9xEUxy0 zQ|ZHo&+nWlf|B2(gs8jnu2_*mDj5`G2X$V?11OJ{s`l{!8j_(JSrwIAJis$XOOj5{ z7gTxgfum7 zf6R2AT1?Z6^75iF}h zflj@8DKwt5U#=etk-Z|0s6qK3ayE1GN#4vQPLP!4xV67~Yd9%?NNYDzG{9X+x{0nN ziGD~d->&L}MOP3UZ5)~Y6pxcieLGt{0f;Au&mQ{r%I<8w-)l+YCU51=tiBzpd`*x~ zErTUwhUX96In^X<<$lZqhXA`XBGvkhVHJL|Kq3w_Paf%ww?Rp5K5}b(7|=~rQ$ccn z6$ZrrGC?=<7_*Q&<44(GhU19g0MbM1&{J027uW7_<_~yKT=IJd-L(3zR6x>quKB8m zqMuMn0(BZ(5Y;r<@g2mU9W*|rp9JIzGcKcR!QOa2+Yx46yj+>T!P2W!Csc=i8a?ij zly4)vbTfj)=9nOTZL^iJmc+5_riNn^ z;hHNOARmTIaqyWLuXupD^0O?iWb{z))$Yc?0VL>U7Ij z!|h${D>K+QR(DV11RaRx30HdUYn1TtSyC>%_5^@&*^#64nm(}QRgaTaBOV@^$C40_t`@L{LANjoPw+txk zHg70=2UkY}wdc~O<<8xKxcO^~8kyd_a&I|iiObxT zbY+9*x|zCKGVW9y33{>qGCWG@COJV^u3_MLz3jI-6a&M10f6kC%Aa- zue!d_qgh)?6`L-2|EQ3U?0%KJw&n&G?Y-U|r)BQ!sb~~uW=Z@e0tz8#ko6m-AoThA zd7j7q>jq_FjE=8uRCF0%&Dy=%qL1!Ot%p462zuPP^oOB_ z`DHa3iTa$*IL+1;Z?%1bQqN z152Z)((~Oy$Z9t8Ho#GtFh1W|w%h{EuXpzpfj7O-m=r!U9w1Kpn;@aa>*W z`yAtJf7Aep7T>Jj<%v4=yRLh+)8rdJjIW!(-{(AbcC+P>p~}5`9Aw_fE|fyu6Bz69 z@>C1H#=F-n**<&Hb#u15@!)qw1xkhuX`et#$u9lHw)ExAPBmCHCc0tc%8ab-h&-xm zUJ~E?!7?&3=$L)!bo9qpzJ9>h@+NlDc{ryerq=ZBHwY|-)8No!o;Yt2rm%h)@q+B% zyjb*axtZR6FP_~bwGj65tHK%6-&7--zcU(Ih3e=~G%>t-Bse0uBa}Zo7thv&QGP8A3pPu|K`0-(v z#XYvxxoT=)rrB5qJ}9(DS`E%p+vz@O;y37@=B&4Us&(LQ$%0$!j@!IAXVy17Gqv7E zJCPLGNw#A`IHI%@&sph#f=W9lqkE%f4_b5y?Ita import('../ReactNVD3'), - metadata, - transformProps, - controlPanel, - }); - } -} diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js index 6e2725ad1..f4051195c 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js @@ -126,7 +126,6 @@ const BREAKPOINTS = { const TIMESERIES_VIZ_TYPES = [ 'line', - 'dual_line', 'line_multi', 'area', 'compare', @@ -201,7 +200,6 @@ const propTypes = { 'line_multi', 'time_pivot', 'pie', - 'dual_line', ]), xAxisFormat: PropTypes.string, numberFormat: PropTypes.string, @@ -401,7 +399,6 @@ function nvd3Vis(element, props) { chart.interpolate(lineInterpolation); break; - case 'dual_line': case 'line_multi': chart = nv.models.multiChart(); chart.interpolate(lineInterpolation); @@ -713,7 +710,7 @@ function nvd3Vis(element, props) { ); } - if (isVizTypes(['dual_line', 'line_multi'])) { + if (isVizTypes(['line_multi'])) { const yAxisFormatter1 = getNumberFormatter(yAxisFormat); const yAxisFormatter2 = getNumberFormatter(yAxis2Format); chart.yAxis1.tickFormat(yAxisFormatter1); @@ -812,7 +809,7 @@ function nvd3Vis(element, props) { } // align yAxis1 and yAxis2 ticks - if (isVizTypes(['dual_line', 'line_multi'])) { + if (isVizTypes(['line_multi'])) { const count = chart.yAxis1.ticks(); const ticks1 = chart.yAxis1 .scale() @@ -915,7 +912,7 @@ function nvd3Vis(element, props) { margins.bottom = 40; } - if (isVizTypes(['dual_line', 'line_multi'])) { + if (isVizTypes(['line_multi'])) { const maxYAxis2LabelWidth = getMaxLabelSize(svg, 'nv-y2'); margins.right = maxYAxis2LabelWidth + marginPad; } diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js index 4156c5ca8..b8381294d 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js @@ -25,7 +25,6 @@ export { default as BubbleChartPlugin } from './Bubble'; export { default as BulletChartPlugin } from './Bullet'; export { default as CompareChartPlugin } from './Compare'; export { default as DistBarChartPlugin } from './DistBar'; -export { default as DualLineChartPlugin } from './DualLine'; export { default as LineChartPlugin } from './Line'; export { default as LineMultiChartPlugin } from './LineMulti'; export { default as PieChartPlugin } from './Pie'; diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js index cccb877ec..f109a3af2 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js @@ -24,7 +24,6 @@ import BubbleChartPlugin from './Bubble'; import BulletChartPlugin from './Bullet'; import CompareChartPlugin from './Compare'; import DistBarChartPlugin from './DistBar'; -import DualLineChartPlugin from './DualLine'; import LineChartPlugin from './Line'; import LineMultiChartPlugin from './LineMulti'; import PieChartPlugin from './Pie'; @@ -42,7 +41,6 @@ export default class NVD3ChartPreset extends Preset { new BulletChartPlugin().configure({ key: 'bullet' }), new CompareChartPlugin().configure({ key: 'compare' }), new DistBarChartPlugin().configure({ key: 'dist_bar' }), - new DualLineChartPlugin().configure({ key: 'dual_line' }), new LineChartPlugin().configure({ key: 'line' }), new LineMultiChartPlugin().configure({ key: 'line_multi' }), new PieChartPlugin().configure({ key: 'pie' }), diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js index 7fc8669e6..cf54d4c9f 100644 --- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js +++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js @@ -65,7 +65,6 @@ export default function transformProps(chartProps) { lineInterpolation, maxBubbleSize, metric, - metric2, metrics = [], orderBars, pieLabelType, @@ -106,7 +105,6 @@ export default function transformProps(chartProps) { rangeLabels, ranges, yAxisFormat, - yAxis2Format, } = formData; const rawData = queriesData[0].data || []; @@ -119,9 +117,6 @@ export default function transformProps(chartProps) { if (vizType === 'pie') { numberFormat = numberFormat || grabD3Format(datasource, metric); - } else if (vizType === 'dual_line') { - yAxisFormat = yAxisFormat || grabD3Format(datasource, metric); - yAxis2Format = yAxis2Format || grabD3Format(datasource, metric2); } else if ( ['line', 'dist_bar', 'bar', 'area'].includes(chartProps.formData.vizType) ) { @@ -188,7 +183,6 @@ export default function transformProps(chartProps) { xIsLogScale: xLogScale, xTicksLayout, yAxisFormat, - yAxis2Format, yAxisBounds, yAxis2Bounds, yAxisLabel, diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx index 94eafbe26..db94d8da7 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx @@ -90,7 +90,6 @@ const DEFAULT_ORDER = [ 'deck_arc', 'heatmap', 'deck_grid', - 'dual_line', 'deck_screengrid', 'line_multi', 'treemap_v2', diff --git a/superset-frontend/src/visualizations/presets/MainPreset.js b/superset-frontend/src/visualizations/presets/MainPreset.js index d62c12f82..02c0e682a 100644 --- a/superset-frontend/src/visualizations/presets/MainPreset.js +++ b/superset-frontend/src/visualizations/presets/MainPreset.js @@ -41,7 +41,6 @@ import { BulletChartPlugin, CompareChartPlugin, DistBarChartPlugin, - DualLineChartPlugin, LineChartPlugin, LineMultiChartPlugin, TimePivotChartPlugin, @@ -105,7 +104,6 @@ export default class MainPreset extends Preset { new CompareChartPlugin().configure({ key: 'compare' }), new CountryMapChartPlugin().configure({ key: 'country_map' }), new DistBarChartPlugin().configure({ key: 'dist_bar' }), - new DualLineChartPlugin().configure({ key: 'dual_line' }), new EventFlowChartPlugin().configure({ key: 'event_flow' }), new FilterBoxChartPlugin().configure({ key: 'filter_box' }), new EchartsFunnelChartPlugin().configure({ key: 'funnel' }), diff --git a/superset/examples/birth_names.py b/superset/examples/birth_names.py index 80324ce39..8b09aa4bf 100644 --- a/superset/examples/birth_names.py +++ b/superset/examples/birth_names.py @@ -388,20 +388,21 @@ def create_slices(tbl: SqlaTable) -> tuple[list[Slice], list[Slice]]: Slice( **slice_kwargs, slice_name="Average and Sum Trends", - viz_type="dual_line", + viz_type="mixed_timeseries", params=get_slice_json( defaults, - viz_type="dual_line", - metric={ + viz_type="mixed_timeseries", + metrics={ "expressionType": "SIMPLE", "column": {"column_name": "num", "type": "BIGINT(20)"}, "aggregate": "AVG", "label": "AVG(num)", "optionName": "metric_vgops097wej_g8uff99zhk7", }, - metric_2="sum__num", + metrics_b="sum__num", granularity_sqla="ds", - metrics=metrics, + yAxisIndex=0, + yAxisIndexB=1, ), ), Slice( diff --git a/superset/migrations/shared/migrate_viz/processors.py b/superset/migrations/shared/migrate_viz/processors.py index 076655378..1616154bf 100644 --- a/superset/migrations/shared/migrate_viz/processors.py +++ b/superset/migrations/shared/migrate_viz/processors.py @@ -84,3 +84,22 @@ class MigratePivotTable(MigrateViz): if pandas_aggfunc := self.data.get("pandas_aggfunc"): self.data["pandas_aggfunc"] = self.aggregation_mapping[pandas_aggfunc] + + +class MigrateDualLine(MigrateViz): + source_viz_type = "dual_line" + target_viz_type = "mixed_timeseries" + rename_keys = { + "x_axis_format": "x_axis_time_format", + "y_axis_2_format": "y_axis_format_secondary", + "y_axis_2_bounds": "y_axis_bounds_secondary", + } + remove_keys = {"metric", "metric_2"} + + def _pre_action(self) -> None: + self.data["yAxisIndex"] = 0 + self.data["yAxisIndexB"] = 1 + self.data["adhoc_filters_b"] = self.data.get("adhoc_filters") + self.data["truncateYAxis"] = True + self.data["metrics"] = [self.data.get("metric")] + self.data["metrics_b"] = [self.data.get("metric_2")] diff --git a/superset/migrations/versions/2023-06-08_11-34_ae58e1e58e5c_migrate_dual_line_to_mixed_chart.py b/superset/migrations/versions/2023-06-08_11-34_ae58e1e58e5c_migrate_dual_line_to_mixed_chart.py new file mode 100644 index 000000000..5d707dc60 --- /dev/null +++ b/superset/migrations/versions/2023-06-08_11-34_ae58e1e58e5c_migrate_dual_line_to_mixed_chart.py @@ -0,0 +1,37 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +"""migrate_dual_line_to_mixed_chart + +Revision ID: ae58e1e58e5c +Revises: 4c5da39be729 +Create Date: 2023-06-08 11:34:36.241939 + +""" + +# revision identifiers, used by Alembic. +revision = "ae58e1e58e5c" +down_revision = "4c5da39be729" + +from superset.migrations.shared.migrate_viz.processors import MigrateDualLine + + +def upgrade(): + MigrateDualLine.upgrade() + + +def downgrade(): + MigrateDualLine.downgrade() diff --git a/superset/translations/de/LC_MESSAGES/messages.json b/superset/translations/de/LC_MESSAGES/messages.json index 1631ba0a8..459d26f98 100644 --- a/superset/translations/de/LC_MESSAGES/messages.json +++ b/superset/translations/de/LC_MESSAGES/messages.json @@ -1175,9 +1175,6 @@ ], "Choose a database...": ["Wählen Sie eine Datenbank..."], "Choose a dataset": ["Datensatz auswählen"], - "Choose a metric for left axis": [ - "Wählen Sie eine Metrik für die linke Achse" - ], "Choose a metric for right axis": [ "Wählen Sie eine Metrik für die rechte Achse" ], @@ -2782,7 +2779,6 @@ "Least recently modified": ["Zuletzt geändert"], "Left": ["Links"], "Left Axis Format": ["Format der linken Achse"], - "Left Axis Metric": ["Metrik linke Achse"], "Left Axis chart(s)": ["Diagramm(e) der linken Achse"], "Left Margin": ["Linker Abstand"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -3521,12 +3517,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Wählen Sie eine Granularität im Abschnitt Zeit aus oder deaktivieren Sie \"Zeit einschließen\"." ], - "Pick a metric for left axis!": [ - "Wählen Sie eine Metrik für die linke Achse!" - ], - "Pick a metric for right axis!": [ - "Wählen Sie eine Metrik für die rechte Achse!" - ], "Pick a metric for x, y and size": [ "Wählen Sie eine Metrik für x, y und Größe" ], @@ -5339,9 +5329,6 @@ "Time Ratio": ["Zeitverhältnis"], "Time Series": ["Zeitreihen"], "Time Series - Bar Chart": ["Zeitreihen - Balkendiagramm"], - "Time Series - Dual Axis Line Chart": [ - "Zeitreihen - Zweiachsen-Liniendiagramm" - ], "Time Series - Line Chart": ["Zeitreihen - Liniendiagramm"], "Time Series - Multiple Line Charts": [ "Zeitreihen - Diagramme mit mehreren Linien" @@ -5760,9 +5747,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "Visualisieren Sie zwei verschiedene Zeitreihen mit derselben x-Achse. Beachten Sie, dass jede Zeitreihe unterschiedlich visualisiert werden kann (z. B. eine mit Balken und die andere mit einer Linie)." ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "Visualisiert 2 Metriken als Liniendiagramme mit derselben x-Achse. Dieses Diagramm ist nützlich, um Metriken über den gleichen Zeitraum zu vergleichen." - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "Visualisiert eine Metrik über drei Datendimensionen in einem einzelnen Diagramm (X-Achse, Y-Achse und Blasengröße). Blasen aus derselben Gruppe können mit Blasenfarbe präsentiert werden." ], @@ -6078,8 +6062,6 @@ "Y AXIS TITLE MARGIN": ["Y-ACHSE TITEL RAND"], "Y AXIS TITLE POSITION": ["Y-ACHSE TITEL POSITION"], "Y Axis": ["Y-Achse"], - "Y Axis 1": ["Y-Achse 1"], - "Y Axis 2": ["Y-Achse 2"], "Y Axis 2 Bounds": ["Grenzen der Y-Achse 2"], "Y Axis Bounds": ["Grenzen der Y-Achse"], "Y Axis Format": ["Y-Achsenformat"], diff --git a/superset/translations/de/LC_MESSAGES/messages.po b/superset/translations/de/LC_MESSAGES/messages.po index add584cb2..76a425a7a 100644 --- a/superset/translations/de/LC_MESSAGES/messages.po +++ b/superset/translations/de/LC_MESSAGES/messages.po @@ -1422,7 +1422,7 @@ msgstr "Erweiterter Datentyp" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "Erweiterte Analysen" @@ -1632,7 +1632,7 @@ msgstr "Gesamter Texte" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Alle Diagramme" @@ -3233,7 +3233,7 @@ msgid "Categories to group by on the x-axis." msgstr "Kategorien, nach denen auf der x-Achse gruppiert werden soll." #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "Kategorie" @@ -3479,7 +3479,6 @@ msgstr "Diagramm-ID" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3759,10 +3758,6 @@ msgstr "Wählen Sie eine Datenbank..." msgid "Choose a dataset" msgstr "Datensatz auswählen" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "Wählen Sie eine Metrik für die linke Achse" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6496,7 +6491,7 @@ msgstr "Alle Filterwerte dynamisch durchsuchen" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "ECharts" @@ -7081,7 +7076,6 @@ msgstr "Jeden" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -7108,7 +7102,7 @@ msgstr "Genau" msgid "Example" msgstr "Beispiel" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Beispiele" @@ -9004,15 +8998,10 @@ msgstr "Zuletzt geändert" msgid "Left" msgstr "Links" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "Format der linken Achse" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "Metrik linke Achse" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "Diagramm(e) der linken Achse" @@ -9053,7 +9042,6 @@ msgstr "Linker Wert" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10356,7 +10344,7 @@ msgstr "Keine Datenbanktabellen gefunden" msgid "No databases match your search" msgstr "Keine Datenbanken stimmen mit Ihrer Suche überein" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "Keine Beschreibung verfügbar." @@ -11762,7 +11750,7 @@ msgstr "Tab-Link" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "Beliebt" @@ -12040,7 +12028,6 @@ msgstr "Abfragen" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12282,7 +12269,7 @@ msgstr "Kürzlich" msgid "Recipients are separated by \",\" or \";\"" msgstr "Empfänger werden durch \",\" oder \";\" getrennt." -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "Empfohlene Tags" @@ -13486,7 +13473,7 @@ msgstr "Suchen / Filtern" msgid "Search Metrics & Columns" msgstr "Metriken & Spalten durchsuchen" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "Alle Diagramm durchsuchen" @@ -15243,7 +15230,7 @@ msgstr "Getaggtes Object konnte nicht gelöscht werden." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -19135,14 +19122,6 @@ msgstr "Y-ACHSE TITEL POSITION" msgid "Y Axis" msgstr "Y-Achse" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "Y-Achse 1" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "Y-Achse 2" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "Grenzen der Y-Achse 2" @@ -19364,7 +19343,7 @@ msgstr "" "Sie können den letzten Zeitfilter nicht löschen, da er für " "Zeitbereichsfilter in Dashboards verwendet wird." -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" "Sie können das 45°-Strich-Layout nicht zusammen mit dem " @@ -20418,7 +20397,6 @@ msgstr "Symbol für numerischen Typ" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/en/LC_MESSAGES/messages.json b/superset/translations/en/LC_MESSAGES/messages.json index 2c8a916d2..2bc6be87c 100644 --- a/superset/translations/en/LC_MESSAGES/messages.json +++ b/superset/translations/en/LC_MESSAGES/messages.json @@ -808,7 +808,6 @@ "Choose a chart or dashboard not both": [""], "Choose a database...": [""], "Choose a dataset": [""], - "Choose a metric for left axis": [""], "Choose a metric for right axis": [""], "Choose a number format": [""], "Choose a source": [""], @@ -2007,7 +2006,6 @@ "Least recently modified": [""], "Left": [""], "Left Axis Format": [""], - "Left Axis Metric": [""], "Left Axis chart(s)": [""], "Left Margin": [""], "Left margin, in pixels, allowing for more room for axis labels": [""], @@ -2528,8 +2526,6 @@ "Physical dataset": [""], "Pick a dimension from which categorical colors are defined": [""], "Pick a granularity in the Time section or uncheck 'Include Time'": [""], - "Pick a metric for left axis!": [""], - "Pick a metric for right axis!": [""], "Pick a metric for x, y and size": [""], "Pick a metric to display": [""], "Pick a metric!": [""], @@ -3833,7 +3829,6 @@ "Time Ratio": [""], "Time Series": [""], "Time Series - Bar Chart": [""], - "Time Series - Dual Axis Line Chart": [""], "Time Series - Line Chart": [""], "Time Series - Multiple Line Charts": [""], "Time Series - Nightingale Rose Chart": [""], @@ -4153,9 +4148,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -4363,8 +4355,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": [""], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/en/LC_MESSAGES/messages.po b/superset/translations/en/LC_MESSAGES/messages.po index 77f32f763..2a4772436 100644 --- a/superset/translations/en/LC_MESSAGES/messages.po +++ b/superset/translations/en/LC_MESSAGES/messages.po @@ -1313,7 +1313,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1512,7 +1512,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "" @@ -2986,7 +2986,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3226,7 +3226,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3490,10 +3489,6 @@ msgstr "" msgid "Choose a dataset" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6035,7 +6030,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "" @@ -6606,7 +6601,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6633,7 +6627,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8414,15 +8408,10 @@ msgstr "" msgid "Left" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8463,7 +8452,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -9715,7 +9703,7 @@ msgstr "" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11021,7 +11009,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11294,7 +11282,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11528,7 +11515,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -12675,7 +12662,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "" @@ -14347,7 +14334,7 @@ msgstr "" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -16981,12 +16968,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -17704,14 +17685,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -17903,7 +17876,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -18912,7 +18885,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/es/LC_MESSAGES/messages.json b/superset/translations/es/LC_MESSAGES/messages.json index e7d35fa75..553b19b24 100644 --- a/superset/translations/es/LC_MESSAGES/messages.json +++ b/superset/translations/es/LC_MESSAGES/messages.json @@ -2143,12 +2143,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Elige una granularidad en la sección de tiempo o desmarca 'Incluir tiempo'" ], - "Pick a metric for left axis!": [ - "Elige una métrica para el eje izquierdo!" - ], - "Pick a metric for right axis!": [ - "Elige una métrica para el eje derecho!" - ], "Pick a metric for x, y and size": [ "Elige una métrica para 'x', 'y' y 'tamaño'" ], @@ -3257,9 +3251,6 @@ "Thursday": ["Jueves"], "Time": ["Tiempo"], "Time Series - Bar Chart": ["Serie Temporal - Gráfico de Barras"], - "Time Series - Dual Axis Line Chart": [ - "Serie Temporal - Gráfico de líneas de doble eje" - ], "Time Series - Line Chart": ["Serie Temporal - Gráfico de Líneas"], "Time Series - Multiple Line Charts": [ "Serie temportal - Gráfico de múltiples líneas" @@ -3554,9 +3545,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3747,8 +3735,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Eje Y"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": ["Formato Eje Y"], diff --git a/superset/translations/es/LC_MESSAGES/messages.po b/superset/translations/es/LC_MESSAGES/messages.po index 08f505b40..487e1e3af 100644 --- a/superset/translations/es/LC_MESSAGES/messages.po +++ b/superset/translations/es/LC_MESSAGES/messages.po @@ -1395,7 +1395,7 @@ msgstr "Datos cargados en caché" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "Advanced-Analytics" msgstr "Analíticos Avanzadas" @@ -1603,7 +1603,7 @@ msgstr "Todo el Texto" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Todos los gráficos" @@ -3183,7 +3183,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3437,7 +3437,6 @@ msgstr "ID de gráfico" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3719,11 +3718,6 @@ msgstr "Selecciona una base de datos" msgid "Choose a dataset" msgstr "Selecciona una base de datos" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "Elige una métrica para el eje derecho" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6429,7 +6423,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "gráfico" @@ -7038,7 +7032,6 @@ msgstr "Cada" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -7067,7 +7060,7 @@ msgstr "Siguiente" msgid "Example" msgstr "Ver ejemplos" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Ver ejemplos" @@ -8987,17 +8980,11 @@ msgstr "Última modificación" msgid "Left" msgstr "alerta" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 #, fuzzy msgid "Left Axis Format" msgstr "Formato Eje Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "Métrica Eje Derecho" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 #, fuzzy msgid "Left Axis chart(s)" @@ -9040,7 +9027,6 @@ msgstr "Valores Nulos" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10382,7 +10368,7 @@ msgstr "La base de datos no existe" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 #, fuzzy msgid "No description available." msgstr "descripción" @@ -11780,7 +11766,7 @@ msgstr "Pop Tab Link" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -12071,7 +12057,6 @@ msgstr "Series" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12330,7 +12315,7 @@ msgstr "Recientes" msgid "Recipients are separated by \",\" or \";\"" msgstr "Los destinatarios están separados por \",\" o \";\"" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13563,7 +13548,7 @@ msgstr "Buscar / Filtrar" msgid "Search Metrics & Columns" msgstr "Buscar Métricas y Columnas" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "Todos los gráficos" @@ -15384,7 +15369,7 @@ msgstr "El conjunto de datos no pudo ser eliminado." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -18236,12 +18221,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18994,14 +18973,6 @@ msgstr "" msgid "Y Axis" msgstr "Eje Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -19205,7 +19176,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -20293,7 +20264,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/fr/LC_MESSAGES/messages.json b/superset/translations/fr/LC_MESSAGES/messages.json index d8b3b6eb1..dee61f7ee 100644 --- a/superset/translations/fr/LC_MESSAGES/messages.json +++ b/superset/translations/fr/LC_MESSAGES/messages.json @@ -2444,12 +2444,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Choississez une granularité dans la section Temps ou décochez 'Inclure le temps'" ], - "Pick a metric for left axis!": [ - "Choisissez une métrique pour l'axe de gauche !" - ], - "Pick a metric for right axis!": [ - "Choisissez une métrique pour l'axe de droite !" - ], "Pick a metric for x, y and size": [ "Choisissez une métrique pour x, y, taille" ], @@ -3751,7 +3745,6 @@ "Thursday": ["Jeudi"], "Time": ["Temps"], "Time Series - Bar Chart": ["Séries temporelles - histogramme"], - "Time Series - Dual Axis Line Chart": ["Séries temporelles - double axe"], "Time Series - Line Chart": ["Séries temporelles - ligne"], "Time Series - Multiple Line Charts": [ "Séries temporelles - Lignes multiples" @@ -4073,9 +4066,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -4279,8 +4269,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Axe Y"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": ["Format de l'axe Y"], diff --git a/superset/translations/fr/LC_MESSAGES/messages.po b/superset/translations/fr/LC_MESSAGES/messages.po index 2963244cc..0784784a2 100644 --- a/superset/translations/fr/LC_MESSAGES/messages.po +++ b/superset/translations/fr/LC_MESSAGES/messages.po @@ -1428,7 +1428,7 @@ msgstr "Données chargées mises en cache" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "Analyses avancées" @@ -1635,7 +1635,7 @@ msgstr "Tout texte" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Tous les graphiques" @@ -3264,7 +3264,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "Catégorie" @@ -3523,7 +3523,6 @@ msgstr "ID Graphique" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3814,11 +3813,6 @@ msgstr "Choisissez un jeu de donnée" msgid "Choose a dataset" msgstr "Choisissez un jeu de donnée" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "Choisir une mesure pour l'axe de droite" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6556,7 +6550,7 @@ msgstr "Charge dynamiquement les valeurs du filtre" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "EGraphiques" @@ -7166,7 +7160,6 @@ msgstr "Chaque" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -7194,7 +7187,7 @@ msgstr "Zone de texte" msgid "Example" msgstr "Exemple" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Exemples" @@ -9161,17 +9154,11 @@ msgstr "Dernière modification" msgid "Left" msgstr "alerte" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 #, fuzzy msgid "Left Axis Format" msgstr "Format de l'axe Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "Mesure de l'axe de droite" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -9212,7 +9199,6 @@ msgstr "Valeur gauche" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10569,7 +10555,7 @@ msgstr "Base de données non trouvée." msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "Pas de description disponible." @@ -12004,7 +11990,7 @@ msgstr "Retirer le lien de l'onglet" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "Populaires" @@ -12292,7 +12278,6 @@ msgstr "requêtes" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12547,7 +12532,7 @@ msgstr "Récents" msgid "Recipients are separated by \",\" or \";\"" msgstr "Les destinataires sont séparés par \",\" ou \";\"" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "Tags recommandés" @@ -13789,7 +13774,7 @@ msgstr "Rechercher / Filtrer" msgid "Search Metrics & Columns" msgstr "Chercher dans les métriques et les colonnes" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "Chercher tous les graphiques" @@ -15593,7 +15578,7 @@ msgstr "Le jeu de données n'a pas pu être supprimé." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -18565,12 +18550,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -19343,14 +19322,6 @@ msgstr "" msgid "Y Axis" msgstr "Axe Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -19568,7 +19539,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -20664,7 +20635,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/it/LC_MESSAGES/messages.json b/superset/translations/it/LC_MESSAGES/messages.json index 520b80f35..f1c973db3 100644 --- a/superset/translations/it/LC_MESSAGES/messages.json +++ b/superset/translations/it/LC_MESSAGES/messages.json @@ -2105,12 +2105,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Seleziona una granularità nella sezione tempo e deseleziona 'Includi Tempo'" ], - "Pick a metric for left axis!": [ - "Seleziona una metrica per l'asse sinistro" - ], - "Pick a metric for right axis!": [ - "Seleziona una metrica per l'asse destro" - ], "Pick a metric for x, y and size": [ "Seleziona una metrica per x, y e grandezza" ], @@ -3230,9 +3224,6 @@ "Time Lag": [""], "Time Range": [""], "Time Series - Bar Chart": ["Serie Temporali - Grafico Barre"], - "Time Series - Dual Axis Line Chart": [ - "Serie Temporali - Grafico Lineare ad Assi Duali" - ], "Time Series - Line Chart": ["Serie Temporali - Grafico Lineare"], "Time Series - Multiple Line Charts": [ "Serie Temporali - Grafico Lineare" @@ -3509,9 +3500,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3713,8 +3701,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": [""], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/it/LC_MESSAGES/messages.po b/superset/translations/it/LC_MESSAGES/messages.po index 3507d5382..a2886a892 100644 --- a/superset/translations/it/LC_MESSAGES/messages.po +++ b/superset/translations/it/LC_MESSAGES/messages.po @@ -1362,7 +1362,7 @@ msgstr "Analytics avanzate" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "Advanced-Analytics" msgstr "Analytics avanzate" @@ -1568,7 +1568,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Grafico a Proiettile" @@ -3102,7 +3102,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3348,7 +3348,6 @@ msgstr "Grafici" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3627,11 +3626,6 @@ msgstr "Seleziona una destinazione" msgid "Choose a dataset" msgstr "Seleziona una destinazione" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "Seleziona una metrica per l'asse destro" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6279,7 +6273,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "Grafici" @@ -6872,7 +6866,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6899,7 +6892,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8756,16 +8749,10 @@ msgstr "Ultima Modifica" msgid "Left" msgstr "Cancella" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "Metrica asse destro" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8807,7 +8794,6 @@ msgstr "Valore del filtro" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10124,7 +10110,7 @@ msgstr "Template CSS" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 #, fuzzy msgid "No description available." msgstr "descrizione" @@ -11480,7 +11466,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11768,7 +11754,6 @@ msgstr "Query salvate" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12017,7 +12002,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13211,7 +13196,7 @@ msgstr "Cerca / Filtra" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "Grafico a Proiettile" @@ -14978,7 +14963,7 @@ msgstr "La query non può essere caricata" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17711,12 +17696,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18447,14 +18426,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18649,7 +18620,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19713,7 +19684,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/ja/LC_MESSAGES/messages.json b/superset/translations/ja/LC_MESSAGES/messages.json index 502a4c9e7..944b84e70 100644 --- a/superset/translations/ja/LC_MESSAGES/messages.json +++ b/superset/translations/ja/LC_MESSAGES/messages.json @@ -2156,8 +2156,6 @@ "Physical dataset": [""], "Pick a dimension from which categorical colors are defined": [""], "Pick a granularity in the Time section or uncheck 'Include Time'": [""], - "Pick a metric for left axis!": [""], - "Pick a metric for right axis!": [""], "Pick a metric for x, y and size": [""], "Pick a metric to display": ["表示する指標を選択"], "Pick a metric!": ["指標を選んでください!"], @@ -3296,7 +3294,6 @@ "Time Comparison": [""], "Time Granularity": [""], "Time Series - Bar Chart": ["時系列 - 棒グラフ"], - "Time Series - Dual Axis Line Chart": ["時系列 - 二重軸折れ線グラフ"], "Time Series - Line Chart": ["時系列 - 折れ線グラフ"], "Time Series - Multiple Line Charts": ["時系列 - 複数の折れ線グラフ"], "Time Series - Nightingale Rose Chart": [""], @@ -3561,9 +3558,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3762,8 +3756,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Y軸"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/ja/LC_MESSAGES/messages.po b/superset/translations/ja/LC_MESSAGES/messages.po index deae8766f..eafe24e52 100644 --- a/superset/translations/ja/LC_MESSAGES/messages.po +++ b/superset/translations/ja/LC_MESSAGES/messages.po @@ -1361,7 +1361,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1566,7 +1566,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "すべてのチャート" @@ -3097,7 +3097,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3346,7 +3346,6 @@ msgstr "チャートID" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3624,11 +3623,6 @@ msgstr "データセットを選択" msgid "Choose a dataset" msgstr "データセットを選択" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "右軸の指標を選択" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6280,7 +6274,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "チャート" @@ -6876,7 +6870,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6904,7 +6897,7 @@ msgstr "次" msgid "Example" msgstr "例" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "例" @@ -8758,16 +8751,10 @@ msgstr "最終更新" msgid "Left" msgstr "アラート" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "右軸の指標" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8809,7 +8796,6 @@ msgstr "デフォルト値" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10125,7 +10111,7 @@ msgstr "データベースが見つかりません。" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11486,7 +11472,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11769,7 +11755,6 @@ msgstr "クエリ" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12019,7 +12004,7 @@ msgstr "最近" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13216,7 +13201,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "すべてのチャート" @@ -14989,7 +14974,7 @@ msgstr "データベースを削除できませんでした。" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17740,12 +17725,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18471,14 +18450,6 @@ msgstr "" msgid "Y Axis" msgstr "Y軸" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18674,7 +18645,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19741,7 +19712,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/ko/LC_MESSAGES/messages.json b/superset/translations/ko/LC_MESSAGES/messages.json index 9f0b2e2f6..ea3511f28 100644 --- a/superset/translations/ko/LC_MESSAGES/messages.json +++ b/superset/translations/ko/LC_MESSAGES/messages.json @@ -700,7 +700,6 @@ "Choose File": ["CSV 파일"], "Choose a chart or dashboard not both": [""], "Choose a dataset": ["데이터소스 선택"], - "Choose a metric for left axis": [""], "Choose a metric for right axis": [""], "Choose a number format": [""], "Choose one of the available databases from the panel on the left.": [""], @@ -1728,7 +1727,6 @@ ], "Least recently modified": [""], "Left Axis Format": [""], - "Left Axis Metric": [""], "Left Axis chart(s)": [""], "Left Margin": [""], "Left margin, in pixels, allowing for more room for axis labels": [""], @@ -2186,8 +2184,6 @@ "Physical dataset": ["데이터소스 선택"], "Pick a dimension from which categorical colors are defined": [""], "Pick a granularity in the Time section or uncheck 'Include Time'": [""], - "Pick a metric for left axis!": [""], - "Pick a metric for right axis!": [""], "Pick a metric for x, y and size": [""], "Pick a metric to display": [""], "Pick a metric!": [""], @@ -3300,7 +3296,6 @@ "Time Lag": [""], "Time Range": [""], "Time Series - Bar Chart": [""], - "Time Series - Dual Axis Line Chart": [""], "Time Series - Line Chart": [""], "Time Series - Multiple Line Charts": [""], "Time Series - Nightingale Rose Chart": [""], @@ -3571,9 +3566,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3778,8 +3770,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": [""], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/ko/LC_MESSAGES/messages.po b/superset/translations/ko/LC_MESSAGES/messages.po index 8b72f257d..1f0cad66f 100644 --- a/superset/translations/ko/LC_MESSAGES/messages.po +++ b/superset/translations/ko/LC_MESSAGES/messages.po @@ -1355,7 +1355,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1559,7 +1559,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "차트 추가" @@ -3080,7 +3080,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3328,7 +3328,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3605,10 +3604,6 @@ msgstr "데이터소스 선택" msgid "Choose a dataset" msgstr "데이터소스 선택" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6229,7 +6224,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "차트" @@ -6818,7 +6813,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6845,7 +6839,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8688,15 +8682,10 @@ msgstr "" msgid "Left" msgstr "삭제" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8738,7 +8727,6 @@ msgstr "테이블 명" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10036,7 +10024,7 @@ msgstr "데이터베이스를 찾을 수 없습니다." msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11371,7 +11359,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11652,7 +11640,6 @@ msgstr "저장된 Query" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11899,7 +11886,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13088,7 +13075,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "차트 추가" @@ -14847,7 +14834,7 @@ msgstr "데이터베이스를 삭제할 수 없습니다." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17552,12 +17539,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18277,14 +18258,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18477,7 +18450,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19527,7 +19500,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/messages.pot b/superset/translations/messages.pot index a6b659826..b7dbebc0e 100644 --- a/superset/translations/messages.pot +++ b/superset/translations/messages.pot @@ -1318,7 +1318,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1517,7 +1517,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "" @@ -2991,7 +2991,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3231,7 +3231,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3495,10 +3494,6 @@ msgstr "" msgid "Choose a dataset" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6037,7 +6032,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "" @@ -6605,7 +6600,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6632,7 +6626,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8413,15 +8407,10 @@ msgstr "" msgid "Left" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8462,7 +8451,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -9713,7 +9701,7 @@ msgstr "" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11018,7 +11006,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11291,7 +11279,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11525,7 +11512,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -12672,7 +12659,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "" @@ -14342,7 +14329,7 @@ msgstr "" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -16975,12 +16962,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -17698,14 +17679,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -17897,7 +17870,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -18906,7 +18879,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/nl/LC_MESSAGES/messages.json b/superset/translations/nl/LC_MESSAGES/messages.json index 6467849fb..b2c0327f7 100644 --- a/superset/translations/nl/LC_MESSAGES/messages.json +++ b/superset/translations/nl/LC_MESSAGES/messages.json @@ -887,7 +887,6 @@ ], "Choose a database...": [""], "Choose a dataset": ["Kies een dataset"], - "Choose a metric for left axis": [""], "Choose a metric for right axis": [ "Kies een meeteenheid voor de rechteras" ], @@ -2141,7 +2140,6 @@ "Least recently modified": ["Meest recente wijziging"], "Left": [""], "Left Axis Format": [""], - "Left Axis Metric": [""], "Left Axis chart(s)": [""], "Left Margin": [""], "Left margin, in pixels, allowing for more room for axis labels": [""], @@ -2669,12 +2667,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Kies een granulariteit in de sectie Tijd of vink ‘Inclusief tijd’ uit" ], - "Pick a metric for left axis!": [ - "Kies een meeteenheid voor de linkeras!" - ], - "Pick a metric for right axis!": [ - "Kies een meeteenheid voor de rechteras!" - ], "Pick a metric for x, y and size": [ "Kies een meeteenheid voor x, y en grootte" ], @@ -4051,9 +4043,6 @@ "Time Range": [""], "Time Series": [""], "Time Series - Bar Chart": ["Tijdreeks - Staafdiagram"], - "Time Series - Dual Axis Line Chart": [ - "Tijdreeks - lijngrafiek met twee assen" - ], "Time Series - Line Chart": ["Tijdreeks - Lijngrafiek"], "Time Series - Multiple Line Charts": [ "Tijdreeksen - Meervoudige lijndiagrammen" @@ -4399,9 +4388,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -4613,8 +4599,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Y As"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": ["Y-as Formaat"], diff --git a/superset/translations/nl/LC_MESSAGES/messages.po b/superset/translations/nl/LC_MESSAGES/messages.po index eb49e6720..b10775dd7 100644 --- a/superset/translations/nl/LC_MESSAGES/messages.po +++ b/superset/translations/nl/LC_MESSAGES/messages.po @@ -1382,7 +1382,7 @@ msgstr "Geladen gegevens in de cache" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1584,7 +1584,7 @@ msgstr "Alle tekst" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Alle grafieken" @@ -3141,7 +3141,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3388,7 +3388,6 @@ msgstr "Grafiek ID" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3660,10 +3659,6 @@ msgstr "" msgid "Choose a dataset" msgstr "Kies een dataset" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6270,7 +6265,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "" @@ -6854,7 +6849,6 @@ msgstr "Elke" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6881,7 +6875,7 @@ msgstr "" msgid "Example" msgstr "Voorbeeld" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Voorbeelden" @@ -8714,15 +8708,10 @@ msgstr "Meest recente wijziging" msgid "Left" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8763,7 +8752,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10055,7 +10043,7 @@ msgstr "Database niet gevonden." msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11385,7 +11373,7 @@ msgstr "Pop Tab Link" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11663,7 +11651,6 @@ msgstr "queries" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11907,7 +11894,7 @@ msgstr "Recente" msgid "Recipients are separated by \",\" or \";\"" msgstr "Ontvangers worden gescheiden door “,” of “;”" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13096,7 +13083,7 @@ msgstr "Zoek / Filter" msgid "Search Metrics & Columns" msgstr "Zoek meeteenheden & kolommen" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "" @@ -14825,7 +14812,7 @@ msgstr "Dataset kon niet worden verwijderd." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17531,12 +17518,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18268,14 +18249,6 @@ msgstr "" msgid "Y Axis" msgstr "Y As" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18475,7 +18448,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19529,7 +19502,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/pt/LC_MESSAGES/messages.json b/superset/translations/pt/LC_MESSAGES/messages.json index 4c889efb5..55fa70d0b 100644 --- a/superset/translations/pt/LC_MESSAGES/messages.json +++ b/superset/translations/pt/LC_MESSAGES/messages.json @@ -2096,12 +2096,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Escolha uma granularidade na secção Tempo ou desmarque 'Incluir hora'" ], - "Pick a metric for left axis!": [ - "Selecione uma métrica para o eixo esquerdo!" - ], - "Pick a metric for right axis!": [ - "Selecione uma métrica para o eixo direito!" - ], "Pick a metric for x, y and size": [ "Selecione uma métrica para x, y e tamanho" ], @@ -3205,9 +3199,6 @@ "Time Comparison": ["Coluna de tempo"], "Time Range": ["Granularidade Temporal"], "Time Series - Bar Chart": ["Série Temporal - Gráfico de barras"], - "Time Series - Dual Axis Line Chart": [ - "Série Temporal - Gráfico de linha de dois eixos" - ], "Time Series - Line Chart": ["Série Temporal - Gráfico de linhas"], "Time Series - Multiple Line Charts": [ "Série Temporal - Gráfico de linhas" @@ -3480,9 +3471,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -3679,8 +3667,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": ["Eixo YY"], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": ["Formato do Eixo YY"], diff --git a/superset/translations/pt/LC_MESSAGES/messages.po b/superset/translations/pt/LC_MESSAGES/messages.po index 8c60c54be..c756a020a 100644 --- a/superset/translations/pt/LC_MESSAGES/messages.po +++ b/superset/translations/pt/LC_MESSAGES/messages.po @@ -1378,7 +1378,7 @@ msgstr "Dados carregados em cache" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "Advanced-Analytics" msgstr "Análise Avançada" @@ -1591,7 +1591,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Gráfico de bala" @@ -3134,7 +3134,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3383,7 +3383,6 @@ msgstr "Tipo de gráfico" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3665,11 +3664,6 @@ msgstr "Escolha uma origem de dados" msgid "Choose a dataset" msgstr "Escolha uma origem de dados" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -#, fuzzy -msgid "Choose a metric for left axis" -msgstr "Escolha uma métrica para o eixo direito" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6349,7 +6343,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "Mover gráfico" @@ -6952,7 +6946,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6979,7 +6972,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8865,17 +8858,11 @@ msgstr "Última Alteração" msgid "Left" msgstr "Eliminar" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 #, fuzzy msgid "Left Axis Format" msgstr "Formato do Eixo YY" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -#, fuzzy -msgid "Left Axis Metric" -msgstr "Metric do Eixo Direito" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 #, fuzzy msgid "Left Axis chart(s)" @@ -8918,7 +8905,6 @@ msgstr "Latitude padrão" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10236,7 +10222,7 @@ msgstr "" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 #, fuzzy msgid "No description available." msgstr "descrição" @@ -11596,7 +11582,7 @@ msgstr "Ligação Abrir Aba" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11881,7 +11867,6 @@ msgstr "Séries" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12135,7 +12120,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -13352,7 +13337,7 @@ msgstr "Pesquisa / Filtro" msgid "Search Metrics & Columns" msgstr "Colunas das séries temporais" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 #, fuzzy msgid "Search all charts" msgstr "Gráfico de bala" @@ -15129,7 +15114,7 @@ msgstr "Não foi possível carregar a query" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17913,12 +17898,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18658,14 +18637,6 @@ msgstr "" msgid "Y Axis" msgstr "Eixo YY" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -18859,7 +18830,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -19920,7 +19891,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.json b/superset/translations/pt_BR/LC_MESSAGES/messages.json index 09daf9901..c02c98e98 100644 --- a/superset/translations/pt_BR/LC_MESSAGES/messages.json +++ b/superset/translations/pt_BR/LC_MESSAGES/messages.json @@ -165,6 +165,9 @@ "A dictionary with column names and their data types if you need to change the defaults. Example: {\"user_id\":\"integer\"}": [ "" ], + "A dictionary with column names and their data types if you need to change the defaults. Example: {\"user_id\":\"integer\"}": [ + "" + ], "A full URL pointing to the location of the built plugin (could be hosted on a CDN for example)": [ "Um URL completo apontando para o localização do plug-in construído (poderia ser hospedado em um CDN, por exemplo)" ], @@ -1080,9 +1083,6 @@ ], "Choose a database...": ["Escolha um banco de dados..."], "Choose a dataset": ["Escolha um conjunto de dados"], - "Choose a metric for left axis": [ - "Escolha uma métrica para o eixo esquerdo" - ], "Choose a metric for right axis": [ "Escolha uma métrica para o eixo direito" ], @@ -2610,7 +2610,6 @@ "Least recently modified": ["Modificação mais recente"], "Left": ["Esquerda"], "Left Axis Format": ["Formato do eixo esquerdo"], - "Left Axis Metric": ["Eixo esquerdo métrico"], "Left Axis chart(s)": ["Gráfico(s) do eixo esquerdo"], "Left Margin": ["Margem Esquerda"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -3324,12 +3323,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Escolha uma granularidade na seção Tempo ou desmarque a opção 'Incluir tempo'" ], - "Pick a metric for left axis!": [ - "Escolha uma métrica para o eixo esquerdo!" - ], - "Pick a metric for right axis!": [ - "Escolha uma métrica para o eixo direito!" - ], "Pick a metric for x, y and size": [ "Escolha uma métrica para x, y e tamanho" ], @@ -5076,9 +5069,6 @@ "Time Ratio": ["Relação de tempo"], "Time Series": ["Séries temporais"], "Time Series - Bar Chart": ["Série temporal - Gráfico de barras"], - "Time Series - Dual Axis Line Chart": [ - "Série Temporal - Gráfico de Linhas de Eixo Duplo" - ], "Time Series - Line Chart": ["Série temporal - Gráfico de linhas"], "Time Series - Multiple Line Charts": [ "Séries temporais - Gráficos de linhas múltiplas" @@ -5505,9 +5495,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "Visualize duas séries temporais diferentes usando o mesmo eixo x. Observe que cada série temporal pode ser visualizada de forma diferente (por exemplo, uma usando barras e outra usando uma linha)." ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "Visualiza 2 métricas como gráficos de linha usando o mesmo eixo x. Esse gráfico é útil para comparar métricas no mesmo intervalo de tempo." - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "Visualiza uma métrica em três dimensões de dados em um único gráfico (eixo X, eixo Y e tamanho da bolha). As bolhas do mesmo grupo podem ser exibidas usando a cor da bolha." ], @@ -5803,8 +5790,6 @@ "Y AXIS TITLE MARGIN": ["MARGEM DO TÍTULO DO EIXO Y"], "Y AXIS TITLE POSITION": ["POSIÇÃO DO TÍTULO DO EIXO Y"], "Y Axis": ["Eixo Y"], - "Y Axis 1": ["Eixo Y 1"], - "Y Axis 2": ["Eixo Y 2"], "Y Axis 2 Bounds": ["Eixo Y 2 Limites"], "Y Axis Bounds": ["Limites do Eixo Y"], "Y Axis Format": ["Formato do eixo Y"], diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.po b/superset/translations/pt_BR/LC_MESSAGES/messages.po index b2f689876..c1c70e19e 100644 --- a/superset/translations/pt_BR/LC_MESSAGES/messages.po +++ b/superset/translations/pt_BR/LC_MESSAGES/messages.po @@ -18186,11 +18186,13 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." +"Visualize two different time series using the same x-axis time range. " +"This chart is being deprecated and we recommend using the Mixed " +"Timeseries Chart instead!" msgstr "" -"Visualiza 2 métricas como gráficos de linha usando o mesmo eixo x. Esse " -"gráfico é útil para comparar métricas no mesmo intervalo de tempo." +"Visualize duas séries temporais diferentes usando o mesmo intervalo de " +"tempo do eixo x. Esse gráfico está sendo descontinuado e, em vez disso, " +"recomendamos o uso do gráfico de série temporal mista!" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" diff --git a/superset/translations/ru/LC_MESSAGES/messages.json b/superset/translations/ru/LC_MESSAGES/messages.json index d3a5e7870..4ff7e6462 100644 --- a/superset/translations/ru/LC_MESSAGES/messages.json +++ b/superset/translations/ru/LC_MESSAGES/messages.json @@ -1105,7 +1105,6 @@ ], "Choose a database...": ["Выберите базу данных..."], "Choose a dataset": ["Выберите датасет"], - "Choose a metric for left axis": ["Выберите меру для левой оси"], "Choose a metric for right axis": ["Выберите меру для правой оси"], "Choose a number format": ["Выберите числовой формат"], "Choose a source": ["Выберите источник"], @@ -2586,7 +2585,6 @@ "Least recently modified": ["Измененные давно"], "Left": ["Слева"], "Left Axis Format": ["Формат левой оси"], - "Left Axis Metric": ["Мера левой оси"], "Left Axis chart(s)": ["График(и) по левой оси"], "Left Margin": ["Левый отступ"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -3234,8 +3232,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Выберите степень детализации в разделе Время или снимите флажок \"Включить время\"." ], - "Pick a metric for left axis!": ["Выберите меру для левой оси"], - "Pick a metric for right axis!": ["Выберите меру для правой оси"], "Pick a metric for x, y and size": ["Выберите меру для x, y и размера"], "Pick a metric to display": ["Выберите меру для отображения"], "Pick a metric!": ["Выберите меру!"], @@ -4852,9 +4848,6 @@ "Time Ratio": ["Соотношение времени"], "Time Series": ["Временной ряд"], "Time Series - Bar Chart": ["Столбчатая диаграмма (временные ряды)"], - "Time Series - Dual Axis Line Chart": [ - "Диаграмма с двумя осями (временные ряды)" - ], "Time Series - Line Chart": ["Линейная диаграмма (временные ряды)"], "Time Series - Nightingale Rose Chart": [ "Диаграмма Найтингейл (временные ряды)" @@ -5240,9 +5233,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -5528,8 +5518,6 @@ "Y AXIS TITLE MARGIN": ["Отступ названия оси Y"], "Y AXIS TITLE POSITION": ["Положение названия оси Y"], "Y Axis": ["Ось Y"], - "Y Axis 1": ["Ось Y 1"], - "Y Axis 2": ["Ось Y 2"], "Y Axis 2 Bounds": ["Границы оси Y 2"], "Y Axis Bounds": ["Границы оси Y"], "Y Axis Format": ["Формат Оси Y"], diff --git a/superset/translations/ru/LC_MESSAGES/messages.po b/superset/translations/ru/LC_MESSAGES/messages.po index e2efc535c..2594fca49 100644 --- a/superset/translations/ru/LC_MESSAGES/messages.po +++ b/superset/translations/ru/LC_MESSAGES/messages.po @@ -1385,7 +1385,7 @@ msgstr "Расширенный тип данных" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "Продвинутая аналитика" @@ -1591,7 +1591,7 @@ msgstr "Весь текст" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Все графики" @@ -3164,7 +3164,7 @@ msgid "Categories to group by on the x-axis." msgstr "Категории для группировки по оси x" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "Категория" @@ -3410,7 +3410,6 @@ msgstr "ID графика" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3683,10 +3682,6 @@ msgstr "Выберите базу данных..." msgid "Choose a dataset" msgstr "Выберите датасет" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "Выберите меру для левой оси" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6370,7 +6365,7 @@ msgstr "Динамически искать все значения фильтр #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "Графики Apache" @@ -6955,7 +6950,6 @@ msgstr "Каждый(ая)" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6982,7 +6976,7 @@ msgstr "Точное" msgid "Example" msgstr "Пример" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Примеры" @@ -8856,15 +8850,10 @@ msgstr "Измененные давно" msgid "Left" msgstr "Слева" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "Формат левой оси" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "Мера левой оси" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "График(и) по левой оси" @@ -8905,7 +8894,6 @@ msgstr "Левое значение" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10213,7 +10201,7 @@ msgstr "Не найдено таблиц в базе данных" msgid "No databases match your search" msgstr "Нет баз данных, удовлетворяющих вашему поиску" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "Описание отсутствует." @@ -11594,7 +11582,7 @@ msgstr "Скопировать ссылку" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "Популярно" @@ -11871,7 +11859,6 @@ msgstr "запросы" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12109,7 +12096,7 @@ msgstr "Недавние" msgid "Recipients are separated by \",\" or \";\"" msgstr "Получатели, разделенные \",\" или \";\"" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "Рекомендованные теги" @@ -13294,7 +13281,7 @@ msgstr "Поиск / Фильтр" msgid "Search Metrics & Columns" msgstr "Поиск по мерам и столбцам" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "Поиск по всем графикам" @@ -15035,7 +15022,7 @@ msgstr "Не удалось удалить датасет" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17896,12 +17883,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18678,14 +18659,6 @@ msgstr "Положение названия оси Y" msgid "Y Axis" msgstr "Ось Y" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "Ось Y 1" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "Ось Y 2" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "Границы оси Y 2" @@ -18899,7 +18872,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" "Вы не можете использовать расположение делений под углом 45° при " @@ -19947,7 +19920,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/sk/LC_MESSAGES/messages.json b/superset/translations/sk/LC_MESSAGES/messages.json index 54560d12e..ea88d4a6a 100644 --- a/superset/translations/sk/LC_MESSAGES/messages.json +++ b/superset/translations/sk/LC_MESSAGES/messages.json @@ -788,7 +788,6 @@ "Choose a chart or dashboard not both": [""], "Choose a database...": [""], "Choose a dataset": [""], - "Choose a metric for left axis": [""], "Choose a metric for right axis": [""], "Choose a number format": [""], "Choose a source": [""], @@ -2003,7 +2002,6 @@ "Least recently modified": [""], "Left": [""], "Left Axis Format": [""], - "Left Axis Metric": [""], "Left Axis chart(s)": [""], "Left Margin": [""], "Left margin, in pixels, allowing for more room for axis labels": [""], @@ -2518,8 +2516,6 @@ "Physical dataset": [""], "Pick a dimension from which categorical colors are defined": [""], "Pick a granularity in the Time section or uncheck 'Include Time'": [""], - "Pick a metric for left axis!": [""], - "Pick a metric for right axis!": [""], "Pick a metric for x, y and size": [""], "Pick a metric to display": [""], "Pick a metric!": [""], @@ -3811,7 +3807,6 @@ "Time Ratio": [""], "Time Series": [""], "Time Series - Bar Chart": [""], - "Time Series - Dual Axis Line Chart": [""], "Time Series - Line Chart": [""], "Time Series - Multiple Line Charts": [""], "Time Series - Nightingale Rose Chart": [""], @@ -4124,9 +4119,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "" ], @@ -4334,8 +4326,6 @@ "Y AXIS TITLE MARGIN": [""], "Y AXIS TITLE POSITION": [""], "Y Axis": [""], - "Y Axis 1": [""], - "Y Axis 2": [""], "Y Axis 2 Bounds": [""], "Y Axis Bounds": [""], "Y Axis Format": [""], diff --git a/superset/translations/sk/LC_MESSAGES/messages.po b/superset/translations/sk/LC_MESSAGES/messages.po index 1e77a4722..7900ff22d 100644 --- a/superset/translations/sk/LC_MESSAGES/messages.po +++ b/superset/translations/sk/LC_MESSAGES/messages.po @@ -1318,7 +1318,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "" @@ -1517,7 +1517,7 @@ msgstr "" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "" @@ -3005,7 +3005,7 @@ msgid "Categories to group by on the x-axis." msgstr "" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "" @@ -3246,7 +3246,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3513,10 +3512,6 @@ msgstr "" msgid "Choose a dataset" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6076,7 +6071,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 #, fuzzy msgid "ECharts" msgstr "Grafy" @@ -6649,7 +6644,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6676,7 +6670,7 @@ msgstr "" msgid "Example" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "" @@ -8458,15 +8452,10 @@ msgstr "" msgid "Left" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "" @@ -8507,7 +8496,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -9763,7 +9751,7 @@ msgstr "" msgid "No databases match your search" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "" @@ -11072,7 +11060,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "" @@ -11346,7 +11334,6 @@ msgstr "Uložené dotazy" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11582,7 +11569,7 @@ msgstr "" msgid "Recipients are separated by \",\" or \";\"" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "" @@ -12733,7 +12720,7 @@ msgstr "" msgid "Search Metrics & Columns" msgstr "" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "" @@ -14411,7 +14398,7 @@ msgstr "" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17054,12 +17041,6 @@ msgid "" " a line)." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -17779,14 +17760,6 @@ msgstr "" msgid "Y Axis" msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "" @@ -17978,7 +17951,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" @@ -18994,7 +18967,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/sl/LC_MESSAGES/messages.json b/superset/translations/sl/LC_MESSAGES/messages.json index bee805f09..547bd4071 100644 --- a/superset/translations/sl/LC_MESSAGES/messages.json +++ b/superset/translations/sl/LC_MESSAGES/messages.json @@ -988,7 +988,6 @@ ], "Choose a database...": ["Izberite podatkovno bazo..."], "Choose a dataset": ["Izberite podatkovni set"], - "Choose a metric for left axis": ["Izberite mero za levo os"], "Choose a metric for right axis": ["Izberite mero za desno os"], "Choose a number format": ["Izberite obliko zapisa števila"], "Choose a source": ["Izberite izvor"], @@ -2396,7 +2395,6 @@ "Least recently modified": ["Zadnje spremenjeno"], "Left": ["Levo"], "Left Axis Format": ["Oblika leve osi"], - "Left Axis Metric": ["Mera za levo os"], "Left Axis chart(s)": ["Grafikoni leve osi"], "Left Margin": ["Levi rob"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -2984,8 +2982,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "Izberite granulacijo v razdelku 'Čas' ali odstranite 'Vključi čas'" ], - "Pick a metric for left axis!": ["Izberite mero za levo os!"], - "Pick a metric for right axis!": ["Izberite mero za desno os!"], "Pick a metric for x, y and size": ["Izberite mere za x, y in velikost"], "Pick a metric to display": ["Izberite mero za prikaz"], "Pick a metric!": ["Izberite mero!"], @@ -4491,9 +4487,6 @@ "Time Range": ["Časovno obdobje"], "Time Series": ["Časovna vrsta"], "Time Series - Bar Chart": ["Časovna vrsta - Stolpčni grafikon"], - "Time Series - Dual Axis Line Chart": [ - "Časovna vrsta - Črtni grafikon z dvojno osjo" - ], "Time Series - Line Chart": ["Časovna vrsta - Črtni grafikon"], "Time Series - Multiple Line Charts": [ "Časovna vrsta - Veččrtni grafikon" @@ -4877,9 +4870,6 @@ "Visualize two different time series using the same x-axis. Note that each time series can be visualized differently (e.g. 1 using bars and 1 using a line).": [ "Prikaže dve različni časovni vrsti na isti x-osi. Časovni vrsti sta lahko prikazani različno (npr. ena s stolpci in druga s črto)." ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "Prikaže dve meri na črtnem grafu z isto x-osjo. Grafikon je uporaben za primerjavo mer v istem časovnem obdobju." - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "Prikaže mero v treh dimenzijah podatkov na istem grafikonu (x os, y os, velikost mehurčka). Mehurčki v isti skupini so predstavljeni z barvo." ], @@ -5144,8 +5134,6 @@ "Y AXIS TITLE MARGIN": ["OBROBA NASLOVA Y OSI"], "Y AXIS TITLE POSITION": ["POZICIJA NASLOVA Y OSI"], "Y Axis": ["Y os"], - "Y Axis 1": ["Y-os 1"], - "Y Axis 2": ["Y-os 2"], "Y Axis 2 Bounds": ["Meje Y 2-osi"], "Y Axis Bounds": ["Meje Y-osi"], "Y Axis Format": ["Oblika Y osi"], diff --git a/superset/translations/sl/LC_MESSAGES/messages.po b/superset/translations/sl/LC_MESSAGES/messages.po index dcfd79d6b..b712dfa7d 100644 --- a/superset/translations/sl/LC_MESSAGES/messages.po +++ b/superset/translations/sl/LC_MESSAGES/messages.po @@ -1431,7 +1431,7 @@ msgstr "Napredni podatkovni tip" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "Napredna analitika" @@ -1641,7 +1641,7 @@ msgstr "Celotno besedilo" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "Vsi grafikoni" @@ -3227,7 +3227,7 @@ msgid "Categories to group by on the x-axis." msgstr "Kategorije za združevanje po x-osi." #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "Kategorija" @@ -3478,7 +3478,6 @@ msgstr "ID grafikona" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3763,10 +3762,6 @@ msgstr "Izberite podatkovno bazo..." msgid "Choose a dataset" msgstr "Izberite podatkovni set" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "Izberite mero za levo os" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6483,7 +6478,7 @@ msgstr "Dinamično poišče vse možnosti filtra" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "ECharts" @@ -7073,7 +7068,6 @@ msgstr "Vsak" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -7100,7 +7094,7 @@ msgstr "Natančno" msgid "Example" msgstr "Primer" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "Vzorci" @@ -9011,15 +9005,10 @@ msgstr "Zadnje spremenjeno" msgid "Left" msgstr "Levo" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "Oblika leve osi" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "Mera za levo os" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "Grafikoni leve osi" @@ -9060,7 +9049,6 @@ msgstr "Leva vrednost" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10383,7 +10371,7 @@ msgstr "Podatkovna baza ni bila najdena." msgid "No databases match your search" msgstr "Nobena podatkovna baza ne ustreza iskanju" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "Opisa ni na razpolago." @@ -11778,7 +11766,7 @@ msgstr "Prikaži povezavo zavihka" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "Priljubljeni" @@ -12061,7 +12049,6 @@ msgstr "poizvedbe" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -12304,7 +12291,7 @@ msgstr "Nedavno" msgid "Recipients are separated by \",\" or \";\"" msgstr "Prejemniki so ločeni z \",\" ali \";\"" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "Priporočene značke" @@ -13521,7 +13508,7 @@ msgstr "Iskanje / Filter" msgid "Search Metrics & Columns" msgstr "Iskanje mer in stolpcev" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "Išči vse grafikone" @@ -15296,7 +15283,7 @@ msgstr "Podatkovnega niza ni mogoče izbrisati." #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -18228,14 +18215,6 @@ msgstr "" "Prikaže dve različni časovni vrsti na isti x-osi. Časovni vrsti sta lahko" " prikazani različno (npr. ena s stolpci in druga s črto)." -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "" -"Prikaže dve meri na črtnem grafu z isto x-osjo. Grafikon je uporaben za " -"primerjavo mer v istem časovnem obdobju." - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -19037,14 +19016,6 @@ msgstr "POZICIJA NASLOVA Y OSI" msgid "Y Axis" msgstr "Y os" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "Y-os 1" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "Y-os 2" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "Meje Y 2-osi" @@ -19253,7 +19224,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "" "Skupaj s filtriranjem časovnega obdobja ne morete uporabiti oznak pod 45°" @@ -20325,7 +20296,6 @@ msgstr "ikona numeričnega tipa" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/translations/zh/LC_MESSAGES/messages.json b/superset/translations/zh/LC_MESSAGES/messages.json index 21ede6f44..e12e17e34 100644 --- a/superset/translations/zh/LC_MESSAGES/messages.json +++ b/superset/translations/zh/LC_MESSAGES/messages.json @@ -787,7 +787,6 @@ ], "Choose a database...": ["选择数据库"], "Choose a dataset": ["选择数据源"], - "Choose a metric for left axis": ["选择左轴的计量指标"], "Choose a metric for right axis": ["为右轴选择一个指标"], "Choose a number format": ["选择一种数字格式"], "Choose a source": ["选择一个源"], @@ -1911,7 +1910,6 @@ "Least recently modified": ["最远修改"], "Left": ["左边"], "Left Axis Format": ["左轴格式化"], - "Left Axis Metric": ["左轴指标"], "Left Axis chart(s)": ["左轴图表"], "Left Margin": ["左边距"], "Left margin, in pixels, allowing for more room for axis labels": [ @@ -2405,8 +2403,6 @@ "Pick a granularity in the Time section or uncheck 'Include Time'": [ "在“时间”部分选择一个粒度，或取消选中“包含时间”" ], - "Pick a metric for left axis!": ["为左轴选择一个指标！"], - "Pick a metric for right axis!": ["为右轴选择一个指标！"], "Pick a metric for x, y and size": ["为 x 轴，y 轴和大小选择一个指标"], "Pick a metric to display": ["选择一个指标来显示"], "Pick a metric!": ["选择一个指标！"], @@ -3685,7 +3681,6 @@ "Time Range": ["时间范围"], "Time Series": ["时间序列"], "Time Series - Bar Chart": ["时间序列 - 柱状图"], - "Time Series - Dual Axis Line Chart": ["时间序列-双轴线图"], "Time Series - Line Chart": ["时间序列-折线图"], "Time Series - Multiple Line Charts": ["时间序列-多线图"], "Time Series - Nightingale Rose Chart": ["时间序列 - 南丁格尔玫瑰图"], @@ -4008,9 +4003,6 @@ "Visualize two different time series using the same x-axis time range. This chart is being deprecated and we recommend using the Mixed Timeseries Chart instead!": [ "使用相同的x轴时间范围可视化两个不同的时间序列。此图表已被弃用，我们建议使用混合改为时间序列图！" ], - "Visualizes 2 metrics as line plots using the same x-axis. This chart is useful for comparing metrics across the same time range.": [ - "使用相同的x轴将2个指标可视化为折线图。此图表可用于比较相同时间范围内的指标。" - ], "Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.": [ "在单个图表中跨三维数据（X轴、Y轴和气泡大小）可视化度量。同一组中的气泡可以“使用气泡颜色显示" ], @@ -4229,8 +4221,6 @@ "Y AXIS TITLE MARGIN": ["Y轴标题页边距"], "Y AXIS TITLE POSITION": ["Y轴标题位置"], "Y Axis": ["Y 轴"], - "Y Axis 1": ["Y 轴 1"], - "Y Axis 2": ["Y 轴 2"], "Y Axis 2 Bounds": ["Y 轴界限"], "Y Axis Bounds": ["Y 轴界限"], "Y Axis Format": ["Y 轴格式化"], diff --git a/superset/translations/zh/LC_MESSAGES/messages.po b/superset/translations/zh/LC_MESSAGES/messages.po index 2cb9d497a..08fe9801c 100644 --- a/superset/translations/zh/LC_MESSAGES/messages.po +++ b/superset/translations/zh/LC_MESSAGES/messages.po @@ -1370,7 +1370,7 @@ msgstr "数据缓存已加载" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/index.ts:84 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:75 #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts:70 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Advanced-Analytics" msgstr "高级分析" @@ -1572,7 +1572,7 @@ msgstr "所有文本" #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/ScopeRow.tsx:59 #: superset-frontend/src/dashboard/components/nativeFilters/FilterCard/useFilterScope.ts:60 #: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:128 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:127 msgid "All charts" msgstr "所有图表" @@ -3101,7 +3101,7 @@ msgid "Categories to group by on the x-axis." msgstr "要在x轴上分组的类别。" #: superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx:46 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:678 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:677 msgid "Category" msgstr "分类" @@ -3349,7 +3349,6 @@ msgstr "图表 ID" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:44 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:70 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:49 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:41 @@ -3622,10 +3621,6 @@ msgstr "选择数据库" msgid "Choose a dataset" msgstr "选择数据源" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:69 -msgid "Choose a metric for left axis" -msgstr "选择左轴的计量指标" - #: superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:183 #: superset-frontend/src/explore/controls.jsx:216 msgid "Choose a metric for right axis" @@ -6243,7 +6238,7 @@ msgstr "" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/index.ts:73 #: superset-frontend/plugins/plugin-chart-echarts/src/Tree/index.ts:42 #: superset-frontend/plugins/plugin-chart-echarts/src/Treemap/index.ts:65 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "ECharts" msgstr "ECharts图表" @@ -6832,7 +6827,6 @@ msgstr "每个" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Area/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:29 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:30 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:25 @@ -6859,7 +6853,7 @@ msgstr "精确" msgid "Example" msgstr "例子" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:853 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:852 #: superset-frontend/src/pages/Home/index.tsx:208 msgid "Examples" msgstr "示例" @@ -8734,15 +8728,10 @@ msgstr "最远修改" msgid "Left" msgstr "左边" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:72 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:166 msgid "Left Axis Format" msgstr "左轴格式化" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:68 -msgid "Left Axis Metric" -msgstr "左轴指标" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97 msgid "Left Axis chart(s)" msgstr "左轴图表" @@ -8783,7 +8772,6 @@ msgstr "左值" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:34 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:50 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:35 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 @@ -10090,7 +10078,7 @@ msgstr "数据库没有找到" msgid "No databases match your search" msgstr "没有与您的搜索匹配的数据库" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:846 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:845 msgid "No description available." msgstr "没有可用的描述" @@ -11446,7 +11434,7 @@ msgstr "流行标签链接" #: superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/index.ts:89 #: superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/index.ts:61 #: superset-frontend/plugins/plugin-chart-table/src/index.ts:51 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:130 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:129 msgid "Popular" msgstr "常用" @@ -11728,7 +11716,6 @@ msgstr "序列" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:46 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:60 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:158 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31 @@ -11967,7 +11954,7 @@ msgstr "最近" msgid "Recipients are separated by \",\" or \";\"" msgstr "收件人之间用 \",\" 或者 \";\" 隔开" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:673 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:672 msgid "Recommended tags" msgstr "推荐标签" @@ -13165,7 +13152,7 @@ msgstr "搜索 / 过滤" msgid "Search Metrics & Columns" msgstr "搜索指标和列" -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:779 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:778 msgid "Search all charts" msgstr "搜索所有图表" @@ -14912,7 +14899,7 @@ msgstr "无法删除数据集" #: superset-frontend/src/components/MetadataBar/ContentConfig.tsx:126 #: superset-frontend/src/dashboard/components/PropertiesModal/index.tsx:733 #: superset-frontend/src/explore/components/PropertiesModal/index.tsx:430 -#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:683 +#: superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx:682 #: superset-frontend/src/pages/ChartList/index.tsx:482 #: superset-frontend/src/pages/ChartList/index.tsx:714 #: superset-frontend/src/pages/DashboardList/index.tsx:394 @@ -17628,12 +17615,6 @@ msgid "" " a line)." msgstr "使用相同的x轴时间范围可视化两个不同的时间序列。请注意，每个时间序列可以以不同的方式可视化（例如1个使用条形图，1个使用线条）。" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:28 -msgid "" -"Visualizes 2 metrics as line plots using the same x-axis. This chart is " -"useful for comparing metrics across the same time range." -msgstr "使用相同的x轴将2个指标可视化为折线图。此图表可用于比较相同时间范围内的指标。" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:28 msgid "" "Visualizes a metric across three dimensions of data in a single chart (X " @@ -18370,14 +18351,6 @@ msgstr "Y轴标题位置" msgid "Y Axis" msgstr "Y 轴" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40 -msgid "Y Axis 1" -msgstr "Y 轴 1" - -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50 -msgid "Y Axis 2" -msgstr "Y 轴 2" - #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:274 msgid "Y Axis 2 Bounds" msgstr "Y 轴界限" @@ -18574,7 +18547,7 @@ msgid "" "filters in dashboards." msgstr "" -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:367 +#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:365 msgid "You cannot use 45° tick layout along with the time range filter" msgstr "不能将45°刻度线布局与时间范围过滤器一起使用" @@ -19642,7 +19615,6 @@ msgstr "" #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:55 -#: superset-frontend/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:33 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/Line/index.js:45 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:36 #: superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:29 diff --git a/superset/viz.py b/superset/viz.py index d3d46c5b7..29e15b58f 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -1434,82 +1434,6 @@ class MultiLineViz(NVD3Viz): return data -class NVD3DualLineViz(NVD3Viz): - - """A rich line chart with dual axis""" - - viz_type = "dual_line" - verbose_name = _("Time Series - Dual Axis Line Chart") - sort_series = False - is_timeseries = True - - @deprecated(deprecated_in="3.0") - def query_obj(self) -> QueryObjectDict: - query_obj = super().query_obj() - m1 = self.form_data.get("metric") - m2 = self.form_data.get("metric_2") - if not m1: - raise QueryObjectValidationError(_("Pick a metric for left axis!")) - if not m2: - raise QueryObjectValidationError(_("Pick a metric for right axis!")) - if m1 == m2: - raise QueryObjectValidationError( - _("Please choose different metrics" " on left and right axis") - ) - query_obj["metrics"] = [m1, m2] - return query_obj - - @deprecated(deprecated_in="3.0") - def to_series(self, df: pd.DataFrame, classed: str = "") -> list[dict[str, Any]]: - cols = [] - for col in df.columns: - if col == "": - cols.append("N/A") - elif col is None: - cols.append("NULL") - else: - cols.append(col) - df.columns = cols - series = df.to_dict("series") - chart_data = [] - metrics = [self.form_data["metric"], self.form_data["metric_2"]] - for i, metric in enumerate(metrics): - metric_name = utils.get_metric_name(metric) - ys = series[metric_name] - if df[metric_name].dtype.kind not in "biufc": - continue - series_title = metric_name - chart_data.append( - { - "key": series_title, - "classed": classed, - "values": [ - {"x": ds, "y": ys[ds] if ds in ys else None} for ds in df.index - ], - "yAxis": i + 1, - "type": "line", - } - ) - return chart_data - - @deprecated(deprecated_in="3.0") - def get_data(self, df: pd.DataFrame) -> VizData: - if df.empty: - return None - - if self.form_data.get("granularity") == "all": - raise QueryObjectValidationError( - _("Pick a time granularity for your time series") - ) - - metric = utils.get_metric_name(self.form_data["metric"]) - metric_2 = utils.get_metric_name(self.form_data["metric_2"]) - df = df.pivot_table(index=DTTM_ALIAS, values=[metric, metric_2]) - - chart_data = self.to_series(df) - return chart_data - - class NVD3TimeSeriesBarViz(NVD3TimeSeriesViz): """A bar chart where the x axis is time""" diff --git a/tests/unit_tests/migrations/viz/dual_line_to_mixed_chart_test.py b/tests/unit_tests/migrations/viz/dual_line_to_mixed_chart_test.py new file mode 100644 index 000000000..76addd800 --- /dev/null +++ b/tests/unit_tests/migrations/viz/dual_line_to_mixed_chart_test.py @@ -0,0 +1,97 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +import json + +from superset.migrations.shared.migrate_viz import MigrateDualLine + +ADHOC_FILTERS = [ + { + "clause": "WHERE", + "comparator": ["CA", "FL"], + "expressionType": "SIMPLE", + "operator": "IN", + "subject": "state", + } +] + +SOURCE_FORM_DATA = { + "metric": "num_boys", + "y_axis_format": ",d", + "y_axis_bounds": [50, 100], + "metric_2": "num_girls", + "y_axis_2_format": ",d", + "y_axis_2_bounds": [75, 150], + "viz_type": "dual_line", + "adhoc_filters": ADHOC_FILTERS, + "x_axis_format": "smart_date", + "color_scheme": "bnbColors", + "yAxisIndex": 0, +} + +TARGET_FORM_DATA = { + "metrics": ["num_boys"], + "y_axis_format": ",d", + "y_axis_bounds": [50, 100], + "y_axis_bounds_secondary": [75, 150], + "metrics_b": ["num_girls"], + "y_axis_format_secondary": ",d", + "viz_type": "mixed_timeseries", + "adhoc_filters": ADHOC_FILTERS, + "adhoc_filters_b": ADHOC_FILTERS, + "x_axis_time_format": "smart_date", + "color_scheme": "bnbColors", + "form_data_bak": SOURCE_FORM_DATA, + "yAxisIndex": 0, + "yAxisIndexB": 1, + "truncateYAxis": True, +} + + +def test_migration() -> None: + source = SOURCE_FORM_DATA.copy() + target = TARGET_FORM_DATA.copy() + upgrade_downgrade(source, target) + + +def upgrade_downgrade(source, target) -> None: + from superset.models.slice import Slice + + dumped_form_data = json.dumps(source) + + slc = Slice( + viz_type=MigrateDualLine.source_viz_type, + datasource_type="table", + params=dumped_form_data, + query_context=f'{{"form_data": {dumped_form_data}}}', + ) + + # upgrade + slc = MigrateDualLine.upgrade_slice(slc) + + # verify form_data + new_form_data = json.loads(slc.params) + assert new_form_data == target + assert new_form_data["form_data_bak"] == source + + # verify query_context + new_query_context = json.loads(slc.query_context) + assert new_query_context["form_data"]["viz_type"] == "mixed_timeseries" + + # downgrade + slc = MigrateDualLine.downgrade_slice(slc) + assert slc.viz_type == MigrateDualLine.source_viz_type + assert json.loads(slc.params) == source