diff --git a/Makefile b/Makefile
index 93fb718..db64d60 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,10 @@ docker_up:
 
 generate_pot:
 	wp i18n make-pot kit kit/languages/kit.pot # generate source file
-	for lang in "de_DE" "fr_FR"; do \
+	for i18n in "de_DE" "fr_FR"; do \
 	   # update translated language file \
-		msgmerge -N kit/languages/$${lang}.po kit/languages/kit.pot > kit/languages/$${lang}.po ; \
+		msgmerge -N kit/languages/$${i18n}.po kit/languages/kit.pot > kit/languages/$${i18n}.po.new ; \
+		mv kit/languages/$${i18n}.po.new kit/languages/$${i18n}.po ;\
 		# generate mo file \
-		msgfmt -o kit/languages/$${lang}.mo kit/languages/$${lang}.po ; \
+		msgfmt -o kit/languages/$${i18n}.mo kit/languages/$${i18n}.po ; \
 	done
diff --git a/kit/404.php b/kit/404.php
index 0d0f367..eb3822f 100644
--- a/kit/404.php
+++ b/kit/404.php
@@ -7,20 +7,14 @@ get_header();
   <section class="background-color-white category">
     <div class="content-wrap">
       <h2>
-        Seite leider nicht gefunden
+        <?php _e('Page not found', 'kit'); ?>
       </h2>
-
-      Leider wurde die von ihnen gewünschte Seite nicht gefunden.
-
+      <?php _e('Unfortunately the page you requested was not found', 'kit'); ?>.
     </div>
   </section>
 
 </main>
 
-
-
-
-
 <?php
 
   get_template_part('template-parts/sidebar');
diff --git a/kit/languages/de_DE.mo b/kit/languages/de_DE.mo
index 000d8f2..8fbece2 100644
Binary files a/kit/languages/de_DE.mo and b/kit/languages/de_DE.mo differ
diff --git a/kit/languages/de_DE.po b/kit/languages/de_DE.po
index 0c4cbf3..fd2f78d 100644
--- a/kit/languages/de_DE.po
+++ b/kit/languages/de_DE.po
@@ -1,10 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-05-03T15:26:54+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: WP-CLI 2.2.0\n"
+"X-Domain: kit\n"
+
 #: searchpage.php:14 searchpage.php:31 search.php:12 search.php:31
 msgid "Search"
-msgstr ""
+msgstr "Suche"
 
 #: searchpage.php:26 search.php:26
 msgid "Search for"
-msgstr ""
+msgstr "Suche nach"
 
 #: search.php:49
 msgid "Showing results from"
@@ -21,3 +36,11 @@ msgstr ""
 #: search.php:59 search.php:86
 msgid "Page "
 msgstr ""
+
+#: 404.php:10
+msgid "Page not found"
+msgstr "Seite nicht gefunden"
+
+#: 404.php:12
+msgid "Unfortunately the page you requested was not found"
+msgstr "Leider wurde die von ihnen gewünschte Seite nicht gefunden"
diff --git a/kit/languages/fr_FR.mo b/kit/languages/fr_FR.mo
new file mode 100644
index 0000000..88e59f6
Binary files /dev/null and b/kit/languages/fr_FR.mo differ
diff --git a/kit/languages/fr_FR.po b/kit/languages/fr_FR.po
index 0c4cbf3..4697f58 100644
--- a/kit/languages/fr_FR.po
+++ b/kit/languages/fr_FR.po
@@ -1,6 +1,6 @@
 #: searchpage.php:14 searchpage.php:31 search.php:12 search.php:31
 msgid "Search"
-msgstr ""
+msgstr "Recherche"
 
 #: searchpage.php:26 search.php:26
 msgid "Search for"
@@ -21,3 +21,11 @@ msgstr ""
 #: search.php:59 search.php:86
 msgid "Page "
 msgstr ""
+
+#: 404.php:10
+msgid "Page not found"
+msgstr ""
+
+#: 404.php:12
+msgid "Unfortunately the page you requested was not found"
+msgstr ""
diff --git a/kit/languages/kit.pot b/kit/languages/kit.pot
index 1d8a5f8..bf992b8 100644
--- a/kit/languages/kit.pot
+++ b/kit/languages/kit.pot
@@ -7,7 +7,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2020-05-03T15:09:16+00:00\n"
+"POT-Creation-Date: 2020-05-03T15:26:54+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.2.0\n"
 "X-Domain: kit\n"
@@ -42,3 +42,11 @@ msgstr ""
 #: search.php:86
 msgid "Page "
 msgstr ""
+
+#: 404.php:10
+msgid "Page not found"
+msgstr ""
+
+#: 404.php:12
+msgid "Unfortunately the page you requested was not found"
+msgstr ""