opml.php: fix typo, update.php: i18n

4 files changed, 167 insertions, 108 deletions

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 6aa6f67e0..418681de4 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 24bc999d4..ef58251b1 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-06 12:53+0300\n"
+"POT-Creation-Date: 2007-03-06 17:02+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -160,340 +160,340 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2009 functions.php:2048 functions.php:2325 functions.php:3004
-#: functions.php:3034
+#: functions.php:2022 functions.php:2061 functions.php:2338 functions.php:3017
+#: functions.php:3047
 msgid "Uncategorized"
 msgstr ""
 
-#: functions.php:2038 functions.php:2855
+#: functions.php:2051 functions.php:2868
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2040 functions.php:2881
+#: functions.php:2053 functions.php:2894
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2058 functions.php:2347 functions.php:2865
+#: functions.php:2071 functions.php:2360 functions.php:2878
 msgid "Starred articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2311
+#: functions.php:2324
 msgid "Global search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2313
+#: functions.php:2326
 msgid "Tag search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2329
+#: functions.php:2342
 msgid "Category search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2342
+#: functions.php:2355
 msgid "Feed search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2355
+#: functions.php:2368
 msgid "Label search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2550
+#: functions.php:2563
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:2594
+#: functions.php:2607
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:2596
+#: functions.php:2609
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:2763 functions.php:2792
+#: functions.php:2776 functions.php:2805
 msgid "All"
 msgstr "Все"
 
-#: functions.php:2764 functions.php:2793 functions.php:2796 tt-rss.php:164
+#: functions.php:2777 functions.php:2806 functions.php:2809 tt-rss.php:164
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:2765 functions.php:2794
+#: functions.php:2778 functions.php:2807
 msgid "None"
 msgstr ""
 
-#: functions.php:2768
+#: functions.php:2781
 msgid "Toggle unread"
 msgstr ""
 
-#: functions.php:2769
+#: functions.php:2782
 msgid "Toggle starred"
 msgstr ""
 
-#: functions.php:2771
+#: functions.php:2784
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:2772
+#: functions.php:2785
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:2773
+#: functions.php:2786
 msgid "Entire feed"
 msgstr "Весь фид"
 
-#: functions.php:2778
+#: functions.php:2791
 msgid "Next page"
 msgstr ""
 
-#: functions.php:2779
+#: functions.php:2792
 msgid "Previous page"
 msgstr ""
 
-#: functions.php:2780
+#: functions.php:2793
 msgid "First page"
 msgstr ""
 
-#: functions.php:2791
+#: functions.php:2804
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:2796
+#: functions.php:2809
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:2797 tt-rss.php:163
+#: functions.php:2810 tt-rss.php:163
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:2799
+#: functions.php:2812
 msgid "Mark as read:"
 msgstr ""
 
-#: functions.php:2800
+#: functions.php:2813
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:2801 modules/pref-filters.php:261
+#: functions.php:2814 modules/pref-filters.php:261
 msgid "Feed"
 msgstr ""
 
-#: functions.php:2810
+#: functions.php:2823
 msgid "Convert to Label"
 msgstr ""
 
-#: functions.php:2837
+#: functions.php:2850
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3074
+#: functions.php:3087
 msgid "No feeds to display."
 msgstr ""
 
-#: functions.php:3091
+#: functions.php:3104
 msgid "Tags"
 msgstr ""
 
-#: localized_js.php:29
+#: localized_js.php:32
 msgid "display feeds"
 msgstr "показать фиды"
 
-#: localized_js.php:30 tt-rss.php:121
+#: localized_js.php:33 tt-rss.php:121
 msgid "display tags"
 msgstr "показать теги"
 
-#: localized_js.php:31 prefs.php:123 tt-rss.php:77
+#: localized_js.php:34 prefs.php:123 tt-rss.php:77
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
-#: localized_js.php:32
+#: localized_js.php:35
 msgid "All feeds updated."
 msgstr ""
 
-#: localized_js.php:33
+#: localized_js.php:36
 #, fuzzy
 msgid "Marking all feeds as read..."
 msgstr "Как прочитанные"
 
-#: localized_js.php:34
+#: localized_js.php:37
 msgid "Adding feed..."
 msgstr ""
 
-#: localized_js.php:35
+#: localized_js.php:38
 msgid "Removing feed..."
 msgstr ""
 
-#: localized_js.php:36
+#: localized_js.php:39
 msgid "Saving feed..."
 msgstr ""
 
