diff --git a/channels/google/basic-setup.rst b/channels/google/basic-setup.rst index 91212ed70..2da016a49 100644 --- a/channels/google/basic-setup.rst +++ b/channels/google/basic-setup.rst @@ -1,127 +1,55 @@ Basic Setup =========== -To set up a new Gmail or G Suite channel in Zammad, you first have -to create an **OAuth app** in Google's Cloud console. Then you can connect -Zammad with your Google account and add as many Gmail accounts to Zammad as -you want, using only active Gmail browser sessions (no usernames or passwords -required). +To set up a new Google email channel in Zammad, you first have +to create an **OAuth client** in Google's Cloud console. Then you can connect +Zammad with your Google account and add as many mailboxes to Zammad as +you want. -If you already set up Google email channels in Zammad, you can easily +If you already set up Google email channels via IMAP in Zammad, you can easily migrate them to a Google channel. Follow the steps below but skip the step "Add Account" and proceed with :ref:`migrate-channel`. .. _register-oauth-google: -Register an OAuth App ---------------------- - -Sign in to the `Google Cloud console `_. -You should see a dashboard where you can add a new project. If you already -have an app which is in production, create a new one and follow the steps -below. - -Create an OAuth Consent Screen -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -In the left sidebar of your project's "APIs & Services" section, select -OAuth consent screen and provide the requested information. - -.. figure:: /images/channels/google/oauth-consent-screen.png - :alt: Screenshot shows OAuth consent screen creation in Google Cloud console - -In the first screen, select "Internal" as User Type and click on "Create". - -Provide the following information in the next screen: - -- **App name**: enter a suitable name for this app -- **User support email**: select an email address from the dropdown -- **Authorized domain**: the domain of your Zammad without http or https prefix -- **Developer contact information**: enter a valid email address - -After entering the information, click on "Save and Continue". You should be -on the "Scopes" screen. Click on "Add or Remove Scopes" to see the dialog as in -the following screenshot. - -.. figure:: /images/channels/google/add-api.png - :scale: 60% - :align: center - :alt: Screenshot with highlighted API selection - -1. Enter ``https://mail.google.com`` in the "Manually add scopes" text field -2. Click on "Add to Table" to have it in the selectable scopes table above -3. Select it by checking the box -4. Confirm by clicking the "Update" button - -Go on by clicking "Save and Continue". If your app is in "Testing" mode, add a -user as which you want to sign in to your Google account. -After that you see a summary screen where you can check the information. -Confirm by clicking the "Back to Dashboard" button and go on with creating -credentials for your app. - -Create Credentials -^^^^^^^^^^^^^^^^^^ - -Select "Credentials" in the left sidebar, click on "➕ Create Credentials" and -choose "OAuth client ID". - -.. figure:: /images/channels/google/add-credentials-oauth.png - :alt: Screenshot shows credentials screen with highlighted elements - :align: center - -Select "Web application" as Application type, give it a name and enter your -redirect URL. - -.. figure:: /images/channels/google/oauth-credentials-dialog.png - :alt: - :align: center - -The redirect URL is basically the domain of your Zammad instance, extended with -``/api/v1/external_credentials/google/callback``. - -You can even find the complete redirect URL in Zammad's admin area -under Channels > Google. Click on "Configure App" and find your URL under -"Your callback URL". - -.. figure:: /images/channels/google/configure-app-dialog.png - :alt: Screenshot shows Zammad's configuration dialog for a Google app - :align: center - :scale: 70% - -Click on "Create" after inserting the information. You will see a dialog with -your client ID and client secret. You need both of them in the next step for -configuring Zammad to connect it to Google. - -Configure App -------------- - -Go to Channels > Google in Zammad's admin area and click on "Configure App". -Insert the client ID and client secret which you got in the step before. - -.. figure:: /images/channels/google/client-id-secret.png - :alt: Screenshot shows dialogs from Google and Zammad with client ID and secret - :scale: 70% - :align: center - -Confirm by clicking the "Submit" button. Now you can add a Google account as -channel in Zammad, see next step. +Configure OAuth App +------------------- + +- Sign in to the `Google Cloud console `_. +- Create a new app if you don't have one already. +- Go to *APIs & Services > OAuth consent screen* and create an OAuth client by + clicking the **Create OAuth client** button. +- Choose "Web application" as type, provide a fitting name and add a redirect + URI. You can find the redirect URI in the Google account settings dialog of + Zammad by opening the configuration dialog via **Connect Google App** button + (called "Your callback URL"). +- After saving your app, a dialog will be shown with the "Client ID" and the + "Client secret". Copy and add them to Zammad in the app configuration + dialog. +- **Submit** the app configuration in Zammad and switch back to Google's Cloud + console. +- Go back to the dashboard, select *APIs & Services > Enabled APIs & Services* + and click on **Enable APIs & services** button. Search for ``gmail``, open it + and hit the **Enable** button. +- Go to *OAuth consent screen > Data Access* and click the + **Add or remove scopes** button. Search for ``gmail`` and add the scope + ``https://mail.google.com/``. Confirm with the **Update** button. + +Now, you are technically ready to connect a Gmail mailbox to Zammad. Depending +on your scenario, you should also have a look at the **Audience** section in +the Cloud console. Either add a test account for the app or publish it for +production use. Add Account ----------- -If you already have Google email channels, you can skip this step and head over -to :ref:`migrate-channel`. - -After you've registered Zammad as an OAuth app, you can connect Gmail accounts -to Zammad. - -☠️ **But first, a word of warning!** -The import process does things you might not expect: +After you've registered an OAuth app, you can connect Gmail accounts to Zammad. .. danger:: * By default, Zammad will **delete all emails** in your inbox during the import process. Use the *Keep Messages on Server* setting to - :ref:`disable this behavior `. + :ref:`disable this behavior ` or enable + :ref:`archive mode `. * Zammad will send an auto-reply message to every email it imports (including the old ones!). Make sure to :doc:`disable this behavior ` @@ -194,6 +122,8 @@ Keep messages on server to clean out your inbox from time to time to keep it below its storage limit. +.. _archive-mode: + Archive Mode .. include:: /channels/email/accounts/archive-mode.rst @@ -219,8 +149,7 @@ Convert Email Channel to Google Channel Zammad provides a migration logic that allows you to migrate existing Google accounts from an email channel into a Google channel. -.. note:: 🧐 **Zammad is expecting specific settings** - +.. note:: **Zammad is expecting specific settings.** In order for Zammad to display the migration option, it expects the channels hostname to be ``imap.gmail.com`` for IMAP and ``smtp.gmail.com`` for SMTP. @@ -235,10 +164,6 @@ Google and request you to authenticate and consent to said account. After you pressed next you'll be redirect to Zammad's Google channel overview. Your channel, if successful, is now migrated to an Google channel. -.. figure:: /images/channels/google/migrate-email-channel-to-google.gif - :alt: Migrate an existing email channel to Google - :align: center - Rolling Back the Migration ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/images/channels/google/add-api.png b/images/channels/google/add-api.png deleted file mode 100644 index 9cefee3fd..000000000 Binary files a/images/channels/google/add-api.png and /dev/null differ diff --git a/images/channels/google/add-credentials-oauth.png b/images/channels/google/add-credentials-oauth.png deleted file mode 100644 index 0b716562e..000000000 Binary files a/images/channels/google/add-credentials-oauth.png and /dev/null differ diff --git a/images/channels/google/add-credentials.png b/images/channels/google/add-credentials.png deleted file mode 100644 index eb648042c..000000000 Binary files a/images/channels/google/add-credentials.png and /dev/null differ diff --git a/images/channels/google/client-id-secret.png b/images/channels/google/client-id-secret.png deleted file mode 100644 index 756a1f56d..000000000 Binary files a/images/channels/google/client-id-secret.png and /dev/null differ diff --git a/images/channels/google/configure-app-dialog.png b/images/channels/google/configure-app-dialog.png deleted file mode 100644 index 0bc1a1d1b..000000000 Binary files a/images/channels/google/configure-app-dialog.png and /dev/null differ diff --git a/images/channels/google/migrate-email-channel-to-google.gif b/images/channels/google/migrate-email-channel-to-google.gif deleted file mode 100644 index 5eefc2825..000000000 Binary files a/images/channels/google/migrate-email-channel-to-google.gif and /dev/null differ diff --git a/images/channels/google/oauth-consent-screen.png b/images/channels/google/oauth-consent-screen.png deleted file mode 100644 index d051db54a..000000000 Binary files a/images/channels/google/oauth-consent-screen.png and /dev/null differ diff --git a/images/channels/google/oauth-credentials-dialog.png b/images/channels/google/oauth-credentials-dialog.png deleted file mode 100644 index 573c92eb9..000000000 Binary files a/images/channels/google/oauth-credentials-dialog.png and /dev/null differ diff --git a/images/channels/google/unverified-app-warning.png b/images/channels/google/unverified-app-warning.png deleted file mode 100644 index f7b3c28d9..000000000 Binary files a/images/channels/google/unverified-app-warning.png and /dev/null differ diff --git a/locale/admin-docs.pot b/locale/admin-docs.pot index b80a55f75..7a5f0373f 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: 2025-12-11 10:14+0100\n" +"POT-Creation-Date: 2025-12-12 13:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -230,7 +230,6 @@ msgid "Setting up a new email account? Here's what all the settings do." msgstr "" #: ../channels/email/accounts/account-setup.rst:6 -#: ../channels/google/basic-setup.rst:118 #: ../channels/microsoft365/accounts/account-setup.rst:8 msgid "☠️ **But first, a word of warning!** The import process does things you might not expect:" msgstr "" @@ -349,13 +348,13 @@ msgid "Your account password." msgstr "" #: ../channels/email/accounts/account-setup.rst:83 -#: ../channels/google/basic-setup.rst:154 +#: ../channels/google/basic-setup.rst:82 #: ../channels/microsoft365/accounts/account-setup.rst:96 msgid "Destination group" msgstr "" #: ../channels/email/accounts/account-setup.rst:79 -#: ../channels/google/basic-setup.rst:150 +#: ../channels/google/basic-setup.rst:78 #: ../channels/microsoft365/accounts/account-setup.rst:92 msgid "The :doc:`group ` that incoming emails will be assigned to." msgstr "" @@ -365,13 +364,13 @@ msgid "Use :doc:`filters ` for more fine-grained sortin msgstr "" #: ../channels/email/accounts/account-setup.rst:94 -#: ../channels/google/basic-setup.rst:165 +#: ../channels/google/basic-setup.rst:93 #: ../channels/microsoft365/accounts/account-setup.rst:107 msgid "Destination group > Sending email address" msgstr "" #: ../channels/email/accounts/account-setup.rst:86 -#: ../channels/google/basic-setup.rst:157 +#: ../channels/google/basic-setup.rst:85 #: ../channels/microsoft365/accounts/account-setup.rst:99 msgid "Decide if the email address should be assigned to the selected group for outgoing emails." msgstr "" @@ -512,7 +511,7 @@ msgid "Your email server's port (usu. ``993`` for IMAP, or ``995`` for POP3)." msgstr "" #: ../channels/email/accounts/account-setup.rst:181 -#: ../channels/google/basic-setup.rst:175 +#: ../channels/google/basic-setup.rst:103 #: ../channels/microsoft365/accounts/account-setup.rst:118 msgid "Folder" msgstr "" @@ -534,47 +533,47 @@ msgid "If this folder does not receive incoming messages automatically, you may msgstr "" #: ../channels/email/accounts/account-setup.rst:205 -#: ../channels/google/basic-setup.rst:195 +#: ../channels/google/basic-setup.rst:123 #: ../channels/microsoft365/accounts/account-setup.rst:140 msgid "Keep messages on server" msgstr "" #: ../channels/email/accounts/account-setup.rst:184 -#: ../channels/google/basic-setup.rst:178 +#: ../channels/google/basic-setup.rst:106 #: ../channels/microsoft365/accounts/account-setup.rst:121 msgid "Specify what happens to your emails after Zammad imports them:" msgstr "" #: ../channels/email/accounts/account-setup.rst:186 -#: ../channels/google/basic-setup.rst:180 +#: ../channels/google/basic-setup.rst:108 msgid "``no``: Zammad deletes all imported messages" msgstr "" #: ../channels/email/accounts/account-setup.rst:188 -#: ../channels/google/basic-setup.rst:181 +#: ../channels/google/basic-setup.rst:109 msgid "``yes``: Zammad marks imported messages as read. With this option, Zammad will only import unread messages. This means Zammad may miss messages if the mailbox is externally modified." msgstr "" #: ../channels/email/accounts/account-setup.rst:193 -#: ../channels/google/basic-setup.rst:185 +#: ../channels/google/basic-setup.rst:113 #: ../channels/microsoft365/accounts/account-setup.rst:130 msgid "🤔 **Why does Zammad delete messages by default?**" msgstr "" #: ../channels/email/accounts/account-setup.rst:195 -#: ../channels/google/basic-setup.rst:187 +#: ../channels/google/basic-setup.rst:115 #: ../channels/microsoft365/accounts/account-setup.rst:132 msgid "If you never clean out your inbox, it'll eventually reach its storage limit, and your mail server will start **rejecting incoming messages**. Most Zammad users never even look at their inbox once it's set up, so they rely on Zammad to keep it clean for them." msgstr "" #: ../channels/email/accounts/account-setup.rst:201 -#: ../channels/google/basic-setup.rst:193 +#: ../channels/google/basic-setup.rst:121 #: ../channels/microsoft365/accounts/account-setup.rst:138 msgid "If you choose **yes** here, remember that it's your responsibility to clean out your inbox from time to time to keep it below its storage limit." msgstr "" #: ../channels/email/accounts/account-setup.rst:209 -#: ../channels/google/basic-setup.rst:198 +#: ../channels/google/basic-setup.rst:128 #: ../channels/microsoft365/accounts/account-setup.rst:143 msgid "Archive Mode" msgstr "" @@ -735,7 +734,7 @@ msgid "Otherwise, the agents in this group will not be able to send e-mails." msgstr "" #: ../channels/email/accounts/account-setup.rst:276 -#: ../channels/google/basic-setup.rst:256 +#: ../channels/google/basic-setup.rst:181 #: ../channels/microsoft365/accounts/account-setup.rst:162 #: ../settings/security/third-party/saml.rst:186 #: ../system/integrations/cti/includes/troubleshooting.include.rst:2 @@ -853,7 +852,7 @@ msgstr "" #: ../channels/email/accounts/managing-accounts.rst:21 #: ../channels/email/accounts/managing-accounts.rst:21 -#: ../channels/google/basic-setup.rst:208 +#: ../channels/google/basic-setup.rst:138 #: ../channels/email/accounts/managing-accounts.rst:21 msgid "Only **active** groups will be displayed. Changing this setting will not reassign existing tickets to the new group." msgstr "" @@ -3351,158 +3350,72 @@ msgid "Basic Setup" msgstr "" #: ../channels/google/basic-setup.rst:4 -msgid "To set up a new Gmail or G Suite channel in Zammad, you first have to create an **OAuth app** in Google's Cloud console. Then you can connect Zammad with your Google account and add as many Gmail accounts to Zammad as you want, using only active Gmail browser sessions (no usernames or passwords required)." -msgstr "" - -#: ../channels/google/basic-setup.rst:10 -msgid "If you already set up Google email channels in Zammad, you can easily migrate them to a Google channel. Follow the steps below but skip the step \"Add Account\" and proceed with :ref:`migrate-channel`." -msgstr "" - -#: ../channels/google/basic-setup.rst:17 -#: ../channels/microsoft365/accounts/register-app.rst:2 -msgid "Register an OAuth App" -msgstr "" - -#: ../channels/google/basic-setup.rst:19 -msgid "Sign in to the `Google Cloud console `_. You should see a dashboard where you can add a new project. If you already have an app which is in production, create a new one and follow the steps below." -msgstr "" - -#: ../channels/google/basic-setup.rst:25 -msgid "Create an OAuth Consent Screen" -msgstr "" - -#: ../channels/google/basic-setup.rst:27 -msgid "In the left sidebar of your project's \"APIs & Services\" section, select OAuth consent screen and provide the requested information." -msgstr "" - -#: ../channels/google/basic-setup.rst:None -msgid "Screenshot shows OAuth consent screen creation in Google Cloud console" -msgstr "" - -#: ../channels/google/basic-setup.rst:33 -msgid "In the first screen, select \"Internal\" as User Type and click on \"Create\"." -msgstr "" - -#: ../channels/google/basic-setup.rst:35 -msgid "Provide the following information in the next screen:" -msgstr "" - -#: ../channels/google/basic-setup.rst:37 -msgid "**App name**: enter a suitable name for this app" -msgstr "" - -#: ../channels/google/basic-setup.rst:38 -msgid "**User support email**: select an email address from the dropdown" -msgstr "" - -#: ../channels/google/basic-setup.rst:39 -msgid "**Authorized domain**: the domain of your Zammad without http or https prefix" -msgstr "" - -#: ../channels/google/basic-setup.rst:40 -msgid "**Developer contact information**: enter a valid email address" -msgstr "" - -#: ../channels/google/basic-setup.rst:42 -msgid "After entering the information, click on \"Save and Continue\". You should be on the \"Scopes\" screen. Click on \"Add or Remove Scopes\" to see the dialog as in the following screenshot." -msgstr "" - -#: ../channels/google/basic-setup.rst:None -msgid "Screenshot with highlighted API selection" -msgstr "" - -#: ../channels/google/basic-setup.rst:51 -msgid "Enter ``https://mail.google.com`` in the \"Manually add scopes\" text field" -msgstr "" - -#: ../channels/google/basic-setup.rst:52 -msgid "Click on \"Add to Table\" to have it in the selectable scopes table above" -msgstr "" - -#: ../channels/google/basic-setup.rst:53 -msgid "Select it by checking the box" -msgstr "" - -#: ../channels/google/basic-setup.rst:54 -msgid "Confirm by clicking the \"Update\" button" -msgstr "" - -#: ../channels/google/basic-setup.rst:56 -msgid "Go on by clicking \"Save and Continue\". If your app is in \"Testing\" mode, add a user as which you want to sign in to your Google account. After that you see a summary screen where you can check the information. Confirm by clicking the \"Back to Dashboard\" button and go on with creating credentials for your app." +msgid "To set up a new Google email channel in Zammad, you first have to create an **OAuth client** in Google's Cloud console. Then you can connect Zammad with your Google account and add as many mailboxes to Zammad as you want." msgstr "" -#: ../channels/google/basic-setup.rst:63 -msgid "Create Credentials" +#: ../channels/google/basic-setup.rst:9 +msgid "If you already set up Google email channels via IMAP in Zammad, you can easily migrate them to a Google channel. Follow the steps below but skip the step \"Add Account\" and proceed with :ref:`migrate-channel`." msgstr "" -#: ../channels/google/basic-setup.rst:65 -msgid "Select \"Credentials\" in the left sidebar, click on \"➕ Create Credentials\" and choose \"OAuth client ID\"." +#: ../channels/google/basic-setup.rst:16 +msgid "Configure OAuth App" msgstr "" -#: ../channels/google/basic-setup.rst:None -msgid "Screenshot shows credentials screen with highlighted elements" +#: ../channels/google/basic-setup.rst:18 +msgid "Sign in to the `Google Cloud console `_." msgstr "" -#: ../channels/google/basic-setup.rst:72 -msgid "Select \"Web application\" as Application type, give it a name and enter your redirect URL." +#: ../channels/google/basic-setup.rst:19 +msgid "Create a new app if you don't have one already." msgstr "" -#: ../channels/google/basic-setup.rst:79 -msgid "The redirect URL is basically the domain of your Zammad instance, extended with ``/api/v1/external_credentials/google/callback``." +#: ../channels/google/basic-setup.rst:20 +msgid "Go to *APIs & Services > OAuth consent screen* and create an OAuth client by clicking the **Create OAuth client** button." msgstr "" -#: ../channels/google/basic-setup.rst:82 -msgid "You can even find the complete redirect URL in Zammad's admin area under Channels > Google. Click on \"Configure App\" and find your URL under \"Your callback URL\"." +#: ../channels/google/basic-setup.rst:22 +msgid "Choose \"Web application\" as type, provide a fitting name and add a redirect URI. You can find the redirect URI in the Google account settings dialog of Zammad by opening the configuration dialog via **Connect Google App** button (called \"Your callback URL\")." msgstr "" -#: ../channels/google/basic-setup.rst:None -msgid "Screenshot shows Zammad's configuration dialog for a Google app" +#: ../channels/google/basic-setup.rst:26 +msgid "After saving your app, a dialog will be shown with the \"Client ID\" and the \"Client secret\". Copy and add them to Zammad in the app configuration dialog." msgstr "" -#: ../channels/google/basic-setup.rst:91 -msgid "Click on \"Create\" after inserting the information. You will see a dialog with your client ID and client secret. You need both of them in the next step for configuring Zammad to connect it to Google." +#: ../channels/google/basic-setup.rst:29 +msgid "**Submit** the app configuration in Zammad and switch back to Google's Cloud console." msgstr "" -#: ../channels/google/basic-setup.rst:96 -#: ../system/integrations/exchange.rst:82 -msgid "Configure App" -msgstr "" - -#: ../channels/google/basic-setup.rst:98 -msgid "Go to Channels > Google in Zammad's admin area and click on \"Configure App\". Insert the client ID and client secret which you got in the step before." +#: ../channels/google/basic-setup.rst:31 +msgid "Go back to the dashboard, select *APIs & Services > Enabled APIs & Services* and click on **Enable APIs & services** button. Search for ``gmail``, open it and hit the **Enable** button." msgstr "" -#: ../channels/google/basic-setup.rst:None -msgid "Screenshot shows dialogs from Google and Zammad with client ID and secret" +#: ../channels/google/basic-setup.rst:34 +msgid "Go to *OAuth consent screen > Data Access* and click the **Add or remove scopes** button. Search for ``gmail`` and add the scope ``https://mail.google.com/``. Confirm with the **Update** button." msgstr "" -#: ../channels/google/basic-setup.rst:106 -msgid "Confirm by clicking the \"Submit\" button. Now you can add a Google account as channel in Zammad, see next step." +#: ../channels/google/basic-setup.rst:38 +msgid "Now, you are technically ready to connect a Gmail mailbox to Zammad. Depending on your scenario, you should also have a look at the **Audience** section in the Cloud console. Either add a test account for the app or publish it for production use." msgstr "" -#: ../channels/google/basic-setup.rst:110 +#: ../channels/google/basic-setup.rst:44 #: ../channels/microsoft365-graph/accounts.rst:124 #: ../system/integrations/exchange.rst:119 msgid "Add Account" msgstr "" -#: ../channels/google/basic-setup.rst:112 -msgid "If you already have Google email channels, you can skip this step and head over to :ref:`migrate-channel`." -msgstr "" - -#: ../channels/google/basic-setup.rst:115 -msgid "After you've registered Zammad as an OAuth app, you can connect Gmail accounts to Zammad." +#: ../channels/google/basic-setup.rst:46 +msgid "After you've registered an OAuth app, you can connect Gmail accounts to Zammad." msgstr "" -#: ../channels/google/basic-setup.rst:122 -msgid "By default, Zammad will **delete all emails** in your inbox during the import process. Use the *Keep Messages on Server* setting to :ref:`disable this behavior `." +#: ../channels/google/basic-setup.rst:49 +msgid "By default, Zammad will **delete all emails** in your inbox during the import process. Use the *Keep Messages on Server* setting to :ref:`disable this behavior ` or enable :ref:`archive mode `." msgstr "" -#: ../channels/google/basic-setup.rst:125 +#: ../channels/google/basic-setup.rst:53 msgid "Zammad will send an auto-reply message to every email it imports (including the old ones!). Make sure to :doc:`disable this behavior ` prior adding an email account and to turn it back on once all your messages have been imported." msgstr "" -#: ../channels/google/basic-setup.rst:131 +#: ../channels/google/basic-setup.rst:59 msgid "To connect you Google account, click on \"Add Account\" in Zammad. You will be redirected to a consent dialog. Click through the screens and and make sure to select the desired Google account as well as to grant the permission for email handling as you can see in the following screenshot." msgstr "" @@ -3510,7 +3423,7 @@ msgstr "" msgid "Screenshot shows Google's consent screen with checked email permission" msgstr "" -#: ../channels/google/basic-setup.rst:141 +#: ../channels/google/basic-setup.rst:69 msgid "After clicking on \"Continue\", you are redirected to Zammad where you can see a dialog for specifying some settings for the channel:" msgstr "" @@ -3518,104 +3431,98 @@ msgstr "" msgid "Screenshot shows Zammad's add channel dialog" msgstr "" -#: ../channels/google/basic-setup.rst:153 +#: ../channels/google/basic-setup.rst:81 msgid "Use :doc:`filters ` for more fine-grained sorting of incoming email." msgstr "" -#: ../channels/google/basic-setup.rst:160 +#: ../channels/google/basic-setup.rst:88 #: ../channels/microsoft365/accounts/account-setup.rst:102 msgid "**Change to ...** will add this email address to the group for outgoing emails. This may overwrite an already assigned email address." msgstr "" -#: ../channels/google/basic-setup.rst:163 +#: ../channels/google/basic-setup.rst:91 msgid "**Do not change email address** doesn't assign an email address to the group or change it. If the group has no assigned email address, it stays empty. If the group already has an assigned email address, it stays the same." msgstr "" -#: ../channels/google/basic-setup.rst:170 +#: ../channels/google/basic-setup.rst:98 msgid "Specify which folder (or *label*) to fetch from, or leave empty to fetch from ``INBOX``. If specifying a nested folder, be sure to use the full path, e.g. ``Inquiries/Tech-Support``." msgstr "" -#: ../channels/google/basic-setup.rst:200 +#: ../channels/google/basic-setup.rst:130 msgid "After successfully adding the Google account, you can adjust the default group Zammad is going to assign incoming new tickets to." msgstr "" -#: ../channels/google/basic-setup.rst:214 +#: ../channels/google/basic-setup.rst:144 msgid "Migrate from Email Channel" msgstr "" -#: ../channels/google/basic-setup.rst:217 +#: ../channels/google/basic-setup.rst:147 msgid "Convert Email Channel to Google Channel" msgstr "" -#: ../channels/google/basic-setup.rst:219 +#: ../channels/google/basic-setup.rst:149 msgid "Zammad provides a migration logic that allows you to migrate existing Google accounts from an email channel into a Google channel." msgstr "" -#: ../channels/google/basic-setup.rst:222 -#: ../channels/microsoft365/accounts/migrate-from-email-channel.rst:10 -msgid "🧐 **Zammad is expecting specific settings**" -msgstr "" - -#: ../channels/google/basic-setup.rst:224 -msgid "In order for Zammad to display the migration option, it expects the channels hostname to be ``imap.gmail.com`` for IMAP and ``smtp.gmail.com`` for SMTP." +#: ../channels/google/basic-setup.rst:152 +msgid "**Zammad is expecting specific settings.** In order for Zammad to display the migration option, it expects the channels hostname to be ``imap.gmail.com`` for IMAP and ``smtp.gmail.com`` for SMTP." msgstr "" -#: ../channels/google/basic-setup.rst:227 +#: ../channels/google/basic-setup.rst:156 msgid "The easiest way to start the migration is to :ref:`register-oauth-google` for your Google accounts before migrating. However, if you don't, Zammad will ask you to provide your app credentials before allowing you to continue." msgstr "" -#: ../channels/google/basic-setup.rst:231 +#: ../channels/google/basic-setup.rst:160 msgid "If you're ready to go, simply click on the *Migrate now!* button in the red banner of the email channel in question. Zammad will redirect you to Google and request you to authenticate and consent to said account." msgstr "" -#: ../channels/google/basic-setup.rst:235 +#: ../channels/google/basic-setup.rst:164 msgid "After you pressed next you'll be redirect to Zammad's Google channel overview. Your channel, if successful, is now migrated to an Google channel." msgstr "" -#: ../channels/google/basic-setup.rst:None -#: ../channels/google/basic-setup.rst:0 -msgid "Migrate an existing email channel to Google" -msgstr "" - -#: ../channels/google/basic-setup.rst:243 +#: ../channels/google/basic-setup.rst:168 #: ../channels/microsoft365/accounts/migrate-from-email-channel.rst:29 msgid "Rolling Back the Migration" msgstr "" -#: ../channels/google/basic-setup.rst:245 +#: ../channels/google/basic-setup.rst:170 #: ../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/google/basic-setup.rst:260 +#: ../channels/google/basic-setup.rst:0 +msgid "Migrate an existing email channel to Google" +msgstr "" + +#: ../channels/google/basic-setup.rst:185 msgid "My OAuth credentials stopped working" msgstr "" -#: ../channels/google/basic-setup.rst:259 +#: ../channels/google/basic-setup.rst:184 msgid "Did you recently change your Google password? Google invalidates all your OAuth tokens whenever you change it." msgstr "" -#: ../channels/google/basic-setup.rst:274 +#: ../channels/google/basic-setup.rst:199 msgid "How to use the Gmail account for outgoing system notifications?" msgstr "" -#: ../channels/google/basic-setup.rst:263 +#: ../channels/google/basic-setup.rst:188 msgid "On **subscription/cloud-hosted instances**, you can't do that. Notifications will always come from “Notification Master ”." msgstr "" -#: ../channels/google/basic-setup.rst:267 +#: ../channels/google/basic-setup.rst:192 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:273 +#: ../channels/google/basic-setup.rst:198 msgid "Set up a generic :doc:`email channel ` instead and use the :ref:`Email Notification ` setting." msgstr "" -#: ../channels/google/basic-setup.rst:277 +#: ../channels/google/basic-setup.rst:202 msgid "I successfully added my account, but Zammad isn't fetching new emails" msgstr "" -#: ../channels/google/basic-setup.rst:277 +#: ../channels/google/basic-setup.rst:202 msgid "If you specified a :ref:`custom folder/label to fetch from `, are you sure incoming mail is arriving in that folder?" msgstr "" @@ -4417,6 +4324,10 @@ msgstr "" msgid "Zammad provides a migration logic that allows you to migrate existing Microsoft 365 accounts from the Email channel to the Microsoft 365 channel." msgstr "" +#: ../channels/microsoft365/accounts/migrate-from-email-channel.rst:10 +msgid "🧐 **Zammad is expecting specific settings**" +msgstr "" + #: ../channels/microsoft365/accounts/migrate-from-email-channel.rst:12 msgid "In order for Zammad to display the migration option, it expects the channels hostname to be ``outlook.office365.com`` for IMAP and ``smtp.office365.com`` for SMTP." msgstr "" @@ -4437,6 +4348,10 @@ msgstr "" msgid "Migrate an existing email channel to Microsoft 365" msgstr "" +#: ../channels/microsoft365/accounts/register-app.rst:2 +msgid "Register an OAuth App" +msgstr "" + #: ../channels/microsoft365/accounts/register-app.rst:4 msgid "Setting up a new Microsoft 365 account? Follow our basic setup guide to get started." msgstr "" @@ -20357,6 +20272,10 @@ msgstr "" msgid "For the OAuth option, you first have to configure the connection to your Exchange app and then add an account you want to use." msgstr "" +#: ../system/integrations/exchange.rst:82 +msgid "Configure App" +msgstr "" + #: ../system/integrations/exchange.rst:84 msgid "Create an app in Microsoft's `Entra admin center `_, if not already done." msgstr ""