diff --git a/channels/email/accounts/managing-accounts.rst b/channels/email/accounts/managing-accounts.rst index d4b52891e..c1e06ee05 100644 --- a/channels/email/accounts/managing-accounts.rst +++ b/channels/email/accounts/managing-accounts.rst @@ -8,7 +8,7 @@ configuration. :alt: Existing accounts can be edited from the Accounts panel. :align: center -.. include:: managing-accounts.inbound-outbound.rst +.. include:: /channels/email/accounts/managing-accounts.inbound-outbound.rst Destination Group Click on the group name to reassign the account. diff --git a/channels/google/accounts/managing-accounts.inbound-outbound.rst b/channels/google/accounts/managing-accounts.inbound-outbound.rst deleted file mode 100644 index e9d138fa6..000000000 --- a/channels/google/accounts/managing-accounts.inbound-outbound.rst +++ /dev/null @@ -1,11 +0,0 @@ -Fetch Preferences - Click **Edit** on inbound account details - to change how messages are retrieved from your account. - - See :ref:`New Account Settings ` - for a detailed description of each option. - - .. figure:: /images/channels/google/updating-gmail-account.png - :alt: Location of account details settings for existing accounts - :scale: 60% - :align: center diff --git a/channels/google/basic-setup.rst b/channels/google/basic-setup.rst index 910dff0d3..38fbdd8be 100644 --- a/channels/google/basic-setup.rst +++ b/channels/google/basic-setup.rst @@ -165,15 +165,11 @@ Rolling Back the Migration ^^^^^^^^^^^^^^^^^^^^^^^^^^ In case something went wrong, Zammad allows you to roll back the migration -for up to 7 days. For this time period Zammad will remember your original +for up to 7 days. You can do so by using the ``Rollback migration`` button in +the account details. For this time period, Zammad will remember your original credentials and restore it if needed. These information will be removed entirely after 7 days. - .. figure:: /images/channels/google/rollback-migration.png - :alt: Migrate an existing email channel to Google - :scale: 90% - :align: center - Troubleshooting --------------- @@ -197,4 +193,4 @@ How to use the Gmail account for outgoing system notifications? I successfully added my account, but Zammad isn't fetching new emails If you specified a :ref:`custom folder/label to fetch from `, - are you sure incoming mail is arriving in that folder? \ No newline at end of file + are you sure incoming mail is arriving in that folder? diff --git a/channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst b/channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst deleted file mode 100644 index 34e58ba44..000000000 --- a/channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst +++ /dev/null @@ -1,11 +0,0 @@ -Fetch Preferences - Click **Edit** on inbound account details - to change how messages are retrieved from your account. - - See :ref:`New Account Settings ` - for a detailed description of each option. - - .. figure:: /images/channels/microsoft365/accounts/managing-accounts/updating-microsoft365-account.png - :alt: Location of account details settings for existing accounts - :scale: 60% - :align: center diff --git a/images/channels/google/change-destination-group-for-gmail-account.png b/images/channels/google/change-destination-group-for-gmail-account.png deleted file mode 100644 index c302cba36..000000000 Binary files a/images/channels/google/change-destination-group-for-gmail-account.png and /dev/null differ diff --git a/images/channels/google/change-destination-group.png b/images/channels/google/change-destination-group.png index 43ac0efdb..57f5b4f5a 100644 Binary files a/images/channels/google/change-destination-group.png and b/images/channels/google/change-destination-group.png differ diff --git a/images/channels/google/panel.png b/images/channels/google/panel.png index eb36c95b8..a96a96580 100644 Binary files a/images/channels/google/panel.png and b/images/channels/google/panel.png differ diff --git a/images/channels/google/rollback-migration.png b/images/channels/google/rollback-migration.png deleted file mode 100644 index 600cae882..000000000 Binary files a/images/channels/google/rollback-migration.png and /dev/null differ diff --git a/images/channels/microsoft365-graph/panel.png b/images/channels/microsoft365-graph/panel.png index 9bd560b3f..d975b3f6f 100644 Binary files a/images/channels/microsoft365-graph/panel.png and b/images/channels/microsoft365-graph/panel.png differ diff --git a/images/channels/microsoft365/accounts/account-setup/add-account.png b/images/channels/microsoft365/accounts/account-setup/add-account.png index 45f816f2a..9e00afb55 100644 Binary files a/images/channels/microsoft365/accounts/account-setup/add-account.png and b/images/channels/microsoft365/accounts/account-setup/add-account.png differ diff --git a/images/channels/microsoft365/accounts/account-setup/change-destination-group.png b/images/channels/microsoft365/accounts/account-setup/change-destination-group.png index 7fe434e7e..eed1bbcef 100644 Binary files a/images/channels/microsoft365/accounts/account-setup/change-destination-group.png and b/images/channels/microsoft365/accounts/account-setup/change-destination-group.png differ diff --git a/images/channels/microsoft365/panel.png b/images/channels/microsoft365/panel.png index 1e1a1d256..d95356035 100644 Binary files a/images/channels/microsoft365/panel.png and b/images/channels/microsoft365/panel.png differ diff --git a/locale/admin-docs.pot b/locale/admin-docs.pot index 088445c04..abad23d18 100644 --- a/locale/admin-docs.pot +++ b/locale/admin-docs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Zammad Admin Documentation pre-release\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-05-08 13:02+0200\n" +"POT-Creation-Date: 2026-05-18 16:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1558,7 +1558,7 @@ msgid "Otherwise, the agents in this group will not be able to send e-mails." msgstr "" #: ../channels/email/accounts/account-setup.rst:272 -#: ../channels/google/basic-setup.rst:178 +#: ../channels/google/basic-setup.rst:174 #: ../channels/microsoft365/accounts/account-setup.rst:161 #: ../channels/whatsapp/setup.rst:131 #: ../settings/security/third-party/saml.rst:186 @@ -1633,14 +1633,20 @@ msgstr "" #: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:12 #: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:11 +#: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:12 +#: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:12 msgid "Mail Server Settings" msgstr "" +#: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:2 +#: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:2 #: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:2 #: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:2 msgid "Click **Edit** on inbound/outbound account details to change your server configuration." msgstr "" +#: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:5 +#: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:5 #: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:5 #: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:5 msgid "See :ref:`New Account Settings ` for a detailed description of each option." @@ -1648,10 +1654,8 @@ msgstr "" #: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:0 #: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:0 -#: ../channels/google/accounts/managing-accounts.inbound-outbound.rst:0 -#: ../channels/google/accounts/managing-accounts.inbound-outbound.rst:0 -#: ../channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst:0 -#: ../channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst:0 +#: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:0 +#: ../channels/email/accounts/managing-accounts.inbound-outbound.rst:0 msgid "Location of account details settings for existing accounts" msgstr "" @@ -4662,25 +4666,6 @@ msgstr "" msgid "Managing accounts in Google channels works nearly identically as for email channels. This is why the section has been adopted almost verbatim from :doc:`here `." msgstr "" -#: ../channels/google/accounts/managing-accounts.inbound-outbound.rst:11 -#: ../channels/google/accounts/managing-accounts.inbound-outbound.rst:10 -#: ../channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst:11 -#: ../channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst:10 -msgid "Fetch Preferences" -msgstr "" - -#: ../channels/google/accounts/managing-accounts.inbound-outbound.rst:2 -#: ../channels/google/accounts/managing-accounts.inbound-outbound.rst:2 -#: ../channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst:2 -#: ../channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst:2 -msgid "Click **Edit** on inbound account details to change how messages are retrieved from your account." -msgstr "" - -#: ../channels/google/accounts/managing-accounts.inbound-outbound.rst:5 -#: ../channels/google/accounts/managing-accounts.inbound-outbound.rst:5 -msgid "See :ref:`New Account Settings ` for a detailed description of each option." -msgstr "" - #: ../channels/google/accounts/managing-accounts.delete-note.rst:8 #: ../channels/google/accounts/managing-accounts.delete-note.rst:8 msgid "(There's no need to manage orphaned email addresses like you would on an email channel. In Google channels, aliases are connected to your Gmail account, which means they can be imported and purged automatically.)" @@ -4846,43 +4831,38 @@ msgid "Rolling Back the Migration" msgstr "" #: ../channels/google/basic-setup.rst:167 -#: ../channels/microsoft365/accounts/migrate-from-email-channel.rst:31 -msgid "In case something went wrong, Zammad allows you to roll back the migration for up to 7 days. For this time period Zammad will remember your original credentials and restore it if needed. These information will be removed entirely after 7 days." +msgid "In case something went wrong, Zammad allows you to roll back the migration for up to 7 days. You can do so by using the ``Rollback migration`` button in the account details. For this time period, Zammad will remember your original credentials and restore it if needed. These information will be removed entirely after 7 days." msgstr "" -#: ../channels/google/basic-setup.rst:0 -msgid "Migrate an existing email channel to Google" -msgstr "" - -#: ../channels/google/basic-setup.rst:182 +#: ../channels/google/basic-setup.rst:178 msgid "My OAuth credentials stopped working" msgstr "" -#: ../channels/google/basic-setup.rst:181 +#: ../channels/google/basic-setup.rst:177 msgid "Did you recently change your Google password? Google invalidates all your OAuth tokens whenever you change it." msgstr "" -#: ../channels/google/basic-setup.rst:196 +#: ../channels/google/basic-setup.rst:192 msgid "How to use the Gmail account for outgoing system notifications?" msgstr "" -#: ../channels/google/basic-setup.rst:185 +#: ../channels/google/basic-setup.rst:181 msgid "On **subscription/cloud-hosted instances**, you can't do that. Notifications will always come from “Notification Master ”." msgstr "" -#: ../channels/google/basic-setup.rst:189 +#: ../channels/google/basic-setup.rst:185 msgid "On **self-hosted instances**, we still don't recommend it. Using a Gmail account for automated, outgoing messages is risky: users who exceed Google's `email sending limits `_ can have their accounts suspended." msgstr "" -#: ../channels/google/basic-setup.rst:195 +#: ../channels/google/basic-setup.rst:191 msgid "Set up a generic :doc:`email channel ` instead and use the :ref:`Email Notification ` setting." msgstr "" -#: ../channels/google/basic-setup.rst:199 +#: ../channels/google/basic-setup.rst:195 msgid "I successfully added my account, but Zammad isn't fetching new emails" msgstr "" -#: ../channels/google/basic-setup.rst:199 +#: ../channels/google/basic-setup.rst:195 msgid "If you specified a :ref:`custom folder/label to fetch from `, are you sure incoming mail is arriving in that folder?" msgstr "" @@ -5649,11 +5629,6 @@ msgstr "" msgid "Managing accounts in Microsoft 365 channels works in the same way as in email channels. This is why the section has been adopted verbatim from :doc:`here `." msgstr "" -#: ../channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst:5 -#: ../channels/microsoft365/accounts/managing-accounts.inbound-outbound.rst:5 -msgid "See :ref:`New Account Settings ` for a detailed description of each option." -msgstr "" - #: ../channels/microsoft365/accounts/managing-accounts.delete-note.rst:3 #: ../channels/microsoft365/accounts/managing-accounts.delete-note.rst:3 msgid "Groups need an assigned an address to send outgoing emails. If you delete a group’s assigned address, agents belonging to that group won’t be able to send emails until you assign it a new one." @@ -5691,6 +5666,10 @@ msgstr "" msgid "After you pressed next you'll be redirect to Zammad's Microsoft 365 channel overview. Your channel, if successful, is now migrated to a Microsoft 365 IMAP channel." msgstr "" +#: ../channels/microsoft365/accounts/migrate-from-email-channel.rst:31 +msgid "In case something went wrong, Zammad allows you to roll back the migration for up to 7 days. For this time period Zammad will remember your original credentials and restore it if needed. These information will be removed entirely after 7 days." +msgstr "" + #: ../channels/microsoft365/accounts/migrate-from-email-channel.rst:0 msgid "Migrate an existing email channel to Microsoft 365" msgstr ""