Skip to content

Commit 6072ceb

Browse files
authored
Maintenance: fix migration section and links in email channel
1 parent b60fefe commit 6072ceb

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

channels/email/index.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ Control how Zammad **sends and receives email**.
2828
🚛 Migrate existing email channel to "XOAUTH" channel
2929
At this moment Zammad supports XOAUTH for the following providers:
3030

31-
* :ref:`Google <migrate-channel>`
32-
* Microsoft 365 (formerly Office 365)
33-
* `Microsoft 365 IMAP Email </channels/microsoft365/accounts/migrate-from-email-channel>` (formerly Microsoft 365)
34-
* `Microsoft 365 Graph Email </channels/microsoft365-graph/index/>`
31+
* :ref:`Google Email <migrate-channel>`
32+
* :doc:`Microsoft 365 IMAP Email </channels/microsoft365/accounts/migrate-from-email-channel>` (formerly Office 365)
3533

36-
Use above links to use the migration option instead of removing and re-adding
37-
the channels. This will save precious time for something else!
34+
.. note::
35+
36+
Microsoft 365 *Graph* Email supports XOAUTH as well, but currently there
37+
is no migration option. Instead, you have to remove the existing and
38+
:doc:`add the new channel manually </channels/microsoft365-graph/accounts/>`.
3839

3940
.. start-after-migration
4041

locale/admin-docs.pot

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Zammad Admin Documentation pre-release\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-01-09 14:48+0100\n"
11+
"POT-Creation-Date: 2025-01-13 11:43+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1951,7 +1951,7 @@ msgstr ""
19511951
msgid "Email settings panel"
19521952
msgstr ""
19531953

1954-
#: ../channels/email/index.rst:39
1954+
#: ../channels/email/index.rst:40
19551955
msgid "🚛 Migrate existing email channel to \"XOAUTH\" channel"
19561956
msgstr ""
19571957

@@ -1960,130 +1960,130 @@ msgid "At this moment Zammad supports XOAUTH for the following providers:"
19601960
msgstr ""
19611961

19621962
#: ../channels/email/index.rst:31
1963-
msgid ":ref:`Google <migrate-channel>`"
1963+
msgid ":ref:`Google Email <migrate-channel>`"
19641964
msgstr ""
19651965

19661966
#: ../channels/email/index.rst:32
1967-
msgid "Microsoft 365 (formerly Office 365) * `Microsoft 365 IMAP Email </channels/microsoft365/accounts/migrate-from-email-channel>` (formerly Microsoft 365) * `Microsoft 365 Graph Email </channels/microsoft365-graph/index/>`"
1967+
msgid ":doc:`Microsoft 365 IMAP Email </channels/microsoft365/accounts/migrate-from-email-channel>` (formerly Office 365)"
19681968
msgstr ""
19691969

19701970
#: ../channels/email/index.rst:36
1971-
msgid "Use above links to use the migration option instead of removing and re-adding the channels. This will save precious time for something else!"
1971+
msgid "Microsoft 365 *Graph* Email supports XOAUTH as well, but currently there is no migration option. Instead, you have to remove the existing and :doc:`add the new channel manually </channels/microsoft365-graph/accounts/>`."
19721972
msgstr ""
19731973

1974-
#: ../channels/email/index.rst:48
1974+
#: ../channels/email/index.rst:49
19751975
#: ../channels/email/index.rst:10
19761976
#: ../channels/email/index.rst:10
19771977
msgid ":doc:`👥 Accounts <accounts>`"
19781978
msgstr ""
19791979

1980-
#: ../channels/email/index.rst:42
1980+
#: ../channels/email/index.rst:43
19811981
#: ../channels/email/index.rst:4
19821982
#: ../channels/email/index.rst:4
19831983
msgid "**Connect Zammad to your email provider** so that it can watch your inbox, send auto-replies, and more."
19841984
msgstr ""
19851985

1986-
#: ../channels/email/index.rst:45
1986+
#: ../channels/email/index.rst:46
19871987
#: ../channels/email/index.rst:7
19881988
#: ../channels/email/index.rst:7
19891989
msgid "(Self-hosted users may have already completed this step during new system setup.)"
19901990
msgstr ""
19911991

1992-
#: ../channels/email/index.rst:52
1992+
#: ../channels/email/index.rst:53
19931993
#: ../channels/email/index.rst:14
19941994
#: ../channels/email/index.rst:14
19951995
msgid ":doc:`🗂️ Filters <filters>`"
19961996
msgstr ""
19971997

