Merge branch 'master' of github.com:owncloud/core into vcategories_db

1 files changed, 86 insertions, 26 deletions

diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index b4564768b78..edeaac3f470 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
+"POT-Creation-Date: 2012-09-26 13:19+0200\n"
+"PO-Revision-Date: 2012-09-26 11:20+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -62,39 +62,43 @@ msgstr ""
 msgid "Delete"
 msgstr "刪除"
 
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:190 js/filelist.js:192
 msgid "already exists"
 msgstr "已經存在"
 
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:190 js/filelist.js:192
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:186
+#: js/filelist.js:190
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:190 js/filelist.js:192
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:239 js/filelist.js:241
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
+#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:237
+#: js/filelist.js:241
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:268
+#: js/filelist.js:273
 msgid "unshared"
 msgstr ""
 
-#: js/filelist.js:270
+#: js/filelist.js:275
 msgid "deleted"
 msgstr ""
 
@@ -110,47 +114,107 @@ msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為
 msgid "Upload Error"
 msgstr "上傳發生錯誤"
 
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:355
+#: js/files.js:256
+msgid "1 file uploading"
+msgstr ""
+
+#: js/files.js:259 js/files.js:304 js/files.js:319
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:322 js/files.js:355
 msgid "Upload cancelled."
 msgstr "上傳取消"
 
-#: js/files.js:423
+#: js/files.js:424
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中. 離開此頁面將會取消上傳."
 
-#: js/files.js:493
+#: js/files.js:494
 msgid "Invalid name, '/' is not allowed."
 msgstr "無效的名稱, '/'是不被允許的"
 
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:748 templates/index.php:48
+msgid "Name"
+msgstr "名稱"
+
+#: js/files.js:749 templates/index.php:56
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:747 templates/index.php:58
+#: js/files.js:750 templates/index.php:58
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:774
+#: js/files.js:777
 msgid "folder"
 msgstr ""
 
-#: js/files.js:776
+#: js/files.js:779
 msgid "folders"
 msgstr ""
 
-#: js/files.js:784
+#: js/files.js:787
 msgid "file"
 msgstr ""
 
-#: js/files.js:786
+#: js/files.js:789
 msgid "files"
 msgstr ""
 
+#: js/files.js:833
+msgid "seconds ago"
+msgstr ""
+
+#: js/files.js:834
+msgid "minute ago"
+msgstr ""
+
+#: js/files.js:835
+msgid "minutes ago"
+msgstr ""
+
+#: js/files.js:838
+msgid "today"
+msgstr ""
+
+#: js/files.js:839
+msgid "yesterday"
+msgstr ""
+
+#: js/files.js:840
+msgid "days ago"
+msgstr ""
+
+#: js/files.js:841
+msgid "last month"
+msgstr ""
+
+#: js/files.js:843
+msgid "months ago"
+msgstr ""
+
+#: js/files.js:844
+msgid "last year"
+msgstr ""
+
+#: js/files.js:845
+msgid "years ago"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "檔案處理"
@@ -199,7 +263,7 @@ msgstr "資料夾"
 msgid "From url"
 msgstr "由 url "
 
-#: templates/index.php:21
+#: templates/index.php:20
 msgid "Upload"
 msgstr "上傳"
 
@@ -211,10 +275,6 @@ msgstr "取消上傳"
 msgid "Nothing in here. Upload something!"
 msgstr "沒有任何東西。請上傳內容!"
 
-#: templates/index.php:48
-msgid "Name"
-msgstr "名稱"
-
 #: templates/index.php:50
 msgid "Share"
 msgstr "分享"