From d70df492e4d0cbabd304e468c623d805c384c5d2 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 17 Sep 2012 17:01:13 +0200 Subject: [PATCH 1/6] [tx-robot] updated from transifex --- l10n/zh_CN.GB2312.php | 13 +++++++++++++ l10n/zh_CN.php | 1 + 2 files changed, 14 insertions(+) create mode 100644 l10n/zh_CN.GB2312.php diff --git a/l10n/zh_CN.GB2312.php b/l10n/zh_CN.GB2312.php new file mode 100644 index 00000000..e8ed9eeb --- /dev/null +++ b/l10n/zh_CN.GB2312.php @@ -0,0 +1,13 @@ + "书签", +"unnamed" => "未命名", +"Bookm." => "订阅它们。", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖动此物到您的浏览器书签栏，在您想要快速订阅某网页时点击：", +"Read later" => "稍后阅读", +"Address" => "网址", +"Title" => "标题", +"Tags" => "标签", +"Save bookmark" => "保存书签", +"You have no bookmarks" => "您没有书签", +"Bookmarklet
" => "小书签
" +); diff --git a/l10n/zh_CN.php b/l10n/zh_CN.php index 0510738c..ab72475d 100644 --- a/l10n/zh_CN.php +++ b/l10n/zh_CN.php @@ -1,6 +1,7 @@ "书签", "unnamed" => "未命名", +"Bookm." => "书签", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖曳此处到您的浏览器书签处，点击可以将网页快速添加到书签中。", "Read later" => "稍后阅读", "Address" => "地址", From c781d660f3616fc8eced3854c280d8a62ddd3b67 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 28 Oct 2012 12:53:13 +0100 Subject: [PATCH 2/6] Revert "[tx-robot] updated from transifex" due to merge conflicts This reverts commit a468d47dfb2ca740e25edfac3b11a6ea21ee1546. --- l10n/zh_CN.GB2312.php | 13 ------------- l10n/zh_CN.php | 1 - 2 files changed, 14 deletions(-) delete mode 100644 l10n/zh_CN.GB2312.php diff --git a/l10n/zh_CN.GB2312.php b/l10n/zh_CN.GB2312.php deleted file mode 100644 index e8ed9eeb..00000000 --- a/l10n/zh_CN.GB2312.php +++ /dev/null @@ -1,13 +0,0 @@ - "书签", -"unnamed" => "未命名", -"Bookm." => "订阅它们。", -"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖动此物到您的浏览器书签栏，在您想要快速订阅某网页时点击：", -"Read later" => "稍后阅读", -"Address" => "网址", -"Title" => "标题", -"Tags" => "标签", -"Save bookmark" => "保存书签", -"You have no bookmarks" => "您没有书签", -"Bookmarklet
" => "小书签
" -); diff --git a/l10n/zh_CN.php b/l10n/zh_CN.php index ab72475d..0510738c 100644 --- a/l10n/zh_CN.php +++ b/l10n/zh_CN.php @@ -1,7 +1,6 @@ "书签", "unnamed" => "未命名", -"Bookm." => "书签", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖曳此处到您的浏览器书签处，点击可以将网页快速添加到书签中。", "Read later" => "稍后阅读", "Address" => "地址", From 403faf3bb04544879e436a93c833b30c1cf71d7d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 28 Jan 2013 19:43:52 +0100 Subject: [PATCH 3/6] change required ownCloud version to 4.91 --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 88b7c1c1..5fe5b827 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,6 +6,6 @@ AGPL Arthur Schiwon, Marvin Thomas Rabe - 4.9 + 4.91 true From f32d9f080603518432354fcd255594b504966424 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 30 Jan 2013 23:17:08 +0100 Subject: [PATCH 4/6] Booksmarks: fix undefined variable --- lib/bookmarks.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bookmarks.php b/lib/bookmarks.php index 69f9b2d4..89d01064 100644 --- a/lib/bookmarks.php +++ b/lib/bookmarks.php @@ -53,6 +53,7 @@ class OC_Bookmarks_Bookmarks{ } public static function findOneBookmark($id) { + $CONFIG_DBTYPE = OCP\Config::getSystemValue( 'dbtype', 'sqlite' ); if($CONFIG_DBTYPE == 'pgsql') { $group_fct = 'array_agg(tag)'; } From fbf942884de3291473de8804bec0d2bd2d0a8555 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Wed, 30 Jan 2013 23:28:51 +0100 Subject: [PATCH 5/6] [Bookmark] Correct adding bookmarks pbm thx fossxplorer --- lib/bookmarks.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/bookmarks.php b/lib/bookmarks.php index 89d01064..4af7a4d2 100644 --- a/lib/bookmarks.php +++ b/lib/bookmarks.php @@ -315,13 +315,11 @@ class OC_Bookmarks_Bookmarks{ $is_public = $is_public ? 1 : 0; $enc_url = htmlspecialchars_decode($url); $_ut = self::getNowValue(); - // Change lastmodified date if the record if already exists $sql = "SELECT * from *PREFIX*bookmarks WHERE url = ? and user_id = ?"; $query = OCP\DB::prepare($sql, 1); $result = $query->execute(array($enc_url, OCP\USER::getUser())); - if(count($result) != 0) { - $row = $result->fetchRow(); + if ($row = $result->fetchRow()){ $params = array(); $title_str = ''; if(trim($title) != '') { // Do we replace the old title @@ -340,8 +338,6 @@ class OC_Bookmarks_Bookmarks{ $query->execute($params); return $row['id']; } - - $query = OCP\DB::prepare(" INSERT INTO *PREFIX*bookmarks (url, title, user_id, public, added, lastmodified, description) From 77b38a738db3d783018756dc80e617ce7fe919cd Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 2 Feb 2013 00:06:00 +0100 Subject: [PATCH 6/6] [tx-robot] updated from transifex --- l10n/sr.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/l10n/sr.php b/l10n/sr.php index 24488ac3..470bce74 100644 --- a/l10n/sr.php +++ b/l10n/sr.php @@ -3,30 +3,30 @@ "Bookmarks" => "Обележивачи", "Tags" => "Ознаке", "Filter by tag" => "Филтрирај по ознаци", -"Edit bookmark" => "Промени обележивач", -"Are you sure you want to remove this tag from every entry?" => "Да ли сигурно желите да уклоните ову ознаку из сваког уноса?", +"Edit bookmark" => "Уреди обележивач", +"Are you sure you want to remove this tag from every entry?" => "Желите ли да уклоните ову ознаку из сваког уноса?", "Warning" => "Упозорење", -"Import completed successfully." => "Увоз је успешан.", -"Uploading..." => "Отпремам...", -"Bookm." => "Обеле.", +"Import completed successfully." => "Увоз је успешно завршен.", +"Uploading..." => "Отпремам…", +"Bookm." => "Обележ.", "Add a bookmark" => "Додај обележивач", "Close" => "Затвори", "The title of the page" => "Наслов странице", "The address of the page" => "Адреса странице", "Description of the page" => "Опис странице", -"Save" => "Сними", +"Save" => "Сачувај", "Delete" => "Обриши", "Edit" => "Уреди", "Cancel" => "Откажи", -"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Превуците ово у ваш прегледач и кликните уколико желите да обележите ову веб страницу на брзину:", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Превуците ово у прегледач и кликните ако на брзину желите да обележите веб страницу:", "Read later" => "Прочитаћу касније", "Address" => "Адреса", "Add" => "Додај", -"Related Tags" => "Повезане ознаке", -"Settings" => "Подешавања", +"Related Tags" => "Сродне ознаке", +"Settings" => "Поставке", "You have no bookmarks" => "Немате обележиваче", -"You can also try to import a bookmark file" => "Можете такође пробати са увозом датотеке са обележивачима", -"Bookmarklet" => "Маркер", +"You can also try to import a bookmark file" => "Можете да пробате да увезете и датотеку са обележивачима", +"Bookmarklet" => "Активан обележивач", "Export & Import" => "Извоз и увоз", "Export" => "Извези", "Import" => "Увези"