@open-mercato/core 0.6.7 → 0.6.8-develop.6874.1.982d6097d8

package/src/modules/catalog/i18n/pl.json

@@ -86,17 +86,35 @@
   "catalog.errors.id_required": "Wymagany jest identyfikator rekordu.",
   "catalog.errors.organization_required": "Wymagany jest kontekst organizacji.",
   "catalog.errors.tenant_required": "Wymagany jest kontekst dzierżawy.",
+  "catalog.merchandising_assistant.agents.merchandising.description": "Przygotuj treści, uporządkuj atrybuty i zaproponuj zmiany cen dla bieżącego wyboru.",
+  "catalog.merchandising_assistant.agents.merchandising.label": "Asystent merchandisingu",
   "catalog.merchandising_assistant.context.filteredByCategory": "Filtrowane po kategorii",
+  "catalog.merchandising_assistant.context.matchingProducts": "{count} produktów w widoku",
+  "catalog.merchandising_assistant.context.selectedProducts": "Wybrano {count} produktów",
   "catalog.merchandising_assistant.context.tags": "Tagi: {count}",
   "catalog.merchandising_assistant.dock.subtitle": "Katalog",
   "catalog.merchandising_assistant.popover.heading": "Asystenci AI",
   "catalog.merchandising_assistant.sheet.composerPlaceholder": "Poproś o opisy, atrybuty, tytuły lub propozycje cen…",
   "catalog.merchandising_assistant.sheet.description": "Demo tylko do odczytu. Proponuje opisy, atrybuty, tytuły i korekty cen dla bieżącego wyboru. Na tym etapie żadne zmiany nie są zapisywane.",
+  "catalog.merchandising_assistant.sheet.descriptionWithSelection": "Praca na {count} wybranych produktach. Poproś o opisy, wyodrębnienie atrybutów, propozycje tytułów lub analizę cen.",
   "catalog.merchandising_assistant.sheet.dock": "Przypnij z boku",
   "catalog.merchandising_assistant.sheet.selectionPill": "Działa na {count} produktach",
   "catalog.merchandising_assistant.sheet.title": "Asystent merchandisingu katalogu",
+  "catalog.merchandising_assistant.sheet.welcomeDescriptionAll": "Wybierz produkty, aby wykonać na nich działania, albo przejrzyj swój katalog:",
+  "catalog.merchandising_assistant.sheet.welcomeDescriptionSelection": "Gotowe do pracy na Twoich {count} wybranych produktach. Wypróbuj jedną z opcji:",
+  "catalog.merchandising_assistant.sheet.welcomeTitle": "Asystent merchandisingu",
+  "catalog.merchandising_assistant.suggestions.analyzeAttributes": "Przeanalizuj pokrycie atrybutów",
+  "catalog.merchandising_assistant.suggestions.browseProducts": "Pokaż mi przegląd mojego katalogu produktów",
+  "catalog.merchandising_assistant.suggestions.draftDescriptions": "Przygotuj opisy produktów dla wybranych pozycji",
+  "catalog.merchandising_assistant.suggestions.extractAttributes": "Wyodrębnij atrybuty z opisów",
+  "catalog.merchandising_assistant.suggestions.findMissingDescriptions": "Znajdź produkty bez opisów",
+  "catalog.merchandising_assistant.suggestions.priceAdjustments": "Zaproponuj korekty cen",
+  "catalog.merchandising_assistant.suggestions.pricingOverview": "Pokaż rozkład cen",
+  "catalog.merchandising_assistant.suggestions.showStats": "Pokaż przegląd katalogu",
+  "catalog.merchandising_assistant.suggestions.titleVariants": "Wygeneruj warianty tytułów pod SEO",
   "catalog.merchandising_assistant.trigger.ariaLabel": "Otwórz asystenta merchandisingu AI",
   "catalog.merchandising_assistant.trigger.label": "AI",
