diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index bd33fdfa4a5bb06bb40b8fa495240f3b04acea27..25c2f4ff6992e3823585d38ae002123258630fe4 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -25,6 +25,7 @@
 "undo" => "deshacer",
 "perform delete operation" => "Eliminar",
 "1 file uploading" => "Subiendo 1 archivo",
+"files uploading" => "Subiendo archivos",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
 "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index b7a58e3e561989b42c72fda1d05a979655362f95..c61cf0e2225b3cba55bdda22c6086e86d3e6cd73 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -34,7 +34,7 @@
 "Your download is being prepared. This might take some time if the files are big." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。",
 "Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
 "Not enough space available" => "沒有足夠的可用空間",
-"Upload cancelled." => "上傳取消",
+"Upload cancelled." => "上傳已取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中。離開此頁面將會取消上傳。",
 "URL cannot be empty." => "URL 不能為空白。",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index adfde6c06e5815d003dbe0d69ae2be8398e5a7c0..a9dcba8f7d73ea151c6cd6aff67bfdf2a0723a96 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "無法永久刪除%s",
-"Couldn't restore %s" => "無法復原%s",
+"Couldn't delete %s permanently" => "無法永久刪除 %s",
+"Couldn't restore %s" => "無法復原 %s",
 "perform restore operation" => "進行復原動作",
 "Error" => "錯誤",
-"delete file permanently" => "永久刪除文件",
+"delete file permanently" => "永久刪除檔案",
 "Delete permanently" => "永久刪除",
 "Name" => "名稱",
 "Deleted" => "已刪除",
@@ -11,7 +11,7 @@
 "{count} folders" => "{count} 個資料夾",
 "1 file" => "1 個檔案",
 "{count} files" => "{count} 個檔案",
-"Nothing in here. Your trash bin is empty!" => "這裏沒東西。您的垃圾桶是空的！",
+"Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的！",
 "Restore" => "復原",
 "Delete" => "刪除",
 "Deleted Files" => "已刪除的檔案"
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 5b14033ffeb7a46a6cafea4c803cb4729aa6e848..3199688be308e124143a56a0752479e94c13812d 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -103,7 +103,7 @@
 "Admin" => "管理者",
 "Help" => "幫助",
 "Access forbidden" => "存取被拒",
-"Cloud not found" => "未發現雲",
+"Cloud not found" => "未發現雲端",
 "Edit categories" => "編輯分類",
 "Add" => "增加",
 "Security Warning" => "安全性警告",
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index c7d4671e9a043d4729255fab527ee16356b914d0..cd3608233170566e6c54ff66c5e527ff743e1fe9 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012-2013.
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012-2013.
-# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012-2013
+# cjtess <claudio.tessone@gmail.com>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2012-2013
+# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
+"PO-Revision-Date: 2013-04-19 09:10+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -132,7 +132,7 @@ msgstr "Subiendo 1 archivo"
 
 #: js/filelist.js:409 js/filelist.js:463
 msgid "files uploading"
-msgstr ""
+msgstr "Subiendo archivos"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 59dca9a91a4d01f23d71443aebe076359992a4d4..3d0bd6ff5d77500b0f6a03cda94060d976d8aa66 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -3,18 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <>, 2013.
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-#   <peter.perosa@gmail.com>, 2012.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
-#   <urossolar@hotmail.com>, 2012.
+# mateju <>, 2013
+# mateju <>, 2012
+# mateju <>, 2013
+# Peter Peroša <peter.perosa@gmail.com>, 2012
+# Peter Peroša <peter.perosa@gmail.com>, 2012
+# urossolar <urossolar@hotmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 19:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -525,37 +525,37 @@ msgstr "Napredne možnosti"
 msgid "Data folder"
 msgstr "Podatkovna mapa"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: templates/installation.php:79 templates/installation.php:91
+#: templates/installation.php:102 templates/installation.php:113
+#: templates/installation.php:125
 msgid "will be used"
 msgstr "bo uporabljen"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Uporabnik podatkovne zbirke"
 
-#: templates/installation.php:143
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:148
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:158
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Razpredelnica podatkovne zbirke"
 
