diff --git a/language/zh_TW/common.lang.php b/language/zh_TW/common.lang.php
index d50f2e903..b6bcac9c5 100644
--- a/language/zh_TW/common.lang.php
+++ b/language/zh_TW/common.lang.php
@@ -24,18 +24,18 @@ $lang_info['zero_plural'] = false;
 $lang['%d Kb'] = '%d KB';
 $lang['%d album updated'] = '%d 相冊已更新';
 $lang['%d albums updated'] = '%d 相冊已更新';
-$lang['%d comment to validate'] = '%d 評論等待驗證';
-$lang['%d comments to validate'] = '%d 評論等待驗證';
-$lang['%d new comment'] = '%d 新評論';
-$lang['%d new comments'] = '%d 新評論';
-$lang['%d comment'] = '%d 評論';
-$lang['%d comments'] = '%d 評論';
+$lang['%d comment to validate'] = '%d 則評論等待驗證';
+$lang['%d comments to validate'] = '%d 則評論等待驗證';
+$lang['%d new comment'] = '%d 則新評論';
+$lang['%d new comments'] = '%d 則新評論';
+$lang['%d comment'] = '%d 則評論';
+$lang['%d comments'] = '%d 則評論';
 $lang['%d hit'] = '查看 %d 次';
 $lang['%d hits'] = '查看 %d 次';
-$lang['%d new photo'] = '%d 新圖片';
-$lang['%d new photos'] = '%d 新圖片';
-$lang['%d new user'] = '%d 新用戶';
-$lang['%d new users'] = '%d 新用戶';
+$lang['%d new photo'] = '%d 張新圖片';
+$lang['%d new photos'] = '%d 張新圖片';
+$lang['%d new user'] = '%d 位新用戶';
+$lang['%d new users'] = '%d 位新用戶';
 $lang['About'] = '關於';
 $lang['All tags'] = '所有標籤';
 $lang['Any tag'] = '任何標籤';
@@ -105,7 +105,7 @@ $lang['Username'] = '用戶名';
 $lang['Visits'] = '訪問';
 $lang['Webmaster'] = '網管';
 $lang['Week %d'] = '星期 %d';
-$lang['About Piwigo'] = '關於Piwigo';
+$lang['About Piwigo'] = '關於 Piwigo';
 $lang['You are not authorized to access the requested page'] = '你無權訪問此頁';
 $lang['add this photo to your favorites'] = '把圖片放到收藏夾';
 $lang['Administration'] = '管理員';
@@ -257,7 +257,7 @@ $lang['return to the display of all photos'] = '返回到所有圖片頁面';
 $lang['the beginning'] = '開始';
 $lang['Thumbnails'] = '縮略圖';
 $lang['Menu'] = '選單';
-$lang['A comment on your site'] = '在您的網站上的評論';
+$lang['A comment on your site'] = '在您網站上的評論';
 $lang['today'] = '今天';
 $lang['Update your rating'] = '更改投票';
 $lang['the username must be given'] = '缺少用戶名';
@@ -271,7 +271,7 @@ $lang['Comment: %s'] = '評論: %s';
 $lang['Comment by %s'] = '評論者 %s';
 $lang['User: %s'] = '用戶: %s';
 $lang['Email: %s'] = '電子郵件: %s';
-$lang['Admin: %s'] = '管理員: %s';
+$lang['Admin: %s'] = '管理員：%s';
 $lang['Registration of %s'] = '註冊 %s';
 $lang['Album: %s'] = '相冊: %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = '如果"遊客"反常擁有普通用戶才擁有狀態，預設狀態將被使用。請通知管理員。';
@@ -288,10 +288,10 @@ $lang['Accelerate diaporama speed'] = '加快播放速度';
 $lang['Submit'] = '提交';
 $lang['Yes'] = '是';
 $lang['No'] = '否';
-$lang['%d photo']='%d 圖片';
-$lang['%d photos']='%d 圖片';
-$lang['%d photo is also linked to current tags'] = '%d 圖片同時與目前標籤相關';
-$lang['%d photos are also linked to current tags'] = '%d 圖片同時與目前標籤相關';
+$lang['%d photo'] = '%d 張圖片';
+$lang['%d photos'] = '%d 張圖片';
+$lang['%d photo is also linked to current tags'] = '%d 張圖片同時與目前標籤相關';
+$lang['%d photos are also linked to current tags'] = '%d 張圖片同時與目前標籤相關';
 $lang['display photos linked to this tag'] = '只查看和這標籤相關的圖片';
 $lang['photos posted during the last %d days'] = '圖片在最近%d天裡更新';
 $lang['Piwigo Help'] = 'Piwigo幫助';
@@ -318,7 +318,7 @@ $lang['This author modified following comment:'] = '此作者修改了以下的
 $lang['This author removed the comment with id %d'] = '此作者刪除了 id 為 %d 的評論';
 $lang['Sent by'] = '發送人';
 $lang['html tags are not allowed in login'] = 'html標籤中不允許登入';
-$lang['%d rates'] = '%d 評價';
+$lang['%d rates'] = '%d 筆評價';
 $lang['Rating score'] = '評價得分';
 $lang['The number of photos per page must be a not null scalar'] = '每頁的照片的數量不能為零';
 $lang['Number of photos per page'] = '每頁的照片數量';
@@ -384,7 +384,7 @@ $lang['Visits, low → high'] = '點閱率, 低 → 高';
 $lang['Numeric identifier, 1 → 9'] = '數字標識符, 1 → 9';
 $lang['Numeric identifier, 9 → 1'] = '數字標識符, 9 → 1';
 $lang['Manual sort order'] = '手動排序';
-$lang['%d rate'] = '%d 比率';
+$lang['%d rate'] = '%d 筆評價';
 $lang['Page not found'] = '找不到網頁';
 $lang['Bad request'] = '錯誤的請求';
 $lang['Forbidden'] = '禁止進入';
@@ -403,7 +403,7 @@ $lang['Go back to the album'] = '返回相冊';
 $lang['Last Page'] = '最後一頁';
 $lang['Password is missing. Please enter the password.'] = '密碼沒有輸入，請輸入密碼。';
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = '密碼確認未完成，請確認所選定的密碼。';
-$lang['%d photos per page'] = '每頁 %d 相片';
+$lang['%d photos per page'] = '每頁 %d 張相片';
 $lang['Theme'] = '主題';
 $lang['No results for'] = '沒有結果';
 $lang['Photo description'] = '圖片說明';
@@ -411,4 +411,9 @@ $lang['Photo title'] = '圖片標題';
 $lang['Apply on properties'] = '適用於性能';
 $lang['Album name, A → Z'] = '相冊名稱, A → Z';
 $lang['Album name, Z → A'] = '相冊名稱, Z → A';
-$lang['Link: %s'] = '連結: %s';
\ No newline at end of file
+$lang['Link: %s'] = '連結: %s';
+$lang['Password: ********** (no copy by email)'] = '密碼：**********（不要直接從郵件中複製）';
+$lang['Invalid username or password!'] = '使用者名稱不存在或密碼不符！';
+$lang['Related albums'] = '相關的相簿';
+$lang['Your authentication key is no longer valid.'] = '您的認證金鑰已失效。';
+$lang['generate random password'] = '產生隨機密碼';
\ No newline at end of file