overall directory tree cleanup

49 files changed, 285 insertions, 4342 deletions

diff --git a/backend.php b/backend.php
index 7bbec8c5a..247cab38b 100644
--- a/backend.php
+++ b/backend.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	/* remove ill effects of magic quotes */
 
 	if (get_magic_quotes_gpc()) {
diff --git a/db-updater.php b/db-updater.php
index edee3bc83..9a4fdf604 100644
--- a/db-updater.php
+++ b/db-updater.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
@@ -87,7 +89,7 @@ function confirmOP() {
 
 		} else {
 			print_notice(__("Tiny Tiny RSS database is up to date."));
-			print "<form method=\"GET\" action=\"tt-rss.php\">
+			print "<form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
 		}
diff --git a/digest.php b/digest.php
index f3879ace2..74a0c566d 100644
--- a/digest.php
+++ b/digest.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
@@ -37,9 +39,9 @@
 	<script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
 	<script type="text/javascript" src="lib/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
 	<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
 
-	<script type="text/javascript" src="digest.js"></script>
+	<script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" src="js/digest.js"></script>
 
 	<script type="text/javascript">
 		Event.observe(window, 'load', function() {
diff --git a/errors.php b/errors.php
index 12aeffe75..802947d98 100644
--- a/errors.php
+++ b/errors.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	require_once "functions.php";
 
 	$ERRORS[0] = "";
diff --git a/image.php b/image.php
index 45e1358aa..210bbc2f7 100644
--- a/image.php
+++ b/image.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	require_once "config.php";
 	require_once "lib/simplepie/simplepie.inc";
 
diff --git a/db-prefs.php b/include/db-prefs.php
index 7ee492009..7ee492009 100644
--- a/db-prefs.php
+++ b/include/db-prefs.php
diff --git a/db.php b/include/db.php
index 0682b58f8..0682b58f8 100644
--- a/db.php
+++ b/include/db.php
diff --git a/functions.php b/include/functions.php
index 974d02a5e..8f46c295c 100644
--- a/functions.php
+++ b/include/functions.php
@@ -1,5 +1,4 @@
 <?php
-
 	date_default_timezone_set('UTC');
 	if (defined('E_DEPRECATED')) {
 		error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
@@ -7539,7 +7538,7 @@
 
 		case "logout":
 			logout_user();
-			header("Location: tt-rss.php");
+			header("Location: index.php");
 		break; // logout
 
 		case "fbexport":
diff --git a/localized_schema.php b/include/localized_schema.php
index 29663f351..29663f351 100644
--- a/localized_schema.php
+++ b/include/localized_schema.php
diff --git a/login_form.php b/include/login_form.php
index 04ca3e6d0..04ca3e6d0 100644
--- a/login_form.php
+++ b/include/login_form.php
diff --git a/sanity_check.php b/include/sanity_check.php
index 3e5c09803..3e5c09803 100644
--- a/sanity_check.php
+++ b/include/sanity_check.php
diff --git a/sanity_config.php b/include/sanity_config.php
index 51c9d52be..51c9d52be 100644
--- a/sanity_config.php
+++ b/include/sanity_config.php
diff --git a/sessions.php b/include/sessions.php
index 8588f5807..8588f5807 100644
--- a/sessions.php
+++ b/include/sessions.php
diff --git a/version.php b/include/version.php
index 61445c55f..61445c55f 100644
--- a/version.php
+++ b/include/version.php
diff --git a/index.php b/index.php
index e73671ed4..5b5560a9a 100644
--- a/index.php
+++ b/index.php
@@ -1 +1,211 @@
-<?php header("Location: tt-rss.php"); ?>
+<?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
+	require_once "functions.php";
+	require_once "sessions.php";
+	require_once "sanity_check.php";
+	require_once "version.php";
+	require_once "config.php";
+	require_once "db-prefs.php";
+
+	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+
+	init_connection($link);
+
+	login_sequence($link);
+
+	$dt_add = time();
+
+	no_cache_incantation();
+
+	header('Content-Type: text/html; charset=utf-8');
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+	<title>Tiny Tiny RSS</title>
+	<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
+	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
+	<link rel="stylesheet" type="text/css" href="cdm.css?<?php echo $dt_add ?>"/>
+
+	<?php print_theme_includes($link) ?>
+	<?php print_user_stylesheet($link) ?>
+
+	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
+
+	<script type="text/javascript" src="lib/prototype.js"></script>
+	<script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
+	<script type="text/javascript" src="lib/dojo/dojo.js"></script>
+	<script type="text/javascript" src="lib/dijit/dijit.js"></script>
+	<script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
+
+	<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" charset="utf-8" src="js/tt-rss.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" charset="utf-8" src="js/feedlist.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" charset="utf-8" src="js/viewfeed.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+	<script type="text/javascript">
+		Event.observe(window, 'load', function() {
+			init();
+		});
+	</script>
+</head>
+
+<body id="ttrssMain" class="claro">
+
+<div id="overlay" style="display : block">
+	<div id="overlay_inner">
+		<div class="insensitive"><?php echo __("Loading, please wait...") ?></div>
+		<div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
+	     progress="0" maximum="100">
+		</div>
+		<noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
+	</div>
+</div>
+
+<div id="header">
+	<?php if (!SINGLE_USER_MODE) { ?>
+			<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
+	<?php } ?>
+	<a href="prefs.php"><?php echo __('Preferences') ?></a>
+
+	<?php if (defined('FEEDBACK_URL') && FEEDBACK_URL) { ?>
+		| <a target="_blank" class="feedback" href="<?php echo FEEDBACK_URL ?>">
+				<?php echo __('Comments?') ?></a>
+	<?php } ?>
+
+	<?php if (!SINGLE_USER_MODE) { ?>
+			| <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
+	<?php } ?>
+
+	<img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
+		width="13" height="13"
+		src="<?php echo theme_image($link, 'images/new_version.png') ?>"
+		title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
+		alt="new_version_icon"/>
+</div>
+
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
+	<?php include "help/3.php" ?>
+</div>
+
+<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="cmdline" style="display : none"></div>
+<div id="auxDlg" style="display : none"></div>
+<div id="headlines-tmp" style="display : none"></div>
+
+<div id="main" dojoType="dijit.layout.BorderContainer">
+
+<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
+	<div id="feedlistLoading">
+		<img src='images/indicator_tiny.gif'/>
+		<?php echo  __("Loading, please wait..."); ?></div>
+	<div id="feedTree"></div>
+</div>
+
+<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
+<div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
+<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
+	title="<?php echo __("News") ?>">
+
+<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
+	<div id="main-toolbar" dojoType="dijit.Toolbar">
+
+		<form id="main_toolbar_form" action="" onsubmit='return false'>
+
+		<button dojoType="dijit.form.Button" id="collapse_feeds_btn"
+			onclick="collapse_feedlist()"
+			title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
+			&lt;&lt;</button>
+
+		<select name="view_mode" title="<?php echo __('Show articles') ?>"
+			onchange="viewModeChanged()"
+			dojoType="dijit.form.Select">
+			<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
+			<option value="all_articles"><?php echo __('All Articles') ?></option>
+			<option value="marked"><?php echo __('Starred') ?></option>
+			<option value="published"><?php echo __('Published') ?></option>
+			<option value="unread"><?php echo __('Unread') ?></option>
+			<!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
+			<option value="updated"><?php echo __('Updated') ?></option>
+		</select>
+
+		<select title="<?php echo __('Sort articles') ?>"
+			onchange="viewModeChanged()"
+			dojoType="dijit.form.Select" name="order_by">
+			<option selected="selected" value="default"><?php echo __('Default') ?></option>
+			<option value="date"><?php echo __('Date') ?></option>
+			<option value="title"><?php echo __('Title') ?></option>
+			<option value="score"><?php echo __('Score') ?></option>
+		</select>
+
+		<button dojoType="dijit.form.Button" name="update"
+			onclick="scheduleFeedUpdate()">
+			<?php echo __('Update') ?></button>
+
+		<button dojoType="dijit.form.Button"
+			onclick="catchupCurrentFeed()">
+			<?php echo __('Mark as read') ?></button>
+
+		</form>
+
+		<div class="actionChooser">
+			<div dojoType="dijit.form.DropDownButton">
+				<span><?php echo __('Actions...') ?></span>
+				<div dojoType="dijit.Menu" style="display: none">
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcSearch')"><?php echo __('Search...') ?></div>
+					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRescoreFeed')"><?php echo __('Rescore feed') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
+					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
+					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAbout')"><?php echo __('About...') ?></div>
+				</div>
+			</div>
+		</div>
+	</div> <!-- toolbar -->
+</div> <!-- toolbar pane -->
+
+	<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
+
+		<div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
+		</div>
+
+		<div id="headlines-frame" dojoType="dijit.layout.ContentPane"
+				onscroll="headlines_scroll_handler(this)" region="center">
+			<div id="headlinesInnerContainer">
+				<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
+			</div>
+		</div>
+
+		<?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
+		<div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
+			style="height : 50%" splitter="true"></div>
+		<?php } ?>
+
+	</div>
+</div>
+</div>
+</div>
+</div>
+
+<?php db_close($link); ?>
+
+</body>
+</html>
diff --git a/FeedTree.js b/js/FeedTree.js
index b5b757164..b5b757164 100644
--- a/FeedTree.js
+++ b/js/FeedTree.js
diff --git a/PrefFeedTree.js b/js/PrefFeedTree.js
index 4ea486609..4ea486609 100644
--- a/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
diff --git a/PrefFilterTree.js b/js/PrefFilterTree.js
index a4cf3dac8..a4cf3dac8 100644
--- a/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
diff --git a/PrefLabelTree.js b/js/PrefLabelTree.js
index 05a0c15b6..05a0c15b6 100644
--- a/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
diff --git a/deprecated.js b/js/deprecated.js
index 1d04a1adc..1d04a1adc 100644
--- a/deprecated.js
+++ b/js/deprecated.js
diff --git a/digest.js b/js/digest.js
index 7dba6d36e..7dba6d36e 100644
--- a/digest.js
+++ b/js/digest.js
diff --git a/feedlist.js b/js/feedlist.js
index 62c44b494..62c44b494 100644
--- a/feedlist.js
+++ b/js/feedlist.js
diff --git a/functions.js b/js/functions.js
index 15f645c2e..02fbadf53 100644
--- a/functions.js
+++ b/js/functions.js
@@ -274,7 +274,7 @@ function gotoPreferences() {
 }
 
 function gotoMain() {
-	document.location.href = "tt-rss.php";
+	document.location.href = "index.php";
 }
 
 function gotoExportOpml(filename, settings) {
@@ -504,7 +504,7 @@ function fatalError(code, msg, ext_info) {
 	try {
 
 		if (code == 6) {
-			window.location.href = "tt-rss.php";
+			window.location.href = "index.php";
 		} else if (code == 5) {
 			window.location.href = "db-updater.php";
 		} else {
diff --git a/prefs.js b/js/prefs.js
index 5a75060d6..e40d6d723 100644
--- a/prefs.js
+++ b/js/prefs.js
@@ -925,7 +925,7 @@ function init() {
 
 	try {
 		dojo.registerModulePath("lib", "..");
-		dojo.registerModulePath("fox", "../..");
+		dojo.registerModulePath("fox", "../../js/");
 
 		dojo.require("lib.CheckBoxTree");
 		dojo.require("fox.PrefFeedTree");
diff --git a/tt-rss.js b/js/tt-rss.js
index 36e0d8cc4..589091959 100644
--- a/tt-rss.js
+++ b/js/tt-rss.js
@@ -274,7 +274,7 @@ function genericSanityCheck() {
 
 function init() {
 	try {
-		dojo.registerModulePath("fox", "../..");
+		dojo.registerModulePath("fox", "../../js/");
 
 		dojo.require("fox.FeedTree");
 
diff --git a/viewfeed.js b/js/viewfeed.js
index 9cb902315..9cb902315 100644
--- a/viewfeed.js
+++ b/js/viewfeed.js
diff --git a/localized_js.php b/localized_js.php
index e51e97317..1cf38e573 100644
--- a/localized_js.php
+++ b/localized_js.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	define('DISABLE_SESSIONS', true);
 
 	require "functions.php";
diff --git a/messages.pot b/messages.pot
deleted file mode 100644
index 5237e0ca3..000000000
--- a/messages.pot
+++ /dev/null
@@ -1,2751 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-23 10:40+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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: backend.php:83
-msgid "Use default"
-msgstr ""
-
-#: backend.php:84
-msgid "Never purge"
-msgstr ""
-
-#: backend.php:85
-msgid "1 week old"
-msgstr ""
-
-#: backend.php:86
-msgid "2 weeks old"
-msgstr ""
-
-#: backend.php:87
-msgid "1 month old"
-msgstr ""
-
-#: backend.php:88
-msgid "2 months old"
-msgstr ""
-
-#: backend.php:89
-msgid "3 months old"
-msgstr ""
-
-#: backend.php:92
-msgid "Default interval"
-msgstr ""
-
-#: backend.php:93 backend.php:103
-msgid "Disable updates"
-msgstr ""
-
-#: backend.php:94 backend.php:104
-msgid "Each 15 minutes"
-msgstr ""
-
-#: backend.php:95 backend.php:105
-msgid "Each 30 minutes"
-msgstr ""
-
-#: backend.php:96 backend.php:106
-msgid "Hourly"
-msgstr ""
-
-#: backend.php:97 backend.php:107
-msgid "Each 4 hours"
-msgstr ""
-
-#: backend.php:98 backend.php:108
-msgid "Each 12 hours"
-msgstr ""
-
-#: backend.php:99 backend.php:109
-msgid "Daily"
-msgstr ""
-
-#: backend.php:100 backend.php:110
-msgid "Weekly"
-msgstr ""
-
-#: backend.php:113 tt-rss.php:140 modules/pref-prefs.php:350
-msgid "Default"
-msgstr ""
-
-#: backend.php:114
-msgid "Magpie"
-msgstr ""
-
-#: backend.php:115
-msgid "SimplePie"
-msgstr ""
-
-#: backend.php:116
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:125 modules/pref-users.php:131
-msgid "User"
-msgstr ""
-
-#: backend.php:126
-msgid "Power User"
-msgstr ""
-
-#: backend.php:127
-msgid "Administrator"
-msgstr ""
-
-#: backend.php:179 prefs.php:93 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr ""
-
-#: backend.php:207
-msgid "Article not found."
-msgstr ""
-
-#: backend.php:297 functions.php:5090
-msgid "Feed not found."
-msgstr ""
-
-#: backend.php:457 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:106
-#: tt-rss.php:191 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293 viewfeed.js:1108 viewfeed.js:1278
-msgid "Loading, please wait..."
-msgstr ""
-
-#: db-updater.php:16
-msgid "Your access level is insufficient to run this script."
-msgstr ""
-
-#: db-updater.php:41
-msgid "Database Updater"
-msgstr ""
-
-#: db-updater.php:82
-msgid "Could not update database"
-msgstr ""
-
-#: db-updater.php:85
-msgid "Could not find necessary schema file, need version:"
-msgstr ""
-
-#: db-updater.php:86
-msgid ", found: "
-msgstr ""
-
-#: db-updater.php:89
-msgid "Tiny Tiny RSS database is up to date."
-msgstr ""
-
-#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:189
-#: register.php:234 register.php:247 register.php:262 register.php:280
-#: register.php:365 register.php:375 register.php:387 twitter.php:108
-#: twitter.php:120 modules/pref-feeds.php:1096
-msgid "Return to Tiny Tiny RSS"
-msgstr ""
-
-#: db-updater.php:97
-msgid "Please backup your database before proceeding."
-msgstr ""
-
-#: db-updater.php:99
-#, php-format
-msgid ""
-"Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
-"<b>%d</b>)."
-msgstr ""
-
-#: db-updater.php:113
-msgid "Perform updates"
-msgstr ""
-
-#: db-updater.php:118
-msgid "Performing updates..."
-msgstr ""
-
-#: db-updater.php:124
-#, php-format
-msgid "Updating to version %d..."
-msgstr ""
-
-#: db-updater.php:137
-msgid "Checking version... "
-msgstr ""
-
-#: db-updater.php:143
-msgid "OK!"
-msgstr ""
-
-#: db-updater.php:145
-msgid "ERROR!"
-msgstr ""
-
-#: db-updater.php:153
-#, php-format
-msgid ""
-"Finished. Performed <b>%d</b> update(s) up to schema\n"
-"\t\t\tversion <b>%d</b>."
-msgstr ""
-
-#: db-updater.php:163
-msgid "Your database schema is from a newer version of Tiny Tiny RSS."
-msgstr ""
-
-#: db-updater.php:165
-#, php-format
-msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
-msgstr ""
-
-#: db-updater.php:167
-msgid ""
-"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
-"version and continue."
-msgstr ""
-
-#: digest.php:55
-msgid ""
-"Your browser doesn't support Javascript, which is required\n"
-"\t\t\tfor this application to function properly. Please check your\n"
-"\t\t\tbrowser settings."
-msgstr ""
-
-#: digest.php:69 tt-rss.php:72
-msgid "Hello,"
-msgstr ""
-
-#: digest.php:72 tt-rss.php:82 mobile/functions.php:59
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr ""
-
-#: errors.php:6
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
-
-#: errors.php:9
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
-
-#: errors.php:12
-msgid "Backend sanity check failed"
-msgstr ""
-
-#: errors.php:14
-msgid "Frontend sanity check failed."
-msgstr ""
-
-#: errors.php:16
-msgid ""
-"Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
-"update&lt;/a&gt;."
-msgstr ""
-
-#: errors.php:18
-msgid "Request not authorized."
-msgstr ""
-
-#: errors.php:20
-msgid "No operation to perform."
-msgstr ""
-
-#: errors.php:22
-msgid ""
-"Could not display feed: query failed. Please check label match syntax or "
-"local configuration."
-msgstr ""
-
-#: errors.php:24
-msgid "Denied. Your access level is insufficient to access this page."
-msgstr ""
-
-#: errors.php:26
-msgid "Configuration check failed"
-msgstr ""
-
-#: errors.php:28
-msgid ""
-"Your version of MySQL is not currently supported. Please see\n"
-"\t\tofficial site for more information."
-msgstr ""
-
-#: errors.php:33
-msgid "SQL escaping test failed, check your database and PHP configuration"
-msgstr ""
-
-#: functions.php:2073
-msgid "Session failed to validate (incorrect IP)"
-msgstr ""
-
-#: functions.php:2147
-msgid "Incorrect username or password"
-msgstr ""
-
-#: functions.php:3138 modules/popup-dialog.php:394
-msgid "All feeds"
-msgstr ""
-
-#: functions.php:3170 functions.php:3213 functions.php:4568 functions.php:4577
-#: modules/pref-feeds.php:96
-msgid "Uncategorized"
-msgstr ""
-
-#: functions.php:3203 functions.php:3907 mobile/functions.php:168
-msgid "Special"
-msgstr ""
-
-#: functions.php:3205 functions.php:3909 prefs.php:99
-#: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
-msgid "Labels"
-msgstr ""
-
-#: functions.php:3251 help/3.php:71
-msgid "Starred articles"
-msgstr ""
-
-#: functions.php:3253 help/3.php:72
-msgid "Published articles"
-msgstr ""
-
-#: functions.php:3255 help/3.php:70
-msgid "Fresh articles"
-msgstr ""
-
-#: functions.php:3257 help/3.php:69
-msgid "All articles"
-msgstr ""
-
-#: functions.php:3259
-msgid "Archived articles"
-msgstr ""
-
-#: functions.php:4339
-msgid "Select:"
-msgstr ""
-
-#: functions.php:4340 modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:380
-msgid "All"
-msgstr ""
-
-#: functions.php:4341 functions.php:4353 tt-rss.php:132
-msgid "Unread"
-msgstr ""
-
-#: functions.php:4342
-msgid "Invert"
-msgstr ""
-
-#: functions.php:4343 modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:382
-msgid "None"
-msgstr ""
-
-#: functions.php:4349 tt-rss.php:158
-msgid "Actions..."
-msgstr ""
-
-#: functions.php:4351
-msgid "Selection toggle:"
-msgstr ""
-
-#: functions.php:4354 tt-rss.php:130
-msgid "Starred"
-msgstr ""
-
-#: functions.php:4355 tt-rss.php:131
-msgid "Published"
-msgstr ""
-
-#: functions.php:4357
-msgid "Selection:"
-msgstr ""
-
-#: functions.php:4359 functions.php:4385 localized_schema.php:10
-#: tt-rss.php:152 tt-rss.php:167 digest.js:624 FeedTree.js:125 FeedTree.js:151
-msgid "Mark as read"
-msgstr ""
-
-#: functions.php:4362
-msgid "Archive"
-msgstr ""
-
-#: functions.php:4364
-msgid "Move back"
-msgstr ""
-
-#: functions.php:4365
-msgid "Delete"
-msgstr ""
-
-#: functions.php:4369 functions.php:4946 functions.php:5590
-msgid "Forward by email"
-msgstr ""
-
-#: functions.php:4383 PrefFilterTree.js:29
-msgid "Feed:"
-msgstr ""
-
-#: functions.php:4387 modules/popup-dialog.php:881
-msgid "View as RSS"
-msgstr ""
-
-#: functions.php:4397 functions.php:5009
-msgid "Visit the website"
-msgstr ""
-
-#: functions.php:4430
-msgid "View as RSS feed"
-msgstr ""
-
-#: functions.php:4757 viewfeed.js:2085
-msgid "Click to play"
-msgstr ""
-
-#: functions.php:4758 viewfeed.js:2084
-msgid "Play"
-msgstr ""
-
-#: functions.php:4884
-msgid " - "
-msgstr ""
-
-#: functions.php:4913 functions.php:6537 modules/backend-rpc.php:381
-msgid "no tags"
-msgstr ""
-
-#: functions.php:4923 functions.php:5550
-msgid "Edit tags for this article"
-msgstr ""
-
-#: functions.php:4933 functions.php:5577
-msgid "Open article in new tab"
-msgstr ""
-
-#: functions.php:4940 functions.php:5584 viewfeed.js:2027
-msgid "Edit article note"
-msgstr ""
-
-#: functions.php:4953 functions.php:5597
-msgid "Share on Twitter"
-msgstr ""
-
-#: functions.php:4959
-msgid "Share by URL"
-msgstr ""
-
-#: functions.php:4964 digest.js:267
-msgid "Close this panel"
-msgstr ""
-
-#: functions.php:4981 functions.php:5490
-msgid "Originally from:"
-msgstr ""
-
-#: functions.php:4994 functions.php:5503 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:319
-msgid "Feed URL"
-msgstr ""
-
-#: functions.php:5033 modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr ""
-
-#: functions.php:5311 functions.php:5393
-msgid "mark as read"
-msgstr ""
-
-#: functions.php:5603
-msgid "Dismiss article"
-msgstr ""
-
-#: functions.php:5624
-msgid "No unread articles found to display."
-msgstr ""
-
-#: functions.php:5627
-msgid "No updated articles found to display."
-msgstr ""
-
-#: functions.php:5630
-msgid "No starred articles found to display."
-msgstr ""
-
-#: functions.php:5634
-msgid ""
-"No articles found to display. You can assign articles to labels manually "
-"(see the Actions menu above) or use a filter."
-msgstr ""
-
-#: functions.php:5636
-msgid "No articles found to display."
-msgstr ""
-
-#: functions.php:5651 functions.php:6985
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr ""
-
-#: functions.php:5661 functions.php:6995
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-
-#: functions.php:6477 tt-rss.php:173
-msgid "Create label..."
-msgstr ""
-
-#: functions.php:6491
-msgid "Remove:"
-msgstr ""
-
-#: functions.php:6495
-msgid "Assign:"
-msgstr ""
-
-#: functions.php:6562
-msgid "(edit note)"
-msgstr ""
-
-#: functions.php:6975
-msgid "No feed selected."
-msgstr ""
-
-#: functions.php:7159
-msgid "unknown type"
-msgstr ""
-
-#: functions.php:7199
-msgid "Attachment:"
-msgstr ""
-
-#: functions.php:7201
-msgid "Attachments:"
-msgstr ""
-
-#: functions.php:7632 login_form.php:151 modules/backend-rpc.php:66
-#: modules/popup-dialog.php:109
-msgid "Default profile"
-msgstr ""
-
-#: localized_schema.php:3 tt-rss.php:142 modules/popup-dialog.php:378
-msgid "Title"
-msgstr ""
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr ""
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr ""
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr ""
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr ""
-
-#: localized_schema.php:9
-msgid "Delete article"
-msgstr ""
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr ""
-
-#: localized_schema.php:12 digest.js:262 digest.js:728 viewfeed.js:470
-msgid "Publish article"
-msgstr ""
-
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr ""
-
-#: localized_schema.php:14 viewfeed.js:1968
-msgid "Assign label"
-msgstr ""
-
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-
-#: localized_schema.php:20
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr ""
-
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr ""
-
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr ""
-
-#: localized_schema.php:28
-msgid "Default interval between feed updates"
-msgstr ""
-
-#: localized_schema.php:29
-msgid "Amount of articles to display at once"
-msgstr ""
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr ""
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr ""
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr ""
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr ""
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr ""
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr ""
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr ""
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr ""
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr ""
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr ""
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr ""
-
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr ""
-
-#: localized_schema.php:42
-msgid "Automatically mark articles as read"
-msgstr ""
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr ""
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr ""
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr ""
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr ""
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr ""
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr ""
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr ""
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr ""
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr ""
-
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr ""
-
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr ""
-
-#: localized_schema.php:54
-msgid "Sort headlines by feed date"
-msgstr ""
-
-#: localized_schema.php:55 prefs.js:1784
-msgid "Customize stylesheet"
-msgstr ""
-
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr ""
-
-#: login_form.php:131 mobile/login_form.php:38
-msgid "Login:"
-msgstr ""
-
-#: login_form.php:135 mobile/login_form.php:43
-msgid "Password:"
-msgstr ""
-
-#: login_form.php:139
-msgid "Language:"
-msgstr ""
-
-#: login_form.php:148
-msgid "Profile:"
-msgstr ""
-
-#: login_form.php:161 mobile/login_form.php:28
-msgid "Log in"
-msgstr ""
-
-#: login_form.php:164 register.php:181
-msgid "Create new account"
-msgstr ""
-
-#: login_form.php:178
-msgid "Use less traffic"
-msgstr ""
-
-#: opml.php:163 opml.php:168
-msgid "OPML Utility"
-msgstr ""
-
-#: opml.php:186
-msgid "Importing OPML..."
-msgstr ""
-
-#: opml.php:191
-msgid "Return to preferences"
-msgstr ""
-
-#: prefs.php:81
-msgid "Keyboard shortcuts"
-msgstr ""
-
-#: prefs.php:82 help/4.php:14
-msgid "Exit preferences"
-msgstr ""
-
-#: prefs.php:90 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:74
-#: help/4.php:8
-msgid "Preferences"
-msgstr ""
-
-#: prefs.php:96 modules/pref-filters.php:90 help/4.php:11
-msgid "Filters"
-msgstr ""
-
-#: prefs.php:103 help/4.php:13
-msgid "Users"
-msgstr ""
-
-#: prefs.php:108
-msgid "Linked"
-msgstr ""
-
-#: register.php:185
-msgid "New user registrations are administratively disabled."
-msgstr ""
-
-#: register.php:210
-msgid ""
-"Your temporary password will be sent to the specified email. Accounts, which "
-"were not logged in once, are erased automatically 24 hours after temporary "
-"password is sent."
-msgstr ""
-
-#: register.php:216
-msgid "Desired login:"
-msgstr ""
-
-#: register.php:219
-msgid "Check availability"
-msgstr ""
-
-#: register.php:221
-msgid "Email:"
-msgstr ""
-
-#: register.php:224
-msgid "How much is two plus two:"
-msgstr ""
-
-#: register.php:227
-msgid "Submit registration"
-msgstr ""
-
-#: register.php:245
-msgid "Your registration information is incomplete."
-msgstr ""
-
-#: register.php:260
-msgid "Sorry, this username is already taken."
-msgstr ""
-
-#: register.php:278
-msgid "Registration failed."
-msgstr ""
-
-#: register.php:362
-msgid "Account created successfully."
-msgstr ""
-
-#: register.php:384
-msgid "New user registrations are currently closed."
-msgstr ""
-
-#: tt-rss.php:78
-msgid "Comments?"
-msgstr ""
-
-#: tt-rss.php:88
-msgid "New version of Tiny Tiny RSS is available!"
-msgstr ""
-
-#: tt-rss.php:113
-msgid "News"
-msgstr ""
-
-#: tt-rss.php:122
-msgid "Collapse feedlist"
-msgstr ""
-
-#: tt-rss.php:125
-msgid "Show articles"
-msgstr ""
-
-#: tt-rss.php:128
-msgid "Adaptive"
-msgstr ""
-
-#: tt-rss.php:129
-msgid "All Articles"
-msgstr ""
-
-#: tt-rss.php:133
-msgid "Ignore Scoring"
-msgstr ""
-
-#: tt-rss.php:134
-msgid "Updated"
-msgstr ""
-
-#: tt-rss.php:137
-msgid "Sort articles"
-msgstr ""
-
-#: tt-rss.php:141 modules/pref-filters.php:228
-msgid "Date"
-msgstr ""
-
-#: tt-rss.php:143
-msgid "Score"
-msgstr ""
-
-#: tt-rss.php:148 modules/pref-feeds.php:347 modules/pref-feeds.php:600
-msgid "Update"
-msgstr ""
-
-#: tt-rss.php:160
-msgid "Search..."
-msgstr ""
-
-#: tt-rss.php:161
-msgid "Feed actions:"
-msgstr ""
-
-#: tt-rss.php:162
-msgid "Subscribe to feed..."
-msgstr ""
-
-#: tt-rss.php:163
-msgid "Edit this feed..."
-msgstr ""
-
-#: tt-rss.php:164
-msgid "Rescore feed"
-msgstr ""
-
-#: tt-rss.php:165 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
-msgid "Unsubscribe"
-msgstr ""
-
-#: tt-rss.php:166
-msgid "All feeds:"
-msgstr ""
-
-#: tt-rss.php:168 help/3.php:56
-msgid "(Un)hide read feeds"
-msgstr ""
-
-#: tt-rss.php:169
-msgid "Other actions:"
-msgstr ""
-
-#: tt-rss.php:170
-msgid "Switch to digest..."
-msgstr ""
-
-#: tt-rss.php:171
-msgid "Show tag cloud..."
-msgstr ""
-
-#: tt-rss.php:172
-msgid "Select by tags..."
-msgstr ""
-
-#: tt-rss.php:174
-msgid "Create filter..."
-msgstr ""
-
-#: tt-rss.php:175
-msgid "Keyboard shortcuts help"
-msgstr ""
-
-#: tt-rss.php:176 tt-rss.js:437
-msgid "About..."
-msgstr ""
-
-#: twitter.php:95
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:99
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:103
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:115 modules/pref-prefs.php:464
-msgid "Register"
-msgstr ""
-
-#: modules/backend-rpc.php:843
-msgid "Your request could not be completed."
-msgstr ""
-
-#: modules/backend-rpc.php:847
-msgid "Feed update has been scheduled."
-msgstr ""
-
-#: modules/backend-rpc.php:855
-msgid "Category update has been scheduled."
-msgstr ""
-
-#: modules/backend-rpc.php:868
-msgid "Can't update this kind of feed."
-msgstr ""
-
-#: modules/help.php:6
-msgid "Help"
-msgstr ""
-
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr ""
-
-#: modules/opml_domdoc.php:60
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr ""
-
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: modules/opml_domdoc.php:128
-msgid "is already imported."
-msgstr ""
-
-#: modules/opml_domdoc.php:148
-msgid "OK"
-msgstr ""
-
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr ""
-
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: modules/popup-dialog.php:34
-msgid "Importing using DOMXML."
-msgstr ""
-
-#: modules/popup-dialog.php:40
-msgid "Importing using DOMDocument."
-msgstr ""
-
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-
-#: modules/popup-dialog.php:80
-msgid "Create profile"
-msgstr ""
-
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
-msgid "(active)"
-msgstr ""
-
-#: modules/popup-dialog.php:166
-msgid "Remove selected profiles"
-msgstr ""
-
-#: modules/popup-dialog.php:168
-msgid "Activate profile"
-msgstr ""
-
-#: modules/popup-dialog.php:179
-msgid "Public OPML URL"
-msgstr ""
-
-#: modules/popup-dialog.php:184
-msgid "Your Public OPML URL is:"
-msgstr ""
-
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
-msgid "Generate new URL"
-msgstr ""
-
-#: modules/popup-dialog.php:206
-msgid "Notice"
-msgstr ""
-
-#: modules/popup-dialog.php:212
-msgid ""
-"Update daemon is enabled in configuration, but daemon process is not "
-"running, which prevents all feeds from updating. Please start the daemon "
-"process or contact instance owner."
-msgstr ""
-
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
-msgid "Last update:"
-msgstr ""
-
-#: modules/popup-dialog.php:221
-msgid ""
-"Update daemon is taking too long to perform a feed update. This could "
-"indicate a problem like crash or a hang. Please check the daemon process or "
-"contact instance owner."
-msgstr ""
-
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
-msgid "Feed"
-msgstr ""
-
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
-msgid "Place in category:"
-msgstr ""
-
-#: modules/popup-dialog.php:265
-msgid "Available feeds"
-msgstr ""
-
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
-msgid "Authentication"
-msgstr ""
-
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:436
-msgid "Login"
-msgstr ""
-
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
-msgid "Password"
-msgstr ""
-
-#: modules/popup-dialog.php:294
-msgid "This feed requires authentication."
-msgstr ""
-
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
-msgid "Subscribe"
-msgstr ""
-
-#: modules/popup-dialog.php:300
-msgid "More feeds"
-msgstr ""
-
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
-msgid "Cancel"
-msgstr ""
-
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:367 tt-rss.js:233
-msgid "Search"
-msgstr ""
-
-#: modules/popup-dialog.php:328
-msgid "Popular feeds"
-msgstr ""
-
-#: modules/popup-dialog.php:329
-msgid "Feed archive"
-msgstr ""
-
-#: modules/popup-dialog.php:332
-msgid "limit:"
-msgstr ""
-
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:393
-msgid "Remove"
-msgstr ""
-
-#: modules/popup-dialog.php:365
-msgid "Look for"
-msgstr ""
-
-#: modules/popup-dialog.php:375
-msgid "match on"
-msgstr ""
-
-#: modules/popup-dialog.php:380
-msgid "Title or content"
-msgstr ""
-
-#: modules/popup-dialog.php:391
-msgid "Limit search to:"
-msgstr ""
-
-#: modules/popup-dialog.php:407
-msgid "This feed"
-msgstr ""
-
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
-msgid "Match"
-msgstr ""
-
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
-msgid "before"
-msgstr ""
-
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
-msgid "after"
-msgstr ""
-
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
-msgid "Check it"
-msgstr ""
-
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
-msgid "on field"
-msgstr ""
-
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:239
-msgid "in"
-msgstr ""
-
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
-msgid "Perform Action"
-msgstr ""
-
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
-msgid "with parameters:"
-msgstr ""
-
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
-msgid "Options"
-msgstr ""
-
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
-msgid "Enabled"
-msgstr ""
-
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
-msgid "Inverse match"
-msgstr ""
-
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
-msgid "Test"
-msgstr ""
-
-#: modules/popup-dialog.php:541
-msgid "Create"
-msgstr ""
-
-#: modules/popup-dialog.php:571
-msgid ""
-"These feeds have not been updated with new content for 3 months (oldest "
-"first):"
-msgstr ""
-
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
-msgid "Click to edit feed"
-msgstr ""
-
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
-msgid "Unsubscribe from selected feeds"
-msgstr ""
-
-#: modules/popup-dialog.php:628
-msgid "These feeds have not been updated because of errors:"
-msgstr ""
-
-#: modules/popup-dialog.php:688
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
-msgid "Save"
-msgstr ""
-
-#: modules/popup-dialog.php:721
-msgid "Tag Cloud"
-msgstr ""
-
-#: modules/popup-dialog.php:743
-msgid "Select item(s) by tags"
-msgstr ""
-
-#: modules/popup-dialog.php:746
-msgid "Match:"
-msgstr ""
-
-#: modules/popup-dialog.php:751
-msgid "Which Tags?"
-msgstr ""
-
-#: modules/popup-dialog.php:764
-msgid "Display entries"
-msgstr ""
-
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr ""
-
-#: modules/popup-dialog.php:813
-msgid "Multiple articles"
-msgstr ""
-
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr ""
-
-#: modules/popup-dialog.php:843
-msgid "To:"
-msgstr ""
-
-#: modules/popup-dialog.php:856
-msgid "Subject:"
-msgstr ""
-
-#: modules/popup-dialog.php:872
-msgid "Send e-mail"
-msgstr ""
-
-#: modules/popup-dialog.php:892
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: modules/popup-dialog.php:919
-#, php-format
-msgid "New version of Tiny Tiny RSS is available (%s)."
-msgstr ""
-
-#: modules/popup-dialog.php:929 modules/pref-users.php:389
-msgid "Details"
-msgstr ""
-
-#: modules/popup-dialog.php:931
-msgid "Download"
-msgstr ""
-
-#: modules/popup-dialog.php:945
-#, php-format
-msgid ""
-"You can override colors, fonts and layout of your currently selected theme "
-"with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink"
-"\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
-msgid "Instance"
-msgstr ""
-
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
-msgid "URL:"
-msgstr ""
-
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
-msgid "Instance URL"
-msgstr ""
-
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
-msgid "Access key:"
-msgstr ""
-
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
-msgid "Access key"
-msgstr ""
-
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
-msgid "Generate new key"
-msgstr ""
-
-#: modules/popup-dialog.php:1068
-msgid "Create link"
-msgstr ""
-
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: modules/pref-feeds.php:4
-msgid "Check to enable field"
-msgstr ""
-
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
-#, php-format
-msgid "(%d feeds)"
-msgstr ""
-
-#: modules/pref-feeds.php:306
-msgid "Feed Title"
-msgstr ""
-
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
-msgid "using"
-msgstr ""
-
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
-msgid "Article purging:"
-msgstr ""
-
-#: modules/pref-feeds.php:401
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
-msgid "Hide from Popular feeds"
-msgstr ""
-
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
-msgid "Right-to-left content"
-msgstr ""
-
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
-msgid "Include in e-mail digest"
-msgstr ""
-
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
-msgid "Always display image attachments"
-msgstr ""
-
-#: modules/pref-feeds.php:472
-msgid "Cache images locally (SimplePie only)"
-msgstr ""
-
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
-msgid "Mark updated articles as unread"
-msgstr ""
-
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: modules/pref-feeds.php:504
-msgid "Icon"
-msgstr ""
-
-#: modules/pref-feeds.php:518
-msgid "Replace"
-msgstr ""
-
-#: modules/pref-feeds.php:537
-msgid "Resubscribe to push updates"
-msgstr ""
-
-#: modules/pref-feeds.php:544
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr ""
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
-msgid "All done."
-msgstr ""
-
-#: modules/pref-feeds.php:1027
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr ""
-
-#: modules/pref-feeds.php:1030
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr ""
-
-#: modules/pref-feeds.php:1033
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr ""
-
-#: modules/pref-feeds.php:1036
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr ""
-
-#: modules/pref-feeds.php:1044
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr ""
-
-#: modules/pref-feeds.php:1066
-msgid "Subscribe to selected feed"
-msgstr ""
-
-#: modules/pref-feeds.php:1091
-msgid "Edit subscription options"
-msgstr ""
-
-#: modules/pref-feeds.php:1173
-#, php-format
-msgid "Category <b>$%s</b> already exists in the database."
-msgstr ""
-
-#: modules/pref-feeds.php:1189
-msgid "Create category"
-msgstr ""
-
-#: modules/pref-feeds.php:1259
-msgid "No feed categories defined."
-msgstr ""
-
-#: modules/pref-feeds.php:1265
-msgid "Remove selected categories"
-msgstr ""
-
-#: modules/pref-feeds.php:1293
-msgid "Feeds with errors"
-msgstr ""
-
-#: modules/pref-feeds.php:1316
-msgid "Inactive feeds"
-msgstr ""
-
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:377
-msgid "Select"
-msgstr ""
-
-#: modules/pref-feeds.php:1351 help/3.php:57 help/4.php:22
-msgid "Subscribe to feed"
-msgstr ""
-
-#: modules/pref-feeds.php:1353
-msgid "Edit selected feeds"
-msgstr ""
-
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
-msgid "Reset sort order"
-msgstr ""
-
-#: modules/pref-feeds.php:1360
-msgid "Categories"
-msgstr ""
-
-#: modules/pref-feeds.php:1363
-msgid "Edit categories"
-msgstr ""
-
-#: modules/pref-feeds.php:1379
-msgid "More actions..."
-msgstr ""
-
-#: modules/pref-feeds.php:1383
-msgid "Manual purge"
-msgstr ""
-
-#: modules/pref-feeds.php:1387
-msgid "Clear feed data"
-msgstr ""
-
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
-msgid "Rescore articles"
-msgstr ""
-
-#: modules/pref-feeds.php:1430
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr ""
-
-#: modules/pref-feeds.php:1438
-msgid "OPML"
-msgstr ""
-
-#: modules/pref-feeds.php:1440
-msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
-msgstr ""
-
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr ""
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
-msgid "Export"
-msgstr ""
-
-#: modules/pref-feeds.php:1463
-msgid "Filename:"
-msgstr ""
-
-#: modules/pref-feeds.php:1465
-msgid "Include settings"
-msgstr ""
-
-#: modules/pref-feeds.php:1471
-msgid "Publish"
-msgstr ""
-
-#: modules/pref-feeds.php:1473
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-
-#: modules/pref-feeds.php:1475
-msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
-msgstr ""
-
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
-msgid "Display URL"
-msgstr ""
-
-#: modules/pref-feeds.php:1485
-msgid "Firefox integration"
-msgstr ""
-
-#: modules/pref-feeds.php:1487
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-
-#: modules/pref-feeds.php:1494
-msgid "Click here to register this site as a feed reader."
-msgstr ""
-
-#: modules/pref-feeds.php:1502
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: modules/pref-feeds.php:1504
-msgid ""
-"Drag the link below to your browser toolbar, open the feed you're interested "
-"in in your browser and click on the link to subscribe to it."
-msgstr ""
-
-#: modules/pref-feeds.php:1508
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr ""
-
-#: modules/pref-feeds.php:1512
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr ""
-
-#: modules/pref-feeds.php:1516
-msgid "Published & shared articles and generated feeds"
-msgstr ""
-
-#: modules/pref-feeds.php:1518
-msgid "Published articles and generated feeds"
-msgstr ""
-
-#: modules/pref-feeds.php:1520
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-
-#: modules/pref-feeds.php:1529
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: modules/pref-feeds.php:1531
-msgid "Articles shared by URL"
-msgstr ""
-
-#: modules/pref-feeds.php:1533
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: modules/pref-feeds.php:1536
-msgid "Unshare all articles"
-msgstr ""
-
-#: modules/pref-feeds.php:1542
-msgid "Twitter"
-msgstr ""
-
-#: modules/pref-feeds.php:1551
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: modules/pref-feeds.php:1553
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: modules/pref-feeds.php:1557
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: modules/pref-feeds.php:1563
-msgid "Clear stored credentials"
-msgstr ""
-
-#: modules/pref-feeds.php:1654
-#, php-format
-msgid "%d archived articles"
-msgstr ""
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr ""
-
-#: modules/pref-filters.php:38
-msgid "Articles matching this filter:"
-msgstr ""
-
-#: modules/pref-filters.php:75
-msgid "No articles matching this filter has been found."
-msgstr ""
-
-#: modules/pref-filters.php:470
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr ""
-
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr ""
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:391
-msgid "Edit"
-msgstr ""
-
-#: modules/pref-instances.php:5 modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr ""
-
-#: modules/pref-instances.php:142
-msgid "Link instance"
-msgstr ""
-
-#: modules/pref-instances.php:154
-msgid ""
-"You can connect other instances of Tiny Tiny RSS to this one to share "
-"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
-
-#: modules/pref-instances.php:164
-msgid "Last connected"
-msgstr ""
-
-#: modules/pref-instances.php:165
-msgid "Stored feeds"
-msgstr ""
-
-#: modules/pref-instances.php:183 modules/pref-users.php:467
-msgid "Click to edit"
-msgstr ""
-
-#: modules/pref-labels.php:21
-msgid "Caption"
-msgstr ""
-
-#: modules/pref-labels.php:36
-msgid "Colors"
-msgstr ""
-
-#: modules/pref-labels.php:41
-msgid "Foreground:"
-msgstr ""
-
-#: modules/pref-labels.php:41
-msgid "Background:"
-msgstr ""
-
-#: modules/pref-labels.php:231
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr ""
-
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr ""
-
-#: modules/pref-labels.php:284
-msgid "Clear colors"
-msgstr ""
-
-#: modules/pref-prefs.php:29
-msgid "Old password cannot be blank."
-msgstr ""
-
-#: modules/pref-prefs.php:34
-msgid "New password cannot be blank."
-msgstr ""
-
-#: modules/pref-prefs.php:39
-msgid "Entered passwords do not match."
-msgstr ""
-
-#: modules/pref-prefs.php:63
-msgid "Password has been changed."
-msgstr ""
-
-#: modules/pref-prefs.php:65
-msgid "Old password is incorrect."
-msgstr ""
-
-#: modules/pref-prefs.php:93
-msgid "The configuration was saved."
-msgstr ""
-
-#: modules/pref-prefs.php:109
-#, php-format
-msgid "Unknown option: %s"
-msgstr ""
-
-#: modules/pref-prefs.php:122
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: modules/pref-prefs.php:154
-msgid "Personal data"
-msgstr ""
-
-#: modules/pref-prefs.php:181
-msgid "Full name"
-msgstr ""
-
-#: modules/pref-prefs.php:185
-msgid "E-mail"
-msgstr ""
-
-#: modules/pref-prefs.php:190
-msgid "Access level"
-msgstr ""
-
-#: modules/pref-prefs.php:200
-msgid "Save data"
-msgstr ""
-
-#: modules/pref-prefs.php:212
-msgid "Your password is at default value, please change it."
-msgstr ""
-
-#: modules/pref-prefs.php:240
-msgid "Old password"
-msgstr ""
-
-#: modules/pref-prefs.php:243
-msgid "New password"
-msgstr ""
-
-#: modules/pref-prefs.php:248
-msgid "Confirm password"
-msgstr ""
-
-#: modules/pref-prefs.php:258
-msgid "Change password"
-msgstr ""
-
-#: modules/pref-prefs.php:344
-msgid "Select theme"
-msgstr ""
-
-#: modules/pref-prefs.php:402
-msgid "Customize"
-msgstr ""
-
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
-msgid "Yes"
-msgstr ""
-
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
-msgid "No"
-msgstr ""
-
-#: modules/pref-prefs.php:468
-msgid "Clear"
-msgstr ""
-
-#: modules/pref-prefs.php:494
-msgid "Save configuration"
-msgstr ""
-
-#: modules/pref-prefs.php:497
-msgid "Manage profiles"
-msgstr ""
-
-#: modules/pref-prefs.php:500
-msgid "Reset to defaults"
-msgstr ""
-
-#: modules/pref-users.php:20
-msgid "User details"
-msgstr ""
-
-#: modules/pref-users.php:34
-msgid "User not found"
-msgstr ""
-
-#: modules/pref-users.php:53 modules/pref-users.php:438
-msgid "Registered"
-msgstr ""
-
-#: modules/pref-users.php:54
-msgid "Last logged in"
-msgstr ""
-
-#: modules/pref-users.php:61
-msgid "Subscribed feeds count"
-msgstr ""
-
-#: modules/pref-users.php:65
-msgid "Subscribed feeds"
-msgstr ""
-
-#: modules/pref-users.php:114
-msgid "User Editor"
-msgstr ""
-
-#: modules/pref-users.php:150
-msgid "Access level: "
-msgstr ""
-
-#: modules/pref-users.php:163
-msgid "Change password to"
-msgstr ""
-
-#: modules/pref-users.php:172
-msgid "E-mail: "
-msgstr ""
-
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr ""
-
-#: modules/pref-users.php:254
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr ""
-
-#: modules/pref-users.php:261
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr ""
-
-#: modules/pref-users.php:265
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr ""
-
-#: modules/pref-users.php:285
-#, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
-msgstr ""
-
-#: modules/pref-users.php:289
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr ""
-
-#: modules/pref-users.php:326
-msgid "[tt-rss] Password change notification"
-msgstr ""
-
-#: modules/pref-users.php:385 help/4.php:27
-msgid "Create user"
-msgstr ""
-
-#: modules/pref-users.php:395
-msgid "Reset password"
-msgstr ""
-
-#: modules/pref-users.php:437
-msgid "Access Level"
-msgstr ""
-
-#: modules/pref-users.php:439
-msgid "Last login"
-msgstr ""
-
-#: modules/pref-users.php:487
-msgid "No users defined."
-msgstr ""
-
-#: modules/pref-users.php:489
-msgid "No matching users found."
-msgstr ""
-
-#: help/2.php:1
-msgid "Content filtering"
-msgstr ""
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
-msgstr ""
-
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
-msgstr ""
-
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
-msgstr ""
-
-#: help/2.php:9
-msgid "See also:"
-msgstr ""
-
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr ""
-
-#: help/3.php:5
-msgid "Navigation"
-msgstr ""
-
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr ""
-
-#: help/3.php:9
-msgid "Move between articles"
-msgstr ""
-
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr ""
-
-#: help/3.php:13
-msgid "Active article actions"
-msgstr ""
-
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr ""
-
-#: help/3.php:17
-msgid "Toggle published"
-msgstr ""
-
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr ""
-
-#: help/3.php:19
-msgid "Edit tags"
-msgstr ""
-
-#: help/3.php:20
-msgid "Dismiss selected articles"
-msgstr ""
-
-#: help/3.php:21
-msgid "Dismiss read articles"
-msgstr ""
-
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr ""
-
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr ""
-
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr ""
-
-#: help/3.php:25
-msgid "Email article"
-msgstr ""
-
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr ""
-
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr ""
-
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr ""
-
-#: help/3.php:36
-msgid "Toggle category reordering mode"
-msgstr ""
-
-#: help/3.php:37 help/4.php:34
-msgid "Display this help dialog"
-msgstr ""
-
-#: help/3.php:42
-msgid "Multiple articles actions"
-msgstr ""
-
-#: help/3.php:45
-msgid "Select all articles"
-msgstr ""
-
-#: help/3.php:46
-msgid "Select unread articles"
-msgstr ""
-
-#: help/3.php:47
-msgid "Invert article selection"
-msgstr ""
-
-#: help/3.php:48
-msgid "Deselect all articles"
-msgstr ""
-
-#: help/3.php:51
-msgid "Feed actions"
-msgstr ""
-
-#: help/3.php:54
-msgid "Refresh active feed"
-msgstr ""
-
-#: help/3.php:55
-msgid "Update all feeds"
-msgstr ""
-
-#: help/3.php:58 FeedTree.js:131
-msgid "Edit feed"
-msgstr ""
-
-#: help/3.php:59
-msgid "Sort by name or unread count"
-msgstr ""
-
-#: help/3.php:60
-msgid "Mark feed as read"
-msgstr ""
-
-#: help/3.php:61
-msgid "Reverse headlines order"
-msgstr ""
-
-#: help/3.php:62
-msgid "Mark all feeds as read"
-msgstr ""
-
-#: help/3.php:63
-msgid "If viewing category, (un)collapse it"
-msgstr ""
-
-#: help/3.php:66 help/4.php:5
-msgid "Go to..."
-msgstr ""
-
-#: help/3.php:73
-msgid "Tag cloud"
-msgstr ""
-
-#: help/3.php:80
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: help/3.php:82 help/4.php:41
-msgid "Press any key to close this window."
-msgstr ""
-
-#: help/4.php:9
-msgid "My Feeds"
-msgstr ""
-
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr ""
-
-#: help/4.php:19
-msgid "Panel actions"
-msgstr ""
-
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr ""
-
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr ""
-
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr ""
-
-#: help/4.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-
-#: mobile/functions.php:58 mobile/functions.php:134 mobile/functions.php:170
-#: mobile/functions.php:197 mobile/functions.php:233 mobile/functions.php:372
-#: mobile/prefs.php:25
-msgid "Home"
-msgstr ""
-
-#: mobile/functions.php:408
-msgid "Nothing found (click to reload feed)."
-msgstr ""
-
-#: mobile/prefs.php:30
-msgid "Enable categories"
-msgstr ""
-
-#: mobile/prefs.php:31 mobile/prefs.php:36 mobile/prefs.php:42
-#: mobile/prefs.php:47 mobile/prefs.php:52
-msgid "ON"
-msgstr ""
-
-#: mobile/prefs.php:31 mobile/prefs.php:36 mobile/prefs.php:42
-#: mobile/prefs.php:47 mobile/prefs.php:52
-msgid "OFF"
-msgstr ""
-
-#: mobile/prefs.php:35
-msgid "Browse categories like folders"
-msgstr ""
-
-#: mobile/prefs.php:41
-msgid "Show images in posts"
-msgstr ""
-
-#: mobile/prefs.php:46
-msgid "Hide read articles and feeds"
-msgstr ""
-
-#: mobile/prefs.php:51
-msgid "Sort feeds by unread count"
-msgstr ""
-
-#: digest.js:23 feedlist.js:462 tt-rss.js:521 tt-rss.js:534
-msgid "Mark all articles in %s as read?"
-msgstr ""
-
-#: digest.js:69
-msgid "Mark %d displayed articles as read?"
-msgstr ""
-
-#: digest.js:255 digest.js:688 viewfeed.js:425
-msgid "Unstar article"
-msgstr ""
-
-#: digest.js:257 digest.js:692 viewfeed.js:430
-msgid "Star article"
-msgstr ""
-
-#: digest.js:260 digest.js:723 viewfeed.js:465
-msgid "Unpublish article"
-msgstr ""
-
-#: digest.js:265
-msgid "Original article"
-msgstr ""
-
-#: digest.js:290
-msgid "Error: unable to load article."
-msgstr ""
-
-#: digest.js:442
-msgid "Click to expand article."
-msgstr ""
-
-#: digest.js:517
-msgid "%d more..."
-msgstr ""
-
-#: digest.js:524
-msgid "No unread feeds."
-msgstr ""
-
-#: digest.js:626
-msgid "Load more..."
-msgstr ""
-
-#: feedlist.js:269
-msgid "New articles available in this feed (click to show)"
-msgstr ""
-
-#: FeedTree.js:137
-msgid "Update feed"
-msgstr ""
-
-#: functions.js:72
-msgid ""
-"Are you sure to report this exception to tt-rss.org? The report will include "
-"your browser information. Your IP would be saved in the database."
-msgstr ""
-
-#: functions.js:624
-msgid "Date syntax appears to be correct:"
-msgstr ""
-
-#: functions.js:627
-msgid "Date syntax is incorrect."
-msgstr ""
-
-#: functions.js:763
-msgid "Remove stored feed icon?"
-msgstr ""
-
-#: functions.js:795
-msgid "Please select an image file to upload."
-msgstr ""
-
-#: functions.js:797
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: functions.js:814
-msgid "Please enter label caption:"
-msgstr ""
-
-#: functions.js:819
-msgid "Can't create label: missing caption."
-msgstr ""
-
-#: functions.js:861
-msgid "Subscribe to Feed"
-msgstr ""
-
-#: functions.js:869
-msgid "Subscribing to feed..."
-msgstr ""
-
-#: functions.js:887
-msgid "Subscribed to %s"
-msgstr ""
-
-#: functions.js:892
-msgid "Specified URL seems to be invalid."
-msgstr ""
-
-#: functions.js:895
-msgid "Specified URL doesn't seem to contain any feeds."
-msgstr ""
-
-#: functions.js:931
-msgid "Couldn't download the specified URL."
-msgstr ""
-
-#: functions.js:934
-msgid "You are already subscribed to this feed."
-msgstr ""
-
-#: functions.js:963
-msgid "Create Filter"
-msgstr ""
-
-#: functions.js:973 prefs.js:214
-msgid "Filter Test Results"
-msgstr ""
-
-#: functions.js:1031
-msgid ""
-"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
-"hub again on next feed update."
-msgstr ""
-
-#: functions.js:1052 tt-rss.js:396
-msgid "Unsubscribe from %s?"
-msgstr ""
-
-#: functions.js:1159
-msgid "Please enter category title:"
-msgstr ""
-
-#: functions.js:1190
-msgid "Generate new syndication address for this feed?"
-msgstr ""
-
-#: functions.js:1374 tt-rss.js:375 tt-rss.js:892
-msgid "You can't edit this kind of feed."
-msgstr ""
-
-#: functions.js:1386
-msgid "Edit Feed"
-msgstr ""
-
-#: functions.js:1424
-msgid "More Feeds"
-msgstr ""
-
-#: functions.js:1485 functions.js:1595 prefs.js:439 prefs.js:469 prefs.js:501
-#: prefs.js:659 prefs.js:679 prefs.js:1268 prefs.js:1413
-msgid "No feeds are selected."
-msgstr ""
-
-#: functions.js:1527
-msgid ""
-"Remove selected feeds from the archive? Feeds with stored articles will not "
-"be removed."
-msgstr ""
-
-#: functions.js:1566
-msgid "Feeds with update errors"
-msgstr ""
-
-#: functions.js:1577 prefs.js:1250
-msgid "Remove selected feeds?"
-msgstr ""
-
-#: PrefFilterTree.js:32
-msgid "Inverse"
-msgstr ""
-
-#: prefs.js:114
-msgid "Please enter login:"
-msgstr ""
-
-#: prefs.js:121
-msgid "Can't create user: no login specified."
-msgstr ""
-
-#: prefs.js:183
-msgid "Edit Filter"
-msgstr ""
-
-#: prefs.js:187
-msgid "Remove filter %s?"
-msgstr ""
-
-#: prefs.js:321
-msgid "Remove selected labels?"
-msgstr ""
-
-#: prefs.js:337 prefs.js:1454
-msgid "No labels are selected."
-msgstr ""
-
-#: prefs.js:351
-msgid ""
-"Remove selected users? Neither default admin nor your account will be "
-"removed."
-msgstr ""
-
-#: prefs.js:368 prefs.js:549 prefs.js:570 prefs.js:609
-msgid "No users are selected."
-msgstr ""
-
-#: prefs.js:386
-msgid "Remove selected filters?"
-msgstr ""
-
-#: prefs.js:401 prefs.js:639
-msgid "No filters are selected."
-msgstr ""
-
-#: prefs.js:420
-msgid "Unsubscribe from selected feeds?"
-msgstr ""
-
-#: prefs.js:454
-msgid "Please select only one feed."
-msgstr ""
-
-#: prefs.js:460
-msgid "Erase all non-starred articles in selected feed?"
-msgstr ""
-
-#: prefs.js:482
-msgid "How many days of articles to keep (0 - use default)?"
-msgstr ""
-
-#: prefs.js:520
-msgid "Login field cannot be blank."
-msgstr ""
-
-#: prefs.js:554 prefs.js:575 prefs.js:614
-msgid "Please select only one user."
-msgstr ""
-
-#: prefs.js:579
-msgid "Reset password of selected user?"
-msgstr ""
-
-#: prefs.js:644
-msgid "Please select only one filter."
-msgstr ""
-
-#: prefs.js:701
-msgid "Edit Multiple Feeds"
-msgstr ""
-
-#: prefs.js:725
-msgid "Save changes to selected feeds?"
-msgstr ""
-
-#: prefs.js:815
-msgid "OPML Import"
-msgstr ""
-
-#: prefs.js:834
-msgid "Please choose an OPML file first."
-msgstr ""
-
-#: prefs.js:954
-msgid "Reset to defaults?"
-msgstr ""
-
-#: prefs.js:1170
-msgid "Feed Categories"
-msgstr ""
-
-#: prefs.js:1179
-msgid "Remove selected categories?"
-msgstr ""
-
-#: prefs.js:1198
-msgid "No categories are selected."
-msgstr ""
-
-#: prefs.js:1239
-msgid "Feeds without recent updates"
-msgstr ""
-
-#: prefs.js:1288
-msgid "Replace current OPML publishing address with a new one?"
-msgstr ""
-
-#: prefs.js:1397
-msgid "Rescore articles in selected feeds?"
-msgstr ""
-
-#: prefs.js:1420
-msgid "Rescore all articles? This operation may take a lot of time."
-msgstr ""
-
-#: prefs.js:1440
-msgid "Reset selected labels to default colors?"
-msgstr ""
-
-#: prefs.js:1477
-msgid "Settings Profiles"
-msgstr ""
-
-#: prefs.js:1486
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:1504
-msgid "No profiles are selected."
-msgstr ""
-
-#: prefs.js:1512 prefs.js:1565
-msgid "Activate selected profile?"
-msgstr ""
-
-#: prefs.js:1528 prefs.js:1581
-msgid "Please choose a profile to activate."
-msgstr ""
-
-#: prefs.js:1589
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: prefs.js:1608
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr ""
-
-#: prefs.js:1691
-msgid "Label Editor"
-msgstr ""
-
-#: prefs.js:1755
-msgid ""
-"This will clear your stored authentication information for Twitter. Continue?"
-msgstr ""
-
-#: prefs.js:1826
-msgid "Link Instance"
-msgstr ""
-
-#: prefs.js:1877
-msgid "Edit Instance"
-msgstr ""
-
-#: prefs.js:1926
-msgid "Remove selected instances?"
-msgstr ""
-
-#: prefs.js:1943 prefs.js:1955
-msgid "No instances are selected."
-msgstr ""
-
-#: prefs.js:1960
-msgid "Please select only one instance."
-msgstr ""
-
-#: tt-rss.js:147
-msgid "Mark all articles as read?"
-msgstr ""
-
-#: tt-rss.js:385
-msgid "You can't unsubscribe from the category."
-msgstr ""
-
-#: tt-rss.js:390 tt-rss.js:606 tt-rss.js:1055
-msgid "Please select some feed first."
-msgstr ""
-
-#: tt-rss.js:601
-msgid "You can't rescore this kind of feed."
-msgstr ""
-
-#: tt-rss.js:611
-msgid "Rescore articles in %s?"
-msgstr ""
-
-#: tt-rss.js:1095
-msgid "New version available!"
-msgstr ""
-
-#: viewfeed.js:636 viewfeed.js:664 viewfeed.js:691 viewfeed.js:753
-#: viewfeed.js:785 viewfeed.js:901 viewfeed.js:945 viewfeed.js:995
-#: viewfeed.js:1509
-msgid "No articles are selected."
-msgstr ""
-
-#: viewfeed.js:881
-msgid "Mark all visible articles in %s as read?"
-msgstr ""
-
-#: viewfeed.js:910
-msgid "Delete %d selected articles in %s?"
-msgstr ""
-
-#: viewfeed.js:912
-msgid "Delete %d selected articles?"
-msgstr ""
-
-#: viewfeed.js:954
-msgid "Archive %d selected articles in %s?"
-msgstr ""
-
-#: viewfeed.js:957
-msgid "Move %d archived articles back?"
-msgstr ""
-
-#: viewfeed.js:1001
-msgid "Mark %d selected articles in %s as read?"
-msgstr ""
-
-#: viewfeed.js:1025
-msgid "Edit article Tags"
-msgstr ""
-
-#: viewfeed.js:1175
-msgid "No article is selected."
-msgstr ""
-
-#: viewfeed.js:1210
-msgid "No articles found to mark"
-msgstr ""
-
-#: viewfeed.js:1212
-msgid "Mark %d article(s) as read?"
-msgstr ""
-
-#: viewfeed.js:1376
-msgid "Loading..."
-msgstr ""
-
-#: viewfeed.js:1523
-msgid "Forward article by email"
-msgstr ""
-
-#: viewfeed.js:1920
-msgid "Open original article"
-msgstr ""
-
-#: viewfeed.js:1926
-msgid "View in a tt-rss tab"
-msgstr ""
-
-#: viewfeed.js:1973
-msgid "Remove label"
-msgstr ""
-
-#: viewfeed.js:2078
-msgid "Playing..."
-msgstr ""
-
-#: viewfeed.js:2079
-msgid "Click to pause"
-msgstr ""
-
-#: viewfeed.js:2223
-msgid "Share article by URL"
-msgstr ""
diff --git a/mobile/article.php b/mobile/article.php
index cbdad84da..345767fbd 100644
--- a/mobile/article.php
+++ b/mobile/article.php
@@ -6,13 +6,7 @@
 	define('MOBILE_VERSION', true);
 
 	require_once "../config.php";
-	require_once "functions.php";
-	require_once "../functions.php";
-
-	require_once "../sessions.php";
-
-	require_once "../version.php";
-	require_once "../db-prefs.php";
+	require_once "mobile-functions.php";
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
diff --git a/mobile/cat.php b/mobile/cat.php
index b75a4c046..74d488e1f 100644
--- a/mobile/cat.php
+++ b/mobile/cat.php
@@ -6,13 +6,7 @@
 	define('MOBILE_VERSION', true);
 
 	require_once "../config.php";
-	require_once "functions.php";
-	require_once "../functions.php"; 
-
-	require_once "../sessions.php";
-
-	require_once "../version.php"; 
-	require_once "../db-prefs.php";
+	require_once "mobile-functions.php";
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
diff --git a/mobile/classic/functions.php b/mobile/classic/functions.php
deleted file mode 100644
index 5e1ba8009..000000000
--- a/mobile/classic/functions.php
+++ /dev/null
@@ -1,789 +0,0 @@
-<?php
-	define('TTRSS_SESSION_NAME', 'ttrss_m_sid');
-
-	function render_feeds_list($link) {
-
-		$tags = $_GET["tags"];
-
-		print "<div id=\"heading\">";
-
-		if ($tags) {
-			print __("Tags")."<span id=\"headingAddon\">
-				(<a href=\"index.php\">".__("View feeds")."</a>, ";
-		} else {
-			print __("Feeds")." <span id=\"headingAddon\">
-				(<a href=\"index.php?tags=1\">".__("View tags")."</a>, ";
-		}
-
-		print "<a href=\"index.php?go=sform\">".__("Search")."</a>, ";
-
-		print "<a href=\"logout.php\">".__("Logout")."</a>)</span>";
-		print "</div>";
-
-		print "<ul class=\"feedList\">";
-
-		$owner_uid = $_SESSION["uid"];
-
-		if (!$tags) {
-
-			/* virtual feeds */
-
-			if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
-				$collapsed = get_pref($link, "_COLLAPSED_SPECIAL");
-
-				if ($collapsed == "t" || $collapsed == "1") {
-					$holder_class = "invisible";
-					$ellipsis = "...";
-				} else {
-					$holder_class = "feedCatHolder";
-					$ellipsis = "";
-				}
-
-				$tmp_category = __("Special");
-
-				print "<li class=\"feedCat\">
-					<a href=\"?subop=tc&id=-1\">$tmp_category</a>$ellipsis
-						</li>";
-
-				print "<li class=\"$holder_class\"><ul class=\"feedCatList\">";
-			}
-
-			foreach (array(-4, -3, -1, -2, 0) as $i) {
-				printMobileFeedEntry($i, "virt", false, false, 
-					false, $link);
-			}
-
-			if (get_pref($link, 'ENABLE_FEED_CATS')) {
-				print "</ul>";
-			}
-
-	
-				$result = db_query($link, "SELECT id,caption FROM					
-					ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
-
-				if (db_num_rows($result) > 0) {
-					if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
-						$collapsed = get_pref($link, "_COLLAPSED_LABELS");
-
-						if ($collapsed == "t" || $collapsed == "1") {
-							$holder_class = "invisible";
-							$ellipsis = "...";
-						} else {
-							$holder_class = "feedCatHolder";
-							$ellipsis = "";
-						}
-
-						$tmp_category = __("Labels");
-
-						print "<li class=\"feedCat\">
-							<a href=\"?subop=tc&id=-2\">$tmp_category</a>$ellipsis
-								</li>";
-
-						print "<li class=\"$holder_class\"><ul class=\"feedCatList\">";
-					} else {
-//						print "<li><hr></li>";
-					}
-				}
-		
-				while ($line = db_fetch_assoc($result)) {
-	
-					$count = getFeedUnread($link, -$line["id"]-11);
-	
-					$class = "label";
-	
-					printMobileFeedEntry(-$line["id"]-11, 
-						$class, $line["caption"], $count, false, $link);
-		
-				}
-
-				if (db_num_rows($result) > 0) {
-					if (get_pref($link, 'ENABLE_FEED_CATS')) {
-						print "</ul>";
-					}
-				}
-
-
-			if (get_pref($link, 'ENABLE_FEED_CATS')) {
-				$order_by_qpart = "category,title";
-			} else {
-				$order_by_qpart = "title";
-			}
-
-			$result = db_query($link, "SELECT ttrss_feeds.*,
-				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
-				(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
-					WHERE feed_id = ttrss_feeds.id AND 
-					ttrss_user_entries.ref_id = ttrss_entries.id AND
-					owner_uid = '$owner_uid') AS total,
-				(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,
-				cat_id,last_error,
-				ttrss_feed_categories.title AS category,
-				ttrss_feed_categories.collapsed	
-				FROM ttrss_feeds LEFT JOIN ttrss_feed_categories 
-					ON (ttrss_feed_categories.id = cat_id)				
-				WHERE 
-					ttrss_feeds.owner_uid = '$owner_uid'
-				ORDER BY $order_by_qpart"); 
-
-			$actid = $_GET["actid"];
-	
-			/* real feeds */
-	
-			$lnum = 0;
-	
-			$category = "";
-
-			while ($line = db_fetch_assoc($result)) {
-				if (get_pref($link, 'HIDE_READ_FEEDS') && (int)$line['unread']==0) {
-					continue;
-				}
-
-				$feed = db_unescape_string($line["title"]);
-				$feed_id = $line["id"];	  
-	
-				$subop = $_GET["subop"];
-				
-				$total = $line["total"];
-				$unread = $line["unread"];
-
-				$rtl_content = sql_bool_to_bool($line["rtl_content"]);
-
-				if ($rtl_content) {
-					$rtl_tag = "dir=\"RTL\"";
-				} else {
-					$rtl_tag = "";
-				}
-
-				$cat_id = $line["cat_id"];
-
-				$tmp_category = $line["category"];
-
-				if (!$tmp_category) {
-					$tmp_category = "Uncategorized";
-				}
-				
-	//			$class = ($lnum % 2) ? "even" : "odd";
-
-				if ($line["last_error"]) {
-					$class = "error";
-				} else {
-					$class = "feed";
-				}
-	
-				if ($category != $tmp_category && get_pref($link, 'ENABLE_FEED_CATS')) {
-				
-					if ($category) {
-						print "</ul></li>";
-					}
-				
-					$category = $tmp_category;
-
-					$collapsed = $line["collapsed"];
-
-					// workaround for NULL category
-					if ($category == "Uncategorized") {
-						$collapsed = get_pref($link, "_COLLAPSED_UNCAT");
-					}
-
-					if ($collapsed == "t" || $collapsed == "1") {
-						$holder_class = "invisible";
-						$ellipsis = "...";
-					} else {
-						$holder_class = "feedCatHolder";
-						$ellipsis = "";
-					}
-
-					if ($cat_id) {
-						$cat_id_qpart = "cat_id = '$cat_id'";
-					} else {
-						$cat_id_qpart = "cat_id IS NULL";
-					}
-
-					$cat_id = sprintf("%d", $cat_id);
-					$cat_unread = getCategoryUnread($link, $cat_id);
-
-					if ($cat_unread > 0) {
-						$catctr_class = "";
-					} else {
-						$catctr_class = "invisible";
-					}
-
-					print "<li class=\"feedCat\">
-						<a href=\"?subop=tc&id=$cat_id\">$tmp_category</a>
-							<a href=\"?go=vf&id=$cat_id&cat=true\">
-								<span class=\"$catctr_class\">($cat_unread)$ellipsis</span>
-							</a></li>";
-
-					print "<li id=\"feedCatHolder\" class=\"$holder_class\">
-						<ul class=\"feedCatList\">";
-				}
-	
-				printMobileFeedEntry($feed_id, $class, $feed, $unread, 
-					false, $link, $rtl_content);
-	
-				++$lnum;
-			}
-
-		} else {
-			// tags
-
-			$result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id) 
-				FROM ttrss_user_entries WHERE int_id = post_int_id 
-					AND unread = true)) AS count FROM ttrss_tags 
-				WHERE owner_uid = '".$_SESSION['uid']."' GROUP BY tag_name ORDER BY tag_name");
-
-			$tags = array();
-	
-			while ($line = db_fetch_assoc($result)) {
-				$tags[$line["tag_name"]] += $line["count"];
-			}
-	
-			foreach (array_keys($tags) as $tag) {
-	
-				$unread = $tags[$tag];
-	
-				$class = "tag";
-	
-				printMobileFeedEntry($tag, $class, $tag, $unread, 
-					"../images/tag.png", $link);
-	
-			} 
-
-			
-		}	
-	}
-
-	function printMobileFeedEntry($feed_id, $class, $feed_title, $unread, $icon_file, $link,
-		$rtl_content = false) {
-
-		if (!$feed_title) $feed_title = getFeedTitle($link, $feed_id, false);
-		if (!$unread) $unread = getFeedUnread($link, $feed_id);	
-
-		if ($unread > 0) $class .= "Unread";
-
-		if (!$icon_file) $icon_file = "../../" . getFeedIcon($feed_id);
-
-		if (file_exists($icon_file) && filesize($icon_file) > 0) {
-				$feed_icon = "<img src=\"$icon_file\">";
-		} else {
-			$feed_icon = "<img src=\"../../images/blank_icon.gif\">";
-		}
-
-		if ($rtl_content) {
-			$rtl_tag = "dir=\"rtl\"";
-		} else {
-			$rtl_tag = "dir=\"ltr\"";
-		}
-
-		$feed = "<a href=\"?go=vf&id=$feed_id\">$feed_title</a>";
-
-		print "<li class=\"$class\">";
-		print "$feed_icon";
-		print "<span $rtl_tag>$feed</span> ";
-
-		if ($unread != 0) {
-			print "<span $rtl_tag>($unread)</span>";
-		}
-		
-		print "</li>";
-
-	}
-
-	function render_headlines($link) {
-
-		$feed = db_escape_string($_GET["id"]);
-		$limit = db_escape_string($_GET["limit"]);
-		$view_mode = db_escape_string($_GET["viewmode"]);
-		$cat_view = db_escape_string($_GET["cat"]);
-		$subop = $_GET["subop"];
-		$catchup_op = $_GET["catchup_op"];
-
-		if (!$view_mode) {
-			if ($_SESSION["mobile:viewmode"]) {
-				$view_mode = $_SESSION["mobile:viewmode"];
-			} else {			
-				$view_mode = "adaptive";
-			}
-		}
-
-		$_SESSION["mobile:viewmode"] = $view_mode;
-
-		if (!$limit) $limit = 30;
-		if (!$feed) $feed = 0;
-
-		if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
-
-			$result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
-				WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
-
-			if (db_num_rows($result) == 1) {
-				$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
-			} else {
-				$rtl_content = false;
-			}
-
-			if ($rtl_content) {
-				$rtl_tag = "dir=\"RTL\"";
-			} else {
-				$rtl_tag = "";
-			}
-		} else {
-			$rtl_content = false;
-			$rtl_tag = "";
-		}
-
-		print "<div id=\"headlines\" $rtl_tag>";
-
-		if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
-			update_generic_feed($link, $feed, $cat_view, true);
-		}
-
-		if ($subop == "MarkAllRead" || $catchup_op == "feed")  {
-			catchup_feed($link, $feed, $cat_view);
-		}
-
-		if ($catchup_op == "selection") {
-			if (is_array($_GET["sel_ids"])) {
-				$ids_to_mark = array_keys($_GET["sel_ids"]);
-				if ($ids_to_mark) {
-					foreach ($ids_to_mark as $id) {
-						db_query($link, "UPDATE ttrss_user_entries SET 
-							unread = false,last_read = NOW()
-							WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-					}
-				}
-			}
-		}
-
-		if ($subop == "MarkPageRead" || $catchup_op == "page") {
-			$ids_to_mark = $_SESSION["last_page_ids.$feed"];
-
-			if ($ids_to_mark) {
-
-				foreach ($ids_to_mark as $id) {
-					db_query($link, "UPDATE ttrss_user_entries SET 
-						unread = false,last_read = NOW()
-						WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-				}
-			}
-		}
-
-
-		/// START /////////////////////////////////////////////////////////////////////////////////
-
-		$search = db_escape_string($_GET["query"]);
-		$search_mode = db_escape_string($_GET["search_mode"]);
-		$match_on = db_escape_string($_GET["match_on"]);
-
-		if (!$match_on) {
-			$match_on = "both";
-		}
-
-		$real_offset = $offset * $limit;
-
-		if ($_GET["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
-
-		$qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, 
-			$search, $search_mode, $match_on, false, $real_offset);
-
-		if ($_GET["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
-
-		$result = $qfh_ret[0];
-		$feed_title = $qfh_ret[1];
-		$feed_site_url = $qfh_ret[2];
-		$last_error = $qfh_ret[3];
-		
-		/// STOP //////////////////////////////////////////////////////////////////////////////////
-
-		if (!$result) {
-			print "<div align='center'>".
-				__("Could not display feed (query failed). Please check label match syntax or local configuration.").
-				"</div>";
-			return;
-		}
-
-		print "<div id=\"heading\">";
-		#		if (!$cat_view && file_exists("../icons/$feed.ico") && filesize("../icons/$feed.ico") > 0) {
-			#			print "<img class=\"feedIcon\" src=\"../icons/$feed.ico\">";
-			#		}
-		
-		print "$feed_title <span id=\"headingAddon\">(";
-		print "<a href=\"index.php\">".__("Back")."</a>, ";
-		print "<a href=\"index.php?go=sform&aid=$feed&ic=$cat_view\">".__("Search")."</a>, ";
-		print "<a href=\"index.php?go=vf&id=$feed&subop=ForceUpdate\">".__("Update")."</a>";
-
-#		print "Mark as read: ";
-#		print "<a href=\"index.php?go=vf&id=$feed&subop=MarkAsRead\">Page</a>, ";
-#		print "<a href=\"index.php?go=vf&id=$feed&subop=MarkAllRead\">Feed</a>";
-
-		print ")</span>";
-
-		print "&nbsp;" . __('View:');
-
-		print "<form style=\"display : inline\" method=\"GET\" action=\"index.php\">";
-
-		/* print "<select name=\"viewmode\">
-			<option selected value=\"adaptive\"> " . __('Adaptive') . "</option>
-			<option value=\"all_articles\">" . __('All Articles') . "</option>
-			<option value=\"marked\">" . __('Starred') . "</option>
-			<option value=\"unread\">" . __('Unread') . "</option>
-			</select>"; */
-
-		$sel_values = array(
-			"adaptive" => __("Adaptive"),
-			"all_articles" => __("All Articles"),
-			"unread" => __("Unread"),
-			"marked" => __("Starred"));
-
-		print_select_hash("viewmode", $view_mode, $sel_values);
-
-		print "<input type=\"hidden\" name=\"id\" value=\"$feed\">
-		<input type=\"hidden\" name=\"cat\" value=\"$cat_view\">
-		<input type=\"hidden\" name=\"go\" value=\"vf\">
-		<input type=\"submit\" value=\"".__('Refresh')."\">";
-		print "</form>";
-
-		print "</div>";
-	
-		if (db_num_rows($result) > 0) {
-
-			print "<form method=\"GET\" action=\"index.php\">";
-			print "<input type=\"hidden\" name=\"go\" value=\"vf\">";
-			print "<input type=\"hidden\" name=\"id\" value=\"$feed\">";
-			print "<input type=\"hidden\" name=\"cat\" value=\"$cat_view\">";
-
-			print "<ul class=\"headlines\" id=\"headlines\">";
-
-			$page_art_ids = array();
-			
-			$lnum = 0;
-	
-			error_reporting (DEFAULT_ERROR_LEVEL);
-	
-			$num_unread = 0;
-	
-			while ($line = db_fetch_assoc($result)) {
-
-				$class = ($lnum % 2) ? "even" : "odd";
-	
-				$id = $line["id"];
-				$feed_id = $line["feed_id"];
-
-				array_push($page_art_ids, $id);
-	
-				if ($line["last_read"] == "" && 
-						($line["unread"] != "t" && $line["unread"] != "1")) {
-	
-					$update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\" 
-						alt=\"".__("Updated")."\">";
-				} else {
-					$update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\" 
-						alt=\"".__("Updated")."\">";
-				}
-	
-				if ($line["unread"] == "t" || $line["unread"] == "1") {
-					$class .= "Unread";
-					++$num_unread;
-					$is_unread = true;
-				} else {
-					$is_unread = false;
-				}
-	
-				if ($line["marked"] == "t" || $line["marked"] == "1") {
-					$marked_pic = "<img alt=\"S\" class='marked' src=\"../../images/mark_set.png\">";
-				} else {
-					$marked_pic = "<img alt=\"s\" class='marked' src=\"../../images/mark_unset.png\">";
-				}
-
-				if ($line["published"] == "t" || $line["published"] == "1") {
-					$published_pic = "<img alt=\"P\" class='marked' src=\"../../images/pub_set.gif\">";
-				} else {
-					$published_pic = "<img alt=\"p\" class='marked' src=\"../../images/pub_unset.gif\">";
-				}
-
-				$content_link = "<a href=\"?go=view&id=$id&cat=$cat_view&ret_feed=$feed&feed=$feed_id\">" .
-					$line["title"] . "</a>";
-
-				$updated_fmt = make_local_datetime($link, $line['updated'], false);
-
-				print "<li class='$class' id=\"HROW-$id\">";
-
-				print "<input type=\"checkbox\" name=\"sel_ids[$id]\"
-				  	id=\"HSCB-$id\" onchange=\"toggleSelectRow(this, $id)\">";
-
-				print "<a href=\"?go=vf&id=$feed&ts=$id&cat=$cat_view\">$marked_pic</a>";
-				print "<a href=\"?go=vf&id=$feed&tp=$id&cat=$cat_view\">$published_pic</a>";
-
-				print $content_link;
-	
-				if ($line["feed_title"]) {			
-					print " (<a href='?go=vf&id=$feed_id'>".
-							$line["feed_title"]."</a>)";
-				}
-
-				print "<span class='hlUpdated'> ($updated_fmt)</span>";
-
-				print "</li>";
-
-	
-				++$lnum;
-			}
-
-			print "</ul>";
-
-			print "<div class='footerAddon'>";
-
-			$_SESSION["last_page_ids.$feed"] = $page_art_ids;
-
-/*			print "<a href=\"index.php?go=vf&id=$feed&subop=MarkPageRead\">Page</a>, ";
-			print "<a href=\"index.php?go=vf&id=$feed&subop=MarkAllRead\">Feed</a></div>"; */
-
-			print "Select: 
-				<a href=\"javascript:selectHeadlines(1)\">".__("All")."</a>,
-				<a href=\"javascript:selectHeadlines(2)\">".__("Unread")."</a>,
-				<a href=\"javascript:selectHeadlines(3)\">".__("None")."</a>,
-				<a href=\"javascript:selectHeadlines(4)\">".__("Invert")."</a>";
-
-			print " ";
-
-			print "<select name=\"catchup_op\">
-				<option value=\"selection\">".__("Selection")."</option>
-				<option value=\"page\">".__("Page")."</option>
-				<option value=\"feed\">".__("Entire feed")."</option>
-			</select>
-			<input type=\"hidden\" name=\"cat\" value=\"$cat_view\">
-			<input type=\"submit\" value=\"".__("Mark as read")."\">";
-
-			print "</form>";
-
-		} else {
-			print "<div align='center'>No articles found.</div>";
-		}
-
-	}
-
-	function render_article($link) {
-
-		$id = db_escape_string($_GET["id"]);
-		$feed_id = db_escape_string($_GET["feed"]);
-		$ret_feed_id = db_escape_string($_GET["ret_feed"]);
-		$cat_view = db_escape_string($_GET["cat"]);
-
-		$result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
-			WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
-
-		if (db_num_rows($result) == 1) {
-			$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
-		} else {
-			$rtl_content = false;
-		}
-
-		if ($rtl_content) {
-			$rtl_tag = "dir=\"RTL\"";
-			$rtl_class = "RTL";
-		} else {
-			$rtl_tag = "";
-			$rtl_class = "";
-		}
-
-		$result = db_query($link, "UPDATE ttrss_user_entries 
-			SET unread = false,last_read = NOW() 
-			WHERE ref_id = '$id' AND feed_id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
-
-		$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
-			marked,published,
-			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
-			(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
-			num_comments,
-			author
-			FROM ttrss_entries,ttrss_user_entries
-			WHERE	id = '$id' AND ref_id = id");
-
-		if ($result) {
-
-			$line = db_fetch_assoc($result);
-
-			$num_comments = $line["num_comments"];
-			$entry_comments = "";
-
-			if ($num_comments > 0) {
-				if ($line["comments"]) {
-					$comments_url = $line["comments"];
-				} else {
-					$comments_url = $line["link"];
-				}
-				$entry_comments = "<a href=\"$comments_url\">$num_comments comments</a>";
-			} else {
-				if ($line["comments"] && $line["link"] != $line["comments"]) {
-					$entry_comments = "<a href=\"".$line["comments"]."\">comments</a>";
-				}				
-			}
-
-			$tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM
-				ttrss_tags WHERE post_int_id = " . $line["int_id"] . "
-				ORDER BY tag_name");
-	
-			$tags_str = "";
-			$f_tags_str = "";
-
-			$num_tags = 0;
-
-			while ($tmp_line = db_fetch_assoc($tmp_result)) {
-				$num_tags++;
-				$tag = $tmp_line["tag_name"];				
-				$tag_str = "<a href=\"?go=vf&id=$tag\">$tag</a>, "; 
-				$tags_str .= $tag_str;
-			}
-
-			$tags_str = preg_replace("/, $/", "", $tags_str);
-
-			$parsed_updated = date(get_pref($link, 'SHORT_DATE_FORMAT'), 
-				strtotime($line["updated"]));
-
-			print "<div id=\"heading\">";
-
-			#			if (file_exists("../icons/$feed_id.ico") && filesize("../icons/$feed_id.ico") > 0) {
-				#				print "<img class=\"feedIcon\" src=\"../icons/$feed_id.ico\">";
-				#			}
-
-			if (!$cat_view) {
-				$feed_title = getFeedTitle($link, $ret_feed_id);
-			} else {
-				$feed_title = getCategoryTitle($link, $ret_feed_id);
-				$feed_title_native = getFeedTitle($link, $feed_id);
-			}
-
-			if ($feed_title_native) {
-				$feed_link = "<a href=\"index.php?go=vf&id=$feed_id\">$feed_title_native</a>";
-				$feed_link .= " in <a href=\"index.php?go=vf&id=$ret_feed_id&cat=$cat_view\">
-					$feed_title</a>";
-			} else {
-				$feed_link = "<a href=\"index.php?go=vf&id=$ret_feed_id\">$feed_title</a>";
-			}
-
-			$feedlist = "<a href=\"index.php\">".__('Back to feedlist')."</a>";
-
-			print "<a href=\"" . $line["link"] . "\">" . 
-				truncate_string($line["title"], 30) . "</a>";
-			print " <span id=\"headingAddon\">$parsed_updated ($feed_link, $feedlist)</span>";
-			print "</div>";
-
-			if ($num_tags > 0) {
-				print "<div class=\"postTags\">".__("Tags:")." $tags_str</div>";
-			}
-
-			if ($line["marked"] == "t" || $line["marked"] == "1") {
-				$marked_pic = "<img class='marked' src=\"../../images/mark_set.png\">";
-			} else {
-				$marked_pic = "<img class='marked' src=\"../../images/mark_unset.png\">";
-			}
-
-			if ($line["published"] == "t" || $line["published"] == "1") {
-				$published_pic = "<img class='marked' src=\"../../images/pub_set.gif\">";
-			} else {
-				$published_pic = "<img class='marked' src=\"../../images/pub_unset.gif\">";
-			}
-
-
-			print "<div class=\"postStarOps\">";
-			print "<a title=\"".__('Toggle starred')."\"href=\"?go=view&id=$id&ret_feed=$ret_feed_id&feed=$feed_id&sop=ts\">$marked_pic</a>";
-			print "<a title=\"".__('Toggle published')."\" href=\"?go=view&id=$id&ret_feed=$ret_feed_id&feed=$feed_id&sop=tp\">$published_pic</a>";
-			// Mark unread
-			print "<a title=\"".__('Mark as unread')."\" href=\"?go=vf&id=$ret_feed_id&feed=$feed_id&sop=mu&aid=$id";
-			if ($cat_view) { print "&cat=$cat_view"; }
-			print "\"><img class='marked' src=\"../../images/art-set-unread.png\"></a>";
-			print "</div>";
-
-			print sanitize_rss($link, $line["content"], true);; 
-		
-		}
-
-		print "</body></html>";
-	}
-
-	function render_search_form($link, $active_feed_id = false, $is_cat = false) {
-
-		print "<div id=\"heading\">";
-
-		print __("Search")." <span id=\"headingAddon\">
-				(<a href=\"index.php\">".__("Go back")."</a>)</span></div>";
-
-		print "<form method=\"GET\" action=\"index.php\" class=\"searchForm\">";
-
-		print "<input type=\"hidden\" name=\"go\" value=\"vf\">";
-		print "<input type=\"hidden\" name=\"id\" value=\"$active_feed_id\">";
-		print "<input type=\"hidden\" name=\"cat\" value=\"$is_cat\">";
-
-		print "<table><tr><td>".__('Search:')."</td><td>";
-		print "<input name=\"query\"></td></tr>";
-
-		print "<tr><td>".__('Where:')."</td><td>";
-		
-		print "<select name=\"search_mode\">
-			<option value=\"all_feeds\">".__('All feeds')."</option>";
-			
-		$feed_title = getFeedTitle($link, $active_feed_id);
-
-		if (!$is_cat) {
-			$feed_cat_title = getFeedCatTitle($link, $active_feed_id);
-		} else {
-			$feed_cat_title = getCategoryTitle($link, $active_feed_id);
-		}
-			
-		if ($active_feed_id && !$is_cat) {				
-			print "<option selected value=\"this_feed\">$feed_title</option>";
-		} else {
-			print "<option disabled>".__('This feed')."</option>";
-		}
-
-		if ($is_cat) {
-		  	$cat_preselected = "selected";
-		}
-
-		if (get_pref($link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
-			print "<option $cat_preselected value=\"this_cat\">$feed_cat_title</option>";
-		} else {
-			//print "<option disabled>".__('This category')."</option>";
-		}
-
-		print "</select></td></tr>"; 
-
-		print "<tr><td>".__('Match on:')."</td><td>";
-
-		$search_fields = array(
-			"title" => __("Title"),
-			"content" => __("Content"),
-			"both" => __("Title or content"));
-
-		print_select_hash("match_on", 3, $search_fields); 
-				
-		print "</td></tr></table>";
-
-		print "<input type=\"submit\" value=\"".__('Search')."\">";
-
-		print "</form>";
-
-		print "</div>";
-	}
-
-	function toggleMarked($link, $ts_id) {
-		$result = db_query($link, "UPDATE ttrss_user_entries SET marked = NOT marked
-			WHERE ref_id = '$ts_id' AND owner_uid = " . $_SESSION["uid"]);
-	}
-
-	function togglePublished($link, $tp_id) {
-		$result = db_query($link, "UPDATE ttrss_user_entries SET published = NOT published
-			WHERE ref_id = '$tp_id' AND owner_uid = " . $_SESSION["uid"]);
-	}
-
-	function markUnread($link, $mu_id) {
-		$result = db_query($link, "UPDATE ttrss_user_entries SET unread = true 
-			WHERE ref_id = '$mu_id' AND owner_uid = " . $_SESSION["uid"]);
-	}
-
-?>
diff --git a/mobile/classic/index.php b/mobile/classic/index.php
deleted file mode 100644
index db2215b24..000000000
--- a/mobile/classic/index.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	define('MOBILE_VERSION', true);
-
-	require_once "../../config.php";
-	require_once "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, 2);
-
-	/* perform various redirect-needing subops */
-
-	$subop = db_escape_string($_GET["subop"]);
-	$go = $_GET["go"];
-
-	if ($subop == "tc" && !$go) {
-
-		$cat_id = db_escape_string($_GET["id"]);
-		toggle_collapse_cat($link, $cat_id);
-
-		header("Location: index.php");
-		return;
-	}
-
-	$ts_id = db_escape_string($_GET["ts"]);
-
-	if ($go == "vf" && $ts_id) {
-
-		toggleMarked($link, $ts_id);
-
-		$query_string = preg_replace("/&ts=[0-9]*/", "", $_SERVER["QUERY_STRING"]);
-		header("Location: index.php?$query_string");
-		return;
-	}
-
-	$tp_id = db_escape_string($_GET["tp"]);
-
-	if ($go == "vf" && $tp_id) {
-
-		togglePublished($link, $tp_id);
-
-		$query_string = preg_replace("/&tp=[0-9]*/", "", $_SERVER["QUERY_STRING"]);
-		header("Location: index.php?$query_string");
-		return;
-	}
-
-	$sop = db_escape_string($_GET["sop"]);
-
-	if ($sop) {
-		if ($go == "view") {
-			$a_id = db_escape_string($_GET["id"]);
-		} elseif ($go == "vf") {
-			$a_id = db_escape_string($_GET["aid"]);
-		}
-
-		if ($a_id) {
-
-			if ($sop == "tp") {
-				togglePublished($link, $a_id);
-			}
-
-			if ($sop == "ts") {
-				toggleMarked($link, $a_id);
-			}
-
-			if ($sop == "mu") {
-				markUnread($link, $a_id);
-			}
-
-			$query_string = str_replace("&sop=$sop", "", $_SERVER["QUERY_STRING"]);
-			header("Location: index.php?$query_string");
-		}
-	}
-
-?>
-<html>
-<head>
-	<title>Tiny Tiny RSS</title>
-	<link rel="stylesheet" type="text/css" href="mobile.css">
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript" src="mobile.js"></script>
-	<?php print_user_stylesheet($link) ?>
-</head>
-<body id="ttrssMobile">
-
-<div id="content">
-<?php
-	if (!$go) {
-		render_feeds_list($link);
-	} else if ($go == "vf") {
-		render_headlines($link);
-	} else if ($go == "view") {
-		render_article($link);
-	} else if ($go == "sform") {
-		render_search_form($link, $_GET["aid"], $_GET["ic"]);
-	} else {
-		print __("Internal error: Function not implemented");
-	}
-
-?>
-</div>
-
-</body>
-</html>
diff --git a/mobile/classic/login_form.php b/mobile/classic/login_form.php
deleted file mode 100644
index bf4f77eac..000000000
--- a/mobile/classic/login_form.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<html>
-<head>
-	<title>Tiny Tiny RSS : Login</title>
-	<link rel="stylesheet" type="text/css" href="mobile.css">
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript" charset="utf-8" src="mobile.js"></script>
-</head>
-
-<script type="text/javascript">
-function init() {
-
-	if (arguments.callee.done) return;
-	arguments.callee.done = true;		
-
-	var login = document.forms["loginForm"].login;
-	var click = document.forms["loginForm"].click;
-
-	login.focus();
-	click.disabled = false;
-
-}
-function languageChange(elem) {
-	try {
-		document.forms['loginForm']['click'].disabled = true;
-	
-		var lang = elem[elem.selectedIndex].value;
-		setCookie("ttrss_lang", lang, <?php print SESSION_COOKIE_LIFETIME ?>);
-		window.location.reload();
-	} catch (e) {
-		exception_error("languageChange", e);
-	}
-}
-
-</script>
-
-<script type="text/javascript">
-if (document.addEventListener) {
-	document.addEventListener("DOMContentLoaded", init, null);
-}
-window.onload = init;
-</script>
-
-
-<body>
-
-	<div id="content">
-	<div id="heading">Tiny Tiny RSS</div>
-
-	<form action="index.php" method="POST" name="loginForm">
-	<input type="hidden" name="rt" value="<?php echo $_GET['rt'] ?>">
-	<input type="hidden" name="login_action" value="do_login">
-
-	<?php if ($_SESSION['login_error_msg']) { ?>
-		<div class="loginError"><?php echo $_SESSION['login_error_msg'] ?></div>
-		<?php $_SESSION['login_error_msg'] = ""; ?>
-	<?php } ?>
-
-	<table>
-		<tr><td align='right'><?php echo __("Login:") ?></td><td><input type="text" name="login"></td>
-		<tr><td align='right'><?php echo __("Password:") ?></td><td><input type="password" name="password"></tr>
-
-		<tr><td align="right"><?php echo __("Language:") ?></td>
-		<td>
-			<?php
-				print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(),
-					"style='width : 100%' onchange='languageChange(this)'");
-
-			?>
-		</td></tr>
-		<tr><td colspan='2'>
-		<input type="submit" class="button" value="<?php echo __('Log in') ?>" name="click">
-		</td></tr>
-		</table>
-	</form>
-	</div>
-
-</body>
-</html>
-
diff --git a/mobile/classic/logout.php b/mobile/classic/logout.php
deleted file mode 100644
index b20cfc9a6..000000000
--- a/mobile/classic/logout.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php	
-	require_once "functions.php";
-	require_once "../../sessions.php";
-	require_once "../../functions.php";
-
-	logout_user();
-
-	header("Location: index.php");
-?>
diff --git a/mobile/classic/mobile.css b/mobile/classic/mobile.css
deleted file mode 100644
index 786639efd..000000000
--- a/mobile/classic/mobile.css
+++ /dev/null
@@ -1,216 +0,0 @@
-body {
-	padding : 0px;
-	margin : 0px;
-	font-family : sans-serif;
-}
-
-h1 {
-	font-size : medium;	
-}
-
-h2 {
-	font-size : medium;
-	font-weight : bold;
-	border-width : 0px 0px 1px 0px;
-	border-style : solid;
-	border-color : #88b0ff;
-}
-
-h3 {
-	font-size : medium;
-	font-weight : bold;
-	border-width : 0px 0px 1px 0px;
-	border-style : solid;
-	border-color : #e0e0e0;
-}
-
-#heading {
-	font-size : small;
-
-	border-width : 0px 0px 1px 0px;
-	border-style : solid;
-	border-color : #f0f0f0;
-
-	color : #88b0ff;
-	font-weight : bold;
-}
-
-#content {
-	background : white;
-}
-
-#footer {
-	font-size : x-small;
-	color : gray;
-	margin-top : 5px;
-}
-
-form {
-	padding : 0px;
-	margin : 0px;
-}
-
-li.feedCatHolder {
-	display : inline;
-}
-
-ul.feedList {
-	list-style-type : none;
-	margin : 0px;
-	padding : 0px;
-
-}
-
-ul.feedList li.feedCat {
-	margin : 0px;
-	padding : 0px;
-	color : #707070;
-}
-
-ul.feedList li.feedCat a {
-	color : #707070;
-}
-
-ul.feedList li.feedCat a:hover {
-	color : #4684ff;
-}
-
-ul.feedCatList {
-	list-style-type : none;
-	margin : 0px 0px 0px 1em;
-	padding : 0px;	
-}
-
-ul.feedCatList li {
-	margin : 0px;
-	padding : 0px;
-	color : black;
-}
-
-ul.feedList li {
-	margin : 0px;
-}
-
-hr {
-	border-width : 0px 0px 1px 0px;
-	border-style : dashed;
-	border-color : #e0e0e0;
-}
-
-ul.headlines a, ul.feedList a {
-	color : black;
-}
-
-a {
-	color : #4684ff;
-	text-decoration : none;
-}
-
-a:hover {
-	color : black;
-}
-
-ul.feedList img, img.tinyFeedIcon {
-	margin : 0px 3px 0px 0px;
-	width : 16px;
-	height : 16px;
-	border-width : 0px;
-}
-
-ul.feedlist li.feedUnread, 
-ul.feedlist li.errorUnread, 
-ul.feedlist li.labelUnread, 
-ul.feedlist li.virtUnread,
-ul.feedlist li.tagUnread {
-	font-weight : bold;
-}
-
-.even {
-/*	background-color : #9bbdff; */
-	border-width : 0px 0px 1px 0px;
-	border-color : #88b0ff;
-	border-style : solid;
-	background-color : #cbddff;
-}
-
-.odd {
-	border-width : 0px 0px 1px 0px;
-	border-color : #88b0ff;
-	border-style : solid;
-}
-
-.evenUnread {
-	border-width : 0px 0px 1px 0px;
-	border-color : #88b0ff;
-	border-style : solid;
-/*	background-color : #9bbdff; */
-	font-weight : bold;
-	background-color : #cbddff;
-}
-
-.oddUnread {
-	border-width : 0px 0px 1px 0px;
-	border-color : #88b0ff;
-	border-style : solid;
-	font-weight : bold;
-}
-
-.evenSelected, .oddSelected, .evenUnreadSelected, .oddUnreadSelected {
-	background-color : #fff7d5;
-	border-width : 0px 0px 1px 0px;
-	border-color : #88b0ff;
-	border-style : solid;
-}
-
-.evenUnreadSelected, .oddUnreadSelected {
-	font-weight : bold;
-}
-
-.invisible {
-	display : none;
-}
-
-ul.headlines {
-	list-style-type : none;
-	margin : 0px;
-	padding : 0px;
-}
-
-ul.headlines span.hlUpdated {
-	color : gray;
-}
-
-ul.headlines img.feedIcon {
-	width : 25px;
-	text-align : center;
-}
-
-ul.headlines img.marked {
-	border-width : 0px;
-}
-
-div.postStarOps img.marked {
-	border-width : 0px;
-}
-
-div.postTags {
-	color : gray;
-	font-size : small;
-}
-
-div.footerAddon {
-	font-size : small;
-}
-
-.loginError {
-	color : red;
-	margin : 0.5em;
-}
-
-form.searchForm {
-	margin : 5px;
-}
-
-div.postStarOps {
-	float : right;
-}
diff --git a/mobile/classic/mobile.js b/mobile/classic/mobile.js
deleted file mode 100644
index 599e00725..000000000
--- a/mobile/classic/mobile.js
+++ /dev/null
@@ -1,94 +0,0 @@
-function toggleSelectRow(cb, id) {	
-	try {
-
-		var row = document.getElementById("HROW-" + id);
-		var checked = cb.checked;
-		if (row) {
-			var unread = row.className.match("Unread");
-			var new_classname = row.className;
-
-			new_classname = new_classname.replace("Selected", "");
-			new_classname = new_classname.replace("Unread", "");
-
-			if (unread) new_classname = new_classname + "Unread";
-			if (checked) new_classname = new_classname + "Selected";
-
-			row.className = new_classname;
-		}
-	} catch (e) {
-		exception_error("toggleSelectRow", e);
-	}
-}
-
-function selectHeadlines(mode) {
-	try {
-
-	var cboxes = document.getElementsByTagName("INPUT");
-
-	for (var i = 0; i < cboxes.length; i++) {
-		if (cboxes[i].id && cboxes[i].id.match("HSCB-")) {
-			var row_id = cboxes[i].id.replace("HSCB-", "")
-			var row = document.getElementById("HROW-" + row_id);
-
-			if (row) {
-
-				if (mode == 1) {
-					cboxes[i].checked = true;
-					toggleSelectRow(cboxes[i], row_id);
-				}
-
-				if (mode == 2) {
-
-					var unread = row.className.match("Unread");
-
-					if (unread) {
-						cboxes[i].checked = true;
-					} else {
-						cboxes[i].checked = false;
-					}
-				}
-
-				if (mode == 3) {
-					cboxes[i].checked = false;
-				}
-
-				if (mode == 4) {
-					cboxes[i].checked = !cboxes[i].checked;
-				}
-
-				toggleSelectRow(cboxes[i], row_id);
-
-			}
-
-		}
-
-	}
-
-	} catch (e) {
-		exception_error("selectHeadlines", e);
-	}
-}
-
-function exception_error(location, e, silent) {
-	var msg;
-
-	if (e.fileName) {
-		var base_fname = e.fileName.substring(e.fileName.lastIndexOf("/") + 1);
-	
-		msg = "Exception: " + e.name + ", " + e.message + 
-			"\nFunction: " + location + "()" +
-			"\nLocation: " + base_fname + ":" + e.lineNumber;
-
-	} else if (e.description) {
-		msg = "Exception: " + e.description + "\nFunction: " + location + "()";
-	} else {
-		msg = "Exception: " + e + "\nFunction: " + location + "()";
-	}
-
-	debug("<b>EXCEPTION: " + msg + "</b>");
-
-	if (!silent) {
-		alert(msg);
-	}
-}
-
diff --git a/mobile/feed.php b/mobile/feed.php
index bd5804cca..f7b7443d3 100644
--- a/mobile/feed.php
+++ b/mobile/feed.php
@@ -6,13 +6,7 @@
 	define('MOBILE_VERSION', true);
 
 	require_once "../config.php";
-	require_once "functions.php";
-	require_once "../functions.php"; 
-
-	require_once "../sessions.php";
-
-	require_once "../version.php"; 
-	require_once "../db-prefs.php";
+	require_once "mobile-functions.php";
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
diff --git a/mobile/home.php b/mobile/home.php
index 2830f5530..71194da0a 100644
--- a/mobile/home.php
+++ b/mobile/home.php
@@ -6,13 +6,7 @@
 	define('MOBILE_VERSION', true);
 
 	require_once "../config.php";
-	require_once "functions.php";
-	require_once "../functions.php"; 
-
-	require_once "../sessions.php";
-
-	require_once "../version.php"; 
-	require_once "../db-prefs.php";
+	require_once "mobile-functions.php";
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
@@ -24,7 +18,7 @@
 	$offset = (int) db_escape_string($_REQUEST["skip"]);
 
 	if ($use_cats) {
-		render_categories_list($link); 
+		render_categories_list($link);
 	} else {
 		render_flat_feed_list($link, $offset);
 	}
diff --git a/mobile/index.php b/mobile/index.php
index b0b374497..edbf586e0 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -6,13 +6,7 @@
 	define('MOBILE_VERSION', true);
 
 	require_once "../config.php";
-	require_once "functions.php";
-	require_once "../functions.php"; 
-
-	require_once "../sessions.php";
-
-	require_once "../version.php"; 
-	require_once "../db-prefs.php";
+	require_once "mobile-functions.php";
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
@@ -73,12 +67,12 @@
         <a class="button" href="prefs.php">Preferences</a>
     </div>
 
-	<?php	 
+	<?php
 	$use_cats = mobile_get_pref($link, 'ENABLE_CATS');
 	$offset = (int) db_escape_string($_REQUEST["skip"]);
 
 	if ($use_cats) {
-		render_categories_list($link); 
+		render_categories_list($link);
 	} else {
 		render_flat_feed_list($link, $offset);
 	}
diff --git a/mobile/logout.php b/mobile/logout.php
index b9cadaa5c..46d7ec8ee 100644
--- a/mobile/logout.php
+++ b/mobile/logout.php
@@ -1,7 +1,5 @@
-<?php	
-	require_once "functions.php";
-	require_once "../sessions.php";
-	require_once "../functions.php";
+<?php
+	require_once "mobile-functions.php";
 
 	logout_user();
 
diff --git a/mobile/functions.php b/mobile/mobile-functions.php
index 1063fca18..1765a65eb 100644
--- a/mobile/functions.php
+++ b/mobile/mobile-functions.php
@@ -1,4 +1,14 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR .
+		dirname(__FILE__) . PATH_SEPARATOR .
+		dirname(dirname(__FILE__)) . PATH_SEPARATOR .
+		dirname(dirname(__FILE__)) . "/include" );
+
+	require_once "include/functions.php";
+	require_once "include/sessions.php";
+	require_once "include/version.php";
+	require_once "include/db-prefs.php";
+
 	define('TTRSS_SESSION_NAME', 'ttrss_m_sid');
 
 	/* TODO replace with interface to db-prefs */
diff --git a/mobile/prefs.php b/mobile/prefs.php
index a5a9403e9..59c2d04ae 100644
--- a/mobile/prefs.php
+++ b/mobile/prefs.php
@@ -6,13 +6,7 @@
 	define('MOBILE_VERSION', true);
 
 	require_once "../config.php";
-	require_once "functions.php";
-	require_once "../functions.php";
-
-	require_once "../sessions.php";
-
-	require_once "../version.php";
-	require_once "../db-prefs.php";
+	require_once "mobile-functions.php";
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
diff --git a/opml.php b/opml.php
index 991f93e0c..32432a9a7 100644
--- a/opml.php
+++ b/opml.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
diff --git a/prefs.php b/prefs.php
index 98e4a2fd9..3787a79b6 100644
--- a/prefs.php
+++ b/prefs.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
@@ -41,10 +43,9 @@
 
 	<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
 
-	<script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="deprecated.js?<?php echo $dt_add ?>"></script>
-
-	<script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" charset="utf-8" src="js/deprecated.js?<?php echo $dt_add ?>"></script>
+	<script type="text/javascript" charset="utf-8" src="js/prefs.js?<?php echo $dt_add ?>"></script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
diff --git a/register.php b/register.php
index cc453c0f2..3694a5e75 100644
--- a/register.php
+++ b/register.php
@@ -4,6 +4,8 @@
 	// 1) templates/register_notice.txt - displayed above the registration form
 	// 2) register_expire_do.php - contains user expiration queries when necessary
 
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	require_once 'lib/phpmailer/class.phpmailer.php';
 
 	$action = $_REQUEST["action"];
@@ -93,7 +95,7 @@
 <title>Create new account</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="utility.css">
-<script type="text/javascript" src="functions.js"></script>
+<script type="text/javascript" src="js/functions.js"></script>
 <script type="text/javascript" src="lib/prototype.js"></script>
 <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
 </head>
@@ -232,7 +234,7 @@
 	</table>
 	</form>
 
-	<?php print "<p><form method=\"GET\" action=\"tt-rss.php\">
+	<?php print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>"; ?>
 
@@ -245,7 +247,7 @@
 
 		if (!$login || !$email || !$test) {
 			print_error(__("Your registration information is incomplete."));
-			print "<p><form method=\"GET\" action=\"tt-rss.php\">
+			print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
 			return;
@@ -260,7 +262,7 @@
 
 			if ($is_registered) {
 				print_error(__('Sorry, this username is already taken.'));
-				print "<p><form method=\"GET\" action=\"tt-rss.php\">
+				print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
 			} else {
@@ -278,7 +280,7 @@
 
 				if (db_num_rows($result) != 1) {
 					print_error(__('Registration failed.'));
-					print "<p><form method=\"GET\" action=\"tt-rss.php\">
+					print "<p><form method=\"GET\" action=\"index.php\">
 					<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 					</form>";
 				} else {
@@ -363,7 +365,7 @@
 
 					print_notice(__("Account created successfully."));
 
-					print "<p><form method=\"GET\" action=\"tt-rss.php\">
+					print "<p><form method=\"GET\" action=\"index.php\">
 					<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 					</form>";
 
@@ -373,7 +375,7 @@
 
 			} else {
 				print_error('Plese check the form again, you have failed the robot test.');
-				print "<p><form method=\"GET\" action=\"tt-rss.php\">
+				print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
 
@@ -385,7 +387,7 @@
 
 	<?php print_notice(__('New user registrations are currently closed.')) ?>
 
-	<?php print "<p><form method=\"GET\" action=\"tt-rss.php\">
+	<?php print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>"; ?>
 
diff --git a/tt-rss.php b/tt-rss.php
deleted file mode 100644
index 02756146d..000000000
--- a/tt-rss.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-	require_once "functions.php";
-	require_once "sessions.php";
-	require_once "sanity_check.php";
-	require_once "version.php";
-	require_once "config.php";
-	require_once "db-prefs.php";
-
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	init_connection($link);
-
-	login_sequence($link);
-
-	$dt_add = time();
-
-	no_cache_incantation();
-
-	header('Content-Type: text/html; charset=utf-8');
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-	<title>Tiny Tiny RSS</title>
-	<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
-	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
-	<link rel="stylesheet" type="text/css" href="cdm.css?<?php echo $dt_add ?>"/>
-
-	<?php print_theme_includes($link) ?>
-	<?php print_user_stylesheet($link) ?>
-
-	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
-
-	<script type="text/javascript" src="lib/prototype.js"></script>
-	<script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
-	<script type="text/javascript" src="lib/dojo/dojo.js"></script>
-	<script type="text/javascript" src="lib/dijit/dijit.js"></script>
-	<script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
-
-	<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="tt-rss.js?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="feedlist.js?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="viewfeed.js?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
-
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<script type="text/javascript">
-		Event.observe(window, 'load', function() {
-			init();
-		});
-	</script>
-</head>
-
-<body id="ttrssMain" class="claro">
-
-<div id="overlay" style="display : block">
-	<div id="overlay_inner">
-		<div class="insensitive"><?php echo __("Loading, please wait...") ?></div>
-		<div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
-	     progress="0" maximum="100">
-		</div>
-		<noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
-	</div>
-</div>
-
-<div id="header">
-	<?php if (!SINGLE_USER_MODE) { ?>
-			<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
-	<?php } ?>
-	<a href="prefs.php"><?php echo __('Preferences') ?></a>
-
-	<?php if (defined('FEEDBACK_URL') && FEEDBACK_URL) { ?>
-		| <a target="_blank" class="feedback" href="<?php echo FEEDBACK_URL ?>">
-				<?php echo __('Comments?') ?></a>
-	<?php } ?>
-
-	<?php if (!SINGLE_USER_MODE) { ?>
-			| <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
-	<?php } ?>
-
-	<img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
-		width="13" height="13"
-		src="<?php echo theme_image($link, 'images/new_version.png') ?>"
-		title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
-		alt="new_version_icon"/>
-</div>
-
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
-	<?php include "help/3.php" ?>
-</div>
-
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
-<div id="cmdline" style="display : none"></div>
-<div id="auxDlg" style="display : none"></div>
-<div id="headlines-tmp" style="display : none"></div>
-
-<div id="main" dojoType="dijit.layout.BorderContainer">
-
-<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
-	<div id="feedlistLoading">
-		<img src='images/indicator_tiny.gif'/>
-		<?php echo  __("Loading, please wait..."); ?></div>
-	<div id="feedTree"></div>
-</div>
-
-<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
-<div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
-<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
-	title="<?php echo __("News") ?>">
-
-<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
-	<div id="main-toolbar" dojoType="dijit.Toolbar">
-
-		<form id="main_toolbar_form" action="" onsubmit='return false'>
-
-		<button dojoType="dijit.form.Button" id="collapse_feeds_btn"
-			onclick="collapse_feedlist()"
-			title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
-			&lt;&lt;</button>
-
-		<select name="view_mode" title="<?php echo __('Show articles') ?>"
-			onchange="viewModeChanged()"
-			dojoType="dijit.form.Select">
-			<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
-			<option value="all_articles"><?php echo __('All Articles') ?></option>
-			<option value="marked"><?php echo __('Starred') ?></option>
-			<option value="published"><?php echo __('Published') ?></option>
-			<option value="unread"><?php echo __('Unread') ?></option>
-			<!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
-			<option value="updated"><?php echo __('Updated') ?></option>
-		</select>
-
-		<select title="<?php echo __('Sort articles') ?>"
-			onchange="viewModeChanged()"
-			dojoType="dijit.form.Select" name="order_by">
-			<option selected="selected" value="default"><?php echo __('Default') ?></option>
-			<option value="date"><?php echo __('Date') ?></option>
-			<option value="title"><?php echo __('Title') ?></option>
-			<option value="score"><?php echo __('Score') ?></option>
-		</select>
-
-		<button dojoType="dijit.form.Button" name="update"
-			onclick="scheduleFeedUpdate()">
-			<?php echo __('Update') ?></button>
-
-		<button dojoType="dijit.form.Button"
-			onclick="catchupCurrentFeed()">
-			<?php echo __('Mark as read') ?></button>
-
-		</form>
-
-		<div class="actionChooser">
-			<div dojoType="dijit.form.DropDownButton">
-				<span><?php echo __('Actions...') ?></span>
-				<div dojoType="dijit.Menu" style="display: none">
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcSearch')"><?php echo __('Search...') ?></div>
-					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRescoreFeed')"><?php echo __('Rescore feed') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
-					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
-					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAbout')"><?php echo __('About...') ?></div>
-				</div>
-			</div>
-		</div>
-	</div> <!-- toolbar -->
-</div> <!-- toolbar pane -->
-
-	<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
-
-		<div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
-		</div>
-
-		<div id="headlines-frame" dojoType="dijit.layout.ContentPane"
-				onscroll="headlines_scroll_handler(this)" region="center">
-			<div id="headlinesInnerContainer">
-				<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
-			</div>
-		</div>
-
-		<?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
-		<div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
-			style="height : 50%" splitter="true"></div>
-		<?php } ?>
-
-	</div>
-</div>
-</div>
-</div>
-</div>
-
-<?php db_close($link); ?>
-
-</body>
-</html>
diff --git a/twitter.php b/twitter.php
index 9d0c8e509..2c325140b 100644
--- a/twitter.php
+++ b/twitter.php
@@ -1,4 +1,6 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
@@ -7,15 +9,15 @@
 	//require_once "lib/twitteroauth/twitteroauth.php";
 	require_once "lib/tmhoauth/tmhOAuth.php";
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);	
+	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	init_connection($link);	
+	init_connection($link);
 	login_sequence($link);
-	
+
 	$owner_uid = $_SESSION["uid"];
 	$op = $_REQUEST['op'];
 
-	if (!SINGLE_USER_MODE && !$_SESSION['uid']) { 
+	if (!SINGLE_USER_MODE && !$_SESSION['uid']) {
 		render_login_form($link);
 		exit;
 	}
@@ -25,7 +27,7 @@
 	$tmhOAuth = new tmhOAuth(array(
 	  'consumer_key'    => CONSUMER_KEY,
 	  'consumer_secret' => CONSUMER_SECRET,
-	));	
+	));
 
 	if ($op == 'clear') {
 		unset($_SESSION['oauth']);
@@ -43,7 +45,7 @@
 
 		$code = $tmhOAuth->request('POST', $tmhOAuth->url('oauth/access_token', ''), array(
 			'oauth_verifier' => $_REQUEST['oauth_verifier']));
-		
+
 		if ($code == 200) {
 
 			$access_token = json_encode($tmhOAuth->extract_params($tmhOAuth->response['response']));
@@ -62,7 +64,7 @@
 
 	if ($op == 'register') {
 
-		$code = $tmhOAuth->request('POST', 
+		$code = $tmhOAuth->request('POST',
 			$tmhOAuth->url('oauth/request_token', ''), array(
 			    'oauth_callback' => $callback));
 
@@ -73,8 +75,8 @@
 			$force  = isset($_REQUEST['force']) ? '&force_login=1' : '';
 			$forcewrite  = isset($_REQUEST['force_write']) ? '&oauth_access_type=write' : '';
 			$forceread  = isset($_REQUEST['force_read']) ? '&oauth_access_type=read' : '';
-			
-			$location = $tmhOAuth->url("oauth/{$method}", '') .  
+
+			$location = $tmhOAuth->url("oauth/{$method}", '') .
 				"?oauth_token={$_SESSION['oauth']['oauth_token']}{$force}{$forcewrite}{$forceread}";
 
 			header("Location: $location");
diff --git a/update.php b/update.php
index 7b17c60f8..e6063a9e8 100755
--- a/update.php
+++ b/update.php
@@ -1,5 +1,7 @@
 #!/usr/bin/php
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	define('DISABLE_SESSIONS', true);
 
 	chdir(dirname(__FILE__));
@@ -120,7 +122,7 @@
 	}
 
 	db_close($link);
-	
+
 	if ($lock_handle != false) {
 		fclose($lock_handle);
 	}
diff --git a/update_daemon2.php b/update_daemon2.php
index 9ad914307..06271de85 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,5 +1,7 @@
 #!/usr/bin/php
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
+
 	// This is an experimental multiprocess update daemon.
 	// Some configurable variable may be found below.