-#: localized_js.php:37
+#: localized_js.php:40
 msgid "Can't add category: no name specified."
 msgstr ""
 
-#: localized_js.php:38
+#: localized_js.php:41
 msgid "Adding feed category..."
 msgstr ""
 
-#: localized_js.php:39
+#: localized_js.php:42
 msgid "Can't add user: no login specified."
 msgstr ""
 
-#: localized_js.php:41
+#: localized_js.php:44
 msgid "Adding user..."
 msgstr ""
 
-#: localized_js.php:42
+#: localized_js.php:45
 msgid "Can't create label: missing SQL expression."
 msgstr ""
 
-#: localized_js.php:43
+#: localized_js.php:46
 msgid "Can't create label: missing caption."
 msgstr ""
 
-#: localized_js.php:44
+#: localized_js.php:47
 msgid "Remove selected labels?"
 msgstr ""
 
-#: localized_js.php:45
+#: localized_js.php:48
 msgid "Removing selected labels..."
 msgstr ""
 
-#: localized_js.php:46 localized_js.php:65
+#: localized_js.php:49 localized_js.php:68
 #, fuzzy
 msgid "No labels are selected."
 msgstr "Категории отсутствуют."
 
-#: localized_js.php:47
+#: localized_js.php:50
 msgid "Remove selected users?"
 msgstr ""
 
-#: localized_js.php:48
+#: localized_js.php:51
 msgid "Removing selected users..."
 msgstr ""
 
-#: localized_js.php:49 localized_js.php:67 localized_js.php:69
+#: localized_js.php:52 localized_js.php:70 localized_js.php:72
 msgid "No users are selected."
 msgstr ""
 
-#: localized_js.php:50
+#: localized_js.php:53
 msgid "Remove selected filters?"
 msgstr ""
 
-#: localized_js.php:51
+#: localized_js.php:54
 msgid "Removing selected filters..."
 msgstr ""
 
-#: localized_js.php:52 localized_js.php:75
+#: localized_js.php:55 localized_js.php:78
 #, fuzzy
 msgid "No filters are selected."
 msgstr "Категории отсутствуют."
 
-#: localized_js.php:53
+#: localized_js.php:56
 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 
-#: localized_js.php:54
+#: localized_js.php:57
 msgid "Unsubscribing from selected feeds..."
 msgstr ""
 
-#: localized_js.php:55 localized_js.php:73 localized_js.php:77
+#: localized_js.php:58 localized_js.php:76 localized_js.php:80
 #, fuzzy
 msgid "No feeds are selected."
 msgstr "Категории отсутствуют."
 
-#: localized_js.php:56
+#: localized_js.php:59
 msgid "Remove selected categories?"
 msgstr ""
 
-#: localized_js.php:57
+#: localized_js.php:60
 msgid "Removing selected categories..."
 msgstr ""
 
-#: localized_js.php:58 localized_js.php:79
+#: localized_js.php:61 localized_js.php:82
 #, fuzzy
 msgid "No categories are selected."
 msgstr "Категории отсутствуют."
 
-#: localized_js.php:59
+#: localized_js.php:62
 #, fuzzy
 msgid "Saving category..."
 msgstr "Создать категорию"
 
-#: localized_js.php:60
+#: localized_js.php:63
 msgid "Loading help..."
 msgstr ""
 
-#: localized_js.php:61
+#: localized_js.php:64
 msgid "Saving label..."
 msgstr ""
 
-#: localized_js.php:62
+#: localized_js.php:65
 msgid "Login field cannot be blank."
 msgstr ""
 
-#: localized_js.php:63
+#: localized_js.php:66
 msgid "Saving user..."
 msgstr ""
 
-#: localized_js.php:64
+#: localized_js.php:67
 msgid "Saving filter..."
 msgstr ""
 
-#: localized_js.php:66
+#: localized_js.php:69
 msgid "Please select only one label."
 msgstr ""
 
-#: localized_js.php:68 localized_js.php:70
+#: localized_js.php:71 localized_js.php:73
 msgid "Please select only one user."
 msgstr ""
 
-#: localized_js.php:71
+#: localized_js.php:74
 #, fuzzy
 msgid "Reset password of selected user?"
 msgstr "Пароль"
 
-#: localized_js.php:72
+#: localized_js.php:75
 msgid "Resetting password for selected user..."
 msgstr ""
 
-#: localized_js.php:74
+#: localized_js.php:77
 msgid "Please select only one feed."
 msgstr ""
 
