diff --git a/public/language/de/category.json b/public/language/de/category.json
new file mode 100644
index 0000000000..9f2bc440f4
--- /dev/null
+++ b/public/language/de/category.json
@@ -0,0 +1,14 @@
+{
+ "new_topic_button": "Neues Thema",
+ "no_topics": "Es gibt noch keine Threads in dieser Kategorie.
Warum beginnst du nicht den ersten?",
+ "sidebar.recent_replies": "Neuste Antworten",
+ "sidebar.active_participants": "Aktive Teilnehmer",
+ "sidebar.moderators": "Moderatoren",
+ "posts": "Posts",
+ "views": "Aufrufe",
+ "posted": "Geposted",
+ "browsing": "Sieht zu",
+ "no_one_has_replied": "Niemand hat geantwortet",
+ "replied": "geantwortet",
+ "last_edited_by": "zuletzt editiert durch"
+}
diff --git a/public/language/de/footer.json b/public/language/de/footer.json
new file mode 100644
index 0000000000..adf674ca29
--- /dev/null
+++ b/public/language/de/footer.json
@@ -0,0 +1,10 @@
+{
+ "chat.chatting_with": "Chatten mit ",
+ "chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden",
+ "chat.send": "Senden",
+ "stats.online": "Online",
+ "stats.users": "Benutzer",
+ "stats.topics": "Themen",
+ "stats.posts": "Beiträge",
+ "success": "erfolg"
+}
diff --git a/public/language/de/global.json b/public/language/de/global.json
new file mode 100644
index 0000000000..8f0dba7a18
--- /dev/null
+++ b/public/language/de/global.json
@@ -0,0 +1,30 @@
+{
+ "home": "Übersicht",
+ "search": "Suche",
+ "buttons.close": "Schließen",
+ "403.title": "Zugriff Verweigert",
+ "403.message": "Du bist nicht dazu berechtigt, diese Seite aufzurufen. Logge dich ein und versuche es erneut.",
+ "404.title": " Nicht Gefunden",
+ "404.message": "Die abgefragte Seite wurde nicht gefunden. Zurück zur Übersicht.",
+ "500.title": "Internal error.",
+ "500.message": "Ooops! Looks like something went wrong!",
+
+ "register": "Registrierung",
+ "login": "Login",
+
+ "logout": "Logout",
+ "logout.title": "Du bist ausgeloggt.",
+ "logout.message": "Du hast dich soeben erfolgreich aus dem Forum ausgeloggt.",
+
+ "save_changes": "Speichere Änderungen",
+ "close": "Schließen",
+
+ "header.admin": "Admin",
+ "header.recent": "Aktuell",
+ "header.unread": "Ungelesen",
+ "header.users": "Benutzer",
+ "header.search": "Suche",
+ "header.profile": "Profil",
+
+ "notifications.loading": "Benachrichtigungen laden"
+}
diff --git a/public/language/de/login.json b/public/language/de/login.json
new file mode 100644
index 0000000000..eb7f071969
--- /dev/null
+++ b/public/language/de/login.json
@@ -0,0 +1,10 @@
+{
+ "login": "Einloggen",
+ "username": "Benutzername",
+ "password": "Passwort",
+ "remember_me": "Eingeloggt bleiben?",
+ "forgot_password": "Passwort vergessen?",
+ "alternative_logins": "Login Alternativen",
+ "failed_login_attempt": " Anmeldeversuch fehlgeschlagen, versuche es erneut.",
+ "login_successful": "Du hast dich erfolgreich eingeloggt!"
+}
diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json
new file mode 100644
index 0000000000..7e5ac112e9
--- /dev/null
+++ b/public/language/de/notifications.json
@@ -0,0 +1,9 @@
+{
+ "title": "Benachrichtigungen",
+ "back_to_home": "Zurück zur Startseite",
+ "mark_all_as_read": "Alles als gelesen markieren",
+ "outgoing_link": "Externer Link",
+ "outgoing_link_message": "Du verlässt nun",
+ "continue_to": "Gehe weiter zu",
+ "return_to": "Kehre zurück zu"
+}
diff --git a/public/language/de/recent.json b/public/language/de/recent.json
new file mode 100644
index 0000000000..c6d5301470
--- /dev/null
+++ b/public/language/de/recent.json
@@ -0,0 +1,5 @@
+{
+ "day": "Tag",
+ "week": "Woche",
+ "month": "Monat"
+}
diff --git a/public/language/de/register.json b/public/language/de/register.json
new file mode 100644
index 0000000000..2c1469ed7a
--- /dev/null
+++ b/public/language/de/register.json
@@ -0,0 +1,16 @@
+{
+ "register": "Registrieren",
+ "help.email": "Deine E-Mail Adresse ist standardmäßig nicht öffentlich sichtbar.",
+ "help.username_restrictions": "Einen einmaligen Benutzernamen. 3-16 Zeichen. Andere Benutzer können dich mit @Benutzername anschreiben.",
+ "help.minimum_password_length": "Dein Passwort muss mindestens sechs Zeichen lang sein.",
+ "email_address": "E-Mail",
+ "email_address_placeholder": "E-Mail Adresse hier eingeben",
+ "username": "Benutzername",
+ "username_placeholder": "Benutzernamen eingeben",
+ "password": "Passwort",
+ "password_placeholder": "Passwort eingeben",
+ "confirm_password": "Passwort bestätigen",
+ "confirm_password_placeholder": "Passwort zur Bestätigung erneut eingeben",
+ "register_now_button": "Jetzt registrieren",
+ "alternative_registration": "Alternative Registrierung"
+}
diff --git a/public/language/de/reset_password.json b/public/language/de/reset_password.json
new file mode 100644
index 0000000000..65eaca9028
--- /dev/null
+++ b/public/language/de/reset_password.json
@@ -0,0 +1,13 @@
+{
+ "reset_password": "Passwort zurücksetzen",
+ "update_password": "Ändere Passwort",
+ "password_change": "Passwort wurde geändert",
+ "password_reset_successful": "
Das Passwort wurde erfolgreich zurückgesetzt. Log dich neu ein.",
+ "wrong_reset_code.title": "Der Reset-Code ist falsch.",
+ "wrong_reset_code.message": "Der empfangene Reset-Code war falsch. Bitte versuche es erneut oder fordere einen neuen Code an.",
+ "new_password": "Neues Passwort",
+ "repeat_password": "Wiederhole das Passwort",
+ "enter_email": "Bitte gib Deine E-Mail Adresse ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.",
+ "password_reset_sent": "Passwortzrücksetzung beantragt.",
+ "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!"
+}
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
new file mode 100644
index 0000000000..c1c9c03f8c
--- /dev/null
+++ b/public/language/de/topic.json
@@ -0,0 +1,40 @@
+{
+ "topic": "Thema",
+ "topics": "Themen",
+
+ "no_topics_found": "Keine passende Themen gefunden.",
+
+ "profile": "Profil",
+ "posted_by": "geschrieben von",
+ "chat": "Chat",
+ "notify_me": "Werde bei neues Antworten auf dieses Thema benachrichtigt.",
+ "quote": "zitieren",
+ "reply": "antworten",
+ "edit": "bearbeiten",
+ "delete": "löschen",
+ "banned": "gesperrt",
+ "link": "Link",
+
+ "thread_tools.title": "Thread Tools",
+ "thread_tools.pin": "Thread pinnen",
+ "thread_tools.unpin": "Thread nicht mehr pinnen",
+ "thread_tools.lock": "Thread sperren",
+ "thread_tools.move": "Thread verschieben",
+ "thread_tools.delete": "Thread löschen",
+
+ "load_categories": "Kategorien laden",
+ "disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
+ "confirm_move": "verschieben",
+
+ "favourite": "Favorit",
+ "favourites": "Favoriten",
+ "favourites.not_logged_in.title": "Nicht eingeloggt!",
+ "favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.",
+ "favourites.haz_no_favourites":"Du hast noch keine Favoriten.",
+
+ "posted_by": "Geposted von",
+ "loading": "Lade",
+ "more_posts": "Mehr Posts",
+ "move_topic": "Thema verschieben",
+ "topic_will_be_moved_to": "Dieses Thema wird verschoben nach"
+}
diff --git a/public/language/de/unread.json b/public/language/de/unread.json
new file mode 100644
index 0000000000..28585b0aa0
--- /dev/null
+++ b/public/language/de/unread.json
@@ -0,0 +1,5 @@
+{
+ "no_unread_topics": "Es gibt keine ungelesenen Themen.",
+ "mark_all_read": "alle als gelesen markieren",
+ "load_more": "mehr laden"
+}
\ No newline at end of file
diff --git a/public/language/de/user.json b/public/language/de/user.json
new file mode 100644
index 0000000000..cbe455f8d3
--- /dev/null
+++ b/public/language/de/user.json
@@ -0,0 +1,38 @@
+{
+ "banned": "Gebannt",
+ "offline": "offline",
+ "email": "E-Mail",
+ "fullname": "Kompletter Name",
+ "website": "Homepage",
+ "location": "Wohnort",
+ "age": "Alter",
+ "joined": "Beigetreten",
+ "profil_views": "Profilaufrufe",
+ "reputation": "Reputation",
+ "posts": "Posts",
+ "followers": "Follower",
+ "following": "Folgt",
+ "signature": "Signatur",
+ "gravatar": "Gravatar",
+ "birthday": "Geburtstag",
+
+ "change_picture": "Ändere Profilbild",
+ "edit": "Ändern",
+ "uploaded_pictures": "Hochgeladene Bilder",
+ "upload_new_picture": "Neues Bild hochladen",
+ "change_password": "Ändere Passwort",
+ "confirm_password": "Passwort wiederholen",
+ "password": "Passwort",
+
+ "upload_picture": "Bild hochladen",
+ "upload_a_picture": "Ein Bild hochladen",
+ "image_spec": "Du solltest nur Dateien die PNG, JPG, oder GIF kleiner als 256kb hochladen.",
+
+ "settings": "Einstellungen",
+ "show_my_email": "Zeige meine E-Mail Adresse an.",
+
+ "haz_no_follower": "Dieser User hat noch keine Follower.",
+ "follows_no_one": "Dieser User folgt noch niemanden."
+
+
+}
diff --git a/public/language/de/users.json b/public/language/de/users.json
new file mode 100644
index 0000000000..32ca305187
--- /dev/null
+++ b/public/language/de/users.json
@@ -0,0 +1,9 @@
+{
+ "latest_users": "neuste Benutzer",
+ "top_posters": "meiste Beiträge",
+ "most_reputation": "höhstes Ansehen",
+ "online": "Online",
+ "search": "Suchen",
+ "enter_username": "Benutzer durchsuchen",
+ "load_more": "mehr laden"
+}
diff --git a/public/language/en/category.json b/public/language/en/category.json
index 73d3bef853..189f513e63 100644
--- a/public/language/en/category.json
+++ b/public/language/en/category.json
@@ -3,5 +3,12 @@
"no_topics": "There are no topics in this category.
Why don't you try posting one?",
"sidebar.recent_replies": "Recent Replies",
"sidebar.active_participants": "Active Participants",
- "sidebar.moderators": "Moderators"
-}
\ No newline at end of file
+ "sidebar.moderators": "Moderators",
+ "posts": "Posts",
+ "views": "Aufrufe",
+ "posted": "Geposted",
+ "browsing": "browsing",
+ "no_one_has_replied": "Niemand hat geantwortet",
+ "replied": "geantwortet",
+ "last_edited_by": "last edited by"
+}
diff --git a/public/language/en/footer.json b/public/language/en/footer.json
index 32d2e92bbe..77cf98c039 100644
--- a/public/language/en/footer.json
+++ b/public/language/en/footer.json
@@ -5,5 +5,6 @@
"stats.online": "Online",
"stats.users": "Users",
"stats.topics": "Topics",
- "stats.posts": "Posts"
-}
\ No newline at end of file
+ "stats.posts": "Posts",
+ "success": "success"
+}
diff --git a/public/language/en/global.json b/public/language/en/global.json
index 00576a18be..0dd6208225 100644
--- a/public/language/en/global.json
+++ b/public/language/en/global.json
@@ -8,13 +8,24 @@
"404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.",
"500.title": "Internal error.",
"500.message": "Ooops! Looks like something went wrong!",
+
+ "register": "register",
+ "login": "Login",
+
"logout": "Logout",
"logout.title": "You are now logged out.",
"logout.message": "You have successfully logged out of NodeBB",
+
+ "save_changes": "save changes",
+ "close": "close",
+
"header.admin": "Admin",
"header.recent": "Recent",
"header.unread": "Unread",
"header.users": "Users",
"header.search": "Search",
- "notifications.loading": "Loading Notifications"
-}
\ No newline at end of file
+ "header.profile": "Profile",
+
+ "notifications.loading": "Loading Notifications",
+
+}
diff --git a/public/language/en/login.json b/public/language/en/login.json
index 947395a46d..f2090276a1 100644
--- a/public/language/en/login.json
+++ b/public/language/en/login.json
@@ -7,4 +7,4 @@
"alternative_logins": "Alternative Logins",
"failed_login_attempt": "Failed login attempt, please try again.",
"login_successful": "You have successfully logged in!"
-}
\ No newline at end of file
+}
diff --git a/public/language/en/notifications.json b/public/language/en/notifications.json
index 212cf3fa4f..bfe2a48ab8 100644
--- a/public/language/en/notifications.json
+++ b/public/language/en/notifications.json
@@ -1,3 +1,9 @@
{
- "title": "Notifications"
-}
\ No newline at end of file
+ "title": "Notifications",
+ "back_to_home": "back to NodeBB",
+ "mark_all_as_read": "Mark All as Read",
+ "outgoing_link": "Outgoing Link",
+ "outgoing_link_message": "You are now leaving",
+ "continue_to": "Continue to",
+ "return_to": "Return to "
+}
diff --git a/public/language/en/reset_password.json b/public/language/en/reset_password.json
new file mode 100644
index 0000000000..468bfb0254
--- /dev/null
+++ b/public/language/en/reset_password.json
@@ -0,0 +1,13 @@
+{
+ "reset_password": "Reset Password",
+ "update_password": "Update Password",
+ "password_changed.title": "Password Changed",
+ "password_changed.message": "
Password successfully reset, please log in again.",
+ "wrong_reset_code.title": "Incorrect Reset Code",
+ "wrong_reset_code.message": "The reset code received was incorrect. Please try again, or request a new reset code.",
+ "new_password": "New Password",
+ "repeat_password": "Confirm Password",
+ "enter_email": "Please enter your email address and we will send you an email with instructions on how to reset your account.",
+ "password_reset_sent": "Password Reset Sent",
+ "invalid_email": "Invalid Email / Email does not exist!"
+}
diff --git a/public/language/en/topic.json b/public/language/en/topic.json
index 278ceea37a..0d367fba46 100644
--- a/public/language/en/topic.json
+++ b/public/language/en/topic.json
@@ -1,23 +1,39 @@
{
+ "topic": "Topic",
+ "topics": "Topics",
+
+ "no_topics_found": "No topics found!",
+
"profile": "Profile",
"posted_by": "Posted by",
"chat": "Chat",
"notify_me": "Be notified of new replies in this topic",
- "favourite": "Favourite",
"quote": "Quote",
"reply": "Reply",
"edit": "Edit",
"delete": "Delete",
"banned": "banned",
"link": "Link",
+
"thread_tools.title": "Thread Tools",
"thread_tools.pin": "Pin Thread",
"thread_tools.lock": "Lock Thread",
"thread_tools.move": "Move Thread",
"thread_tools.delete": "Delete Thread",
+
"load_categories": "Loading Categories",
"disabled_categories_note": "Disabled Categories are greyed out",
"confirm_move": "Move",
+
+ "favourite": "Favourite",
+ "favourites": "Favorites",
"favourites.not_logged_in.title": "Not Logged In",
- "favourites.not_logged_in.message": "Please log in in order to favourite this post"
-}
\ No newline at end of file
+ "favourites.not_logged_in.message": "Please log in in order to favourite this post",
+ "favourites.haz_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
+
+ "posted_by": "posted by",
+ "loading": "Lade",
+ "more_posts": "More Posts",
+ "move_topic": "Move Topic",
+ "topic_will_be_moved_to": "This topic will be moved to the category"
+}
diff --git a/public/language/en/user.json b/public/language/en/user.json
new file mode 100644
index 0000000000..8bc65b939b
--- /dev/null
+++ b/public/language/en/user.json
@@ -0,0 +1,36 @@
+{
+ "banned": "Banned",
+ "offline": "offline",
+ "email": "email",
+ "fullname": "full name",
+ "website": "website",
+ "location": "location",
+ "age": "age",
+ "joined": "joined",
+ "profil_views": "profil views",
+ "reputation": "reputation",
+ "posts": "posts",
+ "followers": "followers",
+ "following": "following",
+ "signature": "signature",
+ "gravatar": "gravatar",
+ "birthday": "birthday",
+
+ "change_picture": "change picture",
+ "edit": "edit",
+ "uploaded_pictures": "uploaded pictures",
+ "upload_new_picture": "upload new picture",
+ "change_password": "change password",
+ "confirm_password": "confirm password",
+ "password": "password",
+
+ "upload_picture": "Upload picture",
+ "upload_a_picture": "Upload a picture",
+ "image_spec": "You may only upload PNG, JPG, or GIF files under 256kb.",
+
+ "settings": "settings",
+ "show_my_email": "show my email",
+
+ "haz_no_follower": "This user doesn't have any followers :(",
+ "follows_no_one": "This user isn't following anyone :("
+}
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index eb14891b85..da0014b0fe 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -13,71 +13,68 @@