diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index 9acc93e9f7..079865be1f 100644
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -9,23 +9,25 @@
  * @version     $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->admin->index         = 'Admin Home';
-$lang->admin->checkDB       = 'Datenbank prüfen';
-$lang->admin->sso           = 'SSO';
-$lang->admin->ssoAction     = 'Link Zdoo';
-$lang->admin->safeIndex     = 'Sicherheit';
-$lang->admin->checkWeak     = 'Schwache Passwörter prüfen';
-$lang->admin->certifyMobile = 'Prüfen Sie die Mobilnummer';
-$lang->admin->certifyEmail  = 'Prüfen Sie die Emailadresse';
-$lang->admin->ztCompany     = 'Prüfen Sie das Unternehmen';
-$lang->admin->captcha       = 'Bestätigungscode';
-$lang->admin->getCaptcha    = 'Bestätigungscode anfordern';
-$lang->admin->register      = 'Register';
+$lang->admin->index           = 'Admin Home';
+$lang->admin->checkDB         = 'Datenbank prüfen';
+$lang->admin->sso             = 'SSO';
+$lang->admin->ssoAction       = 'Link Zdoo';
+$lang->admin->safeIndex       = 'Sicherheit';
+$lang->admin->checkWeak       = 'Schwache Passwörter prüfen';
+$lang->admin->certifyMobile   = 'Prüfen Sie die Mobilnummer';
+$lang->admin->certifyEmail    = 'Prüfen Sie die Emailadresse';
+$lang->admin->ztCompany       = 'Prüfen Sie das Unternehmen';
+$lang->admin->captcha         = 'Bestätigungscode';
+$lang->admin->getCaptcha      = 'Bestätigungscode anfordern';
+$lang->admin->register        = 'Register';
+$lang->admin->resetPWDSetting = 'Reset password Setting';
 
-$lang->admin->api     = 'API';
-$lang->admin->log     = 'Log';
-$lang->admin->setting = 'Einstellungen';
-$lang->admin->days    = 'Gültige Tage';
+$lang->admin->api            = 'API';
+$lang->admin->log            = 'Log';
+$lang->admin->setting        = 'Einstellungen';
+$lang->admin->days           = 'Gültige Tage';
+$lang->admin->resetPWDByMail = 'Reset the password via the email';
 
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'Aktuelle Version ist %s. ';
@@ -53,14 +55,14 @@ $lang->admin->bind->caption = 'Konto verknüpfen';
 $lang->admin->bind->success = "Konto wurde verknüpft!";
 
 $lang->admin->safe = new stdclass();
-$lang->admin->safe->common       = 'Sicherheits-Regeln';
-$lang->admin->safe->set          = 'PasswortStärke';
-$lang->admin->safe->password     = 'Passwort Stärke';
-$lang->admin->safe->weak         = 'Schwache Passwörter';
-$lang->admin->safe->reason       = 'Typ';
-$lang->admin->safe->checkWeak    = 'Schwache Passwörter prüfen';
-$lang->admin->safe->changeWeak   = 'Ihr Passwort ist schwach. Bitte ändern.';
-$lang->admin->safe->loginCaptcha = 'Login using CAPTCHA';
+$lang->admin->safe->common                   = 'Sicherheits-Regeln';
+$lang->admin->safe->set                      = 'PasswortStärke';
+$lang->admin->safe->password                 = 'Passwort Stärke';
+$lang->admin->safe->weak                     = 'Schwache Passwörter';
+$lang->admin->safe->reason                   = 'Typ';
+$lang->admin->safe->checkWeak                = 'Schwache Passwörter prüfen';
+$lang->admin->safe->changeWeak               = 'Ihr Passwort ist schwach. Bitte ändern.';
+$lang->admin->safe->loginCaptcha             = 'Login using CAPTCHA';
 $lang->admin->safe->modifyPasswordFirstLogin = 'Passwort nach der ersten Anmeldung ändern';
 
 $lang->admin->safe->modeList[0] = 'N/A';