-#: templates/installation.php:165
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:171
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Končaj namestitev"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 70bc018b177fd085f3a998fb3167c2f35e88e2b1..1c0597e776ed756d7e830db1867d313d9537d9bd 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-#   <peter.perosa@gmail.com>, 2012.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
-#   <urossolar@hotmail.com>, 2012.
+# mateju <>, 2012
+# mateju <>, 2013
+# Peter Peroša <peter.perosa@gmail.com>, 2012
+# Peter Peroša <peter.perosa@gmail.com>, 2012
+# urossolar <urossolar@hotmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
+"PO-Revision-Date: 2013-04-19 20:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 3a134b8b1874af512a71ce83cec4b51b01b87e19..1c88a1cf01b96ec3470b96746f8ce152782d0822 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <>, 2013.
-# Matej Urbančič <>, 2013.
+# mateju <>, 2013
+# mateju <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 17:02+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 8b95f90e69513a14116bf5327b1c229b6d2053e4..e5cecdb8be9e4cd674016ad837f2caf4693c0795 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 0d841af5b4883ec30e5f8b89cbf0b1e2c8412d79..9c675580033765d57f67d813406ba6b9f63d8028 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 1a8cf27e1d81919eabc094d9143131a4ad5e1dc7..26837cd918218d0b452c72f4e516c717ddc7579c 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index d9f875bbc2d74b43ffcaaeaccb8cb6333368c6de..864fe393f12cc083011680dff7c29ac3a47b6075 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index b7e89b1676158a0d2e1a55169ad693bf1ac3851e..770a271e76ae398e9d5c339405af4e76d0e16535 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 2204b0211b406ffc5307d43cdf3547559d26fe0d..e5da673209ca1491476b4dd8ed21d92044e888f4 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 00e7f8f2bfcc43ce50c52994e10934912f684e86..48387dd51997a51c3906053d3c8a4fe79d29f028 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 466ebc8a7cc5d769b63c1b316a4381a31f36c0d3..7c6bf8ac159d4e701442fd3ee702e7cbcebdb492 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 33c40bb72441fdbdaf198fa437d5f27b2c539f42..6b7f59c9fe07443765b66154ee5e8d228922c51d 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 7ea4b20758dc5c12db7c2798562b591ebd13bb69..274338879dda759a80b86dd5f60148a477d1a4e8 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 3eafc9ad0bbb7ba5c3fe729b5b8f025b1e884047..2a1a9c59032f3d688a61456fc7f57ccb7f5ac536 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-04-19 01:56+0200\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 1d36067acb8437b74315b93bdfd7ac6c83b2d351..83022879f37e025933b3e1fe3aa718b4559262ea 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Donahue Chuang <soshinwu@gmail.com>, 2012.
-#   <dw4dev@gmail.com>, 2012.
-# Ming Yi Wu <mingi.wu@gmail.com>, 2012.
-#   <nfsmwlin@gmail.com>, 2013.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
+# admachen <admachen@gmail.com>, 2013
+# Hydriz <admin@alphacorp.tk>, 2013
+# Donahue Chuang <soshinwu@gmail.com>, 2012
+# dw4dev <dw4dev@gmail.com>, 2012
+# Ming Yi Wu <mingi.wu@gmail.com>, 2012
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 04:10+0000\n"
+"Last-Translator: admachen <admachen@gmail.com>\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"
@@ -465,7 +466,7 @@ msgstr "存取被拒"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "未發現雲"
+msgstr "未發現雲端"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -525,37 +526,37 @@ msgstr "進階"
 msgid "Data folder"
 msgstr "資料夾"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: templates/installation.php:79 templates/installation.php:91
+#: templates/installation.php:102 templates/installation.php:113
+#: templates/installation.php:125
 msgid "will be used"
 msgstr "將會使用"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "資料庫使用者"
 
-#: templates/installation.php:143
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:148
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:158
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "資料庫 tablespace"
 
-#: templates/installation.php:165
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "資料庫主機"
 
-#: templates/installation.php:171
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "完成設定"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index e4feb16563a0fb18ae4e8884434eaa8d02dba416..3ef4705fcd4ab2bf03303dcc1fc7b662662d1125 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -3,21 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Donahue Chuang <soshinwu@gmail.com>, 2012.
-#   <dw4dev@gmail.com>, 2012.
-# Eddy Chang <taiwanmambo@gmail.com>, 2012.
-#   <nfsmwlin@gmail.com>, 2013.
-#  <orinx@orinx.com>, 2013.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-# ywang  <ywang1007@gmail.com>, 2012.
+# admachen <admachen@gmail.com>, 2013
+# Hydriz <admin@alphacorp.tk>, 2013
+# Donahue Chuang <soshinwu@gmail.com>, 2012
+# dw4dev <dw4dev@gmail.com>, 2012
+# Eddy Chang <taiwanmambo@gmail.com>, 2012
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# orinx <orinx@orinx.com>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# ywang <ywang1007@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
+"PO-Revision-Date: 2013-04-19 04:10+0000\n"
+"Last-Translator: admachen <admachen@gmail.com>\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"
@@ -176,7 +177,7 @@ msgstr "沒有足夠的可用空間"
 
 #: js/files.js:312
 msgid "Upload cancelled."
