diff --git a/site/plugins/admin/lang/de_DE.yaml b/site/plugins/admin/lang/de_DE.yaml
index 8f79da53..46317040 100644
--- a/site/plugins/admin/lang/de_DE.yaml
+++ b/site/plugins/admin/lang/de_DE.yaml
@@ -1,134 +1,134 @@
 ---
-admin: "Admin"
-admin_welcome: "Welcome"
-admin_create_new_user_welcome: "To finish setup and secure your site, please create the first user by entering the necessary information below."
-admin_cancel: "Cancel"
-admin_create: "Create"
-admin_debugging: "Debugging"
+admin: "Administrator"
+admin_welcome: "Willkommen"
+admin_create_new_user_welcome: "Bitte erstelle nachfolgend einen ersten Benutzer durch die Eingabe der benötigten Informationen um die Installation abzuschliessen und deine Seite abzusichern."
+admin_cancel: "Abbrechen"
+admin_create: "Erstellen"
+admin_debugging: "Fehlerbehebung"
 admin_email: "Email"
 admin_flextype_version: "Flextype Version"
 admin_information: "Information"
-admin_installed: "Installed"
-admin_keywords: "Keywords"
-admin_documentation: "Documentation"
+admin_installed: "Installiert"
+admin_keywords: "Schlüsselwörter"
+admin_documentation: "Dokumentation"
 admin_memcache_server: "Memcache Server"
 admin_memcache_port: "Memcache Port"
-admin_login: "Login"
-admin_entries: "Entries"
-admin_extends: "Extends"
-admin_plugins: "Plugins"
+admin_login: "Anmeldung"
+admin_entries: "Einträge"
+admin_extends: "Erweitern"
+admin_plugins: "Erweiterungen"
 admin_themes: "Themes"
-admin_help: "Help"
-admin_getting_help: "Getting Help"
-admin_message_json_invalid: "Invalid JSON"
-admin_logout: "Logout"
-admin_profile: "Profile"
-admin_view_site: "View Site"
+admin_help: "Hilfe"
+admin_getting_help: "Hilfe holen"
+admin_message_json_invalid: "Ungültige JSON Daten"
+admin_logout: "Abmelden"
+admin_profile: "Profil"
+admin_view_site: "Seite anzeigen"
 admin_snippets: "Snippets"
-admin_not_installed: "Not Installed"
-admin_off: "Off"
-admin_on: "On"
+admin_not_installed: "Nicht installiert"
+admin_off: "Aus"
+admin_on: "An"
 admin_add: "Hinzufügen"
-admin_entry_attributes: "Entry Attributes"
-admin_fieldset_for_template: "Fieldset for template"
-admin_content: "Content"
-admin_create_new_entry: "Create New Entry"
-admin_date: "Date"
-admin_draft: "Draft"
-admin_edit: "Edit"
-admin_blocks: "Blocks"
-admin_media: "Media"
-admin_settings: "Settings"
-admin_templates: "Templates"
-admin_entry: "Entry"
-admin_fieldset: "Fieldset"
-admin_source: "Source"
-admin_upload: "Upload"
-admin_hidden: "Hidden"
-admin_image_preview: "Image preview"
-admin_move: "Move"
-admin_parent_entry: "Entry parent"
-admin_preview: "Preview"
-admin_publish: "Publish"
-admin_rename: "Rename"
-admin_save_entry: "Save entry"
-admin_template: "Template"
-admin_title: "Title"
+admin_entry_attributes: "Eintragsattribute"
+admin_fieldset_for_template: "Fieldset für Vorlage"
+admin_content: "Inhalt"
+admin_create_new_entry: "Neuen Eintrag erstellen"
+admin_date: "Datum"
+admin_draft: "Entwurf"
+admin_edit: "Bearbeiten"
+admin_blocks: "Blöcke"
+admin_media: "Medien"
+admin_settings: "Einstellungen"
+admin_templates: "Vorlagen"
+admin_entry: "Eintrag"
+admin_fieldset: "Feldgruppe"
+admin_source: "Quelle"
+admin_upload: "Hochladen"
+admin_hidden: "Versteckt"
+admin_image_preview: "Bildvorschau"
+admin_move: "Verschieben"
+admin_parent_entry: "Übergeordneter Eintrag"
+admin_preview: "Vorschau"
+admin_publish: "Veröffentlichen"
+admin_rename: "Umbenennen"
+admin_save_entry: "Eintrag speichern"
+admin_template: "Vorlage"
+admin_title: "Titel"
 admin_url: "Url"