+  "catalog.merchandising_assistant.trigger.moreAgentsAriaLabel": "Wybierz asystenta AI",
   "catalog.module.description": "Zarządzaj produktami, wariantami i cennikami wykorzystywanymi w sprzedaży.",
   "catalog.module.title": "Katalog produktów",
   "catalog.nav.group": "Katalog",

package/src/modules/catalog/widgets/injection/product-bulk-delete/widget.ts

@@ -8,6 +8,9 @@ type ProductRow = {
   id: string
 }
 
+const FILTERED_IDS_PAGE_SIZE = 100
+const FILTERED_IDS_MAX_PAGES = 1000
+
 type BulkActionContext = {
   confirm?: (options?: {
     title?: string
@@ -32,7 +35,7 @@ function readRowId(row: unknown): string | null {
 }
 
 function buildListParams(context: BulkActionContext): Record<string, string> {
-  const params: Record<string, string> = { pageSize: '100' }
+  const params: Record<string, string> = { pageSize: String(FILTERED_IDS_PAGE_SIZE) }
   const injectionContext = context.injectionContext
   const search = typeof injectionContext?.search === 'string' ? injectionContext.search.trim() : ''
   if (search) params.search = search
@@ -106,19 +109,26 @@ async function fetchFilteredProductIds(context: BulkActionContext): Promise<stri
   const baseParams = buildListParams(context)
   const productIds = new Set<string>()
   let page = 1
-  let totalPages = 1
 
-  while (page <= totalPages) {
+  // Short-page termination: server-reported `totalPages` is a display value, not a loop
+  // bound — it can under-report (capped counts) or drift mid-enumeration. Fail closed at
+  // the page ceiling: a partial id set would turn "delete all filtered" into "delete the
+  // first N" with no signal to the user.
+  for (;;) {
     const payload = await fetchCrudList<ProductRow>('catalog/products', {
       ...baseParams,
       page,
     })
-    for (const item of payload.items) {
+    const items = Array.isArray(payload.items) ? payload.items : []
+    for (const item of items) {
       if (typeof item?.id === 'string' && item.id.length > 0) {
         productIds.add(item.id)
       }
     }
-    totalPages = typeof payload.totalPages === 'number' && payload.totalPages > 0 ? payload.totalPages : 1
+    if (items.length < FILTERED_IDS_PAGE_SIZE) break
+    if (page >= FILTERED_IDS_MAX_PAGES) {
+      throw new Error(`[internal] filtered product enumeration exceeded ${FILTERED_IDS_MAX_PAGES} pages; refusing to bulk-delete a partial set`)
+    }
     page += 1
   }
 

package/src/modules/catalog/widgets/injection/product-seo/widget.ts

@@ -8,7 +8,7 @@ const widget: InjectionWidgetModule<any, any> = {
     id: 'catalog.injection.product-seo',
     title: 'Product SEO Helper',
     description: 'Helps optimize product metadata for search engines',
-    features: ['catalog.products.edit'],
+    features: ['catalog.products.manage'],
     priority: 90,
     enabled: true,
     requiredFields: ['description'],

package/src/modules/communication_channels/api/post/test-seed/route.ts

@@ -5,7 +5,14 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
-import { ChannelThreadMapping, ExternalConversation, MessageChannelLink } from '../../../data/entities'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import {
+  ChannelThreadMapping,
+  CommunicationChannel,
+  ExternalConversation,
+  MessageChannelLink,
+} from '../../../data/entities'
+import { ChannelAccessDeniedError, assertCanManageChannel } from '../../../lib/access-control'
 import {
   COMMUNICATION_CHANNELS_CONNECT_CREDENTIAL_CHANNEL_COMMAND_ID,
   type ConnectCredentialChannelInput,
@@ -35,6 +42,13 @@ import {
  *     customers link-channel-message subscriber runs against real Postgres. Enables
  *     the inbound auto-link tests (TC-CRM-EMAIL-002..005).
  */
+type RbacServiceLike = {
+  loadAcl: (
+    userId: string,
+    scope: { tenantId: string | null; organizationId: string | null },
+  ) => Promise<{ isSuperAdmin: boolean; features: string[]; organizations: string[] | null }>
+}
+
 export const metadata = {
   path: '/communication_channels/test-seed',
   POST: {
@@ -164,6 +178,55 @@ export async function POST(req: Request): Promise<Response> {
   const em = (container.resolve('em') as EntityManager).fork()
   const providerKey = body.providerKey ?? TEST_SEED_PROVIDER_KEY
 
+  // `channelId` is caller-supplied, so confirm it names a channel this tenant/org
+  // actually owns before seeding rows that reference it. Mirrors the ownership
+  // lookup every other per-channel route performs (see channels/[id]/test-send).
+  const ownedChannel = await findOneWithDecryption(
+    em,
+    CommunicationChannel,
+    {
+      id: body.channelId,
+      tenantId,
+      organizationId,
+      deletedAt: null,
+    },
+    undefined,
+    { tenantId, organizationId },
+  )
+  if (!ownedChannel) {
+    return NextResponse.json({ error: 'Channel not found' }, { status: 404 })
+  }
+
+  // Tenant/org scope alone does not authorize: `connect_user_channel` is granted
+  // broadly, so a same-tenant caller could otherwise seed against a colleague's
+  // personal mailbox. Enforce the module's owner-only contract — personal
+  // channels are owner-restricted, shared channels need `manage`.
+  let userFeatures: string[] = []
+  try {
+    const rbac = container.resolve('rbacService') as RbacServiceLike
+    const acl = await rbac.loadAcl(userId, { tenantId, organizationId })
+    userFeatures = acl?.isSuperAdmin ? ['*'] : Array.isArray(acl?.features) ? acl.features : []
+  } catch {
+    userFeatures = []
+  }
+  try {
+    assertCanManageChannel(
+      { userId: ownedChannel.userId },
+      userId,
+      userFeatures,
+      'communication_channels.manage',
+    )
+  } catch (err) {
+    if (err instanceof ChannelAccessDeniedError) {
+      return NextResponse.json({ error: 'Channel not found' }, { status: 404 })
+    }
+    const status = (err as { statusCode?: number }).statusCode ?? 403
+    return NextResponse.json(
+      { error: err instanceof Error ? err.message : 'Access denied' },
+      { status },
+    )
+  }
+
   // A MessageChannelLink requires a non-null external_conversation_id (FK) and
   // message_id. Create a synthetic conversation + (optionally threaded) message
   // so the link is shaped like a real inbound row the subscriber can consume.
@@ -283,7 +346,11 @@ export const openApi = {
       responses: [
         { status: 201, description: 'Channel seeded / inbound message emitted' },
         { status: 401, description: 'Unauthorized' },
-        { status: 404, description: 'Test channel seeding disabled (production default)' },
+        {
+          status: 404,
+          description:
+            'Test channel seeding disabled (production default), or the requested channel does not belong to the caller',
+        },
         { status: 422, description: 'Invalid request body' },
         { status: 500, description: 'Seed failed' },
       ],

package/src/modules/communication_channels/api/post/webhook/[provider]/route.ts

@@ -12,6 +12,7 @@ import type { InboundMessage } from '../../../../lib/adapter'
 import type { InboundProcessorPayload } from '../../../../workers/inbound-processor'
 import type { ReactionInboundJob } from '../../../../lib/reaction-processor-types'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { readBoundedRequestBody, WebhookBodyTooLargeError } from '@open-mercato/shared/lib/webhooks'
 
 const logger = createLogger('communication_channels').child({ component: 'inbound-webhook' })
 
@@ -60,7 +61,15 @@ export async function POST(req: Request, { params }: RouteContext): Promise<Resp
     )
   }
 
-  const rawBody = await req.text()
+  let rawBody: string
+  try {
+    rawBody = await readBoundedRequestBody(req)
+  } catch (error) {
+    if (error instanceof WebhookBodyTooLargeError) {
+      return NextResponse.json({ error: 'Webhook payload too large' }, { status: 413 })
+    }
+    throw error
+  }
   const headers: Record<string, string> = {}
   req.headers.forEach((value, key) => {
     headers[key] = value
@@ -222,6 +231,7 @@ export const openApi = {
       responses: [
         { status: 202, description: 'Webhook accepted for async processing' },
         { status: 401, description: 'Signature verification failed against every candidate channel' },
+        { status: 413, description: 'Webhook payload too large' },
         { status: 404, description: 'Unknown provider' },
       ],
     },

package/src/modules/communication_channels/api/post/webhooks/gmail/route.ts

@@ -13,6 +13,7 @@ import {
   GmailPubSubJwtError,
 } from '../../../../lib/gmail-pubsub-jwt'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { readBoundedRequestBody, WebhookBodyTooLargeError } from '@open-mercato/shared/lib/webhooks'
 
 const logger = createLogger('communication_channels').child({ component: 'gmail-webhook' })
 
@@ -24,13 +25,14 @@ const logger = createLogger('communication_channels').child({ component: 'gmail-
  * header, which we verify against Google's public certs.
  *
  * Validation pipeline:
- *   1. Verify JWT signature, audience (`OM_GMAIL_PUBSUB_AUDIENCE`), and
+ *   1. Bound the raw request body before cryptographic work.
+ *   2. Verify JWT signature, audience (`OM_GMAIL_PUBSUB_AUDIENCE`), and
  *      email claim (`OM_GMAIL_PUBSUB_SERVICE_ACCOUNT_EMAIL`).
- *   2. Decode the Pub/Sub envelope → `{ emailAddress, historyId }`.
- *   3. Look up every active Gmail channel matching `emailAddress`. Multiple
+ *   3. Decode the Pub/Sub envelope → `{ emailAddress, historyId }`.
+ *   4. Look up every active Gmail channel matching `emailAddress`. Multiple
  *      tenants may have the same mailbox connected — we enqueue one sync
  *      job per matching channel (each tenant sees their own data).
- *   4. Return `204 No Content` even when no channels match — returning 4xx
+ *   5. Return `204 No Content` even when no channels match — returning 4xx
  *      would cause Pub/Sub to retry forever on a permanently-orphaned
  *      registration.
  */
@@ -58,6 +60,16 @@ export async function POST(req: Request): Promise<Response> {
     return NextResponse.json({ error: 'webhook not configured' }, { status: 503 })
   }
 
+  let rawBody: string
+  try {
+    rawBody = await readBoundedRequestBody(req)
+  } catch (error) {
+    if (error instanceof WebhookBodyTooLargeError) {
+      return NextResponse.json({ error: 'Webhook payload too large' }, { status: 413 })
+    }
+    return NextResponse.json({ error: 'unreadable_body' }, { status: 400 })
+  }
+
   const verifier = getGmailPubSubVerifier()
   try {
     await verifier.verify({
@@ -76,13 +88,6 @@ export async function POST(req: Request): Promise<Response> {
     throw err
   }
 
-  let rawBody: string
-  try {
-    rawBody = await req.text()
-  } catch {
-    return NextResponse.json({ error: 'unreadable_body' }, { status: 400 })
-  }
-
   let payload: { emailAddress: string; historyId: string | number }
   try {
     payload = decodeGmailPubSubBody(rawBody)
@@ -153,6 +158,7 @@ export const openApi = {
         { status: 400, description: 'Body not a valid Pub/Sub envelope' },
         { status: 401, description: 'Invalid JWT or email claim' },
         { status: 403, description: 'Wrong audience' },
+        { status: 413, description: 'Webhook payload too large' },
         { status: 503, description: 'Webhook not configured / Google certs unreachable' },
       ],
     },

package/src/modules/communication_channels/backend/communication_channels/channels/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import * as React from 'react'
+import { extensionPoints } from '@open-mercato/core/modules/communication_channels/extension-points'
 import type { ColumnDef } from '@tanstack/react-table'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
@@ -114,7 +115,7 @@ export default function ChannelsListPage() {
       <PageBody>
         <DataTable<ChannelRow>
           title={t('communication_channels.nav.title', 'Communication Channels')}
-          extensionTableId="communication_channels.channels"
+          extensionTableId={extensionPoints.hosts.channelsTable.tableId}
           columns={columns}
           data={rows}
           isLoading={isLoading}

package/src/modules/communication_channels/backend/profile/communication-channels/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import * as React from 'react'
+import { extensionPoints } from '@open-mercato/core/modules/communication_channels/extension-points'
 import type { ColumnDef } from '@tanstack/react-table'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
@@ -462,21 +463,21 @@ export default function ProfileCommunicationChannelsPage() {
             <p className="text-sm text-muted-foreground">
               {t(
                 'communication_channels.profile.subtitle',
-                'Connect your personal mailbox so outbound messages come from your address and inbound emails land in your unified inbox.',
+                'Connect your communication channels so outbound messages come from your own account and inbound messages land in your unified inbox.',
               )}
             </p>
           </div>
           {/* Provider connect entry points injected by each channel-* package
               (channel-gmail, channel-imap) via UMES. */}
           <InjectionSpot
-            spotId="profile:communication-channels:connect"
+            spotId={extensionPoints.hosts.profileConnect.spotId}
             context={{ reload: () => setReloadKey((k) => k + 1) }}
             data={{}}
           />
         </header>
 
         {reauthRows.length > 0 ? (
-          <Alert variant="warning" className="mb-4">
+          <Alert status="warning" className="mb-4">
             <AlertDescription>
               {t(
                 'communication_channels.profile.alerts.requiresReauth',
@@ -489,14 +490,14 @@ export default function ProfileCommunicationChannelsPage() {
 
         <DataTable<ChannelRow>
           title={t('communication_channels.profile.tableTitle', 'Your channels')}
-          extensionTableId="communication_channels.profile.channels"
+          extensionTableId={extensionPoints.hosts.profileChannelsTable.tableId}
           columns={columns}
           data={rows}
           isLoading={isLoading}
           error={errorMessage}
           emptyState={t(
             'communication_channels.profile.empty',
-            'You have no connected channels yet. Use the "Connect channel" entry above to add Gmail or IMAP.',
+            'You have no connected channels yet. Use one of the Connect buttons above to add a channel.',
           )}
         />
         <ImportHistoryDialog
@@ -735,7 +736,7 @@ function ImportHistoryDialog({ channel, onClose, onQueued }: ImportHistoryDialog
           </div>
 
           {fieldErrors.channelId ? (
-            <Alert variant="warning">
+            <Alert status="warning">
               <AlertDescription>{fieldErrors.channelId}</AlertDescription>
             </Alert>
           ) : null}
@@ -870,7 +871,7 @@ function DisconnectChannelDialog({
           <Button type="button" variant="outline" onClick={onClose} disabled={submitting}>
             {t('communication_channels.profile.disconnect.cancel', 'Cancel')}
           </Button>
-          <Button type="button" variant="destructive" onClick={() => void handleConfirm()} disabled={submitting}>
+          <Button type="button" variant="destructive-solid" onClick={() => void handleConfirm()} disabled={submitting}>
             {submitting
               ? t('communication_channels.profile.disconnect.submitting', 'Disconnecting…')
               : t('communication_channels.profile.disconnect.confirm', 'Disconnect')}

package/src/modules/communication_channels/data/enrichers.ts

@@ -1,6 +1,10 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { EnricherContext, ResponseEnricher } from '@open-mercato/shared/lib/crud/response-enricher'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import {
+  applyMessageParticipantScope,
+  type MessagesParticipantScopeDatabase,
+} from '../../messages/lib/participantScope'
 import { sanitizeChannelHtml } from '../lib/sanitize-channel-html'
 import {
   CommunicationChannel,
@@ -43,21 +47,6 @@ type MessageRecord = Record<string, unknown> & {
   threadId?: string | null
 }
 
-type MessageParticipantDatabase = {
-  messages: {
-    id: string
-    tenant_id: string
-    organization_id: string | null
-    sender_user_id: string
-    deleted_at: Date | null
-  }
-  message_recipients: {
-    message_id: string
-    recipient_user_id: string
-    deleted_at: Date | null
-  }
-}
-
 type ResolvedCtx = EnricherContext & {
   em: EntityManager
 }
@@ -151,22 +140,13 @@ const messageChannelEnricher: ResponseEnricher<
       }))
     }
 
-    const db = em.getKysely<MessageParticipantDatabase>()
-    let participantQuery = db
-      .selectFrom('messages as m')
-      .leftJoin('message_recipients as r', (join) => join
-        .onRef('m.id', '=', 'r.message_id')
-        .on('r.recipient_user_id', '=', userId)
-        .on('r.deleted_at', 'is', null))
+    const db = em.getKysely<MessagesParticipantScopeDatabase>()
+    let participantQuery = applyMessageParticipantScope(db.selectFrom('messages as m'), userId)
       .select('m.id')
       .distinct()
       .where('m.id', 'in', messageIds)
       .where('m.tenant_id', '=', tenantId)
       .where('m.deleted_at', 'is', null)
-      .where((eb) => eb.or([
-        eb('m.sender_user_id', '=', userId),
-        eb('r.message_id', 'is not', null),
-      ]))
 
     participantQuery = organizationId !== null
       ? participantQuery.where('m.organization_id', '=', organizationId)

package/src/modules/communication_channels/extension-points.ts

@@ -0,0 +1,17 @@
+import { dataTableExtensionHost, defineModuleExtensionPoints, injectionExtensionHost } from '@open-mercato/shared/modules/widgets/extension-points'
+
+export const extensionPoints = defineModuleExtensionPoints({
+  moduleId: 'communication_channels',
+  hosts: {
+    channelsTable: dataTableExtensionHost({ tableId: 'communication_channels.channels', source: 'backend/communication_channels/channels/page.tsx' }),
+    profileConnect: injectionExtensionHost({
+      family: 'generic',
+      spotId: 'profile:communication-channels:connect',
+      supported: ['render-widget'],
+      source: 'backend/profile/communication-channels/page.tsx',
+    }),
+    profileChannelsTable: dataTableExtensionHost({ tableId: 'communication_channels.profile.channels', source: 'backend/profile/communication-channels/page.tsx' }),
+  },
+})
+
+export default extensionPoints

package/src/modules/communication_channels/i18n/de.json

@@ -96,7 +96,7 @@
   "communication_channels.profile.disconnect.description": "Dies entfernt die Verbindung und stoppt die Synchronisierung. Bereits importierte E-Mails bleiben in Ihren Timelines. Sie können den Kanal jederzeit erneut verbinden.",
   "communication_channels.profile.disconnect.submitting": "Wird getrennt…",
   "communication_channels.profile.disconnect.title": "Kanal trennen",
-  "communication_channels.profile.empty": "Sie haben noch keine verbundenen Kanäle. Verwenden Sie oben den Eintrag \"Kanal verbinden\", um Gmail oder IMAP hinzuzufügen.",
+  "communication_channels.profile.empty": "Sie haben noch keine verbundenen Kanäle. Verwenden Sie oben eine der Schaltflächen zum Verbinden, um einen Kanal hinzuzufügen.",
   "communication_channels.profile.flash.connected": "Kanal verbunden.",
   "communication_channels.profile.flash.connectedWithProvider": "Kanal verbunden ({provider}).",
   "communication_channels.profile.flash.error": "Kanal konnte nicht verbunden werden.",
@@ -118,7 +118,7 @@
   "communication_channels.profile.importHistory.submitting": "Wird eingereiht…",
   "communication_channels.profile.importHistory.title": "Kanalverlauf importieren",
   "communication_channels.profile.primary": "Primär",
-  "communication_channels.profile.subtitle": "Verbinden Sie Ihr persönliches Postfach, damit ausgehende Nachrichten von Ihrer Adresse stammen und eingehende E-Mails in Ihrem einheitlichen Posteingang landen.",
+  "communication_channels.profile.subtitle": "Verbinden Sie Ihre Kommunikationskanäle, damit ausgehende Nachrichten von Ihrem eigenen Konto stammen und eingehende Nachrichten in Ihrem einheitlichen Posteingang landen.",
   "communication_channels.profile.tableTitle": "Ihre Kanäle",
   "communication_channels.profile.title": "Meine Kommunikationskanäle",
   "communication_channels.push.button.reregister": "Push neu registrieren",

package/src/modules/communication_channels/i18n/en.json

@@ -96,7 +96,7 @@
   "communication_channels.profile.disconnect.description": "This removes the connection and stops syncing. Emails already imported stay on your timelines. You can reconnect anytime.",
   "communication_channels.profile.disconnect.submitting": "Disconnecting…",
   "communication_channels.profile.disconnect.title": "Disconnect channel",
-  "communication_channels.profile.empty": "You have no connected channels yet. Use the \"Connect channel\" entry above to add Gmail or IMAP.",
+  "communication_channels.profile.empty": "You have no connected channels yet. Use one of the Connect buttons above to add a channel.",
   "communication_channels.profile.flash.connected": "Channel connected.",
   "communication_channels.profile.flash.connectedWithProvider": "Channel connected ({provider}).",
   "communication_channels.profile.flash.error": "Failed to connect channel.",
@@ -118,7 +118,7 @@
   "communication_channels.profile.importHistory.submitting": "Queueing…",
   "communication_channels.profile.importHistory.title": "Import channel history",
   "communication_channels.profile.primary": "Primary",
-  "communication_channels.profile.subtitle": "Connect your personal mailbox so outbound messages come from your address and inbound emails land in your unified inbox.",
+  "communication_channels.profile.subtitle": "Connect your communication channels so outbound messages come from your own account and inbound messages land in your unified inbox.",
   "communication_channels.profile.tableTitle": "Your channels",
   "communication_channels.profile.title": "My communication channels",
   "communication_channels.push.button.reregister": "Re-register push",

package/src/modules/communication_channels/i18n/es.json

@@ -96,7 +96,7 @@
   "communication_channels.profile.disconnect.description": "Esto elimina la conexión y detiene la sincronización. Los correos ya importados permanecen en tus cronologías. Puedes volver a conectarlo cuando quieras.",
   "communication_channels.profile.disconnect.submitting": "Desconectando…",
   "communication_channels.profile.disconnect.title": "Desconectar canal",
-  "communication_channels.profile.empty": "Aún no tienes canales conectados. Usa la opción \"Conectar canal\" de arriba para añadir Gmail o IMAP.",
+  "communication_channels.profile.empty": "Aún no tienes canales conectados. Usa uno de los botones de conexión de arriba para añadir un canal.",
   "communication_channels.profile.flash.connected": "Canal conectado.",
   "communication_channels.profile.flash.connectedWithProvider": "Canal conectado ({provider}).",
   "communication_channels.profile.flash.error": "No se pudo conectar el canal.",
@@ -118,7 +118,7 @@
   "communication_channels.profile.importHistory.submitting": "Encolando…",
   "communication_channels.profile.importHistory.title": "Importar historial del canal",
   "communication_channels.profile.primary": "Principal",
-  "communication_channels.profile.subtitle": "Conecta tu buzón personal para que los mensajes salientes provengan de tu dirección y los correos entrantes lleguen a tu bandeja de entrada unificada.",
+  "communication_channels.profile.subtitle": "Conecta tus canales de comunicación para que los mensajes salientes provengan de tu propia cuenta y los mensajes entrantes lleguen a tu bandeja de entrada unificada.",
   "communication_channels.profile.tableTitle": "Tus canales",
   "communication_channels.profile.title": "Mis canales de comunicación",
   "communication_channels.push.button.reregister": "Re-registrar push",