@@ -82,5 +84,8 @@ $lang->admin->safe->modifyPasswordList[0] = 'Nein';
 $lang->admin->safe->loginCaptchaList[1] = 'Ja';
 $lang->admin->safe->loginCaptchaList[0] = 'Nein';
 
+$lang->admin->safe->resetPWDList[1] = 'ON';
+$lang->admin->safe->resetPWDList[0] = 'Off';
+
 $lang->admin->safe->noticeMode   = 'Password will be checked when a user logs in, or a user is added or edited.';
 $lang->admin->safe->noticeStrong = '';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index ee2abd5f5d..eee000d75c 100644
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -9,23 +9,25 @@
  * @version     $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->admin->index         = 'Admin Home';
-$lang->admin->checkDB       = 'Check Database';
-$lang->admin->sso           = 'Zdoo';
-$lang->admin->ssoAction     = 'Link Zdoo';
-$lang->admin->safeIndex     = 'Sécurité';
-$lang->admin->checkWeak     = 'Contrôle niveau de sécurité des mots de passe';
-$lang->admin->certifyMobile = 'Vérifier votre smartphone';
-$lang->admin->certifyEmail  = 'Vérifier votre Email';
-$lang->admin->ztCompany     = 'Vérifier votre entreprise';
-$lang->admin->captcha       = 'Code de vérification';
-$lang->admin->getCaptcha    = 'Obtenir le Code de vérification';
-$lang->admin->register      = 'Register';
+$lang->admin->index           = 'Admin Home';
+$lang->admin->checkDB         = 'Check Database';
+$lang->admin->sso             = 'Zdoo';
+$lang->admin->ssoAction       = 'Link Zdoo';
+$lang->admin->safeIndex       = 'Sécurité';
+$lang->admin->checkWeak       = 'Contrôle niveau de sécurité des mots de passe';
+$lang->admin->certifyMobile   = 'Vérifier votre smartphone';
+$lang->admin->certifyEmail    = 'Vérifier votre Email';
+$lang->admin->ztCompany       = 'Vérifier votre entreprise';
+$lang->admin->captcha         = 'Code de vérification';
+$lang->admin->getCaptcha      = 'Obtenir le Code de vérification';
+$lang->admin->register        = 'Register';
+$lang->admin->resetPWDSetting = 'Reset password Setting';
 
-$lang->admin->api     = 'API';
-$lang->admin->log     = 'Log';
-$lang->admin->setting = 'Paramétrage';
-$lang->admin->days    = 'Durée de conservation';
+$lang->admin->api            = 'API';
+$lang->admin->log            = 'Log';
+$lang->admin->setting        = 'Paramétrage';
+$lang->admin->days           = 'Durée de conservation';
+$lang->admin->resetPWDByMail = 'Reset the password via the email';
 
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'La version actuelle est %s customisée. ';
@@ -53,14 +55,14 @@ $lang->admin->bind->caption = 'Lier au compte';
 $lang->admin->bind->success = "Le compte est associé !";
 
 $lang->admin->safe = new stdclass();
-$lang->admin->safe->common       = 'Politique de sécurité';
-$lang->admin->safe->set          = 'Paramétrages du Mot de passe';
-$lang->admin->safe->password     = 'Force du Mot de passe';
-$lang->admin->safe->weak         = 'Mots de passes non sécurisés courrants';
-$lang->admin->safe->reason       = 'Type';
-$lang->admin->safe->checkWeak    = 'Balayage des mots de passe faibles';
-$lang->admin->safe->changeWeak   = 'Forcer le changement des mots de passe faibles';
-$lang->admin->safe->loginCaptcha = 'Login using CAPTCHA';
+$lang->admin->safe->common                   = 'Politique de sécurité';
+$lang->admin->safe->set                      = 'Paramétrages du Mot de passe';
+$lang->admin->safe->password                 = 'Force du Mot de passe';
+$lang->admin->safe->weak                     = 'Mots de passes non sécurisés courrants';
+$lang->admin->safe->reason                   = 'Type';
+$lang->admin->safe->checkWeak                = 'Balayage des mots de passe faibles';
+$lang->admin->safe->changeWeak               = 'Forcer le changement des mots de passe faibles';
+$lang->admin->safe->loginCaptcha             = 'Login using CAPTCHA';
 $lang->admin->safe->modifyPasswordFirstLogin = 'Forcer le changement du mot de passe après la première connexion';
 
 $lang->admin->safe->modeList[0] = "Contrôle Modéré";
