Skip to content

Commit

Permalink
Merge pull request #85 from zammad/mh/pre-release
Browse files Browse the repository at this point in the history
Release 5.2
  • Loading branch information
MrGeneration committed Jun 21, 2022
2 parents a170cd0 + 88209d6 commit 27ecc1e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 3 deletions.
5 changes: 5 additions & 0 deletions extras/customers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ but here are a couple that might confuse you:
Customers may (optionally) belong to **organizations** –
:doc:`skip ahead <organizations>` to learn more.

:Secondary Organizations:

Unlike organizations, you can add several organizations here that are not
as highlighted. Still, the same behavior applies.

:VIP:

Like :doc:`ticket priority </basics/service-ticket/settings/priority>`,
Expand Down
Binary file modified images/extras/customers-edit-dialog.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/extras/customers.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/extras/tags-in-kb-answers.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 11 additions & 3 deletions locale/user-docs.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents) \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-06-09 16:15+0200\n"
"POT-Creation-Date: 2022-06-20 23:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -3057,14 +3057,22 @@ msgid "Customers may (optionally) belong to **organizations** – :doc:`skip ahe
msgstr ""

#: ../extras/customers.rst:0
msgid "VIP"
msgid "Secondary Organizations"
msgstr ""

#: ../extras/customers.rst:49
msgid "Like :doc:`ticket priority </basics/service-ticket/settings/priority>`, **VIP status** doesn’t actually do anything out-of-the-box, but an admin *can* set up automated system hooks based on this value, or use it as a filter for :doc:`custom overviews </basics/find-ticket/browse>`."
msgid "Unlike organizations, you can add several organizations here that are not as highlighted. Still, the same behavior applies."
msgstr ""

#: ../extras/customers.rst:0
msgid "VIP"
msgstr ""

#: ../extras/customers.rst:54
msgid "Like :doc:`ticket priority </basics/service-ticket/settings/priority>`, **VIP status** doesn’t actually do anything out-of-the-box, but an admin *can* set up automated system hooks based on this value, or use it as a filter for :doc:`custom overviews </basics/find-ticket/browse>`."
msgstr ""

#: ../extras/customers.rst:59
msgid "**Ask your administrator** about how she’d like you to use this attribute (or just leave it alone)."
msgstr ""

Expand Down

0 comments on commit 27ecc1e

Please sign in to comment.