From 0b99ee2d05eee82f42324a87a2fec241d154f995 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 24 Jan 2013 16:50:51 +0100
Subject: [PATCH 1/2] drop SimpleTest compatibility

---
 tests/lib_bookmark.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/lib_bookmark.php b/tests/lib_bookmark.php
index 6425fd9a..dcd8d08b 100644
--- a/tests/lib_bookmark.php
+++ b/tests/lib_bookmark.php
@@ -1,7 +1,7 @@
 <?php
 
 OC_App::loadApp('bookmarks');
-class Test_LibBookmarks_Bookmarks extends UnitTestCase {
+class Test_LibBookmarks_Bookmarks extends PHPUnit_Framework_TestCase {
 
 	function testAddBM() {
 		$this->assertCount(0, OC_Bookmarks_Bookmarks::findBookmarks(0, 'id', array(), true, -1));
@@ -12,11 +12,11 @@ class Test_LibBookmarks_Bookmarks extends UnitTestCase {
 
 	function testFindTags() {
 // 		$uid=uniqid();
-		$this->assertEqual(OC_Bookmarks_Bookmarks::findTags(), array());
+		$this->assertEquals(OC_Bookmarks_Bookmarks::findTags(), array());
 
 		OC_Bookmarks_Bookmarks::addBookmark(
 			'http://owncloud.org', 'Owncloud project', array('oc', 'cloud'), 'An Awesome project');
-		$this->assertEqual(array(0=>array('tag' => 'cloud', 'nbr'=>1), 1=>array('tag' => 'oc', 'nbr'=>1)),
+		$this->assertEquals(array(0=>array('tag' => 'cloud', 'nbr'=>1), 1=>array('tag' => 'oc', 'nbr'=>1)),
 			OC_Bookmarks_Bookmarks::findTags());
 	}
 

From 23a6a40a36abb74e6d2f5bbadd983267e40b72c6 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 25 Jan 2013 00:04:33 +0100
Subject: [PATCH 2/2] [tx-robot] updated from transifex

---
 l10n/zh_TW.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/l10n/zh_TW.php b/l10n/zh_TW.php
index f52f67a1..d19c2d3d 100644
--- a/l10n/zh_TW.php
+++ b/l10n/zh_TW.php
@@ -1,13 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Unsupported file type for import" => "不支援這種檔案類型的匯入",
 "Bookmarks" => "書籤",
 "Tags" => "標籤",
 "Filter by tag" => "依標籤篩選",
 "Edit bookmark" => "編輯書籤",
+"Are you sure you want to remove this tag from every entry?" => "您確定要從每個項目中移除這個標籤嗎？",
 "Warning" => "警告",
+"Import completed successfully." => "匯入成功完成。",
 "Uploading..." => "上傳中...",
+"Bookm." => "書籤",
 "Add a bookmark" => "新增書籤",
 "Close" => "關閉",
 "The title of the page" => "頁面標題",
+"The address of the page" => "頁面的位址",
 "Description of the page" => "頁面說明",
 "Save" => "儲存",
 "Delete" => "刪除",
@@ -21,6 +26,7 @@
 "Settings" => "設定",
 "You have no bookmarks" => "你沒有書籤",
 "You can also try to import a bookmark file" => "您也可以匯入書籤檔",
+"Bookmarklet" => "Bookmarklet",
 "Export & Import" => "匯出與匯入",
 "Export" => "匯出",
 "Import" => "匯入"