Merge branch 'master' into fix-5388-master

5 files changed, 247 insertions, 200 deletions

diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 6fd41d8e78a..a184899641b 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-24 00:13-0500\n"
-"PO-Revision-Date: 2013-11-22 02:20+0000\n"
+"POT-Creation-Date: 2013-12-07 22:26-0500\n"
+"PO-Revision-Date: 2013-12-08 03:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -274,7 +274,7 @@ msgid "Share"
 msgstr "分享"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719
+#: js/share.js:719 templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
@@ -310,7 +310,7 @@ msgstr "分享連結"
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:224 templates/installation.php:57 templates/login.php:32
+#: js/share.js:224 templates/installation.php:58 templates/login.php:38
 msgid "Password"
 msgstr "密碼"
 
@@ -386,7 +386,7 @@ msgstr "刪除"
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:464 js/share.js:694
+#: js/share.js:694
 msgid "Password protected"
 msgstr "受密碼保護"
 
@@ -438,6 +438,10 @@ msgstr "載入對話樣板出錯：{error}"
 msgid "No tags selected for deletion."
 msgstr "沒有選擇要刪除的標籤"
 
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -473,8 +477,8 @@ msgstr "請求失敗！<br>您確定填入的電子郵件地址或是帳號名�
 msgid "You will receive a link to reset your password via Email."
 msgstr "重設密碼的連結將會寄到您的電子郵件信箱。"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
-#: templates/login.php:25
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
+#: templates/login.php:31
 msgid "Username"
 msgstr "使用者名稱"
 
@@ -518,7 +522,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "使用者"
 
-#: strings.php:7 templates/layout.user.php:110
+#: strings.php:7 templates/layout.user.php:111
 msgid "Apps"
 msgstr "應用程式"
 
@@ -585,101 +589,108 @@ msgstr ""
 msgid "Cheers!"
 msgstr "太棒了！"
 
-#: templates/installation.php:24 templates/installation.php:31
-#: templates/installation.php:38
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
 msgid "Security Warning"
 msgstr "安全性警告"
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)"
 
-#: templates/installation.php:26
+#: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
 msgstr "請更新 PHP 以安全地使用 %s。"
 
-#: templates/installation.php:32
+#: templates/installation.php:33
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr "沒有可用的亂數產生器，請啟用 PHP 中的 OpenSSL 擴充功能。"
 
-#: templates/installation.php:33
+#: templates/installation.php:34
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr "若沒有安全的亂數產生器，攻擊者可能可以預測密碼重設信物，然後控制您的帳戶。"
 
-#: templates/installation.php:39
+#: templates/installation.php:40
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。"
 
-#: templates/installation.php:41
+#: templates/installation.php:42
 #, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。"
 
-#: templates/installation.php:47
+#: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一個<strong>管理者帳號</strong>"
 
-#: templates/installation.php:66
+#: templates/installation.php:67
 msgid "Advanced"
 msgstr "進階"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Data folder"
 msgstr "資料儲存位置"
 
-#: templates/installation.php:85
+#: templates/installation.php:86
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:90 templates/installation.php:102
-#: templates/installation.php:113 templates/installation.php:124
-#: templates/installation.php:136
+#: templates/installation.php:91 templates/installation.php:103
+#: templates/installation.php:114 templates/installation.php:125
+#: templates/installation.php:137
 msgid "will be used"
 msgstr "將會使用"
 
-#: templates/installation.php:148
+#: templates/installation.php:149
 msgid "Database user"
 msgstr "資料庫使用者"
 
-#: templates/installation.php:155
+#: templates/installation.php:156
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:160
+#: templates/installation.php:161
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:168
+#: templates/installation.php:169
 msgid "Database tablespace"
 msgstr "資料庫 tablespace"
 
-#: templates/installation.php:175
+#: templates/installation.php:176
 msgid "Database host"
 msgstr "資料庫主機"
 
-#: templates/installation.php:184
+#: templates/installation.php:185
 msgid "Finish setup"
 msgstr "完成設定"
 
-#: templates/installation.php:184
+#: templates/installation.php:185
 msgid "Finishing …"
 msgstr "即將完成…"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
 
-#: templates/layout.user.php:71
+#: templates/layout.user.php:72 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "登出"
 
@@ -705,19 +716,19 @@ msgstr "伺服器端認證失敗！"
 msgid "Please contact your administrator."
 msgstr "請聯絡系統管理員。"
 
-#: templates/login.php:38
+#: templates/login.php:44
 msgid "Lost your password?"
 msgstr "忘記密碼？"
 
