Merge remote-tracking branch 'origin/main' into dev

# Conflicts:
#	i18n/pl_PL.yaml
#	i18n/tr_TR.yaml

Author: LinkinStars

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build clean ui
 
-VERSION=1.7.0
+VERSION=1.7.1
 BIN=answer
 DIR_SRC=./cmd/answer
 DOCKER_CMD=docker

README.md

@@ -23,7 +23,7 @@ To learn more about the project, visit [answer.apache.org](https://answer.apache
 ### Running with docker
 
 ```bash
-docker run -d -p 9080:80 -v answer-data:/data --name answer apache/answer:1.7.0
+docker run -d -p 9080:80 -v answer-data:/data --name answer apache/answer:1.7.1
 ```
 
 For more information, see [Installation](https://answer.apache.org/docs/installation).

i18n/cs_CZ.yaml

@@ -58,7 +58,7 @@ backend:
     undelete:
       other: Obnovit
     merge:
-      other: Merge
+      other: Sloučit
   role:
     name:
       user:
@@ -1190,8 +1190,7 @@ ui:
     search:
       placeholder: Search
   footer:
-    build_on: >-
-      Powered by <1> Apache Answer </1>- the open-source software that powers Q&A communities.<br />Made with love © {{cc}}.
+    build_on: Powered by <1> Apache Answer </1>
   upload_img:
     name: Change
     loading: loading...
@@ -1768,6 +1767,7 @@ ui:
     branding: Branding
     legal: Legal
     write: Write
+    terms: Terms
     tos: Terms of Service
     privacy: Privacy
     seo: SEO

i18n/cy_GB.yaml

@@ -1190,8 +1190,7 @@ ui:
     search:
       placeholder: Search
   footer:
-    build_on: >-
-      Powered by <1> Apache Answer </1>- the open-source software that powers Q&A communities.<br />Made with love © {{cc}}.
+    build_on: Powered by <1> Apache Answer </1>
   upload_img:
     name: Change
     loading: loading...
@@ -1768,6 +1767,7 @@ ui:
     branding: Branding
     legal: Legal
     write: Write
+    terms: Terms
     tos: Terms of Service
     privacy: Privacy
     seo: SEO

i18n/da_DK.yaml

@@ -1190,8 +1190,7 @@ ui:
     search:
       placeholder: Søg
   footer:
-    build_on: >-
-      Drevet af <1> Apache Answer</1>- open source-softwaren, der driver Q&A-fællesskaber.<br />Fremstillet med kærlighed ©️ {{cc}}.
+    build_on: Powered by <1> Apache Answer </1>
   upload_img:
     name: Skift
     loading: indlæser...
@@ -1768,6 +1767,7 @@ ui:
     branding: Branding
     legal: Jura
     write: Skriv
+    terms: Terms
     tos: Betingelser for brug
     privacy: Privatliv
     seo: SEO

i18n/de_DE.yaml

@@ -1190,8 +1190,7 @@ ui:
     search:
       placeholder: Suchen
   footer:
-    build_on: >-
-      Betrieben von <1> Apache Answer </1>- die Open-Source-Software, die Q&A-Communities betreibt.<br />Made with love © {{cc}}.
+    build_on: Powered by <1> Apache Answer </1>
   upload_img:
     name: Ändern
     loading: wird geladen...
@@ -1768,6 +1767,7 @@ ui:
     branding: Branding
     legal: Rechtliches
     write: Schreiben
+    terms: Terms
     tos: Nutzungsbedingungen
     privacy: Privatsphäre
     seo: SEO

i18n/en_US.yaml

@@ -1208,9 +1208,7 @@ ui:
     search:
       placeholder: Search
   footer:
-    build_on: >-
-      Powered by <1> Apache Answer </1>- the open-source software that powers Q&A
-      communities.<br />Made with love © {{cc}}.
+    build_on: Powered by <1> Apache Answer </1>
   upload_img:
     name: Change
     loading: loading...
@@ -1807,6 +1805,7 @@ ui:
     branding: Branding
     legal: Legal
     write: Write
+    terms: Terms
     tos: Terms of Service
     privacy: Privacy
     seo: SEO

i18n/es_ES.yaml

@@ -1190,8 +1190,7 @@ ui:
     search:
       placeholder: Buscar
   footer:
-    build_on: >-
-      Sitio creado por <1> Apache Answer </1>- el software libre que impulsa comunidades de Q&A.<br />Hecho con amor © {{cc}}.
+    build_on: Powered by <1> Apache Answer </1>
   upload_img:
     name: Cambiar
     loading: cargando...
@@ -1768,6 +1767,7 @@ ui:
     branding: Marca
     legal: Legal
     write: Escribir
+    terms: Terms
     tos: Términos de servicio
     privacy: Privacidad
     seo: ESTE

i18n/fa_IR.yaml

@@ -1190,8 +1190,7 @@ ui:
     search:
       placeholder: جستجو
   footer:
-    build_on: >-
-      پشتیبانی شده توسط <1> Apache Answer </1> - نرم‌افزار منبع باز که باهمستان های پرسش و پاسخ را تقویت می کند.<br />ساخته شده با عشق © {{cc}}.
+    build_on: Powered by <1> Apache Answer </1>
   upload_img:
     name: تغییر
     loading: درحال بارگذاری...
@@ -1768,6 +1767,7 @@ ui:
     branding: نام تجاری
     legal: قانونی
     write: نوشتن
+    terms: Terms
     tos: قوانین
     privacy: حریم خصوصی
     seo: سئو

i18n/fr_FR.yaml

@@ -1190,8 +1190,7 @@ ui:
     search:
       placeholder: Rechercher
   footer:
-    build_on: >-
-      Propulsé par <1> Apache Answer </1>- le logiciel open-source qui alimente les communautés de Q&A.<br />Fait avec amour ©️ {{cc}}.
+    build_on: Powered by <1> Apache Answer </1>
   upload_img:
     name: Remplacer
     loading: chargement en cours...
@@ -1768,6 +1767,7 @@ ui:
     branding: Marque
     legal: Légal
     write: Écrire
+    terms: Terms
     tos: Conditions d'utilisation
     privacy: Confidentialité
     seo: SEO