diff options
101 files changed, 3105 insertions, 3573 deletions
@@ -132,6 +132,10 @@ div.cdm.expanded.Unread.Selected div.cdmHeader, div.cdm.expanded.Selected div.cd background : #FFEA9E; } +div.cdm.active.Selected div.cdmHeader { + background : #FFEA9E; +} + div.cdm.expanded.even.Unread, div.cdm.expanded.odd.Unread { background : white; } @@ -155,3 +159,17 @@ div.cdmContentInner p { .Unread div.cdmHeader { font-weight : bold; } + +div.cdmContentInner iframe { + min-width : 50%; +} + +div.cdmHeader span.author { + color : gray; + font-size : 11px; +} + +div.cdm.expanded div.cdmHeader a.title, div.cdm.active div.cdmHeader a.title { + font-size : 13px; +} + diff --git a/classes/api.php b/classes/api.php index 5e7ec6573..3ec218671 100644 --- a/classes/api.php +++ b/classes/api.php @@ -47,7 +47,7 @@ class API extends Handler { } function login() { - $login = db_escape_string($_REQUEST["user"]); + $login = db_escape_string($this->link, $_REQUEST["user"]); $password = $_REQUEST["password"]; $password_base64 = base64_decode($_REQUEST["password"]); @@ -92,8 +92,8 @@ class API extends Handler { } function getUnread() { - $feed_id = db_escape_string($_REQUEST["feed_id"]); - $is_cat = db_escape_string($_REQUEST["is_cat"]); + $feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]); + $is_cat = db_escape_string($this->link, $_REQUEST["is_cat"]); if ($feed_id) { print $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($this->link, $feed_id, $is_cat))); @@ -108,10 +108,10 @@ class API extends Handler { } function getFeeds() { - $cat_id = db_escape_string($_REQUEST["cat_id"]); + $cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]); $unread_only = sql_bool_to_bool($_REQUEST["unread_only"]); - $limit = (int) db_escape_string($_REQUEST["limit"]); - $offset = (int) db_escape_string($_REQUEST["offset"]); + $limit = (int) db_escape_string($this->link, $_REQUEST["limit"]); + $offset = (int) db_escape_string($this->link, $_REQUEST["offset"]); $include_nested = sql_bool_to_bool($_REQUEST["include_nested"]); $feeds = $this->api_get_feeds($this->link, $cat_id, $unread_only, $limit, $offset, $include_nested); @@ -171,29 +171,29 @@ class API extends Handler { } function getHeadlines() { - $feed_id = db_escape_string($_REQUEST["feed_id"]); + $feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]); if ($feed_id != "") { - $limit = (int)db_escape_string($_REQUEST["limit"]); + $limit = (int)db_escape_string($this->link, $_REQUEST["limit"]); if (!$limit || $limit >= 60) $limit = 60; - $offset = (int)db_escape_string($_REQUEST["skip"]); - $filter = db_escape_string($_REQUEST["filter"]); + $offset = (int)db_escape_string($this->link, $_REQUEST["skip"]); + $filter = db_escape_string($this->link, $_REQUEST["filter"]); $is_cat = sql_bool_to_bool($_REQUEST["is_cat"]); $show_excerpt = sql_bool_to_bool($_REQUEST["show_excerpt"]); $show_content = sql_bool_to_bool($_REQUEST["show_content"]); /* all_articles, unread, adaptive, marked, updated */ - $view_mode = db_escape_string($_REQUEST["view_mode"]); + $view_mode = db_escape_string($this->link, $_REQUEST["view_mode"]); $include_attachments = sql_bool_to_bool($_REQUEST["include_attachments"]); - $since_id = (int)db_escape_string($_REQUEST["since_id"]); + $since_id = (int)db_escape_string($this->link, $_REQUEST["since_id"]); $include_nested = sql_bool_to_bool($_REQUEST["include_nested"]); $sanitize_content = true; /* do not rely on params below */ - $search = db_escape_string($_REQUEST["search"]); - $search_mode = db_escape_string($_REQUEST["search_mode"]); + $search = db_escape_string($this->link, $_REQUEST["search"]); + $search_mode = db_escape_string($this->link, $_REQUEST["search_mode"]); $headlines = $this->api_get_headlines($this->link, $feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, false, @@ -207,10 +207,10 @@ class API extends Handler { } function updateArticle() { - $article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric); - $mode = (int) db_escape_string($_REQUEST["mode"]); - $data = db_escape_string($_REQUEST["data"]); - $field_raw = (int)db_escape_string($_REQUEST["field"]); + $article_ids = array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_ids"])), is_numeric); + $mode = (int) db_escape_string($this->link, $_REQUEST["mode"]); + $data = db_escape_string($this->link, $_REQUEST["data"]); + $field_raw = (int)db_escape_string($this->link, $_REQUEST["field"]); $field = ""; $set_to = ""; @@ -285,7 +285,7 @@ class API extends Handler { function getArticle() { - $article_id = join(",", array_filter(explode(",", db_escape_string($_REQUEST["article_id"])), is_numeric)); + $article_id = join(",", array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_id"])), is_numeric)); $query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id, marked,unread,published, @@ -348,7 +348,7 @@ class API extends Handler { } function updateFeed() { - $feed_id = db_escape_string($_REQUEST["feed_id"]); + $feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]); update_rss_feed($this->link, $feed_id, true); @@ -356,8 +356,8 @@ class API extends Handler { } function catchupFeed() { - $feed_id = db_escape_string($_REQUEST["feed_id"]); - $is_cat = db_escape_string($_REQUEST["is_cat"]); + $feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]); + $is_cat = db_escape_string($this->link, $_REQUEST["is_cat"]); catchup_feed($this->link, $feed_id, $is_cat); @@ -365,13 +365,13 @@ class API extends Handler { } function getPref() { - $pref_name = db_escape_string($_REQUEST["pref_name"]); + $pref_name = db_escape_string($this->link, $_REQUEST["pref_name"]); print $this->wrap(self::STATUS_OK, array("value" => get_pref($this->link, $pref_name))); } function getLabels() { - //$article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric); + //$article_ids = array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_ids"])), is_numeric); $article_id = (int)$_REQUEST['article_id']; @@ -409,11 +409,11 @@ class API extends Handler { function setArticleLabel() { - $article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric); - $label_id = (int) db_escape_string($_REQUEST['label_id']); - $assign = (bool) db_escape_string($_REQUEST['assign']) == "true"; + $article_ids = array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_ids"])), is_numeric); + $label_id = (int) db_escape_string($this->link, $_REQUEST['label_id']); + $assign = (bool) db_escape_string($this->link, $_REQUEST['assign']) == "true"; - $label = db_escape_string(label_find_caption($this->link, + $label = db_escape_string($this->link, label_find_caption($this->link, $label_id, $_SESSION["uid"])); $num_updated = 0; @@ -442,9 +442,9 @@ class API extends Handler { } function shareToPublished() { - $title = db_escape_string(strip_tags($_REQUEST["title"])); - $url = db_escape_string(strip_tags($_REQUEST["url"])); - $content = db_escape_string(strip_tags($_REQUEST["content"])); + $title = db_escape_string($this->link, strip_tags($_REQUEST["title"])); + $url = db_escape_string($this->link, strip_tags($_REQUEST["url"])); + $content = db_escape_string($this->link, strip_tags($_REQUEST["content"])); if (Article::create_published_article($this->link, $title, $url, $content, "", $_SESSION["uid"])) { print $this->wrap(self::STATUS_OK, array("status" => 'OK')); @@ -655,6 +655,11 @@ class API extends Handler { $headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]); + global $pluginhost; + foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_API) as $p) { + $headline_row = $p->hook_render_article_api($headline_row); + } + array_push($headlines, $headline_row); } diff --git a/classes/article.php b/classes/article.php index 2f49b1827..595c6c432 100644 --- a/classes/article.php +++ b/classes/article.php @@ -8,7 +8,7 @@ class Article extends Handler_Protected { } function redirect() { - $id = db_escape_string($_REQUEST['id']); + $id = db_escape_string($this->link, $_REQUEST['id']); $result = db_query($this->link, "SELECT link FROM ttrss_entries, ttrss_user_entries WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."' @@ -27,10 +27,10 @@ class Article extends Handler_Protected { } function view() { - $id = db_escape_string($_REQUEST["id"]); - $cids = explode(",", db_escape_string($_REQUEST["cids"])); - $mode = db_escape_string($_REQUEST["mode"]); - $omode = db_escape_string($_REQUEST["omode"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); + $cids = explode(",", db_escape_string($this->link, $_REQUEST["cids"])); + $mode = db_escape_string($this->link, $_REQUEST["mode"]); + $omode = db_escape_string($this->link, $_REQUEST["omode"]); // in prefetch mode we only output requested cids, main article // just gets marked as read (it already exists in client cache) diff --git a/classes/auth/base.php b/classes/auth/base.php index aa9d657a4..ad7ff3646 100644 --- a/classes/auth/base.php +++ b/classes/auth/base.php @@ -21,7 +21,7 @@ class Auth_Base { $user_id = $this->find_user_by_login($login); if (!$user_id) { - $login = db_escape_string($login); + $login = db_escape_string($this->link, $login); $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); $pwd_hash = encrypt_password($password, $salt, true); @@ -42,7 +42,7 @@ class Auth_Base { } function find_user_by_login($login) { - $login = db_escape_string($login); + $login = db_escape_string($this->link, $login); $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$login'"); diff --git a/classes/dlg.php b/classes/dlg.php index 3bb2caba4..5789af684 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -5,7 +5,7 @@ class Dlg extends Handler_Protected { function before($method) { if (parent::before($method)) { header("Content-Type: text/xml; charset=utf-8"); - $this->param = db_escape_string($_REQUEST["param"]); + $this->param = db_escape_string($this->link, $_REQUEST["param"]); print "<dlg>"; return true; } @@ -302,7 +302,7 @@ class Dlg extends Handler_Protected { function feedBrowser() { if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return; - $browser_search = db_escape_string($_REQUEST["search"]); + $browser_search = db_escape_string($this->link, $_REQUEST["search"]); print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">"; print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"updateFeedBrowser\">"; @@ -350,7 +350,7 @@ class Dlg extends Handler_Protected { } function search() { - $this->params = explode(":", db_escape_string($_REQUEST["param"]), 2); + $this->params = explode(":", db_escape_string($this->link, $_REQUEST["param"]), 2); $active_feed_id = sprintf("%d", $this->params[0]); $is_cat = $this->params[1] != "false"; @@ -550,7 +550,7 @@ class Dlg extends Handler_Protected { print "<content><![CDATA["; $this->params = explode(":", $this->param, 3); - $feed_id = db_escape_string($this->params[0]); + $feed_id = db_escape_string($this->link, $this->params[0]); $is_cat = (bool) $this->params[1]; $key = get_feed_access_key($this->link, $feed_id, $is_cat); diff --git a/classes/feeds.php b/classes/feeds.php index 79aaa8e55..3657a0564 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -202,13 +202,13 @@ class Feeds extends Handler_Protected { } } - @$search = db_escape_string($_REQUEST["query"]); + @$search = db_escape_string($this->link, $_REQUEST["query"]); if ($search) { $disable_cache = true; } - @$search_mode = db_escape_string($_REQUEST["search_mode"]); + @$search_mode = db_escape_string($this->link, $_REQUEST["search_mode"]); if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info); @@ -450,12 +450,14 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<span class=\"hlUpdated\">"; - if (@$line["feed_title"]) { + if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) { + if (@$line["feed_title"]) { $reply['content'] .= "<div class=\"hlFeed\"> <a href=\"#\" onclick=\"viewfeed($feed_id)\">". $line["feed_title"]."</a> </div>"; } + } $reply['content'] .= "$updated_fmt</span>"; $reply['content'] .= "<div class=\"hlRight\">"; @@ -531,9 +533,6 @@ class Feeds extends Handler_Protected { $reply['content'] .= "</div>"; - $reply['content'] .= "<div id=\"PTITLE-FULL-$id\" style=\"display : none\">" . - htmlspecialchars(strip_tags($line['title'])) . "</div>"; - $reply['content'] .= "<span id=\"RTITLE-$id\" onclick=\"return cdmClicked(event, $id);\" class=\"titleWrap$hlc_suffix\"> @@ -637,8 +636,7 @@ class Feeds extends Handler_Protected { $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); - $reply['content'] .= format_article_enclosures($this->link, $id, $always_display_enclosures, - $line["content"]); + $reply['content'] .= format_article_enclosures($this->link, $id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"])); $reply['content'] .= "</div>"; @@ -756,17 +754,17 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info); - $omode = db_escape_string($_REQUEST["omode"]); + $omode = db_escape_string($this->link, $_REQUEST["omode"]); - $feed = db_escape_string($_REQUEST["feed"]); - $method = db_escape_string($_REQUEST["m"]); - $view_mode = db_escape_string($_REQUEST["view_mode"]); + $feed = db_escape_string($this->link, $_REQUEST["feed"]); + $method = db_escape_string($this->link, $_REQUEST["m"]); + $view_mode = db_escape_string($this->link, $_REQUEST["view_mode"]); $limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT"); @$cat_view = $_REQUEST["cat"] == "true"; - @$next_unread_feed = db_escape_string($_REQUEST["nuf"]); - @$offset = db_escape_string($_REQUEST["skip"]); - @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]); - $order_by = db_escape_string($_REQUEST["order_by"]); + @$next_unread_feed = db_escape_string($this->link, $_REQUEST["nuf"]); + @$offset = db_escape_string($this->link, $_REQUEST["skip"]); + @$vgroup_last_feed = db_escape_string($this->link, $_REQUEST["vgrlf"]); + $order_by = db_escape_string($this->link, $_REQUEST["order_by"]); if (is_numeric($feed)) $feed = (int) $feed; @@ -808,6 +806,13 @@ class Feeds extends Handler_Protected { set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit); set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by); + /* bump login timestamp if needed */ + if (time() - $_SESSION["last_login_update"] > 3600) { + db_query($this->link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " . + $_SESSION["uid"]); + $_SESSION["last_login_update"] = time(); + } + if (!$cat_view && is_numeric($feed) && $feed > 0) { db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW() WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]); diff --git a/classes/handler/public.php b/classes/handler/public.php index dc1e10049..53051a1f8 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -21,7 +21,9 @@ class Handler_Public extends Handler { } if ($feed == -2) - $date_sort_field = "last_read"; + $date_sort_field = "last_published"; + else if ($feed == -1) + $date_sort_field = "last_marked"; $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $is_cat, $search, $search_mode, @@ -180,7 +182,7 @@ class Handler_Public extends Handler { } function getUnread() { - $login = db_escape_string($_REQUEST["login"]); + $login = db_escape_string($this->link, $_REQUEST["login"]); $fresh = $_REQUEST["fresh"] == "1"; $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$login'"); @@ -202,7 +204,7 @@ class Handler_Public extends Handler { } function getProfiles() { - $login = db_escape_string($_REQUEST["login"]); + $login = db_escape_string($this->link, $_REQUEST["login"]); $result = db_query($this->link, "SELECT * FROM ttrss_settings_profiles,ttrss_users WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title"); @@ -222,9 +224,9 @@ class Handler_Public extends Handler { } function pubsub() { - $mode = db_escape_string($_REQUEST['hub_mode']); - $feed_id = (int) db_escape_string($_REQUEST['id']); - $feed_url = db_escape_string($_REQUEST['hub_topic']); + $mode = db_escape_string($this->link, $_REQUEST['hub_mode']); + $feed_id = (int) db_escape_string($this->link, $_REQUEST['id']); + $feed_url = db_escape_string($this->link, $_REQUEST['hub_topic']); if (!PUBSUBHUBBUB_ENABLED) { header('HTTP/1.0 404 Not Found'); @@ -285,7 +287,7 @@ class Handler_Public extends Handler { } function share() { - $uuid = db_escape_string($_REQUEST["key"]); + $uuid = db_escape_string($this->link, $_REQUEST["key"]); $result = db_query($this->link, "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE uuid = '$uuid'"); @@ -307,17 +309,17 @@ class Handler_Public extends Handler { } function rss() { - $feed = db_escape_string($_REQUEST["id"]); - $key = db_escape_string($_REQUEST["key"]); + $feed = db_escape_string($this->link, $_REQUEST["id"]); + $key = db_escape_string($this->link, $_REQUEST["key"]); $is_cat = $_REQUEST["is_cat"] != false; - $limit = (int)db_escape_string($_REQUEST["limit"]); - $offset = (int)db_escape_string($_REQUEST["offset"]); + $limit = (int)db_escape_string($this->link, $_REQUEST["limit"]); + $offset = (int)db_escape_string($this->link, $_REQUEST["offset"]); - $search = db_escape_string($_REQUEST["q"]); - $search_mode = db_escape_string($_REQUEST["smode"]); - $view_mode = db_escape_string($_REQUEST["view-mode"]); + $search = db_escape_string($this->link, $_REQUEST["q"]); + $search_mode = db_escape_string($this->link, $_REQUEST["smode"]); + $view_mode = db_escape_string($this->link, $_REQUEST["view-mode"]); - $format = db_escape_string($_REQUEST['format']); + $format = db_escape_string($this->link, $_REQUEST['format']); if (!$format) $format = 'atom'; @@ -371,10 +373,10 @@ class Handler_Public extends Handler { if ($action == 'share') { - $title = db_escape_string(strip_tags($_REQUEST["title"])); - $url = db_escape_string(strip_tags($_REQUEST["url"])); - $content = db_escape_string(strip_tags($_REQUEST["content"])); - $labels = db_escape_string(strip_tags($_REQUEST["labels"])); + $title = db_escape_string($this->link, strip_tags($_REQUEST["title"])); + $url = db_escape_string($this->link, strip_tags($_REQUEST["url"])); + $content = db_escape_string($this->link, strip_tags($_REQUEST["content"])); + $labels = db_escape_string($this->link, strip_tags($_REQUEST["labels"])); Article::create_published_article($this->link, $title, $url, $content, $labels, $_SESSION["uid"]); @@ -483,7 +485,7 @@ class Handler_Public extends Handler { if (!SINGLE_USER_MODE) { - $login = db_escape_string($_POST["login"]); + $login = db_escape_string($this->link, $_POST["login"]); $password = $_POST["password"]; $remember_me = $_POST["remember_me"]; @@ -496,7 +498,7 @@ class Handler_Public extends Handler { if ($_POST["profile"]) { - $profile = db_escape_string($_POST["profile"]); + $profile = db_escape_string($this->link, $_POST["profile"]); $result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]); @@ -525,7 +527,7 @@ class Handler_Public extends Handler { if ($_SESSION["uid"]) { - $feed_url = db_escape_string(trim($_REQUEST["feed_url"])); + $feed_url = db_escape_string($this->link, trim($_REQUEST["feed_url"])); header('Content-Type: text/html; charset=utf-8'); print "<html> @@ -618,14 +620,14 @@ class Handler_Public extends Handler { } function subscribe2() { - $feed_url = db_escape_string(trim($_REQUEST["feed_url"])); - $cat_id = db_escape_string($_REQUEST["cat_id"]); - $from = db_escape_string($_REQUEST["from"]); + $feed_url = db_escape_string($this->link, trim($_REQUEST["feed_url"])); + $cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]); + $from = db_escape_string($this->link, $_REQUEST["from"]); /* only read authentication information from POST */ - $auth_login = db_escape_string(trim($_POST["auth_login"])); - $auth_pass = db_escape_string(trim($_POST["auth_pass"])); + $auth_login = db_escape_string($this->link, trim($_POST["auth_login"])); + $auth_pass = db_escape_string($this->link, trim($_POST["auth_pass"])); $rc = subscribe_to_feed($this->link, $feed_url, $cat_id, $auth_login, $auth_pass); @@ -706,5 +708,92 @@ class Handler_Public extends Handler { print json_encode(array("error" => array("code" => 7))); } + function forgotpass() { + header('Content-Type: text/html; charset=utf-8'); + print "<html> + <head> + <title>Tiny Tiny RSS</title> + <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\"> + <script type=\"text/javascript\" src=\"lib/prototype.js\"></script> + <script type=\"text/javascript\" src=\"lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls\"></script> + <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> + </head> + <body id='forgotpass'>"; + + print '<div class="floatingLogo"><img src="images/logo_wide.png"></div>'; + print "<h1>".__("Reset password")."</h1>"; + + @$method = $_POST['method']; + + if (!$method) { + $secretkey = uniqid(); + $_SESSION["secretkey"] = $secretkey; + + print "<form method='POST' action='public.php'>"; + print "<input type='hidden' name='secretkey' value='$secretkey'>"; + print "<input type='hidden' name='method' value='do'>"; + print "<input type='hidden' name='op' value='forgotpass'>"; + + print "<fieldset>"; + print "<label>".__("Login:")."</label>"; + print "<input type='text' name='login' value='' required>"; + print "</fieldset>"; + + print "<fieldset>"; + print "<label>".__("Email:")."</label>"; + print "<input type='email' name='email' value='' required>"; + print "</fieldset>"; + + print "<fieldset>"; + print "<label>".__("How much is two plus two:")."</label>"; + print "<input type='text' name='test' value='' required>"; + print "</fieldset>"; + + print "<p/>"; + print "<button type='submit'>".__("Reset password")."</button>"; + + print "</form>"; + } else if ($method == 'do') { + + $secretkey = $_POST["secretkey"]; + $login = db_escape_string($this->link, $_POST["login"]); + $email = db_escape_string($this->link, $_POST["email"]); + $test = db_escape_string($this->link, $_POST["test"]); + + if (($test != 4 && $test != 'four') || !$email || !$login) { + print_error(__('Some of the required form parameters are missing or incorrect.')); + + print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>"; + + } else if ($_SESSION["secretkey"] == $secretkey) { + + $result = db_query($this->link, "SELECT id FROM ttrss_users + WHERE login = '$login' AND email = '$email'"); + + if (db_num_rows($result) != 0) { + $id = db_fetch_result($result, 0, "id"); + + Pref_Users::resetUserPassword($this->link, $id, false); + + print "<p>".__("Completed.")."</p>"; + + } else { + print_error(__("Sorry, login and email combination not found.")); + print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>"; + } + + } else { + print_error(__("Form secret key incorrect. Please enable cookies and try again.")); + print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>"; + + } + + } + + print "</body>"; + print "</html>"; + + } + } ?> diff --git a/classes/opml.php b/classes/opml.php index 34067e017..d4a0e9875 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -253,13 +253,13 @@ class Opml extends Handler_Protected { private function opml_import_feed($doc, $node, $cat_id, $owner_uid) { $attrs = $node->attributes; - $feed_title = db_escape_string($attrs->getNamedItem('text')->nodeValue); - if (!$feed_title) $feed_title = db_escape_string($attrs->getNamedItem('title')->nodeValue); + $feed_title = db_escape_string($this->link, $attrs->getNamedItem('text')->nodeValue); + if (!$feed_title) $feed_title = db_escape_string($this->link, $attrs->getNamedItem('title')->nodeValue); - $feed_url = db_escape_string($attrs->getNamedItem('xmlUrl')->nodeValue); - if (!$feed_url) $feed_url = db_escape_string($attrs->getNamedItem('xmlURL')->nodeValue); + $feed_url = db_escape_string($this->link, $attrs->getNamedItem('xmlUrl')->nodeValue); + if (!$feed_url) $feed_url = db_escape_string($this->link, $attrs->getNamedItem('xmlURL')->nodeValue); - $site_url = db_escape_string($attrs->getNamedItem('htmlUrl')->nodeValue); + $site_url = db_escape_string($this->link, $attrs->getNamedItem('htmlUrl')->nodeValue); if ($feed_url && $feed_title) { $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE @@ -285,11 +285,11 @@ class Opml extends Handler_Protected { private function opml_import_label($doc, $node, $owner_uid) { $attrs = $node->attributes; - $label_name = db_escape_string($attrs->getNamedItem('label-name')->nodeValue); + $label_name = db_escape_string($this->link, $attrs->getNamedItem('label-name')->nodeValue); if ($label_name) { - $fg_color = db_escape_string($attrs->getNamedItem('label-fg-color')->nodeValue); - $bg_color = db_escape_string($attrs->getNamedItem('label-bg-color')->nodeValue); + $fg_color = db_escape_string($this->link, $attrs->getNamedItem('label-fg-color')->nodeValue); + $bg_color = db_escape_string($this->link, $attrs->getNamedItem('label-bg-color')->nodeValue); if (!label_find_id($this->link, $label_name, $_SESSION['uid'])) { $this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name))); @@ -302,10 +302,10 @@ class Opml extends Handler_Protected { private function opml_import_preference($doc, $node, $owner_uid) { $attrs = $node->attributes; - $pref_name = db_escape_string($attrs->getNamedItem('pref-name')->nodeValue); + $pref_name = db_escape_string($this->link, $attrs->getNamedItem('pref-name')->nodeValue); if ($pref_name) { - $pref_value = db_escape_string($attrs->getNamedItem('value')->nodeValue); + $pref_value = db_escape_string($this->link, $attrs->getNamedItem('value')->nodeValue); $this->opml_notice(T_sprintf("Setting preference key %s to %s", $pref_name, $pref_value)); @@ -317,7 +317,7 @@ class Opml extends Handler_Protected { private function opml_import_filter($doc, $node, $owner_uid) { $attrs = $node->attributes; - $filter_type = db_escape_string($attrs->getNamedItem('filter-type')->nodeValue); + $filter_type = db_escape_string($this->link, $attrs->getNamedItem('filter-type')->nodeValue); if ($filter_type == '2') { $filter = json_decode($node->nodeValue, true); @@ -344,13 +344,13 @@ class Opml extends Handler_Protected { if (!$rule["cat_filter"]) { $tmp_result = db_query($this->link, "SELECT id FROM ttrss_feeds - WHERE title = '".db_escape_string($rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]); + WHERE title = '".db_escape_string($this->link, $rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]); if (db_num_rows($tmp_result) > 0) { $feed_id = db_fetch_result($tmp_result, 0, "id"); } } else { $tmp_result = db_query($this->link, "SELECT id FROM ttrss_feed_categories - WHERE title = '".db_escape_string($rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]); + WHERE title = '".db_escape_string($this->link, $rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]); if (db_num_rows($tmp_result) > 0) { $cat_id = db_fetch_result($tmp_result, 0, "id"); @@ -358,7 +358,7 @@ class Opml extends Handler_Protected { } $cat_filter = bool_to_sql_bool($rule["cat_filter"]); - $reg_exp = db_escape_string($rule["reg_exp"]); + $reg_exp = db_escape_string($this->link, $rule["reg_exp"]); $filter_type = (int)$rule["filter_type"]; db_query($this->link, "INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter) @@ -368,7 +368,7 @@ class Opml extends Handler_Protected { foreach ($filter["actions"] as $action) { $action_id = (int)$action["action_id"]; - $action_param = db_escape_string($action["action_param"]); + $action_param = db_escape_string($this->link, $action["action_param"]); db_query($this->link, "INSERT INTO ttrss_filters2_actions (filter_id,action_id,action_param) VALUES ($filter_id, $action_id, '$action_param')"); @@ -386,10 +386,10 @@ class Opml extends Handler_Protected { $default_cat_id = (int) get_feed_category($this->link, 'Imported feeds', false); if ($root_node) { - $cat_title = db_escape_string($root_node->attributes->getNamedItem('text')->nodeValue); + $cat_title = db_escape_string($this->link, $root_node->attributes->getNamedItem('text')->nodeValue); if (!$cat_title) - $cat_title = db_escape_string($root_node->attributes->getNamedItem('title')->nodeValue); + $cat_title = db_escape_string($this->link, $root_node->attributes->getNamedItem('title')->nodeValue); if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) { $cat_id = get_feed_category($this->link, $cat_title, $parent_id); @@ -418,12 +418,12 @@ class Opml extends Handler_Protected { foreach ($outlines as $node) { if ($node->hasAttributes() && strtolower($node->tagName) == "outline") { $attrs = $node->attributes; - $node_cat_title = db_escape_string($attrs->getNamedItem('text')->nodeValue); + $node_cat_title = db_escape_string($this->link, $attrs->getNamedItem('text')->nodeValue); if (!$node_cat_title) - $node_cat_title = db_escape_string($attrs->getNamedItem('title')->nodeValue); + $node_cat_title = db_escape_string($this->link, $attrs->getNamedItem('title')->nodeValue); - $node_feed_url = db_escape_string($attrs->getNamedItem('xmlUrl')->nodeValue); + $node_feed_url = db_escape_string($this->link, $attrs->getNamedItem('xmlUrl')->nodeValue); if ($node_cat_title && !$node_feed_url) { $this->opml_import_category($doc, $node, $owner_uid, $cat_id); diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 710435ae4..0ef17b77e 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -22,6 +22,7 @@ class PluginHost { const HOOK_RENDER_ARTICLE_CDM = 11; const HOOK_FEED_FETCHED = 12; const HOOK_SANITIZE = 13; + const HOOK_RENDER_ARTICLE_API = 14; const KIND_ALL = 1; const KIND_SYSTEM = 2; @@ -210,7 +211,7 @@ class PluginHost { function load_data($force = false) { if ($this->owner_uid && (!$_SESSION["plugin_storage"] || $force)) { - $plugin = db_escape_string($plugin); + $plugin = db_escape_string($this->link, $plugin); $result = db_query($this->link, "SELECT name, content FROM ttrss_plugin_storage WHERE owner_uid = '".$this->owner_uid."'"); @@ -225,7 +226,7 @@ class PluginHost { private function save_data($plugin) { if ($this->owner_uid) { - $plugin = db_escape_string($plugin); + $plugin = db_escape_string($this->link, $plugin); db_query($this->link, "BEGIN"); @@ -235,7 +236,7 @@ class PluginHost { if (!isset($this->storage[$plugin])) $this->storage[$plugin] = array(); - $content = db_escape_string(serialize($this->storage[$plugin])); + $content = db_escape_string($this->link, serialize($this->storage[$plugin])); if (db_num_rows($result) != 0) { db_query($this->link, "UPDATE ttrss_plugin_storage SET content = '$content' diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 285995dfc..ceda13374 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -14,8 +14,8 @@ class Pref_Feeds extends Handler_Protected { } function renamecat() { - $title = db_escape_string($_REQUEST['title']); - $id = db_escape_string($_REQUEST['id']); + $title = db_escape_string($this->link, $_REQUEST['title']); + $id = db_escape_string($this->link, $_REQUEST['id']); if ($title) { db_query($this->link, "UPDATE ttrss_feed_categories SET @@ -293,7 +293,7 @@ class Pref_Feeds extends Handler_Protected { if ($item_id != 'root') { if ($parent_id && $parent_id != 'root') { $parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1); - $parent_qpart = db_escape_string($parent_bare_id); + $parent_qpart = db_escape_string($this->link, $parent_bare_id); } else { $parent_qpart = 'NULL'; } @@ -319,7 +319,7 @@ class Pref_Feeds extends Handler_Protected { if (strpos($id, "FEED") === 0) { $cat_id = ($item_id != "root") ? - db_escape_string($bare_item_id) : "NULL"; + db_escape_string($this->link, $bare_item_id) : "NULL"; $cat_qpart = ($cat_id != 0) ? "cat_id = '$cat_id'" : "cat_id = NULL"; @@ -334,7 +334,7 @@ class Pref_Feeds extends Handler_Protected { $nest_level+1); if ($item_id != 'root') { - $parent_qpart = db_escape_string($bare_id); + $parent_qpart = db_escape_string($this->link, $bare_id); } else { $parent_qpart = 'NULL'; } @@ -424,7 +424,7 @@ class Pref_Feeds extends Handler_Protected { } function removeicon() { - $feed_id = db_escape_string($_REQUEST["feed_id"]); + $feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]); $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]); @@ -440,7 +440,7 @@ class Pref_Feeds extends Handler_Protected { header("Content-type: text/html"); $icon_file = $_FILES['icon_file']['tmp_name']; - $feed_id = db_escape_string($_REQUEST["feed_id"]); + $feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]); if (is_file($icon_file) && $feed_id) { if (filesize($icon_file) < 20000) { @@ -472,7 +472,7 @@ class Pref_Feeds extends Handler_Protected { global $purge_intervals; global $update_intervals; - $feed_id = db_escape_string($_REQUEST["id"]); + $feed_id = db_escape_string($this->link, $_REQUEST["id"]); $result = db_query($this->link, "SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND @@ -708,7 +708,7 @@ class Pref_Feeds extends Handler_Protected { global $purge_intervals; global $update_intervals; - $feed_ids = db_escape_string($_REQUEST["ids"]); + $feed_ids = db_escape_string($this->link, $_REQUEST["ids"]); print "<div class=\"dialogNotice\">" . __("Enable the options you wish to apply using checkboxes on the right:") . "</div>"; @@ -862,27 +862,27 @@ class Pref_Feeds extends Handler_Protected { function editsaveops($batch) { - $feed_title = db_escape_string(trim($_POST["title"])); - $feed_link = db_escape_string(trim($_POST["feed_url"])); - $upd_intl = (int) db_escape_string($_POST["update_interval"]); - $purge_intl = (int) db_escape_string($_POST["purge_interval"]); - $feed_id = (int) db_escape_string($_POST["id"]); /* editSave */ - $feed_ids = db_escape_string($_POST["ids"]); /* batchEditSave */ - $cat_id = (int) db_escape_string($_POST["cat_id"]); - $auth_login = db_escape_string(trim($_POST["auth_login"])); - $auth_pass = db_escape_string(trim($_POST["auth_pass"])); - $private = checkbox_to_sql_bool(db_escape_string($_POST["private"])); + $feed_title = db_escape_string($this->link, trim($_POST["title"])); + $feed_link = db_escape_string($this->link, trim($_POST["feed_url"])); + $upd_intl = (int) db_escape_string($this->link, $_POST["update_interval"]); + $purge_intl = (int) db_escape_string($this->link, $_POST["purge_interval"]); + $feed_id = (int) db_escape_string($this->link, $_POST["id"]); /* editSave */ + $feed_ids = db_escape_string($this->link, $_POST["ids"]); /* batchEditSave */ + $cat_id = (int) db_escape_string($this->link, $_POST["cat_id"]); + $auth_login = db_escape_string($this->link, trim($_POST["auth_login"])); + $auth_pass = db_escape_string($this->link, trim($_POST["auth_pass"])); + $private = checkbox_to_sql_bool(db_escape_string($this->link, $_POST["private"])); $include_in_digest = checkbox_to_sql_bool( - db_escape_string($_POST["include_in_digest"])); + db_escape_string($this->link, $_POST["include_in_digest"])); $cache_images = checkbox_to_sql_bool( - db_escape_string($_POST["cache_images"])); + db_escape_string($this->link, $_POST["cache_images"])); $hide_images = checkbox_to_sql_bool( - db_escape_string($_POST["hide_images"])); + db_escape_string($this->link, $_POST["hide_images"])); $always_display_enclosures = checkbox_to_sql_bool( - db_escape_string($_POST["always_display_enclosures"])); + db_escape_string($this->link, $_POST["always_display_enclosures"])); $mark_unread_on_update = checkbox_to_sql_bool( - db_escape_string($_POST["mark_unread_on_update"])); + db_escape_string($this->link, $_POST["mark_unread_on_update"])); if (get_pref($this->link, 'ENABLE_FEED_CATS')) { if ($cat_id && $cat_id != 0) { @@ -999,7 +999,7 @@ class Pref_Feeds extends Handler_Protected { function resetPubSub() { - $ids = db_escape_string($_REQUEST["ids"]); + $ids = db_escape_string($this->link, $_REQUEST["ids"]); db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); @@ -1009,7 +1009,7 @@ class Pref_Feeds extends Handler_Protected { function remove() { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { $this->remove_feed($this->link, $id, $_SESSION["uid"]); @@ -1019,14 +1019,14 @@ class Pref_Feeds extends Handler_Protected { } function clear() { - $id = db_escape_string($_REQUEST["id"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); $this->clear_feed_articles($this->link, $id); } function rescore() { require_once "rssfuncs.php"; - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { @@ -1132,9 +1132,9 @@ class Pref_Feeds extends Handler_Protected { } function categorize() { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"])); - $cat_id = db_escape_string($_REQUEST["cat_id"]); + $cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]); if ($cat_id == 0) { $cat_id_qpart = 'NULL'; @@ -1156,14 +1156,14 @@ class Pref_Feeds extends Handler_Protected { } function removeCat() { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { $this->remove_feed_category($this->link, $id, $_SESSION["uid"]); } } function addCat() { - $feed_cat = db_escape_string(trim($_REQUEST["cat"])); + $feed_cat = db_escape_string($this->link, trim($_REQUEST["cat"])); add_feed_category($this->link, $feed_cat); } @@ -1205,7 +1205,7 @@ class Pref_Feeds extends Handler_Protected { __("Inactive feeds") . "</button>"; } - $feed_search = db_escape_string($_REQUEST["search"]); + $feed_search = db_escape_string($this->link, $_REQUEST["search"]); if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_feed_search"] = $feed_search; diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 1921f2b97..c97628e51 100644 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -13,7 +13,7 @@ class Pref_Filters extends Handler_Protected { $filter["enabled"] = true; $filter["match_any_rule"] = sql_bool_to_bool( - checkbox_to_sql_bool(db_escape_string($_REQUEST["match_any_rule"]))); + checkbox_to_sql_bool(db_escape_string($this->link, $_REQUEST["match_any_rule"]))); $filter["rules"] = array(); $result = db_query($this->link, "SELECT id,name FROM ttrss_filter_types"); @@ -168,7 +168,7 @@ class Pref_Filters extends Handler_Protected { if ($line['action_id'] == 7) { $label_result = db_query($this->link, "SELECT fg_color, bg_color - FROM ttrss_labels2 WHERE caption = '".db_escape_string($line['action_param'])."' AND + FROM ttrss_labels2 WHERE caption = '".db_escape_string($this->link, $line['action_param'])."' AND owner_uid = " . $_SESSION["uid"]); if (db_num_rows($label_result) > 0) { @@ -207,7 +207,7 @@ class Pref_Filters extends Handler_Protected { function edit() { - $filter_id = db_escape_string($_REQUEST["id"]); + $filter_id = db_escape_string($this->link, $_REQUEST["id"]); $result = db_query($this->link, "SELECT * FROM ttrss_filters2 WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]); @@ -403,9 +403,9 @@ class Pref_Filters extends Handler_Protected { # print_r($_REQUEST); - $filter_id = db_escape_string($_REQUEST["id"]); - $enabled = checkbox_to_sql_bool(db_escape_string($_REQUEST["enabled"])); - $match_any_rule = checkbox_to_sql_bool(db_escape_string($_REQUEST["match_any_rule"])); + $filter_id = db_escape_string($this->link, $_REQUEST["id"]); + $enabled = checkbox_to_sql_bool(db_escape_string($this->link, $_REQUEST["enabled"])); + $match_any_rule = checkbox_to_sql_bool(db_escape_string($this->link, $_REQUEST["match_any_rule"])); $result = db_query($this->link, "UPDATE ttrss_filters2 SET enabled = $enabled, match_any_rule = $match_any_rule @@ -418,7 +418,7 @@ class Pref_Filters extends Handler_Protected { function remove() { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { db_query($this->link, "DELETE FROM ttrss_filters2 WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]); @@ -457,9 +457,9 @@ class Pref_Filters extends Handler_Protected { foreach ($rules as $rule) { if ($rule) { - $reg_exp = strip_tags(db_escape_string(trim($rule["reg_exp"]))); - $filter_type = (int) db_escape_string(trim($rule["filter_type"])); - $feed_id = db_escape_string(trim($rule["feed_id"])); + $reg_exp = strip_tags(db_escape_string($this->link, trim($rule["reg_exp"]))); + $filter_type = (int) db_escape_string($this->link, trim($rule["filter_type"])); + $feed_id = db_escape_string($this->link, trim($rule["feed_id"])); if (strpos($feed_id, "CAT:") === 0) { @@ -487,9 +487,9 @@ class Pref_Filters extends Handler_Protected { foreach ($actions as $action) { if ($action) { - $action_id = (int) db_escape_string($action["action_id"]); - $action_param = db_escape_string($action["action_param"]); - $action_param_label = db_escape_string($action["action_param_label"]); + $action_id = (int) db_escape_string($this->link, $action["action_id"]); + $action_param = db_escape_string($this->link, $action["action_param"]); + $action_param_label = db_escape_string($this->link, $action["action_param_label"]); if ($action_id == 7) { $action_param = $action_param_label; @@ -541,13 +541,13 @@ class Pref_Filters extends Handler_Protected { function index() { - $sort = db_escape_string($_REQUEST["sort"]); + $sort = db_escape_string($this->link, $_REQUEST["sort"]); if (!$sort || $sort == "undefined") { $sort = "reg_exp"; } - $filter_search = db_escape_string($_REQUEST["search"]); + $filter_search = db_escape_string($this->link, $_REQUEST["search"]); if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_filter_search"] = $filter_search; @@ -559,7 +559,7 @@ class Pref_Filters extends Handler_Protected { print "<div id=\"pref-filter-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">"; print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">"; - $filter_search = db_escape_string($_REQUEST["search"]); + $filter_search = db_escape_string($this->link, $_REQUEST["search"]); if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_filter_search"] = $filter_search; @@ -806,7 +806,7 @@ class Pref_Filters extends Handler_Protected { $action = json_decode($_REQUEST["action"], true); if ($action) { - $action_param = db_escape_string($action["action_param"]); + $action_param = db_escape_string($this->link, $action["action_param"]); $action_id = (int)$action["action_id"]; } else { $action_param = ""; @@ -914,7 +914,7 @@ class Pref_Filters extends Handler_Protected { } function join() { - $ids = explode(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); if (count($ids) > 1) { $base_id = array_shift($ids); diff --git a/classes/pref/labels.php b/classes/pref/labels.php index e63a0cfc2..b45354c94 100644 --- a/classes/pref/labels.php +++ b/classes/pref/labels.php @@ -8,7 +8,7 @@ class Pref_Labels extends Handler_Protected { } function edit() { - $label_id = db_escape_string($_REQUEST['id']); + $label_id = db_escape_string($this->link, $_REQUEST['id']); $result = db_query($this->link, "SELECT * FROM ttrss_labels2 WHERE id = '$label_id' AND owner_uid = " . $_SESSION["uid"]); @@ -118,11 +118,11 @@ class Pref_Labels extends Handler_Protected { } function colorset() { - $kind = db_escape_string($_REQUEST["kind"]); - $ids = split(',', db_escape_string($_REQUEST["ids"])); - $color = db_escape_string($_REQUEST["color"]); - $fg = db_escape_string($_REQUEST["fg"]); - $bg = db_escape_string($_REQUEST["bg"]); + $kind = db_escape_string($this->link, $_REQUEST["kind"]); + $ids = split(',', db_escape_string($this->link, $_REQUEST["ids"])); + $color = db_escape_string($this->link, $_REQUEST["color"]); + $fg = db_escape_string($this->link, $_REQUEST["fg"]); + $bg = db_escape_string($this->link, $_REQUEST["bg"]); foreach ($ids as $id) { @@ -136,7 +136,7 @@ class Pref_Labels extends Handler_Protected { AND owner_uid = " . $_SESSION["uid"]); } - $caption = db_escape_string(label_find_caption($this->link, $id, $_SESSION["uid"])); + $caption = db_escape_string($this->link, label_find_caption($this->link, $id, $_SESSION["uid"])); /* Remove cached data */ @@ -149,14 +149,14 @@ class Pref_Labels extends Handler_Protected { } function colorreset() { - $ids = split(',', db_escape_string($_REQUEST["ids"])); + $ids = split(',', db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { db_query($this->link, "UPDATE ttrss_labels2 SET fg_color = '', bg_color = '' WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]); - $caption = db_escape_string(label_find_caption($this->link, $id, $_SESSION["uid"])); + $caption = db_escape_string($this->link, label_find_caption($this->link, $id, $_SESSION["uid"])); /* Remove cached data */ @@ -168,8 +168,8 @@ class Pref_Labels extends Handler_Protected { function save() { - $id = db_escape_string($_REQUEST["id"]); - $caption = db_escape_string(trim($_REQUEST["caption"])); + $id = db_escape_string($this->link, $_REQUEST["id"]); + $caption = db_escape_string($this->link, trim($_REQUEST["caption"])); db_query($this->link, "BEGIN"); @@ -190,7 +190,7 @@ class Pref_Labels extends Handler_Protected { /* Update filters that reference label being renamed */ - $old_caption = db_escape_string($old_caption); + $old_caption = db_escape_string($this->link, $old_caption); db_query($this->link, "UPDATE ttrss_filters2_actions SET action_param = '$caption' WHERE action_param = '$old_caption' @@ -213,7 +213,7 @@ class Pref_Labels extends Handler_Protected { function remove() { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { label_remove($this->link, $id, $_SESSION["uid"]); @@ -222,8 +222,8 @@ class Pref_Labels extends Handler_Protected { } function add() { - $caption = db_escape_string($_REQUEST["caption"]); - $output = db_escape_string($_REQUEST["output"]); + $caption = db_escape_string($this->link, $_REQUEST["caption"]); + $output = db_escape_string($this->link, $_REQUEST["output"]); if ($caption) { @@ -250,13 +250,13 @@ class Pref_Labels extends Handler_Protected { function index() { - $sort = db_escape_string($_REQUEST["sort"]); + $sort = db_escape_string($this->link, $_REQUEST["sort"]); if (!$sort || $sort == "undefined") { $sort = "caption"; } - $label_search = db_escape_string($_REQUEST["search"]); + $label_search = db_escape_string($this->link, $_REQUEST["search"]); if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_label_search"] = $label_search; diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 8b8630c82..4fb8650a2 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -50,8 +50,8 @@ class Pref_Prefs extends Handler_Protected { foreach (array_keys($_POST) as $pref_name) { - $pref_name = db_escape_string($pref_name); - $value = db_escape_string($_POST[$pref_name]); + $pref_name = db_escape_string($this->link, $pref_name); + $value = db_escape_string($this->link, $_POST[$pref_name]); if ($pref_name == 'DIGEST_PREFERRED_TIME') { if (get_pref($this->link, 'DIGEST_PREFERRED_TIME') != $value) { @@ -71,7 +71,7 @@ class Pref_Prefs extends Handler_Protected { function getHelp() { - $pref_name = db_escape_string($_REQUEST["pn"]); + $pref_name = db_escape_string($this->link, $_REQUEST["pn"]); $result = db_query($this->link, "SELECT help_text FROM ttrss_prefs WHERE pref_name = '$pref_name'"); @@ -86,8 +86,8 @@ class Pref_Prefs extends Handler_Protected { function changeemail() { - $email = db_escape_string($_POST["email"]); - $full_name = db_escape_string($_POST["full_name"]); + $email = db_escape_string($this->link, $_POST["email"]); + $full_name = db_escape_string($this->link, $_POST["full_name"]); $active_uid = $_SESSION["uid"]; @@ -798,7 +798,7 @@ class Pref_Prefs extends Handler_Protected { } function otpenable() { - $password = db_escape_string($_REQUEST["password"]); + $password = db_escape_string($this->link, $_REQUEST["password"]); $enable_otp = $_REQUEST["enable_otp"] == "on"; global $pluginhost; @@ -819,7 +819,7 @@ class Pref_Prefs extends Handler_Protected { } function otpdisable() { - $password = db_escape_string($_REQUEST["password"]); + $password = db_escape_string($this->link, $_REQUEST["password"]); global $pluginhost; $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]); @@ -846,7 +846,7 @@ class Pref_Prefs extends Handler_Protected { } function clearplugindata() { - $name = db_escape_string($_REQUEST["name"]); + $name = db_escape_string($this->link, $_REQUEST["name"]); global $pluginhost; $pluginhost->clear_data($pluginhost->get_plugin($name)); diff --git a/classes/pref/users.php b/classes/pref/users.php index d36ed29f7..b4f043775 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -116,7 +116,7 @@ class Pref_Users extends Handler_Protected { header("Content-Type: text/xml"); - $id = db_escape_string($_REQUEST["id"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); print "<dlg id=\"$method\">"; print "<title>".__('User Editor')."</title>"; @@ -199,11 +199,11 @@ class Pref_Users extends Handler_Protected { } function editSave() { - $login = db_escape_string(trim($_REQUEST["login"])); - $uid = db_escape_string($_REQUEST["id"]); + $login = db_escape_string($this->link, trim($_REQUEST["login"])); + $uid = db_escape_string($this->link, $_REQUEST["id"]); $access_level = (int) $_REQUEST["access_level"]; - $email = db_escape_string(trim($_REQUEST["email"])); - $password = db_escape_string(trim($_REQUEST["password"])); + $email = db_escape_string($this->link, trim($_REQUEST["email"])); + $password = db_escape_string($this->link, trim($_REQUEST["password"])); if ($password) { $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); @@ -220,7 +220,7 @@ class Pref_Users extends Handler_Protected { } function remove() { - $ids = split(",", db_escape_string($_REQUEST["ids"])); + $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { if ($id != $_SESSION["uid"] && $id != 1) { @@ -233,7 +233,7 @@ class Pref_Users extends Handler_Protected { function add() { - $login = db_escape_string(trim($_REQUEST["login"])); + $login = db_escape_string($this->link, trim($_REQUEST["login"])); $tmp_user_pwd = make_password(8); $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true); @@ -270,11 +270,9 @@ class Pref_Users extends Handler_Protected { } } - function resetPass() { - - $uid = db_escape_string($_REQUEST["id"]); + static function resetUserPassword($link, $uid, $show_password) { - $result = db_query($this->link, "SELECT login,email + $result = db_query($link, "SELECT login,email FROM ttrss_users WHERE id = '$uid'"); $login = db_fetch_result($result, 0, "login"); @@ -286,18 +284,20 @@ class Pref_Users extends Handler_Protected { $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true); - db_query($this->link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt' + db_query($link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt' WHERE id = '$uid'"); - print T_sprintf("Changed password of user <b>%s</b> - to <b>%s</b>", $login, $tmp_user_pwd); + if ($show_password) { + print T_sprintf("Changed password of user <b>%s</b> + to <b>%s</b>", $login, $tmp_user_pwd); + } else { + print T_sprintf("Sending new password of user <b>%s</b> + to <b>%s</b>", $login, $email); + } require_once 'lib/phpmailer/class.phpmailer.php'; if ($email) { - print " "; - print T_sprintf("Notifying <b>%s</b>.", $email); - require_once "lib/MiniTemplator.class.php"; $tpl = new MiniTemplator; @@ -340,8 +340,11 @@ class Pref_Users extends Handler_Protected { if (!$rc) print_error($mail->ErrorInfo); } + } - print "</div>"; + function resetPass() { + $uid = db_escape_string($this->link, $_REQUEST["id"]); + Pref_Users::resetUserPassword($this->link, $uid, true); } function index() { @@ -353,7 +356,7 @@ class Pref_Users extends Handler_Protected { print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">"; - $user_search = db_escape_string($_REQUEST["search"]); + $user_search = db_escape_string($this->link, $_REQUEST["search"]); if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_user_search"] = $user_search; @@ -368,7 +371,7 @@ class Pref_Users extends Handler_Protected { __('Search')."</button> </div>"; - $sort = db_escape_string($_REQUEST["sort"]); + $sort = db_escape_string($this->link, $_REQUEST["sort"]); if (!$sort || $sort == "undefined") { $sort = "login"; diff --git a/classes/rpc.php b/classes/rpc.php index 139f1fe49..ee5a9e68a 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -8,14 +8,14 @@ class RPC extends Handler_Protected { } function setprofile() { - $id = db_escape_string($_REQUEST["id"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); $_SESSION["profile"] = $id; $_SESSION["prefs_cache"] = array(); } function remprofiles() { - $ids = explode(",", db_escape_string(trim($_REQUEST["ids"]))); + $ids = explode(",", db_escape_string($this->link, trim($_REQUEST["ids"]))); foreach ($ids as $id) { if ($_SESSION["profile"] != $id) { @@ -27,7 +27,7 @@ class RPC extends Handler_Protected { // Silent function addprofile() { - $title = db_escape_string(trim($_REQUEST["title"])); + $title = db_escape_string($this->link, trim($_REQUEST["title"])); if ($title) { db_query($this->link, "BEGIN"); @@ -57,8 +57,8 @@ class RPC extends Handler_Protected { // Silent function saveprofile() { - $id = db_escape_string($_REQUEST["id"]); - $title = db_escape_string(trim($_REQUEST["value"])); + $id = db_escape_string($this->link, $_REQUEST["id"]); + $title = db_escape_string($this->link, trim($_REQUEST["value"])); if ($id == 0) { print __("Default profile"); @@ -88,7 +88,7 @@ class RPC extends Handler_Protected { // Silent function remarchive() { - $ids = explode(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { $result = db_query($this->link, "DELETE FROM ttrss_archived_feeds WHERE @@ -101,11 +101,11 @@ class RPC extends Handler_Protected { } function addfeed() { - $feed = db_escape_string($_REQUEST['feed']); - $cat = db_escape_string($_REQUEST['cat']); - $login = db_escape_string($_REQUEST['login']); - $pass = db_escape_string($_REQUEST['pass']); - $need_auth = db_escape_string($_REQUEST['need_auth']) != ""; + $feed = db_escape_string($this->link, $_REQUEST['feed']); + $cat = db_escape_string($this->link, $_REQUEST['cat']); + $login = db_escape_string($this->link, $_REQUEST['login']); + $pass = db_escape_string($this->link, $_REQUEST['pass']); + $need_auth = db_escape_string($this->link, $_REQUEST['need_auth']) != ""; $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass, $need_auth); @@ -113,7 +113,7 @@ class RPC extends Handler_Protected { } function togglepref() { - $key = db_escape_string($_REQUEST["key"]); + $key = db_escape_string($this->link, $_REQUEST["key"]); set_pref($this->link, $key, !get_pref($this->link, $key)); $value = get_pref($this->link, $key); @@ -132,7 +132,7 @@ class RPC extends Handler_Protected { function mark() { $mark = $_REQUEST["mark"]; - $id = db_escape_string($_REQUEST["id"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); if ($mark == "1") { $mark = "true"; @@ -148,7 +148,7 @@ class RPC extends Handler_Protected { } function delete() { - $ids = db_escape_string($_REQUEST["ids"]); + $ids = db_escape_string($this->link, $_REQUEST["ids"]); $result = db_query($this->link, "DELETE FROM ttrss_user_entries WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); @@ -157,7 +157,7 @@ class RPC extends Handler_Protected { } function unarchive() { - $ids = db_escape_string($_REQUEST["ids"]); + $ids = db_escape_string($this->link, $_REQUEST["ids"]); $result = db_query($this->link, "UPDATE ttrss_user_entries SET feed_id = orig_feed_id, orig_feed_id = NULL @@ -167,7 +167,7 @@ class RPC extends Handler_Protected { } function archive() { - $ids = explode(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); foreach ($ids as $id) { $this->archive_article($this->link, $id, $_SESSION["uid"]); @@ -210,8 +210,8 @@ class RPC extends Handler_Protected { function publ() { $pub = $_REQUEST["pub"]; - $id = db_escape_string($_REQUEST["id"]); - $note = trim(strip_tags(db_escape_string($_REQUEST["note"]))); + $id = db_escape_string($this->link, $_REQUEST["id"]); + $note = trim(strip_tags(db_escape_string($this->link, $_REQUEST["note"]))); if ($pub == "1") { $pub = "true"; @@ -257,7 +257,7 @@ class RPC extends Handler_Protected { /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */ function catchupSelected() { - $ids = explode(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); $cmode = sprintf("%d", $_REQUEST["cmode"]); catchupArticlesById($this->link, $ids, $cmode); @@ -266,7 +266,7 @@ class RPC extends Handler_Protected { } function markSelected() { - $ids = explode(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); $cmode = sprintf("%d", $_REQUEST["cmode"]); $this->markArticlesById($this->link, $ids, $cmode); @@ -275,7 +275,7 @@ class RPC extends Handler_Protected { } function publishSelected() { - $ids = explode(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); $cmode = sprintf("%d", $_REQUEST["cmode"]); $this->publishArticlesById($this->link, $ids, $cmode); @@ -301,9 +301,9 @@ class RPC extends Handler_Protected { function setArticleTags() { - $id = db_escape_string($_REQUEST["id"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); - $tags_str = db_escape_string($_REQUEST["tags_str"]); + $tags_str = db_escape_string($this->link, $_REQUEST["tags_str"]); $tags = array_unique(trim_array(explode(",", $tags_str))); db_query($this->link, "BEGIN"); @@ -373,7 +373,7 @@ class RPC extends Handler_Protected { } function completeLabels() { - $search = db_escape_string($_REQUEST["search"]); + $search = db_escape_string($this->link, $_REQUEST["search"]); $result = db_query($this->link, "SELECT DISTINCT caption FROM ttrss_labels2 @@ -390,7 +390,7 @@ class RPC extends Handler_Protected { function completeTags() { - $search = db_escape_string($_REQUEST["search"]); + $search = db_escape_string($this->link, $_REQUEST["search"]); $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = '".$_SESSION["uid"]."' AND @@ -405,7 +405,7 @@ class RPC extends Handler_Protected { } function purge() { - $ids = explode(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); $days = sprintf("%d", $_REQUEST["days"]); foreach ($ids as $id) { @@ -420,7 +420,7 @@ class RPC extends Handler_Protected { } function getArticles() { - $ids = explode(",", db_escape_string($_REQUEST["ids"])); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); $articles = array(); foreach ($ids as $id) { @@ -433,7 +433,7 @@ class RPC extends Handler_Protected { } function checkDate() { - $date = db_escape_string($_REQUEST["date"]); + $date = db_escape_string($this->link, $_REQUEST["date"]); $date_parsed = strtotime($date); print json_encode(array("result" => (bool)$date_parsed, @@ -451,10 +451,10 @@ class RPC extends Handler_Protected { function labelops($assign) { $reply = array(); - $ids = explode(",", db_escape_string($_REQUEST["ids"])); - $label_id = db_escape_string($_REQUEST["lid"]); + $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"])); + $label_id = db_escape_string($this->link, $_REQUEST["lid"]); - $label = db_escape_string(label_find_caption($this->link, $label_id, + $label = db_escape_string($this->link, label_find_caption($this->link, $label_id, $_SESSION["uid"])); $reply["info-for-headlines"] = array(); @@ -482,9 +482,9 @@ class RPC extends Handler_Protected { } function updateFeedBrowser() { - $search = db_escape_string($_REQUEST["search"]); - $limit = db_escape_string($_REQUEST["limit"]); - $mode = (int) db_escape_string($_REQUEST["mode"]); + $search = db_escape_string($this->link, $_REQUEST["search"]); + $limit = db_escape_string($this->link, $_REQUEST["limit"]); + $mode = (int) db_escape_string($this->link, $_REQUEST["mode"]); require_once "feedbrowser.php"; @@ -504,8 +504,8 @@ class RPC extends Handler_Protected { if ($mode == 1) { foreach ($payload as $feed) { - $title = db_escape_string($feed[0]); - $feed_url = db_escape_string($feed[1]); + $title = db_escape_string($this->link, $feed[0]); + $feed_url = db_escape_string($this->link, $feed[1]); $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); @@ -524,9 +524,9 @@ class RPC extends Handler_Protected { WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]); if (db_num_rows($result) != 0) { - $site_url = db_escape_string(db_fetch_result($result, 0, "site_url")); - $feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url")); - $title = db_escape_string(db_fetch_result($result, 0, "title")); + $site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url")); + $feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url")); + $title = db_escape_string($this->link, db_fetch_result($result, 0, "title")); $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); @@ -543,9 +543,9 @@ class RPC extends Handler_Protected { } function catchupFeed() { - $feed_id = db_escape_string($_REQUEST['feed_id']); - $is_cat = db_escape_string($_REQUEST['is_cat']) == "true"; - $max_id = (int) db_escape_string($_REQUEST['max_id']); + $feed_id = db_escape_string($this->link, $_REQUEST['feed_id']); + $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true"; + $max_id = (int) db_escape_string($this->link, $_REQUEST['max_id']); catchup_feed($this->link, $feed_id, $is_cat, false, $max_id); @@ -553,7 +553,7 @@ class RPC extends Handler_Protected { } function quickAddCat() { - $cat = db_escape_string($_REQUEST["cat"]); + $cat = db_escape_string($this->link, $_REQUEST["cat"]); add_feed_category($this->link, $cat); @@ -570,8 +570,8 @@ class RPC extends Handler_Protected { } function regenFeedKey() { - $feed_id = db_escape_string($_REQUEST['id']); - $is_cat = db_escape_string($_REQUEST['is_cat']) == "true"; + $feed_id = db_escape_string($this->link, $_REQUEST['id']); + $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true"; $new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat); @@ -619,11 +619,11 @@ class RPC extends Handler_Protected { } function batchAddFeeds() { - $cat_id = db_escape_string($_REQUEST['cat']); - $feeds = explode("\n", db_escape_string($_REQUEST['feeds'])); - $login = db_escape_string($_REQUEST['login']); - $pass = db_escape_string($_REQUEST['pass']); - $need_auth = db_escape_string($_REQUEST['need_auth']) != ""; + $cat_id = db_escape_string($this->link, $_REQUEST['cat']); + $feeds = explode("\n", db_escape_string($this->link, $_REQUEST['feeds'])); + $login = db_escape_string($this->link, $_REQUEST['login']); + $pass = db_escape_string($this->link, $_REQUEST['pass']); + $need_auth = db_escape_string($this->link, $_REQUEST['need_auth']) != ""; foreach ($feeds as $feed) { $feed = trim($feed); @@ -656,8 +656,8 @@ class RPC extends Handler_Protected { } function setScore() { - $ids = db_escape_string($_REQUEST['id']); - $score = (int)db_escape_string($_REQUEST['score']); + $ids = db_escape_string($this->link, $_REQUEST['id']); + $score = (int)db_escape_string($this->link, $_REQUEST['score']); db_query($this->link, "UPDATE ttrss_user_entries SET score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); @@ -756,7 +756,7 @@ class RPC extends Handler_Protected { AND owner_uid = " . $owner_uid); if (db_num_rows($result) == 1) { - $key = db_escape_string(sha1(uniqid(rand(), true))); + $key = db_escape_string($this->link, sha1(uniqid(rand(), true))); db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key' WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat @@ -829,5 +829,21 @@ class RPC extends Handler_Protected { } } + function getlinktitlebyid() { + $id = db_escape_string($this->link, $_REQUEST['id']); + + $result = db_query($this->link, "SELECT link, title FROM ttrss_entries, ttrss_user_entries + WHERE ref_id = '$id' AND ref_id = id AND owner_uid = ". $_SESSION["uid"]); + + if (db_num_rows($result) != 0) { + $link = db_fetch_result($result, 0, "link"); + $title = db_fetch_result($result, 0, "title"); + + echo json_encode(array("link" => $link, "title" => $title)); + } else { + echo json_encode(array("error" => "ARTICLE_NOT_FOUND")); + } + } + } ?> diff --git a/images/favicon-72px.png b/images/favicon-72px.png Binary files differnew file mode 100644 index 000000000..421e10996 --- /dev/null +++ b/images/favicon-72px.png diff --git a/images/favicon.png b/images/favicon.png Binary files differindex 99d65e429..b2df2ebb5 100644 --- a/images/favicon.png +++ b/images/favicon.png diff --git a/include/db-prefs.php b/include/db-prefs.php index 641e9d1dd..f6a78939b 100644 --- a/include/db-prefs.php +++ b/include/db-prefs.php @@ -44,7 +44,7 @@ function get_pref($link, $pref_name, $user_id = false, $die_on_error = false) { - $pref_name = db_escape_string($pref_name); + $pref_name = db_escape_string($link, $pref_name); $prefs_cache = true; $profile = false; @@ -115,8 +115,8 @@ } function set_pref($link, $pref_name, $value, $user_id = false, $strip_tags = true) { - $pref_name = db_escape_string($pref_name); - $value = db_escape_string($value, $strip_tags); + $pref_name = db_escape_string($link, $pref_name); + $value = db_escape_string($link, $value, $strip_tags); if (!$user_id) { $user_id = $_SESSION["uid"]; diff --git a/include/db.php b/include/db.php index f1a7af363..0479df6a9 100644 --- a/include/db.php +++ b/include/db.php @@ -41,13 +41,13 @@ function db_connect($host, $user, $pass, $db) { } } -function db_escape_string($s, $strip_tags = true) { +function db_escape_string($link, $s, $strip_tags = true) { if ($strip_tags) $s = strip_tags($s); if (DB_TYPE == "pgsql") { - return pg_escape_string($s); + return pg_escape_string($link, $s); } else { - return mysql_real_escape_string($s); + return mysql_real_escape_string($s, $link); } } diff --git a/include/functions.php b/include/functions.php index 87127b3d0..56bc66b6c 100644 --- a/include/functions.php +++ b/include/functions.php @@ -76,10 +76,7 @@ $lang = _TRANSLATION_OVERRIDE_DEFAULT; } - /* In login action of mobile version */ - if ($_POST["language"] && defined('MOBILE_VERSION')) { - $lang = $_POST["language"]; - } else if ($_SESSION["language"] && $_SESSION["language"] != "auto") { + if ($_SESSION["language"] && $_SESSION["language"] != "auto") { $lang = $_SESSION["language"]; } @@ -90,11 +87,7 @@ _setlocale(LC_ALL, $lang); } - if (defined('MOBILE_VERSION')) { - _bindtextdomain("messages", "../locale"); - } else { - _bindtextdomain("messages", "locale"); - } + _bindtextdomain("messages", "locale"); _textdomain("messages"); _bind_textdomain_codeset("messages", "UTF-8"); @@ -524,7 +517,7 @@ function initialize_user_prefs($link, $uid, $profile = false) { - $uid = db_escape_string($uid); + $uid = db_escape_string($link, $uid); if (!$profile) { $profile = "NULL"; @@ -754,7 +747,7 @@ } } - function login_sequence($link, $login_form = 0) { + function login_sequence($link) { $_SESSION["prefs_cache"] = false; if (SINGLE_USER_MODE) { @@ -770,12 +763,13 @@ authenticate_user($link, null, null, true); } - if (!$_SESSION["uid"]) render_login_form($link, $login_form); + if (!$_SESSION["uid"]) render_login_form($link); } else { /* bump login timestamp */ db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " . $_SESSION["uid"]); + $_SESSION["last_login_update"] = time(); } if ($_SESSION["uid"] && $_SESSION["language"] && SESSION_COOKIE_LIFETIME > 0) { @@ -786,7 +780,21 @@ if ($_SESSION["uid"]) { cache_prefs($link); load_user_plugins($link, $_SESSION["uid"]); + + /* cleanup ccache */ + + db_query($link, "DELETE FROM ttrss_counters_cache WHERE owner_uid = ". + $_SESSION["uid"] . " AND + (SELECT COUNT(id) FROM ttrss_feeds WHERE + ttrss_feeds.id = feed_id) = 0"); + + db_query($link, "DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ". + $_SESSION["uid"] . " AND + (SELECT COUNT(id) FROM ttrss_feed_categories WHERE + ttrss_feed_categories.id = feed_id) = 0"); + } + } } @@ -919,7 +927,7 @@ } } - if (db_escape_string("testTEST") != "testTEST") { + if (db_escape_string($link, "testTEST") != "testTEST") { $error_code = 12; } @@ -1094,7 +1102,7 @@ } else { // tag db_query($link, "BEGIN"); - $tag_name = db_escape_string($feed); + $tag_name = db_escape_string($link, $feed); $result = db_query($link, "SELECT post_int_id FROM ttrss_tags WHERE tag_name = '$tag_name' AND owner_uid = $owner_uid"); @@ -1291,7 +1299,7 @@ return 0; } else if ($feed != "0" && $n_feed == 0) { - $feed = db_escape_string($feed); + $feed = db_escape_string($link, $feed); $result = db_query($link, "SELECT SUM((SELECT COUNT(int_id) FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id @@ -1832,11 +1840,6 @@ function make_init_params($link) { $params = array(); - $params["sign_progress"] = "images/indicator_white.gif"; - $params["sign_progress_tiny"] = "images/indicator_tiny.gif"; - $params["sign_excl"] = "images/sign_excl.svg"; - $params["sign_info"] = "images/sign_info.svg"; - foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS", "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP", "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT", @@ -1897,7 +1900,8 @@ "select_article_cursor" => __("Select article under cursor"), "email_article" => __("Email article"), "close_article" => __("Close/collapse article"), - "toggle_widescreen" => __("Toggle widescreen mode")), + "toggle_widescreen" => __("Toggle widescreen mode"), + "toggle_embed_original" => __("Toggle embed original")), __("Article selection") => array( "select_all" => __("Select all articles"), "select_unread" => __("Select unread"), @@ -1960,6 +1964,7 @@ "*(38)|Shift+up" => "article_scroll_up", "*(40)|Shift+down" => "article_scroll_down", "a *w" => "toggle_widescreen", + "a e" => "toggle_embed_original", "e" => "email_article", "a q" => "close_article", // "article_selection" => array( @@ -2033,6 +2038,8 @@ $data['last_article_id'] = getLastArticleId($link); $data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED'); + $data['dep_ts'] = calculate_dep_timestamp(); + if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) { $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock"); @@ -2753,7 +2760,7 @@ function get_article_tags($link, $id, $owner_uid = 0, $tag_cache = false) { - $a_id = db_escape_string($id); + $a_id = db_escape_string($link, $id); if (!$owner_uid) $owner_uid = $_SESSION["uid"]; @@ -2788,7 +2795,7 @@ /* update the cache */ - $tags_str = db_escape_string(join(",", $tags)); + $tags_str = db_escape_string($link, join(",", $tags)); db_query($link, "UPDATE ttrss_user_entries SET tag_cache = '$tags_str' WHERE ref_id = '$id' @@ -2818,15 +2825,8 @@ return true; } - function render_login_form($link, $form_id = 0) { - switch ($form_id) { - case 0: - require_once "login_form.php"; - break; - case 1: - require_once "mobile/login_form.php"; - break; - } + function render_login_form($link) { + require_once "login_form.php"; exit; } @@ -2953,6 +2953,7 @@ $result = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url, + (SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images, num_comments, tag_cache, author, @@ -3004,11 +3005,6 @@ </head><body>"; } - $title_escaped = htmlspecialchars($line['title']); - - $rv['content'] .= "<div id=\"PTITLE-FULL-$id\" style=\"display : none\">" . - strip_tags($line['title']) . "</div>"; - $rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">"; $rv['content'] .= "<div class=\"postHeader\" id=\"POSTHDR-$id\">"; @@ -3029,8 +3025,8 @@ title=\"".htmlspecialchars($line['title'])."\" href=\"" . htmlspecialchars($line["link"]) . "\">" . - $line["title"] . - "<span class='author'>$entry_author</span></a></div>"; + $line["title"] . "</a>" . + "<span class='author'>$entry_author</span></div>"; } else { $rv['content'] .= "<div class='postTitle'>" . $line["title"] . "$entry_author</div>"; } @@ -3106,35 +3102,10 @@ $rv['content'] .= "<div class=\"postContent\">"; - // N-grams - - if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_RELATED_THRESHOLD')) { - - $ngram_result = db_query($link, "SELECT id,title FROM - ttrss_entries,ttrss_user_entries - WHERE ref_id = id AND updated >= NOW() - INTERVAL '7 day' - AND similarity(title, '$title_escaped') >= "._NGRAM_TITLE_RELATED_THRESHOLD." - AND title != '$title_escaped' - AND owner_uid = $owner_uid"); - - if (db_num_rows($ngram_result) > 0) { - $rv['content'] .= "<div dojoType=\"dijit.form.DropDownButton\">". - "<span>" . __('Related')."</span>"; - $rv['content'] .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; - - while ($nline = db_fetch_assoc($ngram_result)) { - $rv['content'] .= "<div onclick=\"hlOpenInNewTab(null,".$nline['id'].")\" - dojoType=\"dijit.MenuItem\">".$nline['title']."</div>"; - - } - $rv['content'] .= "</div></div><br/"; - } - } - $rv['content'] .= $line["content"]; $rv['content'] .= format_article_enclosures($link, $id, - $always_display_enclosures, $line["content"]); + $always_display_enclosures, $line["content"], $line["hide_images"]); $rv['content'] .= "</div>"; @@ -3526,7 +3497,7 @@ if (db_num_rows($result) == 1) { return db_fetch_result($result, 0, "access_key"); } else { - $key = db_escape_string(sha1(uniqid(rand(), true))); + $key = db_escape_string($link, sha1(uniqid(rand(), true))); $result = db_query($link, "INSERT INTO ttrss_access_keys (access_key, feed_id, is_cat, owner_uid) @@ -3597,7 +3568,7 @@ } function format_article_enclosures($link, $id, $always_display_enclosures, - $article_content) { + $article_content, $hide_images = false) { $result = get_article_enclosures($link, $id); $rv = ''; @@ -3647,10 +3618,16 @@ if (preg_match("/image/", $entry["type"]) || preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) { - $rv .= "<p><img - alt=\"".htmlspecialchars($entry["filename"])."\" - src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>"; + if (!$hide_images) { + $rv .= "<p><img + alt=\"".htmlspecialchars($entry["filename"])."\" + src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>"; + } else { + $rv .= "<p><a target=\"_blank\" + href=\"".htmlspecialchars($entry["url"])."\" + >" .htmlspecialchars($entry["url"]) . "</a></p>"; + } } } } @@ -3874,7 +3851,7 @@ if ($regexp_valid) { - $rule['reg_exp'] = db_escape_string($rule['reg_exp']); + $rule['reg_exp'] = db_escape_string($link, $rule['reg_exp']); switch ($rule["type"]) { case "title": @@ -3905,7 +3882,7 @@ } if (isset($rule["feed_id"]) && $rule["feed_id"] > 0) { - $qpart .= " AND feed_id = " . db_escape_string($rule["feed_id"]); + $qpart .= " AND feed_id = " . db_escape_string($link, $rule["feed_id"]); } if (isset($rule["cat_id"])) { @@ -4095,4 +4072,23 @@ echo "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n"; } + function calculate_dep_timestamp() { + $files = array_merge(glob("js/*.js"), glob("*.css")); + + $max_ts = -1; + + foreach ($files as $file) { + if (filemtime($file) > $max_ts) $max_ts = filemtime($file); + } + + return $max_ts; + } + + function get_site_title() { + if (defined("_SITE_TITLE")) { + return _SITE_TITLE; + } else { + return "Tiny Tiny RSS"; + } + } ?> diff --git a/include/labels.php b/include/labels.php index da7e3f97b..e45a38622 100644 --- a/include/labels.php +++ b/include/labels.php @@ -88,7 +88,7 @@ if (!$labels) $labels = get_article_labels($link, $id); - $labels = db_escape_string(json_encode($labels)); + $labels = db_escape_string($link, json_encode($labels)); db_query($link, "UPDATE ttrss_user_entries SET label_cache = '$labels' WHERE ref_id = '$id' AND owner_uid = '$owner_uid'"); diff --git a/include/localized_schema.php b/include/localized_schema.php index a67e535ab..4a55094ef 100644 --- a/include/localized_schema.php +++ b/include/localized_schema.php @@ -1,4 +1,4 @@ -<?php # This file has been generated at: Thu Mar 21 15:10:58 MSK 2013 +<?php # This file has been generated at: Thu Mar 21 23:29:09 MSK 2013 __("Title"); __("Title or Content"); diff --git a/include/login_form.php b/include/login_form.php index 68df544e3..af451239d 100644 --- a/include/login_form.php +++ b/include/login_form.php @@ -65,6 +65,20 @@ font-size : 12px; } + a.forgotpass { + text-align : right; + font-size : 11px; + display : inline-block; + } + + a { + color : #4684ff; + } + + a:hover { + color : black; + } + div.footer a { color : gray; } @@ -179,6 +193,8 @@ function bwLimitChange(elem) { <input type="password" name="password" required="1" style="width : 220px" class="input" value="<?php echo $_SESSION["fake_password"] ?>"/> + <label></label> + <a class='forgotpass' href="public.php?op=forgotpass"><?php echo __("I forgot my password") ?></a> </div> <div class="row"> diff --git a/include/rssfuncs.php b/include/rssfuncs.php index df1d16986..55c0baa4f 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -18,10 +18,10 @@ $count = 0; while ($line = db_fetch_assoc($result)) { - $subscribers = db_escape_string($line["subscribers"]); - $feed_url = db_escape_string($line["feed_url"]); - $title = db_escape_string($line["title"]); - $site_url = db_escape_string($line["site_url"]); + $subscribers = db_escape_string($link, $line["subscribers"]); + $feed_url = db_escape_string($link, $line["feed_url"]); + $title = db_escape_string($link, $line["title"]); + $site_url = db_escape_string($link, $line["site_url"]); $tmp_result = db_query($link, "SELECT subscribers FROM ttrss_feedbrowser_cache WHERE feed_url = '$feed_url'"); @@ -200,7 +200,7 @@ $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images")); $fetch_url = db_fetch_result($result, 0, "feed_url"); - $feed = db_escape_string($feed); + $feed = db_escape_string($link, $feed); /* if ($auth_login && $auth_pass ){ $url_parts = array(); @@ -238,7 +238,7 @@ _debug("update_rss_feed: unable to fetch: $fetch_last_error"); } - $error_escaped = db_escape_string($fetch_last_error); + $error_escaped = db_escape_string($link, $fetch_last_error); db_query($link, "UPDATE ttrss_feeds SET last_error = '$error_escaped', @@ -287,7 +287,7 @@ // print_r($rss); - $feed = db_escape_string($feed); + $feed = db_escape_string($link, $feed); if (!$rss->error()) { @@ -318,7 +318,7 @@ $owner_uid = db_fetch_result($result, 0, "owner_uid"); - $site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245)); + $site_url = db_escape_string($link, mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245)); if ($debug_enabled) { _debug("update_rss_feed: checking favicon..."); @@ -333,7 +333,7 @@ if (!$registered_title || $registered_title == "[Unknown]") { - $feed_title = db_escape_string($rss->get_title()); + $feed_title = db_escape_string($link, $rss->get_title()); if ($debug_enabled) { _debug("update_rss_feed: registering title: $feed_title"); @@ -475,13 +475,13 @@ $entry_author = $entry_author_item->get_name(); if (!$entry_author) $entry_author = $entry_author_item->get_email(); - $entry_author = db_escape_string($entry_author); + $entry_author = db_escape_string($link, $entry_author); } - $entry_guid = db_escape_string(mb_substr($entry_guid, 0, 245)); + $entry_guid = db_escape_string($link, mb_substr($entry_guid, 0, 245)); - $entry_comments = db_escape_string(mb_substr($entry_comments, 0, 245)); - $entry_author = db_escape_string(mb_substr($entry_author, 0, 245)); + $entry_comments = db_escape_string($link, mb_substr($entry_comments, 0, 245)); + $entry_author = db_escape_string($link, mb_substr($entry_author, 0, 245)); $num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments'); @@ -539,7 +539,7 @@ // FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?) $result = db_query($link, "SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries - WHERE ref_id = id AND guid = '".db_escape_string($entry_guid)."' AND owner_uid = $owner_uid"); + WHERE ref_id = id AND guid = '".db_escape_string($link, $entry_guid)."' AND owner_uid = $owner_uid"); if (db_num_rows($result) != 0) { $entry_plugin_data = db_fetch_result($result, 0, "plugin_data"); @@ -568,11 +568,11 @@ } $entry_tags = $article["tags"]; - $entry_guid = db_escape_string($entry_guid); - $entry_title = db_escape_string($article["title"]); - $entry_author = db_escape_string($article["author"]); - $entry_link = db_escape_string($article["link"]); - $entry_plugin_data = db_escape_string($article["plugin_data"]); + $entry_guid = db_escape_string($link, $entry_guid); + $entry_title = db_escape_string($link, $article["title"]); + $entry_author = db_escape_string($link, $article["author"]); + $entry_link = db_escape_string($link, $article["link"]); + $entry_plugin_data = db_escape_string($link, $article["plugin_data"]); $entry_content = $article["content"]; // escaped below @@ -583,7 +583,7 @@ if ($cache_images && is_writable(CACHE_DIR . '/images')) cache_images($entry_content, $site_url, $debug_enabled); - $entry_content = db_escape_string($entry_content, false); + $entry_content = db_escape_string($link, $entry_content, false); $content_hash = "SHA1:" . sha1($entry_content); @@ -829,7 +829,7 @@ $update_insignificant = false; } - if (db_escape_string($orig_title) != $entry_title) { + if (db_escape_string($link, $orig_title) != $entry_title) { $post_needs_update = true; $update_insignificant = false; } @@ -896,9 +896,9 @@ db_query($link, "BEGIN"); foreach ($enclosures as $enc) { - $enc_url = db_escape_string($enc[0]); - $enc_type = db_escape_string($enc[1]); - $enc_dur = db_escape_string($enc[2]); + $enc_url = db_escape_string($link, $enc[0]); + $enc_type = db_escape_string($link, $enc[1]); + $enc_dur = db_escape_string($link, $enc[2]); $result = db_query($link, "SELECT id FROM ttrss_enclosures WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'"); @@ -959,7 +959,7 @@ foreach ($filtered_tags as $tag) { $tag = sanitize_tag($tag); - $tag = db_escape_string($tag); + $tag = db_escape_string($link, $tag); if (!tag_is_valid($tag)) continue; @@ -981,7 +981,7 @@ $tags_to_cache = array_unique($tags_to_cache); - $tags_str = db_escape_string(join(",", $tags_to_cache)); + $tags_str = db_escape_string($link, join(",", $tags_to_cache)); db_query($link, "UPDATE ttrss_user_entries SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id' @@ -1031,7 +1031,7 @@ } else { - $error_msg = db_escape_string(mb_substr($rss->error(), 0, 245)); + $error_msg = db_escape_string($link, mb_substr($rss->error(), 0, 245)); if ($debug_enabled) { _debug("update_rss_feed: error fetching feed: $error_msg"); diff --git a/include/sessions.php b/include/sessions.php index 2cef1d91b..3355ec49e 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -53,7 +53,7 @@ $expire = time() + $session_expire; - $data = db_escape_string(base64_encode($data), $session_connection); + $data = db_escape_string($session_connection, base64_encode($data), false); if ($session_read) { $query = "UPDATE ttrss_sessions SET data='$data', @@ -71,7 +71,7 @@ global $session_connection; - db_close($session_connection); + //db_close($session_connection); return true; } @@ -96,7 +96,7 @@ db_query($session_connection, $query); } - if (!SINGLE_USER_MODE && DB_TYPE == "pgsql") { + if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) { session_set_save_handler("ttrss_open", "ttrss_close", "ttrss_read", "ttrss_write", "ttrss_destroy", "ttrss_gc"); @@ -53,7 +53,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> - <title>Tiny Tiny RSS</title> + <title><?php echo get_site_title() ?></title> <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> <?php echo stylesheet_tag("tt-rss.css"); ?> @@ -72,6 +72,7 @@ </style> <link rel="shortcut icon" type="image/png" href="images/favicon.png"/> + <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" /> <?php foreach (array("lib/prototype.js", diff --git a/js/functions.js b/js/functions.js index 4840bcbe1..a9367da60 100644 --- a/js/functions.js +++ b/js/functions.js @@ -201,13 +201,13 @@ function notify_real(msg, no_hide, n_type) { n.className = "notify"; } else if (n_type == 2) { n.className = "notifyProgress"; - msg = "<img src='"+getInitParam("sign_progress")+"'> " + msg; + msg = "<img src='images/indicator_white.gif'> " + msg; } else if (n_type == 3) { n.className = "notifyError"; - msg = "<img src='"+getInitParam("sign_excl")+"'> " + msg; + msg = "<img src='images/sign_excl.svg'> " + msg; } else if (n_type == 4) { n.className = "notifyInfo"; - msg = "<img src='"+getInitParam("sign_info")+"'> " + msg; + msg = "<img src='images/sign_info.svg'> " + msg; } // msg = "<img src='images/live_com_loading.gif'> " + msg; @@ -1216,20 +1216,31 @@ function quickAddFilter() { var lh = dojo.connect(dialog, "onLoad", function(){ dojo.disconnect(lh); - var title = $("PTITLE-FULL-" + getActiveArticleId()); + var query = "op=rpc&method=getlinktitlebyid&id=" + getActiveArticleId(); - if (title || getActiveFeedId() || activeFeedIsCat()) { - if (title) title = title.innerHTML; + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + var reply = JSON.parse(transport.responseText); - console.log(title + " " + getActiveFeedId()); + var title = false; - var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) : - getActiveFeedId(); + if (reply && reply) title = reply.title; - var rule = { reg_exp: title, feed_id: feed_id, filter_type: 1 }; + if (title || getActiveFeedId() || activeFeedIsCat()) { + + console.log(title + " " + getActiveFeedId()); + + var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) : + getActiveFeedId(); + + var rule = { reg_exp: title, feed_id: feed_id, filter_type: 1 }; + + addFilterRule(null, dojo.toJson(rule)); + } + + } }); - addFilterRule(null, dojo.toJson(rule)); - } }); } diff --git a/js/tt-rss.js b/js/tt-rss.js index bced92674..b7bb9319b 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -178,10 +178,14 @@ function search() { } function updateTitle() { - var tmp = "Tiny Tiny RSS"; + var tmp = document.title; + + if (tmp.indexOf(")") > 0) { + tmp = tmp.substr(tmp.indexOf(")") + 1); + } if (global_unread > 0) { - tmp = tmp + " (" + global_unread + ")"; + tmp = "(" + global_unread + ") " + tmp; } if (window.fluid) { @@ -446,6 +450,12 @@ function parse_runtime_info(data) { return; } + if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) { + if (parseInt(getInitParam("dep_ts")) < parseInt(v)) { + window.location.reload(); + } + } + if (k == "daemon_is_running" && v != 1) { notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true); return; @@ -786,6 +796,14 @@ function hotkey_handler(e) { case "collapse_sidebar": collapse_feedlist(); return false; + case "toggle_embed_original": + if (typeof embedOriginalArticle != "undefined") { + if (getActiveArticleId()) + embedOriginalArticle(getActiveArticleId()); + } else { + alert(__("Please enable embed_original plugin first.")); + } + return false; case "toggle_widescreen": if (!isCdmMode()) { _widescreen_mode = !_widescreen_mode; @@ -928,6 +946,8 @@ function handle_rpc_json(transport, scheduled_call) { function switchPanelMode(wide) { try { + if (isCdmMode()) return; + article_id = getActiveArticleId(); if (wide) { diff --git a/js/viewfeed.js b/js/viewfeed.js index 5567c717a..e32d3a990 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1392,6 +1392,7 @@ function cdmExpandArticle(id) { Element.hide(elem); Element.show("CEXC-" + getActiveArticleId()); Element.hide(collapse); + $("RROW-" + getActiveArticleId()).removeClassName("active"); } setActiveArticleId(id); @@ -1413,6 +1414,7 @@ function cdmExpandArticle(id) { Element.show(elem); Element.hide("CEXC-" + id); Element.show(collapse); + $("RROW-" + id).addClassName("active"); } var new_offset = $("RROW-" + id).offsetTop; @@ -1824,6 +1826,12 @@ function initHeadlinesMenu() { openArticleInNewWindow(this.getParent().callerRowId); }})); + menu.addChild(new dijit.MenuItem({ + label: __("Display article URL"), + onClick: function(event) { + displayArticleUrl(this.getParent().callerRowId); + }})); + menu.addChild(new dijit.MenuSeparator()); menu.addChild(new dijit.MenuItem({ @@ -2035,3 +2043,21 @@ function changeScore(id, pic) { exception_error("changeScore", e); } } + +function displayArticleUrl(id) { + try { + var query = "op=rpc&method=getlinktitlebyid&id=" + param_escape(id); + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + var reply = JSON.parse(transport.responseText); + + if (reply && reply.link) { + prompt(__("Article URL:"), reply.link); + } + } }); + } catch (e) { + exception_error("changeScore", e); + } +} diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo Binary files differindex 64c3b7c53..1428fc930 100644 --- a/locale/ca_CA/LC_MESSAGES/messages.mo +++ b/locale/ca_CA/LC_MESSAGES/messages.mo diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po index 91d039259..a93f64c10 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: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2009-11-19 09:40+0100\n" "Last-Translator: Alfred Galitó <[email protected]>\n" "Language-Team: Català <[email protected]>\n" @@ -259,200 +259,200 @@ msgstr "" "Ha fallat la sortida de prova de SQL, reviseu la base configuració de la " "bases de dades i de PHP" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "S'està obrint, preneu paciència..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Hi ha una nova versió de Tiny Tiny RSS!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Redueix la llista de canals" -#: index.php:167 +#: index.php:168 #, fuzzy msgid "Show articles" msgstr "Articles mémorisés" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adaptatiu" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Tots els articles" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Marcats" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Publicats" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Per llegir" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Ignora la puntuació" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Actualitzat" -#: index.php:179 +#: index.php:180 #, fuzzy msgid "Sort articles" msgstr "Articles mémorisés" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Per defecte" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Data" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Títol" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Puntuació" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Actualitza" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Marca'l com a llegit" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Accions..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Preferències" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Cerca..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Accions sobre els canals:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Subscriviu-vos al canal" -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Edita aquest canal..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Canvia la puntuació del canal" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Dóna't de baixa" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Tots els canals" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "Mostra/amaga els canals llegits" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Altres accions:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "" -#: index.php:231 +#: index.php:232 #, fuzzy msgid "Show tag cloud..." msgstr "Núvol d'etiquetes" -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Canvia al mode de reordenació de categories" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "" -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Crea una etiqueta" -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Crea un filtre..." -#: index.php:238 +#: index.php:239 #, fuzzy msgid "Keyboard shortcuts help" msgstr "Dreceres de teclat" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Surt" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Preferències" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Dreceres de teclat" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Surt de les preferències" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Canals" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filtres" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Etiquetes" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Usuaris" @@ -628,7 +628,7 @@ msgstr "Articles publicats" msgid "Fresh articles" msgstr "Articles nous" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Tots els articles" @@ -641,242 +641,247 @@ msgstr "Articles mémorisés" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navegació" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "Canals generats" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Mostra el contingut original de l'article" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Mostra el contingut original de l'article" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Mostra el diàleg de cerca" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Tots els articles" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Commuta els marcats" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Commuta els publicats" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Commuta els no llegits" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Edita les etiquetes" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "" "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Publica l'article" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Obre l'article en una finestra nova" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 #, fuzzy msgid "Mark below as read" msgstr "Marca'l com a llegit" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 #, fuzzy msgid "Mark above as read" msgstr "Marca'l com a llegit" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Fet!" -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Seleccioneu un article mitjançant el ratolí." -#: include/functions.php:1897 +#: include/functions.php:1892 #, fuzzy msgid "Email article" msgstr "Tots els articles" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Buida els articles" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Canvia al mode de reordenació de categories" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Accions actives de l'article" -#: include/functions.php:1901 +#: include/functions.php:1897 #, fuzzy msgid "Select all articles" msgstr "Buida els articles" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Purga els articles per llegir" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Marca'l com a destacat" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Purga els articles per llegir" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Accions actives de l'article" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Buida els articles" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Canal" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Actualitza els canals actius" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "Mostra/amaga els canals llegits" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Subscriu-te al canal" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Edita el canal" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "S'ha acabat l'actualització dels canals." -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Marca tots els canals com a llegits" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Clica-hi per a reduir la categoria" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Canvia al mode de reordenació de categories" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Vés a..." -#: include/functions.php:1920 +#: include/functions.php:1916 #, fuzzy msgid "Fresh" msgstr "Actualitza" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Núvol d'etiquetes" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Altres:" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Crea una etiqueta" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Crea un filtre" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Redueix la barra lateral" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Mostra el diàleg de cerca" -#: include/functions.php:2407 +#: include/functions.php:2406 #, fuzzy, php-format msgid "Search results: %s" msgstr "Resultats de la cerca" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 #, fuzzy msgid "Click to play" msgstr "Feu clic per editar" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "" @@ -888,7 +893,7 @@ msgstr " - " msgid "no tags" msgstr "sense etiqueta" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Edita les etiquetes d'aquest article" @@ -926,7 +931,7 @@ msgstr "edita la nota" msgid "unknown type" msgstr "tipus desconegut" -#: include/functions.php:3665 +#: include/functions.php:3671 #, fuzzy msgid "Attachments" msgstr "Adjuncions:" @@ -965,7 +970,7 @@ msgstr "Publica l'article" msgid "Assign tags" msgstr "Assigna etiquetes" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Assigna-li l'etiqueta" @@ -1689,7 +1694,7 @@ msgstr "Marca l'article" msgid "Feed:" msgstr "Flux :" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "No s'ha trobat el canal." @@ -1702,19 +1707,19 @@ msgstr "Marca'l com a llegit" msgid "Collapse article" msgstr "Buida els articles" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha." -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "No hi ha cap article actualitzat." -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "No hi ha articles marcats per mostrar." -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1722,22 +1727,22 @@ msgstr "" "No s'han trobat articles per a mostrar. Podeu assignar articles a etiquetes " "manualment (mireu el menú Accions) o utilitzeu un filtre." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "No s'han trobat articles per a mostrar." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, fuzzy, php-format msgid "Feeds last updated at %s" msgstr "Erreurs de mise à jour" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" "S'han detectat errors en alguns canals (feu clic aquí per veure'n els " "detalls)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "No heu seleccionat cap canal." @@ -2938,7 +2943,7 @@ msgstr "Si us plau, escriviu una nota per aquest article:" msgid "Generate new syndication address for this feed?" msgstr "" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "No podeu editar aquest tipus de canal." @@ -3204,24 +3209,29 @@ msgstr "Esteu segur que voleu marcar tots els articles com a llegits?" msgid "You can't unsubscribe from the category." msgstr "No us podeu donar de baixa de la categoria." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Primerament heu de seleccionar un canal." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "No podeu canviar la puntuació d'aquest tipus de canal." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "Primerament heu de seleccionar un canal." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Primerament heu de seleccionar un canal." + +#: js/tt-rss.js:864 #, fuzzy msgid "New version available!" msgstr "Hi ha una nova versió de Tiny Tiny RSS!" @@ -3248,7 +3258,7 @@ msgstr "Deixa de publicar l'article" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "No hi ha cap article seleccionat." @@ -3311,31 +3321,41 @@ msgstr "Esteu segur que voleu marcar %d article(s) com a llegit(s) ?" msgid "Open original article" msgstr "Mostra el contingut original de l'article" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "afficher les étiquettes" + +#: js/viewfeed.js:1898 #, fuzzy msgid "Remove label" msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 #, fuzzy msgid "Playing..." msgstr "S'està carregant la llista de canals..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 #, fuzzy msgid "Click to pause" msgstr "Feu clic per editar" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Si us plau, escriviu una nota per aquest article:" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "Si us plau, escriviu una nota per aquest article:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Tots els articles" + #: plugins/digest/digest.js:71 #, fuzzy msgid "Mark %d displayed articles as read?" @@ -3366,6 +3386,10 @@ msgstr "Mostra/amaga els canals llegits" msgid "Load more..." msgstr "Ouverture de l'aide..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 #, fuzzy msgid "Forward article by email" diff --git a/locale/cs_CZ/LC_MESSAGES/messages.mo b/locale/cs_CZ/LC_MESSAGES/messages.mo Binary files differindex 748fcec14..0de6449a9 100644 --- a/locale/cs_CZ/LC_MESSAGES/messages.mo +++ b/locale/cs_CZ/LC_MESSAGES/messages.mo diff --git a/locale/cs_CZ/LC_MESSAGES/messages.po b/locale/cs_CZ/LC_MESSAGES/messages.po index 46cd8de27..35b2df428 100644 --- a/locale/cs_CZ/LC_MESSAGES/messages.po +++ b/locale/cs_CZ/LC_MESSAGES/messages.po @@ -1,18 +1,18 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# Michal Stanke <[email protected]>, 2013. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" +"PO-Revision-Date: 2013-03-22 14:50+0100\n" +"Last-Translator: Michal Stanke <[email protected]>\n" "Language-Team: LANGUAGE <[email protected]>\n" -"Language: \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,27 +27,27 @@ msgstr "Nikdy nečistit" #: backend.php:73 msgid "1 week old" -msgstr "starší 1 týdne" +msgstr "starší než týden" #: backend.php:74 msgid "2 weeks old" -msgstr "starší 2 týdnů" +msgstr "starší než 2 týdny" #: backend.php:75 msgid "1 month old" -msgstr "starší 1 měsíce" +msgstr "starší než měsíc" #: backend.php:76 msgid "2 months old" -msgstr "starší 2 měsíců" +msgstr "starší než 2 měsíce" #: backend.php:77 msgid "3 months old" -msgstr "starší 3 měsíců" +msgstr "starší než 3 měsíce" #: backend.php:80 msgid "Default interval" -msgstr "Výchozí časový interval" +msgstr "Výchozí interval" #: backend.php:81 backend.php:91 msgid "Disable updates" @@ -95,7 +95,7 @@ msgstr "Administrátor" #: db-updater.php:19 msgid "Your access level is insufficient to run this script." -msgstr "Vaše úroveň přístupu není dostatečná pro spuštění skriptu." +msgstr "Vaše přístupová práva nejsou dostatečná pro spuštění tohoto skriptu." #: db-updater.php:44 msgid "Database Updater" @@ -107,7 +107,7 @@ msgstr "Nelze aktualizovat databázi" #: db-updater.php:88 msgid "Could not find necessary schema file, need version:" -msgstr "Nelze nalézt potřebný soubor schéma, požadovaná verze:" +msgstr "Nelze nalézt potřebný soubor schématu, požadovaná verze:" #: db-updater.php:89 msgid ", found: " @@ -122,11 +122,11 @@ msgstr "Databáze Tiny Tiny RSS je aktuální." #: register.php:371 register.php:381 register.php:393 #: classes/handler/public.php:610 classes/handler/public.php:698 msgid "Return to Tiny Tiny RSS" -msgstr "Zpět do Tiny TIny RSS" +msgstr "Zpět do Tiny Tiny RSS" #: db-updater.php:100 msgid "Please backup your database before proceeding." -msgstr "Před pokračováním proveďte prosím zálohu databáze." +msgstr "Před pokračováním prosím zazálohujte databázi." #: db-updater.php:102 #, php-format @@ -160,7 +160,7 @@ msgstr "OK" #: db-updater.php:150 msgid "ERROR!" -msgstr "CHYBA" +msgstr "CHYBA!" #: db-updater.php:158 #, php-format @@ -168,7 +168,7 @@ msgid "" "Finished. Performed <b>%d</b> update(s) up to schema\n" "\t\t\tversion <b>%d</b>." msgstr "" -"Dokončeno. Vykonáno <b>%d</b> aktualizací na schéma\n" +"Dokončeno. Provedeno <b>%d</b> aktualizací na schéma\n" "\t\t\tverze <b>%d</b>." #: db-updater.php:168 @@ -185,255 +185,265 @@ msgid "" "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer " "version and continue." msgstr "" -"Aktualizace schéma není možná. Aktualizujte Tiny Tiny RSS na novější verzi a " -"pokračujte." +"Aktualizace schématu není možná. Aktualizujte Tiny Tiny RSS na novější " +"verzi a pokračujte." #: errors.php:9 msgid "" "This program requires XmlHttpRequest to function properly. Your browser " "doesn't seem to support it." msgstr "" +"Tento program vyžaduje pro správnou funkci XmlHttpRequest. Váš prohlížeč " +"ji zřejmě nepodporuje." #: errors.php:12 msgid "" "This program requires cookies to function properly. Your browser doesn't " "seem to support them." msgstr "" +"Tento program vyžaduje pro správnou funkci povolené cookies. Váš prohlížeš " +"je zřejmě nepodporuje." #: errors.php:15 msgid "Backend sanity check failed" -msgstr "" +msgstr "Kontrola na pozadí selhala" #: errors.php:17 msgid "Frontend sanity check failed." -msgstr "" +msgstr "Kontrola selhala" #: errors.php:19 msgid "" "Incorrect database schema version. <a href='db-updater.php'>Please " "update</a>." msgstr "" +"Nesprávná verze schámatu databáze. <a href='db-updater.php'>Prosím " +"aktualizujte</a>." #: errors.php:21 msgid "Request not authorized." -msgstr "" +msgstr "Požadavek nebyl ověřen" #: errors.php:23 msgid "No operation to perform." -msgstr "" +msgstr "Nic k provedení." #: errors.php:25 msgid "" "Could not display feed: query failed. Please check label match syntax or " "local configuration." msgstr "" +"Zdroj nelze zobrazit: dotaz selhal. Zkontrolujte syntaxi label match a " +"místní konfiguraci." #: errors.php:27 msgid "Denied. Your access level is insufficient to access this page." -msgstr "" +msgstr "Nedovoleno. Vaše práva nejsou dostatečná pro přístup na tuto stránku." #: errors.php:29 msgid "Configuration check failed" -msgstr "" +msgstr "Kontrola konfigurace selhala" #: errors.php:31 msgid "" "Your version of MySQL is not currently supported. Please see\n" "\t\tofficial site for more information." msgstr "" +"Vaše verze MySQL není podporována. Více informací\n" +"\t\tnajdete na oficiálních stránkách." #: errors.php:36 msgid "SQL escaping test failed, check your database and PHP configuration" -msgstr "" +msgstr "Test opuštění SQL selhal, zkontrolujte konfiguraci databáze a PHP" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." -msgstr "Načítám, čekejte prosím..." +msgstr "Načítání, čekejte prosím..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "Chyba při komunikaci se serverem." -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" -msgstr "Je dostupná nová verze TIny Tiny RSS." +msgstr "Je dostupná nová verze Tiny Tiny RSS!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" -msgstr "" +msgstr "Skrýt seznam zdrojů" -#: index.php:167 +#: index.php:168 msgid "Show articles" -msgstr "" +msgstr "Zobrazit články" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adaptivní" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Všechny články" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "S hvězdičkou" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Publikováno" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Nepřečteno" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" -msgstr "" +msgstr "Ignorovat hodnocení" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Aktualizováno" -#: index.php:179 +#: index.php:180 msgid "Sort articles" -msgstr "" +msgstr "Seřadit články" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Výchozí" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Datum" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Název" -#: index.php:185 +#: index.php:186 msgid "Score" -msgstr "Skóre" +msgstr "Hodnocení" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Aktualizovat" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Označit jako přečtené" -#: index.php:215 +#: index.php:216 msgid "Actions..." -msgstr "Činnosti..." +msgstr "Akce..." -#: index.php:217 +#: index.php:218 msgid "Preferences..." msgstr "Nastavení..." -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Hledat..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" -msgstr "" +msgstr "Akce zdrojů:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Přihlásit se k odběru..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." -msgstr "Upravit kanál..." +msgstr "Upravit zdroj..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" -msgstr "" +msgstr "Znovu ohodnotit zdroj" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" -msgstr "Odhlásit se" +msgstr "Zrušit odběr" -#: index.php:224 +#: index.php:225 msgid "All feeds:" -msgstr "Všechny kanály:" +msgstr "Všechny zdroje:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" -msgstr "Zobrazit/Skrýt přečtené kanály" +msgstr "Zobrazit/Skrýt přečtené zdroje" -#: index.php:227 +#: index.php:228 msgid "Other actions:" -msgstr "Ostatní činnosti:" +msgstr "Ostatní akce:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." -msgstr "" +msgstr "Přepnout na výběr..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." -msgstr "" +msgstr "Zobrazit seznam štítků..." -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 msgid "Toggle widescreen mode" msgstr "Přepnout širokoúhlý režim" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." -msgstr "" +msgstr "Výběr podle štítků..." -#: index.php:236 +#: index.php:237 msgid "Create label..." -msgstr "" +msgstr "Vytvořit štítek..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Vytvořit filtr..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "Nápověda ke klávesovým zkratkám" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Odhlásit se" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Nastavení" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Klávesové zkratky" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Opustit nastavení" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" -msgstr "Kanály" +msgstr "Zdroje" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filtry" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Popisky" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Uživatelé" @@ -451,10 +461,12 @@ msgid "" "were not logged in once, are erased automatically 24 hours after temporary " "password is sent." msgstr "" +"Vaše dočasné heslo bude odesláno na zadanou e-mailovou adresu. Účet, který " +"se do 24 hodin od odeslání dočasného hesla nepřihlásí, bude smazán." #: register.php:221 msgid "Desired login:" -msgstr "" +msgstr "Požadované jméno:" #: register.php:224 msgid "Check availability" @@ -490,11 +502,11 @@ msgstr "Účet byl úspěšně vytvořen." #: register.php:390 msgid "New user registrations are currently closed." -msgstr "Registrace nových uživatelů nejsou nyní povoleny." +msgstr "Registrace nových uživatelů nyní nejsou povoleny." #: update.php:55 msgid "Tiny Tiny RSS data update script." -msgstr "" +msgstr "Skript aktualizace dat Tiny Tiny RSS." #: mobile/login_form.php:28 include/login_form.php:209 #: classes/handler/public.php:468 @@ -513,7 +525,7 @@ msgstr "Heslo:" #: mobile/login_form.php:52 msgid "Open regular version" -msgstr "" +msgstr "Otevřít normální verzi" #: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144 #: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207 @@ -529,21 +541,21 @@ msgstr "Speciální" #: mobile/mobile-functions.php:416 msgid "Nothing found (click to reload feed)." -msgstr "" +msgstr "Nic nenalezeno (klikněte pro načtení zdroje)." #: mobile/prefs.php:24 msgid "Enable categories" -msgstr "" +msgstr "Povolit kategorie" #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36 #: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51 msgid "ON" -msgstr "Zapnuto" +msgstr "Zap." #: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36 #: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51 msgid "OFF" -msgstr "Vypnuto" +msgstr "Vyp." #: mobile/prefs.php:29 msgid "Browse categories like folders" @@ -555,11 +567,11 @@ msgstr "Zobrazit obrázky v příspěvcích" #: mobile/prefs.php:40 msgid "Hide read articles and feeds" -msgstr "Skrýt přečtené články a kanály" +msgstr "Skrýt přečtené články a zdroje" #: mobile/prefs.php:45 msgid "Sort feeds by unread count" -msgstr "Řadit kanály podle počtu nepřečtených článků" +msgstr "Řadit zdroje podle počtu nepřečtených článků" #: mobile/prefs.php:50 include/localized_schema.php:45 msgid "Reverse headline order (oldest first)" @@ -578,15 +590,15 @@ msgstr "%d archivovaných článků" #: include/feedbrowser.php:107 msgid "No feeds found." -msgstr "Nenalezeny žádné kanály." +msgstr "Nenalezeny žádné zdroje." #: include/functions.php:712 msgid "Session failed to validate (incorrect IP)" -msgstr "Nezdařilo se ověřit sezení (neplatné IP)" +msgstr "Nezdařilo se ověřit relace (neplatné IP)" #: include/functions.php:1598 classes/dlg.php:369 classes/pref/filters.php:368 msgid "All feeds" -msgstr "Všechny kanály" +msgstr "Všechny zdroje" #: include/functions.php:1799 msgid "Starred articles" @@ -600,7 +612,7 @@ msgstr "Publikované články" msgid "Fresh articles" msgstr "Nové články" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Všechny články" @@ -612,210 +624,214 @@ msgstr "Archivované články" msgid "Recently read" msgstr "Nedávno přečtené" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navigace" -#: include/functions.php:1877 +#: include/functions.php:1872 msgid "Open next feed" -msgstr "Otevřít následující kanál" +msgstr "Otevřít další zdroj" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" -msgstr "Otevřít předchozí kanál" +msgstr "Otevřít předchozí zdroj" -#: include/functions.php:1879 +#: include/functions.php:1874 msgid "Open next article" -msgstr "Otevřít následující článek" +msgstr "Otevřít další článek" -#: include/functions.php:1880 +#: include/functions.php:1875 msgid "Open previous article" msgstr "Otevřít předchozí článek" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" -msgstr "" +msgstr "Otevřít další článek (nerolovat dlouhé články)" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" -msgstr "" +msgstr "Otevřít předchozí článek (nerolovat dlouhé články)" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Zobrazit dialog hledání" -#: include/functions.php:1884 +#: include/functions.php:1879 msgid "Article" msgstr "Článek" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Přepnout hvězdičku" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Přepnout publikováno" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Přepnout přečteno" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" -msgstr "Upravit značky" +msgstr "Upravit štítky" -#: include/functions.php:1889 +#: include/functions.php:1884 msgid "Dismiss selected" msgstr "" -#: include/functions.php:1890 +#: include/functions.php:1885 msgid "Dismiss read" msgstr "" -#: include/functions.php:1891 +#: include/functions.php:1886 msgid "Open in new window" msgstr "Otevřít v novém okně" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "Označit níže jako přečtené" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "Označit výše jako přečtené" -#: include/functions.php:1894 +#: include/functions.php:1889 msgid "Scroll down" msgstr "Posunout dolů" -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "Posunout nahoru" -#: include/functions.php:1896 +#: include/functions.php:1891 msgid "Select article under cursor" msgstr "Vybrat článek pod kurzorem" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Zavřít článek" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +msgid "Toggle embed original" +msgstr "Přepnout vložený originál" + +#: include/functions.php:1896 msgid "Article selection" msgstr "Výběr článků" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "Vybrat všechny články" -#: include/functions.php:1902 +#: include/functions.php:1898 msgid "Select unread" msgstr "Vybrat nepřečtené" -#: include/functions.php:1903 +#: include/functions.php:1899 msgid "Select starred" msgstr "Vybrat s hvězdičkou" -#: include/functions.php:1904 +#: include/functions.php:1900 msgid "Select published" msgstr "Vybrat publikované" -#: include/functions.php:1905 +#: include/functions.php:1901 msgid "Invert selection" msgstr "Obrátit výběr" -#: include/functions.php:1906 +#: include/functions.php:1902 msgid "Deselect everything" msgstr "Zrušit výběr" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" -msgstr "Kanál" +msgstr "Zdroj" -#: include/functions.php:1908 +#: include/functions.php:1904 msgid "Refresh current feed" -msgstr "Obnovit současný kanál" +msgstr "Obnovit současný zdroj" -#: include/functions.php:1909 +#: include/functions.php:1905 msgid "Un/hide read feeds" -msgstr "Zobrazit/Skrýt přečtené kanály" +msgstr "Zobrazit/Skrýt přečtené zdroje" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Přihlásit se k odběru" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" -msgstr "Upravit kanál" +msgstr "Upravit zdroj" -#: include/functions.php:1913 +#: include/functions.php:1909 msgid "Reverse headlines" msgstr "" -#: include/functions.php:1914 +#: include/functions.php:1910 msgid "Debug feed update" -msgstr "" +msgstr "Debug aktualizace zdrojů" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" -msgstr "Označit všechny kanály za přečtené" +msgstr "Označit všechny zdroje jako přečtené" -#: include/functions.php:1916 +#: include/functions.php:1912 msgid "Un/collapse current category" -msgstr "" +msgstr "Zobrazit/skrýt aktuální kategorii" -#: include/functions.php:1917 +#: include/functions.php:1913 msgid "Toggle combined mode" -msgstr "" +msgstr "Přepnout kombinovaný režim" -#: include/functions.php:1918 +#: include/functions.php:1914 msgid "Go to" msgstr "Přejít na" -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" -msgstr "" +msgstr "Nový" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" -msgstr "" +msgstr "Seznam štítků" -#: include/functions.php:1925 +#: include/functions.php:1921 msgid "Other" -msgstr "Jiné" +msgstr "Ostatní" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" -msgstr "" +msgstr "Vytvořit štítek" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Vytvořit filtr" -#: include/functions.php:1928 +#: include/functions.php:1924 msgid "Un/collapse sidebar" -msgstr "" +msgstr "Zobrazit/skrýt postranní panel" -#: include/functions.php:1929 +#: include/functions.php:1925 msgid "Show help dialog" -msgstr "" +msgstr "Zobrazit nápovědu" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" -msgstr "" +msgstr "Výslekdy vyhledávání: %s" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Přehrát" @@ -825,11 +841,11 @@ msgstr " - " #: include/functions.php:3040 include/functions.php:3357 classes/rpc.php:360 msgid "no tags" -msgstr "žádné značky" +msgstr "žádné štítky" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" -msgstr "Upravit značky pro článek" +msgstr "Upravit štítky tohoto článku" #: include/functions.php:3079 classes/feeds.php:606 msgid "Originally from:" @@ -837,11 +853,11 @@ msgstr "Původně z:" #: include/functions.php:3092 classes/feeds.php:619 classes/pref/feeds.php:507 msgid "Feed URL" -msgstr "URL kanálu" +msgstr "URL zdroje" #: include/functions.php:3121 msgid "Related" -msgstr "" +msgstr "Podobné" #: include/functions.php:3148 classes/dlg.php:43 classes/dlg.php:162 #: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:506 @@ -862,13 +878,13 @@ msgstr "(upravit poznámku)" msgid "unknown type" msgstr "neznámý typ" -#: include/functions.php:3665 +#: include/functions.php:3671 msgid "Attachments" msgstr "Přílohy" #: include/localized_schema.php:4 msgid "Title or Content" -msgstr "" +msgstr "Nadpis nebo Obsah" #: include/localized_schema.php:5 msgid "Link" @@ -897,15 +913,15 @@ msgstr "Publikovat článek" #: include/localized_schema.php:13 msgid "Assign tags" -msgstr "Přiřadit značky" +msgstr "Přiřadit štítky" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "" #: include/localized_schema.php:15 msgid "Modify score" -msgstr "" +msgstr "Změnit hodnocení" #: include/localized_schema.php:17 msgid "General" @@ -925,6 +941,9 @@ msgid "" "with partially colliding userbase. When disabled, it forces same posts from " "different feeds to appear only once." msgstr "" +"Tato volba je užitečná pro sledování několika agregátorů s částečně kolidující " +"databází uživatelů. Pokud je vypnuta, sloučí stejné příspěvky z různých zdrojů " +"pro zobrazení jako jeden." #: include/localized_schema.php:22 msgid "" @@ -1547,7 +1566,7 @@ msgstr "" msgid "Feed:" msgstr "Kanál:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "" @@ -1560,38 +1579,38 @@ msgstr "označit jako přečtené" msgid "Collapse article" msgstr "Zavřít článek" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "" -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "" -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "" -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." msgstr "" -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "" -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "" @@ -2681,7 +2700,7 @@ msgstr "" msgid "Generate new syndication address for this feed?" msgstr "" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "" @@ -2918,23 +2937,28 @@ msgstr "Označit všechny články jako přečtené?" msgid "You can't unsubscribe from the category." msgstr "" -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Nejprve si prosím vyberte kanál." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "" -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 msgid "Please enable mail plugin first." msgstr "Nejprve si prosím povolte modul odesílání e-mailů." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Nejprve si prosím povolte modul odesílání e-mailů." + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "Je dostupná nová verze." @@ -2959,7 +2983,7 @@ msgstr "" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Nejsou vybrány žádné články." @@ -3008,26 +3032,36 @@ msgstr "Označit %d článků jako přečtené?" msgid "Open original article" msgstr "" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Smazat článek" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Odstranit štítek" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "Přehrává se..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 msgid "Please enter new score for selected articles:" msgstr "" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 msgid "Please enter new score for this article:" msgstr "" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Článek" + #: plugins/digest/digest.js:71 msgid "Mark %d displayed articles as read?" msgstr "" @@ -3052,6 +3086,10 @@ msgstr "Žádné nepřečtené kanály." msgid "Load more..." msgstr "Načíst další..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 msgid "Forward article by email" msgstr "Přeposlat článek e-mailem" diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo Binary files differindex 5bbe328dd..ba5bb9401 100755 --- a/locale/de_DE/LC_MESSAGES/messages.mo +++ b/locale/de_DE/LC_MESSAGES/messages.mo diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po index 9a6f4eede..a5d1429a8 100755 --- a/locale/de_DE/LC_MESSAGES/messages.po +++ b/locale/de_DE/LC_MESSAGES/messages.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2013-03-20 16:42+0100\n" "Last-Translator: Joschasa <[email protected]>\n" "Language-Team: \n" @@ -265,194 +265,194 @@ msgstr "" "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP " "Konfiguration" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "Ladevorgang, bitte warten..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "Kommunikationsfehler mit Server" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Neue Version von Tiny Tiny RSS verfügbar!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Feedliste verbergen" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "Artikel anzeigen" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adaptiv" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Alle Artikel" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Markiert" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Veröffentlicht" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Ungelesen" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Bewertung ignorieren" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Aktualisiert" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "Artikel sortieren" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Standard" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Datum" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Titel" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Bewertung" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Aktualisieren" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Als gelesen markieren" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Aktionen..." -#: index.php:217 +#: index.php:218 msgid "Preferences..." msgstr "Einstellungen..." -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Suchen..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Feed-Aktionen:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Feed abonnieren..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Feed bearbeiten..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Feed neu bewerten" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Feed abbestellen" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Alle Feeds:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "Gelesene zeigen/verstecken" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Andere Aktionen:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "Zur Zusammenfassung wechseln..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "Tagwolke anzeigen..." -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 msgid "Toggle widescreen mode" msgstr "Breitbild-Modus umschalten" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "Artikel nach Tag filtern.." -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Label erstellen..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Filter erstellen..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "Tastaturkürzel..." -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Abmelden" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Einstellungen" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Einstellungen verlassen" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Feeds" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filter" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Label" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Benutzer" @@ -622,7 +622,7 @@ msgstr "Veröffentlichte Artikel" msgid "Fresh articles" msgstr "Neue Artikel" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Alle Artikel" @@ -634,214 +634,219 @@ msgstr "Archivierte Artikel" msgid "Recently read" msgstr "Kürzlich gelesen" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navigation" -#: include/functions.php:1877 +#: include/functions.php:1872 msgid "Open next feed" msgstr "Nächsten Feed öffnen" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "Vorherigen Feed öffnen" -#: include/functions.php:1879 +#: include/functions.php:1874 msgid "Open next article" msgstr "Nächsten Artikel öffnen" -#: include/functions.php:1880 +#: include/functions.php:1875 msgid "Open previous article" msgstr "Vorherigen Artikel öffnen" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "Nächsten Artikel laden (lange Artikel werden nicht gescrollt)" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "Vorherigen Artikel laden (lange Artikel werden nicht gescrollt)" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Suchdialog anzeigen" -#: include/functions.php:1884 +#: include/functions.php:1879 msgid "Article" msgstr "Artikel" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Markierung ein-/ausschalten" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Veröffentlichung ein-/ausschalten" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Gelesen-Status umschalten" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Tags bearbeiten" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Ausgewählte Artikel verbergen" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Gelesene Artikel verbergen" -#: include/functions.php:1891 +#: include/functions.php:1886 msgid "Open in new window" msgstr "In neuem Fenster öffnen" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "Untere als gelesen markieren" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "Obige als gelesen markieren" -#: include/functions.php:1894 +#: include/functions.php:1889 msgid "Scroll down" msgstr "Nach unten scrollen" -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "Nach oben scrollen" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Artikel unter Mauszeiger auswählen" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "Artikel per E-Mail versenden" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Artikel schließen" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Kombinierte Feed-Anzeige umschalten" + +#: include/functions.php:1896 msgid "Article selection" msgstr "Artikelauswahl" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "Alle Artikel auswählen" -#: include/functions.php:1902 +#: include/functions.php:1898 msgid "Select unread" msgstr "Ungelesene Artikel auswählen" -#: include/functions.php:1903 +#: include/functions.php:1899 msgid "Select starred" msgstr "Markierte Artikel auswählen" -#: include/functions.php:1904 +#: include/functions.php:1900 msgid "Select published" msgstr "Veröffentlichte Artikel auswählen" -#: include/functions.php:1905 +#: include/functions.php:1901 msgid "Invert selection" msgstr "Auswahl umkehren" -#: include/functions.php:1906 +#: include/functions.php:1902 msgid "Deselect everything" msgstr "Auswahl aufheben" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Feed" -#: include/functions.php:1908 +#: include/functions.php:1904 msgid "Refresh current feed" msgstr "Aktuellen Feed aktualisieren" -#: include/functions.php:1909 +#: include/functions.php:1905 msgid "Un/hide read feeds" msgstr "Gelesene Feeds zeigen/verstecken" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Feed abonnieren" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Feed bearbeiten" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Schlagzeilensortierung umkehren" -#: include/functions.php:1914 +#: include/functions.php:1910 msgid "Debug feed update" msgstr "Aktualisierung im Diagnose-Modus durchführen" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Alle Feeds als gelesen markieren" -#: include/functions.php:1916 +#: include/functions.php:1912 msgid "Un/collapse current category" msgstr "Aktuelle Kategorie ein-/ausklappen:" -#: include/functions.php:1917 +#: include/functions.php:1913 msgid "Toggle combined mode" msgstr "Kombinierte Feed-Anzeige umschalten" -#: include/functions.php:1918 +#: include/functions.php:1914 msgid "Go to" msgstr "Gehe zu" -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "Neu" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Tagwolke" -#: include/functions.php:1925 +#: include/functions.php:1921 msgid "Other" msgstr "Sonstiges" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Label erstellen" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Filter erstellen" -#: include/functions.php:1928 +#: include/functions.php:1924 msgid "Un/collapse sidebar" msgstr "Seitenleiste ein-/ausklappen" -#: include/functions.php:1929 +#: include/functions.php:1925 msgid "Show help dialog" msgstr "Hilfe anzeigen" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "Suchergebnisse: %s" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "Zum Abspielen klicken" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Abspielen" @@ -853,7 +858,7 @@ msgstr " - " msgid "no tags" msgstr "Keine Tags" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Tags für diesen Artikel bearbeiten" @@ -888,7 +893,7 @@ msgstr "(Notiz bearbeiten)" msgid "unknown type" msgstr "unbekannter Typ" -#: include/functions.php:3665 +#: include/functions.php:3671 msgid "Attachments" msgstr "Anhänge" @@ -925,7 +930,7 @@ msgstr "Artikel veröffentlichen" msgid "Assign tags" msgstr "Tags zuweisen" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Label zuweisen" @@ -1615,7 +1620,7 @@ msgstr "Per E-Mail weiterleiten" msgid "Feed:" msgstr "Feed:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Feed nicht gefunden." @@ -1627,19 +1632,19 @@ msgstr "als gelesen markieren" msgid "Collapse article" msgstr "Artikel einklappen" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden." -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden." -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "Keine markierten Artikel zum Anzeigen gefunden." -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1647,20 +1652,20 @@ msgstr "" "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell " "hinzufügen (siehe obiges Aktionsmenü) oder durch das Benutzen von Filtern." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "Keine Artikel zum Anzeigen gefunden." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "Feeds zuletzt aktualisiert am %s" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Keinen Feed ausgewählt." @@ -2794,7 +2799,7 @@ msgstr "Bitte geben Sie den Kategorietitel ein:" msgid "Generate new syndication address for this feed?" msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "Sie können diese Art von Feed nicht bearbeiten." @@ -3042,23 +3047,28 @@ msgstr "Alle Artikel als gelesen markieren?" msgid "You can't unsubscribe from the category." msgstr "Sie können die Kategorie nicht abbestellen." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Bitte erst einen Feed auswählen." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "Sie können diese Art von Feed nicht neu bewerten." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Artikel in %s neu bewerten?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 msgid "Please enable mail plugin first." msgstr "Bitte erst das Mail-Plugin aktivieren." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Bitte erst das Mail-Plugin aktivieren." + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "Neue Version verfügbar!" @@ -3083,7 +3093,7 @@ msgstr "Artikelveröffentlichung widerrufen" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Keine Artikel ausgewählt." @@ -3132,26 +3142,36 @@ msgstr "%d Artikel als gelesen markieren?" msgid "Open original article" msgstr "Originalartikel öffnen" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Zeige URL an" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Label entfernen" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "Abspielen..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "Zum Pausieren klicken" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 msgid "Please enter new score for selected articles:" msgstr "Bitte geben Sie eine neue Bewertung für die ausgewählten Artikel ab:" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 msgid "Please enter new score for this article:" msgstr "Bitte geben Sie eine neue Bewertung für diesen Artikel ab:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Artikel" + #: plugins/digest/digest.js:71 msgid "Mark %d displayed articles as read?" msgstr "%d Artikel als gelesen markieren?" @@ -3176,6 +3196,10 @@ msgstr "Keine ungelesenen Feeds." msgid "Load more..." msgstr "Mehr laden..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 msgid "Forward article by email" msgstr "Artikel via E-Mail weiterleiten" diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo Binary files differindex 21927e66f..d4a4bcb0b 100644 --- a/locale/es_ES/LC_MESSAGES/messages.mo +++ b/locale/es_ES/LC_MESSAGES/messages.mo diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po index 3c7d7863a..388870950 100644 --- a/locale/es_ES/LC_MESSAGES/messages.po +++ b/locale/es_ES/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2012-10-25 00:12+0100\n" "Last-Translator: DavidM <[email protected]>\n" "Language-Team: Español <[email protected]>\n" @@ -263,196 +263,196 @@ msgstr "" "La prueba de escape SQL ha fallado. Por favor, revise la configuración de su " "base de datos y PHP." -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "Cargando. Por favor, espere..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "¡Nueva versión de Tiny Tiny RSS disponible!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Colapsar la lista de fuentes" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "Mostrar artículos" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adaptable" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Todos" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Favoritos" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Publicados" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Sin leer" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Ignorar la puntuación" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Actualizados" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "Ordenar artículos" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Por defecto" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Fecha" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Título" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Puntuación" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Actualizar" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Marcar como leído" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Acciones..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Preferencias" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Buscar..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Acciones de la fuente:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Suscribirse a una fuente..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Editar esta fuente..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Reiniciar la puntuación" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Cancelar la suscripción" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Todas las fuentes:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "Ocultar/Mostrar fuentes leídas" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Otras acciones:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "Modo resumen..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "Nube de etiquetas..." -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Cambiar a modo de reordenación de categorías" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "Seleccionar por etiquetas..." -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Crear marcador..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Crear filtro..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "Ayuda para atajos de teclado" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Cerrar sesión" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Preferencias" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Atajos de teclado" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Salir de las preferencias" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Fuentes" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filtros" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Marcadores" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Usuarios" @@ -624,7 +624,7 @@ msgstr "Publicados" msgid "Fresh articles" msgstr "Recientes" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Todos" @@ -636,236 +636,241 @@ msgstr "Artículos archivados" msgid "Recently read" msgstr "Leídos recientemente" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navegación" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "Fuente generada" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Abrir artículo original" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Abrir artículo original" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Mostrar el diálogo de búsqueda" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Todos" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Alternar favoritos" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Alternar publicados" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Alternar no leídos" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Editar etiquetas" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Descartar artículos seleccionados" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Publicar artículo" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Abrir el artículo en una nueva pestaña o ventana" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "Marcar artículos posteriores como leídos" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "Marcar artículos anteriores como leídos" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Hecho." -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Seleccionar el artículo que esté bajo el cursor del ratón" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "Enviar artículo por correo" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Cerrar artículo" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Cambiar a modo de reordenación de categorías" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Invertir selección de artículos" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "Seleccionar todos los artículos" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Seleccionar artículos sin leer" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Marcar como favorito" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Seleccionar artículos publicados" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Invertir selección de artículos" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Deseleccionar todos los artículos" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Fuente" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Actualizar la fuente activa" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "Ocultar/Mostrar fuentes leídas" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Suscribirse a una fuente" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Editar fuente" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Invertir orden de titulares" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Se han actualizado todas las fuentes." -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Marcar todas las fuentes como leídas" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Plegar la categoría" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Cambiar a modo de reordenación de categorías" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Ir a..." -#: include/functions.php:1920 +#: include/functions.php:1916 #, fuzzy msgid "Fresh" msgstr "Refrescar" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Nube de etiquetas" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Otro:" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Crear marcador" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Crear filtro" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Colapsar la barra lateral" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Mostrar el diálogo de búsqueda" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "Resultados de búsqueda: %s" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "Clic para reproducir" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Reproducir" @@ -877,7 +882,7 @@ msgstr " - " msgid "no tags" msgstr "sin etiquetas" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Editar las etiquetas de este artículo" @@ -912,7 +917,7 @@ msgstr "(editar nota)" msgid "unknown type" msgstr "tipo desconocido" -#: include/functions.php:3665 +#: include/functions.php:3671 msgid "Attachments" msgstr "Adjuntos" @@ -949,7 +954,7 @@ msgstr "Publicar artículo" msgid "Assign tags" msgstr "Asignar etiquetas" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Asignar marcador" @@ -1648,7 +1653,7 @@ msgstr "Enviar por correo electrónico" msgid "Feed:" msgstr "Fuente:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Fuente no encontrada." @@ -1661,19 +1666,19 @@ msgstr "marcar como leído" msgid "Collapse article" msgstr "Cerrar artículo" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "No se han encontrado artículos sin leer." -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "No se han encontrado artículos actualizados." -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "No se han encontrado artículos favoritos." -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1682,21 +1687,21 @@ msgstr "" "artículos a los marcadores manualmente (ver arriba el menú Acciones) o usar " "un filtro." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "No se han encontrado artículos que mostrar." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "Última actualización de las fuentes: %s" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "No se ha seleccionado ninguna fuente." @@ -2888,7 +2893,7 @@ msgstr "Introduzca el nombre de la categoría:" msgid "Generate new syndication address for this feed?" msgstr "¿Generar nueva dirección de sindicación para esta fuente?" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "No puede editar esta clase de fuente." @@ -3141,24 +3146,29 @@ msgstr "¿Marcar todos los artículos como leídos?" msgid "You can't unsubscribe from the category." msgstr "No puede cancelar la suscripción a la categoría." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Por favor, seleccione primero alguna fuente." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "No puede reiniciar la puntuación de esta clase de fuente." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "¿Reiniciar la puntuación de los artículos de %s?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "Por favor, seleccione primero alguna fuente." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Por favor, seleccione primero alguna fuente." + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "¡Nueva versión disponible!" @@ -3184,7 +3194,7 @@ msgstr "Despublicar artículo" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "No se han seleccionado artículos." @@ -3233,28 +3243,38 @@ msgstr "¿Marcar %d artículo(s) como leído(s)?" msgid "Open original article" msgstr "Abrir artículo original" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Mostrar artículos" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Borrar marcador" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "Reproduciendo..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "Clic para pausar" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Por favor, introduzca una nota para este artículo:" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "Por favor, introduzca una nota para este artículo:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Todos" + #: plugins/digest/digest.js:71 msgid "Mark %d displayed articles as read?" msgstr "¿Marcar %d artículos como leídos?" @@ -3279,6 +3299,10 @@ msgstr "No hay fuentes sin leer." msgid "Load more..." msgstr "Cargar más..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 msgid "Forward article by email" msgstr "Enviar artículo por correo" diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo Binary files differindex e20e945b2..fcd8a2d14 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.mo +++ b/locale/fr_FR/LC_MESSAGES/messages.mo diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po index a9dc28acc..4cc1d6941 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.po +++ b/locale/fr_FR/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2012-02-14 08:32+0000\n" "Last-Translator: Thomas Jost <[email protected]>\n" "Language-Team: French (France) (http://www.transifex.net/projects/p/tt-rss/" @@ -266,196 +266,196 @@ msgstr "" "Le test d'échappement SQL a échoué, vérifiez votre base de donnée et votre " "configuration de PHP." -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "Chargement en cours, veuillez patienter..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Une nouvelle version de Tiny Tiny RSS est disponible !" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Contracter la liste des flux" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "Afficher les articles" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adaptatif" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Tous les articles" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Remarquables" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Publiés" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Non lus" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Ignorer le score" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Mis à jour" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "Classer les articles" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Utiliser la valeur par défaut" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Date" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Titre" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Score" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Mettre à jour" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Marquer comme lu" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Actions..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Configuration" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Rechercher..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Actions sur ce flux :" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "S'abonner au flux..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Modifier ce flux..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Recalculer le score du flux" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Se désabonner" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Tous les flux :" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "(Dé)Masquer les flux lus" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Autres actions :" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "Basculer en mode résumé..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "Afficher le nuage d'étiquettes" -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Marquer comme remarquable" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "Sélectionner par tags..." -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Créer une étiquette..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Créer un filtre..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "Aide sur les raccourcis clavier" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Déconnexion" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Configuration" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Raccourcis clavier" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Quitter la configuration" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Flux" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filtres" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Etiquettes" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Utilisateurs" @@ -627,7 +627,7 @@ msgstr "Articles publiés" msgid "Fresh articles" msgstr "Nouveaux articles" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Tous les articles" @@ -639,235 +639,240 @@ msgstr "Articles archivés" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navigation" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "Sauter automatiquement au flux suivant" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Ouvrir l'article original" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Ouvrir l'article original" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Afficher la fenêtre de recherche" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Tous les articles" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Marquer comme remarquable" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Marquer comme publié" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Marquages comme non-lu" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Modifier les tags" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Exclure les articles sélectionnés" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Exclure les articles lus" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Ouvrir les articles dans une nouvelle fenêtre" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "Marquer les articles en-dessous comme lus" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "Marquer les articles au-dessus comme lus" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Tout est terminé." -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Selectionner l'article sous le curseur de la souris" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "Envoyer l'article par e-mail" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Fermer l'article" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Marquer comme publié" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Inverser la sélection" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "Sélectionner tous les articles" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Sélectionner les articles non lus" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Marquer comme remarquable" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Sélectionner les articles non lus" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Inverser la sélection" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Tout déselectionner" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Flux" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Mettre à jour le flux actif" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "(Dé)Masquer les flux lus" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "S'abonner au flux" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Modifier le flux" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Inverser l'ordre des titres" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Désactiver les mises à jour" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Marquer tous les flux comme lus" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Placer dans la catégorie :" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Marquer comme publié" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Aller à..." -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Nuage de tags" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Autres flux" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Créer une étiquette" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Créer un filtre" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Contracter le menu" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Afficher la fenêtre de recherche" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "Cliquez pour lancer la lecture" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Lecture" @@ -879,7 +884,7 @@ msgstr " - " msgid "no tags" msgstr "aucun tag" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Modifier les tags pour cet article" @@ -915,7 +920,7 @@ msgstr "(modifier l'annotation)" msgid "unknown type" msgstr "type inconnu" -#: include/functions.php:3665 +#: include/functions.php:3671 #, fuzzy msgid "Attachments" msgstr "Fichiers attachés :" @@ -953,7 +958,7 @@ msgstr "Publier l'article" msgid "Assign tags" msgstr "Assigner des tags" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Assigner l'étiquette" @@ -1650,7 +1655,7 @@ msgstr "Transférer par email" msgid "Feed:" msgstr "Flux :" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Flux non trouvé." @@ -1663,19 +1668,19 @@ msgstr "marquer comme lu" msgid "Collapse article" msgstr "Fermer l'article" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "Aucun article non-lu à afficher" -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "Aucun article mis à jour à afficher" -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "Aucun article remarquable à afficher" -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1683,22 +1688,22 @@ msgstr "" "Aucun article à afficher. Vous pouvez assigner des étiquettes aux articles " "manuellement (voir les actions du menu ci-dessus) ou utiliser un filtre." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "Aucun article à afficher" -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "Flux mis à jour à %s" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" "Des erreurs sont survenues pendant la mise à jour de certains flux (cliquer " "ici pour les détails)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Aucun flux sélectionné." @@ -2855,7 +2860,7 @@ msgstr "Veuillez saisir un titre pour cette catégorie :" msgid "Generate new syndication address for this feed?" msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "Vous ne pouvez pas modifier ce type de flux." @@ -3114,24 +3119,29 @@ msgstr "Marquer tous les articles comme lus ?" msgid "You can't unsubscribe from the category." msgstr "Vous ne pouvez pas vous désabonner de la catégorie." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Veuillez d'abord sélectionner un flux." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "Vous ne pouvez pas recalculer le score de ce type de flux." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Recalculer le score des articles de %s ?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "Veuillez d'abord sélectionner un flux." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Veuillez d'abord sélectionner un flux." + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "Une nouvelle version est disponible !" @@ -3157,7 +3167,7 @@ msgstr "Ne plus publier l'article" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Aucun article sélectionné." @@ -3206,28 +3216,38 @@ msgstr "Marquer %d article(s) comme lu(s) ?" msgid "Open original article" msgstr "Ouvrir l'article original" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Afficher l'URL" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Supprimer l'étiquette" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "Lecture..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "Cliquez pour mettre en pause" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Supprimer les %d articles sélectionnés ?" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "Veuillez saisir un titre pour cette catégorie :" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Tous les articles" + #: plugins/digest/digest.js:71 msgid "Mark %d displayed articles as read?" msgstr "Marquer les %d articles affichés comme lus ?" @@ -3252,6 +3272,10 @@ msgstr "Aucun flux non lu." msgid "Load more..." msgstr "Charger plus..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 msgid "Forward article by email" msgstr "Transférer l'article par email" diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo Binary files differindex 7c54c878d..26ebf005a 100644 --- a/locale/hu_HU/LC_MESSAGES/messages.mo +++ b/locale/hu_HU/LC_MESSAGES/messages.mo diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po index 03ae80522..4d6b746c4 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: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2013-03-16 22:33+0100\n" "Last-Translator: Zoltan Faludi <[email protected]>\n" "Language-Team: HUNGARIAN\n" @@ -259,196 +259,196 @@ msgstr "" "SQL eszképelési teszt sikertelen, ellenőrizze az adatbázis és a PHP " "bállításokat" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "Betöltés, kérem várjon..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Hírcsatornalista összecsukása" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "Hírek megjelenítése" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adaptív" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Minden hír" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Csillagozott" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Publikált" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Olvasatlan" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Pontozás memmőzése" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Frissített" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "Hírek rendezése" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Alapértelmezett" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Dátum" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Cím" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Pontszám" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Frissítés" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Megjelölés olvasottként" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Műveletek" -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Beállítások" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Keresés..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Műveletek hírcsatornákkal:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Feliratkozás hírcsatornára..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Hírcsatorna szerkesztése..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Hírcsatorna újrapontozása" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Leiratkozás" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Az összes hírcsatorna:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "Olvasottak rejtése/mutatása" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Egyéb műveletek:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "Váltás áttekintő módba..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "Címkefelhő megjelenítése..." -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Csillagoz" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "Kijelölés címkék alapján" -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Új címke létrehozása..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Szűrő létrehozása..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "Billentyűparancsok súgója" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Kijelentkezés" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Beállítások" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Billentyűparancsok" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Kilépés a beállításokból" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Hírcsatornák" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Szűrők" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Címkék" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Felhasználók" @@ -618,7 +618,7 @@ msgstr "Publikált hírek" msgid "Fresh articles" msgstr "Friss hírek" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Az összes hír" @@ -630,235 +630,240 @@ msgstr "Archivált hírek" msgid "Recently read" msgstr "Legutóbb olvasott" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navigáció" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "Hírcsatorna végén mutassa a következő hírcsatornát" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Eredeti hír megjelenítése" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Eredeti hír megjelenítése" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Keresőmező megjelenítése" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Minden hír" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Csillagoz" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Publikált" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Olvasatlannak jelöl" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Címkék szerkesztése" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Eltávolítja a kijelölt híreket a címke alól?" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Látható olvasott hírek elrejtése" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Hír megnyitása új ablakban" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "Olvasottnak jel ez alatt" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "Olvasottnak jel ez fölött" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Kész." -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Az egérkurzor alatti hír kiválasztása" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "Hír küldése emailben" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Hír bezárása" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Publikált" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Fordított kijelölés" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "Minden hír kijelölése" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Olvasatlan hírek kijelölése" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Csillagoz" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Publikált hírek kijlölése" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Fordított kijelölés" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Kijelölés eltávolítása" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Hírcsatorna" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Aktív hírcsatorna frissítése" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "Olvasottak rejtése/mutatása" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Feliratkozás hírcsatornára" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Hírcsatorna szerkesztése" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Fordított cím sorrend" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Frissítések kikapcsolása" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Minden hírcsatornát olvasottként jelöl" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Hozzáadás a következő kategóriához:" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Publikált" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Ugrás ide..." -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Címkefelhő" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Egyéb hírcsatornák" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Címke létrehozása" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Szűrő létrehozása" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Oldalablak összecsukása" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Keresőmező megjelenítése" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "Keresési eredmények: %s" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "Kattintson a lejátszáshoz" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Lejátszás" @@ -870,7 +875,7 @@ msgstr "-" msgid "no tags" msgstr "nincs címke" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Címkék hozzáadása a hírhez" @@ -905,7 +910,7 @@ msgstr "(jegyzet szerkesztése)" msgid "unknown type" msgstr "ismeretlen hírcsatornatípus" -#: include/functions.php:3665 +#: include/functions.php:3671 msgid "Attachments" msgstr "Csatolmányok:" @@ -942,7 +947,7 @@ msgstr "Hír publikálása" msgid "Assign tags" msgstr "Címke hozzáadása" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Címke hozzáadása" @@ -1627,7 +1632,7 @@ msgstr "Továbbítás emaiben" msgid "Feed:" msgstr "Hírcsatorna:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Hírcsatorna nem található" @@ -1640,19 +1645,19 @@ msgstr "olvasottként jelöl" msgid "Collapse article" msgstr "Hír bezárása" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "Nincs megjeleníthető olvasatlan hír." -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "Nincs megjeleníthető friss hír." -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "Nincs megjeleníthető csillagozott hír." -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1661,21 +1666,21 @@ 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." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "Nincs megjeleníthető hír." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "Hírcsatornák utolsó frissítése: %s" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" "Néhány hírcsatorna frissítésével gond akadt. (Kattints ide a részletekhez!)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Nincs kiválasztott hírcsatorna." @@ -2812,7 +2817,7 @@ msgstr "Adja meg a kategória címét:" msgid "Generate new syndication address for this feed?" msgstr "Új hírszolgáltatási cím generálásása ehhez a hírcsatornához?" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "Ezt a hírcsatornatípust nem szerkesztheted." @@ -3062,23 +3067,28 @@ msgstr "Minden hírt megjelöl olvasottként?" msgid "You can't unsubscribe from the category." msgstr "Ebből a kategóriából nem ." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Válasszon hírcsatorná(ka)t!" -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "Ez a hírcsatorna típust nem lehet újraponszámozni." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Újrapontszámozza %s híreit?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 msgid "Please enable mail plugin first." msgstr "Először engedélyezze a mail plugint." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Először engedélyezze a mail plugint." + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "Új verzió érhető el." @@ -3103,7 +3113,7 @@ msgstr "Publikálás visszavonása" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Nincsen kiválasztott hír." @@ -3152,26 +3162,36 @@ msgstr "%d hír megjelölése olvasottként?" msgid "Open original article" msgstr "Eredeti hír megjelenítése" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "URL megjelenítés" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Címke eltávolítás" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "Lejátszás..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "Kattintson a megállításhoz" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 msgid "Please enter new score for selected articles:" msgstr "Adjon meg egy új pontszámot a kijelölt hírekhez:" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 msgid "Please enter new score for this article:" msgstr "Adjon meg egy új pontszámot a hírhez:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Minden hír" + #: plugins/digest/digest.js:71 #, fuzzy msgid "Mark %d displayed articles as read?" @@ -3201,6 +3221,10 @@ msgstr "Tárolt hírcsatornák" msgid "Load more..." msgstr "Betöltés..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 #, fuzzy msgid "Forward article by email" diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo Binary files differindex a40ef2ccb..0fcef24a5 100644 --- a/locale/it_IT/LC_MESSAGES/messages.mo +++ b/locale/it_IT/LC_MESSAGES/messages.mo diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po index 56655cd4c..cabecb14d 100644 --- a/locale/it_IT/LC_MESSAGES/messages.po +++ b/locale/it_IT/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2012-02-14 08:31+0000\n" "Last-Translator: gothfox <[email protected]>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -260,196 +260,196 @@ msgstr "" "Test di sanitizzazione dell'SQL fallito; controllare il database e la " "configurazione del PHP" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "Caricamento, attendere prego..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "È disponibile la nuova versione di Tiny Tiny RSS." -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Contrai elenco notiziari" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "Mostra articoli" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adattivo" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Tutti gli articoli" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Con stella" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Pubblicati" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Non letti" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Ignora punteggio" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Aggiornato" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "Ordina articoli" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Predefinito" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Data" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Titolo" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Punteggio" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Aggiorna" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Segna come letto" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Azioni..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Preferenze" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Cerca..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Azioni notiziari:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Sottoscrivi il notiziario..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Modifica questo notiziario..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Cambia punteggio notiziario" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Annulla sottoscrizione" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Tutti i notiziari:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "Visualizza/Nascondi notiziari letti" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Altre azioni:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "Passa al sommario..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "Mostra nuvola etichette..." -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Inverti con stella" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "" -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Crea etichetta..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Crea filtro..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "Aiuto scorciatoie da tastiera" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Esci" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Preferenze" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Scorciatoie da tastiera" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Esci dalle preferenze" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Notiziari" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filtri" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Etichette" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Utenti" @@ -621,7 +621,7 @@ msgstr "Articoli pubblicati" msgid "Fresh articles" msgstr "Articoli nuovi" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Tutti gli articoli" @@ -633,234 +633,239 @@ msgstr "Articoli archiviati" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navigazione" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "Su lettura passare al prossimo notiziario" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Apri articolo di origine" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Apri articolo di origine" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Mostra il dialogo di ricerca" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Tutti gli articoli" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Inverti con stella" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Inverti pubblicati" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Inverti non letti" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Modifica etichette" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Rimuovi gli articoli selezionati" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Rimuovi articoli letti" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Aprire gli articoli in una nuova finestra" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Fatto tutto." -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Seleziona l'articolo sotto il cursore del mouse" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Cambio punteggio degli articoli" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Inverti pubblicati" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Azioni sull'articolo attivo" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Inverti non letti" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Imposta con stella" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Articoli pubblicati" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Selezione:" -#: include/functions.php:1906 +#: include/functions.php:1902 msgid "Deselect everything" msgstr "" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Notiziario" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Aggiorna notiziario attivo" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "Visualizza/Nascondi notiziari letti" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Sottoscrivi il notiziario" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Modifica notiziario" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Invertire l'ordine dei sommari" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Disabilitare aggiornamenti" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Segna tutti i notiziari come letti" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Mettere nella categoria:" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Inverti pubblicati" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Vai a..." -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Nuvola etichette" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Altri notiziari" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Crea etichetta" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Crea filtro" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Contrai la barra laterale" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Mostra il dialogo di ricerca" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "Fare clic per riprodurre" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Riproduci" @@ -872,7 +877,7 @@ msgstr " - " msgid "no tags" msgstr "nessuna etichetta" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Modifica le etichette per questo articolo" @@ -907,7 +912,7 @@ msgstr "(modifica note)" msgid "unknown type" msgstr "tipo sconosciuto" -#: include/functions.php:3665 +#: include/functions.php:3671 #, fuzzy msgid "Attachments" msgstr "Allegati:" @@ -945,7 +950,7 @@ msgstr "Pubblica articolo" msgid "Assign tags" msgstr "Assegna etichette" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Assegna etichetta" @@ -1640,7 +1645,7 @@ msgstr "Inoltra per email" msgid "Feed:" msgstr "Notiziario:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Notiziario non trovato." @@ -1653,19 +1658,19 @@ msgstr "segna come letto" msgid "Collapse article" msgstr "Tutti gli articoli" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "Nessun articolo non letto trovato da visualizzare." -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "Nessun articolo non aggiornato trovato da visualizzare." -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "Nessun articolo con stella trovato da visualizzare." -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1674,21 +1679,21 @@ msgstr "" "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un " "filtro." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "Nessun articolo trovato da visualizzare." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "Ultimo aggiornamento notiziari alle %s" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Nessun notiziario selezionato." @@ -2850,7 +2855,7 @@ msgstr "Inserire il titolo della categoria:" msgid "Generate new syndication address for this feed?" msgstr "Generare un nuovo indirizzo per questo notiziario?" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "Impossibile modificare questo tipo di notiziario." @@ -3106,24 +3111,29 @@ msgstr "Segnare tutti gli articoli come letti?" msgid "You can't unsubscribe from the category." msgstr "Impossibile annullare la sottoscrizione alla categoria." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Selezionare prima qualche notiziario." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Cambiare il punteggio degli articoli in «%s»?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "Selezionare prima qualche notiziario." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Selezionare prima qualche notiziario." + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "Nuova versione disponibile." @@ -3149,7 +3159,7 @@ msgstr "Non pubblicare articolo" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Nessun articolo selezionato." @@ -3198,28 +3208,38 @@ msgstr "Segnare %d articolo/i come letto/i?" msgid "Open original article" msgstr "Apri articolo di origine" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Visualizza URL" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Rimuovi etichetta" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "In riproduzione..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "Fare clic per mettere in pausa" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Eliminare i %d articoli selezionati?" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "Inserire il titolo della categoria:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Tutti gli articoli" + #: plugins/digest/digest.js:71 msgid "Mark %d displayed articles as read?" msgstr "Segnare %d articolo/i visualizzato/i come letto/i?" @@ -3244,6 +3264,10 @@ msgstr "Nessun notiziario non letto." msgid "Load more..." msgstr "Carica altri..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 msgid "Forward article by email" msgstr "Inoltra l'articolo per email" diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo Binary files differindex 938f1d4ba..caf63c6be 100644 --- a/locale/ja_JP/LC_MESSAGES/messages.mo +++ b/locale/ja_JP/LC_MESSAGES/messages.mo diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po index 34e30cbab..ddcf1bdab 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: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2009-05-12 03:25+0900\n" "Last-Translator: Tadashi Jokagi <[email protected]>\n" "Language-Team: Japanese <http://oss.poyo.jp/>\n" @@ -259,200 +259,200 @@ msgstr "" "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を" "確認してください。" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "読み込みんでいます。しばらくお待ちください..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "フィード一覧を閉じる" -#: index.php:167 +#: index.php:168 #, fuzzy msgid "Show articles" msgstr "記事を保管しました" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "すべての記事" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "お気に入り" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "公開済み" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "未読" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "スコア計算の無効化" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "更新日時" -#: index.php:179 +#: index.php:180 #, fuzzy msgid "Sort articles" msgstr "記事を保管しました" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "標準" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "日付" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "題名" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "スコア" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "更新" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "既読にする" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "操作..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "設定" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "検索..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "フィード操作" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "フィードを購読する..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "フィードを編集する..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "フィードのスコアを再計算しています..." -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "購読をやめる" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "すべてのフィード:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "読んだフィードを隠す/再表示する" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "その他の操作:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "" -#: index.php:231 +#: index.php:232 #, fuzzy msgid "Show tag cloud..." msgstr "タグクラウド" -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "カテゴリーの並び替えモードの切り替え" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "" -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "ラベルを作成する..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "フィルターを作成しています..." -#: index.php:238 +#: index.php:239 #, fuzzy msgid "Keyboard shortcuts help" msgstr "キーボードショートカット" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "ログアウト" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "設定" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "キーボードショートカット" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "設定を終了する" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "フィード" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "フィルター" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "ラベル" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "ユーザー" @@ -625,7 +625,7 @@ msgstr "公開済みの記事" msgid "Fresh articles" msgstr "新しい記事" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "すべての記事" @@ -638,241 +638,246 @@ msgstr "未読記事" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "ナビゲーション" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "生成したフィード" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "元の記事内容を表示する" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "元の記事内容を表示する" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "検索ダイアログを表示する" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "すべての記事" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "お気に入りを切り替える" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "公開を切り替える" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "未読に切り替える" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "タグを編集する" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "ラベルから選択した記事を削除しますか?" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "公開記事" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "新しいウィンドウで記事を開く" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 #, fuzzy msgid "Mark below as read" msgstr "既読にする" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 #, fuzzy msgid "Mark above as read" msgstr "既読にする" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "すべて終了しました。" -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "マウスカーソルの下の記事を選択する" -#: include/functions.php:1897 +#: include/functions.php:1892 #, fuzzy msgid "Email article" msgstr "すべての記事" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "記事を消去する" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "カテゴリーの並び替えモードの切り替え" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "有効な記事の操作" -#: include/functions.php:1901 +#: include/functions.php:1897 #, fuzzy msgid "Select all articles" msgstr "記事を消去する" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "未読記事を削除する" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "お気に入りに設定する" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "未読記事を削除する" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "有効な記事の操作" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "記事を消去する" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "フィード" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "有効なフィードの更新" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "読んだフィードを隠す/再表示する" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "フィードを購読する" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "フィードを編集する" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "ヘッドラインの逆順 (古いものがはじめに)" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "すべてのフィードを更新しました。" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "すべてのフィードを既読に設定する" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "閉じたカテゴリーのクリック" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "カテゴリーの並び替えモードの切り替え" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "移動..." -#: include/functions.php:1920 +#: include/functions.php:1916 #, fuzzy msgid "Fresh" msgstr "再描画" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "タグクラウド" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "その他:" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "ラベルを作成する" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "フィルターを作成する" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "サイドバーを縮小する" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "検索ダイアログを表示する" -#: include/functions.php:2407 +#: include/functions.php:2406 #, fuzzy, php-format msgid "Search results: %s" msgstr "検索結果" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 #, fuzzy msgid "Click to play" msgstr "編集するにはクリック" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "" @@ -884,7 +889,7 @@ msgstr " - " msgid "no tags" msgstr "タグがありません" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "この記事のタグを編集する" @@ -922,7 +927,7 @@ msgstr "ノートの編集" msgid "unknown type" msgstr "未知の種類" -#: include/functions.php:3665 +#: include/functions.php:3671 #, fuzzy msgid "Attachments" msgstr "添付:" @@ -961,7 +966,7 @@ msgstr "公開記事" msgid "Assign tags" msgstr "タグの割り当て" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "ラベルの割り当て" @@ -1658,7 +1663,7 @@ msgstr "記事をお気に入りにする" msgid "Feed:" msgstr "フィード:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "フィードが見つかりません。" @@ -1671,19 +1676,19 @@ msgstr "既読にする" msgid "Collapse article" msgstr "記事を消去する" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "表示する未読記事が見つかりませんでした。" -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "表示する更新された記事が見つかりませんでした。" -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "表示するお気に入りの記事が見つかりませんでした。" -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1691,20 +1696,20 @@ msgstr "" "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ" "ニューを参照します)、フィルターを使うことができます。" -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "表示する記事が見つかりません。" -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "フィードは選択されていません。" @@ -2894,7 +2899,7 @@ msgstr "このアーティクルのノートを入力してください:" msgid "Generate new syndication address for this feed?" msgstr "" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 #, fuzzy msgid "You can't edit this kind of feed." msgstr "フィードのこの種類を消去できません。" @@ -3154,25 +3159,30 @@ msgstr "すべての記事を既読にしますか?" msgid "You can't unsubscribe from the category." msgstr "カテゴリーから購読をやめることができません。" -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "はじめにいくつかのフィードを選択してください。" -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 #, fuzzy msgid "You can't rescore this kind of feed." msgstr "フィードのこの種類を消去できません。" -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "%s の記事のスコアを再計算しますか?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "はじめにいくつかのフィードを選択してください。" -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "はじめにいくつかのフィードを選択してください。" + +#: js/tt-rss.js:864 #, fuzzy msgid "New version available!" msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!" @@ -3199,7 +3209,7 @@ msgstr "非公開記事" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "記事は選択されていません。" @@ -3254,31 +3264,41 @@ msgstr "%d 件のマークした記事を既読として設定しますか?" msgid "Open original article" msgstr "元の記事内容を表示する" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "タグの表示" + +#: js/viewfeed.js:1898 #, fuzzy msgid "Remove label" msgstr "選択したラベルを削除しますか?" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 #, fuzzy msgid "Playing..." msgstr "フィード一覧を読み込んでいます..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 #, fuzzy msgid "Click to pause" msgstr "編集するにはクリック" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "このアーティクルのノートを入力してください:" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "このアーティクルのノートを入力してください:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "すべての記事" + #: plugins/digest/digest.js:71 #, fuzzy msgid "Mark %d displayed articles as read?" @@ -3309,6 +3329,10 @@ msgstr "読んだフィードを隠す/再表示する" msgid "Load more..." msgstr "ヘルプを読み込んでいます..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 #, fuzzy msgid "Forward article by email" diff --git a/locale/lv_LV/LC_MESSAGES/messages.mo b/locale/lv_LV/LC_MESSAGES/messages.mo Binary files differindex 4c83663ca..fb97d43f3 100644 --- a/locale/lv_LV/LC_MESSAGES/messages.mo +++ b/locale/lv_LV/LC_MESSAGES/messages.mo diff --git a/locale/lv_LV/LC_MESSAGES/messages.po b/locale/lv_LV/LC_MESSAGES/messages.po index b726d40b9..8af1db170 100644 --- a/locale/lv_LV/LC_MESSAGES/messages.po +++ b/locale/lv_LV/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2013-03-18 22:55+0300\n" "Last-Translator: Valdis Vītoliņš <[email protected]>\n" "Language-Team: \n" @@ -256,196 +256,196 @@ msgid "SQL escaping test failed, check your database and PHP configuration" msgstr "" "Neizdevās SQL izņēmumu tests, pārbaudiet jūsu datu bāzes un PHP iestatījumus" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "Ielādē, lūdzu gaidiet..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Ir pieejama jauna Tiny Tiny RSS versija!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Sakļaut barotņu sarakstu" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "Rādīt rakstus" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adaptīvs" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Visus rakstus" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Zvaigžņotos" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Publicētos" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Nelasītos" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Ignorēt novērtējumu" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Atjaunotos" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "Kārtot rakstus" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Noklusētais" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Datums" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Virsraksts" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Novērtējums" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Atjaunot" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Atzīmēt kā lasītu" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Darbības" -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Iestatījumi" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Meklēt" -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Barotnes darbības" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Abonēt barotni..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Rediģēt šo barotni..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Pārvērtēt barotni" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Atteikties" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Visas barotnes:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "(Ne)rādīt lasītās barotnes" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Citas darbības:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "Pārslēgties uz īssavilkumu..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "Radīt birku mākoni..." -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Pārslēgt zvaigžņošanu" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "Atlasīt pēc iezīmēm..." -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Izveidot iezīmi" -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Izveidot filtru..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "Isinājumtaustiņu palīdzība" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Atteikties" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Iestatījumi" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Īsinājumtaustiņi" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Iziet no iestatījumiem" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Barotnes" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filtri" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Iezīmes" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Lietotāji" @@ -615,7 +615,7 @@ msgstr "Publicētie raksti" msgid "Fresh articles" msgstr "Jaunākie raksti" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Visi raksti" @@ -627,235 +627,240 @@ msgstr "Arhivētie raksti" msgid "Recently read" msgstr "Nesen lasītie raksti" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navigācija" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "Pēc noķeršanas rādīt nākamo barotni" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Atvērt sākotnējo rakstu" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Atvērt sākotnējo rakstu" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Rādīt meklēšanas logu" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Visus rakstus" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Pārslēgt zvaigžņošanu" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Pārslēgt publicēšanu" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Pārslēgt nelasītu" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Rediģēt iezīmes" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Atmest atlasītos rakstus" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Atmest lasītos rakstus" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Atvērt rakstu jaunā logā" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "Iezīmēt lejup kā lasītus" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "Iezīmēt augšup kā lasītus" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Viss izdarīts." -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Iezīmēt rakstu zem peles kursora" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "Nosūtīt rakstu uz e-pastu" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Aizvērt rakstu" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Pārslēgt publicēšanu" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Apgriezt rakstu iezīmēšanu" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "Iezīmēt visus rakstus" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Iezīmēt nelasītos rakstus" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Uzlikt zvaigzni" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Iezīmēt publicētos rakstus" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Apgriezt rakstu iezīmēšanu" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Neatzīmēt rakstus" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Barotne" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Atjaunot aktīvo barotni" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "(Ne)rādīt lasītās barotnes" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Abonēt barotni" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Rediģēt barotni" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Apgriezt virsrakstu secību" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Atslēgt atjaunojumus" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Atzīmēt visas barotnes kā lasītas" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Ievietot kategorijā:" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Pārslēgt publicēšanu" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Doties uz..." -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Iezīmju mākonis" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Citas barotnes" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Izveidot etiķeti" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Izveidot filtru" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Sakļaut sānjoslu" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Rādīt meklēšanas logu" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "Meklēšanas rezultāti: %s" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "Klikšķiniet, lai atskaņotu" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Atskaņot" @@ -867,7 +872,7 @@ msgstr "–" msgid "no tags" msgstr "nav iezīmju" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Rediģēt šī raksta iezīmes" @@ -902,7 +907,7 @@ msgstr "(rediģēt piezīmi)" msgid "unknown type" msgstr "nezināms tips" -#: include/functions.php:3665 +#: include/functions.php:3671 msgid "Attachments" msgstr "Pielikumi" @@ -939,7 +944,7 @@ msgstr "Publicēt rakstu" msgid "Assign tags" msgstr "Pievienot iezīmi" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Pievienot etiķeti" @@ -1619,7 +1624,7 @@ msgstr "Pārsūtīt e-pastā" msgid "Feed:" msgstr "Barotne:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Barotne netika atrasta." @@ -1632,19 +1637,19 @@ msgstr "iezīmēt kā lasītu" msgid "Collapse article" msgstr "Aizvērt rakstu" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "Nav neizlasītu rakstu, ko rādīt." -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "Nav atjaunotu rakstu, ko rādīt." -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "Nav zvaigžņotu rakstu, ko rādīt." -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1652,21 +1657,21 @@ msgstr "" "Netika atrasti parādāmi raksti. Jūs varat pievienot rakstus etiķetēm manuāli " "(skatiet darbību izvēlni), vai arī ar filtru." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "Netika atrasti raksti, ko rādīt." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "Barotnes pēdējo reizi atjaunotas %s." -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" "Dažas barotnes ir atjaunotas ar kļūdām (klikšķiniet lai skatītu vairāk)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Nav izvēlēta barotne." @@ -2799,7 +2804,7 @@ msgstr "Lūdzu ievadiet kategorijas virsrakstu:" msgid "Generate new syndication address for this feed?" msgstr "Izveidot jaunu šīs barotnes sindikācijas adresi?" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "Jūs nevarat rediģēt šāda veida barotni." @@ -3044,23 +3049,28 @@ msgstr "Vai atzīmēt visus rakstus kā lasītus?" msgid "You can't unsubscribe from the category." msgstr "Jūs nevarat atteikties no kategorijas." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Lūdzu, vispirms norādiet barotni." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "Jūs nevarat pārvērtēt šī veida barotni." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Pārvērtēt rakstus %s?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 msgid "Please enable mail plugin first." msgstr "Lūdzu, vispirmi iespējojiet e-pasta spraudni." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Lūdzu, vispirmi iespējojiet e-pasta spraudni." + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "Ir pieejama jauna versija!" @@ -3085,7 +3095,7 @@ msgstr "Atpublicēt rakstu" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Nav norādīts raksts." @@ -3134,26 +3144,36 @@ msgstr "Iezīmēt %d rakstus kā lasītus?" msgid "Open original article" msgstr "Atvērt sākotnējo rakstu" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Parādīt URL" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Dzēst etiķeti" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "Atskaņo..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "Klikšķiniet, lai apturētu" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 msgid "Please enter new score for selected articles:" msgstr "Ievadiet jauno vērtējumu izvēlētajiem rakstiem:" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 msgid "Please enter new score for this article:" msgstr "Ievadiet jaunu vērtējumu šim rakstam:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Visus rakstus" + #: plugins/digest/digest.js:71 #, fuzzy msgid "Mark %d displayed articles as read?" @@ -3183,6 +3203,10 @@ msgstr "Saglabātās barotnes" msgid "Load more..." msgstr "Ielādē..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 #, fuzzy msgid "Forward article by email" diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo Binary files differindex d994619db..70c65cf21 100644 --- a/locale/nb_NO/LC_MESSAGES/messages.mo +++ b/locale/nb_NO/LC_MESSAGES/messages.mo diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po index e0ad731d6..98b30c2ef 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: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2009-05-02 00:10+0100\n" "Last-Translator: Christian Lomsdalen <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -257,200 +257,200 @@ msgid "SQL escaping test failed, check your database and PHP configuration" msgstr "" "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine." -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "laster, vennligst vent" -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Skjul nyhetskanalsslisten" -#: index.php:167 +#: index.php:168 #, fuzzy msgid "Show articles" msgstr "Lagrede artikler" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Tilpasset" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Alle artikler" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Favoritter" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Publisert" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Ulest" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Ignorer poenggivning" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Oppdatert" -#: index.php:179 +#: index.php:180 #, fuzzy msgid "Sort articles" msgstr "Lagrede artikler" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Standard" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Dato" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Tittel" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Poeng" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Oppdater" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Marker som lest" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Handlinger..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Innstillinger" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Søk..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Nyhetsstrømshandlinger:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Abonner på nyhetsstrøm..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Rediger nyhetsstrømmen..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Sett poeng på nytt for nyhetskanalene" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Avabonner" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Alle nyhetsstrømmer:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "Skjul/vis leste nyhetsstrømmer" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Andre handlinger:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "" -#: index.php:231 +#: index.php:232 #, fuzzy msgid "Show tag cloud..." msgstr "Tag-sky" -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Tillatt endringer i kategorirekkefølgen?" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "" -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Lag merkelapp..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Lag filter..." -#: index.php:238 +#: index.php:239 #, fuzzy msgid "Keyboard shortcuts help" msgstr "Tastatursnarveier" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Logg ut" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Innstillinger" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Tastatursnarveier" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Forlat innstillinger" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Nyhetsstrømmer" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filtre" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Merkelapper" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Brukere" @@ -626,7 +626,7 @@ msgstr "Publiserte artikler" msgid "Fresh articles" msgstr "Ferske artikler" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Alle artikler" @@ -639,241 +639,246 @@ msgstr "Lagrede artikler" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Navigasjon" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "Generert nyhetsstrøm" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Vis opprinnelig artikkelinnhold" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Vis opprinnelig artikkelinnhold" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Vis søkevinduet" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Alle artikler" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Sett som favoritt" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Sett som publisert" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Sett som ulest" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Endre stikkord" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Fjerne merkede artikler fra merkelappen?" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Publiser artiklen" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Åpne artikkel i nytt nettleservindu" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 #, fuzzy msgid "Mark below as read" msgstr "Marker som lest" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 #, fuzzy msgid "Mark above as read" msgstr "Marker som lest" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Alt ferdig." -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Velg artikkelen under musepekeren" -#: include/functions.php:1897 +#: include/functions.php:1892 #, fuzzy msgid "Email article" msgstr "Alle artikler" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Fjern artikler" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Tillatt endringer i kategorirekkefølgen?" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Handlinger for aktive artikler" -#: include/functions.php:1901 +#: include/functions.php:1897 #, fuzzy msgid "Select all articles" msgstr "Fjern artikler" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Slett uleste artikler" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Sett som favorittartikkel" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Slett uleste artikler" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Handlinger for aktive artikler" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Fjern artikler" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Nyhetsstrøm" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Oppdater aktive nyhetsstrømmer" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "Skjul/vis leste nyhetsstrømmer" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Abonner på nyhetsstrøm" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Rediger nyhetsstrømmen" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Motsatt titteloversikt (eldste først)" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Alle nyhetsstrømmer er oppdatert" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Marker alle nyhetsstrømmer som lest" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Velg for å slå sammen kategorien" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Tillatt endringer i kategorirekkefølgen?" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Gå til..." -#: include/functions.php:1920 +#: include/functions.php:1916 #, fuzzy msgid "Fresh" msgstr "Oppdater" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Tag-sky" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Andre:" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Lag merkelapp" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Lag filter" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Skjul nyhetskanalsslisten" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Vis søkevinduet" -#: include/functions.php:2407 +#: include/functions.php:2406 #, fuzzy, php-format msgid "Search results: %s" msgstr "Søkeresultat" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 #, fuzzy msgid "Click to play" msgstr "Trykk for å endre" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "" @@ -885,7 +890,7 @@ msgstr "-" msgid "no tags" msgstr "Ingen stikkord" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Rediger stikkordene for denne artikkelen" @@ -923,7 +928,7 @@ msgstr "Rediger notat" msgid "unknown type" msgstr "Ukjent type" -#: include/functions.php:3665 +#: include/functions.php:3671 #, fuzzy msgid "Attachments" msgstr "Vedlegg:" @@ -962,7 +967,7 @@ msgstr "Publiser artiklen" msgid "Assign tags" msgstr "Tildel stikkord" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Tildel stikkord" @@ -1682,7 +1687,7 @@ msgstr "Marker artikkel som favoritt" msgid "Feed:" msgstr "Nyhetsstrøm:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Nyhetsstrømmen ble ikke funnet" @@ -1695,19 +1700,19 @@ msgstr "marker som lest" msgid "Collapse article" msgstr "Fjern artikler" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "Ingen uleste artikler funnet som kunne vises" -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "Ingen oppdaterte artikler funnet som kunne vises" -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "Ingen markerte artikler som kan vises" -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1715,20 +1720,20 @@ msgstr "" "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-" "menyen ovenfor) eller bruke et filter." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "Ingen artikler funnet som kan vises" -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, fuzzy, php-format msgid "Feeds last updated at %s" msgstr "Oppdateringsfeil" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Ingen valgt nyhetsstrøm" @@ -2924,7 +2929,7 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:" msgid "Generate new syndication address for this feed?" msgstr "" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "Du kan ikke endre denne typen nyhetsstrøm" @@ -3182,24 +3187,29 @@ msgstr "Marker alle artikler som leste?" msgid "You can't unsubscribe from the category." msgstr "Du kan ikke fjerne abonnement fra kategorien." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Vennligst velg en eller flere nyhetsstrømmer først" -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal" -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Endre poengene for artiklene i %s?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "Vennligst velg en eller flere nyhetsstrømmer først" -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Vennligst velg en eller flere nyhetsstrømmer først" + +#: js/tt-rss.js:864 #, fuzzy msgid "New version available!" msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!" @@ -3226,7 +3236,7 @@ msgstr "Fjern publiseringen av artikkelen." #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Ingen artikler er valgt." @@ -3281,31 +3291,41 @@ msgstr "Marker %d artikkel/artikler som leste?" msgid "Open original article" msgstr "Vis opprinnelig artikkelinnhold" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Vis stikkord" + +#: js/viewfeed.js:1898 #, fuzzy msgid "Remove label" msgstr "Fjerne merkede merkelapper?" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 #, fuzzy msgid "Playing..." msgstr "Laster nyhetsstrømmer..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 #, fuzzy msgid "Click to pause" msgstr "Trykk for å endre" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Vennligst skriv inn et notat for denne artikkelen:" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "Vennligst skriv inn et notat for denne artikkelen:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Alle artikler" + #: plugins/digest/digest.js:71 #, fuzzy msgid "Mark %d displayed articles as read?" @@ -3336,6 +3356,10 @@ msgstr "Skjul/vis leste nyhetsstrømmer" msgid "Load more..." msgstr "Laster hjelp..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 #, fuzzy msgid "Forward article by email" diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo Binary files differindex 44f490ada..832888eef 100644 --- a/locale/pl_PL/LC_MESSAGES/messages.mo +++ b/locale/pl_PL/LC_MESSAGES/messages.mo diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po index 58641c1ac..bfda9bae4 100644 --- a/locale/pl_PL/LC_MESSAGES/messages.po +++ b/locale/pl_PL/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2012-10-06 16:54+0100\n" "Last-Translator: Mirosław Lach <[email protected]>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/tt-rss/language/" @@ -266,196 +266,196 @@ msgstr "" "Test escape'owania SQL nie powiódł się. Sprawdź konfigurację swojej bazy " "danych i PHP." -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "Trwa ładowanie, proszę czekać..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Dostępna jest nowa wersja Tiny Tiny RSS!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Rozwiń listę kanałów" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "Pokaż artykuły" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Adaptacyjny" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Wszystkie artykuły" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Oznaczone gwiazdką" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Opublikowane" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Nieprzeczytane" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Ignoruj punktację" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Zaktualizowany" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "Sortuj artykuły" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Domyślne" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Data" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Tytuł" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Punktacja" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Aktualizuj" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Oznacz jako przeczytane" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Działania..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Ustawienia" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Szukaj..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Działania dla kanałów:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Prenumeruj kanał..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Edytuj ten kanał..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Przelicz punktację kanału" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Wypisz się" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Wszystkie kanały:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "Pokaż/Ukryj przeczytane kanały" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Inne działania:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "Przełącz na przegląd..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "Pokaż chmurę tagów..." -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Przełącz oznaczenie gwiazdką" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "Wybierz używając tagów..." -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Utwórz etykietę..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Utwórz filtr..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "O skrótach klawiszowych" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Wyloguj" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Ustawienia" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Skróty klawiszowe" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Wyjdź z ustawień" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Kanały" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Filtry" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Etykiety" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Użytkownicy" @@ -627,7 +627,7 @@ msgstr "Opublikowane artykuły" msgid "Fresh articles" msgstr "Świeże artykuły" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Wszystkie artykuły" @@ -639,236 +639,241 @@ msgstr "Zarchiwizowane artykuły" msgid "Recently read" msgstr "Ostatnio czytane" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Nawigacja" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "" "Przejdź do następnego kanału po zakończeniu lektury ostatniego artykułu" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Otwórz oryginalny artykuł" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Otwórz oryginalny artykuł" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Otwórz okno wyszukiwania" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Wszystkie artykuły" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Przełącz oznaczenie gwiazdką" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Przełącz flagę publikacji" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Przełącz flagę \"przeczytano\"" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Edytuj tagi" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Odwołaj wybrane artykuły" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Odwołaj przeczytane artykuły" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Otwórz artykuł w nowym oknie" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "Oznacz poniższe jako przeczytane" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "Oznacz powyższe jako przeczytane" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Zrobione." -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Wybierz artykuł pod kursorem myszy" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "Prześlij artykuł emailem" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Zamknij artykuł" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Przełącz flagę publikacji" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Odwróć zaznaczenie artykułów" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "Wybierz wszystkie artykuły" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Wybierz nieprzeczytane artykuły" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Oznacz gwiazdką" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Wybierz nieprzeczytane artykuły" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Odwróć zaznaczenie artykułów" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Odznacz wszystkie artykuły" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Kanał" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Odśwież aktywny kanał" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "Pokaż/Ukryj przeczytane kanały" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Prenumeruj kanał" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Edytuj kanał" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Odwróć kolejność nagłówków" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Wyłącz aktualizacje" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Oznacz wszystkie kanały jako przeczytane" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Umieść w kategorii:" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Przełącz flagę publikacji" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Idź do..." -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Chmura tagów" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Inne kanały" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Utwórz etykietę" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Utwórz filtr" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Rozwiń pasek boczny" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Otwórz okno wyszukiwania" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "Wyniki wyszukiwania: %s" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "Wciśnij aby odtworzyć" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Odtwórz" @@ -880,7 +885,7 @@ msgstr " - " msgid "no tags" msgstr "brak tagów" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Edytuj tagi dla tego artykułu" @@ -915,7 +920,7 @@ msgstr "(edytuj notatkę)" msgid "unknown type" msgstr "nieznany typ" -#: include/functions.php:3665 +#: include/functions.php:3671 msgid "Attachments" msgstr "Załączniki" @@ -952,7 +957,7 @@ msgstr "Opublikuj" msgid "Assign tags" msgstr "Przypisz tagi" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Przypisz etykietę" @@ -1648,7 +1653,7 @@ msgstr "Przekaż za pomocą emaila" msgid "Feed:" msgstr "Kanał:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Kanał nie został odnaleziony." @@ -1661,19 +1666,19 @@ msgstr "oznacz jako przeczytane" msgid "Collapse article" msgstr "Zamknij artykuł" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "Nie znaleziono nieprzeczytanych artykułów." -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "Nie znaleziono uaktualnionych artykułów." -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "Nie znaleziono artykułów oznaczonych gwiazdką." -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1681,22 +1686,22 @@ msgstr "" "Nie znaleziono artykułów. Możesz ręcznie przypisać artykuły do etykiet " "(zobacz menu Akcje powyżej) lub wykorzystać do tego celu filtry." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "Nie znaleziono artykułów." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "Kanały ostatnio uaktualnione o %s" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" "Wystąpiły błędy aktualizacji niektórych kanałów (kliknij aby zobaczyć " "szczegóły)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Nie wybrano kanału." @@ -2854,7 +2859,7 @@ msgstr "Wprowadź tytuł kategorii:" msgid "Generate new syndication address for this feed?" msgstr "Wygenerowań nowy adres do dzielenia się tym kanałem?" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "Nie możesz edytować kanału tego typu." @@ -3107,24 +3112,29 @@ msgstr "Oznaczyć wszystkie artykuły jako przeczytane?" msgid "You can't unsubscribe from the category." msgstr "Nie możesz zrezygnować z prenumeraty tej kategorii." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Wybierz najpierw jakiś kanał." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "Nie możesz przeliczyć punktacji kanału tego rodzaju." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Przeliczyć punktację artykułów w %s?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "Wybierz najpierw jakiś kanał." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Wybierz najpierw jakiś kanał." + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "Dostępna jest nowa wersja!" @@ -3150,7 +3160,7 @@ msgstr "Anuluj publikacje artykułu" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Nie wybrano żadnych artykułów" @@ -3199,28 +3209,38 @@ msgstr "Oznaczyć %d artykuły(ów) jako przeczytane?" msgid "Open original article" msgstr "Otwórz oryginalny artykuł" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Wyświetl adres" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Usuń etykietę" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "Odtwarzam..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "Kliknij aby zapauzować" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Usunąć %d zaznaczonych artykułów?" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "Wprowadź tytuł kategorii:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Wszystkie artykuły" + #: plugins/digest/digest.js:71 msgid "Mark %d displayed articles as read?" msgstr "Oznaczyć %d wyświetlonych artykułów jako przeczytane?" @@ -3245,6 +3265,10 @@ msgstr "Brak nieprzeczytanych kanałów." msgid "Load more..." msgstr "Wczytaj więcej..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 msgid "Forward article by email" msgstr "Prześlij artykuł emailem" diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo Binary files differindex cee5787f3..4d1d147eb 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.mo +++ b/locale/pt_BR/LC_MESSAGES/messages.mo diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 02f875c50..fbc5dfb22 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: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2007-10-24 00:47-0200\n" "Last-Translator: Marcelo Jorge VIeira (metal) <[email protected]>\n" "Language-Team: Portuguese/Brazil\n" @@ -244,210 +244,210 @@ msgstr "" msgid "SQL escaping test failed, check your database and PHP configuration" msgstr "" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "" -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "" -#: index.php:164 +#: index.php:165 #, fuzzy msgid "Collapse feedlist" msgstr "Todos os feeds" -#: index.php:167 +#: index.php:168 #, fuzzy msgid "Show articles" msgstr "Favoritos" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Favoritos" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Publicado" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Não Lido" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Atualizado" -#: index.php:179 +#: index.php:180 #, fuzzy msgid "Sort articles" msgstr "Favoritos" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "Padrão" -#: index.php:183 +#: index.php:184 #, fuzzy msgid "Date" msgstr "Atualizar" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Título" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Atualizar" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Marcar como lido" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Ações..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Preferências" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "" -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Ações do Feed:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 #, fuzzy msgid "Subscribe to feed..." msgstr "Removendo o Feed..." -#: index.php:221 +#: index.php:222 #, fuzzy msgid "Edit this feed..." msgstr "Editar" -#: index.php:222 +#: index.php:223 #, fuzzy msgid "Rescore feed" msgstr "Removendo o Feed..." -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Todos os Feeds:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Outras ações:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "" -#: index.php:231 +#: index.php:232 #, fuzzy msgid "Show tag cloud..." msgstr "núvem de tags" -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Remover as categorias selecionadas?" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "" -#: index.php:236 +#: index.php:237 #, fuzzy msgid "Create label..." msgstr "Criar um usuário" -#: index.php:237 +#: index.php:238 #, fuzzy msgid "Create filter..." msgstr "Criar um usuário" -#: index.php:238 +#: index.php:239 #, fuzzy msgid "Keyboard shortcuts help" msgstr " Criar filtro" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Sair" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Preferências" -#: prefs.php:93 +#: prefs.php:94 #, fuzzy msgid "Keyboard shortcuts" msgstr " Criar filtro" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Sair das preferências" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 #, fuzzy msgid "Feeds" msgstr "Feed" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 #, fuzzy msgid "Filters" msgstr "Arquivo:" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "" -#: prefs.php:115 +#: prefs.php:116 #, fuzzy msgid "Users" msgstr "Usuário" @@ -621,7 +621,7 @@ msgstr "" msgid "Fresh articles" msgstr "" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 #, fuzzy msgid "All articles" msgstr "Favoritos" @@ -635,243 +635,248 @@ msgstr "Favoritos" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 #, fuzzy msgid "Navigation" msgstr "Salvar configuração" -#: include/functions.php:1877 +#: include/functions.php:1872 msgid "Open next feed" msgstr "" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Favoritos" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Favoritos" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 #, fuzzy msgid "Show search dialog" msgstr "Favoritos" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Feed não encontrado." -#: include/functions.php:1885 +#: include/functions.php:1880 #, fuzzy msgid "Toggle starred" msgstr "Marcar como favorito" -#: include/functions.php:1886 +#: include/functions.php:1881 #, fuzzy msgid "Toggle published" msgstr "Publicado" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "" -#: include/functions.php:1888 +#: include/functions.php:1883 #, fuzzy msgid "Edit tags" msgstr "Editar Tags" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Remover os filtros selecionados?" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Favoritos" -#: include/functions.php:1891 +#: include/functions.php:1886 msgid "Open in new window" msgstr "" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 #, fuzzy msgid "Mark below as read" msgstr "Marcar como lido" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 #, fuzzy msgid "Mark above as read" msgstr "Marcar como lido" -#: include/functions.php:1894 +#: include/functions.php:1889 msgid "Scroll down" msgstr "" -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Favoritos" -#: include/functions.php:1897 +#: include/functions.php:1892 #, fuzzy msgid "Email article" msgstr "Favoritos" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Favoritos" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Remover as categorias selecionadas?" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Favoritos" -#: include/functions.php:1901 +#: include/functions.php:1897 #, fuzzy msgid "Select all articles" msgstr "Favoritos" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Favoritos" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Marcar como favorito" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Favoritos" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Favoritos" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Favoritos" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Feed" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Favoritos" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "Favoritos" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 #, fuzzy msgid "Edit feed" msgstr "Editar" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Remover as categorias selecionadas?" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Desabilitar updates" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 #, fuzzy msgid "Mark all feeds as read" msgstr "Marcando todos os feeds como lidos..." -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Salvando categoria..." -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Remover as categorias selecionadas?" -#: include/functions.php:1918 +#: include/functions.php:1914 msgid "Go to" msgstr "" -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Núvem de tags" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Onde:" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Todos os feeds" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Favoritos" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 #, fuzzy msgid "Click to play" msgstr "Favoritos" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "" @@ -884,7 +889,7 @@ msgstr " - por " msgid "no tags" msgstr "sem tags" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 #, fuzzy msgid "Edit tags for this article" msgstr "Favoritos" @@ -923,7 +928,7 @@ msgstr "" msgid "unknown type" msgstr "Erro desconhecido" -#: include/functions.php:3665 +#: include/functions.php:3671 #, fuzzy msgid "Attachments" msgstr "Conteúdo" @@ -964,7 +969,7 @@ msgstr "" msgid "Assign tags" msgstr "sem tags" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "" @@ -1658,7 +1663,7 @@ msgstr "Favoritos" msgid "Feed:" msgstr "Feed:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Feed não encontrado." @@ -1672,42 +1677,42 @@ msgstr "Marcar como lido" msgid "Collapse article" msgstr "Favoritos" -#: classes/feeds.php:697 +#: classes/feeds.php:696 #, fuzzy msgid "No unread articles found to display." msgstr "Sem Feeds para exibir." -#: classes/feeds.php:700 +#: classes/feeds.php:699 #, fuzzy msgid "No updated articles found to display." msgstr "Sem Feeds para exibir." -#: classes/feeds.php:703 +#: classes/feeds.php:702 #, fuzzy msgid "No starred articles found to display." msgstr "Sem Feeds para exibir." -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." msgstr "" -#: classes/feeds.php:709 +#: classes/feeds.php:708 #, fuzzy msgid "No articles found to display." msgstr "Sem Feeds para exibir." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, fuzzy, php-format msgid "Feeds last updated at %s" msgstr "Atualizar" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "Alguns feeds estão com erros (clique aqui para detalhes)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Nenhum feed foi selecionado." @@ -2912,7 +2917,7 @@ msgstr "Salvando categoria..." msgid "Generate new syndication address for this feed?" msgstr "" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "" @@ -3180,26 +3185,31 @@ msgstr "Marcando todos os feeds como lidos..." msgid "You can't unsubscribe from the category." msgstr "" -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 #, fuzzy msgid "Please select some feed first." msgstr "Por favor selecione somente um feed" -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "" -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 #, fuzzy msgid "Rescore articles in %s?" msgstr "Favoritos" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "Por favor selecione somente um feed" -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Por favor selecione somente um feed" + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "" @@ -3228,7 +3238,7 @@ msgstr "Publicado" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 #, fuzzy msgid "No articles are selected." @@ -3289,31 +3299,41 @@ msgstr "Marcando todos os feeds como lidos..." msgid "Open original article" msgstr "Favoritos" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "Favoritos" + +#: js/viewfeed.js:1898 #, fuzzy msgid "Remove label" msgstr "Remover" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 #, fuzzy msgid "Playing..." msgstr "Salvando o Feed..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 #, fuzzy msgid "Click to pause" msgstr "Favoritos" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Remover os filtros selecionados?" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "Salvando categoria..." +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Feed não encontrado." + #: plugins/digest/digest.js:71 #, fuzzy msgid "Mark %d displayed articles as read?" @@ -3344,6 +3364,10 @@ msgstr "Favoritos" msgid "Load more..." msgstr "Salvando o Feed..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 #, fuzzy msgid "Forward article by email" diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo Binary files differindex 5ee378f22..b4b92a52a 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.mo +++ b/locale/ru_RU/LC_MESSAGES/messages.mo diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 8ef20729c..5932e7222 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: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2009-05-29 14:38+0300\n" "Last-Translator: Max Kamashev <[email protected]>\n" "Language-Team: Русский <[email protected]>\n" @@ -259,196 +259,196 @@ msgstr "" "неудавшийся тест экранирования SQL, проверьте вашу базу данных и " "конфигурацию PHP" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "Идет загрузка..." -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Доступная новая версия Tiny Tiny RSS!" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "Свернуть список каналов" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "Показать статьи" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "Адаптивно" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "Все статьи" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "Отмеченные" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "Опубликован" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "Новые" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "Игнорировать Оценки" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "Обновлено" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "Сортировать статьи" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "По умолчанию" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "Дата" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "Заголовок" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "Оценка" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "Обновить" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "Как прочитанные" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "Действия..." -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "Настройки" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "Поиск..." -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "Действия над каналами:" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "Подписаться на канал..." -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "Редактировать канал..." -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "Заново оценить канал" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "Отписаться" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "Все каналы:" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "Показать/скрыть прочитанные" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "Другие действия:" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "Перейти в дайджест..." -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "Показать облако тегов..." -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "Переключить изменение режима категории" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "Выбрать по тегам..." -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "Создать метку..." -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "Создать фильтр..." -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "Горячие клавиши" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "Выход" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "Настройки" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "Горячие Клавиши" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "Закрыть настройки" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "Каналы" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "Фильтры" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "Метки" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "Пользователи" @@ -623,7 +623,7 @@ msgstr "Опубликованные" msgid "Fresh articles" msgstr "Свежие" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "Все статьи" @@ -635,236 +635,241 @@ msgstr "Архив статей" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "Навигация" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "Генерировать канал" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "Показать оригинальное содержимое статьи" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "Показать оригинальное содержимое статьи" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "Показать диалог поиска" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "Все статьи" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "Изм. отмеченное" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "Отметить / снять отметку" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "Прочитано / не прочитано" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "Редактировать теги" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "Скрыть выбранные статьи" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "Опубликовать" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "Открыть статью в новом окне" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "Отметить статьи ниже как прочитанные" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "Отметить статьи выше как прочитанные" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "Всё выполнено." -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "Выбрать статью под курсором мыши" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "Отправить по почте" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "Закрыть статью" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "Переключить изменение режима категории" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "Инвертировать выделение" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "Выбрать все статьи" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "Выбрать непрочитанные статьи" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "Отметить" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "Выбрать непрочитанные статьи" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "Инвертировать выделение" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "Очистить выделение статей" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "Канал" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "Обновить активный канал" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "Показать/скрыть прочитанные" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "Подписаться на канал" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "Редактировать канал" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "Обратный порядок заголовков" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "Все каналы обновлены." -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "Отметить все каналы как прочитанные" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "Щёлкните, чтобы развернуть категорию" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "Переключить изменение режима категории" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "Перейти к.." -#: include/functions.php:1920 +#: include/functions.php:1916 #, fuzzy msgid "Fresh" msgstr "Обновить" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "Облако тегов" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "Другой:" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "Создать метку" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "Создать фильтр" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "Развернуть боковую панель" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "Показать диалог поиска" -#: include/functions.php:2407 +#: include/functions.php:2406 #, fuzzy, php-format msgid "Search results: %s" msgstr "Результаты поиска" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "Щёлкните для проигрывания" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "Играть" @@ -876,7 +881,7 @@ msgstr " - " msgid "no tags" msgstr "нет тегов" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "Редактировать теги статьи" @@ -913,7 +918,7 @@ msgstr "править заметку" msgid "unknown type" msgstr "неизвестный тип" -#: include/functions.php:3665 +#: include/functions.php:3671 #, fuzzy msgid "Attachments" msgstr "Вложения:" @@ -951,7 +956,7 @@ msgstr "Опубликовать" msgid "Assign tags" msgstr "Применить теги" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "Применить метку" @@ -1645,7 +1650,7 @@ msgstr "Отправить по почте" msgid "Feed:" msgstr "Канал:" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "Канал не найден." @@ -1658,19 +1663,19 @@ msgstr "Отметить как прочитанные" msgid "Collapse article" msgstr "Закрыть статью" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "Не найдено не прочитанных статей" -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "Не найдено не прочитанных статей." -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "Не найдено отмеченных статей" -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1678,20 +1683,20 @@ msgstr "" "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню " "Действия) или используйте фильтр." -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "Статей не найдено." -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "Последнее обновление в %s" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "Канал не выбран." @@ -2853,7 +2858,7 @@ msgstr "Пожалуйста, укажите заметку для статьи: msgid "Generate new syndication address for this feed?" msgstr "" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "Вы не можете редактировать этот канал." @@ -3105,24 +3110,29 @@ msgstr "Пометить все статьи как прочитанные?" msgid "You can't unsubscribe from the category." msgstr "Нельзя отписаться от категории." -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "Пожалуйста выберите какой-нибудь канал." -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "Вы не можете снова оценить этот канал." -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "Установить оценку статьям в %s?" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "Пожалуйста выберите какой-нибудь канал." -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "Пожалуйста выберите какой-нибудь канал." + +#: js/tt-rss.js:864 #, fuzzy msgid "New version available!" msgstr "Доступная новая версия Tiny Tiny RSS!" @@ -3149,7 +3159,7 @@ msgstr "Не публиковать" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "Нет выбранных статей." @@ -3199,28 +3209,38 @@ msgstr "Отметить %d статью(ей) как прочитанные?" msgid "Open original article" msgstr "Показать оригинальное содержимое статьи" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "показать теги" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "Удалить метку" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "Проигрываю..." -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "Пауза" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "Пожалуйста, укажите заметку для статьи:" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "Пожалуйста, укажите заметку для статьи:" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "Все статьи" + #: plugins/digest/digest.js:71 #, fuzzy msgid "Mark %d displayed articles as read?" @@ -3251,6 +3271,10 @@ msgstr " Показать/скрыть прочитанные" msgid "Load more..." msgstr "Идет загрузка помощи..." +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 #, fuzzy msgid "Forward article by email" diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo Binary files differindex 36456b4ad..378d1a6d1 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.mo +++ b/locale/zh_CN/LC_MESSAGES/messages.mo diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 7c69074bd..22fee0557 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiny Tiny RSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: 2012-02-14 08:32+0000\n" "Last-Translator: Sai <[email protected]>\n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/" @@ -247,196 +247,196 @@ msgstr "" msgid "SQL escaping test failed, check your database and PHP configuration" msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "读取中，请稍候……" -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "Tiny Tiny RSS 有新版本啦！" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "收缩侧边栏" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "显示文章" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "自动适应" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "全部文章" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "加星标的" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "已发布" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "未读" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "忽略评分" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "有更新的" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "排序文章" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "默认" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "日期" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "标题" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "评分" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "更新列表" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "标记为已读" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "动作" -#: index.php:217 +#: index.php:218 #, fuzzy msgid "Preferences..." msgstr "偏好设置" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "搜索" -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "信息源操作：" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "订阅信息源" -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "编辑信息源" -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "为信息源重新评分" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "取消订阅" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "全部信息源：" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "隐藏（显示）已读信息" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "其他操作：" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "切换至摘要模式" -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "显示标签云" -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 #, fuzzy msgid "Toggle widescreen mode" msgstr "锁定加星标的项" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "通过自定义标签选择" -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "创建预定义标签" -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "创建过滤器" -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "快捷键帮助" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "注销" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "偏好设置" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "快捷键" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "退出偏好设置" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "信息源" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "过滤器" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "预定义标签" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "用户" @@ -604,7 +604,7 @@ msgstr "已发布文章" msgid "Fresh articles" msgstr "最新更新的文章" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "全部文章" @@ -616,235 +616,240 @@ msgstr "存档的文章" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "导航" -#: include/functions.php:1877 +#: include/functions.php:1872 #, fuzzy msgid "Open next feed" msgstr "自动显示下一个信息源" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 #, fuzzy msgid "Open next article" msgstr "打开原文" -#: include/functions.php:1880 +#: include/functions.php:1875 #, fuzzy msgid "Open previous article" msgstr "打开原文" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "显示搜索对话框" -#: include/functions.php:1884 +#: include/functions.php:1879 #, fuzzy msgid "Article" msgstr "全部文章" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "锁定加星标的项" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "锁定发布的项" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "锁定未读项" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "编辑自定义标签" -#: include/functions.php:1889 +#: include/functions.php:1884 #, fuzzy msgid "Dismiss selected" msgstr "不再显示所选的文章" -#: include/functions.php:1890 +#: include/functions.php:1885 #, fuzzy msgid "Dismiss read" msgstr "不再显示已读文章" -#: include/functions.php:1891 +#: include/functions.php:1886 #, fuzzy msgid "Open in new window" msgstr "在新窗口打开文章" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "" -#: include/functions.php:1894 +#: include/functions.php:1889 #, fuzzy msgid "Scroll down" msgstr "全部完成。" -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 #, fuzzy msgid "Select article under cursor" msgstr "选择鼠标指向的文章" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "通过邮件发送文章" -#: include/functions.php:1898 +#: include/functions.php:1893 #, fuzzy msgid "Close/collapse article" msgstr "选择所有文章" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +#, fuzzy +msgid "Toggle embed original" +msgstr "锁定发布的项" + +#: include/functions.php:1896 #, fuzzy msgid "Article selection" msgstr "反选文章" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "选择所有文章" -#: include/functions.php:1902 +#: include/functions.php:1898 #, fuzzy msgid "Select unread" msgstr "选择未读文章" -#: include/functions.php:1903 +#: include/functions.php:1899 #, fuzzy msgid "Select starred" msgstr "加星标" -#: include/functions.php:1904 +#: include/functions.php:1900 #, fuzzy msgid "Select published" msgstr "选择未读文章" -#: include/functions.php:1905 +#: include/functions.php:1901 #, fuzzy msgid "Invert selection" msgstr "反选文章" -#: include/functions.php:1906 +#: include/functions.php:1902 #, fuzzy msgid "Deselect everything" msgstr "取消选择所有文章" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "信息源" -#: include/functions.php:1908 +#: include/functions.php:1904 #, fuzzy msgid "Refresh current feed" msgstr "刷新活动的信息源" -#: include/functions.php:1909 +#: include/functions.php:1905 #, fuzzy msgid "Un/hide read feeds" msgstr "隐藏（显示）已读信息" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "订阅信息源" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "编辑信息源" -#: include/functions.php:1913 +#: include/functions.php:1909 #, fuzzy msgid "Reverse headlines" msgstr "反向排序" -#: include/functions.php:1914 +#: include/functions.php:1910 #, fuzzy msgid "Debug feed update" msgstr "禁用更新" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "标记所有信息源为已读" -#: include/functions.php:1916 +#: include/functions.php:1912 #, fuzzy msgid "Un/collapse current category" msgstr "加入到类别：" -#: include/functions.php:1917 +#: include/functions.php:1913 #, fuzzy msgid "Toggle combined mode" msgstr "锁定发布的项" -#: include/functions.php:1918 +#: include/functions.php:1914 #, fuzzy msgid "Go to" msgstr "跳转至……" -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "标签云" -#: include/functions.php:1925 +#: include/functions.php:1921 #, fuzzy msgid "Other" msgstr "其他信息源" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "创建预定义标签" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "创建过滤器" -#: include/functions.php:1928 +#: include/functions.php:1924 #, fuzzy msgid "Un/collapse sidebar" msgstr "折叠侧边栏" -#: include/functions.php:1929 +#: include/functions.php:1925 #, fuzzy msgid "Show help dialog" msgstr "显示搜索对话框" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "点击播放" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "播放" @@ -856,7 +861,7 @@ msgstr " - " msgid "no tags" msgstr "无标签" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "为本文编辑自定义标签" @@ -891,7 +896,7 @@ msgstr "（编辑注记）" msgid "unknown type" msgstr "未知类型" -#: include/functions.php:3665 +#: include/functions.php:3671 #, fuzzy msgid "Attachments" msgstr "附件：" @@ -929,7 +934,7 @@ msgstr "发布文章" msgid "Assign tags" msgstr "添加自定义标签" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "添加预定义标签" @@ -1598,7 +1603,7 @@ msgstr "通过邮件转发" msgid "Feed:" msgstr "信息源：" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "找不到信息源。" @@ -1611,19 +1616,19 @@ msgstr "标记为已读" msgid "Collapse article" msgstr "全部文章" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "没有未读文章。" -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "没有最新更新的文章。" -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "没有加星标的文章。" -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." @@ -1631,20 +1636,20 @@ msgstr "" "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方" "动作菜单）。" -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "暂时没有文章。" -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "上次信息源更新时间：%s" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "部分信息源更新错误（点击了解详情）" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "没有选中的信息源。" @@ -2784,7 +2789,7 @@ msgstr "请填写类别名称：" msgid "Generate new syndication address for this feed?" msgstr "为本信息源生成新的群地址？" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "您无法编辑这种类型的信息源。" @@ -3026,24 +3031,29 @@ msgstr "将所有文章标记为已读？" msgid "You can't unsubscribe from the category." msgstr "您不能取消订阅一个类别。" -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "请先选几个信息源吧。" -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "无法重置本类信息源的评分。" -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "重置 %s 中文章的评分？" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 #, fuzzy msgid "Please enable mail plugin first." msgstr "请先选几个信息源吧。" -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +#, fuzzy +msgid "Please enable embed_original plugin first." +msgstr "请先选几个信息源吧。" + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "有可用的新版本啦！" @@ -3069,7 +3079,7 @@ msgstr "取消发布文章" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "没有选中任何文章。" @@ -3118,28 +3128,38 @@ msgstr "将 %d 篇文章标记为已读？" msgid "Open original article" msgstr "打开原文" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +#, fuzzy +msgid "Display article URL" +msgstr "显示 URL" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "移除预定义标签" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "播放中……" -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "点击暂停" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 #, fuzzy msgid "Please enter new score for selected articles:" msgstr "删除选中的 %d 篇文章？" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 #, fuzzy msgid "Please enter new score for this article:" msgstr "请填写类别名称：" +#: js/viewfeed.js:2055 +#, fuzzy +msgid "Article URL:" +msgstr "全部文章" + #: plugins/digest/digest.js:71 msgid "Mark %d displayed articles as read?" msgstr "将显示的 %d 篇文章标记为已读？" @@ -3164,6 +3184,10 @@ msgstr "没有未读的信息源。" msgid "Load more..." msgstr "加载更多……" +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 msgid "Forward article by email" msgstr "用邮件转发文章" diff --git a/messages.pot b/messages.pot index 65a69cdea..1f8595a6e 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-21 15:10+0400\n" +"POT-Creation-Date: 2013-03-21 23:29+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -240,194 +240,194 @@ msgstr "" msgid "SQL escaping test failed, check your database and PHP configuration" msgstr "" -#: index.php:120 index.php:150 index.php:256 prefs.php:82 +#: index.php:121 index.php:151 index.php:257 prefs.php:83 #: classes/backend.php:5 classes/pref/labels.php:296 #: classes/pref/filters.php:609 classes/pref/feeds.php:1296 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205 msgid "Loading, please wait..." msgstr "" -#: index.php:130 index.php:202 +#: index.php:131 index.php:203 msgid "Communication problem with server." msgstr "" -#: index.php:136 index.php:210 +#: index.php:137 index.php:211 msgid "New version of Tiny Tiny RSS is available!" msgstr "" -#: index.php:164 +#: index.php:165 msgid "Collapse feedlist" msgstr "" -#: index.php:167 +#: index.php:168 msgid "Show articles" msgstr "" -#: index.php:170 +#: index.php:171 msgid "Adaptive" msgstr "" -#: index.php:171 +#: index.php:172 msgid "All Articles" msgstr "" -#: index.php:172 include/functions.php:1921 classes/feeds.php:106 +#: index.php:173 include/functions.php:1917 classes/feeds.php:106 msgid "Starred" msgstr "" -#: index.php:173 include/functions.php:1922 classes/feeds.php:107 +#: index.php:174 include/functions.php:1918 classes/feeds.php:107 msgid "Published" msgstr "" -#: index.php:174 classes/feeds.php:93 classes/feeds.php:105 +#: index.php:175 classes/feeds.php:93 classes/feeds.php:105 msgid "Unread" msgstr "" -#: index.php:175 +#: index.php:176 msgid "Ignore Scoring" msgstr "" -#: index.php:176 +#: index.php:177 msgid "Updated" msgstr "" -#: index.php:179 +#: index.php:180 msgid "Sort articles" msgstr "" -#: index.php:182 +#: index.php:183 msgid "Default" msgstr "" -#: index.php:183 +#: index.php:184 msgid "Date" msgstr "" -#: index.php:184 include/localized_schema.php:3 +#: index.php:185 include/localized_schema.php:3 msgid "Title" msgstr "" -#: index.php:185 +#: index.php:186 msgid "Score" msgstr "" -#: index.php:191 classes/pref/feeds.php:535 classes/pref/feeds.php:758 +#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758 msgid "Update" msgstr "" -#: index.php:195 index.php:225 include/functions.php:1912 +#: index.php:196 index.php:226 include/functions.php:1908 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156 #: plugins/digest/digest.js:630 msgid "Mark as read" msgstr "" -#: index.php:215 +#: index.php:216 msgid "Actions..." msgstr "" -#: index.php:217 +#: index.php:218 msgid "Preferences..." msgstr "" -#: index.php:218 +#: index.php:219 msgid "Search..." msgstr "" -#: index.php:219 +#: index.php:220 msgid "Feed actions:" msgstr "" -#: index.php:220 classes/handler/public.php:540 +#: index.php:221 classes/handler/public.php:540 msgid "Subscribe to feed..." msgstr "" -#: index.php:221 +#: index.php:222 msgid "Edit this feed..." msgstr "" -#: index.php:222 +#: index.php:223 msgid "Rescore feed" msgstr "" -#: index.php:223 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 +#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269 #: js/PrefFeedTree.js:73 msgid "Unsubscribe" msgstr "" -#: index.php:224 +#: index.php:225 msgid "All feeds:" msgstr "" -#: index.php:226 +#: index.php:227 msgid "(Un)hide read feeds" msgstr "" -#: index.php:227 +#: index.php:228 msgid "Other actions:" msgstr "" -#: index.php:229 +#: index.php:230 msgid "Switch to digest..." msgstr "" -#: index.php:231 +#: index.php:232 msgid "Show tag cloud..." msgstr "" -#: index.php:233 include/functions.php:1899 +#: index.php:234 include/functions.php:1894 msgid "Toggle widescreen mode" msgstr "" -#: index.php:235 +#: index.php:236 msgid "Select by tags..." msgstr "" -#: index.php:236 +#: index.php:237 msgid "Create label..." msgstr "" -#: index.php:237 +#: index.php:238 msgid "Create filter..." msgstr "" -#: index.php:238 +#: index.php:239 msgid "Keyboard shortcuts help" msgstr "" -#: index.php:240 mobile/mobile-functions.php:69 +#: index.php:241 mobile/mobile-functions.php:69 #: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63 msgid "Logout" msgstr "" -#: prefs.php:26 prefs.php:102 include/functions.php:1924 +#: prefs.php:26 prefs.php:103 include/functions.php:1920 #: classes/pref/prefs.php:377 msgid "Preferences" msgstr "" -#: prefs.php:93 +#: prefs.php:94 msgid "Keyboard shortcuts" msgstr "" -#: prefs.php:94 +#: prefs.php:95 msgid "Exit preferences" msgstr "" -#: prefs.php:105 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 +#: prefs.php:106 classes/pref/feeds.php:100 classes/pref/feeds.php:1174 #: classes/pref/feeds.php:1237 msgid "Feeds" msgstr "" -#: prefs.php:108 classes/pref/filters.php:117 +#: prefs.php:109 classes/pref/filters.php:117 msgid "Filters" msgstr "" -#: prefs.php:111 mobile/mobile-functions.php:205 include/functions.php:1127 +#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127 #: include/functions.php:1748 classes/pref/labels.php:90 msgid "Labels" msgstr "" -#: prefs.php:115 +#: prefs.php:116 msgid "Users" msgstr "" @@ -594,7 +594,7 @@ msgstr "" msgid "Fresh articles" msgstr "" -#: include/functions.php:1805 include/functions.php:1919 +#: include/functions.php:1805 include/functions.php:1915 msgid "All articles" msgstr "" @@ -606,209 +606,213 @@ msgstr "" msgid "Recently read" msgstr "" -#: include/functions.php:1876 +#: include/functions.php:1871 msgid "Navigation" msgstr "" -#: include/functions.php:1877 +#: include/functions.php:1872 msgid "Open next feed" msgstr "" -#: include/functions.php:1878 +#: include/functions.php:1873 msgid "Open previous feed" msgstr "" -#: include/functions.php:1879 +#: include/functions.php:1874 msgid "Open next article" msgstr "" -#: include/functions.php:1880 +#: include/functions.php:1875 msgid "Open previous article" msgstr "" -#: include/functions.php:1881 +#: include/functions.php:1876 msgid "Open next article (don't scroll long articles)" msgstr "" -#: include/functions.php:1882 +#: include/functions.php:1877 msgid "Open previous article (don't scroll long articles)" msgstr "" -#: include/functions.php:1883 +#: include/functions.php:1878 msgid "Show search dialog" msgstr "" -#: include/functions.php:1884 +#: include/functions.php:1879 msgid "Article" msgstr "" -#: include/functions.php:1885 +#: include/functions.php:1880 msgid "Toggle starred" msgstr "" -#: include/functions.php:1886 +#: include/functions.php:1881 msgid "Toggle published" msgstr "" -#: include/functions.php:1887 +#: include/functions.php:1882 msgid "Toggle unread" msgstr "" -#: include/functions.php:1888 +#: include/functions.php:1883 msgid "Edit tags" msgstr "" -#: include/functions.php:1889 +#: include/functions.php:1884 msgid "Dismiss selected" msgstr "" -#: include/functions.php:1890 +#: include/functions.php:1885 msgid "Dismiss read" msgstr "" -#: include/functions.php:1891 +#: include/functions.php:1886 msgid "Open in new window" msgstr "" -#: include/functions.php:1892 js/viewfeed.js:1836 +#: include/functions.php:1887 js/viewfeed.js:1842 msgid "Mark below as read" msgstr "" -#: include/functions.php:1893 js/viewfeed.js:1830 +#: include/functions.php:1888 js/viewfeed.js:1836 msgid "Mark above as read" msgstr "" -#: include/functions.php:1894 +#: include/functions.php:1889 msgid "Scroll down" msgstr "" -#: include/functions.php:1895 +#: include/functions.php:1890 msgid "Scroll up" msgstr "" -#: include/functions.php:1896 +#: include/functions.php:1891 msgid "Select article under cursor" msgstr "" -#: include/functions.php:1897 +#: include/functions.php:1892 msgid "Email article" msgstr "" -#: include/functions.php:1898 +#: include/functions.php:1893 msgid "Close/collapse article" msgstr "" -#: include/functions.php:1900 +#: include/functions.php:1895 plugins/embed_original/init.php:33 +msgid "Toggle embed original" +msgstr "" + +#: include/functions.php:1896 msgid "Article selection" msgstr "" -#: include/functions.php:1901 +#: include/functions.php:1897 msgid "Select all articles" msgstr "" -#: include/functions.php:1902 +#: include/functions.php:1898 msgid "Select unread" msgstr "" -#: include/functions.php:1903 +#: include/functions.php:1899 msgid "Select starred" msgstr "" -#: include/functions.php:1904 +#: include/functions.php:1900 msgid "Select published" msgstr "" -#: include/functions.php:1905 +#: include/functions.php:1901 msgid "Invert selection" msgstr "" -#: include/functions.php:1906 +#: include/functions.php:1902 msgid "Deselect everything" msgstr "" -#: include/functions.php:1907 classes/pref/feeds.php:488 +#: include/functions.php:1903 classes/pref/feeds.php:488 #: classes/pref/feeds.php:719 msgid "Feed" msgstr "" -#: include/functions.php:1908 +#: include/functions.php:1904 msgid "Refresh current feed" msgstr "" -#: include/functions.php:1909 +#: include/functions.php:1905 msgid "Un/hide read feeds" msgstr "" -#: include/functions.php:1910 classes/pref/feeds.php:1240 +#: include/functions.php:1906 classes/pref/feeds.php:1240 msgid "Subscribe to feed" msgstr "" -#: include/functions.php:1911 js/FeedTree.js:135 js/PrefFeedTree.js:67 +#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67 msgid "Edit feed" msgstr "" -#: include/functions.php:1913 +#: include/functions.php:1909 msgid "Reverse headlines" msgstr "" -#: include/functions.php:1914 +#: include/functions.php:1910 msgid "Debug feed update" msgstr "" -#: include/functions.php:1915 js/FeedTree.js:178 +#: include/functions.php:1911 js/FeedTree.js:178 msgid "Mark all feeds as read" msgstr "" -#: include/functions.php:1916 +#: include/functions.php:1912 msgid "Un/collapse current category" msgstr "" -#: include/functions.php:1917 +#: include/functions.php:1913 msgid "Toggle combined mode" msgstr "" -#: include/functions.php:1918 +#: include/functions.php:1914 msgid "Go to" msgstr "" -#: include/functions.php:1920 +#: include/functions.php:1916 msgid "Fresh" msgstr "" -#: include/functions.php:1923 +#: include/functions.php:1919 msgid "Tag cloud" msgstr "" -#: include/functions.php:1925 +#: include/functions.php:1921 msgid "Other" msgstr "" -#: include/functions.php:1926 classes/pref/labels.php:281 +#: include/functions.php:1922 classes/pref/labels.php:281 msgid "Create label" msgstr "" -#: include/functions.php:1927 classes/pref/filters.php:587 +#: include/functions.php:1923 classes/pref/filters.php:587 msgid "Create filter" msgstr "" -#: include/functions.php:1928 +#: include/functions.php:1924 msgid "Un/collapse sidebar" msgstr "" -#: include/functions.php:1929 +#: include/functions.php:1925 msgid "Show help dialog" msgstr "" -#: include/functions.php:2407 +#: include/functions.php:2406 #, php-format msgid "Search results: %s" msgstr "" -#: include/functions.php:2896 js/viewfeed.js:1923 +#: include/functions.php:2895 js/viewfeed.js:1929 msgid "Click to play" msgstr "" -#: include/functions.php:2897 js/viewfeed.js:1922 +#: include/functions.php:2896 js/viewfeed.js:1928 msgid "Play" msgstr "" @@ -820,7 +824,7 @@ msgstr "" msgid "no tags" msgstr "" -#: include/functions.php:3050 classes/feeds.php:651 +#: include/functions.php:3050 classes/feeds.php:650 msgid "Edit tags for this article" msgstr "" @@ -855,7 +859,7 @@ msgstr "" msgid "unknown type" msgstr "" -#: include/functions.php:3665 +#: include/functions.php:3671 msgid "Attachments" msgstr "" @@ -892,7 +896,7 @@ msgstr "" msgid "Assign tags" msgstr "" -#: include/localized_schema.php:14 js/viewfeed.js:1887 +#: include/localized_schema.php:14 js/viewfeed.js:1893 msgid "Assign label" msgstr "" @@ -1540,7 +1544,7 @@ msgstr "" msgid "Feed:" msgstr "" -#: classes/feeds.php:201 classes/feeds.php:796 +#: classes/feeds.php:201 classes/feeds.php:795 msgid "Feed not found." msgstr "" @@ -1552,38 +1556,38 @@ msgstr "" msgid "Collapse article" msgstr "" -#: classes/feeds.php:697 +#: classes/feeds.php:696 msgid "No unread articles found to display." msgstr "" -#: classes/feeds.php:700 +#: classes/feeds.php:699 msgid "No updated articles found to display." msgstr "" -#: classes/feeds.php:703 +#: classes/feeds.php:702 msgid "No starred articles found to display." msgstr "" -#: classes/feeds.php:707 +#: classes/feeds.php:706 msgid "" "No articles found to display. You can assign articles to labels manually " "(see the Actions menu above) or use a filter." msgstr "" -#: classes/feeds.php:709 +#: classes/feeds.php:708 msgid "No articles found to display." msgstr "" -#: classes/feeds.php:724 classes/feeds.php:905 +#: classes/feeds.php:723 classes/feeds.php:904 #, php-format msgid "Feeds last updated at %s" msgstr "" -#: classes/feeds.php:734 classes/feeds.php:915 +#: classes/feeds.php:733 classes/feeds.php:914 msgid "Some feeds have update errors (click for details)" msgstr "" -#: classes/feeds.php:895 +#: classes/feeds.php:894 msgid "No feed selected." msgstr "" @@ -2669,7 +2673,7 @@ msgstr "" msgid "Generate new syndication address for this feed?" msgstr "" -#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729 +#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735 msgid "You can't edit this kind of feed." msgstr "" @@ -2906,23 +2910,27 @@ msgstr "" msgid "You can't unsubscribe from the category." msgstr "" -#: js/tt-rss.js:363 js/tt-rss.js:513 +#: js/tt-rss.js:363 js/tt-rss.js:519 msgid "Please select some feed first." msgstr "" -#: js/tt-rss.js:508 +#: js/tt-rss.js:514 msgid "You can't rescore this kind of feed." msgstr "" -#: js/tt-rss.js:518 +#: js/tt-rss.js:524 msgid "Rescore articles in %s?" msgstr "" -#: js/tt-rss.js:688 +#: js/tt-rss.js:694 msgid "Please enable mail plugin first." msgstr "" -#: js/tt-rss.js:850 +#: js/tt-rss.js:800 +msgid "Please enable embed_original plugin first." +msgstr "" + +#: js/tt-rss.js:864 msgid "New version available!" msgstr "" @@ -2947,7 +2955,7 @@ msgstr "" #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017 -#: js/viewfeed.js:1067 js/viewfeed.js:2005 plugins/mailto/init.js:7 +#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7 #: plugins/mail/mail.js:7 msgid "No articles are selected." msgstr "" @@ -2996,26 +3004,34 @@ msgstr "" msgid "Open original article" msgstr "" -#: js/viewfeed.js:1892 +#: js/viewfeed.js:1828 +msgid "Display article URL" +msgstr "" + +#: js/viewfeed.js:1898 msgid "Remove label" msgstr "" -#: js/viewfeed.js:1916 +#: js/viewfeed.js:1922 msgid "Playing..." msgstr "" -#: js/viewfeed.js:1917 +#: js/viewfeed.js:1923 msgid "Click to pause" msgstr "" -#: js/viewfeed.js:1974 +#: js/viewfeed.js:1980 msgid "Please enter new score for selected articles:" msgstr "" -#: js/viewfeed.js:2016 +#: js/viewfeed.js:2022 msgid "Please enter new score for this article:" msgstr "" +#: js/viewfeed.js:2055 +msgid "Article URL:" +msgstr "" + #: plugins/digest/digest.js:71 msgid "Mark %d displayed articles as read?" msgstr "" @@ -3040,6 +3056,10 @@ msgstr "" msgid "Load more..." msgstr "" +#: plugins/embed_original/init.js:6 +msgid "Sorry, your browser does not support sandboxed iframes." +msgstr "" + #: plugins/mailto/init.js:21 plugins/mail/mail.js:21 msgid "Forward article by email" msgstr "" diff --git a/mobile/article.php b/mobile/article.php deleted file mode 100644 index 345767fbd..000000000 --- a/mobile/article.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php - error_reporting(E_ERROR | E_WARNING | E_PARSE); - - header('Content-Type: text/html; charset=utf-8'); - - define('MOBILE_VERSION', true); - - require_once "../config.php"; - require_once "mobile-functions.php"; - - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - - init_connection($link); - - login_sequence($link, true); - - $id = db_escape_string($_REQUEST["id"]); - $feed_id = db_escape_string($_REQUEST["feed"]); - $cat_id = db_escape_string($_REQUEST["cat"]); - $is_cat = db_escape_string($_REQUEST["is_cat"]); - - render_article($link, $id, $feed_id, $cat_id, $is_cat); -?> - diff --git a/mobile/backend.php b/mobile/backend.php deleted file mode 100644 index 98e30bd13..000000000 --- a/mobile/backend.php +++ /dev/null @@ -1,55 +0,0 @@ -<?php - error_reporting(E_ERROR | E_WARNING | E_PARSE); - - header('Content-Type: text/html; charset=utf-8'); - - define('MOBILE_VERSION', true); - - require_once "../config.php"; - require_once "mobile-functions.php"; - - require_once "functions.php"; - require_once "sessions.php"; - require_once "version.php"; - require_once "db-prefs.php"; - - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - - init_connection($link); - - login_sequence($link, true); - - $op = $_REQUEST["op"]; - - switch ($op) { - case "toggleMarked": - $cmode = db_escape_string($_REQUEST["mark"]); - $id = db_escape_string($_REQUEST["id"]); - - markArticlesById($link, array($id), $cmode); - break; - case "togglePublished": - $cmode = db_escape_string($_REQUEST["pub"]); - $id = db_escape_string($_REQUEST["id"]); - - publishArticlesById($link, array($id), $cmode); - break; - case "toggleUnread": - $cmode = db_escape_string($_REQUEST["unread"]); - $id = db_escape_string($_REQUEST["id"]); - - catchupArticlesById($link, array($id), $cmode); - break; - - case "setPref": - $id = db_escape_string($_REQUEST["id"]); - $value = db_escape_string($_REQUEST["to"]); - mobile_set_pref($link, $id, $value); - print_r($_SESSION); - break; - default: - print json_encode(array("error", "UNKNOWN_METHOD")); - break; - } -?> - diff --git a/mobile/cat.php b/mobile/cat.php deleted file mode 100644 index 74d488e1f..000000000 --- a/mobile/cat.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - error_reporting(E_ERROR | E_WARNING | E_PARSE); - - header('Content-Type: text/html; charset=utf-8'); - - define('MOBILE_VERSION', true); - - require_once "../config.php"; - require_once "mobile-functions.php"; - - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - - init_connection($link); - - login_sequence($link, true); - - $cat_id = db_escape_string($_REQUEST["id"]); - - render_category($link, $cat_id); -?> - diff --git a/mobile/feed.php b/mobile/feed.php deleted file mode 100644 index f7b7443d3..000000000 --- a/mobile/feed.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php - error_reporting(E_ERROR | E_WARNING | E_PARSE); - - header('Content-Type: text/html; charset=utf-8'); - - define('MOBILE_VERSION', true); - - require_once "../config.php"; - require_once "mobile-functions.php"; - - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - - init_connection($link); - - login_sequence($link, true); - - $feed_id = db_escape_string($_REQUEST["id"]); - $cat_id = db_escape_string($_REQUEST["cat"]); - $offset = (int) db_escape_string($_REQUEST["skip"]); - $search = db_escape_string($_REQUEST["search"]); - $is_cat = (bool) db_escape_string($_REQUEST["is_cat"]); - - render_headlines_list($link, $feed_id, $cat_id, $offset, $search, $is_cat); -?> - diff --git a/mobile/home.php b/mobile/home.php deleted file mode 100644 index 71194da0a..000000000 --- a/mobile/home.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php - error_reporting(E_ERROR | E_WARNING | E_PARSE); - - header('Content-Type: text/html; charset=utf-8'); - - define('MOBILE_VERSION', true); - - require_once "../config.php"; - require_once "mobile-functions.php"; - - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - - init_connection($link); - - login_sequence($link, true); - - $use_cats = mobile_get_pref($link, 'ENABLE_CATS'); - $offset = (int) db_escape_string($_REQUEST["skip"]); - - if ($use_cats) { - render_categories_list($link); - } else { - render_flat_feed_list($link, $offset); - } -?> diff --git a/mobile/image.php b/mobile/image.php deleted file mode 100644 index 765fcc240..000000000 --- a/mobile/image.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php - set_include_path(dirname(__FILE__) . PATH_SEPARATOR . - dirname(dirname(__FILE__)) . PATH_SEPARATOR . - dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR . - get_include_path()); - - require_once "config.php"; - - chdir('..'); - - $filename = CACHE_DIR . '/images/' . sha1($_GET['url']) . '.png'; - - if (file_exists($filename)) { - header("Content-type: image/png"); - echo file_get_contents($filename); - } else { - header("Location: " . $_GET['url']); - } -?> diff --git a/mobile/index.php b/mobile/index.php deleted file mode 100644 index edbf586e0..000000000 --- a/mobile/index.php +++ /dev/null @@ -1,82 +0,0 @@ -<?php - error_reporting(E_ERROR | E_WARNING | E_PARSE); - - header('Content-Type: text/html; charset=utf-8'); - - define('MOBILE_VERSION', true); - - require_once "../config.php"; - require_once "mobile-functions.php"; - - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - - init_connection($link); - - login_sequence($link, true); -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<title>Tiny Tiny RSS</title> -<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> -<link rel="apple-touch-icon" href="../lib/iui/iui-logo-touch-icon.png" /> -<meta name="apple-touch-fullscreen" content="YES" /> -<style type="text/css" media="screen">@import "../lib/iui/iui.css";</style> -<script type="application/x-javascript" src="../lib/iui/iui.js"></script> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<script type="text/javascript" src="../lib/prototype.js"></script> -<script type="text/javascript" src="mobile.js"></script> -<style type="text/css" media="screen">@import "mobile.css";</style> -</head> - -<style type="text/css"> - img { max-width : 75%; } - - li.oldItem { - color : gray; - } - - #myBackButton { - display: none; - left: 6px; - right: auto; - padding: 0; - max-width: 55px; - border-width: 0 8px 0 14px; - -webkit-border-image: url(../lib/iui/backButton.png) 0 8 0 14; - } - - img.tinyIcon { - max-width : 16px; - max-height : 16px; - margin-right : 10px; - vertical-align : middle; - } - - a img { - border-width : 0px; - } -</style> - -<body> - <div class="toolbar"> - <h1 id="pageTitle"></h1> - <a id="myBackButton" class="button" href="#"></a> - <a class="button" href="prefs.php">Preferences</a> - </div> - - <?php - $use_cats = mobile_get_pref($link, 'ENABLE_CATS'); - $offset = (int) db_escape_string($_REQUEST["skip"]); - - if ($use_cats) { - render_categories_list($link); - } else { - render_flat_feed_list($link, $offset); - } - ?> - -</body> -</html> diff --git a/mobile/login_form.php b/mobile/login_form.php deleted file mode 100644 index 98c0bfdbc..000000000 --- a/mobile/login_form.php +++ /dev/null @@ -1,58 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<title>Tiny Tiny RSS</title> -<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> -<link rel="apple-touch-icon" href="../lib/iui/iui-logo-touch-icon.png" /> -<meta name="apple-touch-fullscreen" content="YES" /> -<style type="text/css" media="screen">@import "../lib/iui/iui.css";</style> -<script type="application/x-javascript" src="../lib/iui/iui.js"></script> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -</head> - - -<script type="text/javascript"> -function do_login() { - var f = document.forms['login']; - f.submit(); -} -</script> - -<body> - - <div class="toolbar"> - <h1 id="pageTitle"></h1> - <a id="backButton" class="button" href="#"></a> - <a class="button blueButton" onclick='do_login()'><?php echo __('Log in') ?></a> - </div> - - <form target="_self" title="Login" id="login" class="panel" name="login" selected="true" - action="../public.php?return=<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]) ?>" - method="post"> - - <input type="hidden" name="op" value="login"> - - <fieldset> - - <div class="row"> - <label><?php echo __("Login:") ?></label> - <input type="text" autocapitalize="off" name="login"> - </div> - - <div class="row"> - <label><?php echo __("Password:") ?></label> - <input type="password" name="password"> - </div> - - </fieldset> - - <div align='center'><a target='_self' href='<?php echo get_self_url_prefix() ?>/index.php?mobile=false'> - <?php echo __("Open regular version") ?></a> - - </form> - -</body> -</html> - diff --git a/mobile/logout.php b/mobile/logout.php deleted file mode 100644 index 46d7ec8ee..000000000 --- a/mobile/logout.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php - require_once "mobile-functions.php"; - - logout_user(); - - header("Location: index.php"); -?> diff --git a/mobile/mobile-functions.php b/mobile/mobile-functions.php deleted file mode 100644 index 39b89fa9c..000000000 --- a/mobile/mobile-functions.php +++ /dev/null @@ -1,546 +0,0 @@ -<?php - set_include_path(dirname(__FILE__) . PATH_SEPARATOR . - dirname(dirname(__FILE__)) . PATH_SEPARATOR . - dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR . - get_include_path()); - - require_once "functions.php"; - require_once "sessions.php"; - require_once "version.php"; - require_once "db-prefs.php"; - - define('TTRSS_SESSION_NAME', 'ttrss_m_sid'); - - /* TODO replace with interface to db-prefs */ - - function mobile_pref_toggled($link, $id) { - if (get_pref($link, "_MOBILE_$id")) - return "true"; - else - return ""; - } - - function mobile_get_pref($link, $id) { - //return $_SESSION["mobile-prefs"][$id]; - return get_pref($link, "_MOBILE_$id"); - } - - function mobile_set_pref($link, $id, $value) { - //$_SESSION["mobile-prefs"][$id] = $value; - return set_pref($link, "_MOBILE_$id", $value); - } - - function mobile_feed_has_icon($id) { - $filename = "../".ICONS_DIR."/$id.ico"; - - return file_exists($filename) && filesize($filename) > 0; - } - - function render_flat_feed_list($link, $offset) { - $owner_uid = $_SESSION["uid"]; - $limit = 0; - - if (!$offset) $offset = 0; - - if (mobile_get_pref($link, "SORT_FEEDS_UNREAD")) { - $order_by = "unread DESC, title"; - } else { - $order_by = "title"; - } - - if ($limit > 0) { - $limit_qpart = "LIMIT $limit OFFSET $offset"; - } else { - $limit_qpart = ""; - } - - $result = db_query($link, "SELECT id, - title, - (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries - WHERE feed_id = ttrss_feeds.id AND unread = true - AND ttrss_user_entries.ref_id = ttrss_entries.id - AND owner_uid = '$owner_uid') AS unread - FROM ttrss_feeds - WHERE - ttrss_feeds.owner_uid = '$owner_uid' - ORDER BY $order_by $limit_qpart"); - - if (!$offset) print '<ul id="home" title="'.__('Home').'" selected="true" - myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">'; - - - // print "<li><a href='#cat-actions'>".__('Actions...')."</a></li>"; - - $num_feeds = 0; - - while ($line = db_fetch_assoc($result)) { - $id = $line["id"]; - $unread = $line["unread"]; - - // $unread = rand(0, 100); - - if ($unread > 0) { - $line["title"] = $line["title"] . " ($unread)"; - $class = ''; - } else { - $class = 'oldItem'; - } - - if (mobile_feed_has_icon($id)) { - $icon_url = "../".ICONS_URL."/$id.ico"; - } else { - $icon_url = "../images/blank_icon.gif"; - } - - if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) { - print "<li class='$class'><a href='feed.php?id=$id'>" . - "<img class='tinyIcon' src='$icon_url'/>". - $line["title"] . "</a></li>"; - } - - ++$num_feeds; - } - -/* $next_offset = $offset + $num_feeds; - - print "<li><a href=\"home.php?skip=$next_offset\" - target=\"_replace\">Show more feeds...</a></li>"; */ - - if (!$offset) print "</ul>"; - - } - - function render_category($link, $cat_id, $offset) { - $owner_uid = $_SESSION["uid"]; - - if ($cat_id >= 0) { - - if ($cat_id != 0) { - $cat_query = "cat_id = '$cat_id'"; - } else { - $cat_query = "cat_id IS NULL"; - } - - if (mobile_get_pref($link, "SORT_FEEDS_UNREAD")) { - $order_by = "unread DESC, title"; - } else { - $order_by = "title"; - } - - $result = db_query($link, "SELECT id, - title, - (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries - WHERE feed_id = ttrss_feeds.id AND unread = true - AND ttrss_user_entries.ref_id = ttrss_entries.id - AND owner_uid = '$owner_uid') as unread - FROM ttrss_feeds - WHERE - ttrss_feeds.owner_uid = '$owner_uid' AND - $cat_query - ORDER BY $order_by"); - - $title = getCategoryTitle($link, $cat_id); - - print "<ul id='cat-$cat_id' title='$title' myBackLabel='".__("Home")."' - myBackHref='home.php'>"; - - // print "<li><a href='#cat-actions'>".__('Actions...')."</a></li>"; - - while ($line = db_fetch_assoc($result)) { - $id = $line["id"]; - $unread = $line["unread"]; - - // $unread = rand(0, 100); - - if ($unread > 0) { - $line["title"] = $line["title"] . " ($unread)"; - $class = ''; - } else { - $class = 'oldItem'; - } - - if (mobile_feed_has_icon($id)) { - $icon_url = "../".ICONS_URL."/$id.ico"; - } else { - $icon_url = "../images/blank_icon.gif"; - } - - if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) { - print "<li class='$class'><a href='feed.php?id=$id&cat=$cat_id'>" . - "<img class='tinyIcon' src='$icon_url'/>". - $line["title"] . "</a></li>"; - } - } - - print "</ul>"; - } else if ($cat_id == -1) { - - $title = __('Special'); - - print "<ul id='cat--1' title='$title' myBackLabel='".__("Home")."' - myBackHref='home.php'>"; - - foreach (array(-4, -3, -1, -2, 0) as $id) { - $title = getFeedTitle($link, $id); - $unread = getFeedUnread($link, $id, false); - $icon = getFeedIcon($id); - - if ($unread > 0) { - $title = $title . " ($unread)"; - $class = ''; - } else { - $class = 'oldItem'; - } - - if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) { - print "<li class='$class'> - <a href='feed.php?id=$id&cat=-1'> - <img class='tinyIcon' src='../$icon'/>$title</a></li>"; - } - } - - print "</ul>"; - } else if ($cat_id == -2) { - - $title = __('Labels'); - - print "<ul id='cat--2' title='$title' myBackLabel='".__("Home")."' - myBackHref='home.php'>"; - - $result = db_query($link, "SELECT id, caption FROM ttrss_labels2 - WHERE owner_uid = '$owner_uid'"); - - $label_data = array(); - - while ($line = db_fetch_assoc($result)) { - - $id = -$line["id"] - 11; - - $unread = getFeedUnread($link, $id); - $title = $line["caption"]; - - if ($unread > 0) { - $title = $title . " ($unread)"; - $class = ''; - } else { - $class = 'oldItem'; - } - - if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) { - print "<li class='$class'> - <a href='feed.php?id=$id&cat=-2'>$title</a></li>"; - } - } - print "</ul>"; - } - } - - function render_categories_list($link) { - $owner_uid = $_SESSION["uid"]; - - $cat_browse = mobile_get_pref($link, "BROWSE_CATS"); - - print '<ul id="home" title="'.__('Home').'" selected="true" - myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">'; - -// print "<li><a href='#searchForm'>Search...</a></li>"; - - foreach (array(-1, -2) as $id) { - $title = getCategoryTitle($link, $id); - $unread = getFeedUnread($link, $id, true); - if ($unread > 0) { - $title = $title . " ($unread)"; - $class = ''; - } else { - $class = 'oldItem'; - } - - if ($cat_browse) - print "<li class='$class'><a href='cat.php?id=$id'>$title</a></li>"; - else - print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>$title</a></li>"; - } - - $result = db_query($link, "SELECT - ttrss_feed_categories.id, - ttrss_feed_categories.title, - COUNT(ttrss_feeds.id) AS num_feeds - FROM ttrss_feed_categories, ttrss_feeds - WHERE ttrss_feed_categories.owner_uid = $owner_uid - AND ttrss_feed_categories.id = cat_id - GROUP BY ttrss_feed_categories.id, - ttrss_feed_categories.title - ORDER BY ttrss_feed_categories.title"); - - while ($line = db_fetch_assoc($result)) { - - if ($line["num_feeds"] > 0) { - - $unread = getFeedUnread($link, $line["id"], true); - $id = $line["id"]; - - if ($unread > 0) { - $line["title"] = $line["title"] . " ($unread)"; - $class = ''; - } else { - $class = 'oldItem'; - } - - if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) { - - if ($cat_browse) - print "<li class='$class'><a href='cat.php?id=$id'>" . - $line["title"] . "</a></li>"; - else - print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>". - $line["title"] . "</a></li>"; - } - } - } - - - $result = db_query($link, "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE - cat_id IS NULL and owner_uid = '$owner_uid'"); - - $num_feeds = db_fetch_result($result, 0, "nf"); - - if ($num_feeds > 0) { - $unread = getFeedUnread($link, 0, true); - $title = "Uncategorized"; - - if ($unread > 0) { - $title = "$title ($unread)"; - $class = ''; - } else { - $class = 'oldItem'; - } - - if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) { - if ($cat_browse) - print "<li class='$class'><a href='cat.php?id=0'>$title</a></li>"; - else - print "<li class='$class'><a href='feed.php?id=0&is_cat=true'>$title</a></li>"; - - } - } - - print "</ul>"; - } - - function render_headlines_list($link, $feed_id, $cat_id, $offset, $search, - $is_cat = false) { - - $feed_id = $feed_id; - $limit = 15; - $filter = ''; - - if (!mobile_get_pref($link, "HIDE_READ")) - $view_mode = "all_articles"; - else - $view_mode = 'adaptive'; - - if ($search) { - $search_mode = 'this_feed'; - } else { - $search_mode = ''; - } - - $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, - $view_mode, $is_cat, $search, $search_mode, - "score DESC, date_entered ".(mobile_get_pref($link, 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset); - - $result = $qfh_ret[0]; - $feed_title = $qfh_ret[1]; - - if (!$offset) { - - print "<form id=\"searchForm-$feed_id-$cat_id\" class=\"dialog\" method=\"POST\" - action=\"feed.php\"> - - <input type=\"hidden\" name=\"id\" value=\"$feed_id\"> - <input type=\"hidden\" name=\"cat\" value=\"$cat_id\"> - - <fieldset> - <h1>Search</h1> - <a class=\"button leftButton\" type=\"cancel\">Cancel</a> - <a class=\"button blueButton\" type=\"submit\">Search</a> - - <label>Search:</label> - <input id=\"search\" type=\"text\" name=\"search\"/> - </fieldset> - </form>"; - - if ($cat_id) { - $cat_title = getCategoryTitle($link, $cat_id); - - print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\" - myBackLabel='$cat_title' myBackHref='cat.php?id=$cat_id'>"; - } else { - print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\" - myBackLabel='".__("Home")."' myBackHref='home.php'>"; - } - - print "<li><a href='#searchForm-$feed_id-$cat_id'>Search...</a></li>"; - } - - $num_headlines = 0; - - while ($line = db_fetch_assoc($result)) { - $id = $line["id"]; - $real_feed_id = $line["feed_id"]; - - if (sql_bool_to_bool($line["unread"])) { - $class = ''; - } else { - $class = 'oldItem'; - } - - if (mobile_feed_has_icon($real_feed_id)) { - $icon_url = "../".ICONS_URL."/$real_feed_id.ico"; - } else { - $icon_url = "../images/blank_icon.gif"; - } - - print "<li class='$class'><a href='article.php?id=$id&feed=$feed_id&cat=$cat_id&is_cat=$is_cat'> - <img class='tinyIcon' src='$icon_url'>"; - print $line["title"]; - print "</a></li>"; - - ++$num_headlines; - - } - - if ($num_headlines == 0 && $search) { - $articles_url = "feed.php?id=$feed_id&cat=$cat_id&skip=$next_offset"; - - print "<li><a href=\"$articles_url\">" . __("Nothing found (click to reload feed).") . "</a></li>"; - - } - -// print "<a target='_replace' href='feed.php?id=$feed_id&cat=$cat_id&skip=0'>Next $limit articles...</a>"; - - $next_offset = $offset + $num_headlines; - $num_unread = getFeedUnread($link, $feed_id, $is_cat); - - /* FIXME needs normal implementation */ - - if ($num_headlines > 0 && ($num_unread == 0 || $num_unread > $next_offset)) { - - if ($is_cat) { - $articles_url = "feed.php?id=$feed_id&skip=$next_offset". - "&search=$search&is_cat=true"; - } else { - $articles_url = "feed.php?id=$feed_id&cat=$cat_id&skip=$next_offset". - "&search=$search"; - } - - print "<li><a href=\"$articles_url\" - target=\"_replace\">Get more articles...</a></li>"; - } - - if (!$offset) print "</ul>"; - - } - - function render_article($link, $id, $feed_id, $cat_id, $is_cat) { - - $query = "SELECT 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 = '$id' AND ref_id = id AND owner_uid = " . - $_SESSION["uid"] ; - - $result = db_query($link, $query); - - if (db_num_rows($result) != 0) { - - $line = db_fetch_assoc($result); - - $tmp_result = db_query($link, "UPDATE ttrss_user_entries - SET unread = false,last_read = NOW() - WHERE ref_id = '$id' - AND owner_uid = " . $_SESSION["uid"]); - - $updated_fmt = make_local_datetime($link, $line['updated'], false); - - $title = $line["title"]; - $article_link = $line["link"]; - - if (!$is_cat) - $feed_title = getFeedTitle($link, $feed_id); - else - $feed_title = getCategoryTitle($link, $feed_id); - - print "<div class=\"panel\" id=\"article-$id\" title=\"$title\" - selected=\"true\" - myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>"; - - if ($line['feed_id'] != $feed_id) { - $real_feed_title = getFeedTitle($link, $line['feed_id']); - $real_feed_id = $line['feed_id']; - $feed_link = "(<a href=\"feed.php?id=$real_feed_id\">$real_feed_title</a>)"; - } -// print "<fieldset>"; - - print "<div style='float : right'>($updated_fmt)</div>"; - - print "<h2><a target='_blank' href='$article_link'>$title</a> $feed_link</h2>"; - - print "<hr>"; - -/* print "<div class=\"row\">"; - print "<label id='title'><a target='_blank' href='$article_link'>$title</a></label>"; - print "</div>"; */ - - $is_starred = (sql_bool_to_bool($line["marked"])) ? "true" : "false"; - $is_published = (sql_bool_to_bool($line["published"])) ? "true" : "false"; - - //print "<div class=\"row\">"; - //print "<label id='updated'>Updated:</label>"; - //print "<input type='text' enabled='false' name='updated' disabled value='$updated_fmt'/>"; - //print "</div>"; - -// print "</fieldset>"; - - $content = sanitize($link, $line["content"]); - $content = preg_replace("/href=/i", "target=\"_blank\" href=", $content); - - if (!mobile_get_pref($link, "SHOW_IMAGES")) { - $content = preg_replace('/<img[^>]+>/is', '', $content); - } - - print "<p>$content</p>"; - - print "<div class='nav'> - <label>Navigation</label> - <div class='button left' onclick='goPrev($id, $feed_id, this)'>Prev</div> - <div class='button right' onclick='goNext($id, $feed_id, this)'>Next</div> - </div>"; - - print "<fieldset>"; - - print "<div class=\"row\"> - <label>Starred</label> - <div class=\"toggle\" onclick=\"toggleMarked($id, this)\" toggled=\"$is_starred\"><span class=\"thumb\"></span><span class=\"toggleOn\">ON</span><span class=\"toggleOff\">OFF</span></div> - </div>"; - - print "<div class=\"row\"> - <label>Published</label> - <div class=\"toggle\" onclick=\"togglePublished($id, this)\" toggled=\"$is_published\"><span class=\"thumb\"></span><span class=\"toggleOn\">ON</span><span class=\"toggleOff\">OFF</span></div> - </div>"; - - print "<div class=\"row\"> - <label>Unread</label> - <div class=\"toggle\" onclick=\"toggleUnread($id, this)\" toggled=\"$is_unread\"><span class=\"thumb\"></span><span class=\"toggleOn\">ON</span><span class=\"toggleOff\">OFF</span></div> - </div>"; - - - print "</fieldset>"; - - print "</div>"; - - } - } -?> diff --git a/mobile/mobile.css b/mobile/mobile.css deleted file mode 100644 index 8068e3d38..000000000 --- a/mobile/mobile.css +++ /dev/null @@ -1,38 +0,0 @@ -div.nav { - height: 40px; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - background-color: #ffffff; - border: 1px solid #999999; - text-align: center; - margin-bottom: 1em; -} -div.nav label { - line-height: 40px; - color: black; - font-weight: bold; -} -div.nav .button { - position: static; - margin: 5px 10px; - -webkit-border-image: url(../lib/iui/whiteButton.png) 0 12 0 12; - text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0; - color: black; - cursor: pointer; /* On a touch screen ? */ -} -div.nav .button.left { - float: left; -} -div.nav .button.right { - float: right; -} - -ul li a.read { - color: #666666; -} - -ul li span.browse { - color : #909090; - text-align : right; - float : right; -} diff --git a/mobile/mobile.js b/mobile/mobile.js deleted file mode 100644 index 3fed3a1d7..000000000 --- a/mobile/mobile.js +++ /dev/null @@ -1,163 +0,0 @@ -var backend = "backend.php"; - -function toggleMarked(id, elem) { - - var toggled = false; - - if (elem.getAttribute("toggled") == "true") { - toggled = 1; - } else { - toggled = 0; - } - - var query = "op=toggleMarked&id=" + id + "&mark=" + toggled; - - new Ajax.Request(backend, { - parameters: query, - onComplete: function (transport) { - // - } }); -} - -function togglePublished(id, elem) { - - var toggled = false; - - if (elem.getAttribute("toggled") == "true") { - toggled = 1; - } else { - toggled = 0; - } - - var query = "op=togglePublished&id=" + id + "&pub=" + toggled; - - new Ajax.Request(backend, { - parameters: query, - onComplete: function (transport) { - // - } }); - -} - -function toggleUnread(id, elem) { - - var toggled = false; - - if (elem.getAttribute("toggled") == "true") { - toggled = 1; - } else { - toggled = 0; - } - - var query = "op=toggleUnread&id=" + id + "&unread=" + toggled; - - new Ajax.Request(backend, { - parameters: query, - onComplete: function (transport) { - // - } }); - -} - -function setPref(elem) { - var toggled = false; - var id = elem.id; - - if (elem.getAttribute("toggled") == "true") { - toggled = 1; - } else { - toggled = 0; - } - - var query = "op=setPref&id=" + id + "&to=" + toggled; - - new Ajax.Request(backend, { - parameters: query, - onComplete: function (transport) { - // - } }); - -} - -// Go directly to another item in the same feed -function goToSibling(article_id, feed_id, link, step) { - var links = linksInFeed(feed_id); - for (var i=0 ; i<links.length ; i++) { - var re = new RegExp(".*article\\.php\\?id="+article_id+"&.*"); - if (!re.test(links[i].href)) continue; - // here, we've found the current article - var index = i + step; - if (index < 0) { - markAsRead(feed_id); - iui.showPage($("feed-"+feed_id), true); - return false; - } - if (index >= links.length) { - showRestOfFeed(feed_id); - return false; - } - console.log(links[index]); - var match = links[index].href.match(/.*article\.php\?(.*)/); - var qs = match[1]; - var backwards = false; - if (step < 0) backwards = true; - link.setAttribute("selected", "progress"); - function unselect() { link.removeAttribute("selected"); } - iui.showPageByHref("article.php?"+qs, null, null, null, unselect, backwards); - return false; - } - return false; -} -function goPrev(article_id, feed_id, link) { - return goToSibling(article_id, feed_id, link, -1); -} -function goNext(article_id, feed_id, link) { - return goToSibling(article_id, feed_id, link, 1); -} - -// Get all the links in the feed. The all_links variable includes the "get more article" link -function linksInFeed(feed_id, all_links) { - var feed_content = $("feed-"+feed_id); - var links_raw = feed_content.getElementsByTagName("a"); - if (all_links) return links_raw; - var links = []; - // filter the array to remove the "get more articles" link - // and the "search" link (which is always first) - for (var i=1 ; i<links_raw.length ; i++) { - if (links_raw[i].href.match(/.*article\.php\?id=.*/)) { - links.push(links_raw[i]); - } - } - return links; -} - -// Adds the "read" class to all read links in the feed -function markAsRead(feed_id) { - var links = linksInFeed(feed_id); - for (var j=0 ; j<links.length ; j++) { - var match = links[j].href.match(/.*article\.php\?id=(\d+)&.*/); - if ($("article-"+match[1])) { - links[j].className = "read"; - } - } -} - -// Go the the articles list and expand the "get more articles" link -function showRestOfFeed(feed_id) { - var links_raw = linksInFeed(feed_id, true); - var lastlink = links_raw[links_raw.length - 1]; - if (lastlink.target == "_replace") { - // It's a "get more articles" link - iui.showPage($("feed-"+feed_id), true); - // Mark old items a "read" - markAsRead(feed_id); - // Simulate click on the "get more articles" link - lastlink.setAttribute("selected", "progress"); - function unselect() { lastlink.removeAttribute("selected"); } - setTimeout(window.scrollTo, 0, 0, 1000); - iui.showPageByHref(lastlink.href, null, null, lastlink, unselect); - } else { - iui.showPage($("home"), true); - } -} - diff --git a/mobile/prefs.php b/mobile/prefs.php deleted file mode 100644 index 6b053dc3b..000000000 --- a/mobile/prefs.php +++ /dev/null @@ -1,54 +0,0 @@ -<?php - error_reporting(E_ERROR | E_WARNING | E_PARSE); - - header('Content-Type: text/html; charset=utf-8'); - - define('MOBILE_VERSION', true); - - require_once "../config.php"; - require_once "mobile-functions.php"; - - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - - init_connection($link); - - login_sequence($link, true); -?> - -<div class="panel" id="prefs" selected="yes" title="Preferences" - myBackLabel="<?php echo __('Home') ?>" myBackHref="home.php"> - -<fieldset> - -<div class="row"> - <label><?php echo __('Enable categories') ?></label> - <div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> -</div> - -<div class="row"> - <label><?php echo __('Browse categories like folders') ?></label> - <div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> -</div> - - -<div class="row"> - <label><?php echo __('Show images in posts') ?></label> - <div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> -</div> - -<div class="row"> - <label><?php echo __('Hide read articles and feeds') ?></label> - <div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> -</div> - -<div class="row"> - <label><?php echo __('Sort feeds by unread count') ?></label> - <div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> -</div> - -<div class="row"> - <label><?php echo __('Reverse headline order (oldest first)') ?></label> - <div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> -</div> - -</fieldset> @@ -16,7 +16,7 @@ $op = $_REQUEST['op']; if ($op == "publish"){ - $key = db_escape_string($_REQUEST["key"]); + $key = db_escape_string($link, $_REQUEST["key"]); $result = db_query($link, "SELECT owner_uid FROM ttrss_access_keys WHERE diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php index cf6c13780..e910e52aa 100644 --- a/plugins/auth_internal/init.php +++ b/plugins/auth_internal/init.php @@ -22,8 +22,8 @@ class Auth_Internal extends Plugin implements IAuthModule { $pwd_hash1 = encrypt_password($password); $pwd_hash2 = encrypt_password($password, $login); - $login = db_escape_string($login); - $otp = db_escape_string($_REQUEST["otp"]); + $login = db_escape_string($this->link, $login); + $otp = db_escape_string($this->link, $_REQUEST["otp"]); if (get_schema_version($this->link) > 96) { if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) { @@ -140,7 +140,7 @@ class Auth_Internal extends Plugin implements IAuthModule { } function check_password($owner_uid, $password) { - $owner_uid = db_escape_string($owner_uid); + $owner_uid = db_escape_string($this->link, $owner_uid); $result = db_query($this->link, "SELECT salt,login FROM ttrss_users WHERE id = '$owner_uid'"); @@ -169,7 +169,7 @@ class Auth_Internal extends Plugin implements IAuthModule { } function change_password($owner_uid, $old_password, $new_password) { - $owner_uid = db_escape_string($owner_uid); + $owner_uid = db_escape_string($this->link, $owner_uid); if ($this->check_password($owner_uid, $old_password)) { diff --git a/plugins/auth_remote/init.php b/plugins/auth_remote/init.php index 7c8d835f8..7e4638fb2 100644 --- a/plugins/auth_remote/init.php +++ b/plugins/auth_remote/init.php @@ -21,7 +21,7 @@ class Auth_Remote extends Plugin implements IAuthModule { } function get_login_by_ssl_certificate() { - $cert_serial = db_escape_string(get_ssl_certificate_id()); + $cert_serial = db_escape_string($this->link, get_ssl_certificate_id()); if ($cert_serial) { $result = db_query($this->link, "SELECT login FROM ttrss_user_prefs, ttrss_users @@ -29,7 +29,7 @@ class Auth_Remote extends Plugin implements IAuthModule { owner_uid = ttrss_users.id"); if (db_num_rows($result) != 0) { - return db_escape_string(db_fetch_result($result, 0, "login")); + return db_escape_string($this->link, db_fetch_result($result, 0, "login")); } } @@ -38,10 +38,10 @@ class Auth_Remote extends Plugin implements IAuthModule { function authenticate($login, $password) { - $try_login = db_escape_string($_SERVER["REMOTE_USER"]); + $try_login = db_escape_string($this->link, $_SERVER["REMOTE_USER"]); // php-cgi - if (!$try_login) $try_login = db_escape_string($_SERVER["REDIRECT_REMOTE_USER"]); + if (!$try_login) $try_login = db_escape_string($this->link, $_SERVER["REDIRECT_REMOTE_USER"]); if (!$try_login) $try_login = $this->get_login_by_ssl_certificate(); # if (!$try_login) $try_login = "test_qqq"; @@ -60,14 +60,14 @@ class Auth_Remote extends Plugin implements IAuthModule { // update user name $fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN']; if ($fullname){ - $fullname = db_escape_string($fullname); + $fullname = db_escape_string($this->link, $fullname); db_query($this->link, "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " . $user_id); } // update user mail $email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL']; if ($email){ - $email = db_escape_string($email); + $email = db_escape_string($this->link, $email); db_query($this->link, "UPDATE ttrss_users SET email = '$email' WHERE id = " . $user_id); } diff --git a/plugins/digest/init.php b/plugins/digest/init.php index 2feabe3b4..2fc98b0ec 100644 --- a/plugins/digest/init.php +++ b/plugins/digest/init.php @@ -47,7 +47,7 @@ class Digest extends Plugin implements IHandler { } function digestgetcontents() { - $article_id = db_escape_string($_REQUEST['article_id']); + $article_id = db_escape_string($this->link, $_REQUEST['article_id']); $result = db_query($this->link, "SELECT content,title,link,marked,published FROM ttrss_entries, ttrss_user_entries @@ -67,9 +67,9 @@ class Digest extends Plugin implements IHandler { } function digestupdate() { - $feed_id = db_escape_string($_REQUEST['feed_id']); - $offset = db_escape_string($_REQUEST['offset']); - $seq = db_escape_string($_REQUEST['seq']); + $feed_id = db_escape_string($this->link, $_REQUEST['feed_id']); + $offset = db_escape_string($this->link, $_REQUEST['offset']); + $seq = db_escape_string($this->link, $_REQUEST['seq']); if (!$feed_id) $feed_id = -4; if (!$offset) $offset = 0; diff --git a/plugins/embed_original/button.png b/plugins/embed_original/button.png Binary files differnew file mode 100644 index 000000000..e861201d5 --- /dev/null +++ b/plugins/embed_original/button.png diff --git a/plugins/embed_original/init.css b/plugins/embed_original/init.css new file mode 100644 index 000000000..4ce482e1a --- /dev/null +++ b/plugins/embed_original/init.css @@ -0,0 +1,13 @@ +div.cdmContentInner iframe.embeddedContent { + overflow : hidden; + width : 100%; + height : 600px; + border-width : 0px; +} + +div.postContent iframe.embeddedContent { + overflow : hidden; + width : 100%; + height : 100%; + border-width : 0px; +} diff --git a/plugins/embed_original/init.js b/plugins/embed_original/init.js new file mode 100644 index 000000000..517f2cd54 --- /dev/null +++ b/plugins/embed_original/init.js @@ -0,0 +1,69 @@ +function embedOriginalArticle(id) { + try { + var hasSandbox = "sandbox" in document.createElement("iframe"); + + if (!hasSandbox) { + alert(__("Sorry, your browser does not support sandboxed iframes.")); + return; + } + + var query = "op=pluginhandler&plugin=embed_original&method=getUrl&id=" + + param_escape(id); + + var c = false; + + if (isCdmMode()) { + c = $$("div#RROW-" + id + " div[class=cdmContentInner]")[0]; + } else if (id == getActiveArticleId()) { + c = $$("div[class=postContent]")[0]; + } + + if (c) { + var iframe = c.getElementsByClassName("embeddedContent")[0]; + + if (iframe) { + Element.show(c.firstChild); + c.removeChild(iframe); + + if (isCdmMode()) { + cdmScrollToArticleId(id, true); + } + + return; + } + } + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + var ti = JSON.parse(transport.responseText); + + if (ti) { + + var iframe = new Element("iframe", { + class: "embeddedContent", + src: ti.url, + sandbox: 'allow-scripts', + }); + + if (c) { + Element.hide(c.firstChild); + + if (c.firstChild.nextSibling) + c.insertBefore(iframe, c.firstChild.nextSibling); + else + c.appendChild(iframe); + + if (isCdmMode()) { + cdmScrollToArticleId(id, true); + } + } + } + + } }); + + + } catch (e) { + exception_error("embedOriginalArticle", e); + } +} diff --git a/plugins/embed_original/init.php b/plugins/embed_original/init.php new file mode 100644 index 000000000..0e0eb9603 --- /dev/null +++ b/plugins/embed_original/init.php @@ -0,0 +1,56 @@ +<?php +class Embed_Original extends Plugin { + private $link; + private $host; + + function init($host) { + $this->link = $host->get_link(); + $this->host = $host; + + $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this); + } + + function about() { + return array(1.0, + "Try to display original article content inside tt-rss", + "fox"); + } + + function get_js() { + return file_get_contents(dirname(__FILE__) . "/init.js"); + } + + function get_css() { + return file_get_contents(dirname(__FILE__) . "/init.css"); + } + + function hook_article_button($line) { + $id = $line["id"]; + + $rv = "<img src=\"plugins/embed_original/button.png\" + class='tagsPic' style=\"cursor : pointer\" + onclick=\"embedOriginalArticle($id)\" + title='".__('Toggle embed original')."'>"; + + return $rv; + } + + function getUrl() { + $id = db_escape_string($this->link, $_REQUEST['id']); + + $result = db_query($this->link, "SELECT link + FROM ttrss_entries, ttrss_user_entries + WHERE id = '$id' AND ref_id = id AND owner_uid = " .$_SESSION['uid']); + + $url = ""; + + if (db_num_rows($result) != 0) { + $url = db_fetch_result($result, 0, "link"); + + } + + print json_encode(array("url" => $url, "id" => $id)); + } + +} +?> diff --git a/plugins/example/init.php b/plugins/example/init.php index f3788ae8c..926a57da8 100644 --- a/plugins/example/init.php +++ b/plugins/example/init.php @@ -21,7 +21,7 @@ class Example extends Plugin { } function save() { - $example_value = db_escape_string($_POST["example_value"]); + $example_value = db_escape_string($this->link, $_POST["example_value"]); $this->host->set($this, "example", $example_value); diff --git a/plugins/googleplus/init.php b/plugins/googleplus/init.php index 7ae6d1456..6045d2df6 100644 --- a/plugins/googleplus/init.php +++ b/plugins/googleplus/init.php @@ -32,7 +32,7 @@ class GooglePlus extends Plugin { } function getInfo() { - $id = db_escape_string($_REQUEST['id']); + $id = db_escape_string($this->link, $_REQUEST['id']); $result = db_query($this->link, "SELECT title, link FROM ttrss_entries, ttrss_user_entries diff --git a/plugins/googlereaderkeys/init.php b/plugins/googlereaderkeys/init.php index 92bf626e6..afdc58ec7 100644 --- a/plugins/googlereaderkeys/init.php +++ b/plugins/googlereaderkeys/init.php @@ -25,6 +25,7 @@ class GoogleReaderKeys extends Plugin { $hotkeys["*p"] = "prev_feed"; $hotkeys["v"] = "open_in_new_window"; $hotkeys["r"] = "feed_refresh"; + $hotkeys["m"] = "toggle_unread"; $hotkeys["(32)|space"] = "next_article"; $hotkeys["(38)|up"] = "article_scroll_up"; $hotkeys["(40)|down"] = "article_scroll_down"; diff --git a/plugins/googlereadertheme/init.css b/plugins/googlereadertheme/init.css deleted file mode 100644 index 8d5c8cefe..000000000 --- a/plugins/googlereadertheme/init.css +++ /dev/null @@ -1,73 +0,0 @@ -/* fix dijit */ -:focus { - outline: none; -} -input[type="search"] { - -webkit-appearance: none; -} -.claro .dijitToolbar .dijitButton .dijitButtonNode, -.claro .dijitToolbar .dijitDropDownButton .dijitButtonNode, -.claro .dijitToolbar .dijitComboButton .dijitButtonNode, -.claro .dijitToolbar .dijitToggleButton .dijitButtonNode, -.claro .dijitToolbar .dijitComboBox .dijitButtonNode { - -moz-transition: background-color, border-color, color; - -webkit-transition-property: background-color, border-color, color; - transition: background-color, border-color, color; -} - - -/* some style */ -body#ttrssMain, -a, -.titleWrap .title { - color: #444; -} -a:hover, -.Unread .titleWrap .title, -.Selected .titleWrap .title, -html div.cdmContent a { - color: #15c; -} -#feeds-holder, -#content-wrap, -#headlines-frame { - border: none; -} -#ttrssMain #headlines-toolbar, -#ttrssMain .dijitToolbar, -#ttrssMain .cdmHeader { - background: #fff; - border-color: transparent; -} -#ttrssMain #headlines-toolbar { - border-color: #ebebeb; -} -#ttrssMain .cdm { - margin: 5px 25px 10px 5px; - border: 1px solid #ddd !important; - box-shadow: 0 0 4px rgba(0,0,0,.1); - background: #fff !important; -} -#ttrssMain .cdm.Selected { - border-left-color: #4d90f0 !important; - background: #fff !important; -} -#ttrssMain .cdmFeedTitle { - border-color: #ebebeb; - background: #fff; - font-size: 1.2em; - font-weight: bold; -} -#headlines-frame .cdmFooter { - border-top: 1px solid #ebebeb; - background: #fafafa; -} - -.titleWrap .title { - font-size: 1.5em; - font-weight: bold; -} -div.cdmHeader span.hlFeed { - padding-top: .5em; -} - diff --git a/plugins/googlereadertheme/init.php b/plugins/googlereadertheme/init.php deleted file mode 100644 index 4ee4a4ba3..000000000 --- a/plugins/googlereadertheme/init.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -class GoogleReaderTheme extends Plugin { - - private $link; - private $host; - - function about() { - return array(1.0, - "Make tt-rss look similar to Google Reader", - "levito"); - } - - function init($host) { - $this->link = $host->get_link(); - $this->host = $host; - - if ($_SESSION["uid"]) { - // force-enable combined mode - set_pref($this->link, "COMBINED_DISPLAY_MODE", true, $_SESSION["uid"]); - } - } - - function get_css() { - return file_get_contents(dirname(__FILE__) . "/init.css"); - } -} -?> diff --git a/plugins/identica/init.php b/plugins/identica/init.php index c9aa4118e..8e0ad4b9a 100644 --- a/plugins/identica/init.php +++ b/plugins/identica/init.php @@ -32,7 +32,7 @@ class Identica extends Plugin { } function getInfo() { - $id = db_escape_string($_REQUEST['id']); + $id = db_escape_string($this->link, $_REQUEST['id']); $result = db_query($this->link, "SELECT title, link FROM ttrss_entries, ttrss_user_entries diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php index de21dbf32..61b9a439f 100644 --- a/plugins/import_export/init.php +++ b/plugins/import_export/init.php @@ -49,7 +49,7 @@ class Import_Export extends Plugin implements IHandler { } function save() { - $example_value = db_escape_string($_POST["example_value"]); + $example_value = db_escape_string($this->link, $_POST["example_value"]); echo "Value set to $example_value (not really)"; } @@ -122,7 +122,7 @@ class Import_Export extends Plugin implements IHandler { } function exportrun() { - $offset = (int) db_escape_string($_REQUEST['offset']); + $offset = (int) db_escape_string($this->link, $_REQUEST['offset']); $exported = 0; $limit = 250; @@ -238,7 +238,7 @@ class Import_Export extends Plugin implements IHandler { foreach ($article_node->childNodes as $child) { if ($child->nodeName != 'label_cache') - $article[$child->nodeName] = db_escape_string($child->nodeValue); + $article[$child->nodeName] = db_escape_string($this->link, $child->nodeValue); else $article[$child->nodeName] = $child->nodeValue; } @@ -346,7 +346,7 @@ class Import_Export extends Plugin implements IHandler { $score = (int) $article['score']; $tag_cache = $article['tag_cache']; - $label_cache = db_escape_string($article['label_cache']); + $label_cache = db_escape_string($this->link, $article['label_cache']); $note = $article['note']; //print "Importing " . $article['title'] . "<br/>"; diff --git a/plugins/instances/init.php b/plugins/instances/init.php index 6c0f89e1c..6e8d43e9b 100644 --- a/plugins/instances/init.php +++ b/plugins/instances/init.php @@ -92,10 +92,10 @@ class Instances extends Plugin implements IHandler { WHERE instance_id = '$id'"); foreach ($feeds['feeds'] as $feed) { - $feed_url = db_escape_string($feed['feed_url']); - $title = db_escape_string($feed['title']); - $subscribers = db_escape_string($feed['subscribers']); - $site_url = db_escape_string($feed['site_url']); + $feed_url = db_escape_string($this->link, $feed['feed_url']); + $title = db_escape_string($this->link, $feed['title']); + $subscribers = db_escape_string($this->link, $feed['subscribers']); + $site_url = db_escape_string($this->link, $feed['site_url']); db_query($link, "INSERT INTO ttrss_linked_feeds (feed_url, site_url, title, subscribers, instance_id, created, updated) @@ -167,16 +167,16 @@ class Instances extends Plugin implements IHandler { } function remove() { - $ids = db_escape_string($_REQUEST['ids']); + $ids = db_escape_string($this->link, $_REQUEST['ids']); db_query($this->link, "DELETE FROM ttrss_linked_instances WHERE id IN ($ids)"); } function add() { - $id = db_escape_string($_REQUEST["id"]); - $access_url = db_escape_string($_REQUEST["access_url"]); - $access_key = db_escape_string($_REQUEST["access_key"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); + $access_url = db_escape_string($this->link, $_REQUEST["access_url"]); + $access_key = db_escape_string($this->link, $_REQUEST["access_key"]); db_query($this->link, "BEGIN"); @@ -195,7 +195,7 @@ class Instances extends Plugin implements IHandler { } function edit() { - $id = db_escape_string($_REQUEST["id"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); $result = db_query($this->link, "SELECT * FROM ttrss_linked_instances WHERE id = '$id'"); @@ -253,9 +253,9 @@ class Instances extends Plugin implements IHandler { } function editSave() { - $id = db_escape_string($_REQUEST["id"]); - $access_url = db_escape_string($_REQUEST["access_url"]); - $access_key = db_escape_string($_REQUEST["access_key"]); + $id = db_escape_string($this->link, $_REQUEST["id"]); + $access_url = db_escape_string($this->link, $_REQUEST["access_url"]); + $access_key = db_escape_string($this->link, $_REQUEST["access_key"]); db_query($this->link, "UPDATE ttrss_linked_instances SET access_key = '$access_key', access_url = '$access_url', @@ -277,7 +277,7 @@ class Instances extends Plugin implements IHandler { print "<div id=\"pref-instance-toolbar\" dojoType=\"dijit.Toolbar\">"; - $sort = db_escape_string($_REQUEST["sort"]); + $sort = db_escape_string($this->link, $_REQUEST["sort"]); if (!$sort || $sort == "undefined") { $sort = "access_url"; @@ -364,7 +364,7 @@ class Instances extends Plugin implements IHandler { function fbexport() { - $access_key = db_escape_string($_POST["key"]); + $access_key = db_escape_string($this->link, $_POST["key"]); // TODO: rate limit checking using last_connected $result = db_query($this->link, "SELECT id FROM ttrss_linked_instances diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 30a417a1b..a4817a15d 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -30,7 +30,7 @@ class Mail extends Plugin { function emailArticle() { - $param = db_escape_string($_REQUEST['param']); + $param = db_escape_string($this->link, $_REQUEST['param']); $secretkey = sha1(uniqid(rand(), true)); @@ -181,7 +181,7 @@ class Mail extends Plugin { if (!$rc) { $reply['error'] = $mail->ErrorInfo; } else { - save_email_address($this->link, db_escape_string($destination)); + save_email_address($this->link, db_escape_string($this->link, $destination)); $reply['message'] = "UPDATE_COUNTERS"; } @@ -193,7 +193,7 @@ class Mail extends Plugin { } function completeEmails() { - $search = db_escape_string($_REQUEST["search"]); + $search = db_escape_string($this->link, $_REQUEST["search"]); print "<ul>"; diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php index 8d175ae1c..e140bbea7 100644 --- a/plugins/mailto/init.php +++ b/plugins/mailto/init.php @@ -30,7 +30,7 @@ class MailTo extends Plugin { function emailArticle() { - $param = db_escape_string($_REQUEST['param']); + $param = db_escape_string($this->link, $_REQUEST['param']); require_once "lib/MiniTemplator.class.php"; diff --git a/plugins/note/init.php b/plugins/note/init.php index 83db94248..7e8cfb57f 100644 --- a/plugins/note/init.php +++ b/plugins/note/init.php @@ -29,7 +29,7 @@ class Note extends Plugin { } function edit() { - $param = db_escape_string($_REQUEST['param']); + $param = db_escape_string($this->link, $_REQUEST['param']); $result = db_query($this->link, "SELECT note FROM ttrss_user_entries WHERE ref_id = '$param' AND owner_uid = " . $_SESSION['uid']); @@ -58,8 +58,8 @@ class Note extends Plugin { } function setNote() { - $id = db_escape_string($_REQUEST["id"]); - $note = trim(strip_tags(db_escape_string($_REQUEST["note"]))); + $id = db_escape_string($this->link, $_REQUEST["id"]); + $note = trim(strip_tags(db_escape_string($this->link, $_REQUEST["note"]))); db_query($this->link, "UPDATE ttrss_user_entries SET note = '$note' WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php index 9aadde4dd..247d56a1e 100644 --- a/plugins/nsfw/init.php +++ b/plugins/nsfw/init.php @@ -91,7 +91,7 @@ class NSFW extends Plugin { } function save() { - $tags = explode(",", db_escape_string($_POST["tags"])); + $tags = explode(",", db_escape_string($this->link, $_POST["tags"])); $tags = array_map("trim", $tags); $tags = array_map("mb_strtolower", $tags); $tags = join(", ", $tags); diff --git a/plugins/owncloud/init.php b/plugins/owncloud/init.php index 48377e9d9..5d215b386 100644 --- a/plugins/owncloud/init.php +++ b/plugins/owncloud/init.php @@ -20,7 +20,7 @@ class OwnCloud extends Plugin { } function save() { - $owncloud_url = db_escape_string($_POST["owncloud_url"]); + $owncloud_url = db_escape_string($this->link, $_POST["owncloud_url"]); $this->host->set($this, "owncloud", $owncloud_url); echo "Value set to $owncloud_url"; } @@ -75,7 +75,7 @@ class OwnCloud extends Plugin { } function getOwnCloud() { - $id = db_escape_string($_REQUEST['id']); + $id = db_escape_string($this->link, $_REQUEST['id']); $result = db_query($this->link, "SELECT title, link FROM ttrss_entries, ttrss_user_entries diff --git a/plugins/pinterest/init.php b/plugins/pinterest/init.php index 96c730e84..11fe64eb5 100644 --- a/plugins/pinterest/init.php +++ b/plugins/pinterest/init.php @@ -32,7 +32,7 @@ class Pinterest extends Plugin { } function getInfo() { - $id = db_escape_string($_REQUEST['id']); + $id = db_escape_string($this->link, $_REQUEST['id']); $result = db_query($this->link, "SELECT title, link FROM ttrss_entries, ttrss_user_entries diff --git a/plugins/pocket/init.php b/plugins/pocket/init.php index 688a6258d..e96d08001 100644 --- a/plugins/pocket/init.php +++ b/plugins/pocket/init.php @@ -33,7 +33,7 @@ class Pocket extends Plugin { } function getInfo() { - $id = db_escape_string($_REQUEST['id']); + $id = db_escape_string($this->link, $_REQUEST['id']); $result = db_query($this->link, "SELECT title, link FROM ttrss_entries, ttrss_user_entries diff --git a/plugins/share/init.php b/plugins/share/init.php index f52d2a4fa..a3dc35224 100644 --- a/plugins/share/init.php +++ b/plugins/share/init.php @@ -28,7 +28,7 @@ class Share extends Plugin { } function shareArticle() { - $param = db_escape_string($_REQUEST['param']); + $param = db_escape_string($this->link, $_REQUEST['param']); $result = db_query($this->link, "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$param' AND owner_uid = " . $_SESSION['uid']); @@ -41,7 +41,7 @@ class Share extends Plugin { $ref_id = db_fetch_result($result, 0, "ref_id"); if (!$uuid) { - $uuid = db_escape_string(sha1(uniqid(rand(), true))); + $uuid = db_escape_string($this->link, sha1(uniqid(rand(), true))); db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param' AND owner_uid = " . $_SESSION['uid']); } diff --git a/plugins/tweet/init.php b/plugins/tweet/init.php index 2d20c7187..bbcf7836c 100644 --- a/plugins/tweet/init.php +++ b/plugins/tweet/init.php @@ -32,7 +32,7 @@ class Tweet extends Plugin { } function getInfo() { - $id = db_escape_string($_REQUEST['id']); + $id = db_escape_string($this->link, $_REQUEST['id']); $result = db_query($this->link, "SELECT title, link FROM ttrss_entries, ttrss_user_entries @@ -23,7 +23,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> - <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title> + <title><?php echo get_site_title() ?> : <?php echo __("Preferences") ?></title> <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> <?php echo stylesheet_tag("tt-rss.css"); ?> @@ -31,6 +31,7 @@ <?php print_user_stylesheet($link) ?> <link rel="shortcut icon" type="image/png" href="images/favicon.png"/> + <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" /> <?php foreach (array("lib/prototype.js", diff --git a/register.php b/register.php index 678b3c317..0d714c225 100644 --- a/register.php +++ b/register.php @@ -27,7 +27,7 @@ print '<?xml version="1.0" encoding="utf-8"?>'; print "<feed xmlns=\"http://www.w3.org/2005/Atom\"> <id>".htmlspecialchars(SELF_URL_PATH . "/register.php")."</id> - <title>Tiny Tiny RSS registration slots</title> + <title><?php echo get_site_title() ?> registration slots</title> <link rel=\"self\" href=\"".htmlspecialchars(SELF_URL_PATH . "/register.php?format=feed")."\"/> <link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>"; @@ -74,7 +74,7 @@ if ($action == "check") { header("Content-Type: application/xml"); - $login = trim(db_escape_string($_REQUEST['login'])); + $login = trim(db_escape_string($link, $_REQUEST['login'])); $result = db_query($link, "SELECT id FROM ttrss_users WHERE LOWER(login) = LOWER('$login')"); @@ -242,9 +242,9 @@ <?php } else if ($action == "do_register") { ?> <?php - $login = mb_strtolower(trim(db_escape_string($_REQUEST["login"]))); - $email = trim(db_escape_string($_REQUEST["email"])); - $test = trim(db_escape_string($_REQUEST["turing_test"])); + $login = mb_strtolower(trim(db_escape_string($link, $_REQUEST["login"]))); + $email = trim(db_escape_string($link, $_REQUEST["email"])); + $test = trim(db_escape_string($link, $_REQUEST["turing_test"])); if (!$login || !$email || !$test) { print_error(__("Your registration information is incomplete.")); diff --git a/templates/resetpass_template.txt b/templates/resetpass_template.txt index dd96f2c92..c262f9a77 100644 --- a/templates/resetpass_template.txt +++ b/templates/resetpass_template.txt @@ -1,7 +1,7 @@ <!-- $BeginBlock message --> Hello, ${LOGIN}. -Your password for this Tiny Tiny RSS installation has been reset by an administrator. +Your password for this Tiny Tiny RSS installation has been reset. Your new password is ${NEWPASS}, please remember it for later reference. diff --git a/tt-rss.css b/tt-rss.css index 99cd9958b..ff7134f11 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -485,6 +485,7 @@ div.hlFeed, div.hlFeed a { color : gray; font-style : italic; font-weight : normal; + white-space: nowrap; } div.hlFeed a:hover { @@ -1193,3 +1194,12 @@ div.postContent p { .Unread div.hlTitle { font-weight : bold; } + +div.postContent iframe { + min-width : 50%; +} + +div.postHeader span.author { + color : gray; + font-size : 11px; +} diff --git a/utility.css b/utility.css index de0042a77..b520a49bd 100644 --- a/utility.css +++ b/utility.css @@ -182,3 +182,25 @@ div.autocomplete ul li { cursor : pointer; } +fieldset { + border-width : 0px; + padding : 0px 0px 5px 0px; + margin : 0px; +} + +fieldset input { + font-family : sans-serif; + font-size : medium; + border-spacing : 2px; + border : 1px solid #b5bcc7; + padding : 2px; +} + +fieldset label { + width : 120px; + margin-right : 20px; + display : inline-block; + text-align : right; + color : gray; +} + |