-admin_view: "View"
-admin_visibility: "Visibility"
-admin_visible: "Visible"
-admin_password: "Password"
-admin_php_built_on: "PHP Built On"
+admin_view: "Ansehen"
+admin_visibility: "Sichtbarkeit"
+admin_visible: "Sichtbar"
+admin_password: "Passwort"
+admin_php_built_on: "Basiert auf PHP"
 admin_php_version: "PHP Version"
-admin_author_url: "Author url"
-admin_bugs: "Bugs"
-admin_description: "Description"
-admin_get_more_plugins: "Get More Plugins"
-admin_homepage: "Homepage"
+admin_author_url: "Url des Autors"
+admin_bugs: "Fehler"
+admin_description: "Beschreibung"
+admin_get_more_plugins: "Mehr Plugins finden"
+admin_homepage: "Startseite"
 admin_info: "Info"
-admin_license: "License"
+admin_license: "Lizenz"
 admin_status: "Status"
-admin_disabled: "disabled"
-admin_enabled: "enabled"
+admin_disabled: "deaktiviert"
+admin_enabled: "aktiviert"
 admin_version: "Version"
-admin_role: "Role"
-admin_save: "Save"
-admin_security_check_results: "Security check results"
-admin_security_check_results_debug: "Due to the type and amount of information an error might give intruders when DISPLAY ERRORS TRUE, we strongly advise setting DISPLAY ERRORS FALSE in production systems."
-admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions. <br>You can do this on unix systems with: <code>chmod a-w :path</code>"
-admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions. <br>You can do this on unix systems with: <code>chmod a-w :path</code>"
+admin_role: "Rolle"
+admin_save: "Speichern"
+admin_security_check_results: "Ergebnisse der Sicherheitsprüfung"
+admin_security_check_results_debug: "Aufgrund des Typs und der Menge an Informationen die das Anzeigen von Fehlern an böswillige Besucher ausgeben könnte empfehlen wir ausdrücklich auf Produktivinstallationen diese Option zu deaktivieren."
+admin_security_check_results_htaccess: "Die Flextype .htaccess Datei ist schreibbar. Wir empfehlen alle Schreib-Berechtigungen zu entfernen. Du kannst dies auf Unix-Systemen mit \"chmod a-w :path\" tun"
+admin_security_check_results_index: "Die Flextype index.php Datei ist schreibbar. Wir empfehlen alle Schreib-Berechtigungen zu entfernen. Du kannst dies auf Unix-Systemen mit \"chmod a-w :path\" tun"
 admin_server: "Server"
-admin_site: "Site"
-admin_clear_cache: "Clear cache"
-admin_error404_title: "Error404 entry title"
-admin_error404_description: "Error404 entry description"
-admin_error404_content: "Error404 entry content"
-admin_error404_template: "Error404 entry template"
-admin_heading: "Settings"
-admin_general: "General"
-admin_error_404_page: "Error 404 page"
+admin_site: "Seite"
+admin_clear_cache: "Cache löschen"
+admin_error404_title: "Titel des Error404-Eintrags"
+admin_error404_description: "Beschreibung des Error404 Eintrags"
+admin_error404_content: "Inhalt des Error404-Eintrags"
+admin_error404_template: "Error404-Eingabevorlage"
+admin_heading: "Einstellungen"
+admin_general: "Allgemein"
+admin_error_404_page: "Fehlerseite"
 admin_cache: "Cache"
-admin_author_email: "Author email"
-admin_author_name: "Author name"
-admin_site_description: "Site description"
-admin_site_keywords: "Site keywords"
+admin_author_email: "E-Mail des Autors"
+admin_author_name: "Name des Autors"
+admin_site_description: "Seitenbeschreibung"
+admin_site_keywords: "Meta-Keywords"
 admin_site_robots: "Robots"
-admin_site_title: "Site title"
+admin_site_title: "Seitentitel"
 admin_system: "System"
