From 06719138737a450eba676864a004e6f4959b39c5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 Mar 2007 12:02:19 +0100 Subject: [PATCH] opml.php: fix typo, update.php: i18n --- locale/ru_RU/LC_MESSAGES/messages.mo | Bin 3901 -> 3901 bytes locale/ru_RU/LC_MESSAGES/messages.po | 235 +++++++++++++++++---------- opml.php | 4 +- update.php | 36 ++-- 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 6aa6f67e021b00766fc585efd0f2a6e82ddbb967..418681de423d87506726fd0060cbce48e2a9e48e 100644 GIT binary patch delta 17 Ycmdlhw^wdMB?pVSm4VUbT8;y305_cly#N3J delta 17 Ycmdlhw^wdMB?pU\n" "Language-Team: LANGUAGE \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 "Warning: Please backup your database before proceeding." +msgstr "" + +#: update.php:99 +#, php-format +msgid "" +"Your Tiny Tiny RSS database needs update to the latest version (%d to " +"%d)." +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 %d update(s) up to schema\n" +"\t\t\tversion %d." +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 @@

".__('OPML Utility')."

"; if (function_exists('domxml_open_file')) { - print "

".__("Importing OPML (using DOMXML extension)...")."

"); + print "

".__("Importing OPML (using DOMXML extension)...")."

"; require_once "modules/opml_domxml.php"; opml_import_domxml($link, $owner_uid); } else { - print "

".__("Importing OPML (using DOMDocument extension)...")."

"); + print "

".__("Importing OPML (using DOMDocument extension)...")."

"; 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 "

Error: your access level is insufficient to run this script.

"; + print "

". + __("Error: your access level is insufficient to run this script.")."

"; exit; } @@ -39,13 +40,13 @@ -

Database Updater

+

Tiny Tiny RSS database is up to date (version $version).

"; + print "

".__("Tiny Tiny RSS database is up to date.")."

"; print "
- +
"; return; } if (!$op) { - print "

Warning: Please backup your database before proceeding.

"; + print "

".__("Warning: Please backup your database before proceeding.")."

"; - print "

Your Tiny Tiny RSS database needs update to the latest - version ($version —> $latest_version).

"; + print "

" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (%d to %d).", $version, $latest_version) . "

"; /* print "

Available incremental updates:"; @@ -110,39 +110,39 @@ function confirmOP() { print "

- +
"; } else if ($op == "do") { - print "

Performing updates (from version $version)...

"; + print "

".__("Performing updates...")."

"; $num_updates = 0; foreach (array_keys($update_versions) as $v) { if ($v == $version + 1) { - print "

Updating to version $v...

"; + print "

".T_sprintf("Updating to version %d...", $v)."

"; $fp = fopen($update_versions[$v], "r"); if ($fp) { while (!feof($fp)) { $query = trim(getline($fp, ";")); if ($query != "") { - print "

QUERY: $query

"; + print "

$query

"; db_query($link, $query); } } } fclose($fp); - print "

Checking version... "; + print "

".__("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 "ERROR!"; + print "".__("ERROR!").""; return; } @@ -150,11 +150,11 @@ function confirmOP() { } } - print "

Finished. Performed $num_updates update(s) up to schema - version $version.

"; + print "

".T_sprintf("Finished. Performed %d update(s) up to schema + version %d.", $num_updates, $version)."

"; print "
- +
"; }