1998-
#: ../channels/email/index.rst:51
1998+
#: ../channels/email/index.rst:52
19991999
#: ../channels/email/index.rst:13
20002000
#: ../channels/email/index.rst:13
20012001
msgid "**Make sure new tickets show up in the right place** with automated, if-this-then-that rules for all incoming email."
20022002
msgstr ""
20032003

2004-
#: ../channels/email/index.rst:55
2004+
#: ../channels/email/index.rst:56
20052005
#: ../channels/email/index.rst:17
20062006
#: ../channels/email/index.rst:17
20072007
msgid ":doc:`📜 Signatures <signatures>`"
20082008
msgstr ""
20092009

2010-
#: ../channels/email/index.rst:55
2010+
#: ../channels/email/index.rst:56
20112011
#: ../channels/email/index.rst:17
20122012
#: ../channels/email/index.rst:17
20132013
msgid "Customize signatures for all outgoing email."
20142014
msgstr ""
20152015

2016-
#: ../channels/email/index.rst:67
2016+
#: ../channels/email/index.rst:68
20172017
#: ../channels/email/index.rst:29
20182018
#: ../channels/email/index.rst:29
20192019
msgid ":doc:`⚙️ Settings <settings>`"
20202020
msgstr ""
20212021

2022-
#: ../channels/email/index.rst:58
2022+
#: ../channels/email/index.rst:59
20232023
#: ../channels/google/index.rst:42
20242024
#: ../channels/email/index.rst:20
20252025
#: ../channels/email/index.rst:20
20262026
msgid "Manage options like:"
20272027
msgstr ""
20282028

2029-
#: ../channels/email/index.rst:60
2029+
#: ../channels/email/index.rst:61
20302030
#: ../channels/google/index.rst:44
20312031
#: ../channels/email/index.rst:22
20322032
#: ../channels/email/index.rst:22
20332033
msgid "set the “From:” address on system notifications"
20342034
msgstr ""
20352035

2036-
#: ../channels/email/index.rst:61
2036+
#: ../channels/email/index.rst:62
20372037
#: ../channels/google/index.rst:45
20382038
#: ../channels/email/index.rst:23
20392039
#: ../channels/email/index.rst:23
20402040
msgid "raise the limit on attachment sizes"
20412041
msgstr ""
20422042

2043-
#: ../channels/email/index.rst:62
2043+
#: ../channels/email/index.rst:63
20442044
#: ../channels/google/index.rst:46
20452045
#: ../channels/email/index.rst:24
20462046
#: ../channels/email/index.rst:24
20472047
msgid "modify subject-line prefixes (*e.g.,* use “AW:” instead of “RE:”)"
20482048
msgstr ""
20492049

2050-
#: ../channels/email/index.rst:64
2050+
#: ../channels/email/index.rst:65
20512051
#: ../channels/email/index.rst:26
20522052
#: ../channels/email/index.rst:26
20532053
msgid "Want to **manually edit email subjects** or **always copy parent messages into your replies**?"
20542054
msgstr ""
20552055

2056-
#: ../channels/email/index.rst:67
2056+
#: ../channels/email/index.rst:68
20572057
#: ../channels/email/index.rst:29
20582058
#: ../channels/email/index.rst:29
20592059
msgid "Check the ✍️ :doc:`/misc/composer`."
20602060
msgstr ""
20612061

2062-
#: ../channels/email/index.rst:72
2062+
#: ../channels/email/index.rst:73
20632063
#: ../channels/email/index.rst:35
20642064
#: ../channels/email/index.rst:35
20652065
msgid ":doc:`📇 Header based actions <email-headers>`"
20662066
msgstr ""
20672067

2068-
#: ../channels/email/index.rst:70
2068+
#: ../channels/email/index.rst:71
20692069
#: ../channels/google/index.rst:49
20702070
#: ../channels/email/index.rst:32
20712071
#: ../channels/email/index.rst:32
20722072
msgid "Manipulate auto response behavior or incoming routing."
20732073
msgstr ""
20742074

2075-
#: ../channels/email/index.rst:72
2075+
#: ../channels/email/index.rst:73
20762076
#: ../channels/google/index.rst:51
20772077
#: ../channels/email/index.rst:34
20782078
#: ../channels/email/index.rst:34
20792079
msgid "🤓 This is a very advanced topic."
20802080
msgstr ""
20812081

2082-
#: ../channels/email/index.rst:75
2082+
#: ../channels/email/index.rst:76
20832083
msgid "Extra Options for Self-Hosted Users"
20842084
msgstr ""
20852085

2086-
#: ../channels/email/index.rst:77
2086+
#: ../channels/email/index.rst:78
20872087
msgid "If you're too cool for POP3/IMAP/SMTP..."
20882088
msgstr ""
20892089

0 commit comments

Comments
 (0)