diff --git a/config/module.config.php b/config/module.config.php
index 2426ba1..7f3c8ad 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -13,6 +13,18 @@
             'goalioforgotpassword_forgot' => 'GoalioForgotPassword\Controller\ForgotController',
         ),
     ),
+    'translator' => array(
+	// Change you locale here if needed, and uncomment line below with 'locale' setting. 
+	// Don't forget to create your own translation! See ../language directory.
+	// 'locale' => 'en_US', 
+        'translation_file_patterns' => array(
+            array(
+                'type'     => 'gettext',
+                'base_dir' => __DIR__ . '/../language',
+                'pattern'  => '%s.mo',
+            ),
+        ),
+    ),
     'router' => array(
         'routes' => array(
             'zfcuser' => array(
diff --git a/language/de_DE.mo b/language/de_DE.mo
new file mode 100644
index 0000000..3887443
Binary files /dev/null and b/language/de_DE.mo differ
diff --git a/language/de_DE.po b/language/de_DE.po
new file mode 100644
index 0000000..6b9d4da
--- /dev/null
+++ b/language/de_DE.po
@@ -0,0 +1,165 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ZfcUser\n"
+"Report-Msgid-Bugs-To: zf-devteam@zend.com\n"
+"POT-Creation-Date: 2014-04-12 16:56+0100\n"
+"PO-Revision-Date: 2014-04-12 16:56+0100\n"
+"Last-Translator: Stijnhau <stijnhau@gmail.com>\n"
+"Language-Team: ZF Contibutors <zf-devteam@zend.com>\n"
+"Language: de_DE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-KeywordsList: translate\n"
+"X-Poedit-Basepath: ../\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: language/msgIds.php:6
+msgid "Username"
+msgstr "Benutzername"
+
+#: language/msgIds.php:7
+msgid "Email"
+msgstr "E-Mail"
+
+#: language/msgIds.php:8
+msgid "New Email"
+msgstr "Neue E-Mail"
+
+#: language/msgIds.php:9
+msgid "Verify New Email"
+msgstr "E-Mail wiederholen"
+
+#: language/msgIds.php:10
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#: language/msgIds.php:11
+msgid "Password"
+msgstr "Passwort"
+
+#: language/msgIds.php:12
+msgid "Password Verify"
+msgstr "Passwort wiederholen"
+
+#: language/msgIds.php:13
+msgid "Current Password"
+msgstr "Aktuelles Passwort"
+
+#: language/msgIds.php:14
+msgid "Verify New Password"
+msgstr "Neues Passwort wiederholen"
+
+#: language/msgIds.php:15
+msgid "New Password"
+msgstr "Neues Passwort"
+
+#: language/msgIds.php:16
+msgid "Please type the following text"
+msgstr "Geben Sie bitte den folgenden Text ein"
+
+#: language/msgIds.php:17
+msgid "Submit"
+msgstr "Senden"
+
+#: language/msgIds.php:18 view/zfc-user/user/login.phtml:1
+msgid "Sign In"
+msgstr "Anmelden"
+
+#: language/msgIds.php:19
+msgid "Register"
+msgstr "Registrieren"
+
+#: language/msgIds.php:20
+msgid "No record matching the input was found"
+msgstr "Es wurde kein passender Eintrag gefunden"
+
+#: language/msgIds.php:21
+msgid "A record matching the input was found"
+msgstr "Zugang existiert bereits."
+
+#: language/msgIds.php:22
+msgid "Authentication failed. Please try again."
+msgstr "Authentifizierung fehlgeschlagen. Bitte versuchen Sie es erneut."
+
+#: language/msgIds.php:23
+#, fuzzy
+msgid "Request new password"
+msgstr "Neues Passwort"
+
+#: language/msgIds.php:24
+#, fuzzy
+msgid "Set new password"
+msgstr "Neues Passwort"
+
+#: view/goalio-forgot-password/email/forgot.phtml:2
+msgid ""
+"You have received this email because you initiated to reset your password "
+"with us. To continue with the process, please click the link below:"
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:1
+#: view/goalio-forgot-password/forgot/sent.phtml:1
+msgid "Forgot your password?"
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:23
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:5
+msgid "Back to login."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:1
+msgid "Your password has been changed."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:3
+msgid "You can now login using your new password."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/reset.phtml:1
+#, php-format
+msgid "Change Password for %s"
+msgstr "Passwort ändern für %s"
+
+#: view/goalio-forgot-password/forgot/sent.phtml:3
+#, php-format
+msgid "A reminder has been sent to your e-mail address %s."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/sent.phtml:5
+msgid "Back to login?"
+msgstr ""
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Not registered?"
+msgstr "Noch kein Zugang?"
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Sign up!"
+msgstr "Jetzt registrieren!"
+
+#~ msgid "Change Email for %s"
+#~ msgstr "E-mail ändern für %s"
+
+#~ msgid "Email address changed successfully."
+#~ msgstr "Ihre E-Mail wurde erflogreich aktualisiert."
+
+#~ msgid "Unable to update your email address. Please try again."
+#~ msgstr ""
+#~ "Ihre E-Mail konnte nicht erflogreich aktualisiert werden. Bitte versuchen "
+#~ "Sie es erneut."
+
+#~ msgid "Password changed successfully."
+#~ msgstr "Ihr Passwort wurde erfolgreich aktualisiert."
+
+#~ msgid "Unable to update your password. Please try again."
+#~ msgstr ""
+#~ "Ihr Passwort konnte nicht erfolgreich aktualisiert werden. Bitte "
+#~ "versuchen Sie es erneut."
+
+#~ msgid "Hello"
+#~ msgstr "Hallo"
+
+#~ msgid "Sign Out"
+#~ msgstr "Abmelden"
diff --git a/language/es_UY.mo b/language/es_UY.mo
new file mode 100644
index 0000000..d57b909
Binary files /dev/null and b/language/es_UY.mo differ
diff --git a/language/es_UY.po b/language/es_UY.po
new file mode 100644
index 0000000..67ebec0
--- /dev/null
+++ b/language/es_UY.po
@@ -0,0 +1,85 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Goalio Forgot Password\n"
+"POT-Creation-Date: 2014-04-12 16:56+0100\n"
+"PO-Revision-Date: 2014-04-12 16:56+0100\n"
+"Last-Translator: Stijnhau <stijnhau@gmail.com>\n"
+"Language-Team: \n"
+"Language: es_UY\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: translate\n"
+"X-Poedit-SearchPath-0: view\n"
+"X-Poedit-SearchPath-1: src\n"
+
+#: view/goalio-forgot-password/email/forgot.phtml:2
+msgid ""
+"You have received this email because you initiated to reset your password "
+"with us. To continue with the process, please click the link below:"
+msgstr ""
+"Ha recibido este correo por soliticitar un reinicio de contraseña. Para "
+"continuar el proceso, por favor haga click en el enlace debajo:"
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:1
+#: view/goalio-forgot-password/forgot/sent.phtml:1
+msgid "Forgot your password?"
+msgstr "¿Olvidó su contraseña?"
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:23
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:5
+msgid "Back to login."
+msgstr "Volver a ingresar."
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:1
+msgid "Your password has been changed."
+msgstr "Su contraseña se ha cambiado."
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:3
+msgid "You can now login using your new password."
+msgstr "Ahora puede ingresar usando su nueva contraseña."
+
+#: view/goalio-forgot-password/forgot/reset.phtml:1
+#, php-format
+msgid "Change Password for %s"
+msgstr "Cambiar la contraseña de %s"
+
+#: view/goalio-forgot-password/forgot/sent.phtml:3
+#, php-format
+msgid "A reminder has been sent to your e-mail address %s."
+msgstr "Se ha enviado un recordatorio a su dirección de correo %s."
+
+#: view/goalio-forgot-password/forgot/sent.phtml:5
+msgid "Back to login?"
+msgstr "¿Retornar al ingreso?"
+
+#: view/zfc-user/user/login.phtml:1
+msgid "Sign In"
+msgstr ""
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Not registered?"
+msgstr ""
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Sign up!"
+msgstr ""
+
+#~ msgid "E-Mail"
+#~ msgstr "Correo"
+
+#~ msgid "Request new password"
+#~ msgstr "Solicitar nueva contraseña"
+
+#~ msgid "New Password"
+#~ msgstr "Nueva contraseña"
+
+#~ msgid "Verify New Password"
+#~ msgstr "Verificar nueva contraseña"
+
+#~ msgid "Set new password"
+#~ msgstr "Ingresar nueva contraseña"
diff --git a/language/fr_FR.mo b/language/fr_FR.mo
new file mode 100644
index 0000000..64da542
Binary files /dev/null and b/language/fr_FR.mo differ
diff --git a/language/fr_FR.po b/language/fr_FR.po
new file mode 100644
index 0000000..bde78a1
--- /dev/null
+++ b/language/fr_FR.po
@@ -0,0 +1,165 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ZfcUser\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-12 16:56+0100\n"
+"PO-Revision-Date: 2014-04-12 16:56+0100\n"
+"Last-Translator: Stijnhau <stijnhau@gmail.com>\n"
+"Language-Team: ZF Contibutors <zf-devteam@zend.com>\n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: translate\n"
+"X-Poedit-Basepath: ../\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: language/msgIds.php:6
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: language/msgIds.php:7
+msgid "Email"
+msgstr "Email"
+
+#: language/msgIds.php:8
+msgid "New Email"
+msgstr "Nouvel Email"
+
+#: language/msgIds.php:9
+msgid "Verify New Email"
+msgstr "Nouvel Émail (vérification)"
+
+#: language/msgIds.php:10
+msgid "Display Name"
+msgstr "Nom à afficher"
+
+#: language/msgIds.php:11
+msgid "Password"
+msgstr "Mot de passe"
+
+#: language/msgIds.php:12
+msgid "Password Verify"
+msgstr "Mot de passe (vérification)"
+
+#: language/msgIds.php:13
+msgid "Current Password"
+msgstr "Mot de passe actuel"
+
+#: language/msgIds.php:14
+msgid "Verify New Password"
+msgstr "Nouveau mot de passe (vérification)"
+
+#: language/msgIds.php:15
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
+#: language/msgIds.php:16
+msgid "Please type the following text"
+msgstr "Merci de saisir le texte suivant"
+
+#: language/msgIds.php:17
+msgid "Submit"
+msgstr "Valider"
+
+#: language/msgIds.php:18 view/zfc-user/user/login.phtml:1
+msgid "Sign In"
+msgstr "Se connecter"
+
+#: language/msgIds.php:19
+msgid "Register"
+msgstr "Créer un compte"
+
+#: language/msgIds.php:20
+msgid "No record matching the input was found"
+msgstr "Aucun enregistrement n'a été trouvé avec cette entrée"
+
+#: language/msgIds.php:21
+msgid "A record matching the input was found"
+msgstr "Un enregistrement a été trouvé avec cette entrée"
+
+#: language/msgIds.php:22
+msgid "Authentication failed. Please try again."
+msgstr "Authentification échouée. Merci de réessayer."
+
+#: language/msgIds.php:23
+#, fuzzy
+msgid "Request new password"
+msgstr "Nouveau mot de passe"
+
+#: language/msgIds.php:24
+#, fuzzy
+msgid "Set new password"
+msgstr "Nouveau mot de passe"
+
+#: view/goalio-forgot-password/email/forgot.phtml:2
+msgid ""
+"You have received this email because you initiated to reset your password "
+"with us. To continue with the process, please click the link below:"
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:1
+#: view/goalio-forgot-password/forgot/sent.phtml:1
+msgid "Forgot your password?"
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:23
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:5
+msgid "Back to login."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:1
+msgid "Your password has been changed."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:3
+msgid "You can now login using your new password."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/reset.phtml:1
+#, php-format
+msgid "Change Password for %s"
+msgstr "Changement du mot de passe pour %s"
+
+#: view/goalio-forgot-password/forgot/sent.phtml:3
+#, php-format
+msgid "A reminder has been sent to your e-mail address %s."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/sent.phtml:5
+msgid "Back to login?"
+msgstr ""
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Not registered?"
+msgstr "Pas encore enregistré?"
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Sign up!"
+msgstr "Créez un compte!"
+
+#~ msgid "Change Email for %s"
+#~ msgstr "Changement de l'émail pour %s"
+
+#~ msgid "Email address changed successfully."
+#~ msgstr "L'émail a été modifié"
+
+#~ msgid "Unable to update your email address. Please try again."
+#~ msgstr ""
+#~ "Impossible de mettre jour votre adresse mail. Merci de réessayer "
+#~ "ultérieurement."
+
+#~ msgid "Password changed successfully."
+#~ msgstr "Le mot de passe a été modifié avec succès."
+
+#~ msgid "Unable to update your password. Please try again."
+#~ msgstr ""
+#~ "Impossible de mettre à jour votre mot de passe. Merci de réessayer "
+#~ "ultérieurement"
+
+#~ msgid "Hello"
+#~ msgstr "Bonjour"
+
+#~ msgid "Sign Out"
+#~ msgstr "Se déconnecter"
diff --git a/language/ja_JP.mo b/language/ja_JP.mo
new file mode 100644
index 0000000..4b2345d
Binary files /dev/null and b/language/ja_JP.mo differ
diff --git a/language/ja_JP.po b/language/ja_JP.po
new file mode 100644
index 0000000..b9bfbaf
--- /dev/null
+++ b/language/ja_JP.po
@@ -0,0 +1,161 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ZfcUser\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-12 16:56+0100\n"
+"PO-Revision-Date: 2014-04-12 16:56+0100\n"
+"Last-Translator: Stijnhau <stijnhau@gmail.com>\n"
+"Language-Team: ZF Contibutors <zf-devteam@zend.com>\n"
+"Language: ja_JP\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: translate\n"
+"X-Poedit-Basepath: ../\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: language/msgIds.php:6
+msgid "Username"
+msgstr "ユーザー名"
+
+#: language/msgIds.php:7
+msgid "Email"
+msgstr "メールアドレス"
+
+#: language/msgIds.php:8
+msgid "New Email"
+msgstr "新しいメールアドレス"
+
+#: language/msgIds.php:9
+msgid "Verify New Email"
+msgstr "新しいメールアドレス (確認)"
+
+#: language/msgIds.php:10
+msgid "Display Name"
+msgstr "表示する名前"
+
+#: language/msgIds.php:11
+msgid "Password"
+msgstr "パスワード"
+
+#: language/msgIds.php:12
+msgid "Password Verify"
+msgstr "パスワード (確認用)"
+
+#: language/msgIds.php:13
+msgid "Current Password"
+msgstr "現在のパスワード"
+
+#: language/msgIds.php:14
+msgid "Verify New Password"
+msgstr "新しいパスワード (確認用)"
+
+#: language/msgIds.php:15
+msgid "New Password"
+msgstr "新しいパスワード"
+
+#: language/msgIds.php:16
+msgid "Please type the following text"
+msgstr "次の文章を入力してください"
+
+#: language/msgIds.php:17
+msgid "Submit"
+msgstr "送信"
+
+#: language/msgIds.php:18 view/zfc-user/user/login.phtml:1
+msgid "Sign In"
+msgstr "ログイン"
+
+#: language/msgIds.php:19
+msgid "Register"
+msgstr "登録する"
+
+#: language/msgIds.php:20
+msgid "No record matching the input was found"
+msgstr "入力にマッチしたレコードが見つかりませんでした"
+
+#: language/msgIds.php:21
+msgid "A record matching the input was found"
+msgstr "入力にマッチしたレコードが見つかりました"
+
+#: language/msgIds.php:22
+msgid "Authentication failed. Please try again."
+msgstr "認証に失敗しました。再度お試しください。"
+
+#: language/msgIds.php:23
+#, fuzzy
+msgid "Request new password"
+msgstr "新しいパスワード"
+
+#: language/msgIds.php:24
+#, fuzzy
+msgid "Set new password"
+msgstr "新しいパスワード"
+
+#: view/goalio-forgot-password/email/forgot.phtml:2
+msgid ""
+"You have received this email because you initiated to reset your password "
+"with us. To continue with the process, please click the link below:"
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:1
+#: view/goalio-forgot-password/forgot/sent.phtml:1
+msgid "Forgot your password?"
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:23
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:5
+msgid "Back to login."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:1
+msgid "Your password has been changed."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:3
+msgid "You can now login using your new password."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/reset.phtml:1
+#, php-format
+msgid "Change Password for %s"
+msgstr "%s のパスワードを変更します"
+
+#: view/goalio-forgot-password/forgot/sent.phtml:3
+#, php-format
+msgid "A reminder has been sent to your e-mail address %s."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/sent.phtml:5
+msgid "Back to login?"
+msgstr ""
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Not registered?"
+msgstr "登録は済んでいますか？"
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Sign up!"
+msgstr "ユーザー登録！"
+
+#~ msgid "Change Email for %s"
+#~ msgstr "%s のメールアドレスを変更します"
+
+#~ msgid "Email address changed successfully."
+#~ msgstr "メールアドレスの変更に成功しました。"
+
+#~ msgid "Unable to update your email address. Please try again."
+#~ msgstr "メールアドレスを更新できません。再度お試しください。"
+
+#~ msgid "Password changed successfully."
+#~ msgstr "パスワードの変更に成功しました。"
+
+#~ msgid "Unable to update your password. Please try again."
+#~ msgstr "パスワードを更新できません。再度お試しください。"
+
+#~ msgid "Hello"
+#~ msgstr "こんにちは"
+
+#~ msgid "Sign Out"
+#~ msgstr "ログアウト"
diff --git a/language/msgIds.php b/language/msgIds.php
new file mode 100644
index 0000000..2c4da30
--- /dev/null
+++ b/language/msgIds.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Ids for poedit
+ * @method translate()
+ */
+translate('Username');
+translate('Email');
+translate('New Email');
+translate('Verify New Email');
+translate('Display Name');
+translate('Password');
+translate('Password Verify');
+translate('Current Password');
+translate('Verify New Password');
+translate('New Password');
+translate('Please type the following text');
+translate('Submit');
+translate('Sign In');
+translate('Register');
+translate("No record matching the input was found");
+translate("A record matching the input was found");
+translate("Authentication failed. Please try again.");
+translate("Request new password");
+translate("Set new password");
\ No newline at end of file
diff --git a/language/nl_NL.mo b/language/nl_NL.mo
new file mode 100644
index 0000000..058ffc6
Binary files /dev/null and b/language/nl_NL.mo differ
diff --git a/language/nl_NL.po b/language/nl_NL.po
new file mode 100644
index 0000000..ad66173
--- /dev/null
+++ b/language/nl_NL.po
@@ -0,0 +1,166 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ZfcUser\n"
+"Report-Msgid-Bugs-To: zf-devteam@zend.com\n"
+"POT-Creation-Date: 2014-04-12 16:57+0100\n"
+"PO-Revision-Date: 2014-04-13 10:46+0100\n"
+"Last-Translator: Stijnhau <stijnhau@gmail.com>\n"
+"Language-Team: ZF Contibutors <zf-devteam@zend.com>\n"
+"Language: nl_NL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Basepath: ../\n"
+"X-Poedit-KeywordsList: translate\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: language/msgIds.php:6
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: language/msgIds.php:7
+msgid "Email"
+msgstr "E-mail adres"
+
+#: language/msgIds.php:8
+msgid "New Email"
+msgstr "Nieuw e-mail adres"
+
+#: language/msgIds.php:9
+msgid "Verify New Email"
+msgstr "Nieuw e-mail adres verificatie"
+
+#: language/msgIds.php:10
+msgid "Display Name"
+msgstr "Bijnaam"
+
+#: language/msgIds.php:11
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: language/msgIds.php:12
+msgid "Password Verify"
+msgstr "Wachtwoord verificatie"
+
+#: language/msgIds.php:13
+msgid "Current Password"
+msgstr "Huidig wachtwoord"
+
+#: language/msgIds.php:14
+msgid "Verify New Password"
+msgstr "Nieuw wachtwoord verificatie"
+
+#: language/msgIds.php:15
+msgid "New Password"
+msgstr "Nieuw wachtwoord"
+
+#: language/msgIds.php:16
+msgid "Please type the following text"
+msgstr "Type de volgende tekst"
+
+#: language/msgIds.php:17
+msgid "Submit"
+msgstr "Verzend"
+
+#: language/msgIds.php:18 view/zfc-user/user/login.phtml:1
+msgid "Sign In"
+msgstr "Aanmelden"
+
+#: language/msgIds.php:19
+msgid "Register"
+msgstr "Registreer"
+
+#: language/msgIds.php:20
+msgid "No record matching the input was found"
+msgstr "Er zijn geen gegevens gevonden die met de invoer overeenkomen"
+
+#: language/msgIds.php:21
+msgid "A record matching the input was found"
+msgstr "Er zijn al gegevens die met de invoer overeenkomen"
+
+#: language/msgIds.php:22
+msgid "Authentication failed. Please try again."
+msgstr "Inloggen mislukt. Probeer het opnieuw."
+
+#: language/msgIds.php:23
+msgid "Request new password"
+msgstr "Vraag nieuw wachtwoord"
+
+#: language/msgIds.php:24
+msgid "Set new password"
+msgstr "Zet nieuw wachtwoord"
+
+#: view/goalio-forgot-password/email/forgot.phtml:2
+msgid ""
+"You have received this email because you initiated to reset your password "
+"with us. To continue with the process, please click the link below:"
+msgstr ""
+"Je hebt deze e-mail ontvangen omdat je een aanvraag hebt gedaan om je "
+"paswoord te veranderen. Om verder te gaan klik op onderstaande link:"
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:1
+#: view/goalio-forgot-password/forgot/sent.phtml:1
+msgid "Forgot your password?"
+msgstr "Wachtwoord vergeten?"
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:23
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:5
+msgid "Back to login."
+msgstr "Terug naar login."
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:1
+msgid "Your password has been changed."
+msgstr "Je paswoord is veranderd."
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:3
+msgid "You can now login using your new password."
+msgstr "Je kan nu inloggen met je nieuwe wachtwoord."
+
+#: view/goalio-forgot-password/forgot/reset.phtml:1
+#, php-format
+msgid "Change Password for %s"
+msgstr "Wijzig het wachtwoord van %s"
+
+#: view/goalio-forgot-password/forgot/sent.phtml:3
+#, php-format
+msgid "A reminder has been sent to your e-mail address %s."
+msgstr "Een herrinering is gestuurd naar het e-mail adres %s."
+
+#: view/goalio-forgot-password/forgot/sent.phtml:5
+msgid "Back to login?"
+msgstr "Terug naar inloggen?"
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Not registered?"
+msgstr "Niet geregistreerd?"
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Sign up!"
+msgstr "Registreren!"
+
+#~ msgid "Change Email for %s"
+#~ msgstr "Wijzig het e-mail adres van %s"
+
+#~ msgid "Email address changed successfully."
+#~ msgstr "Het e-mail adres is gewijzigd."
+
+#~ msgid "Unable to update your email address. Please try again."
+#~ msgstr ""
+#~ "Het is niet gelukt het e-mail adres te wijzigen. Probeer het nog eens."
+
+#~ msgid "Password changed successfully."
+#~ msgstr "Het wachtwoord is gewijzigd."
+
+#~ msgid "Unable to update your password. Please try again."
+#~ msgstr "Wachtwoord wijzigen mislukt. Probeer het nog eens."
+
+#~ msgid "Hello"
+#~ msgstr "Hallo"
+
+#~ msgid "Sign Out"
+#~ msgstr "Afmelden"
+
+#~ msgid "Registration is disabled"
+#~ msgstr "Registratie is uitgeschakeld."
diff --git a/language/pl_PL.mo b/language/pl_PL.mo
new file mode 100644
index 0000000..a6ff1a5
Binary files /dev/null and b/language/pl_PL.mo differ
diff --git a/language/pl_PL.po b/language/pl_PL.po
new file mode 100644
index 0000000..64b206c
--- /dev/null
+++ b/language/pl_PL.po
@@ -0,0 +1,163 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ZfcUser\n"
+"Report-Msgid-Bugs-To: zf-devteam@zend.com\n"
+"POT-Creation-Date: 2014-04-12 16:57+0100\n"
+"PO-Revision-Date: 2014-04-12 16:57+0100\n"
+"Last-Translator: Stijnhau <stijnhau@gmail.com>\n"
+"Language-Team: ZF Contibutors <zf-devteam@zend.com>\n"
+"Language: pl_PL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-Basepath: ../\n"
+"X-Poedit-KeywordsList: translate\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: language/msgIds.php:6
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+#: language/msgIds.php:7
+msgid "Email"
+msgstr "E-mail"
+
+#: language/msgIds.php:8
+msgid "New Email"
+msgstr "Nowy e-mail"
+
+#: language/msgIds.php:9
+msgid "Verify New Email"
+msgstr "Powtórz nowy e-mail"
+
+#: language/msgIds.php:10
+msgid "Display Name"
+msgstr "Nazwa wyświetlana"
+
+#: language/msgIds.php:11
+msgid "Password"
+msgstr "Hasło"
+
+#: language/msgIds.php:12
+msgid "Password Verify"
+msgstr "Powtórz hasło"
+
+#: language/msgIds.php:13
+msgid "Current Password"
+msgstr "Aktualne hasło"
+
+#: language/msgIds.php:14
+msgid "Verify New Password"
+msgstr "Powtórz nowe hasło"
+
+#: language/msgIds.php:15
+msgid "New Password"
+msgstr "Nowe hasło"
+
+#: language/msgIds.php:16
+msgid "Please type the following text"
+msgstr "Proszę przepisz następujący tekst"
+
+#: language/msgIds.php:17
+msgid "Submit"
+msgstr "Prześlij"
+
+#: language/msgIds.php:18 view/zfc-user/user/login.phtml:1
+msgid "Sign In"
+msgstr "Logowanie"
+
+#: language/msgIds.php:19
+msgid "Register"
+msgstr "Rejestracja"
+
+#: language/msgIds.php:20
+msgid "No record matching the input was found"
+msgstr "Nie znaleziono konta o podanym identyfikatorze"
+
+#: language/msgIds.php:21
+msgid "A record matching the input was found"
+msgstr "Konto o podanym identyfikatorze już istnieje"
+
+#: language/msgIds.php:22
+msgid "Authentication failed. Please try again."
+msgstr "Logowanie nie powiodło się. Proszę spróbuj ponownie."
+
+#: language/msgIds.php:23
+#, fuzzy
+msgid "Request new password"
+msgstr "Nowe hasło"
+
+#: language/msgIds.php:24
+#, fuzzy
+msgid "Set new password"
+msgstr "Nowe hasło"
+
+#: view/goalio-forgot-password/email/forgot.phtml:2
+msgid ""
+"You have received this email because you initiated to reset your password "
+"with us. To continue with the process, please click the link below:"
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:1
+#: view/goalio-forgot-password/forgot/sent.phtml:1
+msgid "Forgot your password?"
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/forgot.phtml:23
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:5
+msgid "Back to login."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:1
+msgid "Your password has been changed."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/passwordchanged.phtml:3
+msgid "You can now login using your new password."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/reset.phtml:1
+#, php-format
+msgid "Change Password for %s"
+msgstr "Zmień hasło dla %s"
+
+#: view/goalio-forgot-password/forgot/sent.phtml:3
+#, php-format
+msgid "A reminder has been sent to your e-mail address %s."
+msgstr ""
+
+#: view/goalio-forgot-password/forgot/sent.phtml:5
+msgid "Back to login?"
+msgstr ""
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Not registered?"
+msgstr "Nie posiadasz konta?"
+
+#: view/zfc-user/user/login.phtml:33
+msgid "Sign up!"
+msgstr "Zarejestruj się!"
+
+#~ msgid "Change Email for %s"
+#~ msgstr "Zmień e-mail dla %s"
+
+#~ msgid "Email address changed successfully."
+#~ msgstr "Pomyślnie zaktualizowano e-mail."
+
+#~ msgid "Unable to update your email address. Please try again."
+#~ msgstr ""
+#~ "Nie udało się zaktualizować Twojego adresu e-mail. Proszę spróbuj "
+#~ "ponownie."
+
+#~ msgid "Password changed successfully."
+#~ msgstr "Pomyślnie zmieniono hasło."
+
+#~ msgid "Unable to update your password. Please try again."
+#~ msgstr "Nie udało się zaktualizować Twojego hasła. Proszę spróbuj ponownie."
+
+#~ msgid "Hello"
+#~ msgstr "Witaj"
+
+#~ msgid "Sign Out"
+#~ msgstr "Wyloguj"
diff --git a/language/ru_RU.mo b/language/ru_RU.mo
new file mode 100644
index 0000000..f7df043
Binary files /dev/null and b/language/ru_RU.mo differ
diff --git a/language/ru_RU.po b/language/ru_RU.po
new file mode 100644
index 0000000..4979d88
--- /dev/null
+++ b/language/ru_RU.po
@@ -0,0 +1,130 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ZfcUser\n"
+"Report-Msgid-Bugs-To: zf-devteam@zend.com\n"
+"POT-Creation-Date: 2014-04-11 21:40+0100\n"
+"PO-Revision-Date: 2014-04-11 21:40+0100\n"
+"Last-Translator: Stijnhau <stijnhau@gmail.com>\n"
+"Language-Team: ZF Contibutors <zf-devteam@zend.com>\n"
+"Language: ru_RU\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-KeywordsList: translate\n"
+"X-Poedit-Basepath: ../\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: language/msgIds.php:6
+msgid "Username"
+msgstr "Логин"
+
+#: language/msgIds.php:7
+msgid "Email"
+msgstr "Email"
+
+#: language/msgIds.php:8
+msgid "New Email"
+msgstr "Новый email"
+
+#: language/msgIds.php:9
+msgid "Verify New Email"
+msgstr "Подтвердите новый email"
+
+#: language/msgIds.php:10
+msgid "Display Name"
+msgstr "Отображаемое имя"
+
+#: language/msgIds.php:11
+msgid "Password"
+msgstr "Пароль"
+
+#: language/msgIds.php:12
+msgid "Password Verify"
+msgstr "Подтверждение пароля"
+
+#: language/msgIds.php:13
+msgid "Current Password"
+msgstr "Текущий пароль"
+
+#: language/msgIds.php:14
+msgid "Verify New Password"
+msgstr "Подтверждение нового пароля"
+
+#: language/msgIds.php:15
+msgid "New Password"
+msgstr "Новый пароль"
+
+#: language/msgIds.php:16
+msgid "Please type the following text"
+msgstr "Пожалуйста, введите следующий текст"
+
+#: language/msgIds.php:17
+msgid "Submit"
+msgstr "Отправить"
+
+#: language/msgIds.php:18 view/zfc-user/user/login.phtml:1
+msgid "Sign In"
+msgstr "Вход"
+
+#: language/msgIds.php:19 view/zfc-user/user/register.phtml:1
+msgid "Register"
+msgstr "Регистрация"
+
+#: language/msgIds.php:20
+msgid "No record matching the input was found"
+msgstr "Нет записей, соответствующих вашему запросу"
+
+#: language/msgIds.php:21
+msgid "A record matching the input was found"
+msgstr "Найдена запись, соответствующая вашему запросу"
+
+#: language/msgIds.php:22
+msgid "Authentication failed. Please try again."
+msgstr "Ошибка авторизации. Пожалуйста, попробуйте еще раз."
+
+#: view/zfc-user/user/changeemail.phtml:1
+#, php-format
+msgid "Change Email for %s"
+msgstr "Изменить email для %s"
+
+#: view/zfc-user/user/changeemail.phtml:3
+msgid "Email address changed successfully."
+msgstr "Email успешно изменен"
+
+#: view/zfc-user/user/changeemail.phtml:5
+msgid "Unable to update your email address. Please try again."
+msgstr "Не могу изменить email. Пожалуйста, попробуйте еще раз."
+
+#: view/zfc-user/user/changepassword.phtml:1
+#, php-format
+msgid "Change Password for %s"
+msgstr "Изменить пароль для %s"
+
+#: view/zfc-user/user/changepassword.phtml:3
+msgid "Password changed successfully."
+msgstr "Пароль успешно изменен"
+
+#: view/zfc-user/user/changepassword.phtml:5
+msgid "Unable to update your password. Please try again."
+msgstr "Не могу изменить пароль. Пожалуйста, попробуйте еще раз."
+
+#: view/zfc-user/user/index.phtml:2
+msgid "Hello"
+msgstr "Привет"
+
+#: view/zfc-user/user/index.phtml:3
+msgid "Sign Out"
+msgstr "Выйти"
+
+#: view/zfc-user/user/login.phtml:31
+msgid "Not registered?"
+msgstr "Зарегистрированы?"
+
+#: view/zfc-user/user/login.phtml:31
+msgid "Sign up!"
+msgstr "Регистрация"
+
+#: view/zfc-user/user/register.phtml:5
+msgid "Registration is disabled"
+msgstr ""
diff --git a/src/GoalioForgotPassword/Form/Forgot.php b/src/GoalioForgotPassword/Form/Forgot.php
index aacc106..4ffd9dd 100644
--- a/src/GoalioForgotPassword/Form/Forgot.php
+++ b/src/GoalioForgotPassword/Form/Forgot.php
@@ -21,7 +21,7 @@ public function __construct($name = null, ForgotOptionsInterface $options)
         $this->add(array(
             'name' => 'email',
             'options' => array(
-                'label' => 'E-Mail',
+                'label' => 'Email',
             ),
         ));
 
diff --git a/src/GoalioForgotPassword/Module.php b/src/GoalioForgotPassword/Module.php
index 7457752..6f0ff48 100644
--- a/src/GoalioForgotPassword/Module.php
+++ b/src/GoalioForgotPassword/Module.php
@@ -3,6 +3,7 @@
 
 use Zend\Loader\StandardAutoloader;
 use Zend\Loader\AutoloaderFactory;
+use Zend\Mvc\ModuleRouteListener;
 
 class Module {
 
diff --git a/view/goalio-forgot-password/email/forgot.phtml b/view/goalio-forgot-password/email/forgot.phtml
index 57d502a..099fa0e 100644
--- a/view/goalio-forgot-password/email/forgot.phtml
+++ b/view/goalio-forgot-password/email/forgot.phtml
@@ -1,4 +1,4 @@
 
-You have received this email because you initiated to reset your password with us. To continue with the process, please click the link below:
+<?php echo $this->translate('You have received this email because you initiated to reset your password with us. To continue with the process, please click the link below:'); ?>
 
 <?php echo $this->serverUrl($this->url('zfcuser/resetpassword', array('userId' => $this->record->getUserId(), 'token' => $this->record->getRequestKey()))); ?>
\ No newline at end of file
diff --git a/view/goalio-forgot-password/forgot/forgot.phtml b/view/goalio-forgot-password/forgot/forgot.phtml
index f50a92a..70ae495 100644
--- a/view/goalio-forgot-password/forgot/forgot.phtml
+++ b/view/goalio-forgot-password/forgot/forgot.phtml
@@ -1,4 +1,4 @@
-<h1>Forgot your password?</h1>
+<h1><?php echo $this->translate('Forgot your password?'); ?></h1>
 
 <?php
 $form = $this->forgotForm;
@@ -20,4 +20,4 @@ $form->setAttribute('method', 'post');
 
 <?php echo $this->form()->closeTag() ?>
 
-<a href="<?php echo $this->url('zfcuser/login') ?>">Back to login?</a>
+<a href="<?php echo $this->url('zfcuser/login') ?>"><?php echo $this->translate('Back to login.'); ?></a>
diff --git a/view/goalio-forgot-password/forgot/passwordchanged.phtml b/view/goalio-forgot-password/forgot/passwordchanged.phtml
index c4dded9..58f4a45 100644
--- a/view/goalio-forgot-password/forgot/passwordchanged.phtml
+++ b/view/goalio-forgot-password/forgot/passwordchanged.phtml
@@ -1,5 +1,5 @@
-<h1>Your password has been changed.</h1>
+<h1><?php echo $this->translate('Your password has been changed.'); ?></h1>
 
-<p>You can now login using your new password.</p>
+<p><?php echo $this->translate('You can now login using your new password.') ?></p>
 
-<a href="<?php echo $this->url('zfcuser/login') ?>">Back to login.</a>
+<a href="<?php echo $this->url('zfcuser/login') ?>"><?php echo $this->translate('Back to login.'); ?></a>
diff --git a/view/goalio-forgot-password/forgot/reset.phtml b/view/goalio-forgot-password/forgot/reset.phtml
index 9c28c7c..55b1f46 100644
--- a/view/goalio-forgot-password/forgot/reset.phtml
+++ b/view/goalio-forgot-password/forgot/reset.phtml
@@ -1,4 +1,4 @@
-<h3>Change Password for <?php echo $this->escapeHtml($this->email); ?></h3>
+<h3><?php echo sprintf($this->translate('Change Password for %s'), $this->escapeHtml($this->email)); ?></h3>
 <?php
 
 $form = $this->resetForm;
diff --git a/view/goalio-forgot-password/forgot/sent.phtml b/view/goalio-forgot-password/forgot/sent.phtml
index bb706e9..612ba4e 100644
--- a/view/goalio-forgot-password/forgot/sent.phtml
+++ b/view/goalio-forgot-password/forgot/sent.phtml
@@ -1,5 +1,5 @@
-<h1>Forgot your password?</h1>
+<h1><?php echo $this->translate('Forgot your password?'); ?></h1>
 
-<p>A reminder has been sent to your e-mail address <?php echo $this->escapeHtml($this->email); ?></p>
+<p><?php echo sprintf($this->translate('A reminder has been sent to your e-mail address %s.'), $this->escapeHtml($this->email)); ?></p>
 
-<a href="<?php echo $this->url('zfcuser/login') ?>">Back to login?</a>
+<a href="<?php echo $this->url('zfcuser/login') ?>"><?php echo $this->translate('Back to login?'); ?></a>
diff --git a/view/zfc-user/user/login.phtml b/view/zfc-user/user/login.phtml
index 5945685..ff24776 100644
--- a/view/zfc-user/user/login.phtml
+++ b/view/zfc-user/user/login.phtml
@@ -1,4 +1,4 @@
-<h1>Sign In</h1>
+<h1><?php echo $this->translate('Sign In'); ?></h1>
 
 <?php
 $form = $this->loginForm;
@@ -27,9 +27,8 @@ $form->setAttribute('method', 'post');
 
 <?php echo $this->form()->closeTag() ?>
 
-<p><a href="<?php echo $this->url('zfcuser/forgotpassword') ?>">Forgot your password?</a></p>
+<p><a href="<?php echo $this->url('zfcuser/forgotpassword') ?>"><?php echo $this->translate("Forgot your password?"); ?></a></p>
 
 <?php if ($this->enableRegistration) : ?>
-Not registered? <a href="<?php echo $this->url('zfcuser/register') . ($this->redirect ? '?redirect='.$this->redirect : '') ?>">Sign up!</a>
+<?php echo $this->translate('Not registered?'); ?> <a href="<?php echo $this->url('zfcuser/register') . ($this->redirect ? '?redirect='.$this->redirect : '') ?>"><?php echo $this->translate('Sign up!'); ?></a>
 <?php endif; ?>
-