-#: templates/login.php:43
+#: templates/login.php:49
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:46
+#: templates/login.php:52
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:52
+#: templates/login.php:58
 msgid "Alternative Logins"
 msgstr "其他登入方法"
 
@@ -728,6 +739,24 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>"
 msgstr "嗨，<br><br>%s 和你分享了 %s ，到<a href=\"%s\">這裡</a>看它<br><br>"
 
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr "若這個訊息持續出現，請聯絡系統管理員"
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr "感謝您的耐心"
+
 #: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
@@ -741,13 +770,3 @@ msgstr "ownCloud 正在升級，請稍待一會。"
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
 msgstr "請稍後重新載入這個頁面就可以繼續使用 ownCloud"
-
-#: templates/update.user.php:5
-msgid ""
-"Contact your system administrator if this message persists or appeared "
-"unexpectedly."
-msgstr "若這個訊息持續出現，請聯絡系統管理員"
-
-#: templates/update.user.php:6
-msgid "Thank you for your patience."
-msgstr "感謝您的耐心"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 94fa43e3fda..7f543f2f8fe 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-21 15:01+0000\n"
+"POT-Creation-Date: 2013-12-07 22:26-0500\n"
+"PO-Revision-Date: 2013-12-08 03:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -153,23 +153,23 @@ msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中，離開此頁面將會取消上傳。"
 
-#: js/file-upload.js:519
+#: js/file-upload.js:523
 msgid "URL cannot be empty"
 msgstr "URL 不能留空"
 
-#: js/file-upload.js:523 js/filelist.js:377
+#: js/file-upload.js:527 js/filelist.js:377
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "在家目錄中不能使用「共享」作為檔名"
 
-#: js/file-upload.js:525 js/filelist.js:379
+#: js/file-upload.js:529 js/filelist.js:379
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/file-upload.js:585
+#: js/file-upload.js:595
 msgid "Could not create file"
 msgstr "無法建立檔案"
 
-#: js/file-upload.js:601
+#: js/file-upload.js:611
 msgid "Could not create folder"
 msgstr "無法建立資料夾"
 
@@ -185,7 +185,7 @@ msgstr "永久刪除"
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:873
+#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
 msgid "Pending"
 msgstr "等候中"
 
@@ -193,33 +193,33 @@ msgstr "等候中"
 msgid "Could not rename file"
 msgstr "無法重新命名"
 
-#: js/filelist.js:524
+#: js/filelist.js:539
 msgid "replaced {new_name} with {old_name}"
 msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:524
+#: js/filelist.js:539
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:576
+#: js/filelist.js:591
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:594 js/filelist.js:668 js/files.js:631
+#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個資料夾"
 
-#: js/filelist.js:595 js/filelist.js:669 js/files.js:637
+#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個檔案"
 
-#: js/filelist.js:602
+#: js/filelist.js:617
 msgid "{dirs} and {files}"
 msgstr "{dirs} 和 {files}"
 
-#: js/filelist.js:812 js/filelist.js:850
+#: js/filelist.js:828 js/filelist.js:866
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個檔案正在上傳"
@@ -291,7 +291,7 @@ msgstr "修改時間"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:88
+#: lib/app.php:101
 #, php-format
 msgid "%s could not be renamed"
 msgstr "無法重新命名 %s"
@@ -337,10 +337,18 @@ msgid "New"
 msgstr "新增"
 
 #: templates/index.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:8
 msgid "Text file"
 msgstr "文字檔"
 
 #: templates/index.php:10
+msgid "New folder"
+msgstr "新資料夾"
+
+#: templates/index.php:10
 msgid "Folder"
 msgstr "資料夾"
 
@@ -368,29 +376,25 @@ msgstr "這裡還沒有東西，上傳一些吧！"
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:75 templates/index.php:76
-msgid "Unshare"
-msgstr "取消分享"
-
-#: templates/index.php:81 templates/index.php:82
+#: templates/index.php:73 templates/index.php:74
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/index.php:95
+#: templates/index.php:86
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:97
+#: templates/index.php:88
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您試圖上傳的檔案大小超過伺服器的限制。"
 
-#: templates/index.php:102
+#: templates/index.php:93
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案，請稍等。"
 