-#: localized_js.php:76
+#: localized_js.php:79
 msgid "Please select only one filter."
 msgstr ""
 
-#: localized_js.php:78
+#: localized_js.php:81
 msgid "Please select one feed."
 msgstr ""
 
-#: localized_js.php:80
+#: localized_js.php:83
 msgid "Please select only one category."
 msgstr ""
 
-#: localized_js.php:81
+#: localized_js.php:84
 msgid "No OPML file to upload."
 msgstr ""
 
-#: localized_js.php:82
+#: localized_js.php:85
 msgid "Changing category of selected feeds..."
 msgstr ""
 
-#: localized_js.php:83
+#: localized_js.php:86
 #, fuzzy
 msgid "Reset to defaults?"
 msgstr "По умолчанию"
 
-#: localized_js.php:84
+#: localized_js.php:87
 #, fuzzy
 msgid "Trying to change password..."
 msgstr "Пароль"
 
-#: localized_js.php:85
+#: localized_js.php:88
 msgid "Trying to change e-mail..."
 msgstr ""
 
@@ -701,6 +701,65 @@ msgstr ""
 msgid "No feed selected."
 msgstr ""
 
+#: update.php:24
+msgid "Error: your access level is insufficient to run this script."
+msgstr ""
+
+#: update.php:49
+msgid "Database Updater"
+msgstr ""
+
+#: update.php:88
+msgid "Tiny Tiny RSS database is up to date."
+msgstr ""
+
+#: update.php:90 update.php:157
+msgid "Return to Tiny Tiny RSS"
+msgstr ""
+
+#: update.php:97
+msgid "<b>Warning:</b> Please backup your database before proceeding."
+msgstr ""
+
+#: update.php:99
+#, php-format
+msgid ""
+"Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
+"<b>%d</b>)."
+msgstr ""
+
+#: update.php:113
+msgid "Perform updates"
+msgstr ""
+
+#: update.php:118
+msgid "Performing updates..."
+msgstr ""
+
+#: update.php:124
+#, php-format
+msgid "Updating to version %d..."
+msgstr ""
+
+#: update.php:137
+msgid "Checking version... "
+msgstr ""
+
+#: update.php:143
+msgid "OK!"
+msgstr ""
+
+#: update.php:145
+msgid "ERROR!"
+msgstr ""
+
+#: update.php:153
+#, php-format
+msgid ""
+"Finished. Performed <b>%d</b> update(s) up to schema\n"
+"\t\t\tversion <b>%d</b>."
+msgstr ""
+
 #: modules/help.php:16
 #, fuzzy
 msgid "Help"
@@ -776,7 +835,7 @@ msgstr "Подписаться"
 
 #: modules/popup-dialog.php:76 modules/popup-dialog.php:155
 #: modules/popup-dialog.php:207 modules/popup-dialog.php:294
-#: modules/popup-dialog.php:385 modules/pref-feeds.php:120
+#: modules/popup-dialog.php:386 modules/pref-feeds.php:120
 #: modules/pref-feeds.php:331 modules/pref-feeds.php:708
 #: modules/pref-filters.php:118 modules/pref-users.php:58
 msgid "Cancel"
@@ -880,19 +939,19 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: modules/popup-dialog.php:335
+#: modules/popup-dialog.php:336
 msgid "Edit Tags"
 msgstr ""
 
-#: modules/popup-dialog.php:340
+#: modules/popup-dialog.php:341
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:352
+#: modules/popup-dialog.php:353
 msgid "Add existing tag:"
 msgstr ""
 
-#: modules/popup-dialog.php:381 modules/pref-feeds.php:329
+#: modules/popup-dialog.php:382 modules/pref-feeds.php:329
 #: modules/pref-feeds.php:706 modules/pref-filters.php:114
 #: modules/pref-users.php:55
 msgid "Save"
diff --git a/opml.php b/opml.php
index 32b56c1aa..701d8396b 100644
--- a/opml.php
+++ b/opml.php
@@ -107,11 +107,11 @@
 			<h1>".__('OPML Utility')."</h1>";
 
 		if (function_exists('domxml_open_file')) {
-			print "<p>".__("Importing OPML (using DOMXML extension)...")."</p>");
+			print "<p>".__("Importing OPML (using DOMXML extension)...")."</p>";
 			require_once "modules/opml_domxml.php";
 			opml_import_domxml($link, $owner_uid);
 		} else {
-			print "<p>".__("Importing OPML (using DOMDocument extension)...")."</p>");
+			print "<p>".__("Importing OPML (using DOMDocument extension)...")."</p>";
 			require_once "modules/opml_domdoc.php";
 			opml_import_domdoc($link, $owner_uid);
 		}