-admin_cache_driver: "Cache driver"
-admin_cache_enabled: "Cache enabled"
-admin_cache_lifetime: "Cache lifetime"
-admin_cache_prefix: "Cache prefix"
-admin_charset: "Charset"
-admin_date_format: "Date format"
-admin_date_display_format: "Display date format"
-admin_errors_display: "Display errors"
-admin_locale: "Locale"
-admin_entry_main: "Main entry"
+admin_cache_driver: "Cache-Treiber"
+admin_cache_enabled: "Cache aktiviert"
+admin_cache_lifetime: "Cache-Lebensdauer"
+admin_cache_prefix: "Cache Prefix"
+admin_charset: "Zeichensatz"
+admin_date_format: "Datumsformat"
+admin_date_display_format: "Datumsformat anzeigen"
+admin_errors_display: "Fehler anzeigen"
+admin_locale: "Sprache"
+admin_entry_main: "Haupteintrag"
 admin_theme: "Theme"
-admin_timezone: "Timezone"
-admin_username: "Username"
-admin_create_user: "Create User"
-admin_create_new_user: "Create New User"
-admin_web_server: "Web Server"
-admin_web_server_php_interface: "WebServer to PHP Interface"
-admin_create_new_category: "Create New Category"
-admin_delete_category: "Delete Category"
-admin_create_new_item: "Create New Item"
-admin_delete: "Delete"
-admin_order: "Order"
-admin_edit_category: "Edit category"
-admin_fieldsets: "Fieldsets"
-admin_template_create_new: "Create New Template"
-admin_create_new_fieldset: "Create New Fieldset"
-admin_duplicate: "Duplicate"
-admin_summary: "Summary"
-admin_snippet: "Snippet"
-admin_type: "Type"
-admin_partial: "Partial"
-admin_clone: "Clone"
-admin_create_new_snippet: "Create New Snippet"
+admin_timezone: "Zeitzone"
+admin_username: "Benutzername"
+admin_create_user: "Benutzer erstellen"
+admin_create_new_user: "Neuen Benutzer anlegen"
+admin_web_server: "Webserver"
+admin_web_server_php_interface: "PHP-Schnittstelle"
+admin_create_new_category: "Neue Kategorie anlegen"
+admin_delete_category: "Kategorie löschen"
+admin_create_new_item: "Neuen Eintrag erstellen"
+admin_delete: "Löschen"
+admin_order: "Reihenfolge"
+admin_edit_category: "Kategorie bearbeiten"
+admin_fieldsets: "Feldgruppen"
+admin_template_create_new: "Neue Vorlage erstellen"
+admin_create_new_fieldset: "Neue Feldgruppe erstellen"
+admin_duplicate: "Kopieren"
+admin_summary: "Zusammenfassung"
+admin_snippet: "Schnipsel"
+admin_type: "Typ"
+admin_partial: "Blöcke"
+admin_clone: "Duplizieren"
+admin_create_new_snippet: "Neuen Snippet erstellen"
 admin_message_snippet_was_not_deleted: "Snippet was not deleted"
 admin_message_snippet_was_not_renamed: "Snippet was not renamed"
 admin_message_snippet_was_not_duplicated: "Snippet was not duplicated"
@@ -162,56 +162,56 @@ admin_message_entry_changes_saved: "Changes successfully saved"
 admin_message_entry_changes_not_saved: "Changes not saved"
 admin_message_entry_cloned: "Entry cloned"
 admin_message_entry_created: "Entry created"
