diff --git a/config.toml b/config.toml
index f48a5a87..df382fdf 100644
--- a/config.toml
+++ b/config.toml
@@ -15,6 +15,10 @@ build_search_index = false
ignored_content = [".DS_Store"]
+taxonomies = [
+ {name = "faq", feed = false},
+]
+
[markdown]
external_links_target_blank = true
@@ -30,11 +34,13 @@ stripe = "https://donate.organicmaps.app/"
address = "Address"
back = "Back to News"
contact = "Contact Us"
+engines = "Supported TTS Engines"
install-appgallery = "Install Organic Maps from Huawei AppGallery"
install-appstore = "Install Organic Maps from the AppStore"
install-googleplay = "Install Organic Maps from Google Play"
install-fdroid="Install Organic Maps from F-Droid"
language = "English"
+const_lang = "Language"
name = "Name"
token = "Token"
button-download = "Download"
@@ -827,4 +833,5 @@ services_section_card_description_3 = "Save Your Battery Efficiently uses your b
services_section_card_description_4 = "People like you helped build the app by adding locations to the OpenStreetMap, giving feedback on features, and contributing code"
single_section_title = "Offline Search and Route"
single_section_description = "See the place you want to go while in an underground parking garage, and navigate while on a distant hike."
-learn-more-link = "Learn more"
\ No newline at end of file
+learn-more-link = "Learn more"
+
diff --git a/content/faq/how-edits-are-uploaded-on-openstreetmap-org/index.md b/content/faq/how-edits-are-uploaded-on-openstreetmap-org/index.md
new file mode 100644
index 00000000..7b3b4474
--- /dev/null
+++ b/content/faq/how-edits-are-uploaded-on-openstreetmap-org/index.md
@@ -0,0 +1,15 @@
+---
+title: How edits are uploaded on OpenStreetMap.org, how conflicts are resolved?
+description: "Frequently asked questions for Organic Maps application"
+
+taxonomies:
+ faq: ["Map"]
+
+extra:
+ order: 150
+---
+
+Organic Maps application stores POI changes locally till internet connection is available.
+You can make changes while offline. Edits are uploaded to [OpenStreetMap.org](https://osm.org) in background.
+
+If there are edit conflicts ???
diff --git a/content/faq/how-to-add-intermediate-points/index.md b/content/faq/how-to-add-intermediate-points/index.md
new file mode 100644
index 00000000..01d2a88f
--- /dev/null
+++ b/content/faq/how-to-add-intermediate-points/index.md
@@ -0,0 +1,12 @@
+---
+title: Добавить промежуточные точки для обхода/объезда (как?)
+description: "Frequently asked questions for Organic Maps application"
+
+taxonomies:
+ faq: ["Routing"]
+
+extra:
+ order: 60
+---
+
+???
diff --git a/content/faq/index.md b/content/faq/index.md
index bd2a7a26..5945019c 100644
--- a/content/faq/index.md
+++ b/content/faq/index.md
@@ -1,20 +1,23 @@
----
-title:
-description:
-template: faq.html
-weight: 10
-extra:
- hero_title: Faq
- hero_image: /faq/hero_image.png
- menu_title_pre: Home
- faq_question_title_1: General
- faq_question_title_1_1: What is Telegram?
- faq_question_title_1_2: Who is it for?
- faq_question_title_1_3: How is it different from WhatsApp?
- faq_question_title_1_4: How old is Telegram?
- faq_question_title_1_5: Is it available on my device?
- faq_question_title_1_6: Who are the people behind Telegram?
- faq_question_title_2: Telegram Basics
- faq_question_title_3: Groups and Channels
-
----
\ No newline at end of file
+---
+title: "F.A.Q."
+description: "Frequently asked questions for Organic Maps application"
+template: faq.html
+weight: 1000
+extra:
+ hero_title: Faq
+ hero_image: /faq/hero_image.png
+ menu_title_pre: Home
+ faq_question_title_1: General
+ faq_question_title_1_1: What is Telegram?
+ faq_question_title_1_2: Who is it for?
+ faq_question_title_1_3: How is it different from WhatsApp?
+ faq_question_title_1_4: How old is Telegram?
+ faq_question_title_1_5: Is it available on my device?
+ faq_question_title_1_6: Who are the people behind Telegram?
+ faq_question_title_2: Telegram Basics
+ faq_question_title_3: Groups and Channels
+sort_by: weight
+---
+
+### This page is replaced with taxonomy "faq" from templates/faq/list.html template
+This file is needed for top_menu.html and bottom_menu.html templates to show F.A.Q.
\ No newline at end of file
diff --git a/static/images/screenshots/tts_config_1.jpg b/static/images/screenshots/tts_config_1.jpg
new file mode 100644
index 00000000..0cd45591
Binary files /dev/null and b/static/images/screenshots/tts_config_1.jpg differ
diff --git a/static/images/screenshots/tts_config_2.jpg b/static/images/screenshots/tts_config_2.jpg
new file mode 100644
index 00000000..1226f9e0
Binary files /dev/null and b/static/images/screenshots/tts_config_2.jpg differ
diff --git a/static/images/screenshots/tts_config_3.jpg b/static/images/screenshots/tts_config_3.jpg
new file mode 100644
index 00000000..219a2929
Binary files /dev/null and b/static/images/screenshots/tts_config_3.jpg differ
diff --git a/static/images/screenshots/tts_test.png b/static/images/screenshots/tts_test.png
new file mode 100644
index 00000000..8ff80cdc
Binary files /dev/null and b/static/images/screenshots/tts_test.png differ
diff --git a/templates/base.html b/templates/base.html
index bb3b8132..0934af80 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,19 @@
{%- if page %}
- {%- set resource = page %}
+{%- set resource = page %}
+{%- set resource_title = resource.title %}
+{%- set resource_path = resource.path %}
{%- elif section %}
- {%- set resource = section %}
+{%- set resource = section %}
+{%- set resource_title = resource.title %}
+{%- set resource_path = resource.path %}
+{%- elif term %}
+{%- set resource = term %}{# taxonomy term has only 'name', 'slug' and 'path' properties #}
+{%- set resource_path = resource.path %}
+{%- set resource_title = resource.name %}
+{%- elif taxonomy %}
+{%- set resource = taxonomy %}{# taxonomy has only 'name' and 'slug' properties #}
+{%- set resource_path = '/' ~ resource.name ~ '/' %}
+{%- set resource_title = resource.name %}
{%- endif %}
@@ -26,7 +38,9 @@
+ {% block meta_description %}
+ {% endblock %}
@@ -84,7 +98,7 @@
{{ resource.title }}
{%- if lang == config.default_language %}
- {% include 'components/language_redirect.html' %}
+ {% include 'components/language_redirect.html' %}
{% endif -%}
@@ -101,10 +115,18 @@
{% include 'common/header.html' %}
-
+
+ {% if page.taxonomies and page.taxonomies.faq %}{# Show FAQ breadcrumbs #}
+ F.A.Q.
+ {% set categories = get_taxonomy(kind='faq') | get(key="items") %}
+ {% for item in categories %}
+ • {{ item.name }}
+ {% endfor %}
+ {% endif %}
{% block content %}{% endblock %}
+
diff --git a/templates/faq/list.html b/templates/faq/list.html
new file mode 100644
index 00000000..d146ff73
--- /dev/null
+++ b/templates/faq/list.html
@@ -0,0 +1,12 @@
+
+{% extends 'base.html' %} {% block meta_description %}
+ {% endblock %} {% block content %}
+