merged the angularjs branch

1 files changed, 1 insertions, 16 deletions

diff --git a/l10n/zh_TW.php b/l10n/zh_TW.php
index 0f3b7d858..1061ff744 100644
--- a/l10n/zh_TW.php
+++ b/l10n/zh_TW.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Error changing name of folder " => "變更資料夾名稱時發生錯誤",
-"Error collapsing folder." => "收合資料夾時發生錯誤。",
 "Feed already exists." => "訂閱已經存在.",
 "Error adding feed." => "新增訂閱時發生錯誤.",
 "Feed added!" => "訂閱已新增!",
@@ -10,20 +9,17 @@
 "Error removing folder." => "移除資料夾時發生錯誤.",
 "Error updating feeds." => "更新訂閱時發生錯誤",
 "Empty filename" => "空白的檔名",
-"No source argument passed" => "沒有傳遞來源參數",
 "Error while reading file" => "讀取檔案時發生錯誤",
 "An error occurred while parsing the file." => "解析檔案時發生錯誤.",
 "Feed loaded!" => "訂閱已載入!",
 "Error moving feed into folder." => "移動訂閱至資料夾時發生錯誤",
 "No file path was submitted." => "沒有提交檔案路徑.",
 "File doesn't exist:" => "檔案不存在",
-"Couldn't save temporary image: " => "無法儲存暫存影像",
 "Error setting all items as read." => "設定所有項目為已閱讀時發生錯誤",
 "Error marking item as read." => "標示已閱讀時發生錯誤.",
 "Error updating feed." => "更新訂閱時發生錯誤.",
 "Feed updated!" => "訂閱已更新!",
 "News" => "新聞",
-"Error while loading the feed" => "載入訊息串時發生錯誤",
 "Error" => "錯誤",
 "None" => "無",
 "Show only unread" => "只顯示未閱讀",
@@ -42,26 +38,20 @@
 "Fatal Error" => "嚴重錯誤",
 "No files selected." => "沒有挑選檔案",
 "Importing OPML file..." => "匯入 OPML 檔案中...",
-"Not a valid type" => "不是有效的類型",
 "Importing done" => "匯入完成",
 "Error while importing feeds." => "匯入訂閱時發生錯誤.",
 "Select file" => "選擇檔案",
 "no title" => "沒有標題",
 "no name" => "沒有名稱",
 "no body" => "沒有主體",
-"subscriptions in ownCloud - News" => "在 ownCloud - News 中的訂閱",
 "An error occurred" => "發生錯誤",
-"Nice! You have subscribed to " => "太棒了！您已經訂閱",
-"You had already subscribed to this feed!" => "您已經訂閱了這個訊息串！",
 "You don't have any feed in your reader." => "您的閱讀器中沒有任何訂閱.",
 "Address" => "網址",
-"Subscribe" => "訂閱",
 "Import OPML" => "匯入 OPML",
 "Upload file from desktop" => "從桌面上傳檔案",
 "Upload" => "上傳",
 "Select file from ownCloud" => "從 ownCloud 中挑選檔案",
 "Select" => "選擇",
-"Select file from <a href=\"#\" class=\"settings\" id=\"browselink\">local filesystem</a> or <a href=\"#\" class=\"settings\" id=\"cloudlink\">cloud</a>" => "從 <a href=\"#\" class=\"settings\" id=\"browselink\">本地檔案系統</a> 或 <a href=\"#\" class=\"settings\" id=\"cloudlink\">雲端</a> 選擇檔案",
 "Import" => "匯入",
 "Or..." => "或...",
 "Add feed or folder" => "新增訂閱或資料夾",
@@ -79,19 +69,14 @@
 "New articles" => "新文章",
 "Mark all read" => "標記所有為已閱讀",
 "Starred" => "星號",
-"Mark as unimportant" => "標示為不重要",
-"Mark as important" => "標示為重要",
 "from" => "從",
 "by" => "由",
 "Share" => "分享",
 "Keep unread" => "保持未閱讀",
 "Delete feed" => "刪除訂閱",
-"Collapse" => "收合",
 "Delete folder" => "刪除資料夾",
 "Rename folder" => "資料夾更名",
 "Import feeds" => "匯入訂閱",
 "Export feeds" => "匯出訂閱",
-"Download OPML" => "下載 OPML",
-"Subscribelet" => "Subscribelet",
-"Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "將這個拖曳至瀏覽器的書籤列，當您想要訂閱網頁時，點它一下即可。"
+"Download OPML" => "下載 OPML"
 );