@@ -82,5 +84,8 @@ $lang->admin->safe->modifyPasswordList[0] = 'Non';
 $lang->admin->safe->loginCaptchaList[1] = 'Yes';
 $lang->admin->safe->loginCaptchaList[0] = 'Non';
 
+$lang->admin->safe->resetPWDList[1] = 'ON';
+$lang->admin->safe->resetPWDList[0] = 'Off';
+
 $lang->admin->safe->noticeMode   = "Le mot de passe sera vérifié quand un utilisateur se connectera ou qu'un utilisateur sera créé ou modifier.";
 $lang->admin->safe->noticeStrong = '';
diff --git a/module/api/lang/de.php b/module/api/lang/de.php
index 8871f9512f..f199403fc1 100644
--- a/module/api/lang/de.php
+++ b/module/api/lang/de.php
@@ -60,6 +60,8 @@ $lang->api->confirmDeleteLib = "Do you want to delete this interface library?";
 $lang->api->filterStruct     = "use struct";
 $lang->api->defaultVersion   = "Current Version";
 $lang->api->zentaoAPI        = "Zentao API v1";
+$lang->api->search           = "Search";
+$lang->api->allLibs          = "AllLibs";
 
 /* Common access control lang. */
 $lang->api->whiteList          = 'Whitelist';
@@ -124,6 +126,12 @@ $lang->api->query              = 'Parameter';
 $lang->api->params             = 'Request Body';
 $lang->api->response           = 'Response';
 $lang->api->responseExample    = 'Response Example';
+$lang->api->id                 = 'ID';
+$lang->api->addedBy            = 'AddedBy';
+$lang->api->addedDate          = 'AddedDate';
+$lang->api->editedBy           = 'EditedBy';
+$lang->api->editedDate         = 'EditedDate';
+$lang->api->version            = 'Version';
 $lang->api->res                = new stdClass();
 $lang->api->res->name          = 'Name';
 $lang->api->res->desc          = 'Description';
diff --git a/module/api/lang/fr.php b/module/api/lang/fr.php
index 1c258bb0b5..347256105e 100644
--- a/module/api/lang/fr.php
+++ b/module/api/lang/fr.php
@@ -60,6 +60,8 @@ $lang->api->confirmDeleteLib = "Do you want to delete this interface library?";
 $lang->api->filterStruct     = "use struct";
 $lang->api->defaultVersion   = "Current Version";
 $lang->api->zentaoAPI        = "Zentao API v1";
+$lang->api->search           = "Search";
+$lang->api->allLibs          = "AllLibs";
 
 /* Common access control lang. */
 $lang->api->whiteList          = 'Whitelist';
@@ -124,6 +126,12 @@ $lang->api->query              = 'Parameter';
 $lang->api->params             = 'Request Body';
 $lang->api->response           = 'Response';
 $lang->api->responseExample    = 'Response Example';
+$lang->api->id                 = 'ID';
+$lang->api->addedBy            = 'AddedBy';
+$lang->api->addedDate          = 'AddedDate';
+$lang->api->editedBy           = 'EditedBy';
+$lang->api->editedDate         = 'EditedDate';
+$lang->api->version            = 'Version';
 $lang->api->res                = new stdClass();
 $lang->api->res->name          = 'Name';
 $lang->api->res->desc          = 'Description';
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 81ebf9854b..b2806436ea 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -326,8 +326,8 @@ $lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
 if($config->systemMode == 'classic')
 {
-    $lang->block->default['full']['my']['10']['block']  = 'execution';
-    $lang->block->default['full']['my']['10']['source'] = 'execution';
+    $lang->block->default['full']['my']['10']['block']  = 'project';
+    $lang->block->default['full']['my']['10']['source'] = 'project';
 }
 
 $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc';