-admin_message_entry_was_not_created: "Entry was not created"
-admin_message_entry_deleted: "Entry deleted"
-admin_message_entry_was_not_renamed: "Entry was not renamed"
-admin_message_entry_was_not_deleted: "Entry was not deleted"
-admin_message_entry_file_deleted: "File successfully deleted"
-admin_message_entry_file_uploaded: "File successfully uploaded"
-admin_message_entry_file_not_uploaded: "File was not uploaded"
-admin_message_entry_moved: "Entry moved"
-admin_message_entry_was_not_moved: "Entry was not moved"
-admin_message_entry_renamed: "Entry renamed"
-admin_message_settings_saved: "Settings saved"
-admin_message_settings_was_not_saved: "Settings was not saved"
-admin_message_wrong_username_password: "Wrong username or password"
-admin_quality: "Quality"
-admin_width: "Width"
-admin_height: "Height"
-admin_accept_file_types: "Accept file types"
-admin_embeded_code: "Embeded Code"
-admin_shortcode: "Shortcode"
-admin_php_code: "PHP Code"
-admin_choose_files_to_upload: "Choose file"
-admin_browse_files: "Browse"
-admin_copy: "Copy"
-admin_admin_panel: "Admin Panel"
-admin_light: "Light"
-admin_dark: "Dark"
+admin_message_entry_was_not_created: "Eintrag wurde nicht erstellt"
+admin_message_entry_deleted: "Eintrag gelöscht"
+admin_message_entry_was_not_renamed: "Eintrag wurde nicht umbenannt"
+admin_message_entry_was_not_deleted: "Eintrag wurde nicht gelöscht"
+admin_message_entry_file_deleted: "Datei erfolgreich gelöscht"
+admin_message_entry_file_uploaded: "Datei erfolgreich hochgeladen"
+admin_message_entry_file_not_uploaded: "Datei wurde nicht hochgeladen"
+admin_message_entry_moved: "Eintrag verschoben"
+admin_message_entry_was_not_moved: "Eintrag wurde nicht verschoben"
+admin_message_entry_renamed: "Eintrag umbenannt"
+admin_message_settings_saved: "Einstellungen gespeichert"
+admin_message_settings_was_not_saved: "Einstellungen wurden nicht gespeichert"
+admin_message_wrong_username_password: "Benutzername oder Passwort falsch"
+admin_quality: "Qualität"
+admin_width: "Breite"
+admin_height: "Höhe"
+admin_accept_file_types: "Erlaubte Dateitypen"
+admin_embeded_code: "Eingebetteter Code"
+admin_shortcode: "Kurzcode"
+admin_php_code: "PHP-Code"
+admin_choose_files_to_upload: "Datei auswählen"
+admin_browse_files: "Durchsuchen"
+admin_copy: "Kopieren"
+admin_admin_panel: "Administration"
+admin_light: "Hell"
+admin_dark: "Dunkel"
 admin_name: "Name"
 admin_memcached_server: "Memcached Server"
 admin_memcached_port: "Memcached Port"
 admin_redis_socket: "Redis Socket"
-admin_redis_password: "Redis Password"
+admin_redis_password: "Redis Passwort"
 admin_redis_server: "Redis Server"
 admin_redis_port: "Redis Port"
-admin_sqlite3_database: "SQLite3 Database"
-admin_sqlite3_table: "SQLite3 Table"
-admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
-admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)"
-admin_entries_visible: "Visible"
-admin_entries_draft: "Draft"
-admin_entries_hidden: "Hidden"
-admin_menu_item_title: "Title"
+admin_sqlite3_database: "SQLite3 Datenbank"
+admin_sqlite3_table: "SQLite3 Tabelle"
+admin_error_name_empty_input: "Name muss ein alphanumerischer Wert sein (mindestens 1 Zeichen)"
+admin_error_title_empty_input: "Titel muss ein alphanumerischer Wert sein (von 1 Zeichen)"
+admin_entries_visible: "Sichtbar"
+admin_entries_draft: "Entwurf"
+admin_entries_hidden: "Versteckt"
+admin_menu_item_title: "Titel"
 admin_menu_item_url: "Url"
-admin_menu_item_target: "Target"
-admin_menu_item_order: "Order"
-admin_template_code: "Template code"
-admin_you_have_not_created_any_entries_yet: "You haven't created any entries yet!"
-admin_you_have_not_created_any_snippets_yet: "You haven't created any snippets yet!"
-admin_you_have_not_created_any_templates_yet: "You haven't created any templates yet!"
-admin_you_have_not_created_any_fieldsets_yet: "You haven't created any fieldsets yet!"
-admin_twig_auto_reload: "Auto reload"
+admin_menu_item_target: "Ziel"
+admin_menu_item_order: "Reihenfolge"
+admin_template_code: "Vorlagencode"
+admin_you_have_not_created_any_entries_yet: "Du hast noch keine Einträge erstellt!"
+admin_you_have_not_created_any_snippets_yet: "Du hast noch keine Snippets erstellt!"
+admin_you_have_not_created_any_templates_yet: "Du hast noch keine Vorlagen erstellt!"
+admin_you_have_not_created_any_fieldsets_yet: "Sie haben noch keine Feldgruppen erstellt!"
+admin_twig_auto_reload: "Automatisches Nachladen"
 admin_display_error_details: "Display error details"
 admin_add_content_length_header: "Add content length header"
 admin_router_cache_file: "Route cache file"