diff --git a/gallery/templates/gallery/photo_slideshow.html b/gallery/templates/gallery/photo_slideshow.html
index 3797e82..b44ca15 100644
--- a/gallery/templates/gallery/photo_slideshow.html
+++ b/gallery/templates/gallery/photo_slideshow.html
@@ -1,8 +1,9 @@
-
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+
+{% load static %}
- {% load static %}
- {% load i18n %}
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 64c7868..7e131e0 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -149,4 +149,25 @@ msgid "Nyymix.net Gallery"
msgstr "Nyymix.net Gallery"
msgid "Page %(current)s of %(total)s"
-msgstr "Page %(current)s of %(total)s"
\ No newline at end of file
+msgstr "Page %(current)s of %(total)s"
+
+msgid "404 - Page not found"
+msgstr "404 - Page not found"
+
+msgid "Sorry, we couldn’t find the page you were looking for."
+msgstr "Sorry, we couldn’t find the page you were looking for."
+
+msgid "You’ll be redirected to the homepage in a few seconds."
+msgstr "You’ll be redirected to the homepage in a few seconds."
+
+msgid "Return to homepage"
+msgstr "Return to homepage"
+
+msgid "500 - Server Error"
+msgstr "500 - Server Error"
+
+msgid "Oops! Something went wrong on our end."
+msgstr "HOops! Something went wrong on our end."
+
+msgid "We’re working to fix it — you’ll be redirected shortly."
+msgstr "We’re working to fix it — you’ll be redirected shortly."
diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index 6875863..ca2a89a 100644
--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -149,4 +149,25 @@ msgid "Nyymix.net Gallery"
msgstr "Nyymix.net kuvagalleria"
msgid "Page %(current)s of %(total)s"
-msgstr "Sivu %(current)s / %(total)s"
\ No newline at end of file
+msgstr "Sivu %(current)s / %(total)s"
+
+msgid "404 - Page not found"
+msgstr "404 - Sivua ei löytynyt"
+
+msgid "Sorry, we couldn’t find the page you were looking for."
+msgstr "Valitettavasti etsimääsi sivua ei löytynyt."
+
+msgid "You’ll be redirected to the homepage in a few seconds."
+msgstr "Sinut ohjataan etusivulle muutaman sekunnin kuluttua."
+
+msgid "Return to homepage"
+msgstr "Palaa etusivulle"
+
+msgid "500 - Server Error"
+msgstr "500 – Palvelinvirhe"
+
+msgid "Oops! Something went wrong on our end."
+msgstr "Hups! Jotain meni pieleen palvelimella."
+
+msgid "We’re working to fix it — you’ll be redirected shortly."
+msgstr "Työskentelemme ongelman korjaamiseksi — sinut ohjataan pian uudelleen."
diff --git a/templates/404.html b/templates/404.html
index 3bdf8e9..5ae9be1 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,14 +1,12 @@
-
+{% load i18n %}
+
- 404 - Page not found
+ {% trans "404 - Page not found" %}
-
-
-
@@ -21,11 +19,11 @@
404
- Sorry, we couldn’t find the page you were looking for.
- You’ll be redirected to the homepage in a few seconds.
+ {% trans "Sorry, we couldn’t find the page you were looking for." %}
+ {% trans "You’ll be redirected to the homepage in a few seconds." %}
- Return to homepage
+ {% trans "Return to homepage" %}
diff --git a/templates/500.html b/templates/500.html
index 95ddbc3..b0087ec 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -1,18 +1,15 @@
-
+{% load i18n %}
+
- 500 - Server Error
+ {% trans "500 - Server Error" %}
-
-
-
-
@@ -22,11 +19,11 @@
500
- Oops! Something went wrong on our end.
- We’re working to fix it — you’ll be redirected shortly.
+ {% trans "Oops! Something went wrong on our end." %}
+ {% trans "We’re working to fix it — you’ll be redirected shortly." %}
- Return to homepage
+ {% trans "Return to homepage" %}
diff --git a/templates/base.html b/templates/base.html
index 196d6eb..3f34180 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,8 @@
-
-{% load static %}
{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+
+{% load static %}
{% load top_tags %}