resolve merge conflicts

1 files changed, 10 insertions, 3 deletions

diff --git a/templates/404.html b/templates/404.html
index 02c7688..f3fbfe9 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -17,8 +17,15 @@
 
 {%- block content %}
     <div>
-      <h1>Page not found :(</h1>
-      <p>The page you are looking for doesn't exist or has been moved.</p>
-      <p>Try using the search, or <a href="{{ config.base_url | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">go home</a>.</p>
+      <h1>404 :(</h1>
+      {#- Default English message #}
+      <p>Page not found, maybe moved{% if config.languages | length > 0 %} or not in this language{% endif %}. {% if config.build_search_index %}Try searching or{% endif %} <a href="{{ config.base_url | safe }}/{%- if config.extra.uglyurls %}index.html{%- endif %}">go to homepage</a>.</p>
+
+      {# Iterate through each language and display the localised 404 message #}
+      {%- for lcode, language in config.languages -%}
+        {%- if lcode != config.default_language -%}
+          <p>{{ trans(key="404_not_found", lang=lcode) }}. {% if config.build_search_index %}{{ trans(key="404_try_search", lang=lcode) }}{% endif %} <a href="{{ config.base_url }}/{{ lcode }}/{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ trans(key="404_go_home", lang=lcode) }}</a>.</p>
+        {%- endif -%}
+      {%- endfor -%}
     </div>
 {%- endblock content %}