Merge branch 'master' into news_ext_api

4 files changed, 20 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 6050af0e2..4b3d61818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 coffee/build/
 node_modules/
 *.log
+build/
+
diff --git a/l10n/fa.php b/l10n/fa.php
index b2c919552..bc8ebb3a3 100644
--- a/l10n/fa.php
+++ b/l10n/fa.php
@@ -4,6 +4,7 @@
 "no title" => "بدون عنوان",
 "no name" => "بدون نام",
 "no body" => "هیچ کس",
+"subscriptions in ownCloud - News" => "اشتراک در بخش اخبار ownCloud",
 "An error occurred" => "یک خطا رخ داده است",
 "New" => "جدید",
 "Add Subscription" => "افزودن اشتراک",
@@ -13,9 +14,11 @@
 "Add" => "افزودن",
 "New folder" => "پوشه جدید",
 "Folder" => "پوشه",
+"No folder" => "بدون پوشه",
 "Starred" => "ستاره دار",
 "Unread articles" => "مطالب خوانده نشده",
 "All articles" => "تمام مطالب",
+"Mark all read" => "علامت خوانده شده برای همه",
 "Share" => "اشتراک‌گزاری",
 "Delete folder" => "حذف پوشه",
 "Rename folder" => "تغییر نام پوشه",
diff --git a/l10n/zh_CN.php b/l10n/zh_CN.php
index 1d3e4fea1..86595d45e 100644
--- a/l10n/zh_CN.php
+++ b/l10n/zh_CN.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"year" => "年",
 "News" => "新闻",
 "no title" => "没有标题",
 "no name" => "没有名称",
@@ -9,20 +10,31 @@
 "You had already subscribed to this feed!" => "您已经订阅过此feed哟。",
 "New" => "新建",
 "Add Subscription" => "添加订阅",
+"Address must not be empty!" => "地址不能为空！",
+"Feed exists already!" => "Feed已存在！",
+"Could not add feed! Check if feed contains valid RSS!" => "无法添加 feed！请检查 feed 是否包含合法的 RSS！",
+"Folder exists already" => "文件夹已存在",
 "Address" => "地址",
 "Add" => "添加",
+"New folder" => "添加文件夹",
 "Folder" => "文件夹",
+"No folder" => "无文件夹",
 "Starred" => "已加星标",
+"Unread articles" => "未读文章",
+"All articles" => "全部文章",
 "Mark all read" => "设置所有为已读",
+"Cant play audio format" => "无法播放此音频格式",
 "Share" => "共享",
 "Keep unread" => "保持未读",
 "Delete feed" => "删除Feed",
 "Collapse" => "折叠",
 "Delete folder" => "删除目录",
 "Rename folder" => "重命名目录",
+"Import / Export OPML" => "导入 / 导出 OPML",
 "Import" => "导入",
 "Export" => "导出",
 "Subscribelet" => "订阅组件",
+"Show all" => "显示所有",
 "Show only unread" => "只看未读",
 "Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "拖动此到您的浏览器书签，每当你想迅速订阅网页单击它",
 "Subscribe" => "订阅"
diff --git a/tests/controller/FolderControllerTest.php b/tests/controller/FolderControllerTest.php
index a9eb85e9e..4dfe5e200 100644
--- a/tests/controller/FolderControllerTest.php
+++ b/tests/controller/FolderControllerTest.php
@@ -103,7 +103,7 @@ class FolderControllerTest extends ControllerTestUtility {
 
 	/**
 	 * collapse
-	 */
+	 *//*
 	public function testCollapseCalled(){
 		$urlParams = array('folderId' => 1);
 		$this->folderMapper->expects($this->once())
@@ -161,7 +161,7 @@ class FolderControllerTest extends ControllerTestUtility {
 		$expected = '{"status":"error","data":[],"msg":"' . $ex->getMessage() . '"}';
 		$this->assertEquals($expected, $response->render());
 	}
-
+ 
 
 	public function testCollapseDoesNotExistExceptionReturnsJSONError(){
 		$ex = new DoesNotExistException('exception');
@@ -173,6 +173,6 @@ class FolderControllerTest extends ControllerTestUtility {
 		$ex = new MultipleObjectsReturnedException('exception');
 		$this->collapseException($ex);
 	}
-
+urlParams has been removed, please refactor*/
 
 }
\ No newline at end of file