diff --git a/advanced/search.rst b/advanced/search.rst
index c38691b1..9fdf06a5 100644
--- a/advanced/search.rst
+++ b/advanced/search.rst
@@ -5,8 +5,7 @@ With Zammad, you can limit your search to specific attributes.
This allows you to find e.g. tickets with specific key words and states.
Below information will help you to improve your search results.
-For instance you can search for a specific customer
-by using ``customer.attribute``::
+For instance, you can search for a ticket of a specific customer::
customer.firstname: John
@@ -14,7 +13,6 @@ or::
customer.lastname: Doe
-
If you want to run a more complex search, you can use conditions
with ``()`` and ``AND``/``OR`` options::
diff --git a/advanced/tabs.rst b/advanced/tabs.rst
index 1d66d74e..294d2501 100644
--- a/advanced/tabs.rst
+++ b/advanced/tabs.rst
@@ -3,7 +3,6 @@ Tabs
As you click through Zammad, you will see a list of entries appear in the main
menu area. These are your **open tabs.**
-
You can freely switch between open tabs without losing your work -
all unsaved changes are automatically backed up to the server.
@@ -69,3 +68,8 @@ Stay on tab
Updating the ticket doesn't have any effect on the tab.
*This is the default setting in Zammad installations.*
+
+Now that you are an expert in tab handling, one more thing might be
+interesting as well: the maximum number of tabs is 30 due to performance
+reasons. In case you reach the limit and open another tab, the first opened
+tab gets closed automatically.
\ No newline at end of file
diff --git a/advanced/ticket-actions/merge.rst b/advanced/ticket-actions/merge.rst
index 25c96cdb..f2e08533 100644
--- a/advanced/ticket-actions/merge.rst
+++ b/advanced/ticket-actions/merge.rst
@@ -15,13 +15,14 @@ What is merged where?
Let's assume you already worked on a ticket and you get another ticket about
the same issue and want to merge them.
- Let's call the ticket you already worked on the *original* one and the new
- one *duplicate*.
+ Let's call the ticket you already worked on the *original* or *target* ticket
+ and the new one *duplicate* or *source* ticket.
Then the way to go is to open the duplicate ticket and execute the merging
- from there so it will be merged into the original.
+ from there so it will be merged into the original ticket.
How to merge tickets?
- To merge a ticket, access the **Ticket ▾** submenu in the ticket pane.
+ To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and
+ choose **Merge**.
.. figure:: /images/advanced/ticket-actions/ticket-menu-merge.png
:alt: Ticket menu with highlighted "merge"
@@ -51,3 +52,9 @@ Result after merging
- The articles have been replaced by a "merged" label
- The state has changed to "merged"
- The ticket is :doc:`linked ` to its "parent" ticket
+
+ .. hint:: If you merge two tickets which were created from different
+ channels, you have to answer via channel of the remaining target ticket.
+
+ Example: if you merge a Whatsapp ticket into an email ticket, you have to
+ answer via email channel in the target ticket.
\ No newline at end of file
diff --git a/locale/cs/LC_MESSAGES/user-docs.po b/locale/cs/LC_MESSAGES/user-docs.po
index 634320fc..3cd11b19 100644
--- a/locale/cs/LC_MESSAGES/user-docs.po
+++ b/locale/cs/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -529,8 +529,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -550,9 +550,9 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -654,33 +654,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -833,11 +831,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -847,7 +845,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -868,8 +866,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -894,134 +892,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr ""
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1252,55 +1250,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1338,21 +1332,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1364,47 +1358,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1415,14 +1409,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1494,8 +1496,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1517,8 +1519,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1569,7 +1571,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1620,35 +1622,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1658,28 +1662,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2251,8 +2267,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2610,8 +2627,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2716,8 +2733,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2757,9 +2774,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3381,8 +3398,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3922,8 +3939,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4010,8 +4027,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4206,8 +4223,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4225,8 +4242,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4279,8 +4296,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4356,8 +4373,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5405,8 +5422,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -6972,8 +6989,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7267,7 +7284,7 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
diff --git a/locale/da/LC_MESSAGES/user-docs.po b/locale/da/LC_MESSAGES/user-docs.po
index 4a8d2fc8..354c7597 100644
--- a/locale/da/LC_MESSAGES/user-docs.po
+++ b/locale/da/LC_MESSAGES/user-docs.po
@@ -7,14 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
+"PO-Revision-Date: 2025-06-17 13:00+0000\n"
+"Last-Translator: LomaxThomas \n"
+"Language-Team: Danish \n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.11.4\n"
#: ../advanced/keyboard-shortcuts.rst:2
msgid "Keyboard Shortcuts"
@@ -529,8 +532,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -550,9 +553,9 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -654,33 +657,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -833,11 +834,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -847,7 +848,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -868,8 +869,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -894,134 +895,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr ""
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1252,55 +1253,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1338,21 +1335,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1364,47 +1361,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1415,14 +1412,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1494,8 +1499,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1517,8 +1522,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1569,7 +1574,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1620,35 +1625,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1658,28 +1665,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2251,8 +2270,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2610,8 +2630,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2716,8 +2736,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2757,9 +2777,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3381,8 +3401,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3807,7 +3827,7 @@ msgstr ""
#: ../basics/zammad-glossary.rst:490 ../extras/mobile-view.rst:91
#: ../extras/profile-and-settings.rst:0 ../extras/profile-and-settings.rst:111
msgid "Notifications"
-msgstr ""
+msgstr "Notifikationer"
#: ../basics/zammad-glossary.rst:485
msgid ""
@@ -3922,8 +3942,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4010,8 +4030,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4206,8 +4226,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4225,8 +4245,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4279,8 +4299,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4356,8 +4376,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -4632,7 +4652,7 @@ msgstr ""
#: ../extras/checklist.rst:5
msgid "General"
-msgstr ""
+msgstr "Generelt"
#: ../extras/checklist.rst:7
msgid ""
@@ -5405,8 +5425,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -6972,8 +6992,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7267,7 +7287,7 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
diff --git a/locale/de/LC_MESSAGES/user-docs.po b/locale/de/LC_MESSAGES/user-docs.po
index 277f1b5a..a739a905 100644
--- a/locale/de/LC_MESSAGES/user-docs.po
+++ b/locale/de/LC_MESSAGES/user-docs.po
@@ -7,21 +7,21 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
-"PO-Revision-Date: 2025-02-14 15:00+0000\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
+"PO-Revision-Date: 2025-11-06 16:00+0000\n"
"Last-Translator: Ralf Schmid \n"
"Language-Team: German \n"
+"documentations/user-documentation-latest/de/>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9.2\n"
+"X-Generator: Weblate 5.11.4\n"
#: ../advanced/keyboard-shortcuts.rst:2
msgid "Keyboard Shortcuts"
-msgstr "Tastenkombinationen für die Tastatur"
+msgstr "Tastaturkürzel"
#: ../advanced/keyboard-shortcuts.rst:4
msgid ""
@@ -29,9 +29,9 @@ msgid ""
"as an expert user. But don't be afraid, you don't have to remember all of "
"them."
msgstr ""
-"Zammad unterstützt eine Vielzahl von Tastenkombinationen, um Ihren "
-"Arbeitsablauf als erfahrener Benutzer zu beschleunigen. Aber keine Angst, "
-"Sie müssen sich nicht alle merken."
+"Zammad unterstützt eine Vielzahl von Tastaturkürzel, um Ihren Arbeitsablauf "
+"als erfahrener Benutzer zu beschleunigen. Aber keine Angst, Sie müssen sich "
+"nicht alle merken."
#: ../advanced/keyboard-shortcuts.rst:8 ../basics/zammad-glossary.rst:508
#: ../extras/chat.rst:11 ../extras/customers.rst:7
@@ -63,7 +63,7 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:26
msgid "Keyboard shortcut cheat sheet"
-msgstr "Spickzettel für Tastenkombinationen"
+msgstr "Spickzettel für Tastaturkürzel"
#: ../advanced/keyboard-shortcuts.rst:26
msgid "The keyboard shortcut overview."
@@ -82,8 +82,8 @@ msgid ""
"Enable or disable the shortcuts in general by switching the toggle on the "
"left side."
msgstr ""
-"Die Tastenkombinationen aktivieren oder deaktivieren, indem Sie den Schalter "
-"auf der linken Seite klicken."
+"Die Tastaturkürzel aktivieren oder deaktivieren, indem Sie den Schalter auf "
+"der linken Seite klicken."
#: ../advanced/keyboard-shortcuts.rst:35
msgid ""
@@ -100,9 +100,9 @@ msgid ""
"because browsers and operating systems could jam the key press signal. And "
"the shortcut for opening this overview differs as well."
msgstr ""
-"Beachten Sie, dass diese alten Tastenkombinationen nicht so zuverlässig "
+"Beachten Sie, dass diese alten Tastaturkürzel nicht so zuverlässig "
"funktionieren wie die neuen, da Browser und Betriebssysteme dazwischenfunken "
-"können. Auch die Tastenkombination zum Öffnen dieser Übersicht ist anders."
+"können. Auch die Tastaturkürzel zum Öffnen dieser Übersicht ist anders."
#: ../advanced/keyboard-shortcuts.rst:43
msgid ""
@@ -561,11 +561,12 @@ msgstr "Entfernen von Hyperlinks"
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
-"Wenn Sie ein Mac Benutzer sind, verwenden Sie :kbd:`cmd` anstelle von :kbd:"
-"`strg` und :kbd:`strg` :kbd:`option` anstelle von :kbd:`shift` :kbd:`strg`."
+"Wenn Sie ein Mac Benutzer sind, verwenden Sie :kbd:`cmd` anstelle "
+"von :kbd:`strg` und :kbd:`strg` :kbd:`option` anstelle "
+"von :kbd:`shift` :kbd:`strg`."
#: ../advanced/macros.rst:2
msgid "Macros"
@@ -589,13 +590,13 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
-"Makros können von Ihrem :admin-docs:`Zammad Administrator ` erstellt werden. Wenn Sie eine Idee für ein Makro haben, das Sie "
-"gerne verwenden würden, kann Ihr Zammad-Administrator es wahrscheinlich "
+"Makros können von Ihrem :admin-docs:`Zammad Administrator ` erstellt werden. Wenn Sie eine Idee für ein Makro haben, das "
+"Sie gerne verwenden würden, kann Ihr Zammad-Administrator es wahrscheinlich "
"umsetzen."
#: ../advanced/macros.rst:14
@@ -724,18 +725,15 @@ msgstr ""
"Suchergebnisse zu verbessern."
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-"Zum Beispiel können Sie ``customer.attribute`` nutzen, um nach einem "
-"bestimmten Kunden zu suchen::"
+"Sie können zum Beispiel nach einem Ticket eines bestimmten Kunden suchen::"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "or::"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
@@ -743,21 +741,21 @@ msgstr ""
"Wenn Sie komplexere Suchen nutzen möchten, können Sie Konditionen mit ``()`` "
"und ``AND``/``OR`` nutzen::"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr "Verfügbare Attribute"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-"Eine ausführlichere Liste der verfügbaren Attribute finden Sie in unserer :"
-"docs:`Zammad System Dokumentation `."
+"Eine ausführlichere Liste der verfügbaren Attribute finden Sie in "
+"unserer :docs:`Zammad System Dokumentation `."
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Attribute und ihre Nutzung"
@@ -935,11 +933,11 @@ msgstr ""
"Zammad erlaubt zudem eine Suche mit regulären Ausdrücken, wo immer ein "
"Attribut dies zulässt."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr "Suchbegriffe kombinieren"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -955,7 +953,7 @@ msgstr ""
"ausschließen möchten, können Sie Suchbegriffe mit ``!`` negieren. Hier "
"finden Sie noch ein paar Beispiele, wie so etwas aussehen kann:"
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Beispiele für Suchphrasen-Kombinationen"
@@ -979,11 +977,11 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
#: ../advanced/search.rst:1
msgid ""
@@ -1010,11 +1008,11 @@ msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
"Zeige alles mit einem warten auf Status und einer Artikelanzahl von 1 bis 5."
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr "Einige Ticket Attribute und Typen"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
@@ -1022,128 +1020,128 @@ msgstr ""
"Anbei finden Sie eine Auflistung der wichtigsten Attribute, aufgeteilt in "
"Ticket und Artikel."
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr "Ticket Attribute"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "number: String"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "title: String"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr "group: Object (group.name, ...)"
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr "priority: Object (priority.name, ...)"
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr "state: Object (state.name, ...)"
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr "organization: Object (organization.name, ...)"
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr "owner: Objekt (owner.firstname, owner.lastname, owner.email, ...)"
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
"customer: Objekt (customer.firstname, customer.lastname, customer.email, ...)"
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr "first_response_at: Zeitstempel"
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
"first_response_in_min: ganze Zahl (Geschäfts-Minuten bis zur ersten Reaktion)"
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "close_at: Zeitstempel"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
"close_in_min: ganze Zahl (Geschäfts-Minuten bis Schließung des Tickets)"
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
"last_contact_at: Zeitstempel (Letzter Kontakt durch Kunden oder Agenten)"
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr "last_contact_agent_at: Zeitstempel (Letzter Kontakt durch Agenten)"
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr "last_contact_customer_at: Zeitstempel (Letzter Kontakt durch Kunden)"
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr "create_article_type.name: string (email|phone|web|...)"
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr "create_article_sender: String (Customer|Agent|System)"
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr "article_count: ganze Zahl"
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr "escalation_at: Zeitstempel"
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr "pending_time: Zeitstempel"
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr "Artikel Attribute"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr "article.from: String"
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr "article.to: String"
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr "article.cc: String"
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr "article.subject: String"
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr "article.body: String"
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr "article.attachment.title: string (Dateiname von Anhang)"
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr "article.attachment.content: string (Inhalt des Anhangs)"
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr "article.attachment.content_type: string (Dateityp z.B. PDF)"
@@ -1439,62 +1437,58 @@ msgstr "Tabs"
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-"Wenn Sie sich durchs Zammad klicken, erscheint eine Liste der Einträge im "
-"Hauptmenü. Diese sind Ihre **offenen Tabs.**"
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-"Sie können frei zwischen offenen Tabs wechseln, ohne dass Ihre Änderungen "
-"verloren gehen – alle nicht gespeicherten Änderungen werden automatisch auf "
-"dem Server gesichert."
+"Wenn Sie sich durch Zammad klicken, sehen Sie im Hauptmenübereich eine Liste "
+"von Einträgen erscheinen. Dies sind Ihre **geöffneten Tabs.** Sie können "
+"frei zwischen geöffneten Tabs wechseln, ohne dass Ihre Änderungen verloren "
+"gehen – alle nicht gespeicherten Änderungen werden automatisch auf dem "
+"Server gesichert."
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr "Beispielansicht von Tabs"
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
"Die Tabs erscheinen im Hauptmenü, wenn Sie verschiedene Bereiche der "
"Anwendung öffnen."
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr "**Welche Elemente werden in einem neuen \"Tab\" geöffnet?**"
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr "Vorhandene Tickets"
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr "Neue Tickets"
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr "Benutzer"
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr "Organisationen"
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr "Suchanfragen"
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️Tipp für Profi-Benutzer**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1536,7 +1530,7 @@ msgstr ""
"**Sofortige Maßnahme erforderlich** (Ticket wurde aufgrund einer SLA-"
"Verletzung eskaliert)"
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
@@ -1544,15 +1538,15 @@ msgstr ""
"Ein **pulsierender Punkt** bedeutet, dass in einem Ticket neue Aktivitäten "
"stattgefunden haben, seitdem Sie es zuletzt angesehen haben."
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr "Mit Drag & Drop können Sie die Tabs neu anordnen."
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr "Tab-Verhalten in Ticket-Zooms"
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1568,7 +1562,7 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr "Das Tab-Verhalten kann in Tickets manuell beeinflusst werden"
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
@@ -1577,11 +1571,11 @@ msgstr ""
"Voreinstellung Ihres Administrators zu übergehen. Zammad erinnert sich an "
"Ihre Auswahl bis Sie diese ändern."
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr "Tab schließen"
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
@@ -1589,11 +1583,11 @@ msgstr ""
"Beim Aktualisieren des Tickets wird Zammad das Tab automatisch schließen. "
"Die zuvor geöffnete Ansicht wird Ihnen angezeigt."
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr "Tab bei Ticketabschluss schließen"
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
@@ -1601,17 +1595,17 @@ msgstr ""
"Ticket tabs werden nur dann geschlossen, wenn Sie den Status zu "
"\"geschlossen\" ändern und das Ticket aktualisieren."
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
"Diese Einstellung hat keinen Einfluss auf warten Status die in geschlossenen "
"Status enden."
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr "Nächste in Übersicht"
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
@@ -1620,7 +1614,7 @@ msgstr ""
"nächsten Ticket der Übersicht springen. Das Tab wird von Zammad dabei wieder "
"verwendet."
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1634,14 +1628,26 @@ msgstr ""
msgid "Stay on tab"
msgstr "In Tab bleiben"
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr "Das Aktualisieren des Tickets hat keinen Einfluss auf das Tab."
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr "*Das ist die Standardeinstellung in Zammad-Installationen.*"
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+"Da Sie nun ein Experte in der Handhabung von Tabs sind, noch eine "
+"Information: Die maximale Anzahl von Tabs ist aus Leistungsgründen auf 30 "
+"begrenzt. Wenn Sie diese Grenze erreichen und einen weiteren Tab öffnen, "
+"wird der zuerst geöffnete Tab automatisch geschlossen."
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr "Arbeiten mit Text Bausteinen"
@@ -1736,8 +1742,8 @@ msgstr "Textbausteine anpassen"
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
"Administratoren können :admin-docs:`hier ` mehr "
"über das Anpassen von Textbausteinen erfahren."
@@ -1764,14 +1770,14 @@ msgstr "Tickets verknüpfen"
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
"Wenn Tickets zu verwandten Themen auftauchen, können sie miteinander "
"verknüpft werden, um den Bezug zu erleichtern. Dies kann zum Beispiel "
-"nützlich sein, wenn Sie mehrere Kundenbeschwerden zur selben Sendung haben. :"
-"doc:`Zusammengefasste ` und :doc:`abgespaltete ` Tickets "
-"werden automatisch verknüpft."
+"nützlich sein, wenn Sie mehrere Kundenbeschwerden zur selben Sendung "
+"haben. :doc:`Zusammengefasste ` und :doc:`abgespaltete ` "
+"Tickets werden automatisch verknüpft."
#: ../advanced/ticket-actions/link.rst:16
msgid "Link types"
@@ -1835,7 +1841,7 @@ msgstr ""
"2)."
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1903,36 +1909,38 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
"Nehmen wir an, Sie haben bereits an einem Ticket gearbeitet und erhalten ein "
"weiteres Ticket mit demselben Problem, das Sie zusammenführen möchten. "
"Nennen wir das Ticket, an dem Sie bereits gearbeitet haben, das *originale* "
-"Ticket und das neue Ticket *Duplikat*. In diesem Fall öffnen Sie das "
-"Duplikat und führen die Zusammenfassung von dort aus durch, damit es mit dem "
-"original Ticket zusammengeführt wird."
+"bzw. *Ziel-*Ticket und das neue Ticket *Duplikat* bzw. *Quelle*. In diesem "
+"Fall öffnen Sie das Duplikat und führen die Zusammenfassung von dort aus "
+"durch, damit es mit dem original Ticket zusammengeführt wird."
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr "Wie fasst man Tickets zusammen?"
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
"Um ein Ticket zusammenzufassen, öffnen Sie das Untermenü **Ticket ▾** im "
-"Ticketfenster."
+"Ticketfenster und wählen **Zusammenfassen**."
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr "Ticket-Menü mit hervorgehobenem \"Zusammenfassen\""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr "Dialog Zusammenfassen"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
@@ -1942,7 +1950,7 @@ msgstr ""
"aktuelle Ticket zusammenführen möchten (siehe 1). Alternativ können Sie aus "
"der Liste unten wählen (siehe 2)."
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1955,11 +1963,11 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr "Dialog zum Zusammenführen von Tickets"
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr "Ergebnis nach Zusammenfassung"
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
@@ -1968,18 +1976,34 @@ msgstr ""
"die Zusammenführung durchgeführt haben, besteht weiterhin mit den folgenden "
"Änderungen:"
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
-msgstr "Die Artikel wurden durch eine \"zusammengefasst\" Bezeichnung ersetzt"
+msgstr "Die Artikel wurden mit dem Text \"zusammengefasst\" ersetzt"
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr "Der Status hat sich auf \"zusammengefasst\" geändert"
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr "Das Ticket ist :doc:`verknüpft ` mit seinem \"Parent\" Ticket"
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+"Wenn Sie zwei Tickets zusammenfassen, die aus verschiedenen Kanälen erstellt "
+"wurden, müssen Sie über den Kanal des verbleibenden Zieltickets antworten."
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+"Beispiel: Wenn Sie ein Whatsapp Ticket in ein E-Mail Ticket zusammenfassen, "
+"müssen Sie im Zielticket über den E-Mail Kanal antworten."
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr "Tickets spalten"
@@ -2245,7 +2269,7 @@ msgstr "durch Suchen"
#: ../basics/find-ticket.rst:2
msgid "Finding Tickets"
-msgstr "Ticket Suche"
+msgstr "Tickets finden"
#: ../basics/find-ticket.rst:4
msgid ""
@@ -2686,8 +2710,9 @@ msgstr "Ticket-Zusammenfassung"
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
"Tickets sind Sammlungen aus Nachrichten- und Notiz-Beiträgen zu einem Kunden-"
"Anliegen. :doc:`⚙️ Ticketeinstellungen ` können im "
@@ -2698,8 +2723,8 @@ msgid ""
"Any time you open a ticket, a new entry will appear in your :doc:`tab list"
"advanced/tabs>` in the main menu."
msgstr ""
-"Jedes Mal, wenn Sie ein Ticket öffnen, erscheint ein neuer Eintrag in Ihrer :"
-"doc:`Tabliste` im Hauptmenü."
+"Jedes Mal, wenn Sie ein Ticket öffnen, erscheint ein neuer Eintrag in "
+"Ihrer :doc:`Tabliste` im Hauptmenü."
#: ../basics/service-ticket/follow-up.rst:26
msgid ""
@@ -3141,11 +3166,11 @@ msgid ""
msgstr ""
"Ohne Gruppen könnten alle zehn Agenten jedes Ticket sehen (und beantworten), "
"unabhängig für welche Abteilung es ist. Das muss nicht *per se* "
-"problematisch sein, führt aber zu unnötiger Unordnung in den :doc:"
-"`Übersichten ` . (Ein kritischeres Beispiel wäre es, "
-"wenn Mitarbeiter z.B. des Supports Nachrichten sehen könnten, die an die "
-"Geschäftsführung gehen sollten und so z.B. einsehen können, wie viel die "
-"Kollegen im Sales-Team verdienen 💸💸💸)"
+"problematisch sein, führt aber zu unnötiger Unordnung in "
+"den :doc:`Übersichten ` . (Ein kritischeres Beispiel "
+"wäre es, wenn Mitarbeiter z.B. des Supports Nachrichten sehen könnten, die "
+"an die Geschäftsführung gehen sollten und so z.B. einsehen können, wie viel "
+"die Kollegen im Sales-Team verdienen 💸💸💸)"
#: ../basics/service-ticket/settings/group.rst:25
msgid ""
@@ -3161,8 +3186,8 @@ msgstr "Gruppen verwalten"
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
"Sie können das nicht, das ist die Aufgabe Ihres :admin-docs:`Administrators "
"`."
@@ -3247,11 +3272,11 @@ msgid ""
"In such cases, a colleague may assign a ticket to you (or vice versa) after "
"it has been partially resolved."
msgstr ""
-"Manchmal, wenn Probleme komplizierter werden, kann es notwendig sein :ref:"
-"`Vorgänge zwischen mehreren Agenten hin und her zu schieben `, "
-"bevor ein Ticket abschlossen werden kann. In solchen Fällen kann es sein, "
-"dass Kollegen Ihnen ein Ticket zuweisen (oder anders herum), nachdem es "
-"bereits teilweise gelöst wurde."
+"Manchmal, wenn Probleme komplizierter werden, kann es notwendig "
+"sein :ref:`Vorgänge zwischen mehreren Agenten hin und her zu schieben "
+"`, bevor ein Ticket abschlossen werden kann. In solchen Fällen "
+"kann es sein, dass Kollegen Ihnen ein Ticket zuweisen (oder anders herum), "
+"nachdem es bereits teilweise gelöst wurde."
#: ../basics/service-ticket/settings/priority.rst:2
#: ../basics/zammad-glossary.rst:554
@@ -3294,11 +3319,11 @@ msgstr ":admin-docs:`Automatisierungen `."
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
-"Die Priorität kann auch als Ticketfilter bei der Erstellung von :admin-docs:"
-"`angepassten Übersichten ` verwendet werden."
+"Die Priorität kann auch als Ticketfilter bei der Erstellung von :admin-"
+"docs:`angepassten Übersichten ` verwendet werden."
#: ../basics/service-ticket/settings/priority.rst:28
msgid ""
@@ -3344,9 +3369,9 @@ msgstr "geschlossen"
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
"zusammengefasst (dieses Ticket wurde mit einem anderen Ticket "
"zusammengefasst. Für weitere Informationen überprüfen Sie :doc:`verlinkte "
@@ -4184,8 +4209,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
"Siehe unsere :admin-docs:`Admin-Dokumentation ` für alle Authentifizierungen durch Drittanbieter."
@@ -4363,9 +4388,9 @@ msgid ""
"Learn more on how to add Grafana dashboards for Zammad :docs:`in our "
"documentation `."
msgstr ""
-"Erfahren Sie mehr darüber, wie Sie Grafana-Dashboards für Zammad hinzufügen :"
-"docs:`in unserer System-Dokumentation ` ."
+"Erfahren Sie mehr darüber, wie Sie Grafana-Dashboards für Zammad "
+"hinzufügen :docs:`in unserer System-Dokumentation ` ."
#: ../basics/zammad-glossary.rst:338
msgid "Groups"
@@ -4906,8 +4931,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
"Die Prioritäten können sogar an Ihre Bedürfnisse angepasst oder erweitert "
"werden. Ihr Administrator kann weitere Informationen :admin-docs:`hier "
@@ -5016,14 +5041,14 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
"Der Scheduler ist eine der Automatisierungsfunktionen von Zammad. Ein "
"Administrator kann spezifische Bedingungen und Aktionen definieren, die auf "
"Tickets mit übereinstimmenden Bedingungen zeitbasiert angewendet werden. "
-"Weitere Informationen finden Sie in der Admin-Dokumentation im Abschnitt :"
-"admin-docs:`Automatisierung `."
+"Weitere Informationen finden Sie in der Admin-Dokumentation im "
+"Abschnitt :admin-docs:`Automatisierung `."
#: ../basics/zammad-glossary.rst:623
msgid "Sidebar"
@@ -5095,8 +5120,8 @@ msgid ""
"It can be customized by your admin. Further information can be found :admin-"
"docs:`here `."
msgstr ""
-"Sie kann von Ihrem Admin angepasst werden. Weitere Informationen finden Sie :"
-"admin-docs:`hier `."
+"Sie kann von Ihrem Admin angepasst werden. Weitere Informationen finden "
+"Sie :admin-docs:`hier `."
#: ../basics/zammad-glossary.rst:642
msgid "Sipgate"
@@ -5121,8 +5146,8 @@ msgid ""
"can learn more about this function on this page: :doc:`/extras/caller-log`"
msgstr ""
"Administratoren erfahren mehr über die `Sipgate CTI`-Integrationsseite. "
-"Agenten erfahren mehr über diese Funktionalität auf der folgenden Seite: :"
-"doc:`/extras/caller-log`"
+"Agenten erfahren mehr über diese Funktionalität auf der folgenden "
+"Seite: :doc:`/extras/caller-log`"
#: ../basics/zammad-glossary.rst:657
msgid "SLA"
@@ -5276,8 +5301,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
"Administratoren können mehr über Tags :admin-docs:`hier ` "
@@ -5302,11 +5327,11 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
-"Zum Beispiel, wir bei Zammad, haben einen Textbaustein mit der Abkürzung ``::"
-"üff``, welcher anwächst auf ``Über Feedback würde ich mich freuen``."
+"Zum Beispiel, wir bei Zammad, haben einen Textbaustein mit der Abkürzung "
+"``::üff``, welcher anwächst auf ``Über Feedback würde ich mich freuen``."
#: ../basics/zammad-glossary.rst:719
msgid ""
@@ -5374,8 +5399,8 @@ msgstr "Trigger"
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
"Trigger sind eine der Automatisierungsfunktionen von Zammad. Ein "
"Administrator kann bestimmte Bedingungen und Aktionen definieren, die auf "
@@ -5467,8 +5492,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
"Diese Funktion ist **optional**; wenn Sie sie nicht im Hauptmenü sehen, "
"bedeutet das, dass Ihr Administrator sie noch nicht aktiviert hat. "
@@ -5702,8 +5727,8 @@ msgid ""
"Click for chat configuration options (*e.g.,* auto-greetings and maximum "
"number of simultaneous chats)."
msgstr ""
-"Klicken Sie hier, um die Konfigurationsoptionen für den Chat anzuzeigen (*z."
-"B.* automatische Begrüßung und maximale Anzahl gleichzeitiger Chats)."
+"Klicken Sie hier, um die Konfigurationsoptionen für den Chat anzuzeigen "
+"(*z.B.* automatische Begrüßung und maximale Anzahl gleichzeitiger Chats)."
#: ../extras/chat.rst:36
msgid "**6. Count badge**"
@@ -6103,8 +6128,8 @@ msgstr ""
"Genau wie die :doc:`Ticket Priorität`, kann der **VIP Status** nichts ohne weitere Einstellungen "
"bewirken. Ein Admin *kann* automatisierte Systemkonfigurationen basierend "
-"auf diesem Wert einrichten oder dieses Attribut als Filter für :doc:"
-"`Übersichten` nutzen."
+"auf diesem Wert einrichten oder dieses Attribut als Filter "
+"für :doc:`Übersichten` nutzen."
#: ../extras/customers.rst:68
msgid ""
@@ -6245,8 +6270,8 @@ msgid ""
msgstr ""
"Diese Funktion ist **optional**; wenn Sie sie nicht im Ticketbereich sehen "
"bedeutet das, dass Ihr Administrator sie noch nicht aktiviert hat. "
-"Administratoren können mehr darüber :admin-docs:`hier ` erfahren."
+"Administratoren können mehr darüber :admin-docs:`hier ` erfahren."
#: ../extras/github-gitlab-integration.rst:16
msgid "Ticket detail view showing activated GitHub & GitLab function"
@@ -6792,8 +6817,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
"Die Rollen erfordern eine **Leseberechtigung für die Knowledge Base**. Ihr "
@@ -6866,12 +6891,11 @@ msgid ""
"insert formatted text, bullet lists, and more. You can even add file "
"attachments and links!"
msgstr ""
-"Der Wissensdatenbank-Editor ist mit den gleichen **Richtext-"
-"Bearbeitungsfunktionen** ausgestattet, die auch in der Zammad-Ticket-Maske "
-"zur Verfügung stehen. Das bedeutet, dass Sie dieselben :doc:"
-"`Tastenkombinationen ` verwenden können, um "
-"Text-Formatierungen, Aufzählungszeichen und mehr einzubinden. Es können "
-"sogar Dateianhänge und Links hinzugefügt werden!"
+"Der Knowledge Base-Editor ist mit den gleichen **Bearbeitungsfunktionen** "
+"ausgestattet, die auch in der Zammad-Ticket-Maske zur Verfügung stehen. Das "
+"bedeutet, dass Sie dieselben :doc:`Tastaturkürzel ` verwenden können, um Text-Formatierungen, Aufzählungszeichen und "
+"mehr zu nutzen. Es können sogar Dateianhänge und Links hinzugefügt werden!"
#: ../extras/knowledge-base.rst:206
msgid "Different link types"
@@ -7139,8 +7163,8 @@ msgid ""
"Mobile view provides you with a way to do your common Zammad daily tasks "
"while on the go:"
msgstr ""
-"Mit der mobilen Ansicht können Sie Ihre gewohnten Aufgaben in Zammad von "
-"unterwegs bearbeiten:"
+"Die Mobilansicht bietet Ihnen die Möglichkeit, Ihre täglichen Aufgaben mit "
+"Zammad auch unterwegs zu erledigen:"
#: ../extras/mobile-view.rst:117
msgid "Manage & use your ticket overviews"
@@ -7148,7 +7172,7 @@ msgstr "Verwalten und nutzen Sie Ihre Ticket-Übersichten"
#: ../extras/mobile-view.rst:118
msgid "Search for existing records"
-msgstr "Suche nach existierenden Einträgen"
+msgstr "Suche nach vorhandenen Datensätzen"
#: ../extras/mobile-view.rst:120
msgid "Reply in an already existing ticket"
@@ -7250,7 +7274,7 @@ msgstr ""
#: ../extras/mobile-view.rst:151
msgid "Reports"
-msgstr "Auswertungen"
+msgstr "Berichte"
#: ../extras/mobile-view.rst:156
msgid "Access"
@@ -7449,7 +7473,7 @@ msgstr "weitere Aktionen"
#: ../extras/profile-and-settings.rst:33
msgid "Dark mode"
-msgstr "Dark-Mode"
+msgstr "Dunkler Modus"
#: ../extras/profile-and-settings.rst:30
msgid "Quickly toggle dark and light mode without using keyboard bindings."
@@ -7509,7 +7533,7 @@ msgstr ""
#: ../extras/profile-and-settings.rst:54
msgid "Profile Settings"
-msgstr "Profil Einstellungen"
+msgstr "Profil-Einstellungen"
#: ../extras/profile-and-settings.rst:56
msgid "Clicking on \"Profile\" in the user menu opens the profile settings."
@@ -7687,9 +7711,9 @@ msgid ""
"created to help keep track of your tickets."
msgstr ""
"Ihr Vertreter erhält während Ihrer Abwesenheit alle Ihre "
-"Ticketbenachrichtigungen und er bekommt eine benutzerdefinierte :doc:"
-"`Übersicht`, um den Überblick über Ihre Tickets "
-"zu behalten."
+"Ticketbenachrichtigungen und er bekommt eine "
+"benutzerdefinierte :doc:`Übersicht`, um den "
+"Überblick über Ihre Tickets zu behalten."
#: ../extras/profile-and-settings.rst:146
msgid "You will receive notifications while you are absent."
@@ -7766,7 +7790,7 @@ msgstr ""
#: ../extras/profile-and-settings.rst:0
msgid "Token Access"
-msgstr "Token Zugriff"
+msgstr "Token-Zugriff"
#: ../extras/profile-and-settings.rst:181
msgid ""
@@ -8219,7 +8243,7 @@ msgstr ""
#: ../extras/shared-drafts.rst:2
msgid "Shared Drafts"
-msgstr "Geteilte Vorlagen"
+msgstr "Gemeinsame Entwürfe"
#: ../extras/shared-drafts.rst:7
msgid ""
@@ -8503,8 +8527,8 @@ msgid ""
"learn more :admin-docs:`here `."
msgstr ""
"Die Zwei-Faktor-Authentifizierung ist eine **optionale Funktion**. "
-"Administratoren finden :admin-docs:`hier ` weitere Informationen."
+"Administratoren finden :admin-docs:`hier ` weitere Informationen."
#: ../extras/two-factor-authentication.rst:15
msgid "Set Up Two-Factor Authentication"
@@ -8639,7 +8663,7 @@ msgstr ""
#: ../extras/two-factor-authentication.rst:97
msgid "Generate Recovery Codes"
-msgstr "Generierung von Wiederherstellungs-Codes"
+msgstr "Wiederherstellungs-Codes erzeugen"
#: ../extras/two-factor-authentication.rst:99
msgid ""
@@ -8647,7 +8671,7 @@ msgid ""
"if you lose access to your other two-factor authentication methods. They can "
"only be used as a **backup method**."
msgstr ""
-"Wiederherstellungscodes sind einmalig verwendbare Sicherheitscodes, mit "
+"Wiederherstellungs-Codes sind einmalig verwendbare Sicherheitscodes, mit "
"denen Sie sich anmelden können, wenn Sie den Zugriff auf Ihre anderen Zwei-"
"Faktor-Authentifizierungsmethoden verlieren. Sie können nur als **Backup-"
"Methode** verwendet werden."
@@ -8742,13 +8766,13 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
"Sie werden abhängig von der gewählten Zwei-Faktor-Methode nochmal durch den "
"Einrichtungs-Prozess geführt. Im Normalfall ersetzt eine bearbeitete Methode "
"die bisherige Konfiguration, aber manche Methoden unterstützen erweiterte "
-"Funktionen (z.B. mehrere Security Tokens)."
+"Funktionen (z.B. mehrere Sicherheits-Schlüssel)."
#: ../extras/two-factor-authentication.rst:156
msgid "Remove a Two-Factor Method"
@@ -8797,8 +8821,8 @@ msgid ""
"Choose a method of your choice, and then follow its :ref:`setup guide `."
msgstr ""
-"Wählen Sie die von Ihnen bevorzugte Methode und folgen Sie der :ref:"
-"`Einrichtungsanleitung `."
+"Wählen Sie die von Ihnen bevorzugte Methode und folgen Sie "
+"der :ref:`Einrichtungsanleitung `."
#: ../extras/two-factor-authentication.rst:183
msgid ""
@@ -9129,13 +9153,20 @@ msgstr "Zammad Benutzer Dokumentation"
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
-"Sie lesen gerade die Benutzerdokumentation von Zammad. Es sind außerdem :"
-"docs:`System- ` und :admin-docs:`Admin-Dokumentationen ` verfügbar."
+"Sie lesen gerade die Benutzerdokumentation von Zammad. Es sind "
+"außerdem :docs:`System- ` und :admin-docs:`Admin-"
+"Dokumentationen ` verfügbar."
+
+#~ msgid ""
+#~ "As you click through Zammad, you will see a list of entries appear in the "
+#~ "main menu area. These are your **open tabs.**"
+#~ msgstr ""
+#~ "Wenn Sie sich durchs Zammad klicken, erscheint eine Liste der Einträge im "
+#~ "Hauptmenü. Diese sind Ihre **offenen Tabs.**"
#~ msgid "**Closed**"
#~ msgstr "**Geschlossen**"
@@ -9410,8 +9441,9 @@ msgstr ""
#~ "on a single ticket ` instead.)"
#~ msgstr ""
#~ "In solchen Fällen können Sie **eine einzelne Nachricht in ein eigenes "
-#~ "Ticket abspalten**. (Alternativ kann es auch sinnvoller sein :ref:"
-#~ "`einfach abwechselnd mit einem Ticket zu arbeiten `.)"
+#~ "Ticket abspalten**. (Alternativ kann es auch sinnvoller "
+#~ "sein :ref:`einfach abwechselnd mit einem Ticket zu arbeiten `.)"
#~ msgid ""
#~ "Click the “split” button to take a message and use it as the starting "
@@ -9753,8 +9785,8 @@ msgstr ""
#~ msgstr ""
#~ "Diese Funktion ist **optional**; wenn Sie diese bei der Ticket "
#~ "Bearbeitung nicht sehen, bedeutet das, dass Ihr Administrator sie noch "
-#~ "nicht aktiviert hat. Administratoren können `hier `_ mehr erfahren."
+#~ "nicht aktiviert hat. Administratoren können `hier `_ mehr erfahren."
#~ msgid "What is S/MIME?"
#~ msgstr "Was ist S/MIME?"
@@ -9851,8 +9883,8 @@ msgstr ""
#~ msgstr ""
#~ "Diese Funktion ist **optional**; wenn Sie diese nicht sehen, sobald Sie "
#~ "ein Ticket aktualisieren, bedeutet das, dass Ihr Administrator sie noch "
-#~ "nicht aktiviert hat. Administratoren können `hier `_ mehr erfahren."
+#~ "nicht aktiviert hat. Administratoren können `hier `_ mehr erfahren."
#~ msgid "Password"
#~ msgstr "Passwort"
diff --git a/locale/es/LC_MESSAGES/user-docs.po b/locale/es/LC_MESSAGES/user-docs.po
index e06a7091..48194aaa 100644
--- a/locale/es/LC_MESSAGES/user-docs.po
+++ b/locale/es/LC_MESSAGES/user-docs.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
-"PO-Revision-Date: 2023-09-20 14:18+0000\n"
-"Last-Translator: Arturo \n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
+"PO-Revision-Date: 2025-10-11 17:00+0000\n"
+"Last-Translator: Eduardo Mosqueda \n"
"Language-Team: Spanish \n"
+"documentations/user-documentation-latest/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.11.4\n"
#: ../advanced/keyboard-shortcuts.rst:2
msgid "Keyboard Shortcuts"
@@ -558,8 +558,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -584,9 +584,9 @@ msgstr ""
#: ../advanced/macros.rst:10
#, fuzzy
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
"Agentes no crean los macros - ese es el papel del `administrador `_. Si tiene una idea "
@@ -723,18 +723,20 @@ msgstr ""
"su búsqueda."
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+#, fuzzy
+#| msgid ""
+#| "For instance you can search for a specific customer by using "
+#| "``customer.attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-"Por ejemplo, puede buscar un cliente específico utilizando ``customer."
-"attribute``::"
+"Por ejemplo, puede buscar un cliente específico utilizando "
+"``customer.attribute``::"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "o::"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
#, fuzzy
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
@@ -743,20 +745,20 @@ msgstr ""
"Si desea realizar una búsqueda más compleja, puede utilizar condiciones a "
"través de los operadores ``()`` y ``AND``/``OR``::"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
#, fuzzy
#| msgid "Available attributes"
msgid "Available Attributes"
msgstr "Atributos disponibles"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Atributos y su utilización"
@@ -770,7 +772,7 @@ msgstr "valores posibles"
#: ../advanced/search.rst:1
msgid "Example"
-msgstr "ejemplo"
+msgstr "Ejemplo"
#: ../advanced/search.rst:1
msgid "Description"
@@ -930,12 +932,12 @@ msgstr ""
"similares como por ejemplo \"head\". Zammad también te permitirá usar "
"expresiones regulares, siempre que los atributos lo permitan."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
#, fuzzy
msgid "Combining Search Phrases"
msgstr "Frase de búsqueda"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -945,7 +947,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Ejemplos de combinaciones de frases de búsqueda"
@@ -968,8 +970,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -996,144 +998,144 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
#, fuzzy
#| msgid "Attributes and their usuage"
msgid "Some Ticket Attributes and Their Type"
msgstr "Atributos y su utilización"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
#, fuzzy
#| msgid "Attribute"
msgid "Ticket Attributes"
msgstr "Atributo"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "number: cadena"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "title: cadena"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr "owner: objeto (owner.firstname, owner.lastname, owner.email, ...)"
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
"customer: objeto (customer.firstname, customer.lastname, customer.email, ...)"
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr "first_response_at: marca de tiempo"
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
"first_response_in_min: entero (minutos de negocio antes de la primera "
"respuesta)"
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "close_at: marca de tiempo"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr "close_in_min: entero (minutos de negocio hasta el cierre)"
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
"last_contact_at: marca de tiempo (último contacto por cliente o agente)"
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr "last_contact_agent_at: marca de tiempo (último contacto por agente)"
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
#, fuzzy
#| msgid "Available attributes"
msgid "Article Attributes"
msgstr "Atributos disponibles"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1365,55 +1367,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ Interfaz de usuario: Surgerencia pro**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1451,21 +1449,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1477,47 +1475,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1528,14 +1526,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1607,8 +1613,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1630,8 +1636,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1682,7 +1688,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1733,36 +1739,38 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
#, fuzzy
msgid "Merge dialog"
msgstr "Macros"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1772,28 +1780,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2371,8 +2391,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2730,8 +2751,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2836,8 +2857,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2877,9 +2898,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3501,8 +3522,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4042,8 +4063,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4130,8 +4151,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4328,8 +4349,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4347,8 +4368,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4402,8 +4423,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4479,8 +4500,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -4756,7 +4777,7 @@ msgstr ""
#: ../extras/checklist.rst:5
msgid "General"
-msgstr ""
+msgstr "General"
#: ../extras/checklist.rst:7
msgid ""
@@ -4776,7 +4797,7 @@ msgstr ""
#: ../extras/checklist.rst:18
msgid "Usage"
-msgstr ""
+msgstr "Uso"
#: ../extras/checklist.rst:21 ../index.rst:9
msgid "Basics"
@@ -5529,8 +5550,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7131,8 +7152,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7427,9 +7448,9 @@ msgstr "Documentación del Agente de Zammad"
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
#, fuzzy
diff --git a/locale/es_CO/LC_MESSAGES/user-docs.po b/locale/es_CO/LC_MESSAGES/user-docs.po
index 305dcff8..ada000ab 100644
--- a/locale/es_CO/LC_MESSAGES/user-docs.po
+++ b/locale/es_CO/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -529,8 +529,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -550,9 +550,9 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -654,33 +654,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -833,11 +831,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -847,7 +845,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -868,8 +866,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -894,134 +892,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr ""
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1252,55 +1250,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1338,21 +1332,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1364,47 +1358,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1415,14 +1409,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1494,8 +1496,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1517,8 +1519,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1569,7 +1571,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1620,35 +1622,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1658,28 +1662,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2251,8 +2267,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2610,8 +2627,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2716,8 +2733,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2757,9 +2774,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3381,8 +3398,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3922,8 +3939,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4010,8 +4027,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4206,8 +4223,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4225,8 +4242,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4279,8 +4296,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4356,8 +4373,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5405,8 +5422,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -6972,8 +6989,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7267,7 +7284,7 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
diff --git a/locale/es_MX/LC_MESSAGES/user-docs.po b/locale/es_MX/LC_MESSAGES/user-docs.po
index 9c5f2c6c..a0b02883 100644
--- a/locale/es_MX/LC_MESSAGES/user-docs.po
+++ b/locale/es_MX/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -529,8 +529,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -550,9 +550,9 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -654,33 +654,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -833,11 +831,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -847,7 +845,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -868,8 +866,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -894,134 +892,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr ""
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1252,55 +1250,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1338,21 +1332,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1364,47 +1358,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1415,14 +1409,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1494,8 +1496,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1517,8 +1519,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1569,7 +1571,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1620,35 +1622,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1658,28 +1662,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2251,8 +2267,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2610,8 +2627,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2716,8 +2733,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2757,9 +2774,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3381,8 +3398,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3922,8 +3939,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4010,8 +4027,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4206,8 +4223,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4225,8 +4242,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4279,8 +4296,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4356,8 +4373,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5405,8 +5422,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -6972,8 +6989,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7267,7 +7284,7 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
diff --git a/locale/fa/LC_MESSAGES/user-docs.po b/locale/fa/LC_MESSAGES/user-docs.po
index 44555b7a..5cb6e8f2 100644
--- a/locale/fa/LC_MESSAGES/user-docs.po
+++ b/locale/fa/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2024-11-19 05:00+0000\n"
"Last-Translator: sesoltani \n"
"Language-Team: Persian `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -657,33 +657,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -836,11 +834,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -850,7 +848,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -871,8 +869,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -897,134 +895,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr ""
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1255,55 +1253,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1341,21 +1335,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1367,47 +1361,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1418,14 +1412,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1497,8 +1499,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1520,8 +1522,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1572,7 +1574,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1623,35 +1625,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1661,28 +1665,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2254,8 +2270,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2613,8 +2630,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2719,8 +2736,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2760,9 +2777,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3384,8 +3401,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3925,8 +3942,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4013,8 +4030,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4209,8 +4226,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4228,8 +4245,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4282,8 +4299,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4359,8 +4376,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5408,8 +5425,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -6975,8 +6992,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7270,7 +7287,7 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/user-docs.po b/locale/fr/LC_MESSAGES/user-docs.po
index 32869fcf..4e9f4dfd 100644
--- a/locale/fr/LC_MESSAGES/user-docs.po
+++ b/locale/fr/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2024-10-07 17:00+0000\n"
"Last-Translator: Misha \n"
"Language-Team: French `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
"Les macros peuvent être créées par votre :admin-docs:`administrateur "
"manage/macros.html>`. Si vous avez une idée d'une macro que vous aimeriez "
@@ -729,18 +729,20 @@ msgstr ""
"aideront à améliorer vos résultats de recherche."
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+#, fuzzy
+#| msgid ""
+#| "For instance you can search for a specific customer by using "
+#| "``customer.attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
"Par exemple, vous pouvez rechercher un client spécifique en utilisant "
"``customer.attribute``::"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "ou::"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
@@ -748,11 +750,11 @@ msgstr ""
"Si vous voulez effectuer une recherche plus complexe, vous pouvez utiliser "
"des conditions avec ``()`` et les options ``AND``/``OR``::"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr "Attributs disponibles"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Les attributs et leurs usages"
@@ -936,11 +938,11 @@ msgstr ""
"similaires comme par ex \\\"chaux\\\". Zammad pourra aussi vous permettre "
"d'utiliser des expressions régulières dès que les attributs le permettent."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr "Combiner des phrases de recherche"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -958,7 +960,7 @@ msgstr ""
"négation ``!``. Voici ci-dessous quelques exemples que vous pourriez "
"utiliser avec ceci :"
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Exemples de recherche de combinaisons de phrases"
@@ -981,8 +983,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -1010,11 +1012,11 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr "Affiche tout ce qui aurait l'état en attente et avec 1 à 5 articles."
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr "Quelques attributs de ticket et leurs types"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
@@ -1022,129 +1024,129 @@ msgstr ""
"Ci-dessous vous pouvez trouver les attributs les plus importants triés par "
"ticket et article."
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr "Attributs du ticket"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "number : chaîne"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "title : chaîne"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr "owner : objet (owner.firstname, owner.lastname, owner.email, ...)"
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
"customer : objet (customer.firstname, customer.lastname, customer.email, ...)"
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr "first_response_at : horodatage"
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
"first_response_in_min : entier (minutes ouvrées avant première réponse)"
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "close_at : horodatage"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr "close_in_min : entier (minutes ouvrées avant fermeture)"
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
"last_contact_at : horodatage (dernier contact par le client ou un opérateur)"
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr "last_contact_agent_at : horodatage (dernier contact par un opérateur)"
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr "last_contact_customer_at : horodatage (dernier contact par le client)"
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
#, fuzzy
#| msgid "create_article_type: string (email|phone|web|...)"
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr "create_article_type : chaîne (email|phone|web|...)"
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr "create_article_sender : chaîne (Customer|Agent|System)"
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr "article_count : entier"
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr "escalation_at : horodatage"
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr "pending_time : horodatage"
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr "Attributs de l'article"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr "article.from : chaîne"
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr "article.to : chaîne"
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr "article.cc : chaîne"
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr "article.subject : chaîne"
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr "article.body : chaîne"
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr "article.attachment.title : chaîne (nom du fichier en pièce jointe)"
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr "article.attachment.content : chaîne (contenu de la pièce jointe)"
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr "article.attachment.content_type : chaîne (type du fichier e.g. PDF)"
@@ -1172,9 +1174,9 @@ msgid ""
"in two `, then assign each ticket to its "
"respective “group” (department)."
msgstr ""
-"Si un ticket concerne vraiment deux problèmes différents, vous pouvez :doc:"
-"`le diviser en deux`, et assigner ensuite "
-"chaque ticket dans son \"groupe\" respectif (département)."
+"Si un ticket concerne vraiment deux problèmes différents, vous "
+"pouvez :doc:`le diviser en deux`, et "
+"assigner ensuite chaque ticket dans son \"groupe\" respectif (département)."
#: ../advanced/suggested-workflows.rst:16
msgid ""
@@ -1444,64 +1446,62 @@ msgid "Tabs"
msgstr "Onglets"
#: ../advanced/tabs.rst:4
+#, fuzzy
+#| msgid ""
+#| "You can freely switch between open tabs without losing your work - all "
+#| "unsaved changes are automatically backed up to the server."
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-"En parcourant Zammad, vous remarquerez une liste d'entrées apparaitre dans "
-"la zone du menu principal. Ce sont vos **onglets ouverts.**"
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
"Vous pouvez librement basculer entre les onglets ouverts sans perdre votre "
"travail – Tous les changements non sauvegardés sont automatiquement "
"enregistrés sur le serveur."
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr "Vue d'exemple des onglets"
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
"Des onglets apparaissent dans le menu principal quand vous visitez "
"différentes parties de l'application."
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr "**Quels éléments ouvrent un nouvel \"onglet\"?**"
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr "Tickets existants"
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr "Nouveaux tickets"
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr "Utilisateurs"
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr "Sociétés"
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr "Omnisearch"
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ UI Protip**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1541,7 +1541,7 @@ msgstr "|red|"
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
@@ -1549,15 +1549,15 @@ msgstr ""
"Un **point clignotant** signifie un ticket avec une nouvelle activité depuis "
"son dernier affichage."
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr "Glisser et déposer des onglets pour les réorganiser."
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr "Comportement des onglets dans les détails d'un ticket"
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1573,7 +1573,7 @@ msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
"Le comportement des onglets peut être ajuste depuis les tickets manuellement"
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
@@ -1582,11 +1582,11 @@ msgstr ""
"ce que vous préférez. Zammad se souviendra de votre préférence jusqu'à ce "
"que vous en changiez."
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr "Fermer l'onglet"
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
@@ -1594,11 +1594,11 @@ msgstr ""
"A la mise à jour du ticket, Zammad fermera automatiquement l'onglet. Vous "
"serez renvoyé au dernier aperçu ouvert."
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr "Fermer l'onglet à la fermeture du ticket"
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
@@ -1606,15 +1606,15 @@ msgstr ""
"L'onglet du ticket se fermera seulement si vous fermez le ticket lors de sa "
"mise à jour."
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr "Cela ne s'applique pas pour les états en attente de clôture."
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr "Suivant dans la vue"
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
@@ -1622,7 +1622,7 @@ msgstr ""
"Si vous ouvrez un ticket depuis une vue, Zammad ira au prochain ticket dans "
"la vue en question. Dans le même onglet."
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1636,14 +1636,22 @@ msgstr ""
msgid "Stay on tab"
msgstr "Rester sur l'onglet"
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr "Modifier un ticket n'a aucun effet sur l'onglet."
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr "*Ceci est le paramétrage par défaut des installations Zammad.*"
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr "Travailler avec les modules de texte"
@@ -1738,8 +1746,8 @@ msgstr "Personnaliser les modules de texte"
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
"Les administrateurs peuvent en savoir plus sur la personnalisation des "
"modules de texte :admin-docs:`ici `."
@@ -1766,8 +1774,8 @@ msgstr "Lier des tickets"
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
"Lorsque des tickets au sujet du même problème arrivent, ils peuvent être "
"liés à tous les autres pour plus de traçabilité. Par exemple cela est "
@@ -1836,7 +1844,7 @@ msgstr ""
"Autrement, vous pouvez aussi choisir dans la liste ci-dessous (voir 2)."
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1899,12 +1907,19 @@ msgstr ""
"lequel vous êtes vers celui que vous avez sélectionné."
#: ../advanced/ticket-actions/merge.rst:16
+#, fuzzy
+#| msgid ""
+#| "Let's assume you already worked on a ticket and you get another ticket "
+#| "about the same issue and want to merge them. Let's call the ticket you "
+#| "already worked on the *original* one and the new one *duplicate*. Then "
+#| "the way to go is to open the duplicate ticket and execute the merging "
+#| "from there so it will be merged into the original."
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
"Supposons que vous ayez déjà travaillé sur un ticket, que vous en receviez "
"un autre concernant le même problème et que vous souhaitiez les fusionner. "
@@ -1912,12 +1927,17 @@ msgstr ""
"et le nouveau ticket *duplicate*. Il faut alors ouvrir le ticket dupliqué et "
"exécuter la fusion à partir de là pour qu'il soit fusionné avec l'original."
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr "Comment fusionner des tickets ?"
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+#, fuzzy
+#| msgid ""
+#| "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
"Pour fusionner un ticket, accédez au sous-menu **Ticket ▾** dans le panneau "
"du ticket."
@@ -1926,11 +1946,11 @@ msgstr ""
msgid "Ticket menu with highlighted \"merge\""
msgstr "Menu du ticket avec la mention \"fusionné\" remarquable"
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr "Panneau de fusion"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
@@ -1940,7 +1960,7 @@ msgstr ""
"fusionner le ticket actuel (voir 1). Vous pouvez également faire votre choix "
"dans la liste ci-dessous (voir 2)."
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1952,11 +1972,11 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr "Boîte de dialogue de fusion de ticket"
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr "Résultat après fusion"
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
@@ -1965,18 +1985,30 @@ msgstr ""
"vous avez effectué la fusion existe toujours avec les modifications "
"suivantes :"
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr "Les articles ont été remplacés par une étiquette \"fusionné\""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr "L'état a été changé en \"fusionné\""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr "Le ticket original est :doc:`lié ` au ticket \"parent\""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr "Scinder des tickets"
@@ -2647,8 +2679,9 @@ msgstr "Vue du résumé des tickets"
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
"Les tickets sont des fils de messages & notes concernant une demande d'un "
"client. :doc:`⚙️ Gérer les paramètres d'un ticket ` dans le "
@@ -3070,8 +3103,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
"Que dois-je faire pour choisir mon équipe ? Vous ne faites rien - C'est le "
"travail :admin-docs:`de l'administrateur `."
@@ -3142,8 +3175,8 @@ msgid ""
"ticket/settings/group>`."
msgstr ""
"En principe, n'importe quel opérateur peut assigner un ticket à un autre, du "
-"moment qu'ils ont tous les deux les privilèges nécessaires dans l':doc:"
-"`équipe ` du ticket."
+"moment qu'ils ont tous les deux les privilèges nécessaires dans "
+"l':doc:`équipe ` du ticket."
#: ../basics/service-ticket/settings/owner.rst:21
msgid "Why Would I Want to Re-assign a Ticket to Someone Else?"
@@ -3202,8 +3235,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -3247,9 +3280,9 @@ msgstr "fermé"
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3360,8 +3393,8 @@ msgid ""
msgstr ""
":doc:`Pour rechercher des tickets avec une étiquette donnée ` avec le filtre de recherche ``tags:``. Par exemple, pour "
-"trouver tous les tickets avec l'étiquette **commande** en cherchant : ``tags:"
-"commande``."
+"trouver tous les tickets avec l'étiquette **commande** en cherchant : "
+"``tags:commande``."
#: ../basics/what-is-a-ticket.rst:2
msgid "What is a Ticket?"
@@ -3934,8 +3967,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4476,8 +4509,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4564,8 +4597,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4767,8 +4800,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4786,8 +4819,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4842,8 +4875,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4919,8 +4952,8 @@ msgstr "Voir et gérer les journaux d'appels depuis le panneau **téléphone**."
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5170,8 +5203,8 @@ msgstr ""
msgid ""
"⌨️ Live chat supports :admin-docs:`text modules `."
msgstr ""
-"⌨️ Les discussions en direct supportent les `text modules `_."
+"⌨️ Les discussions en direct supportent les `text modules `_."
#: ../extras/chat.rst:50
#, fuzzy
@@ -5461,8 +5494,8 @@ msgid ""
"Customers may (optionally) belong to **organizations** – :doc:`skip ahead "
"` to learn more."
msgstr ""
-"Les clients peuvent (optionnellement) appartenir à des **société** – :doc:"
-"`Aller à ` pour en apprendre davantage."
+"Les clients peuvent (optionnellement) appartenir à des **société** "
+"– :doc:`Aller à ` pour en apprendre davantage."
#: ../extras/customers.rst:0
#, fuzzy
@@ -6078,8 +6111,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7749,8 +7782,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -8045,11 +8078,18 @@ msgstr "Documentation Utilisateur de Zammad"
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
+#~ msgid ""
+#~ "As you click through Zammad, you will see a list of entries appear in the "
+#~ "main menu area. These are your **open tabs.**"
+#~ msgstr ""
+#~ "En parcourant Zammad, vous remarquerez une liste d'entrées apparaitre "
+#~ "dans la zone du menu principal. Ce sont vos **onglets ouverts.**"
+
#~ msgid "**Closed**"
#~ msgstr "**Fermé**"
@@ -8274,8 +8314,8 @@ msgstr ""
#~ msgstr ""
#~ "C'est à dire, si vous 1) accédez au dialogue de fusion depuis le Ticket "
#~ "A, et qu'ensuite 2) vous choisissez le Ticket B dans le dialogue de "
-#~ "fusion (voir ci-dessous), alors le Ticket A sera vidé, fermé, et and :doc:"
-#~ "`linked as a child ` du Ticket B."
+#~ "fusion (voir ci-dessous), alors le Ticket A sera vidé, fermé, et "
+#~ "and :doc:`linked as a child ` du Ticket B."
#~ msgid ""
#~ "The merge dialog. Specify a ticket to merge into by ID (1), or select one "
diff --git a/locale/fr_CA/LC_MESSAGES/user-docs.po b/locale/fr_CA/LC_MESSAGES/user-docs.po
index e2996668..ce51d518 100644
--- a/locale/fr_CA/LC_MESSAGES/user-docs.po
+++ b/locale/fr_CA/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2022-04-16 15:56+0000\n"
"Last-Translator: Marcel Herrguth \n"
"Language-Team: French (Canada) `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -684,35 +684,33 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
#, fuzzy
#| msgid "Available attributes"
msgid "Available Attributes"
msgstr "Attributs disponibles"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Attributs et leur utilisation"
@@ -888,12 +886,12 @@ msgstr ""
"similaires comme par ex: \"head\". Zammad vous permet également d'utiliser "
"des expressions régulières, partout où les attributs le permettent."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
#, fuzzy
msgid "Combining Search Phrases"
msgstr "Expression de recherche"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -903,7 +901,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Exemples de combinaisons d'expressions de recherche"
@@ -926,8 +924,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -956,13 +954,13 @@ msgstr ""
"Affiche tout avec n'importe quel état En attente et un nombre d'articles de "
"1 à 5."
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
#, fuzzy
#| msgid "Some Ticket attributes and their type"
msgid "Some Ticket Attributes and Their Type"
msgstr "Quelques attributs de billet et leur type"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
@@ -970,131 +968,131 @@ msgstr ""
"Vous trouverez ci-dessous les attributs les plus importants triés par billet "
"et article."
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
#, fuzzy
#| msgid "Ticket attributes"
msgid "Ticket Attributes"
msgstr "Attributs d'un billet"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "number: string"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "title: string"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr "first_response_at: timestamp"
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr "first_response_in_min: integer (business min till first response)"
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "close_at: timestamp"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr "close_in_min: integer (business min till close)"
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr "last_contact_at: timestamp (last contact by customer or agent)"
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr "last_contact_agent_at: timestamp (last contact by agent)"
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr "last_contact_customer_at: timestamp (last contact by customer)"
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
#, fuzzy
#| msgid "create_article_type: string (email|phone|web|...)"
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr "create_article_type: string (email|phone|web|...)"
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr "create_article_sender: string (Customer|Agent|System)"
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr "article_count: integer"
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr "escalation_at: timestamp"
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr "pending_time: timestamp"
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
#, fuzzy
#| msgid "Article attributes"
msgid "Article Attributes"
msgstr "Attributs d'un article"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr "article.from: string"
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr "article.to: string"
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr "article.cc: string"
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr "article.subject: string"
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr "article.body: string"
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr "article.attachment.title: string (filename of attachment)"
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr "article.attachment.content: string (content of attachment)"
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr "article.attachment.content_type: string (File type e.g. PDF)"
@@ -1340,66 +1338,60 @@ msgid "Tabs"
msgstr "Onglets"
#: ../advanced/tabs.rst:4
-msgid ""
-"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-"Lorsque vous cliquez sur Zammad, une liste d'entrées apparaît dans la zone "
-"du menu principal. Ce sont vos **onglets ouverts**."
-
-#: ../advanced/tabs.rst:7
#, fuzzy
msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"As you click through Zammad, you will see a list of entries appear in the "
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
"Vous pouvez basculer librement entre les onglets ouverts sans perdre votre "
"travail - toutes les modifications non enregistrées sont automatiquement "
"sauvegardées sur le serveur."
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
"Des onglets apparaissent dans le menu principal lorsque vous visitez "
"différentes parties de l'application."
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
#, fuzzy
msgid "**What items open in a new “tab”?**"
msgstr "Quels éléments s'ouvrent dans un nouvel \"onglet\" ?"
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr "Billets existants"
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr "Nouveaux billets"
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr "Utilisateurs"
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr "Organisations"
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr "Omnisearch"
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ UI Protip**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1437,7 +1429,7 @@ msgstr "|red|"
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
@@ -1445,15 +1437,15 @@ msgstr ""
"Un **point clignottant** signifie qu'un billet a reçu une nouvelle activité "
"depuis votre dernière consultation."
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr "Glisser et déposer les onglets pour les réorganiser."
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1465,47 +1457,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1516,14 +1508,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr "Travailler avec les modules de texte"
@@ -1626,8 +1626,8 @@ msgstr "Travailler avec les modules de texte"
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1649,8 +1649,8 @@ msgstr "Lier des billets"
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1703,7 +1703,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1760,18 +1760,23 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
#, fuzzy
msgid "How to merge tickets?"
msgstr "Recherche de billets"
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+#, fuzzy
+#| msgid ""
+#| "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
"Pour fusionner un billet, accédez au sous-menu **Billet ▾ ** dans le volet "
"du billet."
@@ -1780,19 +1785,19 @@ msgstr ""
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
#, fuzzy
msgid "Merge dialog"
msgstr "Nouveaux billets"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1802,31 +1807,43 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
#, fuzzy
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
"Le billet d'origine est :doc:`linked ` au nouveau, comme vu dans le panneau "
"des billet."
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr "Fractionnement des billets"
@@ -2439,8 +2456,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2801,8 +2819,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2907,8 +2925,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2948,9 +2966,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3576,8 +3594,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4117,8 +4135,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4205,8 +4223,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4405,8 +4423,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4424,8 +4442,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4480,8 +4498,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4558,8 +4576,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5611,8 +5629,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7201,8 +7219,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7496,11 +7514,18 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
+#~ msgid ""
+#~ "As you click through Zammad, you will see a list of entries appear in the "
+#~ "main menu area. These are your **open tabs.**"
+#~ msgstr ""
+#~ "Lorsque vous cliquez sur Zammad, une liste d'entrées apparaît dans la "
+#~ "zone du menu principal. Ce sont vos **onglets ouverts**."
+
#~ msgid "**Closed**"
#~ msgstr "**Fermés**"
@@ -7593,8 +7618,8 @@ msgstr ""
#~ msgstr ""
#~ "Autrement dit, si vous 1) accédez à la boîte de dialogue de fusion à "
#~ "partir du billet A, puis 2) sélectionnez le billet B dans la boîte de "
-#~ "dialogue de fusion (voir ci-dessous), le billet A sera vidé, fermé et :"
-#~ "doc:`linked as a child ` du billet B."
+#~ "dialogue de fusion (voir ci-dessous), le billet A sera vidé, fermé "
+#~ "et :doc:`linked as a child ` du billet B."
#~ msgid ""
#~ "The merge dialog. Specify a ticket to merge into by ID (1), or select one "
diff --git a/locale/hr/LC_MESSAGES/user-docs.po b/locale/hr/LC_MESSAGES/user-docs.po
index 93928627..d65f9aff 100644
--- a/locale/hr/LC_MESSAGES/user-docs.po
+++ b/locale/hr/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2022-06-15 14:40+0000\n"
"Last-Translator: Ivan Perovic \n"
"Language-Team: Croatian `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
"Vi kao korisnik to ne možete - to je`posao administratora `_. Ukoliko imate ideju za "
@@ -725,18 +725,20 @@ msgstr ""
"Dolje navedene informacije Vam mogu pomoći poboljšati rezultate pretrage."
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+#, fuzzy
+#| msgid ""
+#| "For instance you can search for a specific customer by using "
+#| "``customer.attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
"Na primjer, možete koristiti ``customer.attribute`` prilikom traženja "
"određenog korisnika::"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "ili::"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
#, fuzzy
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
@@ -745,13 +747,13 @@ msgstr ""
"Ukoliko želite opsežnije pretraživati, možete koristiti parametre sa ``()`` "
"i ``AND``/``OR`` opcijama::"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
#, fuzzy
#| msgid "Available attributes"
msgid "Available Attributes"
msgstr "Dostupni atributi"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
#, fuzzy
msgid ""
"For a more detailed list of available attributes please take a look into "
@@ -762,7 +764,7 @@ msgstr ""
"dokumentaciju `_"
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Atributi i njihovo korištenje"
@@ -939,12 +941,12 @@ msgstr ""
"možda pogrešno napisane npr. vrućina - vručina. Zammad Vam također omogućava "
"korištenje normalnih izraza, gdje god to atributi dopuštaju."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
#, fuzzy
msgid "Combining Search Phrases"
msgstr "**Kombiniranje fraza za pretraživanje**"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -954,7 +956,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -975,8 +977,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -1001,140 +1003,140 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
#, fuzzy
#| msgid "Attributes and their usuage"
msgid "Some Ticket Attributes and Their Type"
msgstr "Atributi i njihovo korištenje"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
#, fuzzy
#| msgid "Attribute"
msgid "Ticket Attributes"
msgstr "Atributi"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
#, fuzzy
#| msgid "Available attributes"
msgid "Article Attributes"
msgstr "Dostupni atributi"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1365,55 +1367,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️za napredne korisnike**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1451,21 +1449,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1477,47 +1475,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1528,14 +1526,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1607,8 +1613,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1630,8 +1636,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1682,7 +1688,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1733,36 +1739,38 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
#, fuzzy
msgid "Merge dialog"
msgstr "Makro-naredbe"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1772,28 +1780,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2367,8 +2387,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2726,8 +2747,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2832,8 +2853,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2873,9 +2894,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3497,8 +3518,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4038,8 +4059,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4126,8 +4147,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4322,8 +4343,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4341,8 +4362,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4396,8 +4417,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4473,8 +4494,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5524,8 +5545,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7103,8 +7124,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7398,9 +7419,9 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
#, fuzzy
@@ -7448,8 +7469,8 @@ msgstr ""
#~ "receive the same search results."
#~ msgstr ""
#~ "Od Zammad >=4.0 verzije, ovi elementi sadrže kompletne objekte. To znači "
-#~ "da samo trebate dodati ``.name`` (npr. ``group.name`` ili ``priority."
-#~ "name``) kako bi dobili iste rezultate."
+#~ "da samo trebate dodati ``.name`` (npr. ``group.name`` ili "
+#~ "``priority.name``) kako bi dobili iste rezultate."
#~ msgid "The keyboard shortcut cheat sheet on Windows."
#~ msgstr "Šalabahter tipkovničkih prečaca na Windowsima."
diff --git a/locale/hu/LC_MESSAGES/user-docs.po b/locale/hu/LC_MESSAGES/user-docs.po
index 7fa424ca..c2b93dab 100644
--- a/locale/hu/LC_MESSAGES/user-docs.po
+++ b/locale/hu/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -529,8 +529,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -550,9 +550,9 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -654,33 +654,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -833,11 +831,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -847,7 +845,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -868,8 +866,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -894,134 +892,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr ""
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1252,55 +1250,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1338,21 +1332,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1364,47 +1358,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1415,14 +1409,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1494,8 +1496,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1517,8 +1519,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1569,7 +1571,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1620,35 +1622,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1658,28 +1662,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2251,8 +2267,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2610,8 +2627,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2716,8 +2733,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2757,9 +2774,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3381,8 +3398,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3922,8 +3939,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4010,8 +4027,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4206,8 +4223,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4225,8 +4242,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4279,8 +4296,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4356,8 +4373,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5405,8 +5422,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -6972,8 +6989,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7267,7 +7284,7 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
diff --git a/locale/it/LC_MESSAGES/user-docs.po b/locale/it/LC_MESSAGES/user-docs.po
index e2be8151..08ab402a 100644
--- a/locale/it/LC_MESSAGES/user-docs.po
+++ b/locale/it/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2024-11-13 12:00+0000\n"
"Last-Translator: Cap6991 \n"
"Language-Team: Italian `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
-"Non devi - questo è un `compito dell'amministratore `_. Se hai un'idea per una macro che "
-"vorresti utilizzare, il tuo amministratore di Zammad può aiutarti a "
-"realizzarla."
+"Non devi - questo è un `compito dell'amministratore `_. Se hai un'idea per una "
+"macro che vorresti utilizzare, il tuo amministratore di Zammad può aiutarti "
+"a realizzarla."
#: ../advanced/macros.rst:14
#, fuzzy
@@ -705,33 +705,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -884,11 +882,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -898,7 +896,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -919,8 +917,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -945,136 +943,136 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
#, fuzzy
#| msgid "Ticket Settings"
msgid "Ticket Attributes"
msgstr "Impostazioni del ticket"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1316,55 +1314,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ Suggerimento sull'interfaccia utente**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1404,21 +1398,21 @@ msgstr "|red|"
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1430,47 +1424,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1481,14 +1475,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1560,8 +1562,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1583,8 +1585,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1635,7 +1637,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1686,37 +1688,39 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
#, fuzzy
msgid "How to merge tickets?"
msgstr "Navigazione dei Ticket"
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
#, fuzzy
msgid "Merge dialog"
msgstr "Macros"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1726,28 +1730,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2119,8 +2135,8 @@ msgstr ""
#: ../basics/find-ticket/search.rst:15
msgid "**🔍 Here are just a few of the places the search engine will look:**"
msgstr ""
-"**🔍 Queste sono alcune delle sezioni in cui il motore di ricerca esaminerà:"
-"**"
+"**🔍 Queste sono alcune delle sezioni in cui il motore di ricerca "
+"esaminerà:**"
#: ../basics/find-ticket/search.rst:17
msgid "📝 message subject/content"
@@ -2406,8 +2422,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
#, fuzzy
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
"I ticket sono un thread di messaggi e note riguardanti un problema del "
"cliente con un servizio. :doc:`⚙️ Gestisci le impostazioni di un ticket "
@@ -2419,8 +2436,8 @@ msgid ""
"Any time you open a ticket, a new entry will appear in your :doc:`tab list"
"advanced/tabs>` in the main menu."
msgstr ""
-"📇 Ogni volta che visualizzi un ticket, una nuova voce apparirà nella tua :"
-"doc:`lista di schede` nel menù principale."
+"📇 Ogni volta che visualizzi un ticket, una nuova voce apparirà nella "
+"tua :doc:`lista di schede` nel menù principale."
#: ../basics/service-ticket/follow-up.rst:26
msgid ""
@@ -2844,11 +2861,11 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
#, fuzzy
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
-"Non li gestisci - è il `compito dell'amministratore `_."
+"Non li gestisci - è il `compito dell'amministratore `_."
#: ../basics/service-ticket/settings/group.rst:34
#, fuzzy
@@ -2985,8 +3002,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
#, fuzzy
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
"La priorità può essere utilizzata come filtro per ticket quando si creano "
"`custom overviews`_."
@@ -3032,9 +3049,9 @@ msgstr "chiuso"
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3723,8 +3740,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4265,8 +4282,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4353,8 +4370,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4553,8 +4570,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4572,8 +4589,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4627,8 +4644,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4705,8 +4722,8 @@ msgstr "Visualizza e gestisci il registro chiamate dal pannello **telefono**."
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
"Questa funzione è **opzionale**; se non la vedi nel menù principale "
"significa che il tuo amministratore non l'ha ancora abilitata. Gli "
@@ -5799,8 +5816,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7407,8 +7424,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7703,9 +7720,9 @@ msgstr "Documentazione dell'operatore Zammad"
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
#~ msgid "**Closed**"
diff --git a/locale/nl/LC_MESSAGES/user-docs.po b/locale/nl/LC_MESSAGES/user-docs.po
index e1e55d8d..b342e5d9 100644
--- a/locale/nl/LC_MESSAGES/user-docs.po
+++ b/locale/nl/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -529,8 +529,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -550,9 +550,9 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -654,33 +654,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -833,11 +831,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -847,7 +845,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -868,8 +866,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -894,134 +892,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr ""
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1252,55 +1250,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1338,21 +1332,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1364,47 +1358,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1415,14 +1409,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1494,8 +1496,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1517,8 +1519,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1569,7 +1571,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1620,35 +1622,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1658,28 +1662,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2251,8 +2267,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2610,8 +2627,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2716,8 +2733,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2757,9 +2774,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3381,8 +3398,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3922,8 +3939,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4010,8 +4027,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4206,8 +4223,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4225,8 +4242,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4279,8 +4296,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4356,8 +4373,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5405,8 +5422,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -6972,8 +6989,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7267,7 +7284,7 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
diff --git a/locale/pl/LC_MESSAGES/user-docs.po b/locale/pl/LC_MESSAGES/user-docs.po
index 107beb00..1f70260f 100644
--- a/locale/pl/LC_MESSAGES/user-docs.po
+++ b/locale/pl/LC_MESSAGES/user-docs.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
-"PO-Revision-Date: 2024-06-13 21:00+0000\n"
-"Last-Translator: SamolJacek \n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
+"PO-Revision-Date: 2025-10-28 07:00+0000\n"
+"Last-Translator: MBekspert \n"
"Language-Team: Polish \n"
"Language: pl\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.5.5\n"
+"X-Generator: Weblate 5.11.4\n"
#: ../advanced/keyboard-shortcuts.rst:2
msgid "Keyboard Shortcuts"
@@ -562,8 +562,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -592,12 +592,12 @@ msgstr ""
#: ../advanced/macros.rst:10
#, fuzzy
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
-"Nie możesz – :admin-docs: to zadanie dla administratora `. Jeśli masz pomysł na makro, którego chciałbyś użyć, twój "
+"Nie możesz – :admin-docs: to zadanie dla administratora `. Jeśli masz pomysł na makro, którego chciałbyś użyć, twój "
"administrator Zammad prawdopodobnie może go zrealizować."
#: ../advanced/macros.rst:14
@@ -728,18 +728,16 @@ msgstr ""
#: ../advanced/search.rst:8
#, fuzzy
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-"Na przykład można wyszukać konkretnego klienta za pomocą ``customer."
-"attribute``::"
+"Na przykład można wyszukać konkretnego klienta za pomocą "
+"``customer.attribute``::"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "lub::"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
#, fuzzy
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
@@ -748,12 +746,12 @@ msgstr ""
"Jeśli chcesz uruchomić bardziej złożone wyszukiwanie, możesz użyć warunków z "
"opcjami ``()`` i ``AND``/``OR``::"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
#, fuzzy
msgid "Available Attributes"
msgstr "Dostępne atrybuty"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
#, fuzzy
msgid ""
"For a more detailed list of available attributes please take a look into "
@@ -764,7 +762,7 @@ msgstr ""
"naszego :docs:`Zammad System Documentation `."
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
#, fuzzy
msgid "Attributes and their usuage"
msgstr "Atrybuty i ich wykorzystanie"
@@ -958,12 +956,12 @@ msgstr ""
"np. takie jak \"head\". Zammad pozwala również na użycie wyrażeń "
"regularnych, jeśli tylko atrybuty na to pozwalają."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
#, fuzzy
msgid "Combining Search Phrases"
msgstr "**Łączenie fraz wyszukiwania**"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -980,7 +978,7 @@ msgstr ""
"możesz użyć negacji ``!``. Poniżej znajduje się kilka przykładów, które "
"można wykorzystać:"
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Przykłady kombinacji fraz wyszukiwania"
@@ -993,8 +991,8 @@ msgstr "Szukana fraza"
msgid ""
"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:feedback)"
msgstr ""
-"state.name:(closed OR open) AND (priority.name: \"2 normal\" OR tags:"
-"feedback)"
+"state.name:(closed OR open) AND (priority.name: \"2 normal\" OR "
+"tags:feedback)"
#: ../advanced/search.rst:1
#, fuzzy
@@ -1008,11 +1006,11 @@ msgstr ""
#: ../advanced/search.rst:1
#, fuzzy
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
-"state.name:(closed OR open) AND (priority.name: \"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name: \"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
#: ../advanced/search.rst:1
msgid ""
@@ -1042,13 +1040,13 @@ msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
"Pokaż wszystko z dowolnym stanem oczekiwania i liczbą artykułów od 1 do 5."
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
#, fuzzy
#| msgid "Some Ticket attributes and their type"
msgid "Some Ticket Attributes and Their Type"
msgstr "Niektóre atrybuty zgłoszenia i ich typy"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
@@ -1056,126 +1054,125 @@ msgstr ""
"Poniżej znajdują się najważniejsze atrybuty posortowane według zgłoszeń i "
"artykułów."
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
#, fuzzy
msgid "Ticket Attributes"
msgstr "Atrybut"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
-#, fuzzy
+#: ../advanced/search.rst:95
msgid "Article Attributes"
-msgstr "Dostępne atrybuty"
+msgstr "cechy wpisu"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1406,55 +1403,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ Porada UI**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1492,21 +1485,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1518,47 +1511,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1569,14 +1562,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1648,8 +1649,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1671,8 +1672,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1723,7 +1724,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1774,35 +1775,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1812,28 +1815,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2407,8 +2422,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2766,8 +2782,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2872,8 +2888,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2913,9 +2929,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3568,8 +3584,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4115,8 +4131,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4203,8 +4219,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4400,8 +4416,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4419,8 +4435,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4473,8 +4489,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4550,8 +4566,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5599,8 +5615,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -5956,7 +5972,7 @@ msgstr ""
#: ../extras/mobile-view.rst:141
msgid "Ticket Macros"
-msgstr ""
+msgstr "Makra zgłoszeń"
#: ../extras/mobile-view.rst:142
msgid "Ticket History"
@@ -7171,8 +7187,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7466,9 +7482,9 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
#, fuzzy
diff --git a/locale/pt_BR/LC_MESSAGES/user-docs.po b/locale/pt_BR/LC_MESSAGES/user-docs.po
index e44bf8fd..a916219e 100644
--- a/locale/pt_BR/LC_MESSAGES/user-docs.po
+++ b/locale/pt_BR/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2022-08-01 14:09+0000\n"
"Last-Translator: Erico Cesar \n"
"Language-Team: Portuguese (Brazil) `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -687,35 +687,33 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
#, fuzzy
#| msgid "Available attributes"
msgid "Available Attributes"
msgstr "Atributos disponíveis"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Atributos e sua utilizaçã"
@@ -892,12 +890,12 @@ msgstr ""
"permite a busca utilizando expressões regulares, sempre que o atributo "
"permitir, como no terceiro exemplo."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
#, fuzzy
msgid "Combining Search Phrases"
msgstr "Frase pesquisada"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -907,7 +905,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Exemplos de combinações de termos de buscas"
@@ -930,8 +928,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -959,13 +957,13 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr "Retorna tudo que estiver pendente e que tenham entre 1 e 5 artigos."
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
#, fuzzy
#| msgid "Some Ticket attributes and their type"
msgid "Some Ticket Attributes and Their Type"
msgstr "Alguns atributos dos chamados e os seus respectivos tipos"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
@@ -973,143 +971,143 @@ msgstr ""
"Abaixo você encontra os atributos mais importantes ordenados por chamado e "
"artigo."
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
#, fuzzy
#| msgid "Ticket attributes"
msgid "Ticket Attributes"
msgstr "Atributos do ticket"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "number: texto"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "title: texto"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr "owner: objeto (owner.firstname, owner.lastname, owner.email, ...)"
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
"customer: objeto (customer.firstname, customer.lastname, customer.email, ...)"
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr "first_response_at: rótulo de tempo (timestamp)"
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
"first_response_in_min: inteiro (tempo em minutos úteis para a primeira "
"resposta)"
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "close_at: rótulo de tempo"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr "close_in_min: inteiro (minutos úteis para fechar)"
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
"last_contact_at: rótulo de tempo (registro de tempo do último contato do "
"cliente ou do agente)"
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
"last_contact_agent_at: rótulo de tempo (registro de tempo do último contato "
"do agente)"
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
"last_contact_customer_at: rótulo de tempo (registro de tempo do último "
"contato do cliente)"
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
#, fuzzy
#| msgid "create_article_type: string (email|phone|web|...)"
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr "create_article_type: texto (email | phone | web | ...)"
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr "create_article_sender: texto (cliente | agente | sistema)"
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr "article_count: inteiro (quantidade de artigos)"
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
"escalation_at: rótulo de tempo (registro de tempo do momento em que o "
"chamado escalou a SLA)"
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
"pending_time: timestamp (registro de tempo até quando o chamado ficará "
"pendente)"
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
#, fuzzy
#| msgid "Article attributes"
msgid "Article Attributes"
msgstr "Atributos do artigo"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr "article.from: texto"
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr "article.to: texto"
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr "article.cc: texto"
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr "article.subject: texto"
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr "article.body: texto"
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1355,65 +1353,59 @@ msgid "Tabs"
msgstr "Abas"
#: ../advanced/tabs.rst:4
-msgid ""
-"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-"A media que você navega pelo Zammad, você verá uma lista aparecer na área do "
-"menu principal. Estas são as suas **abas abertas.**"
-
-#: ../advanced/tabs.rst:7
#, fuzzy
msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"As you click through Zammad, you will see a list of entries appear in the "
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
"Você pode trocar entre abas livremente sem perder o seu trabalho - todas as "
"alterações não salvas são automaticamente armazenadas no servidor."
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
"Abas aparecem no menu principal a media que você visita partes diferentes da "
"aplicação."
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
#, fuzzy
msgid "**What items open in a new “tab”?**"
msgstr "Quais itens aparecem em uma nova \"aba\"?"
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr "Chamados atuais"
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr "Novos chamados"
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr "Usuários"
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr "Organizações"
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr "Resultados da busca"
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ Dica profissional da interface de usuário**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1453,7 +1445,7 @@ msgstr "|red|"
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
@@ -1461,15 +1453,15 @@ msgstr ""
"Um **ponto pulsante** significa que o chamado tem nova atividade desde a "
"última vez que foi visualizado."
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr "Arraste as abas para rearranjar a ordem."
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1481,47 +1473,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1532,14 +1524,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr "Trabalhando com Módulos de Texto"
@@ -1625,8 +1625,8 @@ msgstr "Personalização de módulos de texto"
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1648,8 +1648,8 @@ msgstr "Associando chamados"
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1702,7 +1702,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1759,18 +1759,23 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
#, fuzzy
msgid "How to merge tickets?"
msgstr "Navegar pelos chamados"
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+#, fuzzy
+#| msgid ""
+#| "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
"Para mesclar dois chamados, acesse o submenu **Chamado▾** no painel do "
"chamado."
@@ -1779,19 +1784,19 @@ msgstr ""
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
#, fuzzy
msgid "Merge dialog"
msgstr "A janela de edição de cliente."
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1801,31 +1806,43 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
#, fuzzy
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
"O chamado original é :doc:`associado ` ao novo, como visto no painel "
"do chamado."
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr "Dividindo chamados"
@@ -2499,12 +2516,13 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
#, fuzzy
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
-"Chamados são um fluxo de mensagens e notas sobre uma demanda de um cliente. :"
-"doc:`⚙️ gerencie a configuração de um chamado ` no **painel do "
-"chamado** no lado direito da tela."
+"Chamados são um fluxo de mensagens e notas sobre uma demanda de um "
+"cliente. :doc:`⚙️ gerencie a configuração de um chamado ` no "
+"**painel do chamado** no lado direito da tela."
#: ../basics/service-ticket/follow-up.rst:23
#, fuzzy
@@ -2512,8 +2530,8 @@ msgid ""
"Any time you open a ticket, a new entry will appear in your :doc:`tab list"
"advanced/tabs>` in the main menu."
msgstr ""
-"📇 A qualquer momento que acessar um chamado, uma nova entrada aparecerá na :"
-"doc:`lista de abas ` no menu principal."
+"📇 A qualquer momento que acessar um chamado, uma nova entrada aparecerá "
+"na :doc:`lista de abas ` no menu principal."
#: ../basics/service-ticket/follow-up.rst:26
msgid ""
@@ -2934,11 +2952,11 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
#, fuzzy
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
-"Você não precisa, esta é uma `tarefa do administrador `_."
+"Você não precisa, esta é uma `tarefa do administrador `_."
#: ../basics/service-ticket/settings/group.rst:34
#, fuzzy
@@ -3015,8 +3033,8 @@ msgid ""
"ticket/settings/group>`."
msgstr ""
"A princípio, qualquer agente pode atribuir qualquer chamado para quem "
-"desejar, desde que ambos tenham as autorizações necessárias para acessar o :"
-"doc:`grupo 1` do chamado."
+"desejar, desde que ambos tenham as autorizações necessárias para acessar "
+"o :doc:`grupo 1` do chamado."
#: ../basics/service-ticket/settings/owner.rst:21
#, fuzzy
@@ -3077,8 +3095,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -3122,9 +3140,9 @@ msgstr "fechado"
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3325,8 +3343,8 @@ msgid ""
msgstr ""
"Por uma questão de simplicidade, nos referiremos a esses metadados como as "
"**configurações** de um chamado. Todas essas configurações podem ser "
-"alteradas a qualquer momento. Cada configuração é explicada em detalhes na :"
-"doc:`aqui `, mas, por enquanto, vamos "
+"alteradas a qualquer momento. Cada configuração é explicada em detalhes "
+"na :doc:`aqui `, mas, por enquanto, vamos "
"examinar as duas mais importantes:"
#: ../basics/what-is-a-ticket.rst:47
@@ -3817,8 +3835,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4359,8 +4377,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4447,8 +4465,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4651,8 +4669,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4670,8 +4688,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4726,8 +4744,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4804,13 +4822,13 @@ msgstr "Veja e gerencie os registros de ligações a partir da aba **Telefone**.
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
"Este recurso é **opcional**; Se você não o vê no menu, significa que o "
"administrador ainda não o ativou. Administradores podem ver mais `aqui "
-"`_."
+"`_."
#: ../extras/caller-log.rst:14
msgid "Sample view of Caller Log"
@@ -5960,8 +5978,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7627,8 +7645,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7923,11 +7941,18 @@ msgstr "Documentação do Agente Zammad"
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
+#~ msgid ""
+#~ "As you click through Zammad, you will see a list of entries appear in the "
+#~ "main menu area. These are your **open tabs.**"
+#~ msgstr ""
+#~ "A media que você navega pelo Zammad, você verá uma lista aparecer na área "
+#~ "do menu principal. Estas são as suas **abas abertas.**"
+
#~ msgid "**Closed**"
#~ msgstr "**Fechado**"
diff --git a/locale/ru/LC_MESSAGES/user-docs.po b/locale/ru/LC_MESSAGES/user-docs.po
index b53fe422..e8558c81 100644
--- a/locale/ru/LC_MESSAGES/user-docs.po
+++ b/locale/ru/LC_MESSAGES/user-docs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
-"PO-Revision-Date: 2024-10-17 13:00+0000\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
+"PO-Revision-Date: 2025-05-08 10:00+0000\n"
"Last-Translator: Nikita \n"
"Language-Team: Russian \n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.7.2\n"
+"X-Generator: Weblate 5.11\n"
#: ../advanced/keyboard-shortcuts.rst:2
msgid "Keyboard Shortcuts"
@@ -568,8 +568,8 @@ msgstr "Удалить любую гиперссылку"
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -594,9 +594,9 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
"Макросы могут быть созданы вашим :admin-docs:`администратором `. Если у Вас есть идея макроса, который Вы хотели бы "
@@ -723,18 +723,20 @@ msgstr ""
"поиска."
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+#, fuzzy
+#| msgid ""
+#| "For instance you can search for a specific customer by using "
+#| "``customer.attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-"Например, вы можете искать конкретного клиента, используя ``customer."
-"attribute``::"
+"Например, вы можете искать конкретного клиента, используя "
+"``customer.attribute``::"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "или::"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
@@ -742,11 +744,11 @@ msgstr ""
"Если вы хотите выполнить более сложный поиск, вы можете использовать условия "
"с опциями ``()`` и ``AND``/ ``OR``::"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr "Доступные атрибуты"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Атрибуты и их использование"
@@ -930,11 +932,11 @@ msgstr ""
"например, таких как \"head\". Zammad также позволит Вам использовать "
"регулярные выражения там, где это позволяют атрибуты."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr "Комбинирование поисковых фраз"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -951,7 +953,7 @@ msgstr ""
"использовать отрицание ``!``. Ниже приведены примеры, которые Вы можете "
"использовать:"
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Примеры комбинаций поисковых фраз"
@@ -975,11 +977,11 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
#: ../advanced/search.rst:1
msgid ""
@@ -1006,11 +1008,11 @@ msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
"Найти все заявки с любым состоянием ожидания и количеством статей от 1 до 5."
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr "Некоторые атрибуты заявок и их типы"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
@@ -1018,127 +1020,127 @@ msgstr ""
"Ниже Вы можете найти наиболее важные атрибуты, отсортированные по заявкам и "
"статьям."
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr "Атрибуты заявки"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "number: string"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "title: string"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr "group: object (group.name, ...)"
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr "priority: object (priority.name, ...)"
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr "state: object (state.name, ...)"
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr "organization: object (organization.name, ...)"
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr "first_response_at: timestamp"
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr "first_response_in_min: integer (рабочих минут до первого ответа)"
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "close_at: timestamp"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr "close_in_min: integer (рабочих минут до закрытия)"
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr "last_contact_at: timestamp (последний контакт клиента или агента)"
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr "last_contact_agent_at: timestamp (последний контакт агента)"
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr "last_contact_customer_at: timestamp (последний контакт клиента)"
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
#, fuzzy
#| msgid "create_article_type: string (email|phone|web|...)"
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr "create_article_type: string (email|телефон|веб|...)"
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr "create_article_sender: string (Клиент|Агент|Система)"
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr "article_count: integer"
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr "escalation_at: timestamp"
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr "pending_time: timestamp"
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr "Атрибуты статьи"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr "article.from: string"
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr "article.to: string"
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr "article.cc: string"
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr "article.subject: string"
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr "article.body: string"
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr "article.attachment.title: string (имя файла вложения)"
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr "article.attachment.content: string (содержимое вложения)"
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr "article.attachment.content_type: string (тип файла, например, PDF)"
@@ -1166,9 +1168,9 @@ msgid ""
"in two `, then assign each ticket to its "
"respective “group” (department)."
msgstr ""
-"Если заявка действительно касается двух разных проблем, вы можете :doc:"
-"`разделить её на две `, а затем назначить "
-"каждую заявку соответствующей \"группе\" (отделу)."
+"Если заявка действительно касается двух разных проблем, вы "
+"можете :doc:`разделить её на две `, а затем "
+"назначить каждую заявку соответствующей \"группе\" (отделу)."
#: ../advanced/suggested-workflows.rst:16
msgid ""
@@ -1425,63 +1427,61 @@ msgid "Tabs"
msgstr "Вкладки"
#: ../advanced/tabs.rst:4
+#, fuzzy
+#| msgid ""
+#| "You can freely switch between open tabs without losing your work - all "
+#| "unsaved changes are automatically backed up to the server."
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-"По мере того как вы будете переходить по Zammad, в области главного меню "
-"будет появляться список записей. Это ваши **открытые вкладки.**"
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
"Вы можете свободно переключаться между открытыми вкладками, не теряя своей "
"работы - все несохраненные изменения автоматически сохраняются на сервере."
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr "Примерный вид вкладок"
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
"Вкладки появляются в главном меню, когда Вы посещаете различные части "
"приложения."
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr "**Какие элементы открываются в новой “вкладке”?**"
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr "Существующие заявки"
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr "Новые заявки"
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr "Пользователи"
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr "Организации"
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr "Результаты поиска"
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ UI Прототип**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1521,7 +1521,7 @@ msgstr "|red|"
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
@@ -1529,15 +1529,15 @@ msgstr ""
"**Пульсирующая точка** означает, что в заявке появилась новая активность с "
"тех пор, как Вы просматривали ее в последний раз."
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr "Перетаскивайте вкладки, чтобы изменить их расположение."
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr "Поведение вкладок при работе с заявкой"
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1553,7 +1553,7 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr "Поведение вкладок можно настроить в заявках вручную"
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
@@ -1562,11 +1562,11 @@ msgstr ""
"Вы предпочитаете. Zammad будет помнить об этом предпочтении, пока Вы не "
"измените эту настройку."
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr "Закрыть вкладку"
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
@@ -1574,11 +1574,11 @@ msgstr ""
"После обновления заявки Zammad автоматически закроет вкладку. Вы вернетесь к "
"последнему открытому виду."
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr "Закрыть вкладку при закрытии заявки"
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
@@ -1586,17 +1586,17 @@ msgstr ""
"Вкладки заявок будут закрыты, только если Вы измените состояние заявки на "
"\"закрыто\" при обновлении."
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
"Это не относится к состояниям ожидания, которые заканчиваются закрытыми "
"состояниями."
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr "Далее в представлении"
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
@@ -1604,7 +1604,7 @@ msgstr ""
"Если Вы открыли заявку из любого представления, Zammad перейдет к следующей "
"заявке в этом представлении. Zammad повторно использует открытую вкладку."
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1618,14 +1618,22 @@ msgstr ""
msgid "Stay on tab"
msgstr "Остаться на вкладке"
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr "Обновление заявки не оказывает никакого влияния на вкладку."
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr "*Это настройка по умолчанию при установке Zammad.*"
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr "Работа с текстовыми модулями"
@@ -1717,11 +1725,11 @@ msgstr "Настройка текстовых модулей"
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
-"Администраторы могут узнать больше о настройке текстовых модулей :admin-docs:"
-"`здесь `."
+"Администраторы могут узнать больше о настройке текстовых модулей :admin-"
+"docs:`здесь `."
#: ../advanced/ticket-actions.rst:2
msgid "Ticket Actions"
@@ -1746,8 +1754,8 @@ msgstr "Связывание заявок"
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
"Когда возникают заявки по связанным вопросам, их можно связать друг с "
"другом, чтобы было удобнее обращаться к ним. Например, это может быть "
@@ -1766,10 +1774,10 @@ msgid ""
"The first pair is used for split and merged tickets. The normal link is "
"useful when there is no logical hierarchy between tickets."
msgstr ""
-"Существуют различные типы связей между заявками, как Вы уже могли видеть в :"
-"doc:`merge` или :doc:`plit`: родитель/потомок и обычные связи. Первая пара "
-"используется для разделенных и объединенных заявок. Обычная ссылка полезна, "
-"когда между заявками нет логической иерархии."
+"Существуют различные типы связей между заявками, как Вы уже могли видеть "
+"в :doc:`merge` или :doc:`plit`: родитель/потомок и обычные связи. Первая "
+"пара используется для разделенных и объединенных заявок. Обычная ссылка "
+"полезна, когда между заявками нет логической иерархии."
#: ../advanced/ticket-actions/link.rst:15
msgid ""
@@ -1814,7 +1822,7 @@ msgstr ""
"Кроме того, Вы можете выбрать заявку из списка ниже (см. 2)."
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1877,12 +1885,19 @@ msgstr ""
"активировали объединение, в выбранную."
#: ../advanced/ticket-actions/merge.rst:16
+#, fuzzy
+#| msgid ""
+#| "Let's assume you already worked on a ticket and you get another ticket "
+#| "about the same issue and want to merge them. Let's call the ticket you "
+#| "already worked on the *original* one and the new one *duplicate*. Then "
+#| "the way to go is to open the duplicate ticket and execute the merging "
+#| "from there so it will be merged into the original."
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
"Предположим, что Вы уже работали над заявкой и получили еще одну заявку по "
"тому же вопросу и хотите объединить их. Назовем заявку, над которой Вы уже "
@@ -1890,12 +1905,17 @@ msgstr ""
"дубликат заявки и выполнить объединение оттуда, чтобы она была объединена с "
"оригиналом."
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr "Как объединить заявки?"
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+#, fuzzy
+#| msgid ""
+#| "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
"Чтобы объединить заявку, откройте подменю **Заявка ▾** на панели заявки."
@@ -1903,11 +1923,11 @@ msgstr ""
msgid "Ticket menu with highlighted \"merge\""
msgstr "Меню заявки с выделенным \"Объединить\""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr "Окно объединения"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
@@ -1916,7 +1936,7 @@ msgstr ""
"Вы можете ввести номер заявки, с которой нужно объединить текущую заявку "
"(см. 1). Кроме того, Вы можете выбрать заявку из списка ниже (см. 2)."
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1928,11 +1948,11 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr "Окно объединения заявок"
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr "Результат после объединения"
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
@@ -1940,18 +1960,30 @@ msgstr ""
"Статьи перемещаются в выбранную заявку. Заявка, в которой Вы выполнили "
"объединение, по-прежнему останется в Zammad со следующими изменениями:"
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr "Статьи будут заменены \"объединенной\" меткой"
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr "Состояние изменится на \"объединено\""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr "Заявка будет :doc:`связана ` со своей \"родительской\" заявкой"
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr "Разделение заявок"
@@ -2257,8 +2289,8 @@ msgid ""
"There are **six built-in overviews** (Zammad admin may :admin-docs:`create "
"more ` with custom-defined filters):"
msgstr ""
-"Имеется **шесть встроенных представлений** (администратор Zammad может :"
-"admin-docs:`создать больше ` с настраиваемыми "
+"Имеется **шесть встроенных представлений** (администратор Zammad "
+"может :admin-docs:`создать больше ` с настраиваемыми "
"фильтрами):"
#: ../basics/find-ticket/browse.rst:19
@@ -2636,8 +2668,9 @@ msgstr "Просмотр сводки по заявке"
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
"Заявки - это потоки сообщений и заметок по обращениям клиентов. :doc:`⚙️ "
"Управление настройками заявки ` справа в **панели заявки**."
@@ -2647,8 +2680,8 @@ msgid ""
"Any time you open a ticket, a new entry will appear in your :doc:`tab list"
"advanced/tabs>` in the main menu."
msgstr ""
-"Каждый раз, когда Вы открываете заявку, новая запись появляется в вашем :doc:"
-"`списке вкладок` в главном меню."
+"Каждый раз, когда Вы открываете заявку, новая запись появляется в "
+"вашем :doc:`списке вкладок` в главном меню."
#: ../basics/service-ticket/follow-up.rst:26
msgid ""
@@ -3024,8 +3057,8 @@ msgid ""
"Migrate all messages/notes to another ticket (see :doc:`Merging Tickets "
"advanced/ticket-actions/merge>` for details)."
msgstr ""
-"Перенести все сообщения/заметки в другую заявку (подробнее см. в :doc:"
-"`Объединение заявок `)."
+"Перенести все сообщения/заметки в другую заявку (подробнее см. "
+"в :doc:`Объединение заявок `)."
#: ../basics/service-ticket/settings.rst:72
msgid "Change Customer"
@@ -3093,11 +3126,11 @@ msgstr "Управление группами"
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
-"Так как же мне управлять тем, в какой команде я нахожусь? Никак, это работа :"
-"admin-docs:`администратора `."
+"Так как же мне управлять тем, в какой команде я нахожусь? Никак, это "
+"работа :admin-docs:`администратора `."
#: ../basics/service-ticket/settings/group.rst:34
msgid ""
@@ -3226,11 +3259,12 @@ msgstr ":admin-docs:`запланированные события `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
-"Приоритет также можно использовать в качестве фильтра заявок при создании :"
-"admin-docs:`пользовательских представлений `."
+"Приоритет также можно использовать в качестве фильтра заявок при "
+"создании :admin-docs:`пользовательских представлений `."
#: ../basics/service-ticket/settings/priority.rst:28
msgid ""
@@ -3273,9 +3307,9 @@ msgstr "закрыта"
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
"объединенные (эта заявка была объединена с другой заявкой. Чтобы узнать "
"больше, проверьте либо :doc:\"связанные заявки `\"), которая использует информацию о состоянии заявки для определения, "
-"сколько времени потребуется клиенту, чтобы получить ответ на новую заявку "
-"или полностью решить обращение."
+"отслеживания времени (так называемые \":admin-docs:`SLA `\"), которая использует информацию о состоянии заявки для "
+"определения, сколько времени потребуется клиенту, чтобы получить ответ на "
+"новую заявку или полностью решить обращение."
#: ../basics/service-ticket/settings/state.rst:38
msgid ""
@@ -3932,8 +3966,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4473,8 +4507,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4561,8 +4595,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4757,8 +4791,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4776,8 +4810,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4831,8 +4865,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4908,8 +4942,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5959,8 +5993,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7530,8 +7564,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7825,11 +7859,18 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
+#~ msgid ""
+#~ "As you click through Zammad, you will see a list of entries appear in the "
+#~ "main menu area. These are your **open tabs.**"
+#~ msgstr ""
+#~ "По мере того как вы будете переходить по Zammad, в области главного меню "
+#~ "будет появляться список записей. Это ваши **открытые вкладки.**"
+
#~ msgid "**Closed**"
#~ msgstr "**Closed**"
diff --git a/locale/sr/LC_MESSAGES/user-docs.po b/locale/sr/LC_MESSAGES/user-docs.po
index 77dab714..1885b80e 100644
--- a/locale/sr/LC_MESSAGES/user-docs.po
+++ b/locale/sr/LC_MESSAGES/user-docs.po
@@ -7,18 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
-"PO-Revision-Date: 2025-03-18 16:00+0000\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
+"PO-Revision-Date: 2025-09-06 07:00+0000\n"
"Last-Translator: Dusan Vuckovic \n"
"Language-Team: Serbian \n"
+"documentations/user-documentation-latest/sr/>\n"
"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.9.2\n"
+"X-Generator: Weblate 5.11.4\n"
#: ../advanced/keyboard-shortcuts.rst:2
msgid "Keyboard Shortcuts"
@@ -550,11 +550,11 @@ msgstr "Уклони све линкове"
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
-"Ако сте Mac корисник, користите :kbd:`cmd` уместо :kbd:`ctrl` и :kbd:`ctrl` :"
-"kbd:`option` уместо of :kbd:`shift` :kbd:`ctrl`."
+"Ако сте Mac корисник, користите :kbd:`cmd` уместо :kbd:`ctrl` "
+"и :kbd:`ctrl` :kbd:`option` уместо of :kbd:`shift` :kbd:`ctrl`."
#: ../advanced/macros.rst:2
msgid "Macros"
@@ -576,13 +576,13 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
-"Нове макрое може додати ваш :admin-docs:`администратор `. Уколико имате идеју за макро који бисте желели да користите, ваш "
-"Zammad администратор вероватно може то и да оствари."
+"Нове макрое може додати ваш :admin-docs:`администратор `. Уколико имате идеју за макро који бисте желели да користите, "
+"ваш Zammad администратор вероватно може то и да оствари."
#: ../advanced/macros.rst:14
msgid "Macros can be applied in two ways: on a single ticket, or in bulk."
@@ -703,18 +703,14 @@ msgstr ""
"Информације у наставку ће вам помоћи да побољшате своје резултате претраге."
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
-msgstr ""
-"На пример, можете да тражите одређеног клијента користећи ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
+msgstr "На пример, можете да тражите тикет одређеног клијента:"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "или:"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
@@ -722,21 +718,21 @@ msgstr ""
"Уколико желите да извршите напредну претрагу, можете користити услове са "
"опцијама ``()`` и ``AND``/``OR``::"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr "Доступни атрибути"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
"За детаљнију листу доступних атрибута погледајте нашу :docs:`Zammad "
-"администраторску документацију `."
+"администраторску документацију `."
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Атрибути и њихова употреба"
@@ -908,11 +904,11 @@ msgstr ""
"Zammad ће вам такође омогућити да користите регуларне изразе, где год то "
"атрибути дозвољавају."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr "Комбиновање фраза за претрагу"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -929,7 +925,7 @@ msgstr ""
"користити негацију ``!``. Испод су неки примери које можете користити са "
"овим операторима:"
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Примери комбинација фраза за претрагу"
@@ -953,8 +949,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:анкета) "
"AND !(*Zammad*)"
@@ -984,141 +980,141 @@ msgstr "state.name:pending* AND article_count:[1 TO 5]"
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr "Прикажи све са било којим стањем на чекању и бројем чланака од 1 до 5."
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr "Неки атрибути тикета и њихов тип"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr "Испод можете пронаћи најважније атрибуте груписане по тикету и чланку."
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr "Атрибути тикета"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "number: текст"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "title: текст"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr "group: објекат (group.name, ...)"
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr "priority: објекат (priority.name, ...)"
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr "state: објекат (state.name, ...)"
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr "organization: објекат (organization.name, ...)"
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr "owner: објекат (owner.firstname, owner.lastname, owner.email, …)"
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
"customer: објекат (customer.firstname, customer.lastname, customer.email, …)"
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr "first_response_at: временска ознака"
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr "first_response_in_min: цео број (радних минута до првог одговора)"
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "close_at: временска ознака"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr "close_in_min: цео број (радних минута до затварања)"
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
"last_contact_at: временска ознака (последњи контакт од стране клијента или "
"оператера)"
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
"last_contact_agent_at: временска ознака (последњи контакт од стране "
"оператера)"
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
"last_contact_customer_at: временска ознака (последњи контакт од стране "
"клијента)"
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr "create_article_type.name: текст (email|phone|web|…)"
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr "create_article_sender: текст (Customer|Agent|System)"
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr "article_count: цео број"
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr "escalation_at: временска ознака"
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr "pending_time: временска ознака"
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr "Атрибути чланка"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr "article.from: текст"
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr "article.to: текст"
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr "article.cc: текст"
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr "article.subject: текст"
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr "article.body: текст"
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr "article.attachment.title: текст (назив датотеке прилога)"
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr "article.attachment.content: текст (садржај прилога)"
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr "article.attachment.content_type: текст (тип датотеке, нпр. PDF)"
@@ -1402,63 +1398,61 @@ msgid "Tabs"
msgstr "Језичци"
#: ../advanced/tabs.rst:4
+#, fuzzy
+#| msgid ""
+#| "You can freely switch between open tabs without losing your work - all "
+#| "unsaved changes are automatically backed up to the server."
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-"Док кликћете по Zammad-у, приметићете листу ставки које се појављују у "
-"области главног менија. Ово су ваши **отворени прозори.**"
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
"Можете слободно да прелазите између отворених прозора без губитка посла – "
"све несачуване измене се аутоматски снимају на серверу."
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr "Пример прозора"
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
"Прозори се појављују у главном менију док посећујете различите делове "
"апликације."
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr "**Које ставке се отварају у новом „прозору“?**"
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr "Постојећи тикети"
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
-msgstr "Нови тикети"
+msgstr "Новим тикетима"
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr "Корисници"
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr "Организације"
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr "Свеобухватна претрага"
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ Мали савет**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1498,7 +1492,7 @@ msgstr "|red|"
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr "**Захтева тренутну обраду** (тикет је ескалиран услед SLA прекршаја)"
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
@@ -1506,15 +1500,15 @@ msgstr ""
"**Пулсирајућа тачка** значи да тикет има нове активности од када сте га "
"последњи пут погледали."
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr "Превуците и пустите прозоре да бисте их преуредили."
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr "Понашање прозора у прегледу тикета"
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1530,7 +1524,7 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr "Понашање прозора се може ручно подесити у тикетима"
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
@@ -1539,11 +1533,11 @@ msgstr ""
"опцију коју желите. Zammad ће запамтити ово подешавање док не промените "
"његову вредност."
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr "Затвори тренутни прозор"
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
@@ -1551,11 +1545,11 @@ msgstr ""
"Након освежавања тикета, Zammad ће аутоматски затворити прозор. Бићете "
"враћени на последњи приказ који је био отворен."
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr "Затвори прозор по затварању тикета"
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
@@ -1563,16 +1557,16 @@ msgstr ""
"Прозори тикета биће затворени само ако промените стање у \"затворено\" након "
"освежавања тикета."
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
"Ово се не односи на стања на чекању која ће завршити у затвореним стањима."
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr "Иди на следећи из прегледа"
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
@@ -1580,7 +1574,7 @@ msgstr ""
"Ако сте отворили тикет из било ког прегледа, Zammad ће скочити на следећи "
"тикет у наведеном прегледу. Zammad ће искористити већ отворени прозор."
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1594,14 +1588,22 @@ msgstr ""
msgid "Stay on tab"
msgstr "Остани у прозору"
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr "Освежавање тикета нема никаквог утицаја на прозор."
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr "*Ово је подразумевано подешавање у Zammad инсталацијама.*"
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr "Рад са текстуалним исечцима"
@@ -1624,10 +1626,10 @@ msgid ""
"If you found the right text module, just press enter or click with your left "
"mouse and Zammad will insert the modules Text at the place your cursor is."
msgstr ""
-"Да бисте приступили доступним текстуалним исечцима, једноставно укуцајте ``::"
-"`` унутар текста чланка. Кад пронађете одговарајући текстуални исечак, само "
-"потврдите ентером или га кликните и Zammad ће уметнути текст исечка на место "
-"вашег курсора."
+"Да бисте приступили доступним текстуалним исечцима, једноставно укуцајте "
+"``::`` унутар текста чланка. Кад пронађете одговарајући текстуални исечак, "
+"само потврдите ентером или га кликните и Zammad ће уметнути текст исечка на "
+"место вашег курсора."
#: ../advanced/text-modules.rst:15
msgid ""
@@ -1692,11 +1694,11 @@ msgstr "Прилагођавање текстуалних исечака"
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
-"Администратори могу да сазнају више о прилагођавању текстуалних исечака :"
-"admin-docs:`овде `."
+"Администратори могу да сазнају више о прилагођавању текстуалних "
+"исечака :admin-docs:`овде `."
#: ../advanced/ticket-actions.rst:2
msgid "Ticket Actions"
@@ -1719,13 +1721,13 @@ msgstr "Повезивање тикета"
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
"Када се појаве тикети о сродним проблемима, могу се повезати једни са другим "
"ради лакшег референцирања. На пример ово може бити корисно ако имате велики "
-"број жалби клијената на исту испоруку. :doc:`Спојени ` и :doc:"
-"`раздељени ` тикети се аутоматски повезују."
+"број жалби клијената на исту испоруку. :doc:`Спојени ` "
+"и :doc:`раздељени ` тикети се аутоматски повезују."
#: ../advanced/ticket-actions/link.rst:16
msgid "Link types"
@@ -1738,10 +1740,10 @@ msgid ""
"The first pair is used for split and merged tickets. The normal link is "
"useful when there is no logical hierarchy between tickets."
msgstr ""
-"Постоје различите врсте веза између тикета као што сте већ приметили у :doc:"
-"`спајању` or :doc:`раздељивању`: надређене/подређене и нормалне везе. Први "
-"пар се користи за раздељене и спојене тикете. Нормална веза се користи када "
-"не постоји логичка хијерархија између тикета."
+"Постоје различите врсте веза између тикета као што сте већ приметили "
+"у :doc:`спајању` or :doc:`раздељивању`: надређене/подређене и нормалне везе. "
+"Први пар се користи за раздељене и спојене тикете. Нормална веза се користи "
+"када не постоји логичка хијерархија између тикета."
#: ../advanced/ticket-actions/link.rst:15
msgid ""
@@ -1786,7 +1788,7 @@ msgstr ""
"можете изабрати тикет из листе испод (види под 2)."
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1851,33 +1853,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-"Замислимо да већ радите на тикету и добијате тикет о истом проблем и желите "
-"да их спојите. Назовимо тикет на коме већ радите *оригинални* а нови "
-"*дупликат*. Начин на који можете ово урадити је да отворите дупликат и "
-"извршите спајање из њега тако да буде спојен са оригиналним."
+"Претпоставимо да већ радите на тикету и добијате тикет о истом проблем и "
+"желите да их спојите. Назовимо тикет на коме већ радите *оригинални* или "
+"*циљни* а нови *дупликат* или *изворни*. Начин на који можете ово урадити је "
+"да отворите дупликат и покренете спајање из њега тако да буде спојен са "
+"оригиналним тикетом."
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr "Како повезати тикете?"
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
-"Да бисте спојили тикет, приступите подменију **Тицкет ▾** у панелу тикета."
+"Да бисте спојили тикет, приступите подменију **Тикет ▾** у панелу тикета и "
+"одаберите **Споји**."
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr "Мени радњи тикета са означеним „спајањем”"
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr "Дијалог спајања тикета"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
@@ -1886,7 +1892,7 @@ msgstr ""
"Можете унети број тикета са којим желите да спојите тренутни (види под 1). "
"Алтенративно, можете изабрати из листе испод (види под 2)."
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1898,11 +1904,11 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr "Дијалог спајања тикета"
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr "Резултат по спајању"
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
@@ -1910,18 +1916,34 @@ msgstr ""
"Чланци су пребачени у одабрани тикет. Тикет из кога сте извршили спајање још "
"увек постоји са следећим променама:"
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr "Сви чланци су замењени ознаком „спојено”"
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr "Стање је промењено у „спојено”"
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr "Тикет је :doc:`повезан ` са „надређеним” тикетом"
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+"Уколико спојите два тикета који су отворени на различитим каналима, морађете "
+"да одговорите преко доступног канала циљног тикета."
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+"Пример: уколико спојите WhatsApp тикет са имејл тикетом, мораћете да "
+"одговарате преко имејл канала из циљног тикета."
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr "Раздељивање тикета"
@@ -2598,8 +2620,9 @@ msgstr "Кратак приказ тикета"
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
"Тикети су конверзације које се састоје од порука и напомена о проблему "
"клијента. :doc:`⚙️ Управљајте подацима тикета ` у **панелу тикета** "
@@ -2610,8 +2633,8 @@ msgid ""
"Any time you open a ticket, a new entry will appear in your :doc:`tab list"
"advanced/tabs>` in the main menu."
msgstr ""
-"Сваки пут када отворите приказ тикета, нова ставка ће се појавити у вашој :"
-"doc:`листи прозора ` у главном менију."
+"Сваки пут када отворите приказ тикета, нова ставка ће се појавити у "
+"вашој :doc:`листи прозора ` у главном менију."
#: ../basics/service-ticket/follow-up.rst:26
msgid ""
@@ -3032,10 +3055,10 @@ msgid ""
msgstr ""
"Без група, свих десет оператера може да види (и да одговори на) сваки "
"појединачни долазни тикет, без обзира о ком одељењу се ради. Ово није "
-"проблематично *само по себи*, али доводи до много непотребног нереда у :doc:"
-"`менију прегледа `. (Може бити много горе када, на "
-"пример, представник корисничке службе види тикете намењене вашем HR одељењу "
-"и сазна колико зарађују њихове колеге у продаји! 💸💸💸)"
+"проблематично *само по себи*, али доводи до много непотребног нереда "
+"у :doc:`менију прегледа `. (Може бити много горе када, "
+"на пример, представник корисничке службе види тикете намењене вашем HR "
+"одељењу и сазна колико зарађују њихове колеге у продаји! 💸💸💸)"
#: ../basics/service-ticket/settings/group.rst:25
msgid ""
@@ -3051,8 +3074,8 @@ msgstr "Управљање групама"
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
"Како да управљам својим тимом? Никако – то је :admin-docs:`посао "
"администратора `."
@@ -3181,8 +3204,8 @@ msgstr ":admin-docs:`догађаји планера `."
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
"Приоритет се такође може користити као филтер тикета при креирању :admin-"
"docs:`прилагођених прегледа `."
@@ -3230,13 +3253,13 @@ msgstr "затворено"
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
-"спојено (овај тикет је спојен са другим тикетом; погледајте или :doc:"
-"`повезане тикете ` или :ref:`историјат тикета "
-"` да бисте сазнали више)"
+"спојено (овај тикет је спојен са другим тикетом; погледајте "
+"или :doc:`повезане тикете ` "
+"или :ref:`историјат тикета ` да бисте сазнали више)"
#: ../basics/service-ticket/settings/state.rst:14
msgid ""
@@ -3599,8 +3622,8 @@ msgid ""
"You can learn more on our `Autosave landing page `_."
msgstr ""
-"Можете сазнати више на нашој `страници о аутоматском чувању `_."
+"Можете сазнати више на нашој `страници о аутоматском чувању `_."
#: ../basics/zammad-glossary.rst:81 ../basics/zammad-glossary.rst:620
#: ../extras/profile-and-settings.rst:0
@@ -4046,8 +4069,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
"Погледајте нашу :admin-docs:`администраторску документацију ` за све екстерне провајдере."
@@ -4222,8 +4245,9 @@ msgid ""
"Learn more on how to add Grafana dashboards for Zammad :docs:`in our "
"documentation `."
msgstr ""
-"Сазнајте више о томе како да додате Grafana контролне табле за Zammad :docs:"
-"`у нашој документацији `."
+"Сазнајте више о томе како да додате Grafana контролне табле за "
+"Zammad :docs:`у нашој документацији `."
#: ../basics/zammad-glossary.rst:338
msgid "Groups"
@@ -4753,12 +4777,12 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
"Приоритети могу чак бити подешени или прилагођени вашим потребама. Ваш "
-"администратор може наћи више информација :admin-docs:`овде `."
+"администратор може наћи више информација :admin-docs:`овде `."
#: ../basics/zammad-glossary.rst:557
msgid "Q"
@@ -4863,8 +4887,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
"Планер је једна од Zammad-ових функција аутоматизације. Администратор може "
"одредити одговарајуће услове и радње које се извршавају на тикетима који "
@@ -4941,8 +4965,8 @@ msgid ""
"It can be customized by your admin. Further information can be found :admin-"
"docs:`here `."
msgstr ""
-"Ваш администратор га може прилагодити. Додатне информације се могу пронаћи :"
-"admin-docs:`овде `."
+"Ваш администратор га може прилагодити. Додатне информације се могу "
+"пронаћи :admin-docs:`овде `."
#: ../basics/zammad-glossary.rst:642
msgid "Sipgate"
@@ -5119,8 +5143,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
"Администратори могу да сазнају више о ознакама :admin-docs:`овде `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
"Окидачи су једна од Zammad-ових функција аутоматизације. Администратор може "
"дефинисати одговарајуће услове и радње које се извршавају на тикетима који "
-"задовољавају услове. Више информација у администраторској документацији у :"
-"admin-docs:`одељку окидача `."
+"задовољавају услове. Више информација у администраторској документацији "
+"у :admin-docs:`одељку окидача `."
#: ../basics/zammad-glossary.rst:751
msgid "U"
@@ -5304,12 +5328,12 @@ msgstr "Прегледајте и управљајте евиденцијом п
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
"Ова функција је **опциона**; ако је не видите у панелу тикета, то значи да "
-"је ваш администратор још није омогућио. Администратори могу да сазнају више :"
-"admin-docs:`овде `."
#: ../extras/caller-log.rst:14
@@ -5471,8 +5495,8 @@ msgid ""
"more :admin-docs:`here `."
msgstr ""
"Ова функција је **опциона**; ако је не видите у главном менију, то значи да "
-"је ваш администратор још није омогућио. Администратори могу да сазнају више :"
-"admin-docs:`овде `."
+"је ваш администратор још није омогућио. Администратори могу да сазнају "
+"више :admin-docs:`овде `."
#: ../extras/chat.rst:None
msgid "Sample view of Customer Chat"
@@ -5675,9 +5699,9 @@ msgid ""
"area, there is no template available."
msgstr ""
"Уколико желите да додате списак задатака за тикет, идите на језичак „Списак "
-"задатака” и кликните или на „Додај празан списак” (1) или „Додај по "
-"шаблону” (2) након одабира шаблона. Уколико не видите део „Додај по "
-"шаблону”, нема доступних шаблона у систему."
+"задатака” и кликните или на „Додај празан списак” (1) или „Додај по шаблону” "
+"(2) након одабира шаблона. Уколико не видите део „Додај по шаблону”, нема "
+"доступних шаблона у систему."
#: ../extras/checklist.rst:33
msgid "Checklist creation dialog"
@@ -6050,8 +6074,8 @@ msgid ""
"trackers>`."
msgstr ""
"Ова функција је **опциона**; ако је не видите у панелу тикета, то значи да "
-"је ваш администратор још није омогућио. Администратори могу да сазнају више :"
-"admin-docs:`овде `."
#: ../extras/github-gitlab-integration.rst:16
@@ -6153,8 +6177,8 @@ msgid ""
"more :admin-docs:`here `."
msgstr ""
"Ова функција је **опциона**; ако је не видите у приказу тикета, то значи да "
-"је ваш администратор још није омогућио. Администратори могу да сазнају више :"
-"admin-docs:`овде `."
+"је ваш администратор још није омогућио. Администратори могу да сазнају "
+"више :admin-docs:`овде `."
#: ../extras/i-doit-track-company-property.rst:14
msgid ""
@@ -6333,8 +6357,8 @@ msgid ""
msgstr ""
"Ова функција је **опциона**; ако је не видите у главном менију, то значи да "
"је ваш администратор још није омогућио. Администратори могу сазнати више у "
-"нашој :admin-docs:`администраторској документацији `."
+"нашој :admin-docs:`администраторској документацији `."
#: ../extras/knowledge-base.rst:16
msgid "Knowledge Base Preview Mode"
@@ -6577,8 +6601,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
"Улоге захтевају **дозволу читаоца базе знања**. Ваш администратор мора да "
@@ -7977,8 +8001,8 @@ msgid ""
msgstr ""
"Ова функција је **опциона**; ако је не видите у менију, то значи да је ваш "
"администратор онемогућио ову функцију. Администратори могу сазнати више у "
-"нашој :admin-docs:`администраторској документацији `."
+"нашој :admin-docs:`администраторској документацији `."
#: ../extras/shared-drafts.rst:20
msgid ""
@@ -8469,8 +8493,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
"У зависности од изабраног метода двофакторске аутентификације, бићете поново "
"вођени кроз процес постављања. Обично ће уређивање методе једноставно "
@@ -8855,13 +8879,20 @@ msgstr "Zammad корисничка документација"
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
-"Тренутно читате Zammad корисничку документацију. Такође су доступни :docs:"
-"`системски ` и :admin-docs:`администраторски ` "
-"приручници."
+"Тренутно читате Zammad корисничку документацију. Такође су "
+"доступни :docs:`системски ` и :admin-docs:`администраторски "
+"index.html>` приручници."
+
+#~ msgid ""
+#~ "As you click through Zammad, you will see a list of entries appear in the "
+#~ "main menu area. These are your **open tabs.**"
+#~ msgstr ""
+#~ "Док кликћете по Zammad-у, приметићете листу ставки које се појављују у "
+#~ "области главног менија. Ово су ваши **отворени прозори.**"
#~ msgid "**Closed**"
#~ msgstr "**Затворено**"
@@ -9124,8 +9155,9 @@ msgstr ""
#~ "on a single ticket ` instead.)"
#~ msgstr ""
#~ "У таквим случајевима можете **одвојити једну поруку у њен сопствени "
-#~ "тикет**. (Алтернативно, можда би имало више смисла да се :ref:"
-#~ "`једноставно смењујете на истом тикету ` уместо тога.)"
+#~ "тикет**. (Алтернативно, можда би имало више смисла да "
+#~ "се :ref:`једноставно смењујете на истом тикету ` уместо "
+#~ "тога.)"
#~ msgid ""
#~ "Click the “split” button to take a message and use it as the starting "
diff --git a/locale/sv/LC_MESSAGES/user-docs.po b/locale/sv/LC_MESSAGES/user-docs.po
index 707236db..426a7ff4 100644
--- a/locale/sv/LC_MESSAGES/user-docs.po
+++ b/locale/sv/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2024-10-25 11:00+0000\n"
"Last-Translator: chrand818 \n"
"Language-Team: Swedish `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
"Makron kan skapas av din :admin-docs:`administratör `. "
"Om du har en idé om ett makro som du skulle vilja använda, kan din "
@@ -700,33 +700,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "eller::"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr "Tillgängliga Attributer"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Attributer och användningsområde"
@@ -879,11 +877,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -893,7 +891,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -914,8 +912,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -940,134 +938,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr "Ticket Attributet"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "nummer: sträng"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "Ämne: sträng"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr "grupp: objekt (grupp.namn, ...)"
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr "prioritet: ämne (prioritet.namn, ...)"
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "stängt_vid: tidstämpel"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1300,55 +1298,51 @@ msgstr "Flikar"
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1386,21 +1380,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1412,47 +1406,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1463,14 +1457,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1542,8 +1544,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1565,8 +1567,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1617,7 +1619,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1668,35 +1670,37 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1706,28 +1710,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2299,8 +2315,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2658,8 +2675,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2764,8 +2781,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2805,9 +2822,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3429,8 +3446,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3970,8 +3987,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4058,8 +4075,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4254,8 +4271,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4273,8 +4290,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4327,8 +4344,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4404,8 +4421,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5453,8 +5470,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7020,8 +7037,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7315,9 +7332,9 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
#~ msgid "Where to Find Them?"
diff --git a/locale/th/LC_MESSAGES/user-docs.po b/locale/th/LC_MESSAGES/user-docs.po
index 529fa08f..c65d0805 100644
--- a/locale/th/LC_MESSAGES/user-docs.po
+++ b/locale/th/LC_MESSAGES/user-docs.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
-"PO-Revision-Date: 2022-04-16 15:56+0000\n"
-"Last-Translator: LAO \n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
+"PO-Revision-Date: 2025-05-29 09:01+0000\n"
+"Last-Translator: Sumonchai Wongphithak \n"
"Language-Team: Thai \n"
+"user-documentation-latest/th/>\n"
"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.11.2\n"
+"X-Generator: Weblate 5.11.4\n"
#: ../advanced/keyboard-shortcuts.rst:2
msgid "Keyboard Shortcuts"
@@ -62,10 +62,8 @@ msgid "The keyboard shortcut overview."
msgstr ""
#: ../advanced/keyboard-shortcuts.rst:29
-#, fuzzy
-#| msgid "Ticket Settings"
msgid "Settings"
-msgstr "ตั้งค่า ใบแจ้งซ่อม"
+msgstr "ตั้งค่า"
#: ../advanced/keyboard-shortcuts.rst:31
msgid "At the top of the dialog, you can:"
@@ -541,8 +539,8 @@ msgstr ""
#: ../advanced/keyboard-shortcuts.rst:160
msgid ""
-"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` and :kbd:"
-"`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
+"If you are a Mac user, use :kbd:`cmd` instead of :kbd:`ctrl` "
+"and :kbd:`ctrl` :kbd:`option` instead of :kbd:`shift` :kbd:`ctrl`."
msgstr ""
#: ../advanced/macros.rst:2
@@ -562,9 +560,9 @@ msgstr ""
#: ../advanced/macros.rst:10
msgid ""
-"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
#: ../advanced/macros.rst:14
@@ -666,33 +664,31 @@ msgid ""
msgstr ""
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
"and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -845,11 +841,11 @@ msgid ""
"the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -859,7 +855,7 @@ msgid ""
"Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -880,8 +876,8 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
#: ../advanced/search.rst:1
@@ -906,136 +902,134 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
-#, fuzzy
-#| msgid "Ticket Settings"
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
-msgstr "ตั้งค่า ใบแจ้งซ่อม"
+msgstr "คุณลักษณะของตั๋ว"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1268,55 +1262,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
-msgstr ""
-
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr "สร้างใบแจ้งซ่อม"
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr "องค์กร"
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ UI Protip**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1354,21 +1344,21 @@ msgstr "|red|"
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1380,47 +1370,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1431,14 +1421,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1510,8 +1508,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1533,8 +1531,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1585,7 +1583,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1636,36 +1634,38 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
#, fuzzy
msgid "Merge dialog"
msgstr "สร้างใบแจ้งซ่อม"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1675,28 +1675,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2268,8 +2280,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2627,8 +2640,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2733,8 +2746,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2774,9 +2787,9 @@ msgstr "ปิด"
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3399,8 +3412,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -3941,8 +3954,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4029,8 +4042,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4230,8 +4243,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4249,8 +4262,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4305,8 +4318,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4382,8 +4395,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5433,8 +5446,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7022,8 +7035,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7319,9 +7332,9 @@ msgstr "Zammad Agent Documentation"
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
#~ msgid "**Closed**"
diff --git a/locale/tr/LC_MESSAGES/user-docs.po b/locale/tr/LC_MESSAGES/user-docs.po
index 973824ac..1d9af3e1 100644
--- a/locale/tr/LC_MESSAGES/user-docs.po
+++ b/locale/tr/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2025-02-11 08:00+0000\n"
"Last-Translator: Türk Oyuncu \n"
"Language-Team: Turkish `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
"Yapamazsınız – bu 'yönetici'nin işidir `_. Kullanmak istediğiniz bir makro için bir "
@@ -727,18 +727,20 @@ msgstr ""
"arama sonuçlarınızı iyileştirmenize yardımcı olacaktır."
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+#, fuzzy
+#| msgid ""
+#| "For instance you can search for a specific customer by using "
+#| "``customer.attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
"Örneğin, ``customer.attribute``:: kullanarak belirli bir müşteriyi "
"arayabilirsiniz"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "veya::"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
#, fuzzy
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
@@ -747,13 +749,13 @@ msgstr ""
"Daha karmaşık bir arama yapmak istiyorsanız, ``()`` ve ``VE``/``VEYA``:: "
"seçenekleriyle koşulları kullanabilirsiniz"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
#, fuzzy
#| msgid "Available attributes"
msgid "Available Attributes"
msgstr "Kullanılabilir nitelikler"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
#, fuzzy
msgid ""
"For a more detailed list of available attributes please take a look into "
@@ -764,7 +766,7 @@ msgstr ""
"Yönetici-Dokümantasyonu `_ sayfamıza göz atın."
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "Nitelikler ve kullanımı"
@@ -940,12 +942,12 @@ msgstr ""
"kullanabilirsiniz. Zammad, niteliklerin izin verdiği her yerde normal "
"ifadeler kullanmanıza da izin verecektir."
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
#, fuzzy
msgid "Combining Search Phrases"
msgstr "**Birleştirilen arama ifadeleri**"
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -962,7 +964,7 @@ msgstr ""
"olumsuzlama ``!`` kullanabilirsiniz. Aşağıda bununla kullanabileceğiniz bazı "
"örnekler verilmiştir:"
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr "Arama ifadesi kombinasyonlarına göre örnekler"
@@ -974,8 +976,8 @@ msgstr "İfadeyi ara"
msgid ""
"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:feedback)"
msgstr ""
-"state.name:(kapalı VEYA açık) VE (priority.name:\"2 normal\" VEYA tags:"
-"feedback)"
+"state.name:(kapalı VEYA açık) VE (priority.name:\"2 normal\" VEYA "
+"tags:feedback)"
#: ../advanced/search.rst:1
msgid ""
@@ -987,11 +989,11 @@ msgstr ""
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
-"state.name:(kapalı VEYA açık) VE (priority.name:\"2 normal\" VEYA tags:"
-"feedback) VE !(*Zammad*)"
+"state.name:(kapalı VEYA açık) VE (priority.name:\"2 normal\" VEYA "
+"tags:feedback) VE !(*Zammad*)"
#: ../advanced/search.rst:1
msgid ""
@@ -1018,13 +1020,13 @@ msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
"Bekleme durumunda ve 1'den 5'e kadar olan makale sayısının tümünü gösterir."
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
#, fuzzy
#| msgid "Some Ticket attributes and their type"
msgid "Some Ticket Attributes and Their Type"
msgstr "Bazı Bilet özellikleri ve türleri"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
@@ -1032,132 +1034,132 @@ msgstr ""
"Bilet ve makaleye göre sıralanmış en önemli özellikleri aşağıda "
"bulabilirsiniz."
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
#, fuzzy
#| msgid "Ticket attributes"
msgid "Ticket Attributes"
msgstr "Bilet nitelikleri"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr "number: string"
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr "title: string"
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr "group: object (group.name, ...)"
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr "priority: object (priority.name, ...)"
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr "state: object (state.name, ...)"
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr "organization: object (organization.name, ...)"
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr "first_response_at: timestamp"
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr "first_response_in_min: integer (ilk yanıta kadar geçen iş süresi)"
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr "close_at: timestamp"
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr "close_in_min: integer (kapatılana kadar geçen iş süresi)"
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
"last_contact_at: timestamp (müşteri veya temsilci tarafından son iletişim)"
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr "last_contact_agent_at: timestamp (temsilci tarafından son iletişim)"
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr "last_contact_customer_at: timestamp (müşteri tarafından son iletişim)"
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
#, fuzzy
#| msgid "create_article_type: string (email|phone|web|...)"
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr "create_article_type: string (email|phone|web|...)"
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr "create_article_sender: string (Customer|Agent|System)"
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr "article_count: integer"
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr "escalation_at: timestamp"
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr "pending_time: timestamp"
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
#, fuzzy
#| msgid "Article attributes"
msgid "Article Attributes"
msgstr "Makale nitelikleri"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr "article.from: string"
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr "article.to: string"
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr "article.cc: string"
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr "article.subject: string"
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr "article.body: string"
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr "article.attachment.title: string (ekin dosya adı)"
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr "article.attachment.content: string (ekin içeriği)"
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr "article.attachment.content_type: string (Dosya türü ör. PDF)"
@@ -1186,8 +1188,8 @@ msgid ""
"respective “group” (department)."
msgstr ""
"Bir bilet gerçekten iki farklı sorunla ilgiliyse, :doc:`ikiye bölebilir "
-"advanced/ticket-actions/split>`, ardından her bileti ilgili "
-"“grubuna” (departmana) atayabilirsiniz."
+"advanced/ticket-actions/split>`, ardından her bileti ilgili “grubuna” "
+"(departmana) atayabilirsiniz."
#: ../advanced/suggested-workflows.rst:16
#, fuzzy
@@ -1441,66 +1443,60 @@ msgid "Tabs"
msgstr "Sekmeler"
#: ../advanced/tabs.rst:4
-msgid ""
-"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-"Zammad'a tıkladığınızda, ana menü alanında girişlerin bir listesinin "
-"göründüğünü göreceksiniz. Bunlar **açık sekmelerinizdir.**"
-
-#: ../advanced/tabs.rst:7
#, fuzzy
msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"As you click through Zammad, you will see a list of entries appear in the "
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
"Çalışmanızı kaybetmeden açık sekmeler arasında serbestçe geçiş "
"yapabilirsiniz - kaydedilmemiş tüm değişiklikler otomatik olarak sunucuya "
"yedeklenir."
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
"Uygulamanın farklı bölümlerini ziyaret ettiğinizde ana menüde sekmeler "
"görünür."
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
#, fuzzy
msgid "**What items open in a new “tab”?**"
msgstr "Yeni bir \"sekmede\" hangi ögeler açılır?"
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr "Mevcut biletler"
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr "Yeni biletler"
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr "Kullanıcılar"
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr "Organizasyonlar"
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr "Omnisearch"
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ UI Protipi**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1540,7 +1536,7 @@ msgstr "|red|"
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
@@ -1548,15 +1544,15 @@ msgstr ""
"**Titreşen nokta**, bir biletin son görüntülemenizden bu yana yeni "
"etkinliklere sahip olduğu anlamına gelir."
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr "Yeniden düzenlemek için sekmeleri sürükleyip bırakın."
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1568,47 +1564,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1619,14 +1615,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr "Metin Modülleri ile Çalışmak"
@@ -1726,8 +1730,8 @@ msgstr "Metin modüllerini özelleştirmek"
#: ../advanced/text-modules.rst:46
#, fuzzy
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
"Yöneticiler metin modüllerini özelleştirmek hakkında daha fazla bilgi almak "
"için `buraya ` göz atabilir_."
@@ -1751,8 +1755,8 @@ msgstr "Bağlantılı Biletler"
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1803,7 +1807,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1860,18 +1864,23 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
#, fuzzy
msgid "How to merge tickets?"
msgstr "Biletlere Göre Tarama"
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+#, fuzzy
+#| msgid ""
+#| "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
"Bir bileti birleştirmek için, bilet panelinden **Bilet ▾** alt menüsüne "
"erişin."
@@ -1880,19 +1889,19 @@ msgstr ""
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
#, fuzzy
msgid "Merge dialog"
msgstr "Müşteri diyaloğu düzenlemek."
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1902,31 +1911,43 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
#, fuzzy
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
"Orijinal bilet, bilet panelinde görüldüğü gibi yenisine :doc:`bağlıdır "
"`."
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr "Bölünmüş Biletler"
@@ -2591,12 +2612,13 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
#, fuzzy
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
-"Biletler, bir müşteri hizmetleri sorunuyla ilgili mesaj ve not dizileridir. :"
-"doc:`⚙️ Bir biletin ayarlarını sağdaki **bilet bölmesinde** yönetin "
-"` ."
+"Biletler, bir müşteri hizmetleri sorunuyla ilgili mesaj ve not "
+"dizileridir. :doc:`⚙️ Bir biletin ayarlarını sağdaki **bilet bölmesinde** "
+"yönetin ` ."
#: ../basics/service-ticket/follow-up.rst:23
#, fuzzy
@@ -2953,8 +2975,8 @@ msgid ""
"Migrate all messages/notes to another ticket (see :doc:`Merging Tickets "
"advanced/ticket-actions/merge>` for details)."
msgstr ""
-"Tüm mesajları/notları başka bir bilete taşıyın (ayrıntılar için bkz. :doc:"
-"`Biletleri Birleştirme `)."
+"Tüm mesajları/notları başka bir bilete taşıyın (ayrıntılar için "
+"bkz. :doc:`Biletleri Birleştirme `)."
#: ../basics/service-ticket/settings.rst:72
msgid "Change Customer"
@@ -3026,8 +3048,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
#, fuzzy
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr "Yapamazsınız – bu `yöneticinin işidir `_."
#: ../basics/service-ticket/settings/group.rst:34
@@ -3163,8 +3185,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -3208,9 +3230,9 @@ msgstr "kapalı"
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3903,8 +3925,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4464,8 +4486,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4555,8 +4577,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4771,8 +4793,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
#, fuzzy
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
"Yöneticiler metin modüllerini özelleştirmek hakkında daha fazla bilgi almak "
@@ -4792,8 +4814,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4851,8 +4873,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4930,13 +4952,13 @@ msgstr "**Telefon** panelinden arama kayıtlarını görüntüleyin ve yönetin.
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
"Bu özellik **isteğe bağlıdır**; ana menüde görmüyorsanız, bu yöneticiniz "
"tarafından etkinleştirilmediği anlamına gelir. Yöneticiler daha fazla bilgi "
-"için `buraya `_ bakabilir."
+"için `buraya `_ bakabilir."
#: ../extras/caller-log.rst:14
msgid "Sample view of Caller Log"
@@ -5942,8 +5964,8 @@ msgid ""
msgstr ""
"Bu özellik **isteğe bağlıdır**; ana menüde görmüyorsanız, bu yöneticiniz "
"tarafından etkinleştirilmediği anlamına gelir. Yöneticiler daha fazla bilgi "
-"için `buraya `_ bakabilir."
+"için `buraya `_ bakabilir."
#: ../extras/knowledge-base.rst:16
msgid "Knowledge Base Preview Mode"
@@ -6161,8 +6183,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7922,8 +7944,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -8224,14 +8246,21 @@ msgstr "Zammad Aracı Dokümantasyonu"
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
"Şu anda Zammad kullanıcı belgelerini okumaktasınız. Ayrıca :docs:`system "
"index.html>` ve :admin-docs:`administration manuals ` da "
"mevcuttur."
+#~ msgid ""
+#~ "As you click through Zammad, you will see a list of entries appear in the "
+#~ "main menu area. These are your **open tabs.**"
+#~ msgstr ""
+#~ "Zammad'a tıkladığınızda, ana menü alanında girişlerin bir listesinin "
+#~ "göründüğünü göreceksiniz. Bunlar **açık sekmelerinizdir.**"
+
#~ msgid "**Closed**"
#~ msgstr "**Kapalı**"
@@ -8398,8 +8427,8 @@ msgstr ""
#~ "receive the same search results."
#~ msgstr ""
#~ "Zammad >=4.0 ile bu anahtarlar tüm nesneyi içerir. Bu, aynı arama "
-#~ "sonuçlarını almak için artık ``.name`` (ör. ``group.adı`` veya ``priority."
-#~ "name``) eklemeniz gerektiği anlamına gelir."
+#~ "sonuçlarını almak için artık ``.name`` (ör. ``group.adı`` veya "
+#~ "``priority.name``) eklemeniz gerektiği anlamına gelir."
#~ msgid "😖 **A colleague @mentioned me, but I don’t see the ticket!**"
#~ msgstr "😖 **Bir iş arkadaşı benden @bahsetti, ama bileti göremiyorum!**"
@@ -8528,8 +8557,8 @@ msgstr ""
#~ msgstr ""
#~ "Bu özellik **isteğe bağlıdır**; ana menüde görmüyorsanız, bu yöneticiniz "
#~ "tarafından etkinleştirilmediği anlamına gelir. Yöneticiler daha fazla "
-#~ "bilgi için `buraya `_ bakabilir."
+#~ "bilgi için `buraya `_ bakabilir."
#~ msgid "Managing Ticket Settings"
#~ msgstr "Bilet Ayarlarını Yönetmek"
diff --git a/locale/user-docs.pot b/locale/user-docs.pot
index 132a0c74..65109419 100644
--- a/locale/user-docs.pot
+++ b/locale/user-docs.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad User Documentation pre-release\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -618,26 +618,26 @@ msgid "With Zammad, you can limit your search to specific attributes. This allow
msgstr ""
#: ../advanced/search.rst:8
-msgid "For instance you can search for a specific customer by using ``customer.attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr ""
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr ""
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
msgid "If you want to run a more complex search, you can use conditions with ``()`` and ``AND``/``OR`` options::"
msgstr ""
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
msgid "Available Attributes"
msgstr ""
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
msgid "For a more detailed list of available attributes please take a look into our :docs:`Zammad System Documentation `."
msgstr ""
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr ""
@@ -770,15 +770,15 @@ msgstr ""
msgid "First example shows every ticket containing the word \"heat\" - you can also use the fuzzy operator \"~\" to search for similar words like e.g. like \"head\". Zammad will also allow you to use regular expressions, where ever the attributes allows it."
msgstr ""
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid "You can combine search phrases by using ``AND``, ``OR`` and ``TO``, depending on the situation and phrases you use. If needed, you can parts of your search phrase for complex searches with ``()``. This allows you to combine several phrases with different dependencies (AND/OR). In case you receive search results that you want to exclude, you can use negation ``!``. Below are some examples that you could use with this:"
msgstr ""
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -818,131 +818,131 @@ msgstr ""
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr ""
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
msgid "Some Ticket Attributes and Their Type"
msgstr ""
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid "Below you can find the most important attributes sorted by ticket and article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
msgid "Ticket Attributes"
msgstr ""
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid "customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
msgid "Article Attributes"
msgstr ""
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1116,47 +1116,43 @@ msgid "Tabs"
msgstr ""
#: ../advanced/tabs.rst:4
-msgid "As you click through Zammad, you will see a list of entries appear in the main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid "You can freely switch between open tabs without losing your work - all unsaved changes are automatically backed up to the server."
+msgid "As you click through Zammad, you will see a list of entries appear in the main menu area. These are your **open tabs.** You can freely switch between open tabs without losing your work - all unsaved changes are automatically backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21
+#: ../advanced/tabs.rst:20
#: ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24
+#: ../advanced/tabs.rst:23
#: ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33
#: ../basics/service-ticket/create.rst:47
@@ -1166,7 +1162,7 @@ msgstr ""
msgid "**🖱️ UI Protip**"
msgstr ""
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ":doc:`Ticket states ` are **color-coded:**"
msgstr ""
@@ -1227,19 +1223,19 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid "A **pulsing dot** means that a ticket has new activity since you last viewed it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid "You may have noticed the \"Stay on tab\" button next to \"Update\" on the lower right already. This behavior of a tab can be configured by your administrator globally. You can overrule this setting based on your personal preference."
msgstr ""
@@ -1247,39 +1243,39 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid "To overrule your administrator's settings, simply choose the action you prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid "Upon updating the ticket, Zammad will automatically close the tab. You'll be returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid "Ticket tabs will be closed only if you change the state to \"closed\" upon ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid "If you opened a ticket from any overview, Zammad will jump to the next ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid "This option is only available if you open the ticket from an overview. Zammad will ignore the setting if you opened the ticket directly and fall back to ``Stay on tab``."
msgstr ""
@@ -1287,14 +1283,18 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid "Now that you are an expert in tab handling, one more thing might be interesting as well: the maximum number of tabs is 30 due to performance reasons. In case you reach the limit and open another tab, the first opened tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1406,7 +1406,7 @@ msgid "You can enter the ticket number of the ticket you want to link to (see 1)
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid "If the customer has an existing ticket, it will show up under \"Recent customer tickets\". You can see your last viewed tickets under \"Recently viewed tickets\" anyway."
msgstr ""
@@ -1440,30 +1440,30 @@ msgid "Merging a ticket migrates all messages and notes of the ticket from where
msgstr ""
#: ../advanced/ticket-actions/merge.rst:16
-msgid "Let's assume you already worked on a ticket and you get another ticket about the same issue and want to merge them. Let's call the ticket you already worked on the *original* one and the new one *duplicate*. Then the way to go is to open the duplicate ticket and execute the merging from there so it will be merged into the original."
+msgid "Let's assume you already worked on a ticket and you get another ticket about the same issue and want to merge them. Let's call the ticket you already worked on the *original* or *target* ticket and the new one *duplicate* or *source* ticket. Then the way to go is to open the duplicate ticket and execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
msgid "Merge dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid "You can either enter the ticket number of the ticket you want to merge the current one into (see 1). Alternatively, you can choose from the list below (see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid "After entering a ticket number or choosing one of the offered tickets from the list, click on the submit button and the tickets will be merged."
msgstr ""
@@ -1471,26 +1471,34 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid "The articles are moved into the chosen tickets. The ticket in which you executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid "If you merge two tickets which were created from different channels, you have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid "Example: if you merge a Whatsapp ticket into an email ticket, you have to answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
diff --git a/locale/zh_Hans/LC_MESSAGES/user-docs.po b/locale/zh_Hans/LC_MESSAGES/user-docs.po
index dc0c402e..2a6feef4 100644
--- a/locale/zh_Hans/LC_MESSAGES/user-docs.po
+++ b/locale/zh_Hans/LC_MESSAGES/user-docs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad (for Agents)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 14:38+0100\n"
+"POT-Creation-Date: 2025-09-04 10:40+0200\n"
"PO-Revision-Date: 2022-11-04 15:14+0000\n"
"Last-Translator: Never Min <59808@qq.com>\n"
"Language-Team: Chinese (Simplified) `. If you have an idea for a macro you'd like to use, your Zammad admin "
-"can probably make it happen."
+"Macros can be created by your :admin-docs:`administrator `. If you have an idea for a macro you'd like to use, your "
+"Zammad admin can probably make it happen."
msgstr ""
"你不需要自己创建 - 这是`管理员的工作`_。如果你有一个你想使用的宏的想法,你的Zammad管理员可能可"
@@ -698,16 +698,18 @@ msgstr ""
"的工单。以下信息将帮助您改进搜索结果。"
#: ../advanced/search.rst:8
-msgid ""
-"For instance you can search for a specific customer by using ``customer."
-"attribute``::"
+#, fuzzy
+#| msgid ""
+#| "For instance you can search for a specific customer by using "
+#| "``customer.attribute``::"
+msgid "For instance, you can search for a ticket of a specific customer::"
msgstr "例如,您可以使用``customer.attribute``来搜索特定的客户:"
-#: ../advanced/search.rst:13
+#: ../advanced/search.rst:12
msgid "or::"
msgstr "或者:"
-#: ../advanced/search.rst:18
+#: ../advanced/search.rst:16
#, fuzzy
msgid ""
"If you want to run a more complex search, you can use conditions with ``()`` "
@@ -715,23 +717,23 @@ msgid ""
msgstr ""
"如果您想进行更复杂的搜索,您可以使用带有``()``和``AND``/``OR``选项的条件:"
-#: ../advanced/search.rst:24
+#: ../advanced/search.rst:22
#, fuzzy
#| msgid "Available attributes"
msgid "Available Attributes"
msgstr "可用属性"
-#: ../advanced/search.rst:28
+#: ../advanced/search.rst:26
#, fuzzy
msgid ""
"For a more detailed list of available attributes please take a look into "
"our :docs:`Zammad System Documentation `."
msgstr ""
-"如需查看更详细的可用属性列表,请查阅我们的 `Zammad 管理员文档 `_。"
+"如需查看更详细的可用属性列表,请查阅我们的 `Zammad 管理员文档 `_。"
-#: ../advanced/search.rst:35
+#: ../advanced/search.rst:33
msgid "Attributes and their usuage"
msgstr "属性及其用途"
@@ -899,11 +901,11 @@ msgstr ""
"索类似的单词,比如\"head\"。Zammad还允许你在属性允许的地方使用正则表达式进行"
"搜索。"
-#: ../advanced/search.rst:48
+#: ../advanced/search.rst:46
msgid "Combining Search Phrases"
msgstr ""
-#: ../advanced/search.rst:50
+#: ../advanced/search.rst:48
msgid ""
"You can combine search phrases by using ``AND``, ``OR`` and ``TO``, "
"depending on the situation and phrases you use. If needed, you can parts of "
@@ -917,7 +919,7 @@ msgstr ""
"允许你将不同依赖性的几个短语组合在一起(AND/OR)。如果你收到了你想排除的搜索结"
"果,你可以使用否定``!``。以下是一些你可以使用的示例:"
-#: ../advanced/search.rst:57
+#: ../advanced/search.rst:55
msgid "Examples for search phrase combinations"
msgstr ""
@@ -938,8 +940,8 @@ msgstr "显示所有状态为已关闭或开放,并且优先级为正常或带
#: ../advanced/search.rst:1
msgid ""
-"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR tags:"
-"feedback) AND !(*Zammad*)"
+"state.name:(closed OR open) AND (priority.name:\"2 normal\" OR "
+"tags:feedback) AND !(*Zammad*)"
msgstr ""
"状态.名称:(已关闭 或 开放) 并且 (优先级.名称:\"2 正常\" 或 标签:反馈) 并且 !"
"(包含*Zammad*)"
@@ -966,140 +968,140 @@ msgstr "状态.名称:待处理* 和 文章_数量:[1 到 5]"
msgid "Show everything with any pending state and an article count of 1 to 5."
msgstr "显示所有处于任何待处理状态且文章数量在1到5之间的内容。"
-#: ../advanced/search.rst:67
+#: ../advanced/search.rst:65
#, fuzzy
#| msgid "Attributes and their usuage"
msgid "Some Ticket Attributes and Their Type"
msgstr "属性及其用途"
-#: ../advanced/search.rst:69
+#: ../advanced/search.rst:67
msgid ""
"Below you can find the most important attributes sorted by ticket and "
"article."
msgstr ""
-#: ../advanced/search.rst:72
+#: ../advanced/search.rst:70
#, fuzzy
#| msgid "Attribute"
msgid "Ticket Attributes"
msgstr "属性"
-#: ../advanced/search.rst:74
+#: ../advanced/search.rst:72
msgid "number: string"
msgstr ""
-#: ../advanced/search.rst:75
+#: ../advanced/search.rst:73
msgid "title: string"
msgstr ""
-#: ../advanced/search.rst:76
+#: ../advanced/search.rst:74
msgid "group: object (group.name, ...)"
msgstr ""
-#: ../advanced/search.rst:77
+#: ../advanced/search.rst:75
msgid "priority: object (priority.name, ...)"
msgstr ""
-#: ../advanced/search.rst:78
+#: ../advanced/search.rst:76
msgid "state: object (state.name, ...)"
msgstr ""
-#: ../advanced/search.rst:79
+#: ../advanced/search.rst:77
msgid "organization: object (organization.name, ...)"
msgstr ""
-#: ../advanced/search.rst:80
+#: ../advanced/search.rst:78
msgid "owner: object (owner.firstname, owner.lastname, owner.email, ...)"
msgstr ""
-#: ../advanced/search.rst:81
+#: ../advanced/search.rst:79
msgid ""
"customer: object (customer.firstname, customer.lastname, customer.email, ...)"
msgstr ""
-#: ../advanced/search.rst:83
+#: ../advanced/search.rst:81
msgid "first_response_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:84
+#: ../advanced/search.rst:82
msgid "first_response_in_min: integer (business min till first response)"
msgstr ""
-#: ../advanced/search.rst:85
+#: ../advanced/search.rst:83
msgid "close_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:86
+#: ../advanced/search.rst:84
msgid "close_in_min: integer (business min till close)"
msgstr ""
-#: ../advanced/search.rst:87
+#: ../advanced/search.rst:85
msgid "last_contact_at: timestamp (last contact by customer or agent)"
msgstr ""
-#: ../advanced/search.rst:88
+#: ../advanced/search.rst:86
msgid "last_contact_agent_at: timestamp (last contact by agent)"
msgstr ""
-#: ../advanced/search.rst:89
+#: ../advanced/search.rst:87
msgid "last_contact_customer_at: timestamp (last contact by customer)"
msgstr ""
-#: ../advanced/search.rst:90
+#: ../advanced/search.rst:88
msgid "create_article_type.name: string (email|phone|web|...)"
msgstr ""
-#: ../advanced/search.rst:91
+#: ../advanced/search.rst:89
msgid "create_article_sender: string (Customer|Agent|System)"
msgstr ""
-#: ../advanced/search.rst:92
+#: ../advanced/search.rst:90
msgid "article_count: integer"
msgstr ""
-#: ../advanced/search.rst:93
+#: ../advanced/search.rst:91
msgid "escalation_at: timestamp"
msgstr ""
-#: ../advanced/search.rst:94
+#: ../advanced/search.rst:92
msgid "pending_time: timestamp"
msgstr ""
-#: ../advanced/search.rst:97
+#: ../advanced/search.rst:95
#, fuzzy
#| msgid "Available attributes"
msgid "Article Attributes"
msgstr "可用属性"
-#: ../advanced/search.rst:99
+#: ../advanced/search.rst:97
msgid "article.from: string"
msgstr ""
-#: ../advanced/search.rst:100
+#: ../advanced/search.rst:98
msgid "article.to: string"
msgstr ""
-#: ../advanced/search.rst:101
+#: ../advanced/search.rst:99
msgid "article.cc: string"
msgstr ""
-#: ../advanced/search.rst:102
+#: ../advanced/search.rst:100
msgid "article.subject: string"
msgstr ""
-#: ../advanced/search.rst:103
+#: ../advanced/search.rst:101
msgid "article.body: string"
msgstr ""
-#: ../advanced/search.rst:104
+#: ../advanced/search.rst:102
msgid "article.attachment.title: string (filename of attachment)"
msgstr ""
-#: ../advanced/search.rst:105
+#: ../advanced/search.rst:103
msgid "article.attachment.content: string (content of attachment)"
msgstr ""
-#: ../advanced/search.rst:106
+#: ../advanced/search.rst:104
msgid "article.attachment.content_type: string (File type e.g. PDF)"
msgstr ""
@@ -1330,55 +1332,51 @@ msgstr ""
#: ../advanced/tabs.rst:4
msgid ""
"As you click through Zammad, you will see a list of entries appear in the "
-"main menu area. These are your **open tabs.**"
-msgstr ""
-
-#: ../advanced/tabs.rst:7
-msgid ""
-"You can freely switch between open tabs without losing your work - all "
-"unsaved changes are automatically backed up to the server."
+"main menu area. These are your **open tabs.** You can freely switch between "
+"open tabs without losing your work - all unsaved changes are automatically "
+"backed up to the server."
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid "Sample view of Tabs"
msgstr ""
-#: ../advanced/tabs.rst:13
+#: ../advanced/tabs.rst:12
msgid ""
"Tabs appear in the main menu as you visit different parts of the application."
msgstr ""
-#: ../advanced/tabs.rst:16
+#: ../advanced/tabs.rst:15
msgid "**What items open in a new “tab”?**"
msgstr ""
-#: ../advanced/tabs.rst:18
+#: ../advanced/tabs.rst:17
msgid "Existing tickets"
msgstr ""
-#: ../advanced/tabs.rst:19
+#: ../advanced/tabs.rst:18
msgid "New tickets"
msgstr ""
-#: ../advanced/tabs.rst:20
+#: ../advanced/tabs.rst:19
msgid "Users"
msgstr ""
-#: ../advanced/tabs.rst:21 ../extras/organizations.rst:2
+#: ../advanced/tabs.rst:20 ../extras/organizations.rst:2
msgid "Organizations"
msgstr ""
-#: ../advanced/tabs.rst:22
+#: ../advanced/tabs.rst:21
msgid "Omnisearch"
msgstr ""
-#: ../advanced/tabs.rst:24 ../basics/find-ticket/browse.rst:27
+#: ../advanced/tabs.rst:23 ../basics/find-ticket/browse.rst:27
#: ../basics/find-ticket/search.rst:33 ../basics/service-ticket/create.rst:47
#: ../snippets/ui-protip-message-editor-features.rst:1
msgid "**🖱️ UI Protip**"
msgstr "**🖱️ UI 高级技巧**"
-#: ../advanced/tabs.rst:26
+#: ../advanced/tabs.rst:25
msgid ""
":doc:`Ticket states ` are **color-"
"coded:**"
@@ -1416,21 +1414,21 @@ msgstr ""
msgid "**Immediate action needed** (ticket escalated due to an SLA violation)"
msgstr ""
-#: ../advanced/tabs.rst:31
+#: ../advanced/tabs.rst:30
msgid ""
"A **pulsing dot** means that a ticket has new activity since you last viewed "
"it."
msgstr ""
-#: ../advanced/tabs.rst:33
+#: ../advanced/tabs.rst:32
msgid "Drag and drop tabs to rearrange them."
msgstr ""
-#: ../advanced/tabs.rst:36
+#: ../advanced/tabs.rst:35
msgid "Tab Behavior in Ticket Zooms"
msgstr ""
-#: ../advanced/tabs.rst:38
+#: ../advanced/tabs.rst:37
msgid ""
"You may have noticed the \"Stay on tab\" button next to \"Update\" on the "
"lower right already. This behavior of a tab can be configured by your "
@@ -1442,47 +1440,47 @@ msgstr ""
msgid "Tab behavior can be adjusted in tickets manually"
msgstr ""
-#: ../advanced/tabs.rst:47
+#: ../advanced/tabs.rst:46
msgid ""
"To overrule your administrator's settings, simply choose the action you "
"prefer. Zammad will remember this preference until you change its setting."
msgstr ""
-#: ../advanced/tabs.rst:52
+#: ../advanced/tabs.rst:51
msgid "Close tab"
msgstr ""
-#: ../advanced/tabs.rst:51
+#: ../advanced/tabs.rst:50
msgid ""
"Upon updating the ticket, Zammad will automatically close the tab. You'll be "
"returned to the last view that was open."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "Close tab on ticket close"
msgstr ""
-#: ../advanced/tabs.rst:55
+#: ../advanced/tabs.rst:54
msgid ""
"Ticket tabs will be closed only if you change the state to \"closed\" upon "
"ticket update."
msgstr ""
-#: ../advanced/tabs.rst:58
+#: ../advanced/tabs.rst:57
msgid "This does not apply for pending states that end in closed states."
msgstr ""
-#: ../advanced/tabs.rst:66
+#: ../advanced/tabs.rst:65
msgid "Next in overview"
msgstr ""
-#: ../advanced/tabs.rst:61
+#: ../advanced/tabs.rst:60
msgid ""
"If you opened a ticket from any overview, Zammad will jump to the next "
"ticket in said overview. Zammad recycles the open tab."
msgstr ""
-#: ../advanced/tabs.rst:64
+#: ../advanced/tabs.rst:63
msgid ""
"This option is only available if you open the ticket from an overview. "
"Zammad will ignore the setting if you opened the ticket directly and fall "
@@ -1493,14 +1491,22 @@ msgstr ""
msgid "Stay on tab"
msgstr ""
-#: ../advanced/tabs.rst:69
+#: ../advanced/tabs.rst:68
msgid "Updating the ticket doesn't have any effect on the tab."
msgstr ""
-#: ../advanced/tabs.rst:71
+#: ../advanced/tabs.rst:70
msgid "*This is the default setting in Zammad installations.*"
msgstr ""
+#: ../advanced/tabs.rst:72
+msgid ""
+"Now that you are an expert in tab handling, one more thing might be "
+"interesting as well: the maximum number of tabs is 30 due to performance "
+"reasons. In case you reach the limit and open another tab, the first opened "
+"tab gets closed automatically."
+msgstr ""
+
#: ../advanced/text-modules.rst:2
msgid "Working with Text Modules"
msgstr ""
@@ -1572,8 +1578,8 @@ msgstr ""
#: ../advanced/text-modules.rst:46
msgid ""
-"Administrators can learn more about customizing text modules :admin-docs:"
-"`here `."
+"Administrators can learn more about customizing text modules :admin-"
+"docs:`here `."
msgstr ""
#: ../advanced/ticket-actions.rst:2
@@ -1595,8 +1601,8 @@ msgstr ""
msgid ""
"When tickets about related issues arise, they can be linked to each other "
"for easier reference. For example this could be useful if you have multiple "
-"customer complaints about the same shipment. :doc:`Merged ` and :doc:"
-"`split ` tickets are automatically linked."
+"customer complaints about the same shipment. :doc:`Merged ` "
+"and :doc:`split ` tickets are automatically linked."
msgstr ""
#: ../advanced/ticket-actions/link.rst:16
@@ -1647,7 +1653,7 @@ msgid ""
msgstr ""
#: ../advanced/ticket-actions/link.rst:33
-#: ../advanced/ticket-actions/merge.rst:35
+#: ../advanced/ticket-actions/merge.rst:36
msgid ""
"If the customer has an existing ticket, it will show up under \"Recent "
"customer tickets\". You can see your last viewed tickets under \"Recently "
@@ -1698,36 +1704,38 @@ msgstr ""
msgid ""
"Let's assume you already worked on a ticket and you get another ticket about "
"the same issue and want to merge them. Let's call the ticket you already "
-"worked on the *original* one and the new one *duplicate*. Then the way to go "
-"is to open the duplicate ticket and execute the merging from there so it "
-"will be merged into the original."
+"worked on the *original* or *target* ticket and the new one *duplicate* or "
+"*source* ticket. Then the way to go is to open the duplicate ticket and "
+"execute the merging from there so it will be merged into the original ticket."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:28
+#: ../advanced/ticket-actions/merge.rst:29
msgid "How to merge tickets?"
msgstr ""
#: ../advanced/ticket-actions/merge.rst:24
-msgid "To merge a ticket, access the **Ticket ▾** submenu in the ticket pane."
+msgid ""
+"To merge a ticket, access the **Ticket ▾** submenu in the ticket pane and "
+"choose **Merge**."
msgstr ""
#: ../advanced/ticket-actions/merge.rst:0
msgid "Ticket menu with highlighted \"merge\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:40
+#: ../advanced/ticket-actions/merge.rst:41
#, fuzzy
msgid "Merge dialog"
msgstr "宏"
-#: ../advanced/ticket-actions/merge.rst:31
+#: ../advanced/ticket-actions/merge.rst:32
msgid ""
"You can either enter the ticket number of the ticket you want to merge the "
"current one into (see 1). Alternatively, you can choose from the list below "
"(see 2)."
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:39
+#: ../advanced/ticket-actions/merge.rst:40
msgid ""
"After entering a ticket number or choosing one of the offered tickets from "
"the list, click on the submit button and the tickets will be merged."
@@ -1737,28 +1745,40 @@ msgstr ""
msgid "Merge ticket dialog"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:59
msgid "Result after merging"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:48
+#: ../advanced/ticket-actions/merge.rst:49
msgid ""
"The articles are moved into the chosen tickets. The ticket in which you "
"executed the merging still exists with the following changes:"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:51
+#: ../advanced/ticket-actions/merge.rst:52
msgid "The articles have been replaced by a \"merged\" label"
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:52
+#: ../advanced/ticket-actions/merge.rst:53
msgid "The state has changed to \"merged\""
msgstr ""
-#: ../advanced/ticket-actions/merge.rst:53
+#: ../advanced/ticket-actions/merge.rst:54
msgid "The ticket is :doc:`linked ` to its \"parent\" ticket"
msgstr ""
+#: ../advanced/ticket-actions/merge.rst:56
+msgid ""
+"If you merge two tickets which were created from different channels, you "
+"have to answer via channel of the remaining target ticket."
+msgstr ""
+
+#: ../advanced/ticket-actions/merge.rst:59
+msgid ""
+"Example: if you merge a Whatsapp ticket into an email ticket, you have to "
+"answer via email channel in the target ticket."
+msgstr ""
+
#: ../advanced/ticket-actions/split.rst:2
msgid "Splitting Tickets"
msgstr ""
@@ -2332,8 +2352,9 @@ msgstr ""
#: ../basics/service-ticket/follow-up.rst:19
msgid ""
-"Tickets are threads of messages & notes about a customer service issue. :doc:"
-"`⚙️ Manage ticket settings ` in the **ticket pane** on the right."
+"Tickets are threads of messages & notes about a customer service "
+"issue. :doc:`⚙️ Manage ticket settings ` in the **ticket pane** on "
+"the right."
msgstr ""
#: ../basics/service-ticket/follow-up.rst:23
@@ -2691,8 +2712,8 @@ msgstr ""
#: ../basics/service-ticket/settings/group.rst:31
msgid ""
-"So how do I manage which team I'm on? You don't - that's the :admin-docs:"
-"`administrator's job `."
+"So how do I manage which team I'm on? You don't - that's the :admin-"
+"docs:`administrator's job `."
msgstr ""
#: ../basics/service-ticket/settings/group.rst:34
@@ -2797,8 +2818,8 @@ msgstr ""
#: ../basics/service-ticket/settings/priority.rst:25
msgid ""
-"Priority can also be used as a ticket filter when creating :admin-docs:"
-"`custom overviews `."
+"Priority can also be used as a ticket filter when creating :admin-"
+"docs:`custom overviews `."
msgstr ""
#: ../basics/service-ticket/settings/priority.rst:28
@@ -2838,9 +2859,9 @@ msgstr ""
#: ../basics/service-ticket/settings/state.rst:10
msgid ""
-"merged (this Ticket has been merged into another Ticket. Check either the :"
-"doc:`linked tickets ` or the :ref:`ticket "
-"history ` to learn more)"
+"merged (this Ticket has been merged into another Ticket. Check either "
+"the :doc:`linked tickets ` or "
+"the :ref:`ticket history ` to learn more)"
msgstr ""
#: ../basics/service-ticket/settings/state.rst:14
@@ -3462,8 +3483,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:253
msgid ""
-"See our :admin-docs:`admin documentation ` for all third party authentication providers."
+"See our :admin-docs:`admin documentation ` for all third party authentication providers."
msgstr ""
#: ../basics/zammad-glossary.rst:257
@@ -4003,8 +4024,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:552
msgid ""
"Priorities can even be adjusted or extended to fit your needs. Your "
-"administrator can find more information :admin-docs:`here `."
+"administrator can find more information :admin-docs:`here `."
msgstr ""
#: ../basics/zammad-glossary.rst:557
@@ -4091,8 +4112,8 @@ msgid ""
"The scheduler is one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
"conditions in a time based manner. More information in the admin "
-"documentation in the :admin-docs:`scheduler section `."
+"documentation in the :admin-docs:`scheduler section `."
msgstr ""
#: ../basics/zammad-glossary.rst:623
@@ -4287,8 +4308,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:705
msgid ""
-"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
+"Administrators can learn more about tags :admin-docs:`here `. Agents can learn more about this function on this page: :doc:`/"
"basics/service-ticket/settings/tags`"
msgstr ""
@@ -4306,8 +4327,8 @@ msgstr ""
#: ../basics/zammad-glossary.rst:716
msgid ""
-"For example, here at Zammad, we have a text module with the shortcut ``::"
-"ilff``, which turns into ``I look forward to your feedback``."
+"For example, here at Zammad, we have a text module with the shortcut "
+"``::ilff``, which turns into ``I look forward to your feedback``."
msgstr ""
#: ../basics/zammad-glossary.rst:719
@@ -4361,8 +4382,8 @@ msgstr ""
msgid ""
"Triggers are one of Zammad's automation features. An admin can define "
"specific conditions and actions which are applied to tickets with matching "
-"conditions. More information in the admin documentation in the :admin-docs:"
-"`trigger section `."
+"conditions. More information in the admin documentation in the :admin-"
+"docs:`trigger section `."
msgstr ""
#: ../basics/zammad-glossary.rst:751
@@ -4438,8 +4459,8 @@ msgstr ""
msgid ""
"This feature is **optional**; if you don't see it in the main menu, that "
"means your administrator hasn't enabled it yet. Administrators can learn "
-"more on our :admin-docs:`admin documentation `."
+"more on our :admin-docs:`admin documentation `."
msgstr ""
#: ../extras/caller-log.rst:14
@@ -5488,8 +5509,8 @@ msgstr ""
msgid ""
"The roles require **knowledge base reader permission**. Your administrator "
"has to provide the relevant groups with reader permissions for the knowledge "
-"base. If you're unsure, please ask your administrator to configure the :"
-"admin-docs:`role permissions ` "
+"base. If you're unsure, please ask your administrator to configure "
+"the :admin-docs:`role permissions ` "
"accordingly."
msgstr ""
@@ -7061,8 +7082,8 @@ msgstr ""
msgid ""
"Depending on the chosen two-factor method, you will be guided again through "
"the setup process. Normally, editing a method will simply renew it and "
-"replace the older setup, but some methods do support advanced functions (e."
-"g. adding multiple security keys)."
+"replace the older setup, but some methods do support advanced functions "
+"(e.g. adding multiple security keys)."
msgstr ""
#: ../extras/two-factor-authentication.rst:156
@@ -7356,9 +7377,9 @@ msgstr ""
#: ../index.rst:5
msgid ""
-"You are currently reading the Zammad user documentation. There are also :"
-"docs:`system ` and :admin-docs:`administration manuals ` available."
+"You are currently reading the Zammad user documentation. There are "
+"also :docs:`system ` and :admin-docs:`administration manuals "
+"index.html>` available."
msgstr ""
#, fuzzy