From 911d4c0836cf6d1be53be5917739defc91277a7e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 16:49:06 +0400 Subject: add experimental digest thingie --- api/index.php | 133 ++------------------------------------------- functions.php | 141 ++++++++++++++++++++++++++++++++++++++++++++++++ modules/backend-rpc.php | 36 +++++++++++++ 3 files changed, 180 insertions(+), 130 deletions(-) diff --git a/api/index.php b/api/index.php index 8d69e1a73..ae4f1eb5d 100644 --- a/api/index.php +++ b/api/index.php @@ -100,95 +100,7 @@ $limit = (int) db_escape_string($_REQUEST["limit"]); $offset = (int) db_escape_string($_REQUEST["offset"]); - if ($limit) { - $limit_qpart = "LIMIT $limit OFFSET $offset"; - } else { - $limit_qpart = ""; - } - - if (!$cat_id) { - $result = db_query($link, "SELECT - id, feed_url, cat_id, title, ". - SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated - FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . - " ORDER BY cat_id, title " . $limit_qpart); - } else { - $result = db_query($link, "SELECT - id, feed_url, cat_id, title, ". - SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated - FROM ttrss_feeds WHERE - cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . - " ORDER BY cat_id, title " . $limit_qpart); - } - - $feeds = array(); - - while ($line = db_fetch_assoc($result)) { - - $unread = getFeedUnread($link, $line["id"]); - - $icon_path = "../" . ICONS_DIR . "/" . $line["id"] . ".ico"; - $has_icon = file_exists($icon_path) && filesize($icon_path) > 0; - - if ($unread || !$unread_only) { - - $row = array( - "feed_url" => $line["feed_url"], - "title" => $line["title"], - "id" => (int)$line["id"], - "unread" => (int)$unread, - "has_icon" => $has_icon, - "cat_id" => (int)$line["cat_id"], - "last_updated" => strtotime($line["last_updated"]) - ); - - array_push($feeds, $row); - } - } - - /* Labels */ - - if (!$cat_id || $cat_id == -2) { - $counters = getLabelCounters($link, true); - - foreach (array_keys($counters) as $id) { - - $unread = $counters[$id]["counter"]; - - if ($unread || !$unread_only) { - - $row = array( - "id" => $id, - "title" => $counters[$id]["description"], - "unread" => $counters[$id]["counter"], - "cat_id" => -2, - ); - - array_push($feeds, $row); - } - } - } - - /* Virtual feeds */ - - if (!$cat_id || $cat_id == -1) { - foreach (array(-1, -2, -3, -4, 0) as $i) { - $unread = getFeedUnread($link, $i); - - if ($unread || !$unread_only) { - $title = getFeedTitle($link, $i); - - $row = array( - "id" => $i, - "title" => $title, - "unread" => $unread, - "cat_id" => -1, - ); - array_push($feeds, $row); - } - - } - } + $feeds = api_get_feeds($link, $cat_id, $unread_only, $limit, $offset); print json_encode($feeds); @@ -226,47 +138,8 @@ /* all_articles, unread, adaptive, marked, updated */ $view_mode = db_escape_string($_REQUEST["view_mode"]); - /* do not rely on params below */ - - $search = db_escape_string($_REQUEST["search"]); - $search_mode = db_escape_string($_REQUEST["search_mode"]); - $match_on = db_escape_string($_REQUEST["match_on"]); - - $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, - $view_mode, $is_cat, $search, $search_mode, $match_on, - false, $offset); - - $result = $qfh_ret[0]; - $feed_title = $qfh_ret[1]; - - $headlines = array(); - - while ($line = db_fetch_assoc($result)) { - $is_updated = ($line["last_read"] == "" && - ($line["unread"] != "t" && $line["unread"] != "1")); - - $headline_row = array( - "id" => (int)$line["id"], - "unread" => sql_bool_to_bool($line["unread"]), - "marked" => sql_bool_to_bool($line["marked"]), - "updated" => strtotime($line["updated"]), - "is_updated" => $is_updated, - "title" => $line["title"], - "link" => $line["link"], - "feed_id" => $line["feed_id"], - ); - - if ($show_excerpt) { - $excerpt = truncate_string(strip_tags($line["content_preview"]), 100); - $headline_row["excerpt"] = $excerpt; - } - - if ($show_content) { - $headline_row["content"] = $line["content_preview"]; - } - - array_push($headlines, $headline_row); - } + $headlines = api_get_headlines($link, $feed_id, $limit, $offset, + $filter, $is_cat, $show_excerpt, $show_content, $view_mode, false); print json_encode($headlines); diff --git a/functions.php b/functions.php index 05eb85909..78e0d4f18 100644 --- a/functions.php +++ b/functions.php @@ -6652,4 +6652,145 @@ return $rv; } + function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset) { + if ($limit) { + $limit_qpart = "LIMIT $limit OFFSET $offset"; + } else { + $limit_qpart = ""; + } + + if (!$cat_id) { + $result = db_query($link, "SELECT + id, feed_url, cat_id, title, ". + SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . + " ORDER BY cat_id, title " . $limit_qpart); + } else { + $result = db_query($link, "SELECT + id, feed_url, cat_id, title, ". + SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + FROM ttrss_feeds WHERE + cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . + " ORDER BY cat_id, title " . $limit_qpart); + } + + $feeds = array(); + + while ($line = db_fetch_assoc($result)) { + + $unread = getFeedUnread($link, $line["id"]); + + $has_icon = feed_has_icon($line['id']); + + if ($unread || !$unread_only) { + + $row = array( + "feed_url" => $line["feed_url"], + "title" => $line["title"], + "id" => (int)$line["id"], + "unread" => (int)$unread, + "has_icon" => $has_icon, + "cat_id" => (int)$line["cat_id"], + "last_updated" => strtotime($line["last_updated"]) + ); + + array_push($feeds, $row); + } + } + + /* Labels */ + + if (!$cat_id || $cat_id == -2) { + $counters = getLabelCounters($link, true); + + foreach (array_keys($counters) as $id) { + + $unread = $counters[$id]["counter"]; + + if ($unread || !$unread_only) { + + $row = array( + "id" => $id, + "title" => $counters[$id]["description"], + "unread" => $counters[$id]["counter"], + "cat_id" => -2, + ); + + array_push($feeds, $row); + } + } + } + + /* Virtual feeds */ + + if (!$cat_id || $cat_id == -1) { + foreach (array(-1, -2, -3, -4, 0) as $i) { + $unread = getFeedUnread($link, $i); + + if ($unread || !$unread_only) { + $title = getFeedTitle($link, $i); + + $row = array( + "id" => $i, + "title" => $title, + "unread" => $unread, + "cat_id" => -1, + ); + array_push($feeds, $row); + } + + } + } + return $feeds; + } + + function api_get_headlines($link, $feed_id, $limit, $offset, + $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order) { + + /* do not rely on params below */ + + $search = db_escape_string($_REQUEST["search"]); + $search_mode = db_escape_string($_REQUEST["search_mode"]); + $match_on = db_escape_string($_REQUEST["match_on"]); + + $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, + $view_mode, $is_cat, $search, $search_mode, $match_on, + $order, $offset); + + $result = $qfh_ret[0]; + $feed_title = $qfh_ret[1]; + + $headlines = array(); + + while ($line = db_fetch_assoc($result)) { + $is_updated = ($line["last_read"] == "" && + ($line["unread"] != "t" && $line["unread"] != "1")); + + $headline_row = array( + "id" => (int)$line["id"], + "unread" => sql_bool_to_bool($line["unread"]), + "marked" => sql_bool_to_bool($line["marked"]), + "updated" => strtotime($line["updated"]), + "is_updated" => $is_updated, + "title" => $line["title"], + "link" => $line["link"], + "feed_id" => $line["feed_id"], + "has_icon" => feed_has_icon($line["feed_id"]) + ); + + if ($show_excerpt) { + $excerpt = truncate_string(strip_tags($line["content_preview"]), 100); + $headline_row["excerpt"] = $excerpt; + } + + if ($show_content) { + $headline_row["content"] = $line["content_preview"]; + } + + array_push($headlines, $headline_row); + } + + return $headlines; + } + ?> diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index b21e161e4..f8233a7cd 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -978,6 +978,42 @@ return; } + if ($subop == "digest-init") { + print ""; + + $tmp_feeds = api_get_feeds($link, false, true, false, 0); + $feeds = array(); + + foreach ($tmp_feeds as $f) { + if ($f['id'] > 0) array_push($feeds, $f); + } + + function feeds_sort_by_unread_rev($a, $b) { + $a = $a['unread']; + $b = $b['unread']; + + if ($a == $b) { + return 0; + } + return ($a < $b) ? 1 : -1; + } + +// uasort($feeds, 'feeds_sort_by_unread_rev'); +// $feeds = array_slice($feeds, 0, 10); + + print ""; + + $headlines = api_get_headlines($link, -4, 20, 0, + '', true, true, false, "all_articles", "updated DESC"); + + //function api_get_headlines($link, $feed_id, $limit, $offset, + // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { + + print ""; + print ""; + return; + } + print "Unknown method: $subop"; } ?> -- cgit v1.2.3 From c01f40f4d9c8fae847ecec5a18ff52c0a15dd57b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 16:50:10 +0400 Subject: add experimental digest thingie (2) --- digest.css | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ digest.js | 108 +++++++++++++++++++++++++++++++++++++++ digest.php | 113 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 391 insertions(+) create mode 100644 digest.css create mode 100644 digest.js create mode 100644 digest.php diff --git a/digest.css b/digest.css new file mode 100644 index 000000000..5139114f0 --- /dev/null +++ b/digest.css @@ -0,0 +1,170 @@ +body { + background : #f0f0f0; + color : gray; + font-family : sans-serif; + font-size : 12px; +} + +a { + color : #0069D8; + text-decoration : none; +} + +a:hover { + color : gray; +} + +#header a, #footer a { + color : gray; +} + +#header { + font-weight : bold; + font-size : 14px; + font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif; + margin-left : 1em; + margin-right : 1em; +} + +#header div.links { + float : right; +} + +#search { + float : right; + clear : left; + +} + +#content { + border : 1px solid #e0e0e0; + background : white; + padding : 0.8em; + margin : 0.5em; +} + +#footer { + font-size : 12px; + text-align : center; +} + +/*#content h1 { + font-weight : bold; + font-size : 25px; + font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif; + letter-spacing : -2; + margin : 0px 0px 0.5em 0px; + color : black; +} + +#content h2 { + font-weight : bold; + font-size : 20px; + font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif; + letter-spacing : 2; + margin : 0px 0px 0.5em 0px; + color : #684C99; +} + +#content h3 { + font-weight : bold; + font-size : 16px; + font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif; + letter-spacing : 2; + margin : 0px 0px 0.5em 0px; + color : #659a4c; +} */ + +#content h1 { + margin : 0px 0px 20px 0px; + font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif; + font-size : 18px; + letter-spacing : 1px; + color : #684C99; +} + +#title { +} + +#latest { + padding : 5px; +} + +#feeds { + float : right; + width : 30%; + min-width : 300px; + padding : 5px; + font-size : 14px; +} + +#feeds h1 { + text-align : right; +} + +#feeds ul#feeds-content img { + width : 16px; + height : 16px; + vertical-align : middle; + margin-right : 5px; +} + +#feeds ul#feeds-content div.unread-ctr { + color : gray; + float : right; +} + +#feeds ul#feeds-content li { + margin : 0px 0px 2px 0px; +} + +#feeds ul#feeds-content { + list-style-type : none; + font-weight : bold; + color : #659a4c; + margin : 0px; + padding : 0px; +} + +#headlines { + padding : 5px; + font-size : 14px; +} + +#headlines ul#headlines-content img { + width : 16px; + height : 16px; + vertical-align : middle; + margin-right : 5px; +} + +#headlines ul#headlines-content { + list-style-type : none; + color : gray; + margin : 0px; + padding : 0px; +} + +#headlines ul#headlines-content li { + margin : 0px 0px 10px 0px; + color : #909090; +} + +#headlines ul#headlines-content a.title { + font-weight : bold; + font-size : 16px; +} + +#headlines ul#headlines-content div.excerpt { + margin-left : 22px; + color : #404040; +} + +#headlines ul#headlines-content div.info { + margin-left : 22px; +} + +#headlines ul#headlines-content div.info a { + color : gray; +} + diff --git a/digest.js b/digest.js new file mode 100644 index 000000000..7bfd9df27 --- /dev/null +++ b/digest.js @@ -0,0 +1,108 @@ +var last_feeds = []; + +function find_feed(feeds, feed_id) { + try { + for (var i = 0; i < feeds.length; i++) { + if (feeds[i].id == feed_id) + return feeds[i]; + } + + return false; + + } catch (e) { + exception_error("find_feed", e); + } +} + +function add_feed_entry(feed) { + try { + var icon_part = ""; + + if (feed.has_icon) + icon_part = "zz"; + + var tmp_html = "
  • " + + icon_part + + feed.title + + "
    " + feed.unread + "
    " + + "
    • "; + + $("feeds-content").innerHTML += tmp_html; + + } catch (e) { + exception_error("add_feed_entry", e); + } +} + +function add_latest_entry(article) { + try { + + } catch (e) { + exception_error("add_latest_entry", e); + } +} + +function add_headline_entry(article, feed) { + try { + + var icon_part = ""; + + if (article.has_icon) + icon_part = "zz"; + + var tmp_html = "
  • " + + icon_part + + "" + article.title + "" + + "
    " + article.excerpt + "
    " + + "
    " + feed.title + " " + " @ " + + article.updated + "
    " + + "
    • "; + + $("headlines-content").innerHTML += tmp_html; + + } catch (e) { + exception_error("add_headline_entry", e); + } +} + +function digest_update(transport) { + try { + var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; + + if (feeds) { + last_feeds = feeds; + + feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + + for (var i = 0; i < feeds.length; i++) { + add_feed_entry(feeds[i]); + } + } + + if (headlines) { + headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + + for (var i = 0; i < headlines.length; i++) { + add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); + } + } + + } catch (e) { + exception_error("digest_update", e); + } + } + +function digest_init() { + try { + + new Ajax.Request("backend.php", { + parameters: "backend.php?op=rpc&subop=digest-init", + onComplete: function(transport) { + digest_update(transport); + } }); + + } catch (e) { + exception_error("digest_init", e); + } +} diff --git a/digest.php b/digest.php new file mode 100644 index 000000000..cfe16cfe4 --- /dev/null +++ b/digest.php @@ -0,0 +1,113 @@ + + + + + + Tiny Tiny Digest + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + +
    + +
    +

    latest articles

    + + TODO + +
    +
    + +
    +

    feeds

    + +
    +
    + +
    +

    headlines

    + +
    +
    + +
    + +
    + + + + -- cgit v1.2.3 From b41c254984df3fcb9fc7db4bb5218f2391e62164 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 19:02:12 +0400 Subject: small digest page improvements --- digest.css | 8 +++++ digest.js | 57 +++++++++++++++++++++++++++++--- digest.php | 1 - functions.php | 88 ++++++++++++++++++++++++++----------------------- modules/backend-rpc.php | 14 +++++--- 5 files changed, 115 insertions(+), 53 deletions(-) diff --git a/digest.css b/digest.css index 5139114f0..62852adb0 100644 --- a/digest.css +++ b/digest.css @@ -126,6 +126,14 @@ a:hover { padding : 0px; } +#feeds ul#feeds-content li a { + color : #659a4c; +} + +#feeds ul#feeds-content li a:hover { + color : gray; +} + #headlines { padding : 5px; font-size : 14px; diff --git a/digest.js b/digest.js index 7bfd9df27..3d58ca95f 100644 --- a/digest.js +++ b/digest.js @@ -1,5 +1,19 @@ var last_feeds = []; +function view(feed_id) { + try { + + new Ajax.Request("backend.php", { + parameters: "backend.php?op=rpc&subop=digest-init&feed_id=" + feed_id, + onComplete: function(transport) { + digest_update(transport); + } }); + + } catch (e) { + exception_error("view", e); + } +} + function find_feed(feeds, feed_id) { try { for (var i = 0; i < feeds.length; i++) { @@ -14,16 +28,40 @@ function find_feed(feeds, feed_id) { } } +function get_feed_icon(feed) { + try { + if (feed.has_icon) + return 'icons/' + feed.id + '.ico'; + + if (feed.id == -1) + return 'images/mark_set.png'; + + if (feed.id == -2) + return 'images/pub_set.png'; + + if (feed.id == -3) + return 'images/fresh.png'; + + if (feed.id == -4) + return 'images/tag.png'; + + if (feed.id < -10) + return 'images/label.png'; + + } catch (e) { + exception_error("get_feed_icon", e); + } +} + function add_feed_entry(feed) { try { var icon_part = ""; - if (feed.has_icon) - icon_part = "zz"; + icon_part = ""; var tmp_html = "
  • " + icon_part + - feed.title + + "" + feed.title + "
    " + feed.unread + "
    " + "
    • "; @@ -34,8 +72,11 @@ function add_feed_entry(feed) { } } -function add_latest_entry(article) { +function add_latest_entry(article, feed) { try { + + + //$("latest-content").innerHTML += "bbb"; } catch (e) { exception_error("add_latest_entry", e); @@ -55,7 +96,7 @@ function add_headline_entry(article, feed) { "" + article.title + "" + "
    " + article.excerpt + "
    " + "
    " + feed.title + " " + " @ " + - article.updated + "
    " + + new Date(article.updated * 1000) + "" + ""; $("headlines-content").innerHTML += tmp_html; @@ -75,6 +116,8 @@ function digest_update(transport) { feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + $('feeds-content').innerHTML = ""; + for (var i = 0; i < feeds.length; i++) { add_feed_entry(feeds[i]); } @@ -83,9 +126,13 @@ function digest_update(transport) { if (headlines) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + $('headlines-content').innerHTML = ""; + for (var i = 0; i < headlines.length; i++) { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); } + + $('headlines-content').innerHTML += "
  • More articles...
    • "; } } catch (e) { diff --git a/digest.php b/digest.php index cfe16cfe4..94489eb0b 100644 --- a/digest.php +++ b/digest.php @@ -39,7 +39,6 @@ - diff --git a/functions.php b/functions.php index 78e0d4f18..ce1a06a62 100644 --- a/functions.php +++ b/functions.php @@ -6653,51 +6653,9 @@ } function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset) { - if ($limit) { - $limit_qpart = "LIMIT $limit OFFSET $offset"; - } else { - $limit_qpart = ""; - } - - if (!$cat_id) { - $result = db_query($link, "SELECT - id, feed_url, cat_id, title, ". - SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated - FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . - " ORDER BY cat_id, title " . $limit_qpart); - } else { - $result = db_query($link, "SELECT - id, feed_url, cat_id, title, ". - SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated - FROM ttrss_feeds WHERE - cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . - " ORDER BY cat_id, title " . $limit_qpart); - } $feeds = array(); - while ($line = db_fetch_assoc($result)) { - - $unread = getFeedUnread($link, $line["id"]); - - $has_icon = feed_has_icon($line['id']); - - if ($unread || !$unread_only) { - - $row = array( - "feed_url" => $line["feed_url"], - "title" => $line["title"], - "id" => (int)$line["id"], - "unread" => (int)$unread, - "has_icon" => $has_icon, - "cat_id" => (int)$line["cat_id"], - "last_updated" => strtotime($line["last_updated"]) - ); - - array_push($feeds, $row); - } - } - /* Labels */ if (!$cat_id || $cat_id == -2) { @@ -6741,6 +6699,52 @@ } } + + /* Real feeds */ + + if ($limit) { + $limit_qpart = "LIMIT $limit OFFSET $offset"; + } else { + $limit_qpart = ""; + } + + if (!$cat_id) { + $result = db_query($link, "SELECT + id, feed_url, cat_id, title, ". + SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . + " ORDER BY cat_id, title " . $limit_qpart); + } else { + $result = db_query($link, "SELECT + id, feed_url, cat_id, title, ". + SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + FROM ttrss_feeds WHERE + cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . + " ORDER BY cat_id, title " . $limit_qpart); + } + + while ($line = db_fetch_assoc($result)) { + + $unread = getFeedUnread($link, $line["id"]); + + $has_icon = feed_has_icon($line['id']); + + if ($unread || !$unread_only) { + + $row = array( + "feed_url" => $line["feed_url"], + "title" => $line["title"], + "id" => (int)$line["id"], + "unread" => (int)$unread, + "has_icon" => $has_icon, + "cat_id" => (int)$line["cat_id"], + "last_updated" => strtotime($line["last_updated"]) + ); + + array_push($feeds, $row); + } + } + return $feeds; } diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index f8233a7cd..edf2ae2e4 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -979,13 +979,17 @@ } if ($subop == "digest-init") { + $feed_id = db_escape_string($_REQUEST['feed_id']); + + if (!$feed_id) $feed_id = -4; + print ""; $tmp_feeds = api_get_feeds($link, false, true, false, 0); $feeds = array(); foreach ($tmp_feeds as $f) { - if ($f['id'] > 0) array_push($feeds, $f); + if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f); } function feeds_sort_by_unread_rev($a, $b) { @@ -998,13 +1002,13 @@ return ($a < $b) ? 1 : -1; } -// uasort($feeds, 'feeds_sort_by_unread_rev'); -// $feeds = array_slice($feeds, 0, 10); + //uasort($feeds, 'feeds_sort_by_unread_rev'); + //$feeds = array_slice($feeds, 0, 10); print ""; - $headlines = api_get_headlines($link, -4, 20, 0, - '', true, true, false, "all_articles", "updated DESC"); + $headlines = api_get_headlines($link, $feed_id, 10, 0, + '', ($feed_id == -4), true, false, "all_articles", "updated DESC"); //function api_get_headlines($link, $feed_id, $limit, $offset, // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { -- cgit v1.2.3 From 1ca8997bcc818bdfa12f3c979b9e0981422cdbc0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 21:44:04 +0400 Subject: more digest page improvements --- digest.css | 9 +++++++-- digest.js | 45 ++++++++++++++++++++++++++++++++++++--------- modules/backend-rpc.php | 29 ++++++++++++++++++++--------- 3 files changed, 63 insertions(+), 20 deletions(-) diff --git a/digest.css b/digest.css index 62852adb0..3c770b765 100644 --- a/digest.css +++ b/digest.css @@ -156,6 +156,7 @@ a:hover { #headlines ul#headlines-content li { margin : 0px 0px 10px 0px; color : #909090; + clear : left; } #headlines ul#headlines-content a.title { @@ -164,12 +165,16 @@ a:hover { } #headlines ul#headlines-content div.excerpt { - margin-left : 22px; color : #404040; } +#headlines ul#headlines-content div.body { + margin-left : 21px; +} + #headlines ul#headlines-content div.info { - margin-left : 22px; + margin-top : 2px; + font-size : 11px; } #headlines ul#headlines-content div.info a { diff --git a/digest.js b/digest.js index 3d58ca95f..f27f15f86 100644 --- a/digest.js +++ b/digest.js @@ -1,12 +1,29 @@ var last_feeds = []; -function view(feed_id) { +var _active_feed_id = false; +var _active_feed_offset = false; + +function viewfeed(feed_id, offset) { try { + if (!feed_id) feed_id = _active_feed_id; + + if (!offset) + offset = 0; + else + offset = _active_feed_offset + offset; + + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + + "&offset=" + offset; + + console.log(query); + new Ajax.Request("backend.php", { - parameters: "backend.php?op=rpc&subop=digest-init&feed_id=" + feed_id, + parameters: query, onComplete: function(transport) { digest_update(transport); + _active_feed_id = feed_id; + _active_feed_offset = offset; } }); } catch (e) { @@ -61,7 +78,7 @@ function add_feed_entry(feed) { var tmp_html = "
  • " + icon_part + - "" + feed.title + + "" + feed.title + "
    " + feed.unread + "
    " + "
    • "; @@ -89,15 +106,15 @@ function add_headline_entry(article, feed) { var icon_part = ""; if (article.has_icon) - icon_part = "zz"; + icon_part = ""; var tmp_html = "
  • " + icon_part + "" + article.title + "" + - "
    " + article.excerpt + "
    " + + "
    " + article.excerpt + "
    " + "
    " + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + - "
    • "; + ""; $("headlines-content").innerHTML += tmp_html; @@ -112,15 +129,17 @@ function digest_update(transport) { var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; if (feeds) { - last_feeds = feeds; - feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + last_feeds = feeds; + $('feeds-content').innerHTML = ""; for (var i = 0; i < feeds.length; i++) { add_feed_entry(feeds[i]); } + } else { + feeds = last_feeds; } if (headlines) { @@ -128,11 +147,18 @@ function digest_update(transport) { $('headlines-content').innerHTML = ""; + Element.hide('headlines-content'); + for (var i = 0; i < headlines.length; i++) { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); } - $('headlines-content').innerHTML += "
  • More articles...
    • "; + $('headlines-content').innerHTML += "
  • " + + "
    " + + __("More articles...") + "
    • "; + + new Effect.Appear('headlines-content'); + } } catch (e) { @@ -147,6 +173,7 @@ function digest_init() { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { digest_update(transport); + window.setTimeout('viewfeed(-4)', 100); } }); } catch (e) { diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index edf2ae2e4..80eda7c3f 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -978,11 +978,29 @@ return; } - if ($subop == "digest-init") { + if ($subop == "digest-update") { $feed_id = db_escape_string($_REQUEST['feed_id']); - + $offset = db_escape_string($_REQUEST['offset']); + if (!$feed_id) $feed_id = -4; + if (!$offset) $offset = 0; + + print ""; + + $headlines = api_get_headlines($link, $feed_id, 10, $offset, + '', ($feed_id == -4), true, false, "unread", "updated DESC"); + + //function api_get_headlines($link, $feed_id, $limit, $offset, + // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { + + print ""; + + print ""; + return; + } + + if ($subop == "digest-init") { print ""; $tmp_feeds = api_get_feeds($link, false, true, false, 0); @@ -1007,13 +1025,6 @@ print ""; - $headlines = api_get_headlines($link, $feed_id, 10, 0, - '', ($feed_id == -4), true, false, "all_articles", "updated DESC"); - - //function api_get_headlines($link, $feed_id, $limit, $offset, - // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { - - print ""; print ""; return; } -- cgit v1.2.3 From 22933e5e381f241365d833a7e1da6185816688bf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 22:01:35 +0400 Subject: more digest page improvements --- digest.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/digest.js b/digest.js index f27f15f86..d641733f0 100644 --- a/digest.js +++ b/digest.js @@ -3,6 +3,16 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; +function view(article_id) { + try { + new Effect.Fade('A-' + article_id, {duration : 0.3}); + + return true; + } catch (e) { + exception_error("view", e); + } +} + function viewfeed(feed_id, offset) { try { @@ -108,9 +118,11 @@ function add_headline_entry(article, feed) { if (article.has_icon) icon_part = ""; - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + - "" + article.title + "" + + "" + + article.title + "" + "
    " + article.excerpt + "
    " + "
    " + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + @@ -153,9 +165,9 @@ function digest_update(transport) { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); } - $('headlines-content').innerHTML += "
  • " + - "
    " + - __("More articles...") + "
    • "; +// $('headlines-content').innerHTML += "
  • " + +// "
    " + +// __("More articles...") + "
    • "; new Effect.Appear('headlines-content'); -- cgit v1.2.3 From 118e9399b7896472af1f3e3c349c35a9a94072b1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Sep 2010 13:59:21 +0400 Subject: more digest page improvements --- digest.css | 17 ++++++ digest.js | 129 ++++++++++++++++++++++++++++++++++++++++----- images/digest_checkbox.png | Bin 0 -> 244 bytes modules/backend-rpc.php | 2 +- 4 files changed, 134 insertions(+), 14 deletions(-) create mode 100755 images/digest_checkbox.png diff --git a/digest.css b/digest.css index 3c770b765..f82bd54cd 100644 --- a/digest.css +++ b/digest.css @@ -137,6 +137,13 @@ a:hover { #headlines { padding : 5px; font-size : 14px; + max-width : 65%; +} + +#headlines ul#headlines-content img.digest-check { + float : right; + cursor : pointer; + } #headlines ul#headlines-content img { @@ -159,6 +166,10 @@ a:hover { clear : left; } +#headlines ul#headlines-content li:hover { + background : #fafafa; +} + #headlines ul#headlines-content a.title { font-weight : bold; font-size : 16px; @@ -166,10 +177,16 @@ a:hover { #headlines ul#headlines-content div.excerpt { color : #404040; + cursor : pointer; +} + +#headlines ul#headlines-content div.content { + color : #404040; } #headlines ul#headlines-content div.body { margin-left : 21px; + /*margin-left : 42px;*/ } #headlines ul#headlines-content div.info { diff --git a/digest.js b/digest.js index d641733f0..01f96a54e 100644 --- a/digest.js +++ b/digest.js @@ -2,12 +2,81 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; +var _update_timeout = false; -function view(article_id) { +function zoom(article_id) { try { - new Effect.Fade('A-' + article_id, {duration : 0.3}); + var elem = $('A-' + article_id); - return true; + if (elem) { + var divs = elem.getElementsByTagName('DIV'); + + for (var i = 0; i < divs.length; i++) { + if (divs[i].className == 'excerpt') + Element.hide(divs[i]); + + if (divs[i].className == 'content') + Element.show(divs[i]); + } + } + + var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + window.clearTimeout(_update_timeout); + _update_timeout = window.setTimeout('update()', 1000); + } }); + + } catch (e) { + exception_error("zoom", e); + } +} + +function load_more() { + try { + var elem = $('MORE-PROMPT'); + + if (elem) { + elem.id = ''; + Element.hide(elem); + } + + viewfeed(_active_feed_id, _active_feed_offset + 10); + } catch (e) { + exception_error("load_more", e); + } +} + +function update() { + try { + viewfeed(_active_feed_id, _active_feed_offset); + } catch (e) { + exception_error("update", e); + } +} + +function view(article_id, dismiss_only) { + try { + var elem = $('A-' + article_id); + + elem.id = ''; + + //new Effect.Fade(elem, {duration : 0.3}); + + Element.hide(elem); + + var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + window.clearTimeout(_update_timeout); + _update_timeout = window.setTimeout('update()', 1000); + } }); + + return dismiss_only != true; } catch (e) { exception_error("view", e); } @@ -31,7 +100,7 @@ function viewfeed(feed_id, offset) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - digest_update(transport); + digest_update(transport, feed_id); _active_feed_id = feed_id; _active_feed_offset = offset; } }); @@ -41,6 +110,20 @@ function viewfeed(feed_id, offset) { } } +function find_article(articles, article_id) { + try { + for (var i = 0; i < articles.length; i++) { + if (articles[i].id == article_id) + return articles[i]; + } + + return false; + + } catch (e) { + exception_error("find_article", e); + } +} + function find_feed(feeds, feed_id) { try { for (var i = 0; i < feeds.length; i++) { @@ -120,10 +203,15 @@ function add_headline_entry(article, feed) { var tmp_html = "
  • " + icon_part + + "" + "" + article.title + "" + - "
    " + article.excerpt + "
    " + + "
    " + + "
    " + + article.excerpt + "
    " + + "" + "
    " + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + "
    • "; @@ -135,7 +223,7 @@ function add_headline_entry(article, feed) { } } -function digest_update(transport) { +function digest_update(transport, feed_id) { try { var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; @@ -157,17 +245,32 @@ function digest_update(transport) { if (headlines) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); - $('headlines-content').innerHTML = ""; + if (_active_feed_id != feed_id) + $('headlines-content').innerHTML = ""; + + //Element.hide('headlines-content'); + + var pr = $('MORE-PROMPT'); - Element.hide('headlines-content'); + if (pr) { + pr.id = ''; + Element.hide(pr); + } for (var i = 0; i < headlines.length; i++) { - add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); + var elem = $('A-' + headlines[i].id); + + if (elem && Element.visible(elem)) { + + + } else { + add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); + } } -// $('headlines-content').innerHTML += "
  • " + -// "
    " + -// __("More articles...") + "
    • "; + $('headlines-content').innerHTML += "
  • " + + "
    " + + __("More articles...") + "
    • "; new Effect.Appear('headlines-content'); @@ -184,7 +287,7 @@ function digest_init() { new Ajax.Request("backend.php", { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { - digest_update(transport); + digest_update(transport, -4); window.setTimeout('viewfeed(-4)', 100); } }); diff --git a/images/digest_checkbox.png b/images/digest_checkbox.png new file mode 100755 index 000000000..c5e4b98ea Binary files /dev/null and b/images/digest_checkbox.png differ diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 80eda7c3f..70b690111 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -989,7 +989,7 @@ print ""; $headlines = api_get_headlines($link, $feed_id, 10, $offset, - '', ($feed_id == -4), true, false, "unread", "updated DESC"); + '', ($feed_id == -4), true, true, "unread", "updated DESC"); //function api_get_headlines($link, $feed_id, $limit, $offset, // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { -- cgit v1.2.3 From c524d7e6825b9127630963ebb641af75387a34a3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Sep 2010 15:47:15 +0400 Subject: more digest page improvements --- digest.css | 4 ++++ digest.js | 3 ++- digest.php | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/digest.css b/digest.css index f82bd54cd..30009a68a 100644 --- a/digest.css +++ b/digest.css @@ -196,5 +196,9 @@ a:hover { #headlines ul#headlines-content div.info a { color : gray; + font-weight : bold; } +#headlines ul#headlines-content div.info a:hover { + color : #659a4c; +} diff --git a/digest.js b/digest.js index 01f96a54e..8b1a8f0ce 100644 --- a/digest.js +++ b/digest.js @@ -212,7 +212,8 @@ function add_headline_entry(article, feed) { article.excerpt + "" + "" + - "
    " + feed.title + " " + " @ " + + "
    " + + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + "
    "; diff --git a/digest.php b/digest.php index 94489eb0b..7b1bfd23d 100644 --- a/digest.php +++ b/digest.php @@ -64,11 +64,11 @@ - Tiny Tiny Digest +
    -
    +
    -

    feeds

    +

    -

    headlines

    +

    -- cgit v1.2.3 From 6361fd20fd89ba4bbda585066550b16a058eed43 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Sep 2010 17:45:59 +0400 Subject: rudimentary support for starring/publishing articles in digest --- digest.css | 4 ++- digest.js | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/digest.css b/digest.css index 30009a68a..b0d17b4fc 100644 --- a/digest.css +++ b/digest.css @@ -141,9 +141,11 @@ a:hover { } #headlines ul#headlines-content img.digest-check { - float : right; cursor : pointer; +} +#headlines ul#headlines-content div.digest-check { + float : right; } #headlines ul#headlines-content img { diff --git a/digest.js b/digest.js index 8b1a8f0ce..2a886a89b 100644 --- a/digest.js +++ b/digest.js @@ -203,7 +203,11 @@ function add_headline_entry(article, feed) { var tmp_html = "
  • " + icon_part + + "
    " + + "" + + "" + "" + + "
    " + "" + article.title + "" + @@ -296,3 +300,117 @@ function digest_init() { exception_error("digest_init", e); } } + +function tMark_afh_off(effect) { + try { + var elem = effect.effects[0].element; + + console.log("tMark_afh_off : " + elem.id); + + if (elem) { + elem.src = elem.src.replace("mark_set", "mark_unset"); + elem.alt = __("Star article"); + Element.show(elem); + } + + } catch (e) { + exception_error("tMark_afh_off", e); + } +} + +function tPub_afh_off(effect) { + try { + var elem = effect.effects[0].element; + + console.log("tPub_afh_off : " + elem.id); + + if (elem) { + elem.src = elem.src.replace("pub_set", "pub_unset"); + elem.alt = __("Publish article"); + Element.show(elem); + } + + } catch (e) { + exception_error("tPub_afh_off", e); + } +} + +function toggleMark(mark_img, id) { + + try { + + var query = "?op=rpc&id=" + id + "&subop=mark"; + + query = query + "&afid=" + _active_feed_id; + query = query + "&omode=c"; + + if (!mark_img) return; + + var vfeedu = $("FEEDU--1"); + var crow = $("RROW-" + id); + + if (mark_img.src.match("mark_unset")) { + mark_img.src = mark_img.src.replace("mark_unset", "mark_set"); + mark_img.alt = __("Unstar article"); + query = query + "&mark=1"; + } else { + mark_img.alt = __("Please wait..."); + query = query + "&mark=0"; + + mark_img.src = mark_img.src.replace("mark_set", "mark_unset"); + mark_img.alt = __("Star article"); + } + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + // + } }); + + } catch (e) { + exception_error("toggleMark", e); + } +} + +function togglePub(mark_img, id, note) { + + try { + + var query = "?op=rpc&id=" + id + "&subop=publ"; + + query = query + "&afid=" + _active_feed_id; + + if (note != undefined) { + query = query + "¬e=" + param_escape(note); + } else { + query = query + "¬e=undefined"; + } + + query = query + "&omode=c"; + + if (!mark_img) return; + + if (mark_img.src.match("pub_unset") || note != undefined) { + mark_img.src = mark_img.src.replace("pub_unset", "pub_set"); + mark_img.alt = __("Unpublish article"); + query = query + "&pub=1"; + + } else { + mark_img.alt = __("Please wait..."); + query = query + "&pub=0"; + + mark_img.src = mark_img.src.replace("pub_set", "pub_unset"); + mark_img.alt = __("Publish article"); + } + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + // + } }); + + } catch (e) { + exception_error("togglePub", e); + } +} + -- cgit v1.2.3 From 11a7a966066942a263e11ecd546dc7c101f00cc7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 11 Sep 2010 11:33:47 +0400 Subject: more digest page improvements --- digest.css | 19 ++++++++++++++++++- digest.js | 23 ++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/digest.css b/digest.css index b0d17b4fc..b94044f98 100644 --- a/digest.css +++ b/digest.css @@ -116,6 +116,19 @@ a:hover { #feeds ul#feeds-content li { margin : 0px 0px 2px 0px; + padding : 2px; +} + +#feeds ul#feeds-content li.selected { + background : #f0f0f0; +} + +#feeds ul#feeds-content li.selected a { + color : #404040; +} + +#feeds ul#feeds-content li.selected a:hover { + color : #659a4c; } #feeds ul#feeds-content { @@ -148,7 +161,7 @@ a:hover { float : right; } -#headlines ul#headlines-content img { +#headlines ul#headlines-content img.icon { width : 16px; height : 16px; vertical-align : middle; @@ -186,6 +199,10 @@ a:hover { color : #404040; } +#headlines ul#headlines-content div.content img { + max-width : 75%; +} + #headlines ul#headlines-content div.body { margin-left : 21px; /*margin-left : 42px;*/ diff --git a/digest.js b/digest.js index 2a886a89b..0e567193f 100644 --- a/digest.js +++ b/digest.js @@ -4,6 +4,22 @@ var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; +function mark_selected_feed(feed_id) { + try { + var feeds = $("feeds-content").getElementsByTagName("LI"); + + for (var i = 0; i < feeds.length; i++) { + if (feeds[i].id == "F-" + feed_id) + feeds[i].className = "selected"; + else + feeds[i].className = ""; + } + + } catch (e) { + exception_error("mark_selected_feed", e); + } +} + function zoom(article_id) { try { var elem = $('A-' + article_id); @@ -103,7 +119,8 @@ function viewfeed(feed_id, offset) { digest_update(transport, feed_id); _active_feed_id = feed_id; _active_feed_offset = offset; - } }); + mark_selected_feed(feed_id); + } }); } catch (e) { exception_error("view", e); @@ -169,7 +186,7 @@ function add_feed_entry(feed) { icon_part = ""; - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + "" + feed.title + "
    " + feed.unread + "
    " + @@ -199,7 +216,7 @@ function add_headline_entry(article, feed) { var icon_part = ""; if (article.has_icon) - icon_part = ""; + icon_part = ""; var tmp_html = "
  • " + icon_part + -- cgit v1.2.3 From f1e4d924c956f653022defb822283903f4fbe631 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 11 Sep 2010 12:07:45 +0400 Subject: update translations; release 1.4.3 --- locale/ca_CA/LC_MESSAGES/messages.mo | Bin 43317 -> 43317 bytes locale/ca_CA/LC_MESSAGES/messages.po | 280 +++++++++++++++++++--------------- locale/de_DE/LC_MESSAGES/messages.mo | Bin 43163 -> 43163 bytes locale/de_DE/LC_MESSAGES/messages.po | 276 +++++++++++++++++++-------------- locale/es_ES/LC_MESSAGES/messages.mo | Bin 44729 -> 44729 bytes locale/es_ES/LC_MESSAGES/messages.po | 276 +++++++++++++++++++-------------- locale/fr_FR/LC_MESSAGES/messages.mo | Bin 44825 -> 44825 bytes locale/fr_FR/LC_MESSAGES/messages.po | 276 +++++++++++++++++++-------------- locale/hu_HU/LC_MESSAGES/messages.mo | Bin 38784 -> 38784 bytes locale/hu_HU/LC_MESSAGES/messages.po | 276 +++++++++++++++++++-------------- locale/it_IT/LC_MESSAGES/messages.mo | Bin 48448 -> 48448 bytes locale/it_IT/LC_MESSAGES/messages.po | 280 +++++++++++++++++++--------------- locale/ja_JP/LC_MESSAGES/messages.mo | Bin 38068 -> 38068 bytes locale/ja_JP/LC_MESSAGES/messages.po | 280 +++++++++++++++++++--------------- locale/nb_NO/LC_MESSAGES/messages.mo | Bin 41758 -> 41758 bytes locale/nb_NO/LC_MESSAGES/messages.po | 280 +++++++++++++++++++--------------- locale/pt_BR/LC_MESSAGES/messages.mo | Bin 8957 -> 8957 bytes locale/pt_BR/LC_MESSAGES/messages.po | 276 ++++++++++++++++++--------------- locale/ru_RU/LC_MESSAGES/messages.mo | Bin 53175 -> 53175 bytes locale/ru_RU/LC_MESSAGES/messages.po | 280 +++++++++++++++++++--------------- locale/zh_CN/LC_MESSAGES/messages.mo | Bin 17322 -> 17322 bytes locale/zh_CN/LC_MESSAGES/messages.po | 288 ++++++++++++++++++++--------------- version.php | 2 +- 23 files changed, 1748 insertions(+), 1322 deletions(-) diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo index 7c22cab46..bce204d62 100644 Binary files a/locale/ca_CA/LC_MESSAGES/messages.mo and b/locale/ca_CA/LC_MESSAGES/messages.mo differ diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po index 236a847a2..102fd3e07 100644 --- a/locale/ca_CA/LC_MESSAGES/messages.po +++ b/locale/ca_CA/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 14:09+0400\n" +"POT-Creation-Date: 2010-09-11 12:07+0400\n" "PO-Revision-Date: 2009-11-19 09:40+0100\n" "Last-Translator: Alfred Galitó \n" "Language-Team: Català \n" @@ -16,100 +16,124 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Language: Catalan\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "Valors per defecte" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "No ho purguis mai" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "Al cap d'1 setmana" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "Al cap de 2 setmanes" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "Al cap d'1 mes" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "Al cap de 2 mesos" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "Al cap de 3 mesos" -#: backend.php:116 +#: backend.php:122 msgid "Default interval" msgstr "Interval per defecte" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Deshabilita les actualitzacions" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Cada 15 minuts" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "cada 30 minuts" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "Cada hora" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Cada 4 hores" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Cada 12 hores" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Diàriament" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Setmanalment" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "Per defecte" -#: backend.php:138 +#: backend.php:144 msgid "Magpie" msgstr "Magpie" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "SimplePie" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Usuari" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "Súper usuari" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Administrador" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "Nombre maximal d'articles par défaut" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Hola, " + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Surt" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "Torna a Tiny Tiny RSS" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Canals" + +#: digest.php:94 +#, fuzzy +msgid "headlines" +msgstr "Derniers en-têtes :" + #: errors.php:3 msgid "Unknown error" msgstr "Error desconegut" @@ -193,174 +217,174 @@ msgstr "No s'ha pogut validar la sessió (IP incorrecta)" msgid "Incorrect username or password" msgstr "El nom d'usuari o la contrasenya és incorrecte" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Tots els canals" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Sense categoria" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Especial" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "Etiquetes" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "Articles marcats" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "Articles publicats" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "Articles nous" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 msgid "All articles" msgstr "Tots els articles" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "Articles mémorisés" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "Canals generats" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Selecciona:" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "Tot" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Per llegir" -#: functions.php:4220 +#: functions.php:4225 msgid "Invert" msgstr "Inverteix" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Cap" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Accions..." -#: functions.php:4235 +#: functions.php:4240 msgid "Selection toggle:" msgstr "Commuta la selecció" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Marcats" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Publicats" -#: functions.php:4239 +#: functions.php:4244 msgid "Selection:" msgstr "Selecció:" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Marca'l com a llegit" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "" -#: functions.php:4248 +#: functions.php:4253 #, fuzzy msgid "Move back" msgstr "Vés enrere" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "Per defecte" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "Assigna-l'hi l'etiqueta:" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "Clica-hi per a reduir la categoria" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "No hi ha canals per a mostrar." -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Etiqueta" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "àudio/mpeg" -#: functions.php:4807 +#: functions.php:4812 msgid " - " msgstr " - " -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "Edita les etiquetes d'aquest article" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "Obre els enllaços de l'article en una nova finestra" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 msgid "Publish article with a note" msgstr "Publica l'article amb una nota" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Canal" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 msgid "unknown type" msgstr "tipus desconegut" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "Adjunció:" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "Adjuncions:" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -369,11 +393,11 @@ msgstr "Adjuncions:" msgid "Close this window" msgstr "Tanca la finestra" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "No s'ha trobat el canal." -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." @@ -382,31 +406,31 @@ msgstr "" "seleccioneu reviseu que coincideixi la sintaxi o que la configuració local " "sigui correcta." -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 msgid "mark as read" msgstr "Marca'l com a llegit" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 msgid "Click to expand article" msgstr "Clica-hi per a veure el cos de l'article" -#: functions.php:5599 +#: functions.php:5604 msgid "toggle unread" msgstr "commuta els no llegits" -#: functions.php:5618 +#: functions.php:5623 msgid "No unread articles found to display." msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha." -#: functions.php:5621 +#: functions.php:5626 msgid "No updated articles found to display." msgstr "No hi ha cap article actualitzat." -#: functions.php:5624 +#: functions.php:5629 msgid "No starred articles found to display." msgstr "No hi ha articles marcats per mostrar." -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -414,7 +438,7 @@ msgstr "" "No s'han trobat articles per a mostrar. Podeu assignar articles a etiquetes " "manualment (mireu el menú Accions) o utilitzeu un filtre." -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 msgid "No articles found to display." msgstr "No s'han trobat articles per a mostrar." @@ -463,7 +487,8 @@ msgstr "Filtra l'article" msgid "Set starred" msgstr "Marca'l com a destacat" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "Publica l'article" @@ -826,19 +851,10 @@ msgstr "" "reviseu els vostres\n" "/t/t paràmetres del navegador." -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Hola, " - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Surt de les preferències" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Surt" - #: prefs.php:102 msgid "Keyboard shortcuts" msgstr "Dreceres de teclat" @@ -1669,7 +1685,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 #, fuzzy msgid "Display URL" msgstr "afficher les étiquettes" @@ -1690,7 +1706,27 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "Feu clic aquí per a desar aquesta pàgina web com un canal." +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Torna a Tiny Tiny RSS" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "Torna a Tiny Tiny RSS" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." @@ -1698,12 +1734,12 @@ msgstr "" "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot " "subscriure qualsevol que en conegui l'adreça URL." -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "Articles marcats" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 msgid "No feeds found." msgstr "No s'ha trobat cap canal." @@ -2238,76 +2274,97 @@ msgstr "Mostra/amaga els canals llegits" msgid "Sort feeds by unread count" msgstr "Ordena els canals per articles no llegits" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Accions..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +msgid "Star article" +msgstr "Marca l'article" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "Treu la marca de l'article" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "Si us plau, espereu..." + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "Deixa de publicar l'article" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "No s'ha pogut afegir el filtre: no hi ha coincidències." -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal." -#: functions.js:1354 +#: functions.js:1371 msgid "Subscribing to feed..." msgstr "S'està subscrivint a un canal..." -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "Subscrit als canals:" -#: functions.js:1386 +#: functions.js:1403 #, fuzzy msgid "Can't subscribe to the specified URL." msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal." -#: functions.js:1389 +#: functions.js:1406 #, fuzzy msgid "You are already subscribed to this feed." msgstr "No esteu subscrit a cap canal." -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "Subscrit als canals:" -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "No heu seleccionat cap canal." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." msgstr "" -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "Elimina les dades emmagatzemades" -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "Si us plau, seleccioneu un canal." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "Si us plau, escriviu un títol per a l'etiqueta:" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut." -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "Us voleu donar de baixa de %s ?" @@ -2577,22 +2634,6 @@ msgstr "No podeu canviar la puntuació d'aquest tipus de canal." msgid "Rescore articles in %s?" msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?" -#: viewfeed.js:528 viewfeed.js:592 -msgid "Star article" -msgstr "Marca l'article" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "Treu la marca de l'article" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "Si us plau, espereu..." - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "Deixa de publicar l'article" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." @@ -3154,9 +3195,6 @@ msgstr "Si us plau, escriviu una nota per aquest article:" #~ msgid "Last updated:" #~ msgstr "Dernière mise à jour :" -#~ msgid "Last headlines:" -#~ msgstr "Derniers en-têtes :" - #~ msgid "Other feeds: Top 25" #~ msgstr "Autres flux : Top 25" diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo index 3df33bc66..85fe6a66b 100644 Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po index 20a68f09e..8525e4552 100644 --- a/locale/de_DE/LC_MESSAGES/messages.po +++ b/locale/de_DE/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiny Tiny RSS 1.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 14:09+0400\n" +"POT-Creation-Date: 2010-09-11 12:07+0400\n" "PO-Revision-Date: \n" "Last-Translator: Kevin Kraft \n" "Language-Team: Deutsch \n" @@ -19,100 +19,123 @@ msgstr "" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "Standard verweden" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "Niemals löschen" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "Nach 1 Woche" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "Nach 2 Wochen" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "Nach 1 Monat" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "Nach 2 Monaten" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "Nach 3 Monaten" -#: backend.php:116 +#: backend.php:122 msgid "Default interval" msgstr "Standard Intervall" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Aktualisierungen deaktivieren" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Alle 15 Minuten" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "Alle 30 Minuten" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "Stündlich" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Alle 4 Stunden" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Alle 12 Stunden" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Täglich" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Wöchentlich" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "Standard" -#: backend.php:138 +#: backend.php:144 msgid "Magpie" msgstr "Magpie" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "SimplePie" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Benutzer" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "Erfahrener Benutzer" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Administrator" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "Standard Artikelgrenzwert" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Hallo," + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Abmelden" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "Zu Tiny Tiny RSS zurückkehren" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Feeds" + +#: digest.php:94 +msgid "headlines" +msgstr "" + #: errors.php:3 msgid "Unknown error" msgstr "Unbekannter Fehler" @@ -197,175 +220,175 @@ msgstr "Session konnte nicht validiert werden (falsche IP)" msgid "Incorrect username or password" msgstr "falscher Benutzername oder Passwort" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Alle Feeds" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Unsortiert" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Sonderfeeds" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "Label" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "Bewertete Artikel" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "Veröffentlichte Artikel" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "Neue Artikel" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 msgid "All articles" msgstr "Alle Artikel" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "Bewertete Artikel" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "Erzeugter Feed" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Auswahl:" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "Alle" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Ungelesen" -#: functions.php:4220 +#: functions.php:4225 msgid "Invert" msgstr "Invertieren" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Keine" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Aktionen..." -#: functions.php:4235 +#: functions.php:4240 msgid "Selection toggle:" msgstr "Auswahl umschalten:" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Bewertet" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Veröffentlicht" -#: functions.php:4239 +#: functions.php:4244 msgid "Selection:" msgstr "Auswahl:" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Als gelesen markieren" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "Archiv" -#: functions.php:4248 +#: functions.php:4253 #, fuzzy msgid "Move back" msgstr "Zurück gehen" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "Standard" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "Label zuweisen:" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "Kategorie auf-/zuklappen" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "Keine Feeds zum Anzeigen." -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Tags" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "audio/mpeg" -#: functions.php:4807 +#: functions.php:4812 msgid " - " msgstr " - " -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "Tags für diesen Artikel bearbeiten" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "Artikelzusammenfassung in neuem Fenster anzeigen" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 #, fuzzy msgid "Publish article with a note" msgstr "Artikel veröffentlichen" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "Original von:" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Feed" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 msgid "unknown type" msgstr "unbekannter Typ" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "Anhang:" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "Anhänge:" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -374,11 +397,11 @@ msgstr "Anhänge:" msgid "Close this window" msgstr "Dieses Fenster schließen" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "Feed nicht gefunden." -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." @@ -386,33 +409,33 @@ msgstr "" "Konnte Feed nicht anzeigen (Abfrage fehlgeschlagen). Bitte prüfen Sie die " "Label Übereinstimmungs Syntax oder die Spracheinstellungen." -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 #, fuzzy msgid "mark as read" msgstr "Als gelesen markieren" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 msgid "Click to expand article" msgstr "Klicken um den Artikel aufzuklappen" -#: functions.php:5599 +#: functions.php:5604 #, fuzzy msgid "toggle unread" msgstr "Umschalten ungelesen" -#: functions.php:5618 +#: functions.php:5623 msgid "No unread articles found to display." msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden." -#: functions.php:5621 +#: functions.php:5626 msgid "No updated articles found to display." msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden." -#: functions.php:5624 +#: functions.php:5629 msgid "No starred articles found to display." msgstr "Keine bewerteten Artikel zum Anzeigen gefunden." -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -420,7 +443,7 @@ msgstr "" "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell " "hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen." -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 msgid "No articles found to display." msgstr "Keine Artikel zum Anzeigen gefunden." @@ -469,7 +492,8 @@ msgstr "Artikel filtern" msgid "Set starred" msgstr "Bewertung setzen" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "Artikel veröffentlichen" @@ -822,19 +846,10 @@ msgstr "" "\t\tfunktionieren, welches von Ihrem Browser nicht unterstützt wird.\t" "\tBitte überprüfen Sie Ihre Browser Einstellungen." -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Hallo," - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Einstellungen verlassen" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Abmelden" - #: prefs.php:102 msgid "Keyboard shortcuts" msgstr "Tastaturbefehle" @@ -1665,7 +1680,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 msgid "Display URL" msgstr "Zeige URL an" @@ -1685,7 +1700,27 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "Diese Website als Feedreader registrieren." +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Zu Tiny Tiny RSS zurückkehren" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "Zu Tiny Tiny RSS zurückkehren" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." @@ -1693,12 +1728,12 @@ msgstr "" "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und " "können von jedem abonniert werden, der die nachstehende URL kennt." -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "Bewertete Artikel" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 msgid "No feeds found." msgstr "Keine Feeds gefunden." @@ -2241,48 +2276,69 @@ msgstr "Gelesene ein-/ausblenden" msgid "Sort feeds by unread count" msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Aktionen..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +msgid "Star article" +msgstr "Artikel bewerten" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "Artikelbewertung zurücknehmen" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "Bitte warten..." + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "Artikelveröffentlichung widerrufen" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "Kann den Filter nicht hinzufügen: keine Übereinstimmung vorhanden." -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "Kann Feed nicht abonnieren: keine Feed URL angegeben." -#: functions.js:1354 +#: functions.js:1371 msgid "Subscribing to feed..." msgstr "Abonniere Feed..." -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "Abonnierte Feeds:" -#: functions.js:1386 +#: functions.js:1403 #, fuzzy msgid "Can't subscribe to the specified URL." msgstr "Kann Feed nicht abonnieren: keine Feed URL angegeben." -#: functions.js:1389 +#: functions.js:1406 #, fuzzy msgid "You are already subscribed to this feed." msgstr "Sie können die Kategorie nicht abbestellen." -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "Neue Artikel verfügbar (klicken zum anzeigen)" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "Abonnierte Feeds:" -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "Keine Feeds ausgewählt." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." @@ -2290,29 +2346,29 @@ msgstr "" "ausgewählte Feed aus dem Archiv löschen? Feeds mit gespeicherten Artikeln " "werden nicht gelöscht" -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "Gespeicherte Daten entfernen" -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "Bitte einen Feed auswählen." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "Neues Icon für diesen Feed hochladen" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "Bitte einen Label-Titel eingeben:" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "Kann das Label nicht hinzufügen: fehlender Titel." -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "Abbestellen von %s?" @@ -2580,22 +2636,6 @@ msgstr "Sie können diese Art von Feed nicht neu bewerten." msgid "Rescore articles in %s?" msgstr "Artikel in %s neu bewerten?" -#: viewfeed.js:528 viewfeed.js:592 -msgid "Star article" -msgstr "Artikel bewerten" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "Artikelbewertung zurücknehmen" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "Bitte warten..." - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "Artikelveröffentlichung widerrufen" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo index b45fd10dc..511545e57 100644 Binary files a/locale/es_ES/LC_MESSAGES/messages.mo and b/locale/es_ES/LC_MESSAGES/messages.mo differ diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po index a3bd6b8bf..eb2d70ba0 100644 --- a/locale/es_ES/LC_MESSAGES/messages.po +++ b/locale/es_ES/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 14:09+0400\n" +"POT-Creation-Date: 2010-09-11 12:07+0400\n" "PO-Revision-Date: 2009-11-10 00:12+0100\n" "Last-Translator: Manuel Gualda Caballero \n" "Language-Team: Español \n" @@ -13,100 +13,123 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "Usar configuración por defecto" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "Nunca purgar" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "1 semana de antigüedad" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "2 semanas de antigüedad" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "1 mes de antigüedad" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "2 meses de antigüedad" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "3 meses de antigüedad" -#: backend.php:116 +#: backend.php:122 msgid "Default interval" msgstr "Intervalo por defecto" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Desactivar actualizaciones" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Cada 15 minutos" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "Cada 30 minutos" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "Cada hora" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Cada 4 horas" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Cada 12 horas" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Diariamente" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Semanalmente" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "Por defecto" -#: backend.php:138 +#: backend.php:144 msgid "Magpie" msgstr "Magpie" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "SimplePie" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Usuario" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "Usuario con poder" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Administrador" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "Límite de artículos por defecto" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Hola," + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Cerrar sesión" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "Volver a Tiny Tiny RSS" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Fuentes" + +#: digest.php:94 +msgid "headlines" +msgstr "" + #: errors.php:3 msgid "Unknown error" msgstr "Error desconocido" @@ -190,174 +213,174 @@ msgstr "No se pudo validar la sesión (IP incorrecta)" msgid "Incorrect username or password" msgstr "Nombre de usuario o contraseña incorrecta" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Todas las fuentes" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Sin clasificar" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Especial" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "Etiquetas" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "Favoritos" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "Publicados" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "Recientes" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 msgid "All articles" msgstr "Todos" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "Favoritos" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "Fuente generada" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Seleccione:" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "No" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Sin leer" -#: functions.php:4220 +#: functions.php:4225 msgid "Invert" msgstr "Invertir" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Ninguno" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Acciones..." -#: functions.php:4235 +#: functions.php:4240 msgid "Selection toggle:" msgstr "Cambiar la selección:" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Favoritos" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Publicado" -#: functions.php:4239 +#: functions.php:4244 msgid "Selection:" msgstr "Selección:" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Marcar como leído" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "" -#: functions.php:4248 +#: functions.php:4253 #, fuzzy msgid "Move back" msgstr "Volver atrás" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "Por defecto" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "Asignar etiqueta:" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "Plegar la categoría" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "No hay fuentes que mostrar." -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Etiquetas" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "audio/mpeg" -#: functions.php:4807 +#: functions.php:4812 msgid " - " msgstr " - " -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "Editar las etiquetas de este artículo" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "Mostrar el sumario del artículo en una nueva pestaña o ventana" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 msgid "Publish article with a note" msgstr "Publicar el artículo con una nota" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Fuente" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 msgid "unknown type" msgstr "tipo desconocido" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "Adjunto:" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "Adjuntos:" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -366,11 +389,11 @@ msgstr "Adjuntos:" msgid "Close this window" msgstr "Cerrar esta ventana" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "Fuente no encontrada." -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." @@ -378,31 +401,31 @@ msgstr "" "No se puede mostrar la fuente (consulta fallida). Por favor, compruebe la " "sintaxis de la coincidencia de etiqueta o la configuración local." -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 msgid "mark as read" msgstr "marcar como leído" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 msgid "Click to expand article" msgstr "Desplegar el artículo" -#: functions.php:5599 +#: functions.php:5604 msgid "toggle unread" msgstr "cambiar a sin leer" -#: functions.php:5618 +#: functions.php:5623 msgid "No unread articles found to display." msgstr "No se han encontrado artículos sin leer." -#: functions.php:5621 +#: functions.php:5626 msgid "No updated articles found to display." msgstr "No se han encontrado artículos actualizados." -#: functions.php:5624 +#: functions.php:5629 msgid "No starred articles found to display." msgstr "No se han encontrado artículos favoritos." -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -411,7 +434,7 @@ msgstr "" "artículos a las etiquetas manualmente (ver el menú Acciones -arriba-) o usar " "un filtro." -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 msgid "No articles found to display." msgstr "No se han encontrado artículos que desplegar." @@ -460,7 +483,8 @@ msgstr "Filtrar artículo" msgid "Set starred" msgstr "Fijar como favorito" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "Publicar artículo" @@ -826,19 +850,10 @@ msgstr "" "navegador no lo soporta actualmente. Por favor, revise las opciones de " "configuración de su navegador." -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Hola," - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Salir de las preferencias" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Cerrar sesión" - #: prefs.php:102 msgid "Keyboard shortcuts" msgstr "Atajos de teclado" @@ -1673,7 +1688,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 msgid "Display URL" msgstr "" @@ -1693,7 +1708,27 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "Pulse aquí para registrar este sitio como un lector de fuentes." +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Volver a Tiny Tiny RSS" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "Volver a Tiny Tiny RSS" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." @@ -1702,12 +1737,12 @@ msgstr "" "cual podrá suscribirse cualquiera que conozca la URL especificada a " "continuación." -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "Favoritos" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 msgid "No feeds found." msgstr "No se han encontrado fuentes." @@ -2249,76 +2284,97 @@ msgstr "Ocultar/Mostrar las leídas" msgid "Sort feeds by unread count" msgstr "Ordenar las fuentes en función del número de artículos sin leer" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Acciones..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +msgid "Star article" +msgstr "Marcar el artículo como favorito" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "Quitar el artículo de los favoritos" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "Por favor, espere..." + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "Anular la publicación del artículo" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "No se puede añadir el filtro: no se ha indicado ninguna coincidencia." -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "Suscripción imposible: no se ha indicado la URL de la fuente." -#: functions.js:1354 +#: functions.js:1371 msgid "Subscribing to feed..." msgstr "Suscribiéndose a la fuente..." -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "Suscrito a las fuentes:" -#: functions.js:1386 +#: functions.js:1403 #, fuzzy msgid "Can't subscribe to the specified URL." msgstr "Suscripción imposible: no se ha indicado la URL de la fuente." -#: functions.js:1389 +#: functions.js:1406 #, fuzzy msgid "You are already subscribed to this feed." msgstr "No está suscrito a ninguna fuente." -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "Suscrito a las fuentes:" -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "No se han seleccionado fuentes." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." msgstr "" -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "Eliminar los datos almacenados" -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "Por favor, seleccione una fuente." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "Por favor, introduzca el título de la etiqueta:" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "No se puede crear la etiqueta: falta el título." -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "¿Cancelar la suscripción a %s?" @@ -2585,22 +2641,6 @@ msgstr "No puede reiniciar la puntuación de esta clase de fuente." msgid "Rescore articles in %s?" msgstr "¿Reiniciar la puntuación de los artículos de %s?" -#: viewfeed.js:528 viewfeed.js:592 -msgid "Star article" -msgstr "Marcar el artículo como favorito" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "Quitar el artículo de los favoritos" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "Por favor, espere..." - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "Anular la publicación del artículo" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo index 250b74489..e31c3fb6d 100644 Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po index 9a7d6af51..06faeb1f2 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.po +++ b/locale/fr_FR/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 14:09+0400\n" +"POT-Creation-Date: 2010-09-11 12:07+0400\n" "PO-Revision-Date: 2007-11-20 23:01+0100\n" "Last-Translator: Ploc \n" "Language-Team: Français \n" @@ -18,100 +18,123 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "Utiliser la valeur par défaut" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "Ne jamais purger" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "Au bout d'une semaine" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "Au bout de 2 semaines" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "Au bout d'un mois" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "Au bout de 2 mois" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "Au bout de 3 mois" -#: backend.php:116 +#: backend.php:122 msgid "Default interval" msgstr "Fréquence de mise à jour par défaut" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Désactiver les mises à jour" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Toutes les 15 minutes" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "Toutes les 30 minutes" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "Toutes les heures" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Toutes les 4 heures" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Toutes les 12 heures" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Une fois par jour" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Une fois par semaine" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "Utiliser la valeur par défaut" -#: backend.php:138 +#: backend.php:144 msgid "Magpie" msgstr "Magpie" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "SimplePie" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Utilisateur" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "Utilisateur avancé" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Administrateur" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "Nombre maximal d'articles par défaut" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Bonjour," + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Déconnexion" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "Revenir à Tiny Tiny RSS" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Flux" + +#: digest.php:94 +msgid "headlines" +msgstr "" + #: errors.php:3 msgid "Unknown error" msgstr "Erreur inconnue" @@ -199,174 +222,174 @@ msgstr "Echec de la validation de la session (adresse ip incorrecte)" msgid "Incorrect username or password" msgstr "Login ou mot de passe incorrect" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Tous les flux" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Sans catégorie" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Spécial" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "Etiquettes" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "Articles remarquables" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "Articles publiés" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "Nouveaux articles" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 msgid "All articles" msgstr "Tous les articles" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "Articles remarquables" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "Flux généré" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Sélectionner :" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "Tout" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Non lus" -#: functions.php:4220 +#: functions.php:4225 msgid "Invert" msgstr "Inverse" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Aucun" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Actions..." -#: functions.php:4235 +#: functions.php:4240 msgid "Selection toggle:" msgstr "Sélection :" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Remarquables" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Publiés" -#: functions.php:4239 +#: functions.php:4244 msgid "Selection:" msgstr "Sélection :" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Marquer comme lu" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "" -#: functions.php:4248 +#: functions.php:4253 #, fuzzy msgid "Move back" msgstr "Revenir" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "Utiliser la valeur par défaut" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "Assigner l'étiquette :" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "Cliquer pour contracter la catégorie" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "Aucun flux à afficher." -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Tags" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "audio/mpeg" -#: functions.php:4807 +#: functions.php:4812 msgid " - " msgstr " - " -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "Editer les tags pour cet article" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "Afficher le résumé des articles dans une nouvelle fenêtre" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 msgid "Publish article with a note" msgstr "Publier l'article avec une note" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Flux" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 msgid "unknown type" msgstr "type inconnu" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "Fichier attaché :" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "Fichiers attachés :" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -375,11 +398,11 @@ msgstr "Fichiers attachés :" msgid "Close this window" msgstr "Fermer cette fenêtre" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "Flux non trouvé." -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." @@ -387,31 +410,31 @@ msgstr "" "Impossible d'afficher le flux (la requête l'a pas abouti). Veuillez vérifier " "la syntaxe de l'étiquette de correspondance ou la configuration locale." -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 msgid "mark as read" msgstr "marquer comme lu" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 msgid "Click to expand article" msgstr "Cliquer pour développer l'article" -#: functions.php:5599 +#: functions.php:5604 msgid "toggle unread" msgstr "marquer comme non-lu" -#: functions.php:5618 +#: functions.php:5623 msgid "No unread articles found to display." msgstr "Aucun article non-lu à afficher" -#: functions.php:5621 +#: functions.php:5626 msgid "No updated articles found to display." msgstr "Aucun article mis à jour à afficher" -#: functions.php:5624 +#: functions.php:5629 msgid "No starred articles found to display." msgstr "Aucun article remarquable à afficher" -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -420,7 +443,7 @@ msgstr "" "articles manuellement (voir les actions du menu ci-dessus) ou utiliser un " "filtre." -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 msgid "No articles found to display." msgstr "Aucun article à afficher" @@ -469,7 +492,8 @@ msgstr "Filtrer l'article" msgid "Set starred" msgstr "Marquer comme remarquable" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "Publier l'article" @@ -830,19 +854,10 @@ msgstr "" "\t\tpour le bon fonctionnement de ce logiciel. Veuillez modifier la\n" "\t\tconfiguration de votre navigateur." -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Bonjour," - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Quitter la configuration" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Déconnexion" - #: prefs.php:102 msgid "Keyboard shortcuts" msgstr "Raccourcis clavier" @@ -1676,7 +1691,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 msgid "Display URL" msgstr "" @@ -1696,7 +1711,27 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux." +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Revenir à Tiny Tiny RSS" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "Revenir à Tiny Tiny RSS" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." @@ -1704,12 +1739,12 @@ msgstr "" "Les articles publiés sont exportés comme un flux RSS public et toute " "personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire." -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "Articles remarquables" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 msgid "No feeds found." msgstr "Aucun flux trouvé." @@ -2253,48 +2288,69 @@ msgstr "(Dé)Masquer les flux lus" msgid "Sort feeds by unread count" msgstr "Trier les flux par nombre d'articles non lus" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Actions..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +msgid "Star article" +msgstr "Marquer comme remarquable" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "Ne plus marquer comme remarquable" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "Veuillez patienter..." + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "Ne plus publier l'article" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "Impossible d'ajouter un filtre : aucune correspondance." -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "Impossible de s'inscrire : aucune URL de flux n'a été fournie." -#: functions.js:1354 +#: functions.js:1371 msgid "Subscribing to feed..." msgstr "Inscription au flux..." -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "Inscrit aux flux :" -#: functions.js:1386 +#: functions.js:1403 #, fuzzy msgid "Can't subscribe to the specified URL." msgstr "Impossible de s'inscrire : aucune URL de flux n'a été fournie." -#: functions.js:1389 +#: functions.js:1406 #, fuzzy msgid "You are already subscribed to this feed." msgstr "Vous ne pouvez pas vous désinscrire de la catégorie." -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "Nouveaux articles disponible dans ce flux (cliquer pour les afficher)" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "Inscrit aux flux :" -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "Aucun flux sélectionné." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." @@ -2302,29 +2358,29 @@ msgstr "" "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des " "articles stockés ne seront pas supprimés." -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "Supprimer les données stockées" -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "Veuillez sélectionner une image à envoyer." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "Envoyer une nouvelle icône pour ce flux ?" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "Veuillez saisir le libellé de l'étiquette :" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "Impossible de créer une étiquette : libellé manquant." -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "Se désinscrire de %s ?" @@ -2598,22 +2654,6 @@ msgstr "Vous ne pouvez pas recalculer le score de ce type de flux." msgid "Rescore articles in %s?" msgstr "Recalculer le score des articles de %s ?" -#: viewfeed.js:528 viewfeed.js:592 -msgid "Star article" -msgstr "Marquer comme remarquable" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "Ne plus marquer comme remarquable" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "Veuillez patienter..." - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "Ne plus publier l'article" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo index d93b8e92b..3079d1c77 100644 Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po index 0ba9105ae..014e79d0a 100644 --- a/locale/hu_HU/LC_MESSAGES/messages.po +++ b/locale/hu_HU/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 14:09+0400\n" +"POT-Creation-Date: 2010-09-11 12:07+0400\n" "PO-Revision-Date: 2009-08-17 23:04+0100\n" "Last-Translator: MoJo2009\n" "Language-Team: HUNGARIAN\n" @@ -17,100 +17,123 @@ msgstr "" "X-Poedit-Language: Hungarian\n" "X-Poedit-Country: HUNGARY\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "Alapértelmezett beállítás" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "Sose töröld a régi híreket" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "1 hetes" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "2 hetes" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "1 hónapos" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "2 hónapos" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "3 hónapos" -#: backend.php:116 +#: backend.php:122 msgid "Default interval" msgstr "Frissítési intervallum:" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Frissítések kikapcsolása" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Minden 15 percben" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "Minden 30 percben" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "Óránként" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Minden 4 órában" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Minden 12 órában" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Napi" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Heti" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "Alapértelmezett" -#: backend.php:138 +#: backend.php:144 msgid "Magpie" msgstr "Magpie" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "SimplePie" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Felhasználó" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "Kiemelt felhasználó" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Adminisztrátor" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "Hírek maximális száma" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Üdv," + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Kijelentkezés" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "Vissza az RSS-olvasóhoz" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Hírcsatornák" + +#: digest.php:94 +msgid "headlines" +msgstr "" + #: errors.php:3 msgid "Unknown error" msgstr "Ismeretlen hiba" @@ -188,174 +211,174 @@ msgstr "" msgid "Incorrect username or password" msgstr "Hibás felhasználói név vagy jelszó" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Összes hírcsatorna" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Kategorizálatlan" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Kiemelt" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "Címkék" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "Csillagos hírek" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "Publikált hírek" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "Friss hírek" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 msgid "All articles" msgstr "Az összes hír" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "Tárolt hírek" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "Generált hírcsatorna" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Kiválaszt:" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "Mind" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Olvasatlan" -#: functions.php:4220 +#: functions.php:4225 msgid "Invert" msgstr "Fordított" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Kijelölés törlése" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Műveletek" -#: functions.php:4235 +#: functions.php:4240 msgid "Selection toggle:" msgstr "Kiválasztott legyen:" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Csillagos" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Publikált" -#: functions.php:4239 +#: functions.php:4244 msgid "Selection:" msgstr "Kiválasztott hírcsatornák:" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Olvasottá tesz" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "" -#: functions.php:4248 +#: functions.php:4253 #, fuzzy msgid "Move back" msgstr "Vissza" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "Alapértelmezett" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "Besorolás címke alá:" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "Kattintson ide a kategória összecsukásához" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "Nincs megjelenítendő hírcsatorna." -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Címkék" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "audio/mpeg" -#: functions.php:4807 +#: functions.php:4812 msgid " - " msgstr "-" -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "Címkék hozzáadása a hírhez" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "Hírösszefoglaló megjelenítése új ablakban." -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 msgid "Publish article with a note" msgstr "Hír publikálása megjegyzéssel" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Hírcsatorna" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 msgid "unknown type" msgstr "ismeretlen hírcsatornatípus" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "Csatolmány:" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "Csatolmányok:" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -364,41 +387,41 @@ msgstr "Csatolmányok:" msgid "Close this window" msgstr "Ablak bezárása" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "Hírcsatorna nem található" -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." msgstr "" -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 msgid "mark as read" msgstr "olvasottként jelöl" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 msgid "Click to expand article" msgstr "Hír kinyitása" -#: functions.php:5599 +#: functions.php:5604 msgid "toggle unread" msgstr "olvasatlanná tesz" -#: functions.php:5618 +#: functions.php:5623 msgid "No unread articles found to display." msgstr "Nincs megjeleníthető olvasatlan hír." -#: functions.php:5621 +#: functions.php:5626 msgid "No updated articles found to display." msgstr "Nincs megjeleníthető friss hír." -#: functions.php:5624 +#: functions.php:5629 msgid "No starred articles found to display." msgstr "Nincs megjeleníthető csillagos hír." -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -407,7 +430,7 @@ msgstr "" "Címkék alá híreket besorolhat manuálisan (lásd a fenti Műveletek menüt) vagy " "a besoroláshoz használhat Szűrőket." -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 msgid "No articles found to display." msgstr "Nincs megjeleníthető hír." @@ -456,7 +479,8 @@ msgstr "Hír szűrése" msgid "Set starred" msgstr "Csillagoz" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "Hír publikálása" @@ -810,19 +834,10 @@ msgstr "" "\t\telengedhetetlen a program működéséhez.\n" "\t\tKérem ellenőrizze böngészőbeállításait, és engedélyezze a Javascriptet!" -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Üdv," - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Kilépés a beállításokból" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Kijelentkezés" - #: prefs.php:102 msgid "Keyboard shortcuts" msgstr "Billentyűparancsok" @@ -1651,7 +1666,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 msgid "Display URL" msgstr "" @@ -1671,7 +1686,27 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "Kattintson ide az oldal hírcsatorna-olvasóként való beállításához!" +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Vissza az RSS-olvasóhoz" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "Vissza az RSS-olvasóhoz" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." @@ -1679,12 +1714,12 @@ msgstr "" "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre " "bárki feliratkozhat, aki tudja a lenti címet." -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "Csillagos hírek" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 msgid "No feeds found." msgstr "Nem található hírcsatorna." @@ -2211,78 +2246,99 @@ msgstr "Olvasottak rejtése/mutatása" msgid "Sort feeds by unread count" msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Műveletek" + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +msgid "Star article" +msgstr "Hír csillagozása" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "Csillagot levesz a hírről" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "Kérem várjon..." + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "Publikálás visszavonása" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "Szűrő hozzáadása sikertelen: nincs érvényes szűrőfeltétel." -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "" "Feliratkozás hírcsatornára sikertelen: nincs megadva a hírcsatorna URL címe." -#: functions.js:1354 +#: functions.js:1371 msgid "Subscribing to feed..." msgstr "Feliratkozás a hírcsatornára..." -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "Feliratkozva a következő hírcsatornákra:" -#: functions.js:1386 +#: functions.js:1403 #, fuzzy msgid "Can't subscribe to the specified URL." msgstr "" "Feliratkozás hírcsatornára sikertelen: nincs megadva a hírcsatorna URL címe." -#: functions.js:1389 +#: functions.js:1406 #, fuzzy msgid "You are already subscribed to this feed." msgstr "Ebből a kategóriából nem ." -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "Feliratkozva a következő hírcsatornákra:" -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "Nincs kiválasztott hírcsatorna." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." msgstr "" -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "Tárolt adatok eltávolítása." -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "Válasszon egy hírcsatornát." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "Adja meg címke nevét:" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "Címke létrehozása sikertelen: nincs megadva név." -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "Leiratkozik innen: %s?" @@ -2551,22 +2607,6 @@ msgstr "" msgid "Rescore articles in %s?" msgstr "" -#: viewfeed.js:528 viewfeed.js:592 -msgid "Star article" -msgstr "Hír csillagozása" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "Csillagot levesz a hírről" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "Kérem várjon..." - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "Publikálás visszavonása" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo index 1a3f9dd60..9585d1dc1 100644 Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po index 07f24271e..4a984a494 100644 --- a/locale/it_IT/LC_MESSAGES/messages.po +++ b/locale/it_IT/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ttrss-1.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 14:09+0400\n" +"POT-Creation-Date: 2010-09-11 12:07+0400\n" "PO-Revision-Date: 2010-04-19 16:36+0200\n" "Last-Translator: Andrea Zagli \n" "Language-Team: Italian \n" @@ -14,99 +14,123 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "Utilizza predefiniti" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "Non pulire mai" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "Vecchi di 1 settimana" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "Vecchi di 2 settimane" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "Vecchi di 1 mese" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "Vecchi di 2 mesi" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "Vecchi di 3 mesi" -#: backend.php:116 +#: backend.php:122 msgid "Default interval" msgstr "Intervallo predefinito" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Disabilitare aggiornamenti" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Ogni 15 minuti" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "Ogni 30 minuti" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "A ogni ora" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Ogni 4 ore" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Ogni 12 ore" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Giornalmente" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Settimanalmente" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "Predefinito" -#: backend.php:138 +#: backend.php:144 msgid "Magpie" msgstr "Magpie" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "SimplePie" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Utente" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "Utente con più autorizzazioni" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Amministratore" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 msgid "Default profile" msgstr "Profilo predefinito" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Salve," + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Esci" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "Ritorna a Tiny Tiny RSS" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Notiziari" + +#: digest.php:94 +#, fuzzy +msgid "headlines" +msgstr "Ultimi sommari:" + #: errors.php:3 msgid "Unknown error" msgstr "Errore sconosciuto" @@ -190,170 +214,170 @@ msgstr "La validazione della sessione è fallita (IP non corretto)" msgid "Incorrect username or password" msgstr "Nome utente o password sbagliati" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Tutti i notiziari" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Senza categoria" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Speciale" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "Etichette" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "Articoli con stella" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "Articoli pubblicati" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "Articoli nuovi" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 msgid "All articles" msgstr "Tutti gli articoli" -#: functions.php:3102 +#: functions.php:3104 msgid "Archived articles" msgstr "Articoli archiviati" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "Notiziario generato" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Seleziona:" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "Tutti" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Non letti" -#: functions.php:4220 +#: functions.php:4225 msgid "Invert" msgstr "Inverti" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Nessuno" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Azioni..." -#: functions.php:4235 +#: functions.php:4240 msgid "Selection toggle:" msgstr "Inverti selezione:" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Con stella" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Pubblicati" -#: functions.php:4239 +#: functions.php:4244 msgid "Selection:" msgstr "Selezione:" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Segna come letto" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "Archivio" -#: functions.php:4248 +#: functions.php:4253 msgid "Move back" msgstr "Sposta indietro" -#: functions.php:4249 +#: functions.php:4254 msgid "Delete" msgstr "Elimina" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "Assegna etichetta:" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "Fare clic per contrarre la categoria" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "Nessun notiziario da visualizzare." -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Etichette" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "audio/mpeg" -#: functions.php:4807 +#: functions.php:4812 msgid " - " msgstr " - " -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "Modifica le etichette per questo articolo" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "Mostra il sommario dell'articolo in una nuova finestra" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 msgid "Publish article with a note" msgstr "Pubblica articolo con una nota" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "Originariamente da:" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 msgid "Feed URL" msgstr "URL del notiziario" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 msgid "unknown type" msgstr "tipo sconosciuto" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "Allegato:" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "Allegati:" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -362,11 +386,11 @@ msgstr "Allegati:" msgid "Close this window" msgstr "Chiudi questa finestra" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "Notiziario non trovato." -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." @@ -374,31 +398,31 @@ msgstr "" "Impossibile visualizzare il notiziario (interrogazione fallita). Controllare " "che l'etichetta corrisponda alla sintassi o la configurazione locale." -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 msgid "mark as read" msgstr "segna come letto" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 msgid "Click to expand article" msgstr "Fare clic per espandere l'articolo" -#: functions.php:5599 +#: functions.php:5604 msgid "toggle unread" msgstr "inverti non letti" -#: functions.php:5618 +#: functions.php:5623 msgid "No unread articles found to display." msgstr "Nessun articolo non letto trovato da visualizzare." -#: functions.php:5621 +#: functions.php:5626 msgid "No updated articles found to display." msgstr "Nessun articolo non aggiornato trovato da visualizzare." -#: functions.php:5624 +#: functions.php:5629 msgid "No starred articles found to display." msgstr "Nessun articolo con stella trovato da visualizzare." -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -407,7 +431,7 @@ msgstr "" "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un " "filtro." -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 msgid "No articles found to display." msgstr "Nessun articolo trovato da visualizzare." @@ -456,7 +480,8 @@ msgstr "Filtra articoli" msgid "Set starred" msgstr "Imposta con stella" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "Pubblica articolo" @@ -817,19 +842,10 @@ msgstr "" "\t\tda questa applicazione per funzionare correttamente. Controllare\n" "\t\tle impostazioni del browser." -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Salve," - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Esci dalle preferenze" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Esci" - #: prefs.php:102 msgid "Keyboard shortcuts" msgstr "Scorciatoie da tastiera" @@ -1638,7 +1654,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 msgid "Display URL" msgstr "Visualizza URL" @@ -1658,7 +1674,27 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "Fare clic qui per registrare questo sito come lettore di notiziari." +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Ritorna a Tiny Tiny RSS" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "Ritorna a Tiny Tiny RSS" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." @@ -1667,12 +1703,12 @@ msgstr "" "possono essere sottoscritti da chiunque conosca l'URL specificato qui " "sotto." -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, php-format msgid "%d archived articles" msgstr "%d articoli archiviati" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 msgid "No feeds found." msgstr "Nessun notiziario trovato." @@ -2209,47 +2245,68 @@ msgstr "Nascondi notiziari letti" msgid "Sort feeds by unread count" msgstr "Ordinare i notiziari per numero di non letti" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Altre azioni..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +msgid "Star article" +msgstr "Metti la stella all'articolo" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "Togli la stella all'articolo" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "Attendere prego..." + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "Non pubblicare articolo" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "Impossibile aggiungere il filtro: niente a cui corrisponda." -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "" "Impossibile annullare la sottoscrizione: nessun URL di notiziario è stato " "dato." -#: functions.js:1354 +#: functions.js:1371 msgid "Subscribing to feed..." msgstr "Sottoscrizione al notiziario..." -#: functions.js:1377 +#: functions.js:1394 msgid "Subscribed to %s" msgstr "Sottoscrizione effettuata a «%s»" -#: functions.js:1386 +#: functions.js:1403 msgid "Can't subscribe to the specified URL." msgstr "Impossibile sottoscrivere l'URL specificato." -#: functions.js:1389 +#: functions.js:1406 msgid "You are already subscribed to this feed." msgstr "La sottoscrizione a questo notiziario è già stata effettuata." -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "" "Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)" -#: functions.js:1989 +#: functions.js:2004 msgid "Subscribed to %d feed(s)." msgstr "Sottoscrizione effettuata a %d notiziari." -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "Nessun notiziario selezionato." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." @@ -2257,27 +2314,27 @@ msgstr "" "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli " "archiviati non saranno rimossi." -#: functions.js:2066 +#: functions.js:2081 msgid "Remove stored feed icon?" msgstr "Rimuovi le icone salvate dei notiziari?" -#: functions.js:2098 +#: functions.js:2113 msgid "Please select an image file to upload." msgstr "Selezionare un file immagine da caricare." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "Caricare una nuova icona per questo notiziario?" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "Inserire l'intestazione dell'etichetta:" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "Impossibile creare l'etichetta: intestazione mancante." -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "Annullare la sottoscrizione a «%s»?" @@ -2545,22 +2602,6 @@ msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari." msgid "Rescore articles in %s?" msgstr "Cambiare il punteggio degli articoli in «%s»?" -#: viewfeed.js:528 viewfeed.js:592 -msgid "Star article" -msgstr "Metti la stella all'articolo" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "Togli la stella all'articolo" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "Attendere prego..." - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "Non pubblicare articolo" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." @@ -2648,9 +2689,6 @@ msgstr "Inserire una nota per questo articolo:" #~ msgid "Last updated:" #~ msgstr "Ultimo aggiornamento:" -#~ msgid "Last headlines:" -#~ msgstr "Ultimi sommari:" - #~ msgid "" #~ "Feed browser cache information is missing. Please refer to the \n" "Language-Team: Norwegian Bokmål \n" @@ -15,100 +15,124 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "Bruk standard" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "Slett aldri" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "1 uke gammel" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "2 uker gammel" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "1 måned gammel" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "2 måneder gammel" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "3 måneder gammel" -#: backend.php:116 +#: backend.php:122 msgid "Default interval" msgstr "Standard intervall:" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Slå av oppdateringer" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Hvert 15. minutt" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "Hvert 30. minutt" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "På timen" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Hver 4. time" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Hver 12. time" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Daglig" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Ukentlig" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "Standard" -#: backend.php:138 +#: backend.php:144 msgid "Magpie" msgstr "Magpie" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "SimplePie" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Bruker" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "Superbruker" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Administrator" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "Standard artikkelbegrensning" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Hei, " + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Logg ut" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "Returner til Tiny Tiny RSS" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Nyhetsstrømmer" + +#: digest.php:94 +#, fuzzy +msgid "headlines" +msgstr "Siste artikler:" + #: errors.php:3 msgid "Unknown error" msgstr "Ukjent feil" @@ -191,174 +215,174 @@ msgstr "Sesjonen kunne ikke valideres (feil IP)" msgid "Incorrect username or password" msgstr "Feil brukernavn og/eller passord" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Alle Nyhetsstrømmer" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Ukategorisert" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Snarveier" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "Merkelapper" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "Favorittartikler" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "Publiserte artikler" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "Ferske artikler" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 msgid "All articles" msgstr "Alle artikler" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "Lagrede artikler" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "Generert nyhetsstrøm" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Velg:" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "Alle" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Ulest" -#: functions.php:4220 +#: functions.php:4225 msgid "Invert" msgstr "Motsatt" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Ingen" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Handlinger..." -#: functions.php:4235 +#: functions.php:4240 msgid "Selection toggle:" msgstr "Marker utvalg:" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Favoritter" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Publisert" -#: functions.php:4239 +#: functions.php:4244 msgid "Selection:" msgstr "Utvalg:" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Marker som lest" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "" -#: functions.php:4248 +#: functions.php:4253 #, fuzzy msgid "Move back" msgstr "Gå tilbake" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "Standard" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "Tildel stikkord:" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "Velg for å slå sammen kategorien" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "Ingen nyhetstrømmer å vise" -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Stikkord" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "Lyd/mpeg" -#: functions.php:4807 +#: functions.php:4812 msgid " - " msgstr "-" -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "Rediger stikkordene for denne artikkelen" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "Åpne artikkelsammendraget i nytt nettleservindu" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 msgid "Publish article with a note" msgstr "Publiser artikelen med notat" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Nyhetsstrøm" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 msgid "unknown type" msgstr "Ukjent type" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "Vedlegg:" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "Vedlegg:" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -367,11 +391,11 @@ msgstr "Vedlegg:" msgid "Close this window" msgstr "Lukk dette vinduet" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "Nyhetsstrømmen ble ikke funnet" -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." @@ -379,31 +403,31 @@ msgstr "" "Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk " "merkelappsyntaksen eller lokal konfigurasjon." -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 msgid "mark as read" msgstr "marker som lest" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 msgid "Click to expand article" msgstr "Trykk for å utvide artikkel" -#: functions.php:5599 +#: functions.php:5604 msgid "toggle unread" msgstr "sett som ulest" -#: functions.php:5618 +#: functions.php:5623 msgid "No unread articles found to display." msgstr "Ingen uleste artikler funnet som kunne vises" -#: functions.php:5621 +#: functions.php:5626 msgid "No updated articles found to display." msgstr "Ingen oppdaterte artikler funnet som kunne vises" -#: functions.php:5624 +#: functions.php:5629 msgid "No starred articles found to display." msgstr "Ingen markerte artikler som kan vises" -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -411,7 +435,7 @@ msgstr "" "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-" "menyen ovenfor) eller bruke et filter." -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 msgid "No articles found to display." msgstr "Ingen artikler funnet som kan vises" @@ -460,7 +484,8 @@ msgstr "Filtrer artikkel" msgid "Set starred" msgstr "Sett som favorittartikkel" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "Publiser artiklen" @@ -816,19 +841,10 @@ msgstr "" "\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n" "\t\tnettlesers instillinger." -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Hei, " - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Forlat innstillinger" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Logg ut" - #: prefs.php:102 msgid "Keyboard shortcuts" msgstr "Tastatursnarveier" @@ -1659,7 +1675,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 #, fuzzy msgid "Display URL" msgstr "Vis stikkord" @@ -1680,7 +1696,27 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser" +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Returner til Tiny Tiny RSS" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "Returner til Tiny Tiny RSS" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." @@ -1688,12 +1724,12 @@ msgstr "" "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og " "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor." -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "Favorittartikler" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 msgid "No feeds found." msgstr "Ingen nyhetsstrømmer ble funnet." @@ -2235,76 +2271,97 @@ msgstr "Skjul/vis leste nyhetsstrømmer" msgid "Sort feeds by unread count" msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Handlinger..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +msgid "Star article" +msgstr "Marker artikkel som favoritt" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "Fjern favorittmerkingen fra artiklen" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "Vennligst vent..." + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "Fjern publiseringen av artikkelen." + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "Kan ikke legge til filter, ingen match på kriteriene" -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt" -#: functions.js:1354 +#: functions.js:1371 msgid "Subscribing to feed..." msgstr "Abonnerer på nyhetsstrømmen..." -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "Abonnerer på følgende nyhetsstrømmer:" -#: functions.js:1386 +#: functions.js:1403 #, fuzzy msgid "Can't subscribe to the specified URL." msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt" -#: functions.js:1389 +#: functions.js:1406 #, fuzzy msgid "You are already subscribed to this feed." msgstr "Du kan ikke fjerne abonnement fra kategorien." -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "Abonnerer på følgende nyhetsstrømmer:" -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "Ingen nyhetsstrømmer er valgt" -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." msgstr "" -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "Fjern lagrede data" -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "Vennligst velg en nyhetsstrøm" -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "Vennligst skriv inn merkelappstekst:" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "Kan ikke skape merkelapp, mangler overskrift." -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "Fjerne abonnement på %s?" @@ -2566,22 +2623,6 @@ msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal" msgid "Rescore articles in %s?" msgstr "Endre poengene for artiklene i %s?" -#: viewfeed.js:528 viewfeed.js:592 -msgid "Star article" -msgstr "Marker artikkel som favoritt" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "Fjern favorittmerkingen fra artiklen" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "Vennligst vent..." - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "Fjern publiseringen av artikkelen." - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." @@ -3129,9 +3170,6 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:" #~ msgid "Last updated:" #~ msgstr "Siste oppdatering:" -#~ msgid "Last headlines:" -#~ msgstr "Siste artikler:" - #~ msgid "Other feeds: Top 25" #~ msgstr "Andre nyhetsstrømmer: Topp 25" diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo index a2d561267..385601b37 100644 Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index c281bd661..424736a01 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tt-rss 1.2.14.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 14:09+0400\n" +"POT-Creation-Date: 2010-09-11 12:07+0400\n" "PO-Revision-Date: 2007-10-24 00:47-0200\n" "Last-Translator: Marcelo Jorge VIeira (metal) \n" "Language-Team: Portuguese/Brazil\n" @@ -16,102 +16,124 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "Usar o padrão" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "Nunca remover" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "1 semana atrás" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "2 semanas atrás" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "1 mês atrás" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "2 meses atrás" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "3 meses atrás" -#: backend.php:116 +#: backend.php:122 #, fuzzy msgid "Default interval" msgstr "Padrão" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Desabilitar updates" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Cada 15 minutos" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "Cada 30 minutos" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "Toda hora" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Cada 4 horas" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Cada 12 horas" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Diariamente" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Semanalmente" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "Padrão" -#: backend.php:138 +#: backend.php:144 #, fuzzy msgid "Magpie" msgstr "Página" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Usuário" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Administrador" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "Padrão" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Olá," + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Sair" + +#: digest.php:67 +msgid "Tiny Tiny RSS" +msgstr "" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Feed" + +#: digest.php:94 +msgid "headlines" +msgstr "" + #: errors.php:3 msgid "Unknown error" msgstr "Erro desconhecido" @@ -184,179 +206,179 @@ msgstr "" msgid "Incorrect username or password" msgstr "" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Todos os feeds" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Não Categorizado" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Especial" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 #, fuzzy msgid "All articles" msgstr "Favoritos" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "Favoritos" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Selecione:" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "Todos" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Não Lido" -#: functions.php:4220 +#: functions.php:4225 #, fuzzy msgid "Invert" msgstr "(Inverso)" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Nenhum" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Ações..." -#: functions.php:4235 +#: functions.php:4240 #, fuzzy msgid "Selection toggle:" msgstr "Seleção" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Favoritos" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Publicado" -#: functions.php:4239 +#: functions.php:4244 #, fuzzy msgid "Selection:" msgstr "Seleção" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Marcar como lido" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "" -#: functions.php:4248 +#: functions.php:4253 msgid "Move back" msgstr "" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "Padrão" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "Sem Feeds para exibir." -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Tags" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "" -#: functions.php:4807 +#: functions.php:4812 #, fuzzy msgid " - " msgstr " - por " -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 msgid "Publish article with a note" msgstr "" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Feed" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 #, fuzzy msgid "unknown type" msgstr "Erro desconhecido" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -365,53 +387,53 @@ msgstr "" msgid "Close this window" msgstr "Fechar esta janela" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "Feed não encontrado." -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." msgstr "" -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 #, fuzzy msgid "mark as read" msgstr "Marcar como lido" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 #, fuzzy msgid "Click to expand article" msgstr "Favoritos" -#: functions.php:5599 +#: functions.php:5604 #, fuzzy msgid "toggle unread" msgstr "Marcar como favorito" -#: functions.php:5618 +#: functions.php:5623 #, fuzzy msgid "No unread articles found to display." msgstr "Sem Feeds para exibir." -#: functions.php:5621 +#: functions.php:5626 #, fuzzy msgid "No updated articles found to display." msgstr "Sem Feeds para exibir." -#: functions.php:5624 +#: functions.php:5629 #, fuzzy msgid "No starred articles found to display." msgstr "Sem Feeds para exibir." -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." msgstr "" -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 #, fuzzy msgid "No articles found to display." msgstr "Sem Feeds para exibir." @@ -463,7 +485,8 @@ msgstr "" msgid "Set starred" msgstr "Marcar como favorito" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "" @@ -788,19 +811,10 @@ msgid "" "\t\tbrowser settings." msgstr "" -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Olá," - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Sair das preferências" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Sair" - #: prefs.php:102 #, fuzzy msgid "Keyboard shortcuts" @@ -1634,7 +1648,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 msgid "Display URL" msgstr "" @@ -1652,18 +1666,37 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "" +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Removendo o Feed..." + +#: modules/pref-feeds.php:1514 +msgid "Subscribe in Tiny Tiny RSS" +msgstr "" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." msgstr "" -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "Favoritos" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 #, fuzzy msgid "No feeds found." msgstr "Sem Feeds para exibir." @@ -2224,75 +2257,97 @@ msgstr "Favoritos" msgid "Sort feeds by unread count" msgstr "" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Ações..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +#, fuzzy +msgid "Star article" +msgstr "Favoritos" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "" + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "" -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "" -#: functions.js:1354 +#: functions.js:1371 #, fuzzy msgid "Subscribing to feed..." msgstr "Removendo o Feed..." -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "Removendo o Feed..." -#: functions.js:1386 +#: functions.js:1403 msgid "Can't subscribe to the specified URL." msgstr "" -#: functions.js:1389 +#: functions.js:1406 msgid "You are already subscribed to this feed." msgstr "" -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "Removendo o Feed..." -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "Nenhum feed foi selecionado." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." msgstr "" -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "Remover as categorias selecionadas?" -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "Por favor selecione um feed." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "" -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "" @@ -2561,23 +2616,6 @@ msgstr "" msgid "Rescore articles in %s?" msgstr "Favoritos" -#: viewfeed.js:528 viewfeed.js:592 -#, fuzzy -msgid "Star article" -msgstr "Favoritos" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "" - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index b4d5eea6b..422cc3c32 100644 Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 998f512ce..7be489d7b 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 14:09+0400\n" +"POT-Creation-Date: 2010-09-11 12:07+0400\n" "PO-Revision-Date: 2009-05-29 14:38+0300\n" "Last-Translator: Max Kamashev \n" "Language-Team: Русский \n" @@ -21,100 +21,124 @@ msgstr "" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-SourceCharset: utf-8\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "По умолчанию" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "Никогда" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "Неделя" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "Две недели" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "Один месяц" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "Два месяца" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "Три месяца" -#: backend.php:116 +#: backend.php:122 msgid "Default interval" msgstr "Интервал обновления:" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "Не обновлять" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "Каждые 15 минут" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "Каждые 30 минут" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "Каждый час" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "Каждые 4 часа" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "Каждые 12 часов" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "Раз в день" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "Раз в неделю" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "По умолчанию" -#: backend.php:138 +#: backend.php:144 msgid "Magpie" msgstr "Magpie" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "SimplePie" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "Пользователь" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "Активный пользователь" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "Администратор" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "Количество статей по умолчанию" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Привет," + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Выход" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "Вернуться к Tiny Tiny RSS" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Каналы" + +#: digest.php:94 +#, fuzzy +msgid "headlines" +msgstr "Последние заголовки:" + #: errors.php:3 msgid "Unknown error" msgstr "Неизвестная ошибка" @@ -195,174 +219,174 @@ msgstr "Ошибка проверки сессии (некорректный IP) msgid "Incorrect username or password" msgstr "Некорректное имя пользователя или пароль" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "Все каналы" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "Нет категории" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "Особые" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "Метки" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "Отмеченные" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "Опубликованные" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 msgid "Fresh articles" msgstr "Свежие" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 msgid "All articles" msgstr "Все статьи" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "Сохранённые статьи" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "Генерировать канал" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "Выбрать:" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "Все" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "Новые" -#: functions.php:4220 +#: functions.php:4225 msgid "Invert" msgstr "Инвертировать" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "Ничего" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "Действия..." -#: functions.php:4235 +#: functions.php:4240 msgid "Selection toggle:" msgstr "Переключить выбранное:" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "Отмеченные" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "Опубликован" -#: functions.php:4239 +#: functions.php:4244 msgid "Selection:" msgstr "Выбрано:" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "Как прочитанные" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "" -#: functions.php:4248 +#: functions.php:4253 #, fuzzy msgid "Move back" msgstr "Идти назад" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "По умолчанию" -#: functions.php:4254 +#: functions.php:4259 msgid "Assign label:" msgstr "Применить метку:" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "Щёлкните, чтобы развернуть категорию" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "Нет каналов для отображения." -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "Теги" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "audio/mpeg" -#: functions.php:4807 +#: functions.php:4812 msgid " - " msgstr " - " -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "Редактировать теги статьи" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 msgid "Show article summary in new window" msgstr "Показать детали статьи в новом окне" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 msgid "Publish article with a note" msgstr "Опубликовать статью с заметкой" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Канал" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 msgid "unknown type" msgstr "Неизвестный тип" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "Вложение:" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "Вложения:" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -371,11 +395,11 @@ msgstr "Вложения:" msgid "Close this window" msgstr "Закрыть это окно" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "Канал не найден." -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." @@ -383,31 +407,31 @@ msgstr "" "Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис " "или локальную конфигурацию." -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 msgid "mark as read" msgstr "Отметить как прочитанные" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 msgid "Click to expand article" msgstr "Щёлкните чтобы развернуть статью" -#: functions.php:5599 +#: functions.php:5604 msgid "toggle unread" msgstr "переключить непрочитанные" -#: functions.php:5618 +#: functions.php:5623 msgid "No unread articles found to display." msgstr "Не найдено не прочитанных статей" -#: functions.php:5621 +#: functions.php:5626 msgid "No updated articles found to display." msgstr "Не найдено не прочитанных статей." -#: functions.php:5624 +#: functions.php:5629 msgid "No starred articles found to display." msgstr "Не найдено отмеченных статей" -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -415,7 +439,7 @@ msgstr "" "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню " "Действия) или используйте фильтр." -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 msgid "No articles found to display." msgstr "Статей не найдено." @@ -464,7 +488,8 @@ msgstr "Отфильтровать статью" msgid "Set starred" msgstr "Отметить" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "Опубликовать" @@ -814,19 +839,10 @@ msgstr "" "\t\tдля функционала этой программы. Пожалуйста, проверьте\n" "\t\tнастройки вашего браузера." -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Привет," - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Закрыть настройки" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Выход" - #: prefs.php:102 msgid "Keyboard shortcuts" msgstr "Горячие Клавиши" @@ -1655,7 +1671,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 #, fuzzy msgid "Display URL" msgstr "показать теги" @@ -1676,7 +1692,27 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора" +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "Вернуться к Tiny Tiny RSS" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "Вернуться к Tiny Tiny RSS" + +#: modules/pref-feeds.php:1522 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." @@ -1684,12 +1720,12 @@ msgstr "" "Опубликованные статьи экспортируется в качестве общего RSS канала и могут " "быть подписаны кем-либо ещё, кто знает URL, указанный ниже." -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "Отмеченные" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 msgid "No feeds found." msgstr "Каналы не найдены." @@ -2229,76 +2265,97 @@ msgstr "  Показать/скрыть прочитанные" msgid "Sort feeds by unread count" msgstr "Сортировать каналы по количеству непрочитанных статей" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "Действия..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +msgid "Star article" +msgstr "Отмеченные" + +#: digest.js:371 viewfeed.js:577 +msgid "Unstar article" +msgstr "Не отмеченные" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "Пожалуйста, подождите..." + +#: digest.js:412 viewfeed.js:648 +msgid "Unpublish article" +msgstr "Не публиковать" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "Не могу добавить фильтр: нет соответствия." -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "Не могу подписаться: нет URL" -#: functions.js:1354 +#: functions.js:1371 msgid "Subscribing to feed..." msgstr "Подписаться на канал..." -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "Подписаны каналы:" -#: functions.js:1386 +#: functions.js:1403 #, fuzzy msgid "Can't subscribe to the specified URL." msgstr "Не могу подписаться: нет URL" -#: functions.js:1389 +#: functions.js:1406 #, fuzzy msgid "You are already subscribed to this feed." msgstr "Нельзя отписаться от категории." -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "Подписаны каналы:" -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "Нет выбранных каналов." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." msgstr "" -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "Удалить сохранённые данные" -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "Пожалуйста выберите только один канал." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "" -#: functions.js:2117 +#: functions.js:2132 msgid "Please enter label caption:" msgstr "Пожалуйста, введите заголовок метки:" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "Не могу создать метку: отсутствует заголовок." -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "Отписаться от %s?" @@ -2560,22 +2617,6 @@ msgstr "Вы не можете снова оценить этот канал." msgid "Rescore articles in %s?" msgstr "Установить оценку статьям в %s?" -#: viewfeed.js:528 viewfeed.js:592 -msgid "Star article" -msgstr "Отмеченные" - -#: viewfeed.js:577 -msgid "Unstar article" -msgstr "Не отмеченные" - -#: viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "Пожалуйста, подождите..." - -#: viewfeed.js:648 -msgid "Unpublish article" -msgstr "Не публиковать" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." @@ -3128,9 +3169,6 @@ msgstr "Пожалуйста, укажите заметку для статьи: #~ msgid "Last updated:" #~ msgstr "Последнее обновление" -#~ msgid "Last headlines:" -#~ msgstr "Последние заголовки:" - #, fuzzy #~ msgid "" #~ "Feed browser cache information is missing. Please refer to the \n" "Language-Team: hicode.org \n" @@ -12,102 +12,126 @@ msgstr "" "X-Poedit-Country: china\n" "X-Poedit-SourceCharset: utf-8\n" -#: backend.php:107 +#: backend.php:113 msgid "Use default" msgstr "用户默认" -#: backend.php:108 +#: backend.php:114 msgid "Never purge" msgstr "从未" -#: backend.php:109 +#: backend.php:115 msgid "1 week old" msgstr "1周前" -#: backend.php:110 +#: backend.php:116 msgid "2 weeks old" msgstr "2周前" -#: backend.php:111 +#: backend.php:117 msgid "1 month old" msgstr "1月前" -#: backend.php:112 +#: backend.php:118 msgid "2 months old" msgstr "2月前" -#: backend.php:113 +#: backend.php:119 msgid "3 months old" msgstr "3月前" -#: backend.php:116 +#: backend.php:122 #, fuzzy msgid "Default interval" msgstr "更新间隔:" -#: backend.php:117 backend.php:127 +#: backend.php:123 backend.php:133 msgid "Disable updates" msgstr "禁用更新" -#: backend.php:118 backend.php:128 +#: backend.php:124 backend.php:134 msgid "Each 15 minutes" msgstr "每15分钟" -#: backend.php:119 backend.php:129 +#: backend.php:125 backend.php:135 msgid "Each 30 minutes" msgstr "每30分钟" -#: backend.php:120 backend.php:130 +#: backend.php:126 backend.php:136 msgid "Hourly" msgstr "每小时" -#: backend.php:121 backend.php:131 +#: backend.php:127 backend.php:137 msgid "Each 4 hours" msgstr "每4小时" -#: backend.php:122 backend.php:132 +#: backend.php:128 backend.php:138 msgid "Each 12 hours" msgstr "每12小时" -#: backend.php:123 backend.php:133 +#: backend.php:129 backend.php:139 msgid "Daily" msgstr "每天" -#: backend.php:124 backend.php:134 +#: backend.php:130 backend.php:140 msgid "Weekly" msgstr "每周" -#: backend.php:137 tt-rss.php:225 modules/pref-prefs.php:329 +#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329 msgid "Default" msgstr "默认" -#: backend.php:138 +#: backend.php:144 #, fuzzy msgid "Magpie" msgstr "页" -#: backend.php:139 +#: backend.php:145 msgid "SimplePie" msgstr "" -#: backend.php:148 modules/pref-users.php:126 +#: backend.php:154 modules/pref-users.php:126 msgid "User" msgstr "用户" -#: backend.php:149 +#: backend.php:155 msgid "Power User" msgstr "" -#: backend.php:150 +#: backend.php:156 msgid "Administrator" msgstr "管理员" -#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61 +#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61 #: modules/popup-dialog.php:106 #, fuzzy msgid "Default profile" msgstr "默认文章限制" +#: digest.php:58 prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "你好," + +#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "注销" + +#: digest.php:67 +#, fuzzy +msgid "Tiny Tiny RSS" +msgstr "返回Tiny Tiny RSS" + +#: digest.php:88 +#, fuzzy +msgid "feeds" +msgstr "Feed" + +#: digest.php:94 +#, fuzzy +msgid "headlines" +msgstr "最新提要：" + #: errors.php:3 msgid "Unknown error" msgstr "未知错误" @@ -180,183 +204,183 @@ msgstr "" msgid "Incorrect username or password" msgstr "" -#: functions.php:2986 modules/popup-dialog.php:418 +#: functions.php:2988 modules/popup-dialog.php:418 #: modules/pref-filters.php:420 msgid "All feeds" msgstr "所有feed" -#: functions.php:3018 functions.php:3057 functions.php:4459 functions.php:4487 +#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325 msgid "Uncategorized" msgstr "未分类" -#: functions.php:3047 functions.php:3700 modules/backend-rpc.php:874 +#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874 #: mobile/functions.php:170 msgid "Special" msgstr "专用" -#: functions.php:3049 functions.php:3702 prefs.php:114 +#: functions.php:3051 functions.php:3707 prefs.php:114 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197 msgid "Labels" msgstr "标记" -#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425 +#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425 msgid "Starred articles" msgstr "星级文章" -#: functions.php:3096 modules/pref-feeds.php:1504 help/3.php:61 +#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61 msgid "Published articles" msgstr "已发布文章" -#: functions.php:3098 help/3.php:59 +#: functions.php:3100 help/3.php:59 #, fuzzy msgid "Fresh articles" msgstr "星级文章" -#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427 +#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427 #, fuzzy msgid "All articles" msgstr "所有文章" -#: functions.php:3102 +#: functions.php:3104 #, fuzzy msgid "Archived articles" msgstr "星级文章" -#: functions.php:4212 +#: functions.php:4217 msgid "Generated feed" msgstr "产生feed" -#: functions.php:4217 functions.php:5565 modules/popup-dialog.php:82 +#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82 #: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289 #: modules/pref-filters.php:377 modules/pref-labels.php:183 #: modules/pref-users.php:419 offline.js:408 msgid "Select:" msgstr "选择：" -#: functions.php:4218 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 +#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080 #: modules/pref-feeds.php:1290 modules/pref-filters.php:378 #: modules/pref-labels.php:184 modules/pref-users.php:420 msgid "All" msgstr "所有" -#: functions.php:4219 functions.php:4236 tt-rss.php:218 +#: functions.php:4224 functions.php:4241 tt-rss.php:218 msgid "Unread" msgstr "未读" -#: functions.php:4220 +#: functions.php:4225 #, fuzzy msgid "Invert" msgstr "(逆)" -#: functions.php:4221 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 +#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081 #: modules/pref-feeds.php:1291 modules/pref-filters.php:379 #: modules/pref-labels.php:185 modules/pref-users.php:421 msgid "None" msgstr "无" -#: functions.php:4229 tt-rss.php:178 offline.js:184 +#: functions.php:4234 tt-rss.php:178 offline.js:184 msgid "Actions..." msgstr "激活..." -#: functions.php:4235 +#: functions.php:4240 #, fuzzy msgid "Selection toggle:" msgstr "选择：" -#: functions.php:4237 tt-rss.php:217 +#: functions.php:4242 tt-rss.php:217 msgid "Starred" msgstr "星级" -#: functions.php:4238 +#: functions.php:4243 msgid "Published" msgstr "已发布" -#: functions.php:4239 +#: functions.php:4244 #, fuzzy msgid "Selection:" msgstr "选择：" -#: functions.php:4240 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 +#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235 msgid "Mark as read" msgstr "标记为已读" -#: functions.php:4246 +#: functions.php:4251 msgid "Archive" msgstr "" -#: functions.php:4248 +#: functions.php:4253 msgid "Move back" msgstr "" -#: functions.php:4249 +#: functions.php:4254 #, fuzzy msgid "Delete" msgstr "默认" -#: functions.php:4254 +#: functions.php:4259 #, fuzzy msgid "Assign label:" msgstr "指定标签" -#: functions.php:4295 +#: functions.php:4300 msgid "Click to collapse category" msgstr "" -#: functions.php:4505 +#: functions.php:4510 msgid "No feeds to display." msgstr "无feed显示。" -#: functions.php:4522 +#: functions.php:4527 msgid "Tags" msgstr "标签" -#: functions.php:4681 +#: functions.php:4686 msgid "audio/mpeg" msgstr "" -#: functions.php:4807 +#: functions.php:4812 #, fuzzy msgid " - " msgstr ", 由 - " -#: functions.php:4832 functions.php:5592 +#: functions.php:4837 functions.php:5597 msgid "Edit tags for this article" msgstr "" -#: functions.php:4838 functions.php:5575 +#: functions.php:4843 functions.php:5580 #, fuzzy msgid "Show article summary in new window" msgstr "新窗口打开文章连结" -#: functions.php:4845 functions.php:5582 +#: functions.php:4850 functions.php:5587 #, fuzzy msgid "Publish article with a note" msgstr "发布文章" -#: functions.php:4862 functions.php:5453 +#: functions.php:4867 functions.php:5458 msgid "Originally from:" msgstr "" -#: functions.php:4875 functions.php:5466 +#: functions.php:4880 functions.php:5471 #, fuzzy msgid "Feed URL" msgstr "Feed" -#: functions.php:4915 functions.php:5496 +#: functions.php:4920 functions.php:5501 #, fuzzy msgid "unknown type" msgstr "未知错误" -#: functions.php:4955 functions.php:5539 +#: functions.php:4960 functions.php:5544 msgid "Attachment:" msgstr "" -#: functions.php:4957 functions.php:5541 +#: functions.php:4962 functions.php:5546 msgid "Attachments:" msgstr "" -#: functions.php:4977 prefs.php:142 tt-rss.php:101 modules/help.php:21 +#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602 @@ -365,53 +389,53 @@ msgstr "" msgid "Close this window" msgstr "关闭此窗口" -#: functions.php:5033 +#: functions.php:5038 msgid "Feed not found." msgstr "未找到Feed." -#: functions.php:5102 +#: functions.php:5107 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置." -#: functions.php:5266 functions.php:5353 +#: functions.php:5271 functions.php:5358 #, fuzzy msgid "mark as read" msgstr "标记为已读" -#: functions.php:5429 functions.php:5436 +#: functions.php:5434 functions.php:5441 #, fuzzy msgid "Click to expand article" msgstr "星级文章" -#: functions.php:5599 +#: functions.php:5604 #, fuzzy msgid "toggle unread" msgstr "触发开关" -#: functions.php:5618 +#: functions.php:5623 #, fuzzy msgid "No unread articles found to display." msgstr "未找到文章。" -#: functions.php:5621 +#: functions.php:5626 #, fuzzy msgid "No updated articles found to display." msgstr "未找到文章。" -#: functions.php:5624 +#: functions.php:5629 #, fuzzy msgid "No starred articles found to display." msgstr "未找到文章。" -#: functions.php:5628 +#: functions.php:5633 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." msgstr "" -#: functions.php:5630 offline.js:443 +#: functions.php:5635 offline.js:443 #, fuzzy msgid "No articles found to display." msgstr "未找到文章。" @@ -463,7 +487,8 @@ msgstr "过滤文章" msgid "Set starred" msgstr "设置星级" -#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 +#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 +#: viewfeed.js:659 msgid "Publish article" msgstr "发布文章" @@ -795,19 +820,10 @@ msgid "" "\t\tbrowser settings." msgstr "您的浏览器不支持Javascript, 请检查设置。" -#: prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "你好," - #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "退出我的最爱" -#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "注销" - #: prefs.php:102 #, fuzzy msgid "Keyboard shortcuts" @@ -1667,7 +1683,7 @@ msgid "" "that require authentication or feeds hidden from Popular feeds." msgstr "" -#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1513 +#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525 #, fuzzy msgid "Display URL" msgstr "显示标签" @@ -1686,19 +1702,39 @@ msgstr "" msgid "Click here to register this site as a feed reader." msgstr "" +#: modules/pref-feeds.php:1504 +msgid "Subscribing via bookmarklet" +msgstr "" + +#: modules/pref-feeds.php:1506 +msgid "" +"Drag the link below to your browser toolbar, open the feed you're interested " +"in in your browser and click on the link to subscribe to it." +msgstr "" + #: modules/pref-feeds.php:1510 +#, fuzzy, php-format +msgid "Subscribe to %s in Tiny Tiny RSS?" +msgstr "返回Tiny Tiny RSS" + +#: modules/pref-feeds.php:1514 +#, fuzzy +msgid "Subscribe in Tiny Tiny RSS" +msgstr "返回Tiny Tiny RSS" + +#: modules/pref-feeds.php:1522 #, fuzzy msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the URL specified below." msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。" -#: modules/pref-feeds.php:1618 +#: modules/pref-feeds.php:1630 #, fuzzy, php-format msgid "%d archived articles" msgstr "星级文章" -#: modules/pref-feeds.php:1647 +#: modules/pref-feeds.php:1659 #, fuzzy msgid "No feeds found." msgstr "无feed可订阅。" @@ -2271,78 +2307,103 @@ msgstr "  (显示)隐藏已读feed" msgid "Sort feeds by unread count" msgstr "以未读文章数量排序feed源" -#: functions.js:1315 +#: digest.js:295 +#, fuzzy +msgid "More articles..." +msgstr "激活..." + +#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 +#, fuzzy +msgid "Star article" +msgstr "星级文章" + +#: digest.js:371 viewfeed.js:577 +#, fuzzy +msgid "Unstar article" +msgstr "星级文章" + +#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 +#, fuzzy +msgid "Please wait..." +msgstr "读取中，请等待..." + +#: digest.js:412 viewfeed.js:648 +#, fuzzy +msgid "Unpublish article" +msgstr "发布文章" + +#: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "未能添加过滤：无匹配。" -#: functions.js:1350 +#: functions.js:1367 msgid "Can't subscribe: no feed URL given." msgstr "未能订阅：无 feed URL。" -#: functions.js:1354 +#: functions.js:1371 #, fuzzy msgid "Subscribing to feed..." msgstr "订阅feed" -#: functions.js:1377 +#: functions.js:1394 #, fuzzy msgid "Subscribed to %s" msgstr "订阅feed:" -#: functions.js:1386 +#: functions.js:1403 #, fuzzy msgid "Can't subscribe to the specified URL." msgstr "未能订阅：无 feed URL。" -#: functions.js:1389 +#: functions.js:1406 #, fuzzy msgid "You are already subscribed to this feed." msgstr "您不能从分类中取消订阅。" -#: functions.js:1952 +#: functions.js:1967 msgid "New articles available in this feed (click to show)" msgstr "" -#: functions.js:1989 +#: functions.js:2004 #, fuzzy msgid "Subscribed to %d feed(s)." msgstr "订阅feed:" -#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619 +#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619 #: prefs.js:908 prefs.js:928 prefs.js:1831 msgid "No feeds are selected." msgstr "未选择feed." -#: functions.js:2014 +#: functions.js:2029 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." msgstr "" -#: functions.js:2066 +#: functions.js:2081 #, fuzzy msgid "Remove stored feed icon?" msgstr "移除选定标记?" -#: functions.js:2098 +#: functions.js:2113 #, fuzzy msgid "Please select an image file to upload." msgstr "请只选择一个feed." -#: functions.js:2100 +#: functions.js:2115 msgid "Upload new icon for this feed?" msgstr "" -#: functions.js:2117 +#: functions.js:2132 #, fuzzy msgid "Please enter label caption:" msgstr "请输入标签主题" -#: functions.js:2122 +#: functions.js:2137 msgid "Can't create label: missing caption." msgstr "创建标签失败：缺少标题。" -#: functions.js:2162 tt-rss.js:568 +#: functions.js:2177 tt-rss.js:568 msgid "Unsubscribe from %s?" msgstr "退订%s?" @@ -2621,26 +2682,6 @@ msgstr "您不能编辑本分类feed" msgid "Rescore articles in %s?" msgstr "星级文章" -#: viewfeed.js:528 viewfeed.js:592 -#, fuzzy -msgid "Star article" -msgstr "星级文章" - -#: viewfeed.js:577 -#, fuzzy -msgid "Unstar article" -msgstr "星级文章" - -#: viewfeed.js:585 viewfeed.js:652 -#, fuzzy -msgid "Please wait..." -msgstr "读取中，请等待..." - -#: viewfeed.js:648 -#, fuzzy -msgid "Unpublish article" -msgstr "发布文章" - #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." @@ -3131,9 +3172,6 @@ msgstr "请输入标签主题" #~ msgid "Last updated:" #~ msgstr "已更新" -#~ msgid "Last headlines:" -#~ msgstr "最新提要：" - #~ msgid "Other feeds: Top 25" #~ msgstr " 其他feed: Top 25" diff --git a/version.php b/version.php index a7e3ab74d..1d5059d98 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@ -- cgit v1.2.3 From d5d5632952914611c0ddf93959034aa1e7d87c21 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 11 Sep 2010 15:25:47 +0400 Subject: code cleanup --- digest.css | 5 +- digest.js | 188 +++++++++++++++++++++++++++++++++++++++------------------- digest.php | 2 +- functions.php | 1 - 4 files changed, 130 insertions(+), 66 deletions(-) diff --git a/digest.css b/digest.css index b94044f98..b500a47e7 100644 --- a/digest.css +++ b/digest.css @@ -117,6 +117,7 @@ a:hover { #feeds ul#feeds-content li { margin : 0px 0px 2px 0px; padding : 2px; + clear : both; } #feeds ul#feeds-content li.selected { @@ -181,10 +182,6 @@ a:hover { clear : left; } -#headlines ul#headlines-content li:hover { - background : #fafafa; -} - #headlines ul#headlines-content a.title { font-weight : bold; font-size : 16px; diff --git a/digest.js b/digest.js index 0e567193f..38e2224bb 100644 --- a/digest.js +++ b/digest.js @@ -4,7 +4,23 @@ var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; -function mark_selected_feed(feed_id) { +function catchup_article(article_id, callback) { + try { + var query = "?op=rpc&subop=catchupSelected" + + "&cmode=0&ids=" + article_id; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + if (callback) callback(transport); + } }); + + } catch (e) { + exception_error("catchup_article", e); + } +} + +function set_selected_feed(feed_id) { try { var feeds = $("feeds-content").getElementsByTagName("LI"); @@ -15,6 +31,8 @@ function mark_selected_feed(feed_id) { feeds[i].className = ""; } + _active_feed_id = feed_id; + } catch (e) { exception_error("mark_selected_feed", e); } @@ -36,14 +54,8 @@ function zoom(article_id) { } } - var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - window.clearTimeout(_update_timeout); - _update_timeout = window.setTimeout('update()', 1000); - } }); + catchup_article(article_id, + function() { update(); }); } catch (e) { exception_error("zoom", e); @@ -52,13 +64,6 @@ function zoom(article_id) { function load_more() { try { - var elem = $('MORE-PROMPT'); - - if (elem) { - elem.id = ''; - Element.hide(elem); - } - viewfeed(_active_feed_id, _active_feed_offset + 10); } catch (e) { exception_error("load_more", e); @@ -67,30 +72,42 @@ function load_more() { function update() { try { - viewfeed(_active_feed_id, _active_feed_offset); + console.log('updating feeds...'); + + window.clearTimeout(_update_timeout); + + new Ajax.Request("backend.php", { + parameters: "?op=rpc&subop=digest-init", + onComplete: function(transport) { + parse_feeds(transport); + set_selected_feed(_active_feed_id); + } }); + + _update_timeout = window.setTimeout('update()', 5*1000); } catch (e) { exception_error("update", e); } } -function view(article_id, dismiss_only) { +function remove_headline_entry(article_id) { try { var elem = $('A-' + article_id); - elem.id = ''; - - //new Effect.Fade(elem, {duration : 0.3}); + if (elem) { + elem.parentNode.removeChild(elem); + } - Element.hide(elem); + } catch (e) { + exception_error("remove_headline_entry", e); + } +} - var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; +function view(article_id, dismiss_only) { + try { + remove_headline_entry(article_id); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - window.clearTimeout(_update_timeout); - _update_timeout = window.setTimeout('update()', 1000); - } }); + catchup_article(article_id, + function() { update(); }); return dismiss_only != true; } catch (e) { @@ -103,23 +120,21 @@ function viewfeed(feed_id, offset) { if (!feed_id) feed_id = _active_feed_id; - if (!offset) + if (!offset) { offset = 0; - else + } else { offset = _active_feed_offset + offset; + } var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + "&offset=" + offset; - console.log(query); - new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - digest_update(transport, feed_id); - _active_feed_id = feed_id; + parse_headlines(transport, offset == 0); + set_selected_feed(feed_id); _active_feed_offset = offset; - mark_selected_feed(feed_id); } }); } catch (e) { @@ -175,6 +190,8 @@ function get_feed_icon(feed) { if (feed.id < -10) return 'images/label.png'; + return 'images/blank_icon.gif'; + } catch (e) { exception_error("get_feed_icon", e); } @@ -199,24 +216,12 @@ function add_feed_entry(feed) { } } -function add_latest_entry(article, feed) { - try { - - - //$("latest-content").innerHTML += "bbb"; - - } catch (e) { - exception_error("add_latest_entry", e); - } -} - function add_headline_entry(article, feed) { try { var icon_part = ""; - if (article.has_icon) - icon_part = ""; + icon_part = ""; var tmp_html = "
  • " + icon_part + @@ -245,7 +250,66 @@ function add_headline_entry(article, feed) { } } -function digest_update(transport, feed_id) { +function parse_feeds(transport) { + try { + + var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; + + if (feeds) { + feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + + last_feeds = feeds; + + $('feeds-content').innerHTML = ""; + + for (var i = 0; i < feeds.length; i++) { + add_feed_entry(feeds[i]); + } + } + + } catch (e) { + exception_error("parse_feeds", e); + } +} + +function parse_headlines(transport, replace) { + try { + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; + + if (headlines) { + headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + + if (replace) $('headlines-content').innerHTML = ''; + + var pr = $('MORE-PROMPT'); + + if (pr) pr.parentNode.removeChild(pr); + + for (var i = 0; i < headlines.length; i++) { + + if (!$('A-' + headlines[i].id)) { + add_headline_entry(headlines[i], + find_feed(last_feeds, headlines[i].feed_id)); + } + } + + if (pr) { + $('headlines-content').appendChild(pr); + } else { + $('headlines-content').innerHTML += "
  • " + + "
    " + + __("More articles...") + "
    • "; + } + + new Effect.Appear('headlines-content'); + } + + } catch (e) { + exception_error("parse_headlines", e); + } +} + +/*function digest_update(transport, feed_id, offset) { try { var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; @@ -267,11 +331,9 @@ function digest_update(transport, feed_id) { if (headlines) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); - if (_active_feed_id != feed_id) + if (_active_feed_id != feed_id || !offset) $('headlines-content').innerHTML = ""; - //Element.hide('headlines-content'); - var pr = $('MORE-PROMPT'); if (pr) { @@ -283,7 +345,8 @@ function digest_update(transport, feed_id) { var elem = $('A-' + headlines[i].id); if (elem && Element.visible(elem)) { - + if (!headlines[i].unread) + remove_headline_entry(headlines[i].id); } else { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); @@ -295,22 +358,30 @@ function digest_update(transport, feed_id) { __("More articles...") + "
    "; new Effect.Appear('headlines-content'); + } + if (feed_id != undefined) { + _active_feed_id = feed_id; } + if (offset != undefined) _active_feed_offset = offset; + + mark_selected_feed(_active_feed_id); + } catch (e) { exception_error("digest_update", e); } - } +} */ -function digest_init() { +function init() { try { new Ajax.Request("backend.php", { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { - digest_update(transport, -4); + parse_feeds(transport); window.setTimeout('viewfeed(-4)', 100); + _update_timeout = window.setTimeout('update()', 5*1000); } }); } catch (e) { @@ -363,9 +434,6 @@ function toggleMark(mark_img, id) { if (!mark_img) return; - var vfeedu = $("FEEDU--1"); - var crow = $("RROW-" + id); - if (mark_img.src.match("mark_unset")) { mark_img.src = mark_img.src.replace("mark_unset", "mark_set"); mark_img.alt = __("Unstar article"); diff --git a/digest.php b/digest.php index 7b1bfd23d..467f6c286 100644 --- a/digest.php +++ b/digest.php @@ -45,7 +45,7 @@ diff --git a/functions.php b/functions.php index 735fd2c73..e53995335 100644 --- a/functions.php +++ b/functions.php @@ -6782,7 +6782,6 @@ "title" => $line["title"], "link" => $line["link"], "feed_id" => $line["feed_id"], - "has_icon" => feed_has_icon($line["feed_id"]) ); if ($show_excerpt) { -- cgit v1.2.3 From e0cebf2a81f8ce20656c210c97b6751f3166b554 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 10:15:40 +0400 Subject: sort feeds list by unread; support fatal error messages and login redirects --- digest.js | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/digest.js b/digest.js index 38e2224bb..fffdf16ea 100644 --- a/digest.js +++ b/digest.js @@ -79,6 +79,7 @@ function update() { new Ajax.Request("backend.php", { parameters: "?op=rpc&subop=digest-init", onComplete: function(transport) { + fatal_error_check(transport); parse_feeds(transport); set_selected_feed(_active_feed_id); } }); @@ -132,6 +133,7 @@ function viewfeed(feed_id, offset) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { + fatal_error_check(transport); parse_headlines(transport, offset == 0); set_selected_feed(feed_id); _active_feed_offset = offset; @@ -258,6 +260,19 @@ function parse_feeds(transport) { if (feeds) { feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + feeds.sort( function (a,b) + { + if (b.unread != a.unread) + return (b.unread - a.unread) + else + if (a.title > b.title) + return 1; + else if (a.title < b.title) + return -1; + else + return 0; + }); + last_feeds = feeds; $('feeds-content').innerHTML = ""; @@ -499,3 +514,45 @@ function togglePub(mark_img, id, note) { } } +function fatal_error(code, msg) { + try { + + if (code == 6) { + window.location.href = "digest.php"; + } else if (code == 5) { + window.location.href = "update.php"; + } else { + + if (msg == "") msg = "Unknown error"; + + console.error("Fatal error: " + code + "\n" + + msg); + + } + + } catch (e) { + exception_error("fatalError", e); + } +} + +function fatal_error_check(transport) { + try { + if (transport.responseXML) { + var error = transport.responseXML.getElementsByTagName("error")[0]; + + if (error) { + var code = error.getAttribute("error-code"); + var msg = error.getAttribute("error-msg"); + if (code != 0) { + fatal_error(code, msg); + return false; + } + } + } + } catch (e) { + exception_error("fatal_error_check", e); + } + return true; +} + + -- cgit v1.2.3 From c1b5cd23e068d269a2736ac4759fbaa09243f4dd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 11:05:03 +0400 Subject: digest: support feed catchup --- digest.css | 5 ++ digest.js | 194 ++++++++++++++++++++++++++++++------------------ modules/backend-rpc.php | 14 ++++ 3 files changed, 139 insertions(+), 74 deletions(-) diff --git a/digest.css b/digest.css index b500a47e7..2c30b0eb8 100644 --- a/digest.css +++ b/digest.css @@ -109,6 +109,11 @@ a:hover { margin-right : 5px; } +#feeds ul#feeds-content div.unread-ctr img.dismiss { + margin-right : 0px; + cursor : pointer; +} + #feeds ul#feeds-content div.unread-ctr { color : gray; float : right; diff --git a/digest.js b/digest.js index fffdf16ea..a3cbb4879 100644 --- a/digest.js +++ b/digest.js @@ -3,6 +3,36 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; +var _feedlist_expanded = false; + +function catchup_feed(feed_id, callback) { + try { + + var fn = find_feed(last_feeds, feed_id).title; + + if (confirm(__("Mark all articles in %s as read?").replace("%s", fn))) { + + var is_cat = ""; + + if (feed_id == -4) is_cat = "true"; + + var query = "?op=rpc&subop=catchupFeed&feed_id=" + + feed_id + "&is_cat=" + is_cat; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + if (callback) callback(transport); + + update(); + } }); + } + + } catch (e) { + exception_error("catchup_article", e); + } +} + function catchup_article(article_id, callback) { try { @@ -205,10 +235,14 @@ function add_feed_entry(feed) { icon_part = ""; - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + - "" + feed.title + - "
    " + feed.unread + "
    " + + "    " + feed.title + "" + + "
    " + + "" + + "" + feed.unread + "" + + "
    " + "
    • "; $("feeds-content").innerHTML += tmp_html; @@ -252,9 +286,48 @@ function add_headline_entry(article, feed) { } } +function expand_feeds() { + try { + _feedlist_expanded = true; + + redraw_feedlist(last_feeds); + + } catch (e) { + exception_error("expand_feeds", e); + } +} + +function redraw_feedlist(feeds) { + try { + + $('feeds-content').innerHTML = ""; + + var limit = 10; + + if (_feedlist_expanded) limit = feeds.length; + + for (var i = 0; i < Math.min(limit, feeds.length); i++) { + add_feed_entry(feeds[i]); + } + + if (feeds.length > limit) { + $('feeds-content').innerHTML += "
  • " + + "" + + "" + + __("%d more...").replace("%d", feeds.length-10) + + "" + "
    • "; + } + + } catch (e) { + exception_error("redraw_feedlist", e); + } +} + function parse_feeds(transport) { try { + if (!transport.responseXML) return; + var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; if (feeds) { @@ -275,11 +348,7 @@ function parse_feeds(transport) { last_feeds = feeds; - $('feeds-content').innerHTML = ""; - - for (var i = 0; i < feeds.length; i++) { - add_feed_entry(feeds[i]); - } + redraw_feedlist(feeds); } } catch (e) { @@ -289,6 +358,8 @@ function parse_feeds(transport) { function parse_headlines(transport, replace) { try { + if (!transport.responseXML) return; + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; if (headlines) { @@ -296,7 +367,7 @@ function parse_headlines(transport, replace) { if (replace) $('headlines-content').innerHTML = ''; - var pr = $('MORE-PROMPT'); + var pr = $('H-MORE-PROMPT'); if (pr) pr.parentNode.removeChild(pr); @@ -311,7 +382,7 @@ function parse_headlines(transport, replace) { if (pr) { $('headlines-content').appendChild(pr); } else { - $('headlines-content').innerHTML += "
  • " + + $('headlines-content').innerHTML += "
  • " + "
    " + __("More articles...") + "
    • "; } @@ -324,70 +395,6 @@ function parse_headlines(transport, replace) { } } -/*function digest_update(transport, feed_id, offset) { - try { - var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; - var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; - - if (feeds) { - feeds = eval("(" + feeds.firstChild.nodeValue + ")"); - - last_feeds = feeds; - - $('feeds-content').innerHTML = ""; - - for (var i = 0; i < feeds.length; i++) { - add_feed_entry(feeds[i]); - } - } else { - feeds = last_feeds; - } - - if (headlines) { - headlines = eval("(" + headlines.firstChild.nodeValue + ")"); - - if (_active_feed_id != feed_id || !offset) - $('headlines-content').innerHTML = ""; - - var pr = $('MORE-PROMPT'); - - if (pr) { - pr.id = ''; - Element.hide(pr); - } - - for (var i = 0; i < headlines.length; i++) { - var elem = $('A-' + headlines[i].id); - - if (elem && Element.visible(elem)) { - if (!headlines[i].unread) - remove_headline_entry(headlines[i].id); - - } else { - add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); - } - } - - $('headlines-content').innerHTML += "
  • " + - "
    " + - __("More articles...") + "
    • "; - - new Effect.Appear('headlines-content'); - } - - if (feed_id != undefined) { - _active_feed_id = feed_id; - } - - if (offset != undefined) _active_feed_offset = offset; - - mark_selected_feed(_active_feed_id); - - } catch (e) { - exception_error("digest_update", e); - } -} */ - function init() { try { @@ -555,4 +562,43 @@ function fatal_error_check(transport) { return true; } +function feed_mi(elem) { + try { + var imgs = elem.getElementsByTagName('IMG'); + var spans = elem.getElementsByTagName('SPAN'); + + for (var i = 0; i < imgs.length; i++) { + if (imgs[i].className == "dismiss") + Element.show(imgs[i]); + } + + for (var i = 0; i < spans.length; i++) { + if (spans[i].className == "unread") + Element.hide(spans[i]); + } + + + } catch (e) { + exception_error("feed_mi", e); + } +} + +function feed_mo(elem) { + try { + var imgs = elem.getElementsByTagName('IMG'); + var spans = elem.getElementsByTagName('SPAN'); + + for (var i = 0; i < imgs.length; i++) { + if (imgs[i].className == "dismiss") + Element.hide(imgs[i]); + } + + for (var i = 0; i < spans.length; i++) { + if (spans[i].className == "unread") + Element.show(spans[i]); + } + } catch (e) { + exception_error("feed_mo", e); + } +} diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 70b690111..976fac15c 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -1029,6 +1029,20 @@ return; } + if ($subop == "catchupFeed") { + + $feed_id = db_escape_string($_REQUEST['feed_id']); + $is_cat = db_escape_string($_REQUEST['is_cat']); + + print ""; + + catchup_feed($link, $feed_id, $is_cat); + + print ""; + + return; + } + print "Unknown method: $subop"; } ?> -- cgit v1.2.3 From 4311cc7e177a4c066d87f39d8b654420617172c1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 12:16:50 +0400 Subject: digest: show number of unread articles in the title --- digest.js | 17 +++++++++++++++++ digest.php | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/digest.js b/digest.js index a3cbb4879..777473c61 100644 --- a/digest.js +++ b/digest.js @@ -346,6 +346,10 @@ function parse_feeds(transport) { return 0; }); + var all_articles = find_feed(feeds, -4); + + update_title(all_articles.unread); + last_feeds = feeds; redraw_feedlist(feeds); @@ -602,3 +606,16 @@ function feed_mo(elem) { exception_error("feed_mo", e); } } + +function update_title(unread) { + try { + document.title = "Tiny Tiny RSS"; + + if (unread > 0) + document.title += " (" + unread + ")"; + + } catch (e) { + exception_error("update_title", e); + } +} + diff --git a/digest.php b/digest.php index 467f6c286..c217d2abf 100644 --- a/digest.php +++ b/digest.php @@ -24,7 +24,7 @@ - Tiny Tiny Digest + Tiny Tiny RSS -- cgit v1.2.3 From 1a434472bae1d6093abc816a253b53c600fd08c6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 12:20:19 +0400 Subject: load more headlines on view() --- digest.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/digest.js b/digest.js index 777473c61..7a1e7d2ec 100644 --- a/digest.js +++ b/digest.js @@ -138,7 +138,10 @@ function view(article_id, dismiss_only) { remove_headline_entry(article_id); catchup_article(article_id, - function() { update(); }); + function() { + viewfeed(_active_feed_id, _active_feed_offset); + update(); + }); return dismiss_only != true; } catch (e) { -- cgit v1.2.3 From 46360a961b5aded1cedc651b45636506c303e30b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 13:08:13 +0400 Subject: digest tweaks --- digest.js | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/digest.js b/digest.js index 7a1e7d2ec..ce9c325b5 100644 --- a/digest.js +++ b/digest.js @@ -33,6 +33,32 @@ function catchup_feed(feed_id, callback) { } } +function catchup_visible_articles(callback) { + try { + var elems = $("headlines-content").getElementsByTagName("LI"); + var ids = []; + + for (var i = 0; i < elems.length; i++) { + if (elems[i].id && elems[i].id.match("A-")) { + ids.push(elems[i].id.replace("A-", "")); + } + } + + var query = "?op=rpc&subop=catchupSelected" + + "&cmode=0&ids=" + param_escape(ids); + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + if (callback) callback(transport); + + viewfeed(_active_feed_id, 0); + } }); + + } catch (e) { + exception_error("catchup_visible_articles", e); + } +} function catchup_article(article_id, callback) { try { @@ -243,7 +269,9 @@ function add_feed_entry(feed) { icon_part + "" + feed.title + "" + "
    " + - "" + + "" + "" + feed.unread + "" + "
    " + ""; @@ -267,7 +295,7 @@ function add_headline_entry(article, feed) { "
    " + "" + "" + - "" + + "" + "
    " + "" + @@ -390,8 +418,12 @@ function parse_headlines(transport, replace) { $('headlines-content').appendChild(pr); } else { $('headlines-content').innerHTML += "
  • " + - "
    " + - __("More articles...") + "
    • "; + "
    " + + "" + + __("Mark as read") + " | " + + "" + + __("Load more...") + "" + + "
    "; } new Effect.Appear('headlines-content'); -- cgit v1.2.3 From 9ed133e7a97e4ad591df2557646519a2f451adf3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 13:38:57 +0400 Subject: api: support published status in getHeadlines; digest: code cleanup --- digest.css | 11 ++++++---- digest.js | 70 +++++++++++++++++++++-------------------------------------- functions.php | 1 + 3 files changed, 33 insertions(+), 49 deletions(-) diff --git a/digest.css b/digest.css index 2c30b0eb8..f7ddff689 100644 --- a/digest.css +++ b/digest.css @@ -159,14 +159,17 @@ a:hover { max-width : 65%; } -#headlines ul#headlines-content img.digest-check { - cursor : pointer; +#headlines ul#headlines-content div.digest-check { + float : right; } -#headlines ul#headlines-content div.digest-check { - float : right; +#headlines ul#headlines-content div.digest-check img { + cursor : pointer; + margin-right : 0px; + margin-left : 3px; } + #headlines ul#headlines-content img.icon { width : 16px; height : 16px; diff --git a/digest.js b/digest.js index ce9c325b5..ba066a15f 100644 --- a/digest.js +++ b/digest.js @@ -14,7 +14,7 @@ function catchup_feed(feed_id, callback) { var is_cat = ""; - if (feed_id == -4) is_cat = "true"; + if (feed_id < 0) is_cat = "true"; // KLUDGE var query = "?op=rpc&subop=catchupFeed&feed_id=" + feed_id + "&is_cat=" + is_cat; @@ -290,18 +290,32 @@ function add_headline_entry(article, feed) { icon_part = ""; + var mark_part = ""; + var publ_part = ""; + + if (article.marked) + mark_part = ""; + else + mark_part = ""; + + if (article.published) + publ_part = ""; + else + publ_part = ""; + + var tmp_html = "
  • " + icon_part + "
    " + - "" + - "" + - "" + + mark_part + + publ_part + + "" + "
    " + "" + article.title + "" + "
    " + - "
    " + + "
    " + article.excerpt + "
    " + "" + @@ -450,41 +464,7 @@ function init() { } } -function tMark_afh_off(effect) { - try { - var elem = effect.effects[0].element; - - console.log("tMark_afh_off : " + elem.id); - - if (elem) { - elem.src = elem.src.replace("mark_set", "mark_unset"); - elem.alt = __("Star article"); - Element.show(elem); - } - - } catch (e) { - exception_error("tMark_afh_off", e); - } -} - -function tPub_afh_off(effect) { - try { - var elem = effect.effects[0].element; - - console.log("tPub_afh_off : " + elem.id); - - if (elem) { - elem.src = elem.src.replace("pub_set", "pub_unset"); - elem.alt = __("Publish article"); - Element.show(elem); - } - - } catch (e) { - exception_error("tPub_afh_off", e); - } -} - -function toggleMark(mark_img, id) { +function toggle_mark(mark_img, id) { try { @@ -510,15 +490,15 @@ function toggleMark(mark_img, id) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - // + update(); } }); } catch (e) { - exception_error("toggleMark", e); + exception_error("toggle_mark", e); } } -function togglePub(mark_img, id, note) { +function toggle_pub(mark_img, id, note) { try { @@ -552,11 +532,11 @@ function togglePub(mark_img, id, note) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - // + update(); } }); } catch (e) { - exception_error("togglePub", e); + exception_error("toggle_pub", e); } } diff --git a/functions.php b/functions.php index e53995335..2174460b4 100644 --- a/functions.php +++ b/functions.php @@ -6777,6 +6777,7 @@ "id" => (int)$line["id"], "unread" => sql_bool_to_bool($line["unread"]), "marked" => sql_bool_to_bool($line["marked"]), + "published" => sql_bool_to_bool($line["published"]), "updated" => strtotime($line["updated"]), "is_updated" => $is_updated, "title" => $line["title"], -- cgit v1.2.3 From ef1ef3bc29b3324830c26efa9678568c4c530e2f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 14:05:12 +0400 Subject: digest: do not catchup on zoom --- digest.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/digest.js b/digest.js index ba066a15f..82abe6676 100644 --- a/digest.js +++ b/digest.js @@ -110,8 +110,8 @@ function zoom(article_id) { } } - catchup_article(article_id, - function() { update(); }); + //catchup_article(article_id, + // function() { update(); }); } catch (e) { exception_error("zoom", e); -- cgit v1.2.3 From 78ac6caf001402142951ec90e8d0a1dac02e433b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 14:37:47 +0400 Subject: digest: support tags --- digest.css | 30 +++++++++++++++++++++++++++--- digest.js | 31 +++++++++++++++++++++++++++---- digest.php | 12 ++++++++++-- functions.php | 1 + modules/backend-rpc.php | 5 +++-- 5 files changed, 68 insertions(+), 11 deletions(-) diff --git a/digest.css b/digest.css index f7ddff689..cfee28bcf 100644 --- a/digest.css +++ b/digest.css @@ -18,6 +18,10 @@ a:hover { color : gray; } +#header a:hover, #footer a:hover { + color : #0069D8; +} + #header { font-weight : bold; font-size : 14px; @@ -159,6 +163,18 @@ a:hover { max-width : 65%; } +#headlines h1 a { + color : #684C99; +} + +#headlines h1 a:hover { + color : gray; +} + +#headlines h1 #headlines-title { + color : gray; +} + #headlines ul#headlines-content div.digest-check { float : right; } @@ -214,15 +230,23 @@ a:hover { } #headlines ul#headlines-content div.info { - margin-top : 2px; font-size : 11px; } #headlines ul#headlines-content div.info a { color : gray; - font-weight : bold; } -#headlines ul#headlines-content div.info a:hover { +#headlines ul#headlines-content span.tags { + font-size : 11px; + margin-bottom : 2px; +} + +#headlines ul#headlines-content span.tags a { + color : #684C99; +} + +#headlines ul#headlines-content div.info a:hover, +#headlines ul#headlines-content span.tags a:hover { color : #659a4c; } diff --git a/digest.js b/digest.js index 82abe6676..51c824ee4 100644 --- a/digest.js +++ b/digest.js @@ -186,8 +186,10 @@ function viewfeed(feed_id, offset) { offset = _active_feed_offset + offset; } - var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + - "&offset=" + offset; + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + + param_escape(feed_id) + "&offset=" + offset; + + console.log(query); new Ajax.Request("backend.php", { parameters: query, @@ -293,6 +295,22 @@ function add_headline_entry(article, feed) { var mark_part = ""; var publ_part = ""; + var tags_part = ""; + + if (article.tags.length > 0) { + + tags_part = " " + __("in") + " "; + + for (var i = 0; i < Math.min(5, article.tags.length); i++) { + tags_part += "" + + article.tags[i] + ", "; + } + + tags_part = tags_part.replace(/, $/, ""); + tags_part = "" + tags_part + ""; + } + if (article.marked) mark_part = ""; else @@ -320,7 +338,7 @@ function add_headline_entry(article, feed) { "" + "
    " + - feed.title + " " + " @ " + + feed.title + " " + tags_part + " @ " + new Date(article.updated * 1000) + "
    " + "
    • "; @@ -410,10 +428,15 @@ function parse_headlines(transport, replace) { if (!transport.responseXML) return; var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; + var headlines_title = transport.responseXML.getElementsByTagName('headlines-title')[0]; - if (headlines) { + if (headlines && headlines_title) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + var title = headlines_title.firstChild.nodeValue; + + $("headlines-title").innerHTML = title; + if (replace) $('headlines-content').innerHTML = ''; var pr = $('H-MORE-PROMPT'); diff --git a/digest.php b/digest.php index c217d2abf..2b7f91807 100644 --- a/digest.php +++ b/digest.php @@ -91,7 +91,8 @@
    -

    +

    : +

    @@ -107,6 +108,13 @@ v © 2005– - Andrew Dolgov + Andrew Dolgov + +
    + + + + + diff --git a/functions.php b/functions.php index 2174460b4..232ee7c1f 100644 --- a/functions.php +++ b/functions.php @@ -6783,6 +6783,7 @@ "title" => $line["title"], "link" => $line["link"], "feed_id" => $line["feed_id"], + "tags" => get_article_tags($link, $line["id"]), ); if ($show_excerpt) { diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 976fac15c..a0e4e77df 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -984,8 +984,6 @@ if (!$feed_id) $feed_id = -4; if (!$offset) $offset = 0; - - print ""; $headlines = api_get_headlines($link, $feed_id, 10, $offset, @@ -994,6 +992,9 @@ //function api_get_headlines($link, $feed_id, $limit, $offset, // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { + print ""; + print ""; print ""; -- cgit v1.2.3 From 6eed9e8071c5a4cff23ab956d616c0ab85313303 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 14:50:45 +0400 Subject: add some scriptaculous stuff --- digest.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/digest.js b/digest.js index 51c824ee4..886fbce89 100644 --- a/digest.js +++ b/digest.js @@ -437,22 +437,30 @@ function parse_headlines(transport, replace) { $("headlines-title").innerHTML = title; - if (replace) $('headlines-content').innerHTML = ''; + if (replace) { + $('headlines-content').innerHTML = ''; + Element.hide('headlines-content'); + } var pr = $('H-MORE-PROMPT'); if (pr) pr.parentNode.removeChild(pr); + var inserted = false; + for (var i = 0; i < headlines.length; i++) { if (!$('A-' + headlines[i].id)) { add_headline_entry(headlines[i], find_feed(last_feeds, headlines[i].feed_id)); + + inserted = $("A-" + headlines[i].id); } } if (pr) { $('headlines-content').appendChild(pr); + new Effect.ScrollTo(inserted); } else { $('headlines-content').innerHTML += "
  • " + "
    " + @@ -463,7 +471,9 @@ function parse_headlines(transport, replace) { "
    • "; } - new Effect.Appear('headlines-content'); + if (replace) new Effect.Appear('headlines-content', {duration : 0.3}); + + //new Effect.Appear('headlines-content'); } } catch (e) { -- cgit v1.2.3 From 41de9581216a904bd6a99cba5186e6b33bca06c9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 19:36:59 +0400 Subject: digest: article display tweaks --- digest.js | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/digest.js b/digest.js index 886fbce89..4faee1f6c 100644 --- a/digest.js +++ b/digest.js @@ -5,6 +5,14 @@ var _active_feed_offset = false; var _update_timeout = false; var _feedlist_expanded = false; +function article_appear(article_id) { + try { + new Effect.Appear('A-' + article_id); + } catch (e) { + exception_error("article_appear", e); + } +} + function catchup_feed(feed_id, callback) { try { @@ -165,8 +173,8 @@ function view(article_id, dismiss_only) { catchup_article(article_id, function() { - viewfeed(_active_feed_id, _active_feed_offset); - update(); + viewfeed(_active_feed_id, _active_feed_offset, false, true); + update(); }); return dismiss_only != true; @@ -175,7 +183,7 @@ function view(article_id, dismiss_only) { } } -function viewfeed(feed_id, offset) { +function viewfeed(feed_id, offset, replace, no_effects) { try { if (!feed_id) feed_id = _active_feed_id; @@ -186,6 +194,8 @@ function viewfeed(feed_id, offset) { offset = _active_feed_offset + offset; } + if (replace == undefined) replace = (offset == 0); + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + param_escape(feed_id) + "&offset=" + offset; @@ -195,7 +205,7 @@ function viewfeed(feed_id, offset) { parameters: query, onComplete: function(transport) { fatal_error_check(transport); - parse_headlines(transport, offset == 0); + parse_headlines(transport, replace, no_effects); set_selected_feed(feed_id); _active_feed_offset = offset; } }); @@ -285,7 +295,7 @@ function add_feed_entry(feed) { } } -function add_headline_entry(article, feed) { +function add_headline_entry(article, feed, no_effects) { try { var icon_part = ""; @@ -321,8 +331,11 @@ function add_headline_entry(article, feed) { else publ_part = ""; + var style = ""; - var tmp_html = "
  • " + + if (!no_effects) style = "style=\"display : none\""; + + var tmp_html = "
  • " + icon_part + "
    " + mark_part + @@ -344,6 +357,9 @@ function add_headline_entry(article, feed) { $("headlines-content").innerHTML += tmp_html; + if (!no_effects) + window.setTimeout('article_appear(' + article.id + ')', 100); + } catch (e) { exception_error("add_headline_entry", e); } @@ -423,7 +439,7 @@ function parse_feeds(transport) { } } -function parse_headlines(transport, replace) { +function parse_headlines(transport, replace, no_effects) { try { if (!transport.responseXML) return; @@ -452,7 +468,7 @@ function parse_headlines(transport, replace) { if (!$('A-' + headlines[i].id)) { add_headline_entry(headlines[i], - find_feed(last_feeds, headlines[i].feed_id)); + find_feed(last_feeds, headlines[i].feed_id), !no_effects); inserted = $("A-" + headlines[i].id); } @@ -460,7 +476,7 @@ function parse_headlines(transport, replace) { if (pr) { $('headlines-content').appendChild(pr); - new Effect.ScrollTo(inserted); + if (!no_effects) new Effect.ScrollTo(inserted); } else { $('headlines-content').innerHTML += "
  • " + "
    " + @@ -471,7 +487,8 @@ function parse_headlines(transport, replace) { "
    • "; } - if (replace) new Effect.Appear('headlines-content', {duration : 0.3}); + if (replace && !no_effects) + new Effect.Appear('headlines-content', {duration : 0.3}); //new Effect.Appear('headlines-content'); } -- cgit v1.2.3 From d8ea9902b6d9a8fce00bd826c9b654397a97bd0f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 19:52:15 +0400 Subject: digest: ajax loading for zoom() --- digest.js | 36 +++++++++++++++++++----------------- modules/backend-rpc.php | 37 +++++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/digest.js b/digest.js index 4faee1f6c..4183d70c5 100644 --- a/digest.js +++ b/digest.js @@ -102,24 +102,28 @@ function set_selected_feed(feed_id) { } } -function zoom(article_id) { +function zoom(elem, article_id) { try { - var elem = $('A-' + article_id); + //alert(elem + "/" + article_id); - if (elem) { - var divs = elem.getElementsByTagName('DIV'); - - for (var i = 0; i < divs.length; i++) { - if (divs[i].className == 'excerpt') - Element.hide(divs[i]); + elem.innerHTML = " " + + __("Loading, please wait..."); - if (divs[i].className == 'content') - Element.show(divs[i]); - } - } + new Ajax.Request("backend.php", { + parameters: "?op=rpc&subop=digest-get-contents&article_id=" + + article_id, + onComplete: function(transport) { + fatal_error_check(transport); + + if (transport.responseXML) { + var article = transport.responseXML.getElementsByTagName('article')[0]; + elem.innerHTML = article.firstChild.nodeValue; + } else { + elem.innerHTML = __("Error: unable to load article."); + } + + } }); - //catchup_article(article_id, - // function() { update(); }); } catch (e) { exception_error("zoom", e); @@ -346,10 +350,8 @@ function add_headline_entry(article, feed, no_effects) { "onclick=\"return view("+article.id+")\" class='title'>" + article.title + "" + "
    " + - "
    " + + "
    " + article.excerpt + "
    " + - "" + "
    " + feed.title + " " + tags_part + " @ " + new Date(article.updated * 1000) + "
    " + diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index a0e4e77df..592c8ab28 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -978,6 +978,28 @@ return; } + if ($subop == "digest-get-contents") { + $article_id = db_escape_string($_REQUEST['article_id']); + + $result = db_query($link, "SELECT content + FROM ttrss_entries, ttrss_user_entries + WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']); + + print ""; + + print "
    "; + + print "    "; + + return; + } + if ($subop == "digest-update") { $feed_id = db_escape_string($_REQUEST['feed_id']); $offset = db_escape_string($_REQUEST['offset']); @@ -987,7 +1009,7 @@ print ""; $headlines = api_get_headlines($link, $feed_id, 10, $offset, - '', ($feed_id == -4), true, true, "unread", "updated DESC"); + '', ($feed_id == -4), true, false, "unread", "updated DESC"); //function api_get_headlines($link, $feed_id, $limit, $offset, // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { @@ -1011,19 +1033,6 @@ if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f); } - function feeds_sort_by_unread_rev($a, $b) { - $a = $a['unread']; - $b = $b['unread']; - - if ($a == $b) { - return 0; - } - return ($a < $b) ? 1 : -1; - } - - //uasort($feeds, 'feeds_sort_by_unread_rev'); - //$feeds = array_slice($feeds, 0, 10); - print ""; print ""; -- cgit v1.2.3 From 85629f6cf5bdf93d0155d1f893ad1cbbe8f30202 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 20:13:20 +0400 Subject: digest: layout tweaks --- digest.css | 3 +++ digest.js | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/digest.css b/digest.css index cfee28bcf..4d50b4c45 100644 --- a/digest.css +++ b/digest.css @@ -191,6 +191,7 @@ a:hover { height : 16px; vertical-align : middle; margin-right : 5px; + float : left; } #headlines ul#headlines-content { @@ -209,6 +210,8 @@ a:hover { #headlines ul#headlines-content a.title { font-weight : bold; font-size : 16px; + display : block; + padding-left : 21px; } #headlines ul#headlines-content div.excerpt { diff --git a/digest.js b/digest.js index 4183d70c5..2bf7779c8 100644 --- a/digest.js +++ b/digest.js @@ -118,6 +118,11 @@ function zoom(elem, article_id) { if (transport.responseXML) { var article = transport.responseXML.getElementsByTagName('article')[0]; elem.innerHTML = article.firstChild.nodeValue; + + new Effect.BlindDown(elem, {duration : 0.5}); + + elem.onclick = false; + elem.style.cursor = "auto"; } else { elem.innerHTML = __("Error: unable to load article."); } @@ -341,10 +346,11 @@ function add_headline_entry(article, feed, no_effects) { var tmp_html = "
  • " + icon_part + + "
    " + - mark_part + - publ_part + - "" + + mark_part + + publ_part + + "" + "
    " + "" + -- cgit v1.2.3 From d3f1300032fd6b0faabddbe58655401582a0dd54 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 20:21:41 +0400 Subject: digest: show loading indicator in feedlist --- digest.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/digest.js b/digest.js index 2bf7779c8..7a034f80e 100644 --- a/digest.js +++ b/digest.js @@ -210,6 +210,11 @@ function viewfeed(feed_id, offset, replace, no_effects) { console.log(query); + var img = $("F-" + feed_id).getElementsByTagName("IMG")[0]; + + img.setAttribute("orig_src", img.src); + img.src = 'images/indicator_tiny.gif'; + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -217,6 +222,7 @@ function viewfeed(feed_id, offset, replace, no_effects) { parse_headlines(transport, replace, no_effects); set_selected_feed(feed_id); _active_feed_offset = offset; + img.src = img.getAttribute("orig_src"); } }); } catch (e) { -- cgit v1.2.3 From eb4f33ec0270d2d97ff75818c2654140cc285872 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 20:29:10 +0400 Subject: digest: more loading prompts --- digest.css | 4 ++++ digest.js | 44 +++++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/digest.css b/digest.css index 4d50b4c45..9041f7416 100644 --- a/digest.css +++ b/digest.css @@ -214,6 +214,10 @@ a:hover { padding-left : 21px; } +#headlines ul#headlines-content img#H-LOADING-IMG { + margin-left : 5px; +} + #headlines ul#headlines-content div.excerpt { color : #404040; cursor : pointer; diff --git a/digest.js b/digest.js index 7a034f80e..5cf8d4ec9 100644 --- a/digest.js +++ b/digest.js @@ -43,25 +43,30 @@ function catchup_feed(feed_id, callback) { function catchup_visible_articles(callback) { try { - var elems = $("headlines-content").getElementsByTagName("LI"); - var ids = []; - - for (var i = 0; i < elems.length; i++) { - if (elems[i].id && elems[i].id.match("A-")) { - ids.push(elems[i].id.replace("A-", "")); - } - } - var query = "?op=rpc&subop=catchupSelected" + - "&cmode=0&ids=" + param_escape(ids); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - if (callback) callback(transport); + if (confirm(__("Mark all displayed articles as read?"))) { - viewfeed(_active_feed_id, 0); - } }); + var elems = $("headlines-content").getElementsByTagName("LI"); + var ids = []; + + for (var i = 0; i < elems.length; i++) { + if (elems[i].id && elems[i].id.match("A-")) { + ids.push(elems[i].id.replace("A-", "")); + } + } + + var query = "?op=rpc&subop=catchupSelected" + + "&cmode=0&ids=" + param_escape(ids); + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + if (callback) callback(transport); + + viewfeed(_active_feed_id, 0); + } }); + + } } catch (e) { exception_error("catchup_visible_articles", e); @@ -215,6 +220,8 @@ function viewfeed(feed_id, offset, replace, no_effects) { img.setAttribute("orig_src", img.src); img.src = 'images/indicator_tiny.gif'; + if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG"); + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -223,6 +230,7 @@ function viewfeed(feed_id, offset, replace, no_effects) { set_selected_feed(feed_id); _active_feed_offset = offset; img.src = img.getAttribute("orig_src"); + if ($('H-LOADING-IMG')) Element.hide("H-LOADING-IMG"); } }); } catch (e) { @@ -498,6 +506,8 @@ function parse_headlines(transport, replace, no_effects) { __("Mark as read") + " | " + "" + __("Load more...") + "" + + "" + "
    • "; } -- cgit v1.2.3 From e4c530dcc3e06e0890ea12f9454f343655fdfff3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 22:36:18 +0400 Subject: digest: add rate limit for headline requests when catching up; control OOE responses with seq numbers --- digest.js | 33 ++++++++++++++++++++++++++++++--- modules/backend-rpc.php | 3 +++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/digest.js b/digest.js index 5cf8d4ec9..cf816cf95 100644 --- a/digest.js +++ b/digest.js @@ -3,7 +3,9 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; +var _view_update_timeout = false; var _feedlist_expanded = false; +var _update_seq = 1; function article_appear(article_id) { try { @@ -181,14 +183,23 @@ function remove_headline_entry(article_id) { } } +function view_update() { + try { + viewfeed(_active_feed_id, _active_feed_offset, false, true); + update(); + } catch (e) { + exception_error("view_update", e); + } +} + function view(article_id, dismiss_only) { try { remove_headline_entry(article_id); catchup_article(article_id, function() { - viewfeed(_active_feed_id, _active_feed_offset, false, true); - update(); + window.clearTimeout(_view_update_timeout); + _view_update_timeout = window.setTimeout("view_update()", 1000); }); return dismiss_only != true; @@ -210,8 +221,11 @@ function viewfeed(feed_id, offset, replace, no_effects) { if (replace == undefined) replace = (offset == 0); + _update_seq = _update_seq + 1; + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + - param_escape(feed_id) + "&offset=" + offset; + param_escape(feed_id) + "&offset=" + offset + + "&seq=" + _update_seq; console.log(query); @@ -222,6 +236,7 @@ function viewfeed(feed_id, offset, replace, no_effects) { if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG"); + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -465,6 +480,18 @@ function parse_headlines(transport, replace, no_effects) { try { if (!transport.responseXML) return; + var seq = transport.responseXML.getElementsByTagName('seq')[0]; + + if (seq) { + seq = seq.firstChild.nodeValue; + if (seq != _update_seq) { + console.log("parse_headlines: wrong sequence received."); + return; + } + } else { + return; + } + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; var headlines_title = transport.responseXML.getElementsByTagName('headlines-title')[0]; diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 592c8ab28..aa05e8e8e 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -1003,11 +1003,14 @@ if ($subop == "digest-update") { $feed_id = db_escape_string($_REQUEST['feed_id']); $offset = db_escape_string($_REQUEST['offset']); + $seq = db_escape_string($_REQUEST['seq']); if (!$feed_id) $feed_id = -4; if (!$offset) $offset = 0; print ""; + print "$seq"; + $headlines = api_get_headlines($link, $feed_id, 10, $offset, '', ($feed_id == -4), true, false, "unread", "updated DESC"); -- cgit v1.2.3 From 01ee171a9c622d22e45c11314ea37ed9897af040 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 08:31:37 +0400 Subject: disable H-LOADING-IMG --- digest.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/digest.js b/digest.js index cf816cf95..8f0142ab6 100644 --- a/digest.js +++ b/digest.js @@ -234,9 +234,6 @@ function viewfeed(feed_id, offset, replace, no_effects) { img.setAttribute("orig_src", img.src); img.src = 'images/indicator_tiny.gif'; - if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG"); - - new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -245,7 +242,6 @@ function viewfeed(feed_id, offset, replace, no_effects) { set_selected_feed(feed_id); _active_feed_offset = offset; img.src = img.getAttribute("orig_src"); - if ($('H-LOADING-IMG')) Element.hide("H-LOADING-IMG"); } }); } catch (e) { -- cgit v1.2.3 From ed6c208dda7a1ff2825a34786d795419f1536dac Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 08:40:37 +0400 Subject: support zoom for blank excerpts --- digest.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/digest.js b/digest.js index 8f0142ab6..9828dc7c2 100644 --- a/digest.js +++ b/digest.js @@ -369,6 +369,9 @@ function add_headline_entry(article, feed, no_effects) { if (!no_effects) style = "style=\"display : none\""; + if (article.excerpt.trim() == "") + article.excerpt = __("Click to expand article."); + var tmp_html = "
  • " + icon_part + -- cgit v1.2.3 From 2f57dff5e4ba3060c560a77b7634c663d4e19d01 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 08:56:50 +0400 Subject: digest: mark read article on zoom --- digest.css | 14 +++++++++++++- digest.js | 13 +++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/digest.css b/digest.css index 9041f7416..45d502e3b 100644 --- a/digest.css +++ b/digest.css @@ -207,13 +207,25 @@ a:hover { clear : left; } -#headlines ul#headlines-content a.title { +#headlines ul#headlines-content li.unread a.title { font-weight : bold; font-size : 16px; display : block; padding-left : 21px; } +#headlines ul#headlines-content li.read a.title { + font-size : 16px; + font-weight : bold; + display : block; + padding-left : 21px; + color : #8DB1D6; +} + +#headlines ul#headlines-content li.read a.title:hover { + color : gray; +} + #headlines ul#headlines-content img#H-LOADING-IMG { margin-left : 5px; } diff --git a/digest.js b/digest.js index 9828dc7c2..a529db7fd 100644 --- a/digest.js +++ b/digest.js @@ -130,6 +130,15 @@ function zoom(elem, article_id) { elem.onclick = false; elem.style.cursor = "auto"; + + catchup_article(article_id, + function() { + window.clearTimeout(_view_update_timeout); + _view_update_timeout = window.setTimeout("view_update()", 500); + $("A-" + article_id).className = "read"; + }); + + } else { elem.innerHTML = __("Error: unable to load article."); } @@ -199,7 +208,7 @@ function view(article_id, dismiss_only) { catchup_article(article_id, function() { window.clearTimeout(_view_update_timeout); - _view_update_timeout = window.setTimeout("view_update()", 1000); + _view_update_timeout = window.setTimeout("view_update()", 500); }); return dismiss_only != true; @@ -372,7 +381,7 @@ function add_headline_entry(article, feed, no_effects) { if (article.excerpt.trim() == "") article.excerpt = __("Click to expand article."); - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + "
    " + -- cgit v1.2.3 From 5e9a79e13426ae29c4829d58ee3964cf8accee4a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 12:24:30 +0400 Subject: misc digest tweaks --- digest.js | 52 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/digest.js b/digest.js index a529db7fd..ae7e870a2 100644 --- a/digest.js +++ b/digest.js @@ -46,17 +46,17 @@ function catchup_feed(feed_id, callback) { function catchup_visible_articles(callback) { try { - if (confirm(__("Mark all displayed articles as read?"))) { - - var elems = $("headlines-content").getElementsByTagName("LI"); - var ids = []; + var elems = $("headlines-content").getElementsByTagName("LI"); + var ids = []; - for (var i = 0; i < elems.length; i++) { - if (elems[i].id && elems[i].id.match("A-")) { - ids.push(elems[i].id.replace("A-", "")); - } + for (var i = 0; i < elems.length; i++) { + if (elems[i].id && elems[i].id.match("A-")) { + ids.push(elems[i].id.replace("A-", "")); } - + } + + if (confirm(__("Mark %d displayed articles as read?").replace("%d", ids.length))) { + var query = "?op=rpc&subop=catchupSelected" + "&cmode=0&ids=" + param_escape(ids); @@ -153,13 +153,22 @@ function zoom(elem, article_id) { function load_more() { try { - viewfeed(_active_feed_id, _active_feed_offset + 10); + var pr = $("H-LOADING-IMG"); + + if (pr) Element.show(pr); + + viewfeed(_active_feed_id, _active_feed_offset + 10, false, false, true, + function() { + var pr = $("H-LOADING-IMG"); + + if (pr) Element.hide(pr); + }); } catch (e) { exception_error("load_more", e); } } -function update() { +function update(callback) { try { console.log('updating feeds...'); @@ -171,6 +180,8 @@ function update() { fatal_error_check(transport); parse_feeds(transport); set_selected_feed(_active_feed_id); + + if (callback) callback(transport); } }); _update_timeout = window.setTimeout('update()', 5*1000); @@ -194,7 +205,7 @@ function remove_headline_entry(article_id) { function view_update() { try { - viewfeed(_active_feed_id, _active_feed_offset, false, true); + viewfeed(_active_feed_id, _active_feed_offset, false, true, true); update(); } catch (e) { exception_error("view_update", e); @@ -217,7 +228,7 @@ function view(article_id, dismiss_only) { } } -function viewfeed(feed_id, offset, replace, no_effects) { +function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) { try { if (!feed_id) feed_id = _active_feed_id; @@ -240,17 +251,24 @@ function viewfeed(feed_id, offset, replace, no_effects) { var img = $("F-" + feed_id).getElementsByTagName("IMG")[0]; - img.setAttribute("orig_src", img.src); - img.src = 'images/indicator_tiny.gif'; + if (img && !no_indicator) { + img.setAttribute("orig_src", img.src); + img.src = 'images/indicator_tiny.gif'; + } new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { fatal_error_check(transport); parse_headlines(transport, replace, no_effects); - set_selected_feed(feed_id); + set_selected_feed(feed_id); _active_feed_offset = offset; - img.src = img.getAttribute("orig_src"); + + if (img && !no_indicator) + img.src = img.getAttribute("orig_src"); + + if (callback) callback(transport); + } }); } catch (e) { -- cgit v1.2.3 From c7a5c8a5a2703f78bf36dc3f2c5cc2f8fc8ec713 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 14:39:16 +0400 Subject: add loading overlay --- digest.css | 19 +++++++++++++++++++ digest.js | 2 ++ digest.php | 14 ++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/digest.css b/digest.css index 45d502e3b..d96cc4968 100644 --- a/digest.css +++ b/digest.css @@ -269,3 +269,22 @@ a:hover { #headlines ul#headlines-content span.tags a:hover { color : #659a4c; } + +#overlay { + background : white; + left : 0; + top : 0; + height : 100%; + width : 100%; + z-index : 100; + position : absolute; + text-align : center; +} + +#overlay_inner { + margin : 1em; +} + +#overlay img { + vertical-align : middle; +} diff --git a/digest.js b/digest.js index ae7e870a2..b788535fc 100644 --- a/digest.js +++ b/digest.js @@ -259,6 +259,8 @@ function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { + Element.hide("overlay"); + fatal_error_check(transport); parse_headlines(transport, replace, no_effects); set_selected_feed(feed_id); diff --git a/digest.php b/digest.php index 2b7f91807..43eb04121 100644 --- a/digest.php +++ b/digest.php @@ -50,6 +50,20 @@ +
    +
    + + + + +
    +
    + + + + +
  • " + + var li_class = "unread"; + + var fresh_max = getInitParam("fresh_article_max_age") * 60 * 60; + var d = new Date(); + + if (d.getTime() / 1000 - article.updated < fresh_max) + li_class = "fresh"; + + var tmp_html = "
  • " + icon_part + "
    " + -- cgit v1.2.3 From b8a1b2ae945d4295971c72aad53fcf5841eb76c7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 22 Sep 2010 14:10:39 +0400 Subject: digest: only try to show feed loading indicator when feed is actually present on screen --- digest.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/digest.js b/digest.js index cb42633b6..3fe85f68e 100644 --- a/digest.js +++ b/digest.js @@ -253,11 +253,13 @@ function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) console.log(query); - var img = $("F-" + feed_id).getElementsByTagName("IMG")[0]; + if ($("F-" + feed_id)) { + var img = $("F-" + feed_id).getElementsByTagName("IMG")[0]; - if (img && !no_indicator) { - img.setAttribute("orig_src", img.src); - img.src = 'images/indicator_tiny.gif'; + if (img && !no_indicator) { + img.setAttribute("orig_src", img.src); + img.src = 'images/indicator_tiny.gif'; + } } new Ajax.Request("backend.php", { -- cgit v1.2.3 From 58226f869cfc0f35bb22c4f5afc5c3d892dc3c54 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 22 Sep 2010 14:17:26 +0400 Subject: digest: do not show catchup/loadmore prompt when there's nothing to load --- digest.js | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/digest.js b/digest.js index 3fe85f68e..98ae14d8c 100644 --- a/digest.js +++ b/digest.js @@ -47,9 +47,8 @@ function catchup_feed(feed_id, callback) { } } -function catchup_visible_articles(callback) { +function get_visible_article_ids() { try { - var elems = $("headlines-content").getElementsByTagName("LI"); var ids = []; @@ -59,6 +58,18 @@ function catchup_visible_articles(callback) { } } + return ids; + + } catch (e) { + exception_error("get_visible_article_ids", e); + } +} + +function catchup_visible_articles(callback) { + try { + + var ids = get_visible_article_ids(); + if (confirm(__("Mark %d displayed articles as read?").replace("%d", ids.length))) { var query = "?op=rpc&subop=catchupSelected" + @@ -565,19 +576,25 @@ function parse_headlines(transport, replace, no_effects) { } } - if (pr) { - $('headlines-content').appendChild(pr); - if (!no_effects) new Effect.ScrollTo(inserted); - } else { - $('headlines-content').innerHTML += "
  • " + - "
    " + - "" + - __("Mark as read") + " | " + - "" + - __("Load more...") + "" + - " 0) { + if (pr) { + $('headlines-content').appendChild(pr); + if (!no_effects) new Effect.ScrollTo(inserted); + } else { + $('headlines-content').innerHTML += "
  • " + + "
    " + + "" + + __("Mark as read") + " | " + + "" + + __("Load more...") + "" + + "" + - "
    • "; + "
    "; + } + } else { + // FIXME : display some kind of "nothing to see here" prompt here } if (replace && !no_effects) -- cgit v1.2.3 From 230807bd59dd86b747c528f789c7044c708bf67e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 30 Sep 2010 16:53:23 +0400 Subject: reenable piggie (refs #42) --- prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/prefs.js b/prefs.js index 64fe0a3d5..83621b6d4 100644 --- a/prefs.js +++ b/prefs.js @@ -1456,8 +1456,7 @@ function pref_hotkey_handler(e) { } if ($("piggie")) { - - if (seq.match("807371717369")) { + if (seq.match("8073717369")) { seq = ""; piggie(true); } else { -- cgit v1.2.3