-#: templates/index.php:105
+#: templates/index.php:96
 msgid "Current scanning"
 msgstr "正在掃描"
 
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 812c8b5112a..c61687e7fe8 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-06 21:43-0500\n"
-"PO-Revision-Date: 2013-11-04 08:00+0000\n"
-"Last-Translator: akong <akong@aspa.idv.tw>\n"
+"POT-Creation-Date: 2013-11-29 14:08-0500\n"
+"PO-Revision-Date: 2013-11-29 19:09+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,6 +98,10 @@ msgstr "請確認已安裝 PHP 5.3.3 或是更新的版本以及 OpenSSL 也一�
 msgid "Following users are not set up for encryption:"
 msgstr "以下的使用者無法設定加密:"
 
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
 #: js/settings-admin.js:13
 msgid "Saving..."
 msgstr "儲存中..."
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index a45392403d7..05744d16b74 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 21:06-0500\n"
-"PO-Revision-Date: 2013-11-22 02:06+0000\n"
+"POT-Creation-Date: 2013-12-04 18:12-0500\n"
+"PO-Revision-Date: 2013-12-04 23:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -162,7 +162,7 @@ msgstr "已更新"
 msgid "Select a profile picture"
 msgstr "選擇大頭貼"
 
-#: js/personal.js:265
+#: js/personal.js:266
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "檔案解密中，請稍候。"
 
@@ -239,11 +239,18 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:22 templates/admin.php:36
 msgid "Security Warning"
 msgstr "安全性警告"
 
 #: templates/admin.php:25
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:39
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -252,57 +259,68 @@ msgid ""
 "root."
 msgstr "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。"
 
-#: templates/admin.php:36
+#: templates/admin.php:50
 msgid "Setup Warning"
 msgstr "設定警告"
 
-#: templates/admin.php:39
+#: templates/admin.php:53
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。"
 
-#: templates/admin.php:40
+#: templates/admin.php:54
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
 
-#: templates/admin.php:51
+#: templates/admin.php:65
 msgid "Module 'fileinfo' missing"
 msgstr "遺失 'fileinfo' 模組"
 
-#: templates/admin.php:54
+#: templates/admin.php:68
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "未偵測到 PHP 模組 'fileinfo'。我們強烈建議啟用這個模組以取得最好的 mime-type 支援。"
 
-#: templates/admin.php:65
+#: templates/admin.php:79
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:82
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:93
 msgid "Locale not working"
 msgstr "語系無法運作"
 
-#: templates/admin.php:70
+#: templates/admin.php:98
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:102
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:106
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:90
+#: templates/admin.php:118
 msgid "Internet connection not working"
 msgstr "無網際網路存取"
 
-#: templates/admin.php:93
+#: templates/admin.php:121
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -311,118 +329,118 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。"
 
-#: templates/admin.php:107
+#: templates/admin.php:135
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:114
+#: templates/admin.php:142
 msgid "Execute one task with each page loaded"
 msgstr "當頁面載入時，執行"
 
-#: templates/admin.php:122
+#: templates/admin.php:150
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php"
 
-#: templates/admin.php:130
+#: templates/admin.php:158
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "使用系統的 cron 服務每15分鐘呼叫 cron.php 一次"
 
-#: templates/admin.php:135
+#: templates/admin.php:163
 msgid "Sharing"
 msgstr "分享"
 
-#: templates/admin.php:141
+#: templates/admin.php:169
 msgid "Enable Share API"
 msgstr "啟用分享 API"
 
-#: templates/admin.php:142
+#: templates/admin.php:170
 msgid "Allow apps to use the Share API"
 msgstr "允許 apps 使用分享 API"
 
-#: templates/admin.php:149
+#: templates/admin.php:177
 msgid "Allow links"
 msgstr "允許連結"
 
-#: templates/admin.php:150
+#: templates/admin.php:178
 msgid "Allow users to share items to the public with links"
 msgstr "允許使用者以結連公開分享檔案"
 
-#: templates/admin.php:158
+#: templates/admin.php:186
 msgid "Allow public uploads"
 msgstr "允許任何人上傳"
 
-#: templates/admin.php:159
+#: templates/admin.php:187
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "允許使用者將他們公開分享的資料夾設定為「任何人皆可上傳」"
 
-#: templates/admin.php:167
+#: templates/admin.php:195
 msgid "Allow resharing"
 msgstr "允許轉貼分享"
 
-#: templates/admin.php:168
+#: templates/admin.php:196
 msgid "Allow users to share items shared with them again"
 msgstr "允許使用者分享其他使用者分享給他的檔案"
 
-#: templates/admin.php:175
+#: templates/admin.php:203
 msgid "Allow users to share with anyone"
 msgstr "允許使用者與任何人分享檔案"
 
-#: templates/admin.php:178
+#: templates/admin.php:206
 msgid "Allow users to only share with users in their groups"
 msgstr "僅允許使用者在群組內分享"
 
-#: templates/admin.php:185
+#: templates/admin.php:213
 msgid "Allow mail notification"
 msgstr "允許郵件通知"
 
