Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/js/files.js

1 files changed, 92 insertions, 65 deletions

diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 53c704dd1ac..bed97e748a0 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -6,14 +6,15 @@
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
 #   <dw4dev@gmail.com>, 2012.
 # Eddy Chang <taiwanmambo@gmail.com>, 2012.
+#   <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-01-05 00:02+0100\n"
-"PO-Revision-Date: 2013-01-04 12:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-11 00:05+0100\n"
+"PO-Revision-Date: 2013-01-10 06:24+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,9 +22,23 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr "無法移動 %s - 同名的檔案已經存在"
+
+#: ajax/move.php:24
+#, php-format
+msgid "Could not move %s"
+msgstr "無法移動 %s"
+
+#: ajax/rename.php:19
+msgid "Unable to rename file"
+msgstr "無法重新命名檔案"
+
 #: ajax/upload.php:14
 msgid "No file was uploaded. Unknown error"
-msgstr "沒有檔案被上傳. 未知的錯誤."
+msgstr "沒有檔案被上傳。未知的錯誤。"
 
 #: ajax/upload.php:21
 msgid "There is no error, the file uploaded with success"
@@ -32,17 +47,17 @@ msgstr "無錯誤，檔案上傳成功"
 #: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定："
 
 #: ajax/upload.php:24
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "上傳黨案的超過 HTML 表單中指定 MAX_FILE_SIZE 限制"
+msgstr "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制"
 
 #: ajax/upload.php:26
 msgid "The uploaded file was only partially uploaded"
-msgstr "只有部分檔案被上傳"
+msgstr "只有檔案的一部分被上傳"
 
 #: ajax/upload.php:27
 msgid "No file was uploaded"
@@ -58,21 +73,21 @@ msgstr "寫入硬碟失敗"
 
 #: ajax/upload.php:45
 msgid "Not enough space available"
-msgstr ""
+msgstr "沒有足夠的可用空間"
 
 #: ajax/upload.php:69
 msgid "Invalid directory."
-msgstr ""
+msgstr "無效的資料夾。"
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "檔案"
 
-#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
+#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
+#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
 msgid "Delete"
 msgstr "刪除"
 
@@ -80,122 +95,134 @@ msgstr "刪除"
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:199
+#: js/filelist.js:205
 msgid "suggest name"
-msgstr ""
+msgstr "建議檔名"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:248
+#: js/filelist.js:254
 msgid "replaced {new_name}"
 msgstr "已取代 {new_name}"
 
-#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
+#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:250
+#: js/filelist.js:256
 msgid "replaced {new_name} with {old_name}"
 msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:282
+#: js/filelist.js:288
 msgid "unshared {files}"
-msgstr ""
+msgstr "已取消分享 {files}"
 
-#: js/filelist.js:284
+#: js/filelist.js:290
 msgid "deleted {files}"
-msgstr ""
+msgstr "已刪除 {files}"
 
-#: js/files.js:33
+#: js/files.js:31
+msgid "'.' is an invalid file name."
+msgstr "'.' 是不合法的檔名。"
+
+#: js/files.js:36
+msgid "File name cannot be empty."
+msgstr "檔名不能為空。"
+
+#: js/files.js:45
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "檔名不合法，不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。"
 
-#: js/files.js:174
+#: js/files.js:186
 msgid "generating ZIP-file, it may take some time."
-msgstr "產生壓縮檔, 它可能需要一段時間."
+msgstr "產生 ZIP 壓縮檔，這可能需要一段時間。"
 
-#: js/files.js:212
+#: js/files.js:224
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
 
-#: js/files.js:212
+#: js/files.js:224
 msgid "Upload Error"
 msgstr "上傳發生錯誤"
 
-#: js/files.js:229
+#: js/files.js:241
 msgid "Close"
 msgstr "關閉"
 
-#: js/files.js:248 js/files.js:362 js/files.js:392
+#: js/files.js:260 js/files.js:376 js/files.js:409
 msgid "Pending"
-msgstr ""
+msgstr "等候中"
 
-#: js/files.js:268
+#: js/files.js:280
 msgid "1 file uploading"
 msgstr "1 個檔案正在上傳"
 
-#: js/files.js:271 js/files.js:325 js/files.js:340
+#: js/files.js:283 js/files.js:338 js/files.js:353
 msgid "{count} files uploading"
 msgstr "{count} 個檔案正在上傳"
 
-#: js/files.js:343 js/files.js:376
+#: js/files.js:357 js/files.js:393
 msgid "Upload cancelled."
 msgstr "上傳取消"
 
-#: js/files.js:445
+#: js/files.js:464
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "檔案上傳中. 離開此頁面將會取消上傳."
+msgstr "檔案上傳中。離開此頁面將會取消上傳。"
+
+#: js/files.js:537
+msgid "URL cannot be empty."
+msgstr "URL 不能為空白."
 
-#: js/files.js:515
-msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr "無效的資料夾名稱. \"Shared\" 名稱已被 Owncloud 所保留使用"
+#: js/files.js:543
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr "無效的資料夾名稱，'Shared' 的使用被 Owncloud 保留"
 
-#: js/files.js:699
+#: js/files.js:727
 msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} 個檔案已掃描"
 
-#: js/files.js:707
+#: js/files.js:735
 msgid "error while scanning"
 msgstr "掃描時發生錯誤"
 
-#: js/files.js:780 templates/index.php:66
+#: js/files.js:808 templates/index.php:64
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:781 templates/index.php:77
+#: js/files.js:809 templates/index.php:75
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:782 templates/index.php:79
+#: js/files.js:810 templates/index.php:77
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:801
+#: js/files.js:829
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/files.js:803
+#: js/files.js:831
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/files.js:811
+#: js/files.js:839
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/files.js:813
+#: js/files.js:841
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
@@ -205,15 +232,15 @@ msgstr "檔案處理"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "最大上傳容量"
+msgstr "最大上傳檔案大小"
 
 #: templates/admin.php:10
 msgid "max. possible: "
-msgstr "最大允許: "
+msgstr "最大允許："
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "針對多檔案和目錄下載是必填的"
+msgstr "針對多檔案和目錄下載是必填的。"
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
@@ -225,7 +252,7 @@ msgstr "0代表沒有限制"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr "針對ZIP檔案最大輸入大小"
+msgstr "針對 ZIP 檔案最大輸入大小"
 
 #: templates/admin.php:26
 msgid "Save"
@@ -245,38 +272,38 @@ msgstr "資料夾"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
+msgstr "從連結"
 
-#: templates/index.php:35
+#: templates/index.php:18
 msgid "Upload"
 msgstr "上傳"
 
-#: templates/index.php:43
+#: templates/index.php:41
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:58
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
-msgstr "沒有任何東西。請上傳內容!"
+msgstr "沒有任何東西。請上傳內容！"
 
-#: templates/index.php:72
+#: templates/index.php:70
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:104
+#: templates/index.php:102
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:106
+#: templates/index.php:104
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "你試圖上傳的檔案已超過伺服器的最大容量限制。　"
+msgstr "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。　"
 
-#: templates/index.php:111
+#: templates/index.php:109
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案，請稍等。"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Current scanning"
 msgstr "目前掃描"