Merge e93512d642 into 66fc694718

public/app/features/dashboard-scene/conditional-rendering/hooks/ConditionalRenderingOverlay.tsx

@@ -9,12 +9,7 @@ export const ConditionalRenderingOverlay = () => {
 
   return (
     <div className={styles.container}>
-      <Tooltip
-        content={t(
-          'dashboard.conditional-rendering.overlay.tooltip',
-          'Element is hidden due to conditional rendering.'
-        )}
-      >
+      <Tooltip content={t('dashboard.conditional-rendering.overlay.tooltip', 'Element is hidden by show/hide rules.')}>
         <Icon name="eye-slash" />
       </Tooltip>
     </div>

public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx

@@ -101,12 +101,7 @@ export function TabItemRenderer({ model }: SceneComponentProps<TabItem>) {
 function IsHiddenSuffix() {
   return (
     <Box paddingLeft={1} display={'inline'}>
-      <Tooltip
-        content={t(
-          'dashboard.conditional-rendering.overlay.tooltip',
-          'Element is hidden due to conditional rendering.'
-        )}
-      >
+      <Tooltip content={t('dashboard.conditional-rendering.overlay.tooltip', 'Element is hidden by show/hide rules.')}>
         <Icon name="eye-slash" />
       </Tooltip>
     </Box>

public/locales/en-US/grafana.json

@@ -4572,7 +4572,7 @@
         "unsupported-object-type": "Conditional rendering not supported for this item type"
       },
       "overlay": {
-        "tooltip": "Element is hidden due to conditional rendering."
+        "tooltip": "Element is hidden by show/hide rules."
       },
       "root": {
         "title": "Show / hide rules"