-#: templates/admin.php:186
+#: templates/admin.php:214
 msgid "Allow user to send mail notification for shared files"
 msgstr "允許使用者分享檔案時寄出通知郵件"
 
-#: templates/admin.php:193
+#: templates/admin.php:221
 msgid "Security"
 msgstr "安全性"
 
-#: templates/admin.php:206
+#: templates/admin.php:234
 msgid "Enforce HTTPS"
 msgstr "強制啟用 HTTPS"
 
-#: templates/admin.php:208
+#: templates/admin.php:236
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "強迫用戶端使用加密連線連接到 %s"
 
-#: templates/admin.php:214
+#: templates/admin.php:242
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。"
 
-#: templates/admin.php:226
+#: templates/admin.php:254
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:227
+#: templates/admin.php:255
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:259
+#: templates/admin.php:287
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:260
+#: templates/admin.php:288
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:266 templates/personal.php:169
+#: templates/admin.php:294 templates/personal.php:173
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:270 templates/personal.php:172
+#: templates/admin.php:298 templates/personal.php:176
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -533,62 +551,66 @@ msgstr "請填入電子郵件信箱以便回復密碼"
 msgid "Profile picture"
 msgstr "個人資料照片"
 
-#: templates/personal.php:90
+#: templates/personal.php:91
 msgid "Upload new"
 msgstr "上傳新的"
 
-#: templates/personal.php:92
+#: templates/personal.php:93
 msgid "Select new from Files"
 msgstr "從已上傳的檔案中選一個"
 
-#: templates/personal.php:93
+#: templates/personal.php:94
 msgid "Remove image"
 msgstr "移除圖片"
 
-#: templates/personal.php:94
+#: templates/personal.php:95
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它"
 
 #: templates/personal.php:97
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:101
 msgid "Abort"
 msgstr "中斷"
 
-#: templates/personal.php:98
+#: templates/personal.php:102
 msgid "Choose as profile image"
 msgstr "設定為大頭貼"
 
-#: templates/personal.php:106 templates/personal.php:107
+#: templates/personal.php:110 templates/personal.php:111
 msgid "Language"
 msgstr "語言"
 
-#: templates/personal.php:126
+#: templates/personal.php:130
 msgid "Help translate"
 msgstr "幫助翻譯"
 
-#: templates/personal.php:133
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:135
+#: templates/personal.php:139
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>"
 
-#: templates/personal.php:146
+#: templates/personal.php:150
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/personal.php:148
-msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr "加密應用程式已經停用，請您解密您所有的檔案"
+#: templates/personal.php:152
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
 
-#: templates/personal.php:154
+#: templates/personal.php:158
 msgid "Log-in password"
 msgstr "登入密碼"
 
-#: templates/personal.php:159
+#: templates/personal.php:163
 msgid "Decrypt all Files"
 msgstr "解密所有檔案"
 
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 71fffa41ac3..8b1f5099d1f 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:45+0000\n"
+"POT-Creation-Date: 2013-11-27 12:08-0500\n"
+"PO-Revision-Date: 2013-11-27 17:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,11 @@ msgstr ""
 msgid "No configuration specified"
 msgstr ""
 
-#: ajax/wizard.php:78
+#: ajax/wizard.php:81
 msgid "No data specified"
 msgstr ""
 
-#: ajax/wizard.php:86
+#: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
 msgstr ""
@@ -88,63 +88,63 @@ msgstr "成功"
 msgid "Error"
 msgstr "錯誤"
 
-#: js/settings.js:674
+#: js/settings.js:777
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:683
+#: js/settings.js:786
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:692
+#: js/settings.js:795
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:709 js/settings.js:718
+#: js/settings.js:812 js/settings.js:821
 msgid "Select groups"
 msgstr "選擇群組"
 
-#: js/settings.js:712 js/settings.js:721
+#: js/settings.js:815 js/settings.js:824
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:715
+#: js/settings.js:818
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:741
+#: js/settings.js:845
 msgid "Connection test succeeded"
 msgstr "連線測試成功"
 
-#: js/settings.js:748
+#: js/settings.js:852
 msgid "Connection test failed"
 msgstr "連線測試失敗"
 
-#: js/settings.js:757
+#: js/settings.js:861
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的要刪除現在的伺服器設定嗎？"
 
-#: js/settings.js:758
+#: js/settings.js:862
 msgid "Confirm Deletion"
 msgstr "確認刪除"
 
