diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..4f4773fb3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+config.php
diff --git a/api/index.php b/api/index.php
index 8d69e1a73..f02f92a77 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);
@@ -321,42 +194,43 @@
case "getArticle":
- $article_id = (int)db_escape_string($_REQUEST["article_id"]);
+ $article_id = db_escape_string($_REQUEST["article_id"]);
- $query = "SELECT title,link,content,feed_id,comments,int_id,
+ $query = "SELECT id,title,link,content,feed_id,comments,int_id,
marked,unread,published,
".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
author
FROM ttrss_entries,ttrss_user_entries
- WHERE id = '$article_id' AND ref_id = id AND owner_uid = " .
+ WHERE id IN ($article_id) AND ref_id = id AND owner_uid = " .
$_SESSION["uid"] ;
- $attachments = get_article_enclosures($link, $article_id);
-
$result = db_query($link, $query);
-
- $article = array();
-
+
if (db_num_rows($result) != 0) {
- $line = db_fetch_assoc($result);
-
- $article = array(
- "title" => $line["title"],
- "link" => $line["link"],
- "labels" => get_article_labels($link, $article_id),
- "unread" => sql_bool_to_bool($line["unread"]),
- "marked" => sql_bool_to_bool($line["marked"]),
- "published" => sql_bool_to_bool($line["published"]),
- "comments" => $line["comments"],
- "author" => $line["author"],
- "updated" => strtotime($line["updated"]),
- "content" => $line["content"],
- "feed_id" => $line["feed_id"],
- "attachments" => $attachments
- );
- }
- print json_encode($article);
+ while ($line = db_fetch_assoc($result)) {
+
+ $attachments = get_article_enclosures($link, $line['id']);
+
+ $article = array(
+ "id" => $line["id"],
+ "title" => $line["title"],
+ "link" => $line["link"],
+ "labels" => get_article_labels($link, $line['id']),
+ "unread" => sql_bool_to_bool($line["unread"]),
+ "marked" => sql_bool_to_bool($line["marked"]),
+ "published" => sql_bool_to_bool($line["published"]),
+ "comments" => $line["comments"],
+ "author" => $line["author"],
+ "updated" => strtotime($line["updated"]),
+ "content" => $line["content"],
+ "feed_id" => $line["feed_id"],
+ "attachments" => $attachments
+ );
+
+ print json_encode($article);
+ }
+ }
break;
case "getConfig":
diff --git a/digest.css b/digest.css
new file mode 100644
index 000000000..2ed6aae93
--- /dev/null
+++ b/digest.css
@@ -0,0 +1,300 @@
+body {
+ background : #f0f0f0;
+ color : black;
+ font-family : sans-serif;
+ font-size : 12px;
+}
+
+a {
+ color : #0069D8;
+ text-decoration : none;
+}
+
+a:hover {
+ color : gray;
+}
+
+#header a, #footer a {
+ color : gray;
+}
+
+#header a:hover, #footer a:hover {
+ color : #0069D8;
+}
+
+#header {
+ font-weight : bold;
+ font-size : 14px;
+ font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif;
+ margin-left : 1em;
+ margin-right : 1em;
+ color : gray;
+}
+
+#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;
+ color : gray;
+}
+
+/*#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 img.dismiss {
+ margin-right : 0px;
+ cursor : pointer;
+}
+
+#feeds ul#feeds-content div.unread-ctr {
+ color : gray;
+ float : right;
+}
+
+#feeds ul#feeds-content li {
+ margin : 0px 0px 2px 0px;
+ padding : 2px;
+ clear : both;
+}
+
+#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 {
+ list-style-type : none;
+ font-weight : bold;
+ color : #659a4c;
+ margin : 0px;
+ 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;
+ 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;
+}
+
+#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;
+ vertical-align : middle;
+ margin-right : 5px;
+ float : left;
+}
+
+#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;
+ clear : left;
+}
+
+#headlines ul#headlines-content li.fresh a.title {
+ font-weight : bold;
+ font-size : 16px;
+ display : block;
+ padding-left : 21px;
+ color : #007FFF;
+}
+
+#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;
+}
+
+#headlines ul#headlines-content div.excerpt {
+ color : #404040;
+ cursor : pointer;
+}
+
+#headlines ul#headlines-content div.content {
+ color : #404040;
+}
+
+#headlines ul#headlines-content div.content img {
+ max-width : 75%;
+}
+
+#headlines ul#headlines-content div.body {
+ margin-left : 21px;
+ /*margin-left : 42px;*/
+}
+
+#headlines ul#headlines-content div.info {
+ font-size : 11px;
+}
+
+#headlines ul#headlines-content div.info a {
+ color : gray;
+}
+
+#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;
+}
+
+#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
new file mode 100644
index 000000000..98ae14d8c
--- /dev/null
+++ b/digest.js
@@ -0,0 +1,809 @@
+var last_feeds = [];
+var init_params = {};
+
+var db = false;
+var store = false;
+
+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 {
+ new Effect.Appear('A-' + article_id);
+ } catch (e) {
+ exception_error("article_appear", e);
+ }
+}
+
+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 < 0) is_cat = "true"; // KLUDGE
+
+ 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 get_visible_article_ids() {
+ 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-", ""));
+ }
+ }
+
+ 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" +
+ "&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 {
+ 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");
+
+ for (var i = 0; i < feeds.length; i++) {
+ if (feeds[i].id == "F-" + feed_id)
+ feeds[i].className = "selected";
+ else
+ feeds[i].className = "";
+ }
+
+ _active_feed_id = feed_id;
+
+ } catch (e) {
+ exception_error("mark_selected_feed", e);
+ }
+}
+
+function zoom(elem, article_id) {
+ try {
+ //alert(elem + "/" + article_id);
+
+ elem.innerHTML = " " +
+ __("Loading, please wait...");
+
+ 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;
+
+ new Effect.BlindDown(elem, {duration : 0.5});
+
+ 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.");
+ }
+
+ } });
+
+
+ } catch (e) {
+ exception_error("zoom", e);
+ }
+}
+
+function load_more() {
+ try {
+ 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(callback) {
+ try {
+ console.log('updating feeds...');
+
+ window.clearTimeout(_update_timeout);
+
+ 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);
+
+ if (callback) callback(transport);
+ } });
+
+ _update_timeout = window.setTimeout('update()', 5*1000);
+ } catch (e) {
+ exception_error("update", e);
+ }
+}
+
+function remove_headline_entry(article_id) {
+ try {
+ var elem = $('A-' + article_id);
+
+ if (elem) {
+ elem.parentNode.removeChild(elem);
+ }
+
+ } catch (e) {
+ exception_error("remove_headline_entry", e);
+ }
+}
+
+function view_update() {
+ try {
+ viewfeed(_active_feed_id, _active_feed_offset, false, true, 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() {
+ window.clearTimeout(_view_update_timeout);
+ _view_update_timeout = window.setTimeout("view_update()", 500);
+ });
+
+ return dismiss_only != true;
+ } catch (e) {
+ exception_error("view", e);
+ }
+}
+
+function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) {
+ try {
+
+ if (!feed_id) feed_id = _active_feed_id;
+
+ if (!offset) {
+ offset = 0;
+ } else {
+ offset = _active_feed_offset + offset;
+ }
+
+ 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 +
+ "&seq=" + _update_seq;
+
+ console.log(query);
+
+ 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';
+ }
+ }
+
+ 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);
+ _active_feed_offset = offset;
+
+ if (img && !no_indicator)
+ img.src = img.getAttribute("orig_src");
+
+ if (callback) callback(transport);
+
+ } });
+
+ } catch (e) {
+ exception_error("view", e);
+ }
+}
+
+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++) {
+ if (feeds[i].id == feed_id)
+ return feeds[i];
+ }
+
+ return false;
+
+ } catch (e) {
+ exception_error("find_feed", e);
+ }
+}
+
+function get_feed_icon(feed) {
+ try {
+ if (feed.has_icon)
+ return getInitParam('icons_location') + "/" + 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';
+
+ return 'images/blank_icon.gif';
+
+ } catch (e) {
+ exception_error("get_feed_icon", e);
+ }
+}
+
+function add_feed_entry(feed) {
+ try {
+ var icon_part = "";
+
+ icon_part = "";
+
+ var tmp_html = "
" +
+ icon_part +
+ "" + feed.title + "" +
+ "" +
+ "
" +
+ "
" + feed.unread + "" +
+ "
" +
+ "";
+
+ $("feeds-content").innerHTML += tmp_html;
+
+ } catch (e) {
+ exception_error("add_feed_entry", e);
+ }
+}
+
+function add_headline_entry(article, feed, no_effects) {
+ try {
+
+ var icon_part = "";
+
+ icon_part = "";
+
+ 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
+ mark_part = "";
+
+ if (article.published)
+ publ_part = "";
+ else
+ publ_part = "";
+
+ var style = "";
+
+ if (!no_effects) style = "style=\"display : none\"";
+
+ if (article.excerpt.trim() == "")
+ article.excerpt = __("Click to expand article.");
+
+ 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 +
+
+ "" +
+ mark_part +
+ publ_part +
+ "
" +
+ "
" +
+ "" +
+ article.title + "" +
+ "" +
+ "
" +
+ article.excerpt + "
" +
+ "
" +
+ "
";
+
+ $("headlines-content").innerHTML += tmp_html;
+
+ if (!no_effects)
+ window.setTimeout('article_appear(' + article.id + ')', 100);
+
+ } catch (e) {
+ exception_error("add_headline_entry", e);
+ }
+}
+
+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) {
+ 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;
+ });
+
+ var all_articles = find_feed(feeds, -4);
+
+ update_title(all_articles.unread);
+
+ last_feeds = feeds;
+
+ redraw_feedlist(feeds);
+ }
+
+ } catch (e) {
+ exception_error("parse_feeds", e);
+ }
+}
+
+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];
+
+ if (headlines && headlines_title) {
+ headlines = eval("(" + headlines.firstChild.nodeValue + ")");
+
+ var title = headlines_title.firstChild.nodeValue;
+
+ $("headlines-title").innerHTML = title;
+
+ 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), !no_effects);
+
+ inserted = $("A-" + headlines[i].id);
+ }
+ }
+
+ var ids = get_visible_article_ids();
+
+ if (ids.length > 0) {
+ if (pr) {
+ $('headlines-content').appendChild(pr);
+ if (!no_effects) new Effect.ScrollTo(inserted);
+ } else {
+ $('headlines-content').innerHTML += "" +
+ "";
+ }
+ } else {
+ // FIXME : display some kind of "nothing to see here" prompt here
+ }
+
+ if (replace && !no_effects)
+ new Effect.Appear('headlines-content', {duration : 0.3});
+
+ //new Effect.Appear('headlines-content');
+ }
+
+ } catch (e) {
+ exception_error("parse_headlines", e);
+ }
+}
+
+function init_second_stage() {
+ try {
+ new Ajax.Request("backend.php", {
+ parameters: "backend.php?op=rpc&subop=digest-init",
+ onComplete: function(transport) {
+ parse_feeds(transport);
+ window.setTimeout('viewfeed(-4)', 100);
+ _update_timeout = window.setTimeout('update()', 5*1000);
+ } });
+
+ } catch (e) {
+ exception_error("init_second_stage", e);
+ }
+}
+
+function init() {
+ try {
+
+ new Ajax.Request("backend.php", {
+ parameters: "?op=rpc&subop=sanityCheck",
+ onComplete: function(transport) {
+ backend_sanity_check_callback(transport);
+ } });
+
+ } catch (e) {
+ exception_error("digest_init", e);
+ }
+}
+
+function toggle_mark(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;
+
+ 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) {
+ update();
+ } });
+
+ } catch (e) {
+ exception_error("toggle_mark", e);
+ }
+}
+
+function toggle_pub(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) {
+ update();
+ } });
+
+ } catch (e) {
+ exception_error("toggle_pub", e);
+ }
+}
+
+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;
+}
+
+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);
+ }
+}
+
+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
new file mode 100644
index 000000000..c2ff2a330
--- /dev/null
+++ b/digest.php
@@ -0,0 +1,146 @@
+
+
+
+
+
+ Tiny Tiny RSS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/functions.php b/functions.php
index a669814df..21b9db8e7 100644
--- a/functions.php
+++ b/functions.php
@@ -5523,7 +5523,9 @@
}
$tmp_result = db_query($link, "SELECT always_display_enclosures FROM
- ttrss_feeds WHERE id = ".$line['feed_id']." AND owner_uid = ".$_SESSION["uid"]);
+ ttrss_feeds WHERE id = ".
+ (($line['feed_id'] == null) ? $line['orig_feed_id'] :
+ $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
$always_display_enclosures = db_fetch_result($tmp_result, 0, "always_display_enclosures");
@@ -6659,4 +6661,150 @@
return $rv;
}
+ function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset) {
+
+ $feeds = array();
+
+ /* 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);
+ }
+
+ }
+ }
+
+ /* 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;
+ }
+
+ 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"]),
+ "published" => sql_bool_to_bool($line["published"]),
+ "updated" => strtotime($line["updated"]),
+ "is_updated" => $is_updated,
+ "title" => $line["title"],
+ "link" => $line["link"],
+ "feed_id" => $line["feed_id"],
+ "tags" => get_article_tags($link, $line["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/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/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 1ff99ce72..9015cfc69 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 864dee8f4..bd65a52d9 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-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2009-11-19 09:40+0100\n"
"Last-Translator: Alfred Galitó \n"
"Language-Team: Català \n"
@@ -80,7 +80,7 @@ msgstr "Diàriament"
msgid "Weekly"
msgstr "Setmanalment"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "Per defecte"
@@ -185,182 +185,182 @@ msgstr ""
"Ha fallat la sortida de prova de SQL, reviseu la base configuració de la "
"bases de dades i de PHP"
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "El nom d'usuari o la contrasenya és incorrecte"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Tots els canals"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Sense categoria"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Especial"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "Etiquetes"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "Articles marcats"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "Articles publicats"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "Articles nous"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "Tots els articles"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "Articles mémorisés"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "Canals generats"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Per llegir"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "Inverteix"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Accions..."
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "Commuta la selecció"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Marcats"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Publicats"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "Selecció:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Marca'l com a llegit"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
#, fuzzy
msgid "Move back"
msgstr "Vés enrere"
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "Per defecte"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "Assigna-l'hi l'etiqueta:"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "Clica-hi per a reduir la categoria"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "No hi ha canals per a mostrar."
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Etiqueta"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "àudio/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr " - "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "Edita les etiquetes d'aquest article"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "Obre els enllaços de l'article en una nova finestra"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr "Publica l'article amb una nota"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Canal"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "tipus desconegut"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "Adjunció:"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "Adjuncions:"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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 +369,11 @@ msgstr "Adjuncions:"
msgid "Close this window"
msgstr "Tanca la finestra"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "No s'ha trobat el canal."
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -382,31 +382,31 @@ msgstr ""
"seleccioneu reviseu que coincideixi la sintaxi o que la configuració local "
"sigui correcta."
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
msgid "mark as read"
msgstr "Marca'l com a llegit"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "Clica-hi per a veure el cos de l'article"
-#: functions.php:5604
+#: functions.php:5607
msgid "toggle unread"
msgstr "commuta els no llegits"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "No hi ha cap article actualitzat."
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "No hi ha articles marcats per mostrar."
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -414,27 +414,27 @@ 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:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "No s'han trobat articles per a mostrar."
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "Crea una etiqueta"
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "Elimina"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "sense etiqueta"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "edita la nota"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Títol"
@@ -785,8 +785,8 @@ msgid "Create new account"
msgstr "Creeu un compte nou"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "Limita l'ús de l'ample de banda."
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -811,11 +811,11 @@ msgstr ""
msgid "Return to preferences"
msgstr "Torna a les preferències"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "S'està obrint, preneu paciència..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -826,40 +826,40 @@ msgstr ""
"reviseu els vostres\n"
"/t/t paràmetres del navegador."
-#: prefs.php:90 tt-rss.php:112
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Hola, "
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "Surt de les preferències"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Surt"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "Dreceres de teclat"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Preferències"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "Canals"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "Filtres"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "Usuaris"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
#, fuzzy
msgid "Fatal Exception"
msgstr "Erreur critique"
@@ -924,154 +924,154 @@ msgstr "S'ha creat el compte."
msgid "New user registrations are currently closed."
msgstr "Actualment no es permet el registre de nous usuaris."
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "Comentaris?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr "Lectura fora de línia"
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "Cancel·la la sincronització"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "Sincronització"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "Elimina les dades emmagatzemades"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "Desconnecta't"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "Posa't en línia"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "Núvol d'etiquetes"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "Cerca..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Accions sobre els canals:"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "Subscriviu-vos al canal"
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "Edita aquest canal..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr "Canvia la puntuació del canal"
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "Dóna't de baixa"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Tots els canals"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Mostra/amaga els canals llegits"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Catégorie :"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "Canvia al mode de reordenació de categories"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Reinicia la contrasenya"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Altres accions:"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "Crea un filtre..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "Reinicia la capa de la interfície"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "Dreceres de teclat"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "Redueix la llista de canals"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "Articles mémorisés"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "Adaptatiu"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "Tots els articles"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr "Ignora la puntuació"
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Actualitzat"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "Articles mémorisés"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "Data"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr "Puntuació"
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Actualitza"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "No heu seleccionat cap canal."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "Arrossega'm per a canviar la mida dels quadres."
@@ -1154,35 +1154,35 @@ msgstr "Ajuda"
msgid "Help topic not found."
msgstr "No s'ha trobat el tema a l'ajuda."
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "S'està afegint la categoria %s."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "Ja s'ha importat"
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "D'acord!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "Error mentre s'analitza el document."
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "Error: si us plau carregueu el fitxer OPML."
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "Error: no es pot trobar els elements del cos."
@@ -2258,76 +2258,76 @@ msgstr "Mostra/amaga els canals llegits"
msgid "Sort feeds by unread count"
msgstr "Ordena els canals per articles no llegits"
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr "No s'ha pogut afegir el filtre: no hi ha coincidències."
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal."
-#: functions.js:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "S'està subscrivint a un canal..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "Subscrit als canals:"
-#: functions.js:1403
+#: functions.js:1323
#, 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:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "No esteu subscrit a cap canal."
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "Subscrit als canals:"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "No heu seleccionat cap canal."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
msgstr ""
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "Elimina les dades emmagatzemades"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "Si us plau, seleccioneu un canal."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr ""
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "Si us plau, escriviu un títol per a l'etiqueta:"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut."
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "Us voleu donar de baixa de %s ?"
@@ -2394,206 +2394,206 @@ msgstr ""
"Tiny Tiny RSS no ha pogut accedir al servidor. Voleu que funcioni fora de "
"línia?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "Error: No s'ha especificat la URL del canal."
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "Error: URL del canal no vàlida."
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "No s'ha pogut afegir la categoria: no s'ha especificat cap nom."
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "No s'ha pogut afegir la categoria: no s'ha especificat cap nom."
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "Si us plau, introduïu la vostra identificació (login)"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "No heu seleccionat cap etiqueta."
-#: prefs.js:468
+#: prefs.js:470
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "No heu seleccionat cap usuari."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "No heu seleccionat cap filtre."
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "Us voleu donar de baixa dels canals seleccionats?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Si us plau, seleccioneu només un canal."
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr ""
"Esteu segur que voleu suprimir tots els articles que no estan marcats als "
"canals seleccionats?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Quants dies voleu mantenir els articles (0 - per defecte)?"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "No hi ha cap article seleccionat."
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "No heu seleccionat cap categoria."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "El nom del camp no es pot deixar en blanc."
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Si us plau, seleccioneu només un usuari."
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Si us plau, seleccioneu només un filtre."
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "No hi ha cap fitxer OPML per a carregar."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "Esteu segur que voleu establir els valors per defecte?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "Voleu canviar l'adreça de publicació per una de nova?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Voleu canviar l'adreça de publicació per una de nova?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "Voleu desar la configuració actual?"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr ""
"Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
"personalitzades?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Esteu segur que voleu recuperar tots els articles? Aquesta operació pot "
"durar molt temps."
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "Esteu segur que voleu suprimir el filtre %s?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr ""
"Esteu segur que voleu canviar els colors de les etiquetes pels colors per "
"defecte?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "Si us plau, escriviu un nou color pel primer pla de l'etiqueta:"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "Si us plau, escriviu el nou color de fons de l'etiqueta:"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr ""
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "mostra els canals"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "No us podeu donar de baixa de la categoria."
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "Primerament heu de seleccionar un canal."
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "Esteu segur que voleu eliminar l'ordre de les categories?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "No podeu editar aquest tipus de canal."
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
@@ -2669,6 +2669,9 @@ msgstr "Esteu segur que voleu marcar %d article(s) com a llegit(s) ?"
msgid "Please enter a note for this article:"
msgstr "Si us plau, escriviu una nota per aquest article:"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "Limita l'ús de l'ample de banda."
+
#~ msgid "Reset category order"
#~ msgstr "Reinicia l'ordre de les categories"
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index f0616f5a7..233f2080d 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 fc9c97eb7..f4d03be4b 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-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: \n"
"Last-Translator: Kevin Kraft \n"
"Language-Team: Deutsch \n"
@@ -83,7 +83,7 @@ msgstr "Täglich"
msgid "Weekly"
msgstr "Wöchentlich"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "Standard"
@@ -189,183 +189,183 @@ msgstr ""
"SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
"Konfiguration"
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr "Session konnte nicht validiert werden (falsche IP)"
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "falscher Benutzername oder Passwort"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Alle Feeds"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Unsortiert"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Sonderfeeds"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "Label"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "Bewertete Artikel"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "Veröffentlichte Artikel"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "Neue Artikel"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "Alle Artikel"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "Bewertete Artikel"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "Erzeugter Feed"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Ungelesen"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "Invertieren"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Aktionen..."
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "Auswahl umschalten:"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Bewertet"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Veröffentlicht"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "Auswahl:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Als gelesen markieren"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr "Archiv"
-#: functions.php:4253
+#: functions.php:4254
#, fuzzy
msgid "Move back"
msgstr "Zurück gehen"
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "Standard"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "Label zuweisen:"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "Kategorie auf-/zuklappen"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "Keine Feeds zum Anzeigen."
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Tags"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr " - "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "Tags für diesen Artikel bearbeiten"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "Artikelzusammenfassung in neuem Fenster anzeigen"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
#, fuzzy
msgid "Publish article with a note"
msgstr "Artikel veröffentlichen"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr "Original von:"
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Feed"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "unbekannter Typ"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "Anhang:"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "Anhänge:"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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 +374,11 @@ msgstr "Anhänge:"
msgid "Close this window"
msgstr "Dieses Fenster schließen"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "Feed nicht gefunden."
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -386,33 +386,33 @@ msgstr ""
"Konnte Feed nicht anzeigen (Abfrage fehlgeschlagen). Bitte prüfen Sie die "
"Label Übereinstimmungs Syntax oder die Spracheinstellungen."
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
#, fuzzy
msgid "mark as read"
msgstr "Als gelesen markieren"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "Klicken um den Artikel aufzuklappen"
-#: functions.php:5604
+#: functions.php:5607
#, fuzzy
msgid "toggle unread"
msgstr "Umschalten ungelesen"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "Keine bewerteten Artikel zum Anzeigen gefunden."
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -420,27 +420,27 @@ msgstr ""
"Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell "
"hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen."
-#: functions.php:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "Keine Artikel zum Anzeigen gefunden."
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "Label erstellen..."
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "(entfernen)"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "Keine Tags"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "Notiz bearbeiten"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Titel"
@@ -783,8 +783,8 @@ msgid "Create new account"
msgstr "Neues Konto erstellen"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "Bandbreitennutzung begrenzen"
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -808,11 +808,11 @@ msgstr ""
msgid "Return to preferences"
msgstr "Zu den Einstellungen zurückkehren"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Ladevorgang, bitte warten..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -822,40 +822,40 @@ 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
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Hallo,"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "Einstellungen verlassen"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Abmelden"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "Tastaturbefehle"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Einstellungen"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "Feeds"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "Filter"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "Benutzer"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
msgid "Fatal Exception"
msgstr "Schwerer Ausnahmefehler"
@@ -919,154 +919,154 @@ msgstr "Konto erfolgreich erstellt."
msgid "New user registrations are currently closed."
msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "Kommentare?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr "Offline Lesen"
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "Synchronisierung abbrechen"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "Synchronisiere"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "Gespeicherte Daten entfernen"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "Offline gehen"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "Neue Version von Tiny Tiny RSS verfügbar!"
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "Online gehen"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "Tagwolke"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "Suchen..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Feed Aktionen:"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "Feed abonnieren..."
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "Diesen Feed bearbeiten..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr "Feed neu bewerten"
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "Abbestellen"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Alle Feeds:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Gelesene ein-/ausblenden"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Neu kategorisieren"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "In den Sortiermodus für Kategorien wechseln"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Passwort zurücksetzen"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Andere Aktionen:"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "Filter erstellen..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "UI Layout zurücksetzen"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "Tastaturbefehle"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "Feedliste verbergen"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "Neue Artikel"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "Adaptiv"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "Alle Artikel"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr "Bewertung ignorieren"
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Aktualisiert"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "Artikel bewerten"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "Datum"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr "Bewertung"
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Aktualisieren"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "Kein Feed ausgewählt."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "Zieh mich um die Größe des Panels anzupassen"
@@ -1149,35 +1149,35 @@ msgstr "Hilfe"
msgid "Help topic not found."
msgstr "Hilfe Thema nicht gefunden."
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "Füge Kategorie %s hinzu."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "Bereits importiert."
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "OK!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "Fehler beim analysieren des Dokuments."
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "Fehler: bitte eine OPML Datei hochladen."
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "Fehler: kein Body-Element gefunden."
@@ -2261,48 +2261,48 @@ msgstr "Gelesene ein-/ausblenden"
msgid "Sort feeds by unread count"
msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr "Kann den Filter nicht hinzufügen: keine Übereinstimmung vorhanden."
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr "Kann Feed nicht abonnieren: keine Feed URL angegeben."
-#: functions.js:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "Abonniere Feed..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "Abonnierte Feeds:"
-#: functions.js:1403
+#: functions.js:1323
#, fuzzy
msgid "Can't subscribe to the specified URL."
msgstr "Kann Feed nicht abonnieren: keine Feed URL angegeben."
-#: functions.js:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "Sie können die Kategorie nicht abbestellen."
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr "Neue Artikel verfügbar (klicken zum anzeigen)"
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "Abonnierte Feeds:"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "Keine Feeds ausgewählt."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
@@ -2310,29 +2310,29 @@ msgstr ""
"ausgewählte Feed aus dem Archiv löschen? Feeds mit gespeicherten Artikeln "
"werden nicht gelöscht"
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "Gespeicherte Daten entfernen"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "Bitte einen Feed auswählen."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr "Neues Icon für diesen Feed hochladen"
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "Bitte einen Label-Titel eingeben:"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "Kann das Label nicht hinzufügen: fehlender Titel."
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "Abbestellen von %s?"
@@ -2399,40 +2399,40 @@ msgstr ""
"Tiny Tiny RSS hat Probleme seinen Server anzusteuern. Möchten Sie offline "
"arbeiten?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "Fehler: Keine Feed URL angegeben."
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "Fehler: Ungültige Feed URL."
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Kann die Kategorie nicht hinzufügen: kein Name angegeben."
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "Kann die Kategorie nicht hinzufügen: kein Name angegeben."
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "Bitte Benutzernamen eingeben:"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "Ausgewählte Label entfernen?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "Keine Label ausgewählt."
-#: prefs.js:468
+#: prefs.js:470
#, fuzzy
msgid ""
"Remove selected users? Neither default admin nor your account will be "
@@ -2441,162 +2441,162 @@ msgstr ""
"ausgewählte Profile löschen? Das Aktive und das Standardprofil werden nicht "
"gelöscht"
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "Keine Benutzer ausgewählt."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "Ausgewählte Filter entfernen?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "Keine Filter ausgewählt."
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "Ausgewählte Feeds abbestellen?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Bitte nur einen Feed auswählen."
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr "Alle nicht bewerteten Artikel im ausgewählten Feed löschen?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Artikel von wievielen Tagen aufbewahren (0 - Standardwert nutzen)?"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
"ausgewählte Profile löschen? Das Aktive und das Standardprofil werden nicht "
"gelöscht"
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "Kein Artikel ausgewählt."
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "Ausgewählte Kategorien entfernen?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "Keine Kategorien ausgewählt."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "Feld für Benutzername darf nicht leer sein."
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Bitte nur einen Benutzer auswählen."
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Bitte nur einen Filter auswählen."
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "Keine OPML Datei zum Hochladen."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "Auf Standardwerte zurücksetzen?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "Aktuelle Einstellungen speichern?"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr "Artikel in gewählten Feeds neu bewerten?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Alle Artikel neu bewerten? Dieser Vorgang kann viel Zeit in Anspruch nehmen."
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "Filter entfernen %s?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "Änderungen an den gewählten Feeds speichern?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr "Label-Farben auf Standardwerte zurücksetzen?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "Bitte eine neue Label-Vordergrundfarbe eingeben:"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "Bitte eine neue Label-Hintergrundfarbe eingeben:"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "Ausgewählte Filter entfernen?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr "Bitte ein Profil zum aktivieren auswählen"
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "Feeds anzeigen"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "Alle Artikel als gelesen markieren?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "Sie können die Kategorie nicht abbestellen."
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "Bitte erst einen Feed auswählen."
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "Kategoriefolge zurücksetzen?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "Alle Artikel in %s als gelesen markieren?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "Sie können diese Art von Feed nicht bearbeiten."
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr "Sie können diese Art von Feed nicht neu bewerten."
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr "Artikel in %s neu bewerten?"
@@ -2665,6 +2665,9 @@ msgstr "%d Artikel als gelesen markieren?"
msgid "Please enter a note for this article:"
msgstr "Tags für diesen Artikel bearbeiten"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "Bandbreitennutzung begrenzen"
+
#~ msgid "Reset category order"
#~ msgstr "Kategoriefolge zurücksetzen"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index c5851f81a..253e5a4ef 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 f1f3ee711..91ab3500f 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-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2009-11-10 00:12+0100\n"
"Last-Translator: Manuel Gualda Caballero \n"
"Language-Team: Español \n"
@@ -77,7 +77,7 @@ msgstr "Diariamente"
msgid "Weekly"
msgstr "Semanalmente"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "Por defecto"
@@ -182,182 +182,182 @@ msgstr ""
"La prueba de escape SQL ha fallado. Por favor, revise la configuración de su "
"base de datos y PHP."
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr "No se pudo validar la sesión (IP incorrecta)"
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "Nombre de usuario o contraseña incorrecta"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Todas las fuentes"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Sin clasificar"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Especial"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "Etiquetas"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "Favoritos"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "Publicados"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "Recientes"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "Todos"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "Favoritos"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "Fuente generada"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Sin leer"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "Invertir"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Acciones..."
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "Cambiar la selección:"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Favoritos"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Publicado"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "Selección:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Marcar como leído"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
#, fuzzy
msgid "Move back"
msgstr "Volver atrás"
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "Por defecto"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "Asignar etiqueta:"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "Plegar la categoría"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "No hay fuentes que mostrar."
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Etiquetas"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr " - "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "Editar las etiquetas de este artículo"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "Mostrar el sumario del artículo en una nueva pestaña o ventana"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr "Publicar el artículo con una nota"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Fuente"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "tipo desconocido"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "Adjunto:"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "Adjuntos:"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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 +366,11 @@ msgstr "Adjuntos:"
msgid "Close this window"
msgstr "Cerrar esta ventana"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "Fuente no encontrada."
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -378,31 +378,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:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
msgid "mark as read"
msgstr "marcar como leído"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "Desplegar el artículo"
-#: functions.php:5604
+#: functions.php:5607
msgid "toggle unread"
msgstr "cambiar a sin leer"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "No se han encontrado artículos sin leer."
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "No se han encontrado artículos actualizados."
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "No se han encontrado artículos favoritos."
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -411,27 +411,27 @@ msgstr ""
"artículos a las etiquetas manualmente (ver el menú Acciones -arriba-) o usar "
"un filtro."
-#: functions.php:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "No se han encontrado artículos que desplegar."
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "Crear etiqueta..."
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "(eliminar)"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "sin etiquetas"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "editar nota"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Título"
@@ -787,8 +787,8 @@ msgid "Create new account"
msgstr "Crear una nueva cuenta"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "Limitar el uso de ancho de banda"
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -812,11 +812,11 @@ msgstr ""
msgid "Return to preferences"
msgstr "Volver a las preferencias"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Cargando. Por favor, espere..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -826,40 +826,40 @@ msgstr ""
"navegador no lo soporta actualmente. Por favor, revise las opciones de "
"configuración de su navegador."
-#: prefs.php:90 tt-rss.php:112
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Hola,"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "Salir de las preferencias"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Cerrar sesión"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "Atajos de teclado"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Preferencias"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "Fuentes"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "Filtros"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "Usuarios"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
msgid "Fatal Exception"
msgstr ""
@@ -924,154 +924,154 @@ msgstr "Cuenta creada correctamente."
msgid "New user registrations are currently closed."
msgstr "El registro de nuevos usuarios está cerrado en estos momentos."
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "¿Comentarios?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr "Lectura fuera de línea"
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "Cancelar la sincronización"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "Sincronizar"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "Eliminar los datos almacenados"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "Poner fuera de línea"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "Poner en línea"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "nube de etiquetas"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "Buscar..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Acciones de la fuente:"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "Suscribir a la fuente..."
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "Editar esta fuente..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr "Reiniciar la puntuación"
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "Cancelar la suscripción"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Todas las fuentes:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Ocultar/Mostrar las leídas"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Volver a categorizar"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "Cambiar a modo de reordenación de categorías"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Redefinir contraseña"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Otras acciones:"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "Crear filtro..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "Reajustar la interfaz"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "Atajos de teclado"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "Plegar la lista de fuentes"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "Recientes"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "Adaptable"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "Todos"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr "Ignorar la puntuación"
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Actualizados"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "Marcar el artículo como favorito"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "Fecha"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr "Puntos"
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Actualizar"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "No se ha seleccionado ninguna fuente."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "Arrástrame para redimensionar los paneles"
@@ -1157,35 +1157,35 @@ msgstr "Ayuda"
msgid "Help topic not found."
msgstr "Tema de ayuda no encontrado."
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "Añadiendo categoría %s."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "Ya importado."
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "¡TODO CORRECTO!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "Error mientras se analizaba el documento."
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "Error: por favor, suba un fichero OPML."
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "Error: no se puede encontrar el elemento \"body\"."
@@ -2269,76 +2269,76 @@ 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:1332
+#: functions.js:1252
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:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr "Suscripción imposible: no se ha indicado la URL de la fuente."
-#: functions.js:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "Suscribiéndose a la fuente..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "Suscrito a las fuentes:"
-#: functions.js:1403
+#: functions.js:1323
#, fuzzy
msgid "Can't subscribe to the specified URL."
msgstr "Suscripción imposible: no se ha indicado la URL de la fuente."
-#: functions.js:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "No está suscrito a ninguna fuente."
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "Suscrito a las fuentes:"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "No se han seleccionado fuentes."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
msgstr ""
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "Eliminar los datos almacenados"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "Por favor, seleccione una fuente."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr ""
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "Por favor, introduzca el título de la etiqueta:"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "No se puede crear la etiqueta: falta el título."
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "¿Cancelar la suscripción a %s?"
@@ -2405,203 +2405,203 @@ msgstr ""
"Tiny Tiny RSS tiene problemas para acceder a su servidor. ¿Desea ponerlo en "
"modo fuera de línea?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "Error: no se ha indicado la URL de la fuente."
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "Error: la URL de la fuente no es válida."
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "No se puede añadir la categoría: no se ha especificado el nombre."
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "No se puede añadir la categoría: no se ha especificado el nombre."
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "Por favor, introduzca el nombre de usuario:"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr ""
"No se puede crear el usuario: no se ha especificado el nombre de usuario."
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "¿Eliminar las etiquetas seleccionadas?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "No se han seleccionado etiquetas."
-#: prefs.js:468
+#: prefs.js:470
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "No se han seleccionado usuarios."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "¿Eliminar los filtros seleccionados?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "No se han seleccionado filtros."
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Por favor, seleccione una única fuente."
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr "¿Borrar todos los artículos no favoritos de la fuente seleccionada?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
"¿Cuántos días desea guardar el artículo? (0 = configuración por defecto)"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "No se ha seleccionado ningún artículo."
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "¿Eliminar las categorías seleccionadas?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "No se han seleccionado categorías."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "El campo de nombre de usuario no puede dejarse en blanco."
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Por favor, seleccione un único usuario."
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "¿Reajustar la contraseña del usuario seleccionado?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Por favor, seleccione un único filtro."
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "No hay fichero OPML que subir."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "¿Reajustar a las opciones por defecto?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "¿Reemplazar la actual dirección de publicación por una nueva?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "¿Reemplazar la actual dirección de publicación por una nueva?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "¿Guardar la configuración actual?"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr ""
"¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"¿Reiniciar la puntuación de todos los artículos? Esta operación puede tomar "
"algo de tiempo."
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "¿Eliminar el filtro %s?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr "¿Reajustar los colores de la etiqueta a las opciones por defecto?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "Por favor, introduzca un nuevo color de primer plano para la etiqueta:"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "Por favor, introduzca un nuevo color de fondo para la etiqueta:"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "¿Eliminar los filtros seleccionados?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr ""
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "desplegar fuentes"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "¿Marcar todos los artículos como leídos?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "No puede cancelar la suscripción a la categoría."
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "Por favor, seleccione alguna fuente primero."
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "¿Reajustar el orden de la categoría?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "¿Marcar todos los artículos de %s como leídos?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "No puede editar esta clase de fuente."
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr "No puede reiniciar la puntuación de esta clase de fuente."
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr "¿Reiniciar la puntuación de los artículos de %s?"
@@ -2669,6 +2669,9 @@ msgstr "¿Marcar %d artículo(s) como leído(s)?"
msgid "Please enter a note for this article:"
msgstr "Por favor, introduzca una nota para este artículo:"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "Limitar el uso de ancho de banda"
+
#~ msgid "Reset category order"
#~ msgstr "Reordenar categorías"
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 65a13520c..98a5bcaac 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 e0f6f5801..32696de25 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-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2007-11-20 23:01+0100\n"
"Last-Translator: Ploc \n"
"Language-Team: Français \n"
@@ -82,7 +82,7 @@ msgstr "Une fois par jour"
msgid "Weekly"
msgstr "Une fois par semaine"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "Utiliser la valeur par défaut"
@@ -191,182 +191,182 @@ msgstr ""
"Le test d'échappement sql a échoué, vérifier votre base de donnée et votre "
"configuration de php."
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr "Echec de la validation de la session (adresse ip incorrecte)"
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "Login ou mot de passe incorrect"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Tous les flux"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Sans catégorie"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Spécial"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "Etiquettes"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "Articles remarquables"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "Articles publiés"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "Nouveaux articles"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "Tous les articles"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "Articles remarquables"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "Flux généré"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Non lus"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "Inverse"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Actions..."
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "Sélection :"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Remarquables"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Publiés"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "Sélection :"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Marquer comme lu"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
#, fuzzy
msgid "Move back"
msgstr "Revenir"
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "Utiliser la valeur par défaut"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "Assigner l'étiquette :"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "Cliquer pour contracter la catégorie"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "Aucun flux à afficher."
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Tags"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr " - "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "Editer les tags pour cet article"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "Afficher le résumé des articles dans une nouvelle fenêtre"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr "Publier l'article avec une note"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Flux"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "type inconnu"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "Fichier attaché :"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "Fichiers attachés :"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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 +375,11 @@ msgstr "Fichiers attachés :"
msgid "Close this window"
msgstr "Fermer cette fenêtre"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "Flux non trouvé."
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -387,31 +387,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:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
msgid "mark as read"
msgstr "marquer comme lu"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "Cliquer pour développer l'article"
-#: functions.php:5604
+#: functions.php:5607
msgid "toggle unread"
msgstr "marquer comme non-lu"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "Aucun article non-lu à afficher"
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "Aucun article mis à jour à afficher"
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "Aucun article remarquable à afficher"
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -420,27 +420,27 @@ msgstr ""
"articles manuellement (voir les actions du menu ci-dessus) ou utiliser un "
"filtre."
-#: functions.php:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "Aucun article à afficher"
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "Créer une étiquette..."
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "(supprimer)"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "aucun tag"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "éditer la note"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Titre"
@@ -790,8 +790,8 @@ msgid "Create new account"
msgstr "Créer un nouveau compte"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "Limiter l'usage de la bande passante"
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -816,11 +816,11 @@ msgstr ""
msgid "Return to preferences"
msgstr "Revenir à la configuration"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Chargement en cours, veuillez patienter..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -830,40 +830,40 @@ 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
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Bonjour,"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "Quitter la configuration"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Déconnexion"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "Raccourcis clavier"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Configuration"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "Flux"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "Filtres"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "Utilisateurs"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
msgid "Fatal Exception"
msgstr ""
@@ -927,154 +927,154 @@ msgstr "Compte créé avec succès."
msgid "New user registrations are currently closed."
msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "Commentaires ?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr "Lecture hors-ligne"
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "Annuler la synchronisation"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "Synchroniser"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "Supprimer les données stockées"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "Passer hors-ligne"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "Une nouvelle version de Tiny Tiny RSS est disponible !"
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "Passer en ligne"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "nuage de tags"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "Rechercher..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Actions sur ce flux :"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "S'inscrire à un flux..."
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "Editer ce flux..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr "Recalculer le score du flux"
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "Se désinscrire"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Tous les flux :"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "(Dé)Masquer les flux lus"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Changer de catégorie"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "Activer le classement selon la catégorie"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Réinitialiser le mot de passe"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Autres actions :"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "Créer un filtre..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "Ré-initialiser l'affichage"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "Raccourcis clavier"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "Contracter la liste des flux"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "Nouveaux articles"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "Adaptatif"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "Tous les articles"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr "Ignorer le score"
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Mis à jour"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "Marquer comme remarquable"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "Date"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr "Score"
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Mettre à jour"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "Aucun flux sélectionné."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "Déplacez-moi pour redimensionner les panneaux"
@@ -1159,35 +1159,35 @@ msgstr "Aide"
msgid "Help topic not found."
msgstr "Sujet non trouvé dans l'aide."
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "Ajout de la catégorie %s."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "Déjà importé"
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "OK !"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "Erreur lors de l'analyse du document."
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "Erreur : veuillez envoyer un document OPML."
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "Erreur : impossible de trouver la balise body."
@@ -2273,48 +2273,48 @@ msgstr "(Dé)Masquer les flux lus"
msgid "Sort feeds by unread count"
msgstr "Trier les flux par nombre d'articles non lus"
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr "Impossible d'ajouter un filtre : aucune correspondance."
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr "Impossible de s'inscrire : aucune URL de flux n'a été fournie."
-#: functions.js:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "Inscription au flux..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "Inscrit aux flux :"
-#: functions.js:1403
+#: functions.js:1323
#, fuzzy
msgid "Can't subscribe to the specified URL."
msgstr "Impossible de s'inscrire : aucune URL de flux n'a été fournie."
-#: functions.js:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "Vous ne pouvez pas vous désinscrire de la catégorie."
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr "Nouveaux articles disponible dans ce flux (cliquer pour les afficher)"
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "Inscrit aux flux :"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "Aucun flux sélectionné."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
@@ -2322,29 +2322,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:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "Supprimer les données stockées"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "Veuillez sélectionner une image à envoyer."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr "Envoyer une nouvelle icône pour ce flux ?"
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "Veuillez saisir le libellé de l'étiquette :"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "Impossible de créer une étiquette : libellé manquant."
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "Se désinscrire de %s ?"
@@ -2413,40 +2413,40 @@ msgstr ""
"Tiny Tiny RSS rencontre des problèmes pour accéder au serveur. Voulez-vous "
"passer en mode hors-ligne ?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "Erreur : aucune URL de flux n'a été fournie."
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "Erreur : URL du flux est invalide."
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Impossible d'ajouter une catégorie : aucun nom fourni."
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "Impossible d'ajouter une catégorie : aucun nom fourni."
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "Veuillez saisir le login :"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr "Impossible de créer l'utilisateur : aucun login spécifié."
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "Supprimer les étiquettes sélectionnées ?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "Aucune étiquette sélectionnée."
-#: prefs.js:468
+#: prefs.js:470
#, fuzzy
msgid ""
"Remove selected users? Neither default admin nor your account will be "
@@ -2455,166 +2455,166 @@ msgstr ""
"Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne "
"seront pas supprimés."
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "Aucun utilisateur sélectionné."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "Supprimer les filtres sélectionnés ?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "Aucun filtre sélectionné."
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "Se désinscrire des flux sélectionnés ?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Veuillez sélectionner un seul flux."
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr ""
"Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
"Combien de jour faut-il conserver l'article (entrer 0 pour utiliser la "
"valeur par défaut)"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
"Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne "
"seront pas supprimés."
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "Aucun article sélectionné."
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "Supprimer les catégories sélectionnées ?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "Aucune catégorie sélectionnée."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "Le nom ne peut pas être vide."
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Veuillez sélectionner un seul utilisateur."
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Veuillez sélectionner un seul filtre."
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "Aucun fichier OPML à envoyer."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "Revenir aux valeurs par défaut ?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "Remplacer l'adresse de publication actuelle ?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Remplacer l'adresse de publication actuelle ?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "Enregistrer la configuration actuelle ?"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr "Recalculer le score des articles des flux sélectionnés ?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Recalculer le score de tous les articles ? Cette opération peut prendre "
"beaucoup de temps."
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "Supprimer le filtre %s ?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "Enregistrer les modifications aux flux sélectionnés ?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "Veuillez saisir la couleur d'avant-plan de l'étiquette :"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "Veuillez saisir la couleur d'arrière-plan de l'étiquette :"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "Supprimer les filtres sélectionnés ?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr "Veuillez sélectionner un profil à activer"
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "afficher les flux"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "Marquer tous les articles comme lus ?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "Vous ne pouvez pas vous désinscrire de la catégorie."
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "Veuillez d'abord sélectionner un flux."
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "Réinitialiser l'ordre des catégories ?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "Marquer tous les articles de %s comme lus ?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "Vous ne pouvez pas éditer ce type de flux."
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr "Recalculer le score des articles de %s ?"
@@ -2682,6 +2682,9 @@ msgstr "Marquer %d article(s) comme lu(s) ?"
msgid "Please enter a note for this article:"
msgstr "Veuillez saisir une note pour cet article :"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "Limiter l'usage de la bande passante"
+
#~ msgid "Reset category order"
#~ msgstr "Re-initialiser l'ordre des catégories"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 462ce1f03..1bd743bc5 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 7fd2fa884..014af2663 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-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2009-08-17 23:04+0100\n"
"Last-Translator: MoJo2009\n"
"Language-Team: HUNGARIAN\n"
@@ -81,7 +81,7 @@ msgstr "Napi"
msgid "Weekly"
msgstr "Heti"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "Alapértelmezett"
@@ -180,182 +180,182 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr ""
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "Hibás felhasználói név vagy jelszó"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Összes hírcsatorna"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Kategorizálatlan"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Kiemelt"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "Címkék"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "Csillagos hírek"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "Publikált hírek"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "Friss hírek"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "Az összes hír"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "Tárolt hírek"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "Generált hírcsatorna"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Olvasatlan"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "Fordított"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Műveletek"
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "Kiválasztott legyen:"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Csillagos"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Publikált"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "Kiválasztott hírcsatornák:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Olvasottá tesz"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
#, fuzzy
msgid "Move back"
msgstr "Vissza"
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "Alapértelmezett"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "Besorolás címke alá:"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "Kattintson ide a kategória összecsukásához"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "Nincs megjelenítendő hírcsatorna."
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Címkék"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr "-"
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "Címkék hozzáadása a hírhez"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "Hírösszefoglaló megjelenítése új ablakban."
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr "Hír publikálása megjegyzéssel"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Hírcsatorna"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "ismeretlen hírcsatornatípus"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "Csatolmány:"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "Csatolmányok:"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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 +364,41 @@ msgstr "Csatolmányok:"
msgid "Close this window"
msgstr "Ablak bezárása"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "Hírcsatorna nem található"
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
msgid "mark as read"
msgstr "olvasottként jelöl"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "Hír kinyitása"
-#: functions.php:5604
+#: functions.php:5607
msgid "toggle unread"
msgstr "olvasatlanná tesz"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "Nincs megjeleníthető olvasatlan hír."
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "Nincs megjeleníthető friss hír."
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "Nincs megjeleníthető csillagos hír."
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -407,27 +407,27 @@ 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:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "Nincs megjeleníthető hír."
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "Új címke létrehozása..."
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "(eltávolít)"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "nincs címke"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "jegyzet szerkesztése"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Cím"
@@ -771,8 +771,8 @@ msgid "Create new account"
msgstr "Új felhasználói fiók létrehozása"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "Sávszélesség-használat korlátozása"
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -796,11 +796,11 @@ msgstr ""
msgid "Return to preferences"
msgstr "Vissza a beállításokhoz"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Töltés, kérem várjon..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -810,40 +810,40 @@ 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
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Üdv,"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 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
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Kijelentkezés"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "Billentyűparancsok"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Beállítások"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "Hírcsatornák"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "Szűrők"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "Felhasználók"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
#, fuzzy
msgid "Fatal Exception"
msgstr "Végzetes Hiba"
@@ -908,154 +908,154 @@ msgstr "Felhasználói fiók sikeresen létrehozva"
msgid "New user registrations are currently closed."
msgstr "Új felhasználók regisztrációja jelenleg nem engedélyezett."
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "Hozzászólások?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr ""
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "Szinkronizálás megszakítása"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "Szinkronizálás"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "Tárolt adatok eltávolítása."
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "Váltás kapcsolat nélküli módra"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "Kilépés kapcsolat nélküli módból"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "címkefelhő"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "Keresés..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Műveletek hírcsatornákkal:"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "Feliratkozás hírcsatornára..."
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "Hírcsatorna szerkesztése..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr ""
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "Leiratkozás"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Az összes hírcsatorna:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Olvasottak rejtése/mutatása"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Kategória:"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "Kategória-újrarendezés bekapcsolása"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Jelszó reset"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Egyéb műveletek:"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "Szűrő létrehozása..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "UI-kiosztás visszaállítása"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "Billentyűparancsok"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "Hírcsatornalista összecsukása"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "Tárolt hírek"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "Adaptív"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "Minden hír"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Frissített"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "Tárolt hírek"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "Dátum"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr ""
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Frissítés"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "Nincs kiválasztott hírcsatorna."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "A panelek újraméretezéséhez fogj meg az egérrel és húzz arrébb"
@@ -1136,35 +1136,35 @@ msgstr "Segítség"
msgid "Help topic not found."
msgstr "Súgótéma nem tlálható."
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "Kategória hozzáadása %s...
"
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "Már importálva."
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "OK!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "Hiba történt a dokuementum feldoglozása közben"
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "Hiba: kérem töltse fel az OPML fájlt!"
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr ""
@@ -2231,78 +2231,78 @@ 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:1332
+#: functions.js:1252
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:1367
+#: functions.js:1287
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:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "Feliratkozás a hírcsatornára..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "Feliratkozva a következő hírcsatornákra:"
-#: functions.js:1403
+#: functions.js:1323
#, 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:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "Ebből a kategóriából nem ."
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "Feliratkozva a következő hírcsatornákra:"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "Nincs kiválasztott hírcsatorna."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
msgstr ""
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "Tárolt adatok eltávolítása."
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "Válasszon egy hírcsatornát."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr ""
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "Adja meg címke nevét:"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "Címke létrehozása sikertelen: nincs megadva név."
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "Leiratkozik innen: %s?"
@@ -2371,203 +2371,203 @@ msgstr ""
"A Tiny Tiny RSS-nek nem sikerül hozzáférnie a szerverhez. Átvált offline "
"üzemmódba?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "Hiba: Nincs megadva hírcsatorna URL."
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "Hiba: Hibás hírcsatorna-URL cím"
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Kategória hozzáadása sikertelen: nincs megadva név."
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "Kategória hozzáadása sikertelen: nincs megadva név."
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "Kérem adja meg a felhasználói nevét:"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói név."
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "Eltávolítja a kiválasztott címkéket?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "Nincs kiválasztott címke."
-#: prefs.js:468
+#: prefs.js:470
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "Nincs kijelölt felhasználó."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "Eltávolítja a kiválasztott szűrőket?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "Nincs kiválasztott szűrő."
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Kérem csak egy hírcsatornát jelöljön meg!"
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr "Eltávolítja az összes csillag nélküli hírt a kijelölt hírcsatornából?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
"Milyen régi híreket szeretne megtartani (napokban; 0 - alapértelmezett)?"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "Nincs kiválasztott hír."
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "Kiválasztott kategóriák eltávolítása?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "Nincs kategória kiválaszta."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "A felhasználói név nem maradhat üresen."
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Kérem csak egy felhasználót jelöljön meg!"
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "Visszaállítja akiválasztott felhasználók jelszavakit?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Kérem csak egy szűrőt jelöljön meg!"
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "Nincs feltöltendő OPML fájl megjelölve."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "Visszaállítja a gyári beállításokat?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr ""
"Biztosan lecseréli a jelenlegi publikált hírek hírcsatornájának címét egy "
"újra?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr ""
"Biztosan lecseréli a jelenlegi publikált hírek hírcsatornájának címét egy "
"újra?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "Menti a jelenlegi beállításokat?"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr ""
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "Eltávolítja a következő szűrőt: %s?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr "Visszaállítja a címkeszíneket az alapértelmezettre?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "Adja meg az új címke-előtérrszín nevét:"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "Adja meg az új címke-háttérszín nevét:"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "Eltávolítja a kiválasztott szűrőket?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr ""
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "hírcsatornák megjelenítése"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "Minden hírt olvasottá tesz?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "Ebből a kategóriából nem ."
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "Válasszon hírcsatorná(ka)t!"
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "Visszaállítja a kategória rendjét"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "Minden hírt olvasottá tesz itt: %s?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr ""
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr ""
@@ -2635,6 +2635,9 @@ msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
msgid "Please enter a note for this article:"
msgstr "Megyjegyzés csatolása ehhez a hírhez:"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "Sávszélesség-használat korlátozása"
+
#~ msgid "Reset category order"
#~ msgstr "Kategória rendjének visszaállítása"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 57f551c36..4a254cf5a 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 4be367a51..08cb4dff5 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-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2010-04-19 16:36+0200\n"
"Last-Translator: Andrea Zagli \n"
"Language-Team: Italian \n"
@@ -78,7 +78,7 @@ msgstr "Giornalmente"
msgid "Weekly"
msgstr "Settimanalmente"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "Predefinito"
@@ -182,178 +182,178 @@ msgstr ""
"Test di sanitizzazione dell'SQL fallito; controllare il database e la "
"configurazione del PHP"
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr "La validazione della sessione è fallita (IP non corretto)"
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "Nome utente o password sbagliati"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Tutti i notiziari"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Senza categoria"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Speciale"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "Etichette"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "Articoli con stella"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "Articoli pubblicati"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "Articoli nuovi"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "Tutti gli articoli"
-#: functions.php:3104
+#: functions.php:3105
msgid "Archived articles"
msgstr "Articoli archiviati"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "Notiziario generato"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Non letti"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "Inverti"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Azioni..."
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "Inverti selezione:"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Con stella"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Pubblicati"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "Selezione:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Segna come letto"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr "Archivio"
-#: functions.php:4253
+#: functions.php:4254
msgid "Move back"
msgstr "Sposta indietro"
-#: functions.php:4254
+#: functions.php:4255
msgid "Delete"
msgstr "Elimina"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "Assegna etichetta:"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "Fare clic per contrarre la categoria"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "Nessun notiziario da visualizzare."
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Etichette"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr " - "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "Modifica le etichette per questo articolo"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "Mostra il sommario dell'articolo in una nuova finestra"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr "Pubblica articolo con una nota"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr "Originariamente da:"
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
msgid "Feed URL"
msgstr "URL del notiziario"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "tipo sconosciuto"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "Allegato:"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "Allegati:"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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 +362,11 @@ msgstr "Allegati:"
msgid "Close this window"
msgstr "Chiudi questa finestra"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "Notiziario non trovato."
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -374,31 +374,31 @@ msgstr ""
"Impossibile visualizzare il notiziario (interrogazione fallita). Controllare "
"che l'etichetta corrisponda alla sintassi o la configurazione locale."
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
msgid "mark as read"
msgstr "segna come letto"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "Fare clic per espandere l'articolo"
-#: functions.php:5604
+#: functions.php:5607
msgid "toggle unread"
msgstr "inverti non letti"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "Nessun articolo non letto trovato da visualizzare."
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "Nessun articolo non aggiornato trovato da visualizzare."
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "Nessun articolo con stella trovato da visualizzare."
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -407,27 +407,27 @@ msgstr ""
"gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
"filtro."
-#: functions.php:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "Nessun articolo trovato da visualizzare."
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "Crea etichetta..."
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "(rimuovi)"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "nessuna etichetta"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "modifica note"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Titolo"
@@ -778,8 +778,8 @@ msgid "Create new account"
msgstr "Crea un nuovo utente"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "Limitare l'uso della banda"
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -803,11 +803,11 @@ msgstr ""
msgid "Return to preferences"
msgstr "Ritorna alle preferenze"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Caricamento, attendere prego..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -817,40 +817,40 @@ msgstr ""
"\t\tda questa applicazione per funzionare correttamente. Controllare\n"
"\t\tle impostazioni del browser."
-#: prefs.php:90 tt-rss.php:112
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Salve,"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "Esci dalle preferenze"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Esci"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "Scorciatoie da tastiera"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Preferenze"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "Notiziari"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "Filtri"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "Utenti"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
msgid "Fatal Exception"
msgstr "Errore fatale"
@@ -915,152 +915,152 @@ msgstr "Utente creato con successo."
msgid "New user registrations are currently closed."
msgstr "La registrazione di nuovi utenti è attualmente chiusa."
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "Commenti?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr "Lettura fuori linea"
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "Annulla sincronizzazione"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "Sincronizza"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "Rimuovi dati salvati"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "Vai «fuori linea»"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "Vai «in linea»"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "nuvola etichette"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "Cerca..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Azioni notiziari:"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "Sottoscrivi il notiziario..."
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "Modifica questo notiziario..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr "Cambia punteggio notiziario"
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "Annulla sottoscrizione"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Tutti i notiziari:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Visualizza/Nascondi notiziari letti"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Reimposta categoria"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "Inverti modalità riordinamento categoria"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Reimposta password"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Altre azioni:"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "Crea filtro..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "Reimposta disposizione UI"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "Scorciatoie da tastiera"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "Contrai elenco notiziari"
-#: tt-rss.php:213
+#: tt-rss.php:214
msgid "Show articles"
msgstr "Mostra articoli"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "Adattivo"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "Tutti gli articoli"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr "Ignora punteggio"
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Aggiornato"
-#: tt-rss.php:223
+#: tt-rss.php:224
msgid "Sort articles"
msgstr "Ordina articoli"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "Data"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr "Punteggio"
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Aggiorna"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "Nessun notiziario selezionato."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "Trascina per ridimensionare i riquadri"
@@ -1143,33 +1143,33 @@ msgstr "Aiuto"
msgid "Help topic not found."
msgstr "Argomento dell'aiuto non trovato."
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, php-format
msgid "Adding category %s."
msgstr "Aggiunta della categoria %s."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
msgid "is already imported."
msgstr "già importato."
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
msgid "OK"
msgstr "OK"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "Errore durante l'analisi del documento."
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "Errore: caricare il file OPML."
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "Errore: impossibile trovare l'elemento body"
@@ -2229,47 +2229,47 @@ msgstr "Nascondi notiziari letti"
msgid "Sort feeds by unread count"
msgstr "Ordinare i notiziari per numero di non letti"
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr "Impossibile aggiungere il filtro: niente a cui corrisponda."
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr ""
"Impossibile annullare la sottoscrizione: nessun URL di notiziario è stato "
"dato."
-#: functions.js:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "Sottoscrizione al notiziario..."
-#: functions.js:1394
+#: functions.js:1314
msgid "Subscribed to %s"
msgstr "Sottoscrizione effettuata a «%s»"
-#: functions.js:1403
+#: functions.js:1323
msgid "Can't subscribe to the specified URL."
msgstr "Impossibile sottoscrivere l'URL specificato."
-#: functions.js:1406
+#: functions.js:1326
msgid "You are already subscribed to this feed."
msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
"Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
-#: functions.js:2004
+#: functions.js:1924
msgid "Subscribed to %d feed(s)."
msgstr "Sottoscrizione effettuata a %d notiziari."
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "Nessun notiziario selezionato."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
@@ -2277,27 +2277,27 @@ msgstr ""
"Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
"archiviati non saranno rimossi."
-#: functions.js:2081
+#: functions.js:2001
msgid "Remove stored feed icon?"
msgstr "Rimuovi le icone salvate dei notiziari?"
-#: functions.js:2113
+#: functions.js:2033
msgid "Please select an image file to upload."
msgstr "Selezionare un file immagine da caricare."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr "Caricare una nuova icona per questo notiziario?"
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "Inserire l'intestazione dell'etichetta:"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "Impossibile creare l'etichetta: intestazione mancante."
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "Annullare la sottoscrizione a «%s»?"
@@ -2365,39 +2365,39 @@ msgstr ""
"Tiny Tiny RSS ha dei problemi a connettersi al proprio server. Si vuole "
"andare «fuori linea»?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "Errore: non è stato fornito alcun URL di notiziario."
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "Errore: URL non valido del notiziario."
-#: prefs.js:263
+#: prefs.js:265
msgid "Can't add profile: no name specified."
msgstr "Impossibile aggiungere il profilo: nessun nome specificato."
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "Impossibile aggiungere la categoria: nessun nome specificato."
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "Inserire l'accesso:"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr "Impossibile creare l'utente: nessun accesso specificato."
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "Rimuovere le etichette selezionate?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "Nessuna etichetta selezionata."
-#: prefs.js:468
+#: prefs.js:470
#, fuzzy
msgid ""
"Remove selected users? Neither default admin nor your account will be "
@@ -2406,162 +2406,162 @@ msgstr ""
"Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
"saranno rimossi."
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "Nessun utente selezionato."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "Rimuovere i filtri selezionati?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "Nessun filtro selezionato."
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Selezionare solo un notiziario."
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr ""
"Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Quanti giorni di articoli tenere (0 - utilizza il valore predefinito)?"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
"Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
"saranno rimossi."
-#: prefs.js:648
+#: prefs.js:650
msgid "No profiles selected."
msgstr "Nessun profilo selezionato."
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "Rimuovere le categorie selezionate?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "Nessuna categoria selezionata."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "Il campo accesso non può essere vuoto."
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Selezionare un solo utente."
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "Reimpostare la password per l'utente selezionato?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Selezionare solo un filtro."
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "Nessun file OPML da caricare."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "Reimpostare ai valori predefiniti?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "Sostituire l'indirizzo di pubblicazione attuale con uno nuovo?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Sostituire l'indirizzo di pubblicazione attuale con uno nuovo?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "Salvare la configurazione attuale?"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Cambiare il punteggio a tutti i notiziari? Questa operazione può durare "
"molto tempo."
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "Rimuovere il filtro «%s»?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "Salvare i cambiamenti ai notiziari selezionati?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr "Reimpostare i colori delle etichette ai valori predefiniti?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "Inserire il colore del testo nella nuova etichetta:"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "Inserire il colore di sfondo della nuova etichetta:"
-#: prefs.js:2157
+#: prefs.js:2104
msgid "Activate selected profile?"
msgstr "Attivare il profilo selezionato?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr "Scegliere un profilo da attivare"
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "visualizza notiziari"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "Segnare tutti gli articoli come letti?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "Impossibile annullare la sottoscrizione alla categoria."
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "Selezionare prima qualche notiziario."
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "Reimpostare l'ordine dalla categoria?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "Segnare tutti gli articoli in «%s» come letti?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "Impossibile modificare questo tipo di notiziario."
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr "Cambiare il punteggio degli articoli in «%s»?"
@@ -2626,6 +2626,9 @@ msgstr "Segnare %d articolo/i come letto/i?"
msgid "Please enter a note for this article:"
msgstr "Inserire una nota per questo articolo:"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "Limitare l'uso della banda"
+
#~ msgid "Reset category order"
#~ msgstr "Reimposta ordine categoria"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index ee7e5972b..22a960b07 100644
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index f992b8ebc..edfe497e6 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss unstable\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2009-05-12 03:25+0900\n"
"Last-Translator: Tadashi Jokagi \n"
"Language-Team: Japanese \n"
@@ -79,7 +79,7 @@ msgstr "毎日"
msgid "Weekly"
msgstr "毎週"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "標準"
@@ -184,182 +184,182 @@ msgstr ""
"SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
"確認してください。"
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr "セッションの検査に失敗しました (IP が正しくない)"
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "ユーザー名かパスワードが正しくありません"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "すべてのフィード"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "カテゴリー割り当てなし"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "特別"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "ラベル"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "お気に入りの記事"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "公開済みの記事"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "新しい記事"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "すべての記事"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "未読記事"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "生成したフィード"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "未読"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "反転"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "操作..."
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "選択の切り替え:"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "お気に入り"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "公開済み"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "選択:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "既読にする"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
#, fuzzy
msgid "Move back"
msgstr "戻る"
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "標準"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "ラベルの割り当て:"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "閉じたカテゴリーのクリック"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "表示するフィードがありません。"
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "タグ"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr " - "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "この記事のタグを編集する"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "記事の要約を新しいウィンドウで表示する"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr "ノートと記事を公開する"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "フィード"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "未知の種類"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "添付:"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "添付:"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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
@@ -368,11 +368,11 @@ msgstr "添付:"
msgid "Close this window"
msgstr "このウィンドウを閉じる"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "フィードが見つかりません。"
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -380,31 +380,31 @@ msgstr ""
"フィードを表示できません (問い合わせの失敗)。ラベル一致の文法かローカルの設定"
"を確認してください。"
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
msgid "mark as read"
msgstr "既読にする"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "開いた記事のクリック"
-#: functions.php:5604
+#: functions.php:5607
msgid "toggle unread"
msgstr "未読/既読を切り替える"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "表示する未読記事が見つかりませんでした。"
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "表示する更新された記事が見つかりませんでした。"
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "表示するお気に入りの記事が見つかりませんでした。"
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -412,27 +412,27 @@ msgstr ""
"表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
"ニューを参照します)、フィルターを使うことができます。"
-#: functions.php:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "表示する記事が見つかりません。"
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "ラベルを作成する..."
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "(削除)"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "タグがありません"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "ノートの編集"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "題名"
@@ -751,8 +751,8 @@ msgid "Create new account"
msgstr "新規アカウントの作成"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "帯域の制限を使う"
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -775,51 +775,51 @@ msgstr ""
msgid "Return to preferences"
msgstr "設定に戻る"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "読み込みんでいます。しばらくお待ちください..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
"\t\tbrowser settings."
msgstr ""
-#: prefs.php:90 tt-rss.php:112
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "ようこそ、"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "設定を終了する"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "ログアウト"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "キーボードショートカット"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "設定"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "フィード"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "フィルター"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "ユーザー"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
#, fuzzy
msgid "Fatal Exception"
msgstr "致命的なエラー"
@@ -881,154 +881,154 @@ msgstr "アカウントの作成に成功しました。"
msgid "New user registrations are currently closed."
msgstr "新規ユーザーの登録は現在行っていません。"
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "コメントしますか?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr "オフライン処理"
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "同期の取り消し"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "同期"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "保存したデータを削除する"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "オフラインに移行する"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "オンラインに移行する"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "タグクラウド"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "検索..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "フィード操作"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "フィードを購読する..."
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "フィードを編集する..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr "フィードのスコアを再計算しています..."
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "購読をやめる"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "すべてのフィード:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "読んだフィードを隠す/再表示する"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "カテゴリー:"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "カテゴリーの並び替えモードの切り替え"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "パスワードのリセット"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "その他の操作:"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "フィルターを作成しています..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "UI レイアウトをリセットする"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "キーボードショートカット"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "フィード一覧を閉じる"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "記事を保管しました"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "すべての記事"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr "スコア計算の無効化"
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "更新日時"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "記事を保管しました"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "日付"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr "スコア"
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "更新"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "フィードは選択されていません。"
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "パネルの大きさを変更するにはここをドラッグします"
@@ -1112,35 +1112,35 @@ msgstr "ヘルプ"
msgid "Help topic not found."
msgstr "ヘルプのトピックが見つかりません。"
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "カテゴリー %s の追加中です。"
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "既にインポート済みです。"
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "OK!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "ドキュメントの解析中のエラーです。"
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "エラー: OPML ファイルをアップロードしてください。"
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "エラー: 本文要素を見つけることができませんでした。"
@@ -2192,76 +2192,76 @@ msgstr "読んだフィードを隠す/再表示する"
msgid "Sort feeds by unread count"
msgstr "未読記事数によるフィードの並び替え"
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr "フィルターを追加できません: 一致するものがありません。"
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr "購読できません: フィード URL が入力されていません。"
-#: functions.js:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "フィードを購読しています..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "フィードを購読する:"
-#: functions.js:1403
+#: functions.js:1323
#, fuzzy
msgid "Can't subscribe to the specified URL."
msgstr "購読できません: フィード URL が入力されていません。"
-#: functions.js:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "カテゴリーから購読をやめることができません。"
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "フィードを購読する:"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "選択されたフィードはありません。"
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
msgstr ""
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "保存したデータを削除する"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "フィードをひとつ選択してください"
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr ""
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "ラベルのキャプションを入力してください:"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "ラベルが作成できません: キャプションが見当たりません。"
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "%s の購読をやめますか?"
@@ -2328,200 +2328,200 @@ msgstr ""
"Tiny Tiny RSS はサーバーへのアクセス中に障害がありました。オフラインモードに"
"移行しますか?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "エラー: フィードの URL が入力されていません。"
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "エラー: フィードの URL が正しくありません。"
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "カテゴリーが追加できません: 名前が指定されていません。"
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "カテゴリーが追加できません: 名前が指定されていません。"
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "ログイン名を入力してください:"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "選択したラベルを削除しますか?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "選択されたラベルはありません。"
-#: prefs.js:468
+#: prefs.js:470
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "選択されたユーザーはありません。"
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "選択されたフィルターを削除しますか?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "選択されたフィルターはありません。"
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "選択されたフィードの購読をやめますか?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "フィードをひとつだけ選択してください。"
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr ""
"選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr "記事を維持したい日数は? (0: 標準を使う)"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "選択された記事はありません。"
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "選択されたカテゴリーを削除しますか?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "選択されたカテゴリーはありません。"
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "ログイン名の項目は空にできません。"
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "ひとつだけユーザーを選択してください。"
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "選択したユーザーのパスワードをリセットしますか?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "フィルターをひとつだけ選択してください。"
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "アップロードする OPML ファイルがありません。"
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "標準に戻しますか?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "新しいもので現在の公開アドレスを置き換えますか?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "新しいもので現在の公開アドレスを置き換えますか?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "現在の設定を保存しますか?"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr "選択したフィードの記事のスコアを再計算しますか?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "フィルター %s を削除しますか?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "選択したフィードの変更を保存しますか?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr "ラベルの色を標準にリセットしますか?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "新しいラベルの前景色を入力してください:"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "新しいラベルの背景色を入力してください:"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "選択されたフィルターを削除しますか?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr ""
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "フィードの表示"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "すべての記事を既読にしますか?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "カテゴリーから購読をやめることができません。"
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "はじめにいくつかのフィードを選択してください。"
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "選択したカテゴリーの順序をリセットしますか?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "「%s」のすべての記事を既読に設定しますか?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr ""
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr ""
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr "%s の記事のスコアを再計算しますか?"
@@ -2589,6 +2589,9 @@ msgstr "%d 件のマークした記事を既読として設定しますか?"
msgid "Please enter a note for this article:"
msgstr "このアーティクルのノートを入力してください:"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "帯域の制限を使う"
+
#~ msgid "Reset category order"
#~ msgstr "カテゴリーの順序をリセットする"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index fa67eea02..e836aebbe 100644
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index 04a2b84ef..5957a47bf 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2009-05-02 00:10+0100\n"
"Last-Translator: Christian Lomsdalen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -79,7 +79,7 @@ msgstr "Daglig"
msgid "Weekly"
msgstr "Ukentlig"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "Standard"
@@ -183,182 +183,182 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
"SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr "Sesjonen kunne ikke valideres (feil IP)"
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "Feil brukernavn og/eller passord"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Ukategorisert"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Snarveier"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "Merkelapper"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "Favorittartikler"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "Publiserte artikler"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "Ferske artikler"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "Alle artikler"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "Lagrede artikler"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "Generert nyhetsstrøm"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Ulest"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "Motsatt"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Handlinger..."
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "Marker utvalg:"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Favoritter"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Publisert"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "Utvalg:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Marker som lest"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
#, fuzzy
msgid "Move back"
msgstr "Gå tilbake"
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "Standard"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "Tildel stikkord:"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "Velg for å slå sammen kategorien"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "Ingen nyhetstrømmer å vise"
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Stikkord"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "Lyd/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr "-"
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "Rediger stikkordene for denne artikkelen"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "Åpne artikkelsammendraget i nytt nettleservindu"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr "Publiser artikelen med notat"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Nyhetsstrøm"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "Ukjent type"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "Vedlegg:"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "Vedlegg:"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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 +367,11 @@ msgstr "Vedlegg:"
msgid "Close this window"
msgstr "Lukk dette vinduet"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "Nyhetsstrømmen ble ikke funnet"
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -379,31 +379,31 @@ msgstr ""
"Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
"merkelappsyntaksen eller lokal konfigurasjon."
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
msgid "mark as read"
msgstr "marker som lest"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "Trykk for å utvide artikkel"
-#: functions.php:5604
+#: functions.php:5607
msgid "toggle unread"
msgstr "sett som ulest"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "Ingen uleste artikler funnet som kunne vises"
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "Ingen oppdaterte artikler funnet som kunne vises"
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "Ingen markerte artikler som kan vises"
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -411,27 +411,27 @@ msgstr ""
"Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
"menyen ovenfor) eller bruke et filter."
-#: functions.php:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "Ingen artikler funnet som kan vises"
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "Lag merkelapp..."
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "(fjern)"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "Ingen stikkord"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "Rediger notat"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Tittel"
@@ -778,8 +778,8 @@ msgid "Create new account"
msgstr "Lag ny konto"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "Begrens båndbreddebruken"
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -802,11 +802,11 @@ msgstr ""
msgid "Return to preferences"
msgstr "Returner til innstillinger"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "laster, vennligst vent"
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -816,40 +816,40 @@ msgstr ""
"\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
"\t\tnettlesers instillinger."
-#: prefs.php:90 tt-rss.php:112
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Hei, "
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "Forlat innstillinger"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Logg ut"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "Tastatursnarveier"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Innstillinger"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "Nyhetsstrømmer"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "Filtre"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "Brukere"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
#, fuzzy
msgid "Fatal Exception"
msgstr "Alvorlig feil"
@@ -914,154 +914,154 @@ msgstr "Kontoen ble opprettet med suksess."
msgid "New user registrations are currently closed."
msgstr "Registrering av nye brukere er stengt."
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "Kommentarer?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr "Lesning uten internett-tilgang"
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "Avbryt synkroniseringen"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "Synkroniser"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "Fjern lagrede data"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "Benytt modus for lesning uten internett-tilgang"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "Benytt modus for lesning med internett-tilgang"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "Tag-sky"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "Søk..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Nyhetsstrømshandlinger:"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "Abonner på nyhetsstrøm..."
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "Rediger nyhetsstrømmen..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr "Sett poeng på nytt for nyhetskanalene"
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "Avabonner"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Alle nyhetsstrømmer:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Skjul/vis leste nyhetsstrømmer"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Kategori:"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "Tillatt endringer i kategorirekkefølgen?"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Nullstill passordet"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Andre handlinger:"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "Lag filter..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "Tilbakestill de grafiske instillingene"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "Tastatursnarveier"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "Skjul nyhetskanalsslisten"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "Lagrede artikler"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "Tilpasset"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "Alle artikler"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr "Ignorer poenggivning"
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Oppdatert"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "Lagrede artikler"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "Dato"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr "Poeng"
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Oppdater"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "Ingen valgt nyhetsstrøm"
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "Dra i meg for å endre størrelsen på panelene."
@@ -1144,35 +1144,35 @@ msgstr "Hjelp"
msgid "Help topic not found."
msgstr "Hjelp-emne kunne ikke bli funnet"
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "Legger til kategori %s."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "Allerede importert."
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "OK!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "Feil under behandling av dokumentet"
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "Feil: Kan ikke laste opp OPMLfil"
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "Feil: Kan ikke finne hovedelement."
@@ -2255,76 +2255,76 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
msgid "Sort feeds by unread count"
msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr "Kan ikke legge til filter, ingen match på kriteriene"
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
-#: functions.js:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "Abonnerer på nyhetsstrømmen..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "Abonnerer på følgende nyhetsstrømmer:"
-#: functions.js:1403
+#: functions.js:1323
#, fuzzy
msgid "Can't subscribe to the specified URL."
msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
-#: functions.js:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "Du kan ikke fjerne abonnement fra kategorien."
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "Abonnerer på følgende nyhetsstrømmer:"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "Ingen nyhetsstrømmer er valgt"
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
msgstr ""
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "Fjern lagrede data"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "Vennligst velg en nyhetsstrøm"
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr ""
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "Vennligst skriv inn merkelappstekst:"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "Kan ikke skape merkelapp, mangler overskrift."
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "Fjerne abonnement på %s?"
@@ -2391,198 +2391,198 @@ msgstr ""
"Tiny Tiny RSS har problem med å koble til tjeneren. Ønsker du å benytte "
"muligheten til å lese uten internett-tilgang?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "Feil: Ingen nyhetsstrømsadresse ble oppgitt."
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "Feil: Ugyldig nyhetsstrømsadresse."
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Kan ikke legge til kategori: mangler navn"
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "Kan ikke legge til kategori: mangler navn"
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "Vennligst skriv inn brukernavn:"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr "Kan ikke legge til bruker: brukernavn mangler."
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "Fjerne merkede merkelapper?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "Ingen merkelapper er markert"
-#: prefs.js:468
+#: prefs.js:470
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "Ingen bruker er markert"
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "Fjerne valgte filtre?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "Ingen filtre er valgt"
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "Fjern abonnement på valgte nyhetsstrømmer"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Vennligst velg kun en nyhetsstrøm"
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "Ingen artikkel er valgt."
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "Fjerne valgte kategorier?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "Ingen kategorier er valgt."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "Brukernavn kan ikke være blankt"
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Vennligst velg kun en bruker"
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "Nullstill passordet til utvalgte bruker?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Vennligst velg kun et filter"
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "Ingen OPML-fil til å lastes opp."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "Tilbakefør til standardinnstillingene"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "Lagre nåværende konfigurasjon?"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "Fjerne %s filteret?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr "Sett merkelappsfargene til standard?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "Vennligst legg inn forgrunnsfarge for merkelappen:"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "Vennligst skriv inn bakgrunnsfarge for merkelappen:"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "Fjerne valgte filtre?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr ""
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "Vis nyhetsstrømmer"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "Marker alle artikler som leste?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "Du kan ikke fjerne abonnement fra kategorien."
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "Tilbakestill kategorirekkefølgen?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "Marker alle artikler i %s som leste?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "Du kan ikke endre denne typen nyhetsstrøm"
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr "Endre poengene for artiklene i %s?"
@@ -2650,6 +2650,9 @@ msgstr "Marker %d artikkel/artikler som leste?"
msgid "Please enter a note for this article:"
msgstr "Vennligst skriv inn et notat for denne artikkelen:"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "Begrens båndbreddebruken"
+
#~ msgid "Reset category order"
#~ msgstr "Tilbakestill kategorirekkefølgen"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index c9c7ca42e..70684260c 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 882de8a7b..3d1376447 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-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2007-10-24 00:47-0200\n"
"Last-Translator: Marcelo Jorge VIeira (metal) \n"
"Language-Team: Portuguese/Brazil\n"
@@ -81,7 +81,7 @@ msgstr "Diariamente"
msgid "Weekly"
msgstr "Semanalmente"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "Padrão"
@@ -176,187 +176,187 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr ""
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr ""
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Todos os feeds"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Não Categorizado"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Especial"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr ""
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr ""
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr ""
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr ""
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
#, fuzzy
msgid "All articles"
msgstr "Favoritos"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "Favoritos"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr ""
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Não Lido"
-#: functions.php:4225
+#: functions.php:4226
#, fuzzy
msgid "Invert"
msgstr "(Inverso)"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Ações..."
-#: functions.php:4240
+#: functions.php:4241
#, fuzzy
msgid "Selection toggle:"
msgstr "Seleção"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Favoritos"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Publicado"
-#: functions.php:4244
+#: functions.php:4245
#, fuzzy
msgid "Selection:"
msgstr "Seleção"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Marcar como lido"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
msgid "Move back"
msgstr ""
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "Padrão"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr ""
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Tags"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4812
+#: functions.php:4813
#, fuzzy
msgid " - "
msgstr " - por "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr ""
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Feed"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
#, fuzzy
msgid "unknown type"
msgstr "Erro desconhecido"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr ""
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr ""
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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,76 +365,76 @@ msgstr ""
msgid "Close this window"
msgstr "Fechar esta janela"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "Feed não encontrado."
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
#, fuzzy
msgid "mark as read"
msgstr "Marcar como lido"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
#, fuzzy
msgid "Click to expand article"
msgstr "Favoritos"
-#: functions.php:5604
+#: functions.php:5607
#, fuzzy
msgid "toggle unread"
msgstr "Marcar como favorito"
-#: functions.php:5623
+#: functions.php:5626
#, fuzzy
msgid "No unread articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5626
+#: functions.php:5629
#, fuzzy
msgid "No updated articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5629
+#: functions.php:5632
#, fuzzy
msgid "No starred articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5633
+#: functions.php:5636
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:5635 offline.js:443
+#: functions.php:5638 offline.js:443
#, fuzzy
msgid "No articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
#, fuzzy
msgid "Create label..."
msgstr "Criar um usuário"
-#: functions.php:6403
+#: functions.php:6406
#, fuzzy
msgid "(remove)"
msgstr "Remover"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "sem tags"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Título"
@@ -752,7 +752,7 @@ msgid "Create new account"
msgstr ""
#: login_form.php:169
-msgid "Limit bandwidth usage"
+msgid "Use less traffic"
msgstr ""
#: opml.php:161 opml.php:166
@@ -777,55 +777,55 @@ msgstr ""
msgid "Return to preferences"
msgstr "Retornar às preferências"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr ""
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
"\t\tbrowser settings."
msgstr ""
-#: prefs.php:90 tt-rss.php:112
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Olá,"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "Sair das preferências"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Sair"
-#: prefs.php:102
+#: prefs.php:103
#, fuzzy
msgid "Keyboard shortcuts"
msgstr " Criar filtro"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Preferências"
-#: prefs.php:110
+#: prefs.php:111
#, fuzzy
msgid "Feeds"
msgstr "Feed"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "Arquivo:"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "Usuário"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
#, fuzzy
msgid "Fatal Exception"
msgstr "Erro Fatal"
@@ -889,164 +889,164 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: tt-rss.php:118
+#: tt-rss.php:119
#, fuzzy
msgid "Comments?"
msgstr "Conteúdo"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr ""
-#: tt-rss.php:138
+#: tt-rss.php:139
#, fuzzy
msgid "Cancel synchronization"
msgstr "Salvar configuração"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr ""
-#: tt-rss.php:143
+#: tt-rss.php:144
#, fuzzy
msgid "Remove stored data"
msgstr "Remover as categorias selecionadas?"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr ""
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr ""
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr ""
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "núvem de tags"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr ""
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Ações do Feed:"
-#: tt-rss.php:181
+#: tt-rss.php:182
#, fuzzy
msgid "Subscribe to feed..."
msgstr "Removendo o Feed..."
-#: tt-rss.php:182
+#: tt-rss.php:183
#, fuzzy
msgid "Edit this feed..."
msgstr "Editar"
-#: tt-rss.php:183
+#: tt-rss.php:184
#, fuzzy
msgid "Rescore feed"
msgstr "Removendo o Feed..."
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr ""
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Todos os Feeds:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr ""
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Categoria:"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "Remover as categorias selecionadas?"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Remover as categorias selecionadas?"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Outras ações:"
-#: tt-rss.php:199
+#: tt-rss.php:200
#, fuzzy
msgid "Create filter..."
msgstr "Criar um usuário"
-#: tt-rss.php:200
+#: tt-rss.php:201
#, fuzzy
msgid "Reset UI layout"
msgstr " Editar esse Feed"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr " Criar filtro"
-#: tt-rss.php:210
+#: tt-rss.php:211
#, fuzzy
msgid "Collapse feedlist"
msgstr "Todos os feeds"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "Favoritos"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr ""
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Atualizado"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "Favoritos"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
#, fuzzy
msgid "Date"
msgstr "Atualizar"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr ""
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Atualizar"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "Nenhum feed foi selecionado."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr ""
@@ -1126,34 +1126,34 @@ msgstr "Olá,"
msgid "Help topic not found."
msgstr "Tópico de ajuda não encontrado."
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "Adicionando a categoria %s."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
msgid "is already imported."
msgstr ""
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "OK!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr ""
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr ""
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr ""
@@ -2243,75 +2243,75 @@ msgstr "Favoritos"
msgid "Sort feeds by unread count"
msgstr ""
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr ""
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr ""
-#: functions.js:1371
+#: functions.js:1291
#, fuzzy
msgid "Subscribing to feed..."
msgstr "Removendo o Feed..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "Removendo o Feed..."
-#: functions.js:1403
+#: functions.js:1323
msgid "Can't subscribe to the specified URL."
msgstr ""
-#: functions.js:1406
+#: functions.js:1326
msgid "You are already subscribed to this feed."
msgstr ""
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "Removendo o Feed..."
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "Nenhum feed foi selecionado."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
msgstr ""
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "Remover as categorias selecionadas?"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "Por favor selecione um feed."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr ""
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr ""
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr ""
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr ""
@@ -2378,204 +2378,204 @@ msgid ""
"Tiny Tiny RSS has trouble accessing its server. Would you like to go offline?"
msgstr ""
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr ""
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr ""
-#: prefs.js:263
+#: prefs.js:265
msgid "Can't add profile: no name specified."
msgstr ""
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr ""
-#: prefs.js:307
+#: prefs.js:309
#, fuzzy
msgid "Please enter login:"
msgstr "Último Login"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr ""
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr ""
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr ""
-#: prefs.js:468
+#: prefs.js:470
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "Nenhum usuário foi selecionado."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "Nenhum filtro foi selecionado."
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr ""
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Por favor selecione somente um feed"
-#: prefs.js:578
+#: prefs.js:580
#, fuzzy
msgid "Erase all non-starred articles in selected feed?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "Nenhum filtro foi selecionado."
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "Remover as categorias selecionadas?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "Nenhuma categoria foi selecionada."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "O campo de Login não pode ser vazio."
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Por favor selecione somente um usuário."
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr ""
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Por favor selecione somente um filtro."
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "Nenhum arquivo OPML para upload."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr ""
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr ""
-#: prefs.js:1678
+#: prefs.js:1625
msgid "Replace current OPML publishing address with a new one?"
msgstr ""
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "Salvar a configuração atual?"
-#: prefs.js:1815
+#: prefs.js:1762
#, fuzzy
msgid "Rescore articles in selected feeds?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
-#: prefs.js:1857
+#: prefs.js:1804
#, fuzzy
msgid "Remove filter %s?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:1918
+#: prefs.js:1865
#, fuzzy
msgid "Save changes to selected feeds?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr ""
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr ""
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr ""
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr ""
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr ""
-#: tt-rss.js:251
+#: tt-rss.js:178
#, fuzzy
msgid "Mark all articles as read?"
msgstr "Marcando todos os feeds como lidos..."
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr ""
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr ""
-#: tt-rss.js:630
+#: tt-rss.js:561
#, fuzzy
msgid "Reset category order?"
msgstr "Remover as categorias selecionadas?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
#, fuzzy
msgid "Mark all articles in %s as read?"
msgstr "Marcando todos os feeds como lidos..."
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr ""
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr ""
-#: tt-rss.js:947
+#: tt-rss.js:878
#, fuzzy
msgid "Rescore articles in %s?"
msgstr "Favoritos"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 74d6e5c97..ed7a24ca6 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 5bcf2e2ea..d8bdbb77a 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-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2009-05-29 14:38+0300\n"
"Last-Translator: Max Kamashev \n"
"Language-Team: Русский \n"
@@ -85,7 +85,7 @@ msgstr "Раз в день"
msgid "Weekly"
msgstr "Раз в неделю"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "По умолчанию"
@@ -187,182 +187,182 @@ msgstr ""
"неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
"конфигурацию PHP"
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr "Ошибка проверки сессии (некорректный IP)"
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr "Некорректное имя пользователя или пароль"
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "Все каналы"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "Нет категории"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "Особые"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "Метки"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "Отмеченные"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "Опубликованные"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
msgid "Fresh articles"
msgstr "Свежие"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
msgid "All articles"
msgstr "Все статьи"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "Сохранённые статьи"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "Генерировать канал"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "Новые"
-#: functions.php:4225
+#: functions.php:4226
msgid "Invert"
msgstr "Инвертировать"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "Действия..."
-#: functions.php:4240
+#: functions.php:4241
msgid "Selection toggle:"
msgstr "Переключить выбранное:"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "Отмеченные"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "Опубликован"
-#: functions.php:4244
+#: functions.php:4245
msgid "Selection:"
msgstr "Выбрано:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "Как прочитанные"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
#, fuzzy
msgid "Move back"
msgstr "Идти назад"
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "По умолчанию"
-#: functions.php:4259
+#: functions.php:4260
msgid "Assign label:"
msgstr "Применить метку:"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr "Щёлкните, чтобы развернуть категорию"
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "Нет каналов для отображения."
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "Теги"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4812
+#: functions.php:4813
msgid " - "
msgstr " - "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr "Редактировать теги статьи"
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
msgid "Show article summary in new window"
msgstr "Показать детали статьи в новом окне"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
msgid "Publish article with a note"
msgstr "Опубликовать статью с заметкой"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Канал"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
msgid "unknown type"
msgstr "Неизвестный тип"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr "Вложение:"
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr "Вложения:"
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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 +371,11 @@ msgstr "Вложения:"
msgid "Close this window"
msgstr "Закрыть это окно"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "Канал не найден."
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -383,31 +383,31 @@ msgstr ""
"Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис "
"или локальную конфигурацию."
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
msgid "mark as read"
msgstr "Отметить как прочитанные"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
msgid "Click to expand article"
msgstr "Щёлкните чтобы развернуть статью"
-#: functions.php:5604
+#: functions.php:5607
msgid "toggle unread"
msgstr "переключить непрочитанные"
-#: functions.php:5623
+#: functions.php:5626
msgid "No unread articles found to display."
msgstr "Не найдено не прочитанных статей"
-#: functions.php:5626
+#: functions.php:5629
msgid "No updated articles found to display."
msgstr "Не найдено не прочитанных статей."
-#: functions.php:5629
+#: functions.php:5632
msgid "No starred articles found to display."
msgstr "Не найдено отмеченных статей"
-#: functions.php:5633
+#: functions.php:5636
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
@@ -415,27 +415,27 @@ msgstr ""
"Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
"Действия) или используйте фильтр."
-#: functions.php:5635 offline.js:443
+#: functions.php:5638 offline.js:443
msgid "No articles found to display."
msgstr "Статей не найдено."
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
msgid "Create label..."
msgstr "Создать метку..."
-#: functions.php:6403
+#: functions.php:6406
msgid "(remove)"
msgstr "(удалить)"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "нет тегов"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr "править заметку"
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "Заголовок"
@@ -777,8 +777,8 @@ msgid "Create new account"
msgstr "Создать новый аккаунт"
#: login_form.php:169
-msgid "Limit bandwidth usage"
-msgstr "Ограничить скорость передачи"
+msgid "Use less traffic"
+msgstr ""
#: opml.php:161 opml.php:166
msgid "OPML Utility"
@@ -800,11 +800,11 @@ msgstr "Расширение DOMXML не найдено. Оно необходи
msgid "Return to preferences"
msgstr "Вернуться к настройкам"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Идет загрузка..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -814,40 +814,40 @@ msgstr ""
"\t\tдля функционала этой программы. Пожалуйста, проверьте\n"
"\t\tнастройки вашего браузера."
-#: prefs.php:90 tt-rss.php:112
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "Привет,"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "Закрыть настройки"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "Выход"
-#: prefs.php:102
+#: prefs.php:103
msgid "Keyboard shortcuts"
msgstr "Горячие Клавиши"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "Настройки"
-#: prefs.php:110
+#: prefs.php:111
msgid "Feeds"
msgstr "Каналы"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
msgid "Filters"
msgstr "Фильтры"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
msgid "Users"
msgstr "Пользователи"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
#, fuzzy
msgid "Fatal Exception"
msgstr "Фатальная Ошибка"
@@ -911,154 +911,154 @@ msgstr "Аккаунт успешно создан."
msgid "New user registrations are currently closed."
msgstr "Регистрация новых пользователей временно закрыта."
-#: tt-rss.php:118
+#: tt-rss.php:119
msgid "Comments?"
msgstr "Комментарии?"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr "Оффлайн чтение"
-#: tt-rss.php:138
+#: tt-rss.php:139
msgid "Cancel synchronization"
msgstr "Отменить синхронизацию"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr "Синхронизация"
-#: tt-rss.php:143
+#: tt-rss.php:144
msgid "Remove stored data"
msgstr "Удалить сохранённые данные"
-#: tt-rss.php:145
+#: tt-rss.php:146
msgid "Go offline"
msgstr "Перейти в оффлайн"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr "Доступная новая версия Tiny Tiny RSS!"
-#: tt-rss.php:158
+#: tt-rss.php:159
msgid "Go online"
msgstr "Перейти в онлайн"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "облако тегов"
-#: tt-rss.php:179
+#: tt-rss.php:180
msgid "Search..."
msgstr "Поиск..."
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Действия над каналами:"
-#: tt-rss.php:181
+#: tt-rss.php:182
msgid "Subscribe to feed..."
msgstr "Подписаться на канал..."
-#: tt-rss.php:182
+#: tt-rss.php:183
msgid "Edit this feed..."
msgstr "Редактировать канал..."
-#: tt-rss.php:183
+#: tt-rss.php:184
msgid "Rescore feed"
msgstr "Заново оценить канал"
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "Отписаться"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "Все каналы:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
msgid "(Un)hide read feeds"
msgstr " Показать/скрыть прочитанные"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "Категория:"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "Переключить изменение режима категории"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "Сбросить пароль"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "Другие действия:"
-#: tt-rss.php:199
+#: tt-rss.php:200
msgid "Create filter..."
msgstr "Создать фильтр..."
-#: tt-rss.php:200
+#: tt-rss.php:201
msgid "Reset UI layout"
msgstr "Сбросить панели"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr "Горячие Клавиши"
-#: tt-rss.php:210
+#: tt-rss.php:211
msgid "Collapse feedlist"
msgstr "Свернуть список каналов"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "Сохранённые статьи"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "Адаптивно"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "Все статьи"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr "Игнорировать Оценки"
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "Обновлено"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "Сохранённые статьи"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
msgid "Date"
msgstr "Дата"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr "Оценка"
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "Обновить"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "Канал не выбран."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr "Потяни за меня для изменения размера панелей"
@@ -1141,35 +1141,35 @@ msgstr "Помощь"
msgid "Help topic not found."
msgstr "Раздел помощи не найден."
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "Добавляется категория %s."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "Уже импортирован."
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "OK!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "Ошибка при разборе документа."
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "Ошибка: пожалуйста загрузите OPML файл."
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "Ошибка: не могу найти тело элемента"
@@ -2249,76 +2249,76 @@ msgstr " Показать/скрыть прочитанные"
msgid "Sort feeds by unread count"
msgstr "Сортировать каналы по количеству непрочитанных статей"
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr "Не могу добавить фильтр: нет соответствия."
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr "Не могу подписаться: нет URL"
-#: functions.js:1371
+#: functions.js:1291
msgid "Subscribing to feed..."
msgstr "Подписаться на канал..."
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "Подписаны каналы:"
-#: functions.js:1403
+#: functions.js:1323
#, fuzzy
msgid "Can't subscribe to the specified URL."
msgstr "Не могу подписаться: нет URL"
-#: functions.js:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "Нельзя отписаться от категории."
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "Подписаны каналы:"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "Нет выбранных каналов."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
msgstr ""
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "Удалить сохранённые данные"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "Пожалуйста выберите только один канал."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr ""
-#: functions.js:2132
+#: functions.js:2052
msgid "Please enter label caption:"
msgstr "Пожалуйста, введите заголовок метки:"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "Не могу создать метку: отсутствует заголовок."
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "Отписаться от %s?"
@@ -2384,199 +2384,199 @@ msgstr ""
"У Tiny Tiny RSS есть проблемы с доступом к серверу. Хотели бы вы перейти в "
"режим оффлайн?"
-#: prefs.js:233
+#: prefs.js:235
msgid "Error: No feed URL given."
msgstr "Ошибка: Канал не отдаёт URL."
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr "Ошибка: Не верный URL канала."
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Не могу добавить категорию без имени"
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "Не могу добавить категорию без имени"
-#: prefs.js:307
+#: prefs.js:309
msgid "Please enter login:"
msgstr "Пожалуйста, введите логин:"
-#: prefs.js:314
+#: prefs.js:316
msgid "Can't create user: no login specified."
msgstr "Не могу добавить пользователя: не указан логин."
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "Удалить выбранные метки?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "Нет выбранных меток."
-#: prefs.js:468
+#: prefs.js:470
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "Нет выбранных пользователей."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "Удалить выбранные фильтры?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "Нет выбранных фильтров."
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "Отписаться от выбранных каналов?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "Пожалуйста выберите только один канал."
-#: prefs.js:578
+#: prefs.js:580
msgid "Erase all non-starred articles in selected feed?"
msgstr "Стереть все не отмеченные статьи в выбранном канале?"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Сколько дней хранить статьи (0 - по умолчанию)?"
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "Статья не выбрана"
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "Удалить выбранные категории?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "Нет выбранных категорий."
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "Поле логина не может быть пустым."
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "Пожалуйста выберите только одного пользователя."
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "Сбросить пароль выбранного пользователя?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "Пожалуйста выберите только один фильтр."
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "Нет файла OPML для загрузки."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "Сбросить настройки?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "Изменить текущий адрес публикации на новый?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Изменить текущий адрес публикации на новый?"
-#: prefs.js:1714
+#: prefs.js:1661
msgid "Save current configuration?"
msgstr "Сохранить конфигурацию"
-#: prefs.js:1815
+#: prefs.js:1762
msgid "Rescore articles in selected feeds?"
msgstr "Заново оценить статьи в выбранных каналах?"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Оценить заново все статьи? Эта операция может продолжаться длительное время."
-#: prefs.js:1857
+#: prefs.js:1804
msgid "Remove filter %s?"
msgstr "Удалить фильтр %s?"
-#: prefs.js:1918
+#: prefs.js:1865
msgid "Save changes to selected feeds?"
msgstr "Сохранить изменения выбранных каналов?"
-#: prefs.js:1998
+#: prefs.js:1945
msgid "Reset label colors to default?"
msgstr "Сбросить метку цветов, на цвета по умолчанию?"
-#: prefs.js:2023
+#: prefs.js:1970
msgid "Please enter new label foreground color:"
msgstr "Пожалуйста, введите новую метку цвета переднего плана:"
-#: prefs.js:2025
+#: prefs.js:1972
msgid "Please enter new label background color:"
msgstr "Пожалуйста, введите новую метку цвета фона:"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "Удалить выбранные фильтры?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr ""
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "показать каналы"
-#: tt-rss.js:251
+#: tt-rss.js:178
msgid "Mark all articles as read?"
msgstr "Пометить все статьи как прочитанные?"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "Нельзя отписаться от категории."
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "Пожалуйста выберите какой-нибудь канал."
-#: tt-rss.js:630
+#: tt-rss.js:561
msgid "Reset category order?"
msgstr "Сбросить порядок категорий?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
msgid "Mark all articles in %s as read?"
msgstr "Отметить все статьи в %s как прочитанные?"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "Вы не можете редактировать этот канал."
-#: tt-rss.js:937
+#: tt-rss.js:868
msgid "You can't rescore this kind of feed."
msgstr "Вы не можете снова оценить этот канал."
-#: tt-rss.js:947
+#: tt-rss.js:878
msgid "Rescore articles in %s?"
msgstr "Установить оценку статьям в %s?"
@@ -2644,6 +2644,9 @@ msgstr "Отметить %d статью(ей) как прочитанные?"
msgid "Please enter a note for this article:"
msgstr "Пожалуйста, укажите заметку для статьи:"
+#~ msgid "Limit bandwidth usage"
+#~ msgstr "Ограничить скорость передачи"
+
#~ msgid "Reset category order"
#~ msgstr "Сбросить порядок категорий"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index b015e6b0e..8c07b2bb8 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 9da82cb55..405acd149 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:16+0400\n"
+"POT-Creation-Date: 2010-10-13 14:48+0400\n"
"PO-Revision-Date: 2007-08-19 19:03+0800\n"
"Last-Translator: sluke \n"
"Language-Team: hicode.org \n"
@@ -77,7 +77,7 @@ msgstr "每天"
msgid "Weekly"
msgstr "每周"
-#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:226 modules/pref-prefs.php:329
msgid "Default"
msgstr "默认"
@@ -172,191 +172,191 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:1935
+#: functions.php:1936
msgid "Session failed to validate (incorrect IP)"
msgstr ""
-#: functions.php:2005
+#: functions.php:2006
msgid "Incorrect username or password"
msgstr ""
-#: functions.php:2988 modules/popup-dialog.php:418
+#: functions.php:2989 modules/popup-dialog.php:418
#: modules/pref-filters.php:420
msgid "All feeds"
msgstr "所有feed"
-#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
msgid "Uncategorized"
msgstr "未分类"
-#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
+#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
#: mobile/functions.php:170
msgid "Special"
msgstr "专用"
-#: functions.php:3051 functions.php:3707 prefs.php:114
+#: functions.php:3052 functions.php:3708 prefs.php:115
#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
msgid "Labels"
msgstr "标记"
-#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
msgid "Starred articles"
msgstr "星级文章"
-#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
msgid "Published articles"
msgstr "已发布文章"
-#: functions.php:3100 help/3.php:59
+#: functions.php:3101 help/3.php:59
#, fuzzy
msgid "Fresh articles"
msgstr "星级文章"
-#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
#, fuzzy
msgid "All articles"
msgstr "所有文章"
-#: functions.php:3104
+#: functions.php:3105
#, fuzzy
msgid "Archived articles"
msgstr "星级文章"
-#: functions.php:4217
+#: functions.php:4218
msgid "Generated feed"
msgstr "产生feed"
-#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: functions.php:4223 functions.php:5573 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:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4224 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:4224 functions.php:4241 tt-rss.php:218
+#: functions.php:4225 functions.php:4242 tt-rss.php:219
msgid "Unread"
msgstr "未读"
-#: functions.php:4225
+#: functions.php:4226
#, fuzzy
msgid "Invert"
msgstr "(逆)"
-#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4227 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:4234 tt-rss.php:178 offline.js:184
+#: functions.php:4235 tt-rss.php:179 offline.js:184
msgid "Actions..."
msgstr "激活..."
-#: functions.php:4240
+#: functions.php:4241
#, fuzzy
msgid "Selection toggle:"
msgstr "选择:"
-#: functions.php:4242 tt-rss.php:217
+#: functions.php:4243 tt-rss.php:218
msgid "Starred"
msgstr "星级"
-#: functions.php:4243
+#: functions.php:4244
msgid "Published"
msgstr "已发布"
-#: functions.php:4244
+#: functions.php:4245
#, fuzzy
msgid "Selection:"
msgstr "选择:"
-#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
msgid "Mark as read"
msgstr "标记为已读"
-#: functions.php:4251
+#: functions.php:4252
msgid "Archive"
msgstr ""
-#: functions.php:4253
+#: functions.php:4254
msgid "Move back"
msgstr ""
-#: functions.php:4254
+#: functions.php:4255
#, fuzzy
msgid "Delete"
msgstr "默认"
-#: functions.php:4259
+#: functions.php:4260
#, fuzzy
msgid "Assign label:"
msgstr "指定标签"
-#: functions.php:4300
+#: functions.php:4301
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4510
+#: functions.php:4511
msgid "No feeds to display."
msgstr "无feed显示。"
-#: functions.php:4527
+#: functions.php:4528
msgid "Tags"
msgstr "标签"
-#: functions.php:4686
+#: functions.php:4687
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4812
+#: functions.php:4813
#, fuzzy
msgid " - "
msgstr ", 由 - "
-#: functions.php:4837 functions.php:5597
+#: functions.php:4838 functions.php:5600
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4843 functions.php:5580
+#: functions.php:4844 functions.php:5583
#, fuzzy
msgid "Show article summary in new window"
msgstr "新窗口打开文章连结"
-#: functions.php:4850 functions.php:5587
+#: functions.php:4851 functions.php:5590
#, fuzzy
msgid "Publish article with a note"
msgstr "发布文章"
-#: functions.php:4867 functions.php:5458
+#: functions.php:4868 functions.php:5459
msgid "Originally from:"
msgstr ""
-#: functions.php:4880 functions.php:5471
+#: functions.php:4881 functions.php:5472
#, fuzzy
msgid "Feed URL"
msgstr "Feed"
-#: functions.php:4920 functions.php:5501
+#: functions.php:4921 functions.php:5502
#, fuzzy
msgid "unknown type"
msgstr "未知错误"
-#: functions.php:4960 functions.php:5544
+#: functions.php:4961 functions.php:5547
msgid "Attachment:"
msgstr ""
-#: functions.php:4962 functions.php:5546
+#: functions.php:4963 functions.php:5549
msgid "Attachments:"
msgstr ""
-#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4983 prefs.php:143 tt-rss.php:102 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,76 +365,76 @@ msgstr ""
msgid "Close this window"
msgstr "关闭此窗口"
-#: functions.php:5038
+#: functions.php:5039
msgid "Feed not found."
msgstr "未找到Feed."
-#: functions.php:5107
+#: functions.php:5108
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
-#: functions.php:5271 functions.php:5358
+#: functions.php:5272 functions.php:5359
#, fuzzy
msgid "mark as read"
msgstr "标记为已读"
-#: functions.php:5434 functions.php:5441
+#: functions.php:5435 functions.php:5442
#, fuzzy
msgid "Click to expand article"
msgstr "星级文章"
-#: functions.php:5604
+#: functions.php:5607
#, fuzzy
msgid "toggle unread"
msgstr "触发开关"
-#: functions.php:5623
+#: functions.php:5626
#, fuzzy
msgid "No unread articles found to display."
msgstr "未找到文章。"
-#: functions.php:5626
+#: functions.php:5629
#, fuzzy
msgid "No updated articles found to display."
msgstr "未找到文章。"
-#: functions.php:5629
+#: functions.php:5632
#, fuzzy
msgid "No starred articles found to display."
msgstr "未找到文章。"
-#: functions.php:5633
+#: functions.php:5636
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:5635 offline.js:443
+#: functions.php:5638 offline.js:443
#, fuzzy
msgid "No articles found to display."
msgstr "未找到文章。"
-#: functions.php:6390 tt-rss.php:198
+#: functions.php:6393 tt-rss.php:199
#, fuzzy
msgid "Create label..."
msgstr "创建标记"
-#: functions.php:6403
+#: functions.php:6406
#, fuzzy
msgid "(remove)"
msgstr "移除"
-#: functions.php:6455
+#: functions.php:6458
msgid "no tags"
msgstr "无标签"
-#: functions.php:6484
+#: functions.php:6487
msgid "edit note"
msgstr ""
-#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
msgid "Title"
msgstr "标题"
@@ -761,7 +761,7 @@ msgid "Create new account"
msgstr ""
#: login_form.php:169
-msgid "Limit bandwidth usage"
+msgid "Use less traffic"
msgstr ""
#: opml.php:161 opml.php:166
@@ -784,55 +784,55 @@ msgstr "未检测到DOMXML 扩展, 要求PHP5以下版本。"
msgid "Return to preferences"
msgstr "返回 我的最爱"
-#: prefs.php:63 prefs.php:123 tt-rss.php:65
+#: prefs.php:64 prefs.php:124 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "读取中,请等待..."
-#: prefs.php:70 prefs.php:126 tt-rss.php:73
+#: prefs.php:71 prefs.php:127 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
"\t\tbrowser settings."
msgstr "您的浏览器不支持Javascript, 请检查设置。"
-#: prefs.php:90 tt-rss.php:112
+#: prefs.php:91 tt-rss.php:113
msgid "Hello,"
msgstr "你好,"
-#: prefs.php:92 help/4.php:14
+#: prefs.php:93 help/4.php:14
msgid "Exit preferences"
msgstr "退出我的最爱"
-#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
#: mobile/functions.php:234
msgid "Logout"
msgstr "注销"
-#: prefs.php:102
+#: prefs.php:103
#, fuzzy
msgid "Keyboard shortcuts"
msgstr " 创建过滤器"
-#: prefs.php:108 tt-rss.php:114 help/3.php:63 help/4.php:8
+#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
msgid "Preferences"
msgstr "我的最爱"
-#: prefs.php:110
+#: prefs.php:111
#, fuzzy
msgid "Feeds"
msgstr "Feed"
-#: prefs.php:112 help/4.php:11
+#: prefs.php:113 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "标题:"
-#: prefs.php:117 help/4.php:13
+#: prefs.php:118 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "用户"
-#: prefs.php:140 tt-rss.php:99
+#: prefs.php:141 tt-rss.php:100
#, fuzzy
msgid "Fatal Exception"
msgstr "致命错误"
@@ -897,168 +897,168 @@ msgstr ""
msgid "New user registrations are currently closed."
msgstr ""
-#: tt-rss.php:118
+#: tt-rss.php:119
#, fuzzy
msgid "Comments?"
msgstr "内容"
-#: tt-rss.php:131
+#: tt-rss.php:132
msgid "Offline reading"
msgstr ""
-#: tt-rss.php:138
+#: tt-rss.php:139
#, fuzzy
msgid "Cancel synchronization"
msgstr "保存设置"
-#: tt-rss.php:141
+#: tt-rss.php:142
msgid "Synchronize"
msgstr ""
-#: tt-rss.php:143
+#: tt-rss.php:144
#, fuzzy
msgid "Remove stored data"
msgstr "移除选定标记?"
-#: tt-rss.php:145
+#: tt-rss.php:146
#, fuzzy
msgid "Go offline"
msgstr "无链接"
-#: tt-rss.php:151
+#: tt-rss.php:152
msgid "New version of Tiny Tiny RSS is available!"
msgstr ""
-#: tt-rss.php:158
+#: tt-rss.php:159
#, fuzzy
msgid "Go online"
msgstr "无链接"
-#: tt-rss.php:169 tt-rss.js:79
+#: tt-rss.php:170 tt-rss.js:78
msgid "tag cloud"
msgstr "标签簇"
-#: tt-rss.php:179
+#: tt-rss.php:180
#, fuzzy
msgid "Search..."
msgstr "搜索"
-#: tt-rss.php:180
+#: tt-rss.php:181
msgid "Feed actions:"
msgstr "Feed 操作:"
-#: tt-rss.php:181
+#: tt-rss.php:182
#, fuzzy
msgid "Subscribe to feed..."
msgstr "订阅feed"
-#: tt-rss.php:182
+#: tt-rss.php:183
#, fuzzy
msgid "Edit this feed..."
msgstr "输入feed"
-#: tt-rss.php:183
+#: tt-rss.php:184
#, fuzzy
msgid "Rescore feed"
msgstr "移除feed中..."
-#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
msgid "Unsubscribe"
msgstr "退订"
-#: tt-rss.php:186
+#: tt-rss.php:187
msgid "All feeds:"
msgstr "所有feed:"
-#: tt-rss.php:188 help/3.php:44
+#: tt-rss.php:189 help/3.php:44
#, fuzzy
msgid "(Un)hide read feeds"
msgstr " (显示)隐藏已读feed"
-#: tt-rss.php:190
+#: tt-rss.php:191
#, fuzzy
msgid "Categories:"
msgstr "分类:"
-#: tt-rss.php:192
+#: tt-rss.php:193
#, fuzzy
msgid "Toggle reordering mode"
msgstr "移除选定分类?"
-#: tt-rss.php:193
+#: tt-rss.php:194
#, fuzzy
msgid "Reset order"
msgstr "重置密码"
-#: tt-rss.php:196
+#: tt-rss.php:197
msgid "Other actions:"
msgstr "其他操作:"
-#: tt-rss.php:199
+#: tt-rss.php:200
#, fuzzy
msgid "Create filter..."
msgstr "创建过滤器"
-#: tt-rss.php:200
+#: tt-rss.php:201
#, fuzzy
msgid "Reset UI layout"
msgstr " 订阅feed"
-#: tt-rss.php:201
+#: tt-rss.php:202
#, fuzzy
msgid "Keyboard shortcuts help"
msgstr " 创建过滤器"
-#: tt-rss.php:210
+#: tt-rss.php:211
#, fuzzy
msgid "Collapse feedlist"
msgstr "隐藏我的Feed列表"
-#: tt-rss.php:213
+#: tt-rss.php:214
#, fuzzy
msgid "Show articles"
msgstr "星级文章"
-#: tt-rss.php:215
+#: tt-rss.php:216
msgid "Adaptive"
msgstr "自适应"
-#: tt-rss.php:216
+#: tt-rss.php:217
msgid "All Articles"
msgstr "所有文章"
-#: tt-rss.php:219
+#: tt-rss.php:220
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
msgid "Updated"
msgstr "已更新"
-#: tt-rss.php:223
+#: tt-rss.php:224
#, fuzzy
msgid "Sort articles"
msgstr "星级文章"
-#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
#: modules/pref-filters.php:469
#, fuzzy
msgid "Date"
msgstr "更新"
-#: tt-rss.php:228
+#: tt-rss.php:229
msgid "Score"
msgstr ""
-#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
msgid "Update"
msgstr "更新"
-#: tt-rss.php:243 tt-rss.php:257
+#: tt-rss.php:244 tt-rss.php:258
msgid "No feed selected."
msgstr "无选定feed."
-#: tt-rss.php:247
+#: tt-rss.php:248
msgid "Drag me to resize panels"
msgstr ""
@@ -1140,35 +1140,35 @@ msgstr "你好,"
msgid "Help topic not found."
msgstr "未找到帮助主题。"
-#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
#, fuzzy, php-format
msgid "Adding category %s."
msgstr "添加分类 %s."
-#: modules/opml_domdoc.php:78
+#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
msgstr ""
-#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
#, fuzzy
msgid "is already imported."
msgstr "已导入"
-#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
#, fuzzy
msgid "OK"
msgstr "OK!"
-#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
msgid "Error while parsing document."
msgstr "解析文档时发生错误。"
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
msgid "Error: please upload OPML file."
msgstr "错误:请上传OPML文件。"
-#: modules/opml_domxml.php:131
+#: modules/opml_domxml.php:135
msgid "Error: can't find body element."
msgstr "错误:未找到body元素"
@@ -2291,78 +2291,78 @@ msgstr " (显示)隐藏已读feed"
msgid "Sort feeds by unread count"
msgstr "以未读文章数量排序feed源"
-#: functions.js:1332
+#: functions.js:1252
msgid "Can't add filter: nothing to match on."
msgstr "未能添加过滤:无匹配。"
-#: functions.js:1367
+#: functions.js:1287
msgid "Can't subscribe: no feed URL given."
msgstr "未能订阅:无 feed URL。"
-#: functions.js:1371
+#: functions.js:1291
#, fuzzy
msgid "Subscribing to feed..."
msgstr "订阅feed"
-#: functions.js:1394
+#: functions.js:1314
#, fuzzy
msgid "Subscribed to %s"
msgstr "订阅feed:"
-#: functions.js:1403
+#: functions.js:1323
#, fuzzy
msgid "Can't subscribe to the specified URL."
msgstr "未能订阅:无 feed URL。"
-#: functions.js:1406
+#: functions.js:1326
#, fuzzy
msgid "You are already subscribed to this feed."
msgstr "您不能从分类中取消订阅。"
-#: functions.js:1967
+#: functions.js:1887
msgid "New articles available in this feed (click to show)"
msgstr ""
-#: functions.js:2004
+#: functions.js:1924
#, fuzzy
msgid "Subscribed to %d feed(s)."
msgstr "订阅feed:"
-#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
-#: prefs.js:908 prefs.js:928 prefs.js:1831
+#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
+#: prefs.js:910 prefs.js:930 prefs.js:1778
msgid "No feeds are selected."
msgstr "未选择feed."
-#: functions.js:2029
+#: functions.js:1949
msgid ""
"Remove selected feeds from the archive? Feeds with stored articles will not "
"be removed."
msgstr ""
-#: functions.js:2081
+#: functions.js:2001
#, fuzzy
msgid "Remove stored feed icon?"
msgstr "移除选定标记?"
-#: functions.js:2113
+#: functions.js:2033
#, fuzzy
msgid "Please select an image file to upload."
msgstr "请只选择一个feed."
-#: functions.js:2115
+#: functions.js:2035
msgid "Upload new icon for this feed?"
msgstr ""
-#: functions.js:2132
+#: functions.js:2052
#, fuzzy
msgid "Please enter label caption:"
msgstr "请输入标签主题"
-#: functions.js:2137
+#: functions.js:2057
msgid "Can't create label: missing caption."
msgstr "创建标签失败:缺少标题。"
-#: functions.js:2177 tt-rss.js:568
+#: functions.js:2097 tt-rss.js:499
msgid "Unsubscribe from %s?"
msgstr "退订%s?"
@@ -2430,213 +2430,213 @@ msgid ""
"Tiny Tiny RSS has trouble accessing its server. Would you like to go offline?"
msgstr ""
-#: prefs.js:233
+#: prefs.js:235
#, fuzzy
msgid "Error: No feed URL given."
msgstr "未能订阅:无 feed URL。"
-#: prefs.js:235
+#: prefs.js:237
msgid "Error: Invalid feed URL."
msgstr ""
-#: prefs.js:263
+#: prefs.js:265
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "添加分类失败:未指定分类名"
-#: prefs.js:285
+#: prefs.js:287
msgid "Can't add category: no name specified."
msgstr "添加分类失败:未指定分类名"
-#: prefs.js:307
+#: prefs.js:309
#, fuzzy
msgid "Please enter login:"
msgstr "请输入标签主题"
-#: prefs.js:314
+#: prefs.js:316
#, fuzzy
msgid "Can't create user: no login specified."
msgstr "添加用户失败:未登录。"
-#: prefs.js:438
+#: prefs.js:440
msgid "Remove selected labels?"
msgstr "移除选定标记?"
-#: prefs.js:454
+#: prefs.js:456
msgid "No labels are selected."
msgstr "未选定标记."
-#: prefs.js:468
+#: prefs.js:470
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
msgid "No users are selected."
msgstr "未选定用户."
-#: prefs.js:503
+#: prefs.js:505
msgid "Remove selected filters?"
msgstr "移除选定的过滤器?"
-#: prefs.js:519 prefs.js:888
+#: prefs.js:521 prefs.js:890
msgid "No filters are selected."
msgstr "未选定过滤器。"
-#: prefs.js:538
+#: prefs.js:540
msgid "Unsubscribe from selected feeds?"
msgstr "退订选定feed?"
-#: prefs.js:572
+#: prefs.js:574
msgid "Please select only one feed."
msgstr "请只选择一个feed."
-#: prefs.js:578
+#: prefs.js:580
#, fuzzy
msgid "Erase all non-starred articles in selected feed?"
msgstr "标记 %s 中所有访问过的主题为已读"
-#: prefs.js:600
+#: prefs.js:602
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
-#: prefs.js:632
+#: prefs.js:634
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:648
+#: prefs.js:650
#, fuzzy
msgid "No profiles selected."
msgstr "无选定文章。"
-#: prefs.js:660
+#: prefs.js:662
msgid "Remove selected categories?"
msgstr "移除选定分类?"
-#: prefs.js:678
+#: prefs.js:680
msgid "No categories are selected."
msgstr "未选定分类。"
-#: prefs.js:745
+#: prefs.js:747
msgid "Login field cannot be blank."
msgstr "登陆框不能留空。"
-#: prefs.js:803 prefs.js:824 prefs.js:863
+#: prefs.js:805 prefs.js:826 prefs.js:865
msgid "Please select only one user."
msgstr "请只选择一个用户."
-#: prefs.js:828
+#: prefs.js:830
msgid "Reset password of selected user?"
msgstr "重置选定用户密码?"
-#: prefs.js:893
+#: prefs.js:895
msgid "Please select only one filter."
msgstr "请只选择一个过滤器."
-#: prefs.js:969
+#: prefs.js:971
msgid "No OPML file to upload."
msgstr "无OPML文件上传."
-#: prefs.js:1229
+#: prefs.js:1175
msgid "Reset to defaults?"
msgstr "重置默认项?"
-#: prefs.js:1641
+#: prefs.js:1588
msgid "Replace current publishing address with a new one?"
msgstr "使用新地址替换当前地址?"
-#: prefs.js:1678
+#: prefs.js:1625
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "使用新地址替换当前地址?"
-#: prefs.js:1714
+#: prefs.js:1661
#, fuzzy
msgid "Save current configuration?"
msgstr "保存设置"
-#: prefs.js:1815
+#: prefs.js:1762
#, fuzzy
msgid "Rescore articles in selected feeds?"
msgstr "无选定文章。"
-#: prefs.js:1838
+#: prefs.js:1785
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
-#: prefs.js:1857
+#: prefs.js:1804
#, fuzzy
msgid "Remove filter %s?"
msgstr "移除选定的过滤器?"
-#: prefs.js:1918
+#: prefs.js:1865
#, fuzzy
msgid "Save changes to selected feeds?"
msgstr "无选定文章。"
-#: prefs.js:1998
+#: prefs.js:1945
#, fuzzy
msgid "Reset label colors to default?"
msgstr "重置默认项?"
-#: prefs.js:2023
+#: prefs.js:1970
#, fuzzy
msgid "Please enter new label foreground color:"
msgstr "请输入标签主题"
-#: prefs.js:2025
+#: prefs.js:1972
#, fuzzy
msgid "Please enter new label background color:"
msgstr "请输入标签主题"
-#: prefs.js:2157
+#: prefs.js:2104
#, fuzzy
msgid "Activate selected profile?"
msgstr "移除选定的过滤器?"
-#: prefs.js:2173
+#: prefs.js:2120
msgid "Please choose a profile to activate."
msgstr ""
-#: tt-rss.js:74
+#: tt-rss.js:73
msgid "display feeds"
msgstr "显示Feed"
-#: tt-rss.js:251
+#: tt-rss.js:178
#, fuzzy
msgid "Mark all articles as read?"
msgstr "标记 %s 中所有访问过的主题为已读"
-#: tt-rss.js:557
+#: tt-rss.js:488
msgid "You can't unsubscribe from the category."
msgstr "您不能从分类中取消订阅。"
-#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
+#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
msgid "Please select some feed first."
msgstr "请先选择若干feed"
-#: tt-rss.js:630
+#: tt-rss.js:561
#, fuzzy
msgid "Reset category order?"
msgstr "移除选定分类?"
-#: tt-rss.js:739 tt-rss.js:752
+#: tt-rss.js:670 tt-rss.js:683
#, fuzzy
msgid "Mark all articles in %s as read?"
msgstr "标记 %s 中所有访问过的主题为已读"
-#: tt-rss.js:772
+#: tt-rss.js:703
msgid "You can't edit this kind of feed."
msgstr "您不能编辑本分类feed"
-#: tt-rss.js:937
+#: tt-rss.js:868
#, fuzzy
msgid "You can't rescore this kind of feed."
msgstr "您不能编辑本分类feed"
-#: tt-rss.js:947
+#: tt-rss.js:878
#, fuzzy
msgid "Rescore articles in %s?"
msgstr "星级文章"
diff --git a/login_form.php b/login_form.php
index 8152eaddd..a2e654322 100644
--- a/login_form.php
+++ b/login_form.php
@@ -166,7 +166,7 @@ function validateLoginForm(f) {
+
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index b21e161e4..aa05e8e8e 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -978,6 +978,84 @@
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']);
+ $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");
+
+ //function api_get_headlines($link, $feed_id, $limit, $offset,
+ // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) {
+
+ print "";
+
+ print "";
+
+ print "";
+ 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 || $f['id'] == -4) array_push($feeds, $f);
+ }
+
+ print "";
+
+ print "";
+ 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";
}
?>
diff --git a/tt-rss.js b/tt-rss.js
index 44175488d..e4469d8fe 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -369,6 +369,10 @@ function resize_headlines(delta_x, delta_y) {
c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 0) + "px";
h_frame.style.height = h_frame.offsetHeight + "px";
+ // Workaround for Opera: force the content page to be re-rendered,
+ // so it is not truncated:
+ var content_pane = $("content-insert");
+ content_pane.innerHTML = content_pane.innerHTML;
}
if (getInitParam("cookie_lifetime") != 0) {
@@ -776,7 +780,7 @@ function collapse_feedlist() {
if (!Element.visible(fl)) {
Element.show(fl);
- fbtn.innerHTML = "<<";
+ fbtn.innerHTML = "<<";
if (theme != "graycube") {
@@ -798,7 +802,7 @@ function collapse_feedlist() {
} else {
Element.hide(fl);
- fbtn.innerHTML = ">>";
+ fbtn.innerHTML = ">>";
if (theme != "graycube") {
diff --git a/viewfeed.js b/viewfeed.js
index 73ad35f0a..1b8a1dab0 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -2019,7 +2019,7 @@ function catchupRelativeToArticle(below) {
} else {
var msg = __("Mark %d article(s) as read?").replace("%d", ids_to_mark.length);
- if (confirm(msg)) {
+ if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
for (var i = 0; i < ids_to_mark.length; i++) {
var e = $("RROW-" + ids_to_mark[i]);