-msgstr "上傳取消"
+msgstr "上傳已取消"
 
 #: js/files.js:408
 msgid ""
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index a8ac6763aa88b1877313e79c167f1667a4bfa9f7..f903767b93b04d9cae01459a732ef55695824c90 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
+# Hydriz <admin@alphacorp.tk>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 09:10+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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"
@@ -21,12 +22,12 @@ msgstr ""
 #: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "無法永久刪除%s"
+msgstr "無法永久刪除 %s"
 
 #: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr "無法復原%s"
+msgstr "無法復原 %s"
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
@@ -38,7 +39,7 @@ msgstr "錯誤"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr "永久刪除文件"
+msgstr "永久刪除檔案"
 
 #: js/trash.js:121
 msgid "Delete permanently"
@@ -70,7 +71,7 @@ msgstr "{count} 個檔案"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr "這裏沒東西。您的垃圾桶是空的！"
+msgstr "您的垃圾桶是空的！"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 07d0bd557fb6bb9d7f027b7deeff91143bc11cb5..09c7e166177772680c05c5b069dce2561f5a895d 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-18 02:04+0200\n"
-"PO-Revision-Date: 2013-04-18 00:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 09:00+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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"
@@ -48,11 +48,11 @@ msgstr "管理"
 
 #: files.php:209
 msgid "ZIP download is turned off."
-msgstr "ZIP 下載已關閉"
+msgstr "ZIP 下載已關閉。"
 
 #: files.php:210
 msgid "Files need to be downloaded one by one."
-msgstr "檔案需要逐一下載"
+msgstr "檔案需要逐一下載。"
 
 #: files.php:211 files.php:244
 msgid "Back to Files"
@@ -60,7 +60,7 @@ msgstr "回到檔案列表"
 
 #: files.php:241
 msgid "Selected files too large to generate zip file."
-msgstr "選擇的檔案太大以致於無法產生壓縮檔"
+msgstr "選擇的檔案太大以致於無法產生壓縮檔。"
 
 #: helper.php:228
 msgid "couldn't be determined"
@@ -92,47 +92,47 @@ msgstr "圖片"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr "設置一個管理員用戶名。"
+msgstr "設定管理員帳號。"
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr "設置一個管理員密碼。"
+msgstr "設定管理員密碼。"
 
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s 輸入資料庫使用者名稱。"
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s 輸入資料庫名稱。"
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s 資料庫名稱不能包含小數點"
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s 設定資料庫主機。"
 
 #: setup.php:132 setup.php:324 setup.php:369
 msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL用戶名和/或密碼無效"
+msgstr "PostgreSQL 用戶名和/或密碼無效"
 
 #: setup.php:133 setup.php:156 setup.php:233
 msgid "You need to enter either an existing account or the administrator."
-msgstr "您必須輸入一個現有的賬戶或管理員"
+msgstr "您必須輸入一個現有的帳號或管理員帳號。"
 
 #: setup.php:155 setup.php:457 setup.php:524
 msgid "Oracle username and/or password not valid"
-msgstr "Oracle用戶名和/或密碼無效"
+msgstr "Oracle 用戶名和/或密碼無效"
 
 #: setup.php:232
 msgid "MySQL username and/or password not valid"
-msgstr "MySQL用戶名和/或密碼無效"
+msgstr "MySQL 用戶名和/或密碼無效"
 
 #: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
 #: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
@@ -140,42 +140,42 @@ msgstr "MySQL用戶名和/或密碼無效"
 #: setup.php:614
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "資料庫錯誤：\"%s\""
 
 #: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
 #: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
 #: setup.php:576 setup.php:592 setup.php:600 setup.php:609
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "有問題的指令是：\"%s\""
 
 #: setup.php:303
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL 使用者 '%s'@'localhost' 已經存在。"
 
 #: setup.php:304
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "在 MySQL 移除這個使用者"
 
 #: setup.php:309
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL 使用者 '%s'@'%%' 已經存在"
 
 #: setup.php:310
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "在 MySQL 移除這個使用者。"
 
 #: setup.php:583 setup.php:615
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\""
 
 #: setup.php:635
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL 使用者和/或密碼無效：%s"
 
 #: setup.php:853
 msgid ""
@@ -251,7 +251,7 @@ msgstr "最新的"
 
 #: updater.php:84
 msgid "updates check is disabled"