diff --git a/update.php b/update.php
index 41206dc75..4f7a097c0 100644
--- a/update.php
+++ b/update.php
@@ -20,7 +20,8 @@
 	$owner_uid = $_SESSION["uid"];
 	
 	if ($_SESSION["access_level"] < 10) { 
-		print "<p>Error: your access level is insufficient to run this script.</p>";
+		print "<p>".
+			__("Error: your access level is insufficient to run this script.")."</p>";
 		exit;
 	}
 	
@@ -39,13 +40,13 @@
 
 <script type='text/javascript'>
 function confirmOP() {
-	return confirm("Update the database?");
+	return confirm(__("Update the database?"));
 }
 </script>
 
 <div class="floatingLogo"><img src="images/ttrss_logo.png"></div>
 
-<h1>Database Updater</h1>
+<h1><?php echo __("Database Updater") ?></h1>
 
 <?php
 	function getline($fp, $delim) {
@@ -84,19 +85,18 @@ function confirmOP() {
 	$latest_version = max(array_keys($update_versions));
 	
 	if ($version == $latest_version) {
-		print "<p>Tiny Tiny RSS database is up to date (version $version).</p>";
+		print "<p>".__("Tiny Tiny RSS database is up to date.")."</p>";
 		print "<form method=\"GET\" action=\"tt-rss.php\">
-			<input type=\"submit\" value=\"Return to Tiny Tiny RSS\">
+			<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 			</form>";
 
 		return;
 	}
 	
 	if (!$op) {
-		print "<p class='warning'><b>Warning:</b> Please backup your database before proceeding.</p>";
+		print "<p class='warning'>".__("<b>Warning:</b> Please backup your database before proceeding.")."</p>";
 	
-		print "<p>Your Tiny Tiny RSS database needs update to the latest 
-			version ($version &mdash;&gt; $latest_version).</p>";
+		print "<p>" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>).", $version, $latest_version) . "</p>";
 	
 	/*		print "<p>Available incremental updates:";
 	
@@ -110,39 +110,39 @@ function confirmOP() {
 	
 		print "<form method='POST'>
 			<input type='hidden' name='op' value='do'>
-			<input type='submit' onclick='return confirmOP()' value='Perform updates'>
+			<input type='submit' onclick='return confirmOP()' value='".__("Perform updates")."'>
 			</form>";
 	
 	} else if ($op == "do") {
 	
-		print "<p>Performing updates (from version $version)...</p>";
+		print "<p>".__("Performing updates...")."</p>";
 	
 		$num_updates = 0;
 	
 		foreach (array_keys($update_versions) as $v) {
 			if ($v == $version + 1) {
-				print "<p>Updating to version $v...</p>";
+				print "<p>".T_sprintf("Updating to version %d...", $v)."</p>";
 				$fp = fopen($update_versions[$v], "r");
 				if ($fp) {
 					while (!feof($fp)) {
 						$query = trim(getline($fp, ";"));
 						if ($query != "") {
-							print "<p class='query'><b>QUERY:</b> $query</p>";
+							print "<p class='query'>$query</p>";
 							db_query($link, $query);
 						}
 					}
 				}
 				fclose($fp);
 	
-				print "<p>Checking version... ";
+				print "<p>".__("Checking version... ");
 	
 				$result = db_query($link, "SELECT schema_version FROM ttrss_version");
 				$version = db_fetch_result($result, 0, "schema_version");
 	
 				if ($version == $v) {
-					print "OK! ($version)";
+					print __("OK!");
 				} else {
-					print "<b>ERROR!</b>";
+					print "<b>".__("ERROR!")."</b>";
 					return;
 				}
 	
@@ -150,11 +150,11 @@ function confirmOP() {
 			}
 		}
 	
-		print "<p>Finished. Performed $num_updates update(s) up to schema
-			version $version.</p>";
+		print "<p>".T_sprintf("Finished. Performed <b>%d</b> update(s) up to schema
+			version <b>%d</b>.", $num_updates, $version)."</p>";
 	
 		print "<form method=\"GET\" action=\"logout.php\">
-			<input type=\"submit\" value=\"Return to Tiny Tiny RSS\">
+			<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 			</form>";
 
 	}