Merge branch 'manual-3.4'

dainst · May 22, 2024 · a52c8a1 · a52c8a1
2 parents df9dc72 + 79091db
commit a52c8a1
Show file tree

Hide file tree

Showing 21 changed files with 320 additions and 71 deletions.
diff --git a/desktop/img/README-1.png b/desktop/img/README-1.png
diff --git a/desktop/img/README-FEATURES-1.png b/desktop/img/README-FEATURES-1.png
diff --git a/desktop/img/README-FEATURES-2.png b/desktop/img/README-FEATURES-2.png
diff --git a/desktop/img/README-FEATURES-3.png b/desktop/img/README-FEATURES-3.png
diff --git a/desktop/img/README-FEATURES-4.png b/desktop/img/README-FEATURES-4.png
diff --git a/desktop/img/README-FEATURES-5.png b/desktop/img/README-FEATURES-5.png
diff --git a/desktop/img/README-FEATURES-6.png b/desktop/img/README-FEATURES-6.png
diff --git a/desktop/img/README-FEATURES-7.png b/desktop/img/README-FEATURES-7.png
diff --git a/desktop/img/README-FEATURES-8.png b/desktop/img/README-FEATURES-8.png
diff --git a/desktop/src/manual/images/de/configuration/categories_filter.png b/desktop/src/manual/images/de/configuration/categories_filter.png
diff --git a/desktop/src/manual/images/de/resources/context_menu.png b/desktop/src/manual/images/de/resources/context_menu.png
diff --git a/desktop/src/manual/images/de/resources/goto_operation.png b/desktop/src/manual/images/de/resources/goto_operation.png
diff --git a/desktop/src/manual/images/de/resources/open_collection.png b/desktop/src/manual/images/de/resources/open_collection.png
diff --git a/...ges/de/synchronization/conflicts_icon.png → ...nual/images/de/warnings/warnings_icon.png b/...ges/de/synchronization/conflicts_icon.png → ...nual/images/de/warnings/warnings_icon.png
diff --git a/desktop/src/manual/images/en/configuration/categories_filter.png b/desktop/src/manual/images/en/configuration/categories_filter.png
diff --git a/desktop/src/manual/images/en/resources/context_menu.png b/desktop/src/manual/images/en/resources/context_menu.png
diff --git a/desktop/src/manual/images/en/resources/goto_operation.png b/desktop/src/manual/images/en/resources/goto_operation.png
diff --git a/desktop/src/manual/images/en/resources/open_collection.png b/desktop/src/manual/images/en/resources/open_collection.png
diff --git a/...ges/en/synchronization/conflicts_icon.png → ...nual/images/en/warnings/warnings_icon.png b/...ges/en/synchronization/conflicts_icon.png → ...nual/images/en/warnings/warnings_icon.png
diff --git a/desktop/src/manual/manual.de.md b/desktop/src/manual/manual.de.md
diff --git a/desktop/src/manual/manual.en.md b/desktop/src/manual/manual.en.md