@@ -567,7 +567,7 @@ $lang->block->flowchart['admin']   = array('Administrator', 'Abteilung erstellen
 if($config->systemMode == 'new') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Besitzer', $lang->productCommon . ' erstellen', 'Module pflegen', 'Pläne pflegen', 'Storys pflegen', 'Release erstellen');
 $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
-if($config->systemMode == 'new') $lang->block->flowchart['project'] = array('Project Manager', 'Add ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
+if($config->systemMode == 'new') $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
 $lang->block->flowchart['dev']     = array('Entwickler', 'Aufgabe/Bugs anfordern', 'Update Status', 'Aufgaben/Bugs abschließen');
 $lang->block->flowchart['tester']  = array('QS Team', 'Fälle erstellen', 'Fälle ausführen', 'Bug Berichte', 'Bugs überprüfen', 'Bugs schließen');
 
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index b06d59432e..d9309801ab 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -326,8 +326,8 @@ $lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
 if($config->systemMode == 'classic')
 {
-    $lang->block->default['full']['my']['10']['block']  = 'execution';
-    $lang->block->default['full']['my']['10']['source'] = 'execution';
+    $lang->block->default['full']['my']['10']['block']  = 'project';
+    $lang->block->default['full']['my']['10']['source'] = 'project';
 }
 
 $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc';
@@ -567,7 +567,7 @@ $lang->block->flowchart['admin']   = array('Administrateur', 'Ajoute Compartimen
 if($config->systemMode == 'new') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Ajoute ' . $lang->productCommon . '/Modules', 'Ajoute ' . $lang->executionCommon . 's', 'Ajoute Stories', 'Maintient Plans', 'Crée Releases');
 $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
-if($config->systemMode == 'new') $lang->block->flowchart['project'] = array('Project Manager', 'Add ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
+if($config->systemMode == 'new') $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
 $lang->block->flowchart['dev']     = array('Développeurs', 'Réclament Tâches/Bugs', 'Effectuent Tâches', 'Corrigent Bugs', 'MàJ Statuts', 'Terminent Tâches/Bugs');
 $lang->block->flowchart['tester']  = array('Testeurs', 'Rédigent CasTests', 'Jouent CasTests', 'Détectent Bugs', 'Vérifient Corrections', 'Ferment Bugs');
 
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 230b0de29e..d63e726e2d 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -151,6 +151,7 @@ $lang->doc->removeMenu     = 'Vom Menü entfernen';
 $lang->doc->search         = 'Suche';
 $lang->doc->allCollections = 'All Collections';
 $lang->doc->keywordsTips   = 'Please use commas to separate multiple keywords.';
+$lang->doc->sortLibs       = 'Sort Libs';
 
 global $config;
 /* Query condition list. */
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index 22c6c3ccc5..b9379ba42a 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -151,6 +151,7 @@ $lang->doc->removeMenu     = 'Décoller du Menu';
 $lang->doc->search         = 'Rechercher';
 $lang->doc->allCollections = 'All Collections';
 $lang->doc->keywordsTips   = 'Please use commas to separate multiple keywords.';
+$lang->doc->sortLibs       = 'Sort Libs';
 
 global $config;
 /* Query condition list. */
diff --git a/module/install/lang/de.php b/module/install/lang/de.php
index 2214da0d29..7ce7b1addd 100644
--- a/module/install/lang/de.php
+++ b/module/install/lang/de.php
@@ -161,6 +161,9 @@ $lang->install->company            = 'Firmenname';
 $lang->install->account            = 'Admin Konto';
 $lang->install->password           = 'Admin Passwort';
 
+$lang->install->placeholder = new stdclass();
+$lang->install->placeholder->password = 'Combination of letters, numbers and special symbols, at least 6 characters';
+
 $lang->install->errorEmpty['company']  = "{$lang->install->company} should not be blank.";
 $lang->install->errorEmpty['account']  = "{$lang->install->account} should not be blank.";
 $lang->install->errorEmpty['password'] = "{$lang->install->password} should not be blank.";
diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php
index da37e42715..fa18a22ff6 100644
--- a/module/install/lang/fr.php
+++ b/module/install/lang/fr.php
@@ -161,6 +161,9 @@ $lang->install->company            = 'Nom Entreprise';
 $lang->install->account            = 'Compte Admin';
 $lang->install->password           = 'Mot de Passe Admin';
 
+$lang->install->placeholder = new stdclass();
+$lang->install->placeholder->password = 'Combination of letters, numbers and special symbols, at least 6 characters';
+
 $lang->install->errorEmpty['company']  = "{$lang->install->company} should not be blank.";
 $lang->install->errorEmpty['account']  = "{$lang->install->account} should not be blank.";
 $lang->install->errorEmpty['password'] = "{$lang->install->password} should not be blank.";
diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php
index 4e5a92b40f..a0c66d18f1 100644
--- a/module/kanban/lang/de.php
+++ b/module/kanban/lang/de.php
@@ -90,7 +90,7 @@ $lang->kanban->mine                = 'Mine';
 /* Fields. */
 $lang->kanban->space          = 'Space';
 $lang->kanban->name           = 'Name';
-$lang->kanban->archived       = 'Archive';
+$lang->kanban->archived       = 'Archived';
 $lang->kanban->owner          = 'Owner';
 $lang->kanban->team           = 'Team';
 $lang->kanban->desc           = 'Description';
diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php
index 4e5a92b40f..a0c66d18f1 100644
--- a/module/kanban/lang/fr.php
+++ b/module/kanban/lang/fr.php
@@ -90,7 +90,7 @@ $lang->kanban->mine                = 'Mine';
 /* Fields. */
 $lang->kanban->space          = 'Space';
 $lang->kanban->name           = 'Name';
-$lang->kanban->archived       = 'Archive';
+$lang->kanban->archived       = 'Archived';
 $lang->kanban->owner          = 'Owner';
 $lang->kanban->team           = 'Team';
 $lang->kanban->desc           = 'Description';
diff --git a/module/mail/lang/de.php b/module/mail/lang/de.php
index a43c637d0e..d52845f176 100644
--- a/module/mail/lang/de.php
+++ b/module/mail/lang/de.php
@@ -114,5 +114,11 @@ $lang->mail->ztCloudNotice    = <<<EOD
 
 EOD;
 
+$lang->mail->forgetPassword = <<<EOT
+<p>Hello:</p>
+<p>You are applying to reset your ZenTao password. The link is valid for three minutes. If it expires, please apply again.</p>
+<p><a href="%s" target="_blank">Click here to jump</a></p>
+EOT;
+
 $lang->mail->placeholder = new stdclass();
 $lang->mail->placeholder->password = 'Manche Mail Server benötigen einen AUTH CODE. Bitte prüfen Sie das bei Ihrem Mailprovider.';
diff --git a/module/mail/lang/fr.php b/module/mail/lang/fr.php
index 263bcdcc95..064a1c6e18 100644
--- a/module/mail/lang/fr.php
+++ b/module/mail/lang/fr.php
@@ -114,5 +114,11 @@ $lang->mail->ztCloudNotice    = <<<EOD
 
 EOD;
 
+$lang->mail->forgetPassword = <<<EOT
+<p>Hello:</p>
+<p>You are applying to reset your ZenTao password. The link is valid for three minutes. If it expires, please apply again.</p>
+<p><a href="%s" target="_blank">Click here to jump</a></p>
+EOT;
+
 $lang->mail->placeholder = new stdclass();
 $lang->mail->placeholder->password = "Certains serveurs de mails demandent un code d'autorisation, consultez le service d'Emails de votre provider.";
diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php
index 2b9f8e9ebc..46ed175893 100644
--- a/module/mr/lang/de.php
+++ b/module/mr/lang/de.php
@@ -185,7 +185,7 @@ EOD;
 
 $lang->mr->noChanges = "Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.";
 
-$lang->mr->linkTask          = "Link task";
+$lang->mr->linkTask          = 'Link Tasks';
 $lang->mr->unlinkTask        = "Remove task";
 $lang->mr->linkedTasks       = 'Task';
 $lang->mr->unlinkedTasks     = 'Task not linked';
diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php
index 2b9f8e9ebc..46ed175893 100644
--- a/module/mr/lang/fr.php
+++ b/module/mr/lang/fr.php
@@ -185,7 +185,7 @@ EOD;
 
 $lang->mr->noChanges = "Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.";
 
-$lang->mr->linkTask          = "Link task";
+$lang->mr->linkTask          = 'Link Tasks';
 $lang->mr->unlinkTask        = "Remove task";
 $lang->mr->linkedTasks       = 'Task';
 $lang->mr->unlinkedTasks     = 'Task not linked';
diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php
index d6ce9927b0..e87334e50d 100644
--- a/module/productplan/lang/de.php
+++ b/module/productplan/lang/de.php
@@ -95,7 +95,7 @@ $lang->productplan->childrenAB = "C";
 $lang->productplan->order      = "Rank";
 $lang->productplan->deleted    = "Deleted";
 $lang->productplan->mailto     = "Mailto";
-$lang->productplan->status     = "Plan Status";
+$lang->productplan->status     = 'Status';
 $lang->productplan->planStatus = "Status";
 
 $lang->productplan->statusList['wait']   = 'Wait';
diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php
index c4194410cf..8b45ee16bf 100644
--- a/module/productplan/lang/fr.php
+++ b/module/productplan/lang/fr.php
@@ -95,7 +95,7 @@ $lang->productplan->childrenAB = "C";
 $lang->productplan->order      = "Order";
 $lang->productplan->deleted    = "Deleted";
 $lang->productplan->mailto     = "Mailto";
-$lang->productplan->status     = "Plan Status";
+$lang->productplan->status     = 'Status';
 $lang->productplan->planStatus = "Status";
 
 $lang->productplan->statusList['wait']   = 'Wait';
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index 710b385331..be6975e083 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -39,7 +39,7 @@ $lang->program->auth           = 'Auth';
 $lang->program->path           = 'Path';
 $lang->program->grade          = 'Grade';
 $lang->program->realBegan      = 'RealBegan';
-$lang->program->realEnd        = 'RealEnd';
+$lang->program->realEnd        = 'Actual End';
 $lang->program->version        = 'Version';
 $lang->program->parentVersion  = 'ParentVersion';
 $lang->program->planDuration   = 'PlanDuration';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index 710b385331..be6975e083 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -39,7 +39,7 @@ $lang->program->auth           = 'Auth';
 $lang->program->path           = 'Path';
 $lang->program->grade          = 'Grade';
 $lang->program->realBegan      = 'RealBegan';
-$lang->program->realEnd        = 'RealEnd';
+$lang->program->realEnd        = 'Actual End';
 $lang->program->version        = 'Version';
 $lang->program->parentVersion  = 'ParentVersion';
 $lang->program->planDuration   = 'PlanDuration';
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index 3cb8d41fc9..e01b7e3ed8 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -18,6 +18,7 @@ $lang->user->dept             = 'Abteilung';
 $lang->user->account          = 'Konto';
 $lang->user->password         = 'Passwort';
 $lang->user->password2        = 'Passwort wiederholen';
+$lang->user->password2AB      = 'Repeat Password';
 $lang->user->role             = 'Rolle';
 $lang->user->group            = 'Gruppe';
 $lang->user->realname         = 'Name';
@@ -74,6 +75,9 @@ $lang->user->projects         = 'Project';
 $lang->user->sprints          = $lang->execution->common;
 $lang->user->identity         = 'Identity';
 $lang->user->switchVision     = 'Switch to %s';
+$lang->user->submit           = 'Submit';
+$lang->user->resetPWD         = 'Reset Password';
+$lang->user->resetTitle       = 'Admin reset the password';
 
 $lang->user->legendBasic        = 'Basic Information';
 $lang->user->legendContribution = 'Contribution';
@@ -111,6 +115,8 @@ $lang->user->applyTemplate         = 'Templates';
 $lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
 $lang->user->setPublicTemplate     = 'Set as Public Template';
 $lang->user->tplContentNotEmpty    = 'Vorlageninhalt darf nicht leer sein!';
+$lang->user->sendEmailSuccess      = 'An email has been sent to your mailbox. Please check it.';
+$lang->user->linkExpired           = 'The link has expired, please apply again.';
 
 $lang->user->profile   = 'Profil';
 $lang->user->project   = $lang->executionCommon;
@@ -147,6 +153,7 @@ $lang->user->loginLocked  = "Bitte kontaktieren Sie den Administrator um Ihr Kon
 $lang->user->weakPassword = "Ihr Passwort entspricht nicht den Anforderungen.";
 $lang->user->errorWeak    = "Passwords cannot use [%s] these commonly used weak passwords.";
 $lang->user->errorCaptcha = "Captcha Error";
+$lang->user->loginExpired = 'System login has expired, please log in again :)';
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = 'Developer';
@@ -212,6 +219,7 @@ $lang->user->placeholder->verify    = 'Bitte geben Sie Ihr Login Passwort ein.';
 $lang->user->placeholder->loginPassword = 'Enter your password';
 $lang->user->placeholder->loginAccount  = 'Enter your account';
 $lang->user->placeholder->loginUrl      = 'Enter your ZenTao address';
+$lang->user->placeholder->email         = 'Enter your email';
 
 $lang->user->placeholder->passwordStrength[1] = 'Buchstaben und Ziffern. Mindestens 6 Zeichen';
 $lang->user->placeholder->passwordStrength[2] = 'Buchstaben, Ziffern und Sonderzeichen. Mindestens 10 Zeichen';
@@ -233,6 +241,13 @@ $lang->user->error->verifyPassword   = "Verifikation fehlgeschlagen. Bitte geben
 $lang->user->error->originalPassword = "Altes Passwort ist falsch.";
 $lang->user->error->companyEmpty     = "Company name must be not empty.";
 $lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information.";
+$lang->user->error->accountEmpty     = 'Account must be not empty !';
+$lang->user->error->emailEmpty       = 'Email must be not empty !';
+$lang->user->error->noUser           = 'Invalid account.';
+$lang->user->error->noEmail          = 'The user does not register email. Please get in touch with the administrator to reset the password.';
+$lang->user->error->errorEmail       = 'The account does not match the email. Please enter a new one.';
+$lang->user->error->emailSetting     = 'No email is configured in the system. Contact the admin to reset the email.';
+$lang->user->error->sendMailFail     = 'Message sending failed, please try again!';
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -293,3 +308,5 @@ $lang->user->mkdirLinux = <<<EOT
     <div style='margin-bottom:8px;'>Commond: <strong style='color:#ed980f'>chmod 777 -R %s</strong>.</div>
     </td></tr></table></body></html>
 EOT;
+
+$lang->user->jumping = "This page will redirect to the previous page in <span id='time'>3</span> seconds. <a href='%s' class='btn btn-primary btn-xs'>Redirect Now</a>";
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index abbd28f41a..22cb9d016a 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -18,6 +18,7 @@ $lang->user->dept             = 'Compartiment';
 $lang->user->account          = 'Compte';
 $lang->user->password         = 'Mot de Passe';
 $lang->user->password2        = 'Répétez Password';
+$lang->user->password2AB      = 'Repeat Password';
 $lang->user->role             = 'Rôle';
 $lang->user->group            = 'Groupe de Privilèges';
 $lang->user->realname         = 'Nom';
@@ -74,6 +75,9 @@ $lang->user->projects         = 'Project';
 $lang->user->sprints          = $lang->execution->common;
 $lang->user->identity         = 'Identity';
 $lang->user->switchVision     = 'Switch to %s';
+$lang->user->submit           = 'Submit';
+$lang->user->resetPWD         = 'Reset Password';
+$lang->user->resetTitle       = 'Admin reset the password';
 
 $lang->user->legendBasic        = 'Informations de Base';
 $lang->user->legendContribution = 'Contribution';
@@ -111,6 +115,8 @@ $lang->user->applyTemplate         = 'Modèles';
 $lang->user->confirmDeleteTemplate = 'Voulez-vous vraiment supprimer ce modèle ?';
 $lang->user->setPublicTemplate     = 'Définir comme Modèle Public';
 $lang->user->tplContentNotEmpty    = 'Le contenu du modèle ne peut pas être vide !';
+$lang->user->sendEmailSuccess      = 'An email has been sent to your mailbox. Please check it.';
+$lang->user->linkExpired           = 'The link has expired, please apply again.';
 
 $lang->user->profile   = 'Profil';
 $lang->user->project   = $lang->executionCommon . 's';
@@ -147,6 +153,7 @@ $lang->user->loginLocked  = "Votre compte est bloqué. Contactez l'administrateu
 $lang->user->weakPassword = "Votre mot de passe ne respecte pas les règles de sécurité.";
 $lang->user->errorWeak    = "Les mots de passe ne peuvent pas utiliser ces [%s] mots de passe faibles couramment utilisés.";
 $lang->user->errorCaptcha = "Captcha Error";
+$lang->user->loginExpired = 'System login has expired, please log in again :)';
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = 'Développeur';
@@ -212,6 +219,7 @@ $lang->user->placeholder->verify    = 'Entrez votre Mot de passe.';
 $lang->user->placeholder->loginPassword = 'Enter your password';
 $lang->user->placeholder->loginAccount  = 'Enter your account';
 $lang->user->placeholder->loginUrl      = 'Enter your ZenTao address';
+$lang->user->placeholder->email         = 'Enter your email';
 
 $lang->user->placeholder->passwordStrength[1] = '>= 6 lettres et chiffres';
 $lang->user->placeholder->passwordStrength[2] = '>= 10 lettres, chiffres et caractères spéciaux';
@@ -233,6 +241,13 @@ $lang->user->error->verifyPassword   = "Vérification en échec. Entrez votre Mo
 $lang->user->error->originalPassword = "Ancien Mot de Passe incorrect.";
 $lang->user->error->companyEmpty     = "Company name must be not empty.";
 $lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information.";
+$lang->user->error->accountEmpty     = 'Account must be not empty !';
+$lang->user->error->emailEmpty       = 'Email must be not empty !';
+$lang->user->error->noUser           = 'Invalid account.';
+$lang->user->error->noEmail          = 'The user does not register email. Please get in touch with the administrator to reset the password.';
+$lang->user->error->errorEmail       = 'The account does not match the email. Please enter a new one.';
+$lang->user->error->emailSetting     = 'No email is configured in the system. Contact the admin to reset the email.';
+$lang->user->error->sendMailFail     = 'Message sending failed, please try again!';
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -293,3 +308,5 @@ $lang->user->mkdirLinux = <<<EOT
     <div style='margin-bottom:8px;'>Commond: <strong style='color:#ed980f'>chmod 777 -R %s</strong>.</div>
     </td></tr></table></body></html>
 EOT;
+
+$lang->user->jumping = "This page will redirect to the previous page in <span id='time'>3</span> seconds. <a href='%s' class='btn btn-primary btn-xs'>Redirect Now</a>";