-msgstr "檢查更新已停用"
+msgstr "更新檢查已停用"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index f0787d2836ddc139a34beede01a08003d100b3fb..23cc130ca4f7999e63da84aac944c15f4eb7dd5f 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -3,23 +3,23 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Donahue Chuang <soshinwu@gmail.com>, 2012.
-#   <dw4dev@gmail.com>, 2012.
-#   <nfsmwlin@gmail.com>, 2013.
-#  <orinx@orinx.com>, 2013.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-#   <sy6614@yahoo.com.hk>, 2012.
-#  <tseronnie@ymail.com>, 2013.
-#   <weiyu871@ms14.url.com.tw>, 2012.
-#   <wu0809@msn.com>, 2012.
-# ywang  <ywang1007@gmail.com>, 2012.
+# Hydriz <admin@alphacorp.tk>, 2013
+# Donahue Chuang <soshinwu@gmail.com>, 2012
+# dw4dev <dw4dev@gmail.com>, 2012
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# orinx <orinx@orinx.com>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# sy6614 <sy6614@yahoo.com.hk>, 2012
+# ronnietse <tseronnie@ymail.com>, 2013
+# weiyu <weiyu871@ms14.url.com.tw>, 2012
+# Jeff5555 <wu0809@msn.com>, 2012
+# ywang <ywang1007@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:21+0200\n"
-"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 09:00+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"
@@ -323,19 +323,19 @@ msgstr "紀錄"
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "å°‘"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:102
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:238 templates/personal.php:105
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 62a55ebbb47527bcbeba91c65a357ebed60d3778..fbcf81ad3a42d5135cf85471faead229c5221931 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -5,10 +5,10 @@
 "Users" => "使用者",
 "Apps" => "應用程式",
 "Admin" => "管理",
-"ZIP download is turned off." => "ZIP 下載已關閉",
-"Files need to be downloaded one by one." => "檔案需要逐一下載",
+"ZIP download is turned off." => "ZIP 下載已關閉。",
+"Files need to be downloaded one by one." => "檔案需要逐一下載。",
 "Back to Files" => "回到檔案列表",
-"Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔",
+"Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔。",
 "couldn't be determined" => "無法判斷",
 "Application is not enabled" => "應用程式未啟用",
 "Authentication error" => "認證錯誤",
@@ -16,12 +16,24 @@
 "Files" => "檔案",
 "Text" => "文字",
 "Images" => "圖片",
-"Set an admin username." => "設置一個管理員用戶名。",
-"Set an admin password." => "設置一個管理員密碼。",
-"PostgreSQL username and/or password not valid" => "PostgreSQL用戶名和/或密碼無效",
-"You need to enter either an existing account or the administrator." => "您必須輸入一個現有的賬戶或管理員",
-"Oracle username and/or password not valid" => "Oracle用戶名和/或密碼無效",
-"MySQL username and/or password not valid" => "MySQL用戶名和/或密碼無效",
+"Set an admin username." => "設定管理員帳號。",
+"Set an admin password." => "設定管理員密碼。",
+"%s enter the database username." => "%s 輸入資料庫使用者名稱。",
+"%s enter the database name." => "%s 輸入資料庫名稱。",
+"%s you may not use dots in the database name" => "%s 資料庫名稱不能包含小數點",
+"%s set the database host." => "%s 設定資料庫主機。",
+"PostgreSQL username and/or password not valid" => "PostgreSQL 用戶名和/或密碼無效",
+"You need to enter either an existing account or the administrator." => "您必須輸入一個現有的帳號或管理員帳號。",
+"Oracle username and/or password not valid" => "Oracle 用戶名和/或密碼無效",
+"MySQL username and/or password not valid" => "MySQL 用戶名和/或密碼無效",
+"DB Error: \"%s\"" => "資料庫錯誤：\"%s\"",
+"Offending command was: \"%s\"" => "有問題的指令是：\"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL 使用者 '%s'@'localhost' 已經存在。",
+"Drop this user from MySQL" => "在 MySQL 移除這個使用者",
+"MySQL user '%s'@'%%' already exists" => "MySQL 使用者 '%s'@'%%' 已經存在",
+"Drop this user from MySQL." => "在 MySQL 移除這個使用者。",
+"Offending command was: \"%s\", name: %s, password: %s" => "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
+"MS SQL username and/or password not valid: %s" => "MS SQL 使用者和/或密碼無效：%s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
 "Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
 "seconds ago" => "幾秒前",
@@ -38,6 +50,6 @@
 "years ago" => "幾年前",
 "%s is available. Get <a href=\"%s\">more information</a>" => "%s 已經可用。取得 <a href=\"%s\">更多資訊</a>",
 "up to date" => "最新的",
-"updates check is disabled" => "檢查更新已停用",
+"updates check is disabled" => "更新檢查已停用",
 "Could not find category \"%s\"" => "找不到分類：\"%s\""
 );