-#: lib/wizard.php:76 lib/wizard.php:90
+#: lib/wizard.php:79 lib/wizard.php:93
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:119
+#: lib/wizard.php:122
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:740 lib/wizard.php:752
+#: lib/wizard.php:779 lib/wizard.php:791
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:913
+#: lib/wizard.php:952
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -176,11 +176,13 @@ msgid "only from those groups:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
 #: templates/part.wizard-userfilter.php:25
 msgid "Edit raw filter instead"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
 #: templates/part.wizard-userfilter.php:30
 msgid "Raw LDAP filter"
 msgstr ""
@@ -211,6 +213,13 @@ msgstr ""
 msgid "Other Attributes:"
 msgstr ""
 
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "新增伺服器設定"
@@ -304,148 +313,137 @@ msgid "When unchecked, this configuration will be skipped."
 msgstr "沒有被勾選時，此設定會被略過。"
 
 #: templates/settings.php:23
-msgid "User Login Filter"
-msgstr "User Login Filter"
-
-#: templates/settings.php:25
-#, php-format
-msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:26
 msgid "Backup (Replica) Host"
 msgstr "備用主機"
 
-#: templates/settings.php:26
+#: templates/settings.php:23
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。"
 
-#: templates/settings.php:27
+#: templates/settings.php:24
 msgid "Backup (Replica) Port"
 msgstr "備用（複本）連接埠"
 
-#: templates/settings.php:28
+#: templates/settings.php:25
 msgid "Disable Main Server"
 msgstr "停用主伺服器"
 
-#: templates/settings.php:28
+#: templates/settings.php:25
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:26
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "不區分大小寫的 LDAP 伺服器 (Windows)"
 
-#: templates/settings.php:30
+#: templates/settings.php:27
 msgid "Turn off SSL certificate validation."
 msgstr "關閉 SSL 憑證檢查"
 
-#: templates/settings.php:30
+#: templates/settings.php:27
 #, php-format
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:28
 msgid "Cache Time-To-Live"
 msgstr "快取的存活時間"
 
-#: templates/settings.php:31
+#: templates/settings.php:28
 msgid "in seconds. A change empties the cache."
 msgstr "以秒為單位。變更後會清空快取。"
 
-#: templates/settings.php:33
+#: templates/settings.php:30
 msgid "Directory Settings"
 msgstr "目錄設定"
 
-#: templates/settings.php:35
+#: templates/settings.php:32
 msgid "User Display Name Field"
 msgstr "使用者顯示名稱欄位"
 
-#: templates/settings.php:35
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:33
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:36
+#: templates/settings.php:33
 msgid "One User Base DN per line"
 msgstr "一行一個使用者 Base DN"
 
-#: templates/settings.php:37
+#: templates/settings.php:34
 msgid "User Search Attributes"
 msgstr "User Search Attributes"
 
-#: templates/settings.php:37 templates/settings.php:40
+#: templates/settings.php:34 templates/settings.php:37
 msgid "Optional; one attribute per line"
 msgstr "非必要，一行一項屬性"
 
-#: templates/settings.php:38
+#: templates/settings.php:35
 msgid "Group Display Name Field"
 msgstr "群組顯示名稱欄位"
 
-#: templates/settings.php:38
+#: templates/settings.php:35
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:36
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:39
+#: templates/settings.php:36
 msgid "One Group Base DN per line"
 msgstr "一行一個 Group Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:37
 msgid "Group Search Attributes"
 msgstr "Group Search Attributes"
 
-#: templates/settings.php:41
+#: templates/settings.php:38
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:43
+#: templates/settings.php:40
 msgid "Special Attributes"
 msgstr "特殊屬性"
 
-#: templates/settings.php:45
+#: templates/settings.php:42
 msgid "Quota Field"
 msgstr "配額欄位"
 
-#: templates/settings.php:46
+#: templates/settings.php:43
 msgid "Quota Default"
 msgstr "預設配額"
 
-#: templates/settings.php:46
+#: templates/settings.php:43
 msgid "in bytes"
 msgstr "以位元組為單位"
 
-#: templates/settings.php:47
+#: templates/settings.php:44
 msgid "Email Field"
 msgstr "電郵欄位"
 
-#: templates/settings.php:48
+#: templates/settings.php:45
 msgid "User Home Folder Naming Rule"
 msgstr "使用者家目錄的命名規則"
 
-#: templates/settings.php:48
+#: templates/settings.php:45
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
 
-#: templates/settings.php:54
+#: templates/settings.php:51
 msgid "Internal Username"
 msgstr "內部使用者名稱"
 
-#: templates/settings.php:55
+#: templates/settings.php:52
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +459,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:53
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:54
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:55
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +478,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:56
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:57
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:58
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:59
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +504,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:60
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:60
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""