From c7e51de137d9b02ce7b9ddabde86f91d4119ce4b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 21 Mar 2009 23:11:58 +0300 Subject: [PATCH] Revert "update translations" This reverts commit 2b38f79c86ad9199f39fa8efac1c0e89c6f3a465. Wrong commit from wrong branch. --- functions.php | 138 +++++++++++++++++++++------ images/art-pub-note.png | Bin 0 -> 346 bytes locale/fr_FR/LC_MESSAGES/messages.mo | Bin 27419 -> 27668 bytes locale/fr_FR/LC_MESSAGES/messages.po | 40 ++++---- locale/hu_HU/LC_MESSAGES/messages.mo | Bin 9917 -> 9917 bytes locale/hu_HU/LC_MESSAGES/messages.po | 32 ++++--- locale/it_IT/LC_MESSAGES/messages.mo | Bin 39806 -> 39373 bytes locale/it_IT/LC_MESSAGES/messages.po | 54 +++++++---- locale/ja_JP/LC_MESSAGES/messages.mo | Bin 32406 -> 32804 bytes locale/ja_JP/LC_MESSAGES/messages.po | 46 +++++---- locale/nb_NO/LC_MESSAGES/messages.mo | Bin 48777 -> 48723 bytes locale/nb_NO/LC_MESSAGES/messages.po | 82 ++++++++-------- locale/pt_BR/LC_MESSAGES/messages.mo | Bin 10525 -> 10916 bytes locale/pt_BR/LC_MESSAGES/messages.po | 49 +++++----- locale/ru_RU/LC_MESSAGES/messages.mo | Bin 54128 -> 54151 bytes locale/ru_RU/LC_MESSAGES/messages.po | 64 +++++++------ locale/zh_CN/LC_MESSAGES/messages.mo | Bin 20230 -> 20469 bytes locale/zh_CN/LC_MESSAGES/messages.po | 48 +++++----- modules/backend-rpc.php | 29 +++++- modules/pref-feeds.php | 31 +++--- sanity_check.php | 2 +- schema/ttrss_schema_mysql.sql | 3 +- schema/ttrss_schema_pgsql.sql | 3 +- schema/versions/mysql/55.sql | 7 ++ schema/versions/pgsql/55.sql | 7 ++ tt-rss.css | 33 +++++++ tt-rss.php | 39 ++++---- version.php | 2 +- viewfeed.js | 61 +++++++++++- 29 files changed, 503 insertions(+), 267 deletions(-) create mode 100755 images/art-pub-note.png create mode 100644 schema/versions/mysql/55.sql create mode 100644 schema/versions/pgsql/55.sql diff --git a/functions.php b/functions.php index 648ab343..4c867f26 100644 --- a/functions.php +++ b/functions.php @@ -395,10 +395,14 @@ $faviconURL = $urlParts['scheme'].'://'.$urlParts['host'].$linkUrl; } else if (substr($linkUrl, 0, 7) == 'http://') { $faviconURL = $linkUrl; - } else if (substr($url, -1, 1) == '/') { - $faviconURL = $url.$linkUrl; } else { - $faviconURL = $url.'/'.$linkUrl; + $pos = strrpos($url, "/"); + // no "/" in url or "/" is part of "://" + if ($pos === false || $pos == (strpos($url, "://")+2)) { + $faviconURL = $url.'/'.$linkUrl; + } else { + $faviconURL = substr($url, 0, $pos+1).$linkUrl; + } } } else { @@ -454,7 +458,7 @@ $http_response = fgets( $socket, 22 ); - $responses = "/(200 OK)|(30[0-9] Moved)/"; + $responses = "/(200 OK)|(30[123])/"; if ( preg_match($responses, $http_response) ) { fclose($socket); return true; @@ -1380,7 +1384,7 @@ if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) { _debug("update_rss_feed: new feed, catching it up..."); } - catchup_feed($link, $feed, false); + catchup_feed($link, $feed, false, $owner_uid); } if (!$hidden) { @@ -2116,7 +2120,9 @@ } } - function catchup_feed($link, $feed, $cat_view) { + function catchup_feed($link, $feed, $cat_view, $owner_uid) { + + if (!$owner_uid) $owner_uid = $_SESSION['uid']; if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) { @@ -2131,8 +2137,7 @@ } $tmp_result = db_query($link, "SELECT id - FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = " . - $_SESSION["uid"]); + FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = $owner_uid"); while ($tmp_line = db_fetch_assoc($tmp_result)) { @@ -2140,7 +2145,7 @@ db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE feed_id = '$tmp_feed' AND owner_uid = " . $_SESSION["uid"]); + WHERE feed_id = '$tmp_feed' AND owner_uid = $owner_uid"); } } else if ($feed == -2) { @@ -2148,7 +2153,7 @@ db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*) FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0 - AND unread = true AND owner_uid = " . $_SESSION["uid"]); + AND unread = true AND owner_uid = $owner_uid"); } } else if ($feed > 0) { @@ -2169,12 +2174,12 @@ db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() WHERE (feed_id = '$feed' OR $children_qpart) - AND owner_uid = " . $_SESSION["uid"]); + AND owner_uid = $owner_uid"); } else { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE feed_id = '$feed' AND owner_uid = " . $_SESSION["uid"]); + WHERE feed_id = '$feed' AND owner_uid = $owner_uid"); } } else if ($feed < 0 && $feed > -10) { // special, like starred @@ -2182,13 +2187,13 @@ if ($feed == -1) { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE marked = true AND owner_uid = ".$_SESSION["uid"]); + WHERE marked = true AND owner_uid = $owner_uid"); } if ($feed == -2) { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE published = true AND owner_uid = ".$_SESSION["uid"]); + WHERE published = true AND owner_uid = $owner_uid"); } if ($feed == -3) { @@ -2206,7 +2211,7 @@ ttrss_user_entries WHERE $match_part AND unread = true AND ttrss_user_entries.ref_id = ttrss_entries.id AND - owner_uid = ".$_SESSION["uid"]); + owner_uid = $owner_uid"); $affected_ids = array(); @@ -2220,7 +2225,7 @@ if ($feed == -4) { db_query($link, "UPDATE ttrss_user_entries SET unread = false,last_read = NOW() - WHERE owner_uid = ".$_SESSION["uid"]); + WHERE owner_uid = $owner_uid"); } } else if ($feed < -10) { // label @@ -2230,11 +2235,11 @@ db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2 SET unread = false, last_read = NOW() WHERE label_id = '$label_id' AND unread = true - AND owner_uid = '".$_SESSION["uid"]."' AND ref_id = article_id"); + AND owner_uid = '$owner_uid' AND ref_id = article_id"); } - ccache_update($link, $feed, $_SESSION["uid"], $cat_view); + ccache_update($link, $feed, $owner_uid, $cat_view); } else { // tag db_query($link, "BEGIN"); @@ -2242,7 +2247,7 @@ $tag_name = db_escape_string($feed); $result = db_query($link, "SELECT post_int_id FROM ttrss_tags - WHERE tag_name = '$tag_name' AND owner_uid = " . $_SESSION["uid"]); + WHERE tag_name = '$tag_name' AND owner_uid = $owner_uid"); while ($line = db_fetch_assoc($result)) { db_query($link, "UPDATE ttrss_user_entries SET @@ -3401,6 +3406,7 @@ guid, ttrss_entries.id,ttrss_entries.title, updated, + note, unread,feed_id,marked,published,link,last_read, ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms, $vfeed_query_part @@ -3431,6 +3437,7 @@ $result = db_query($link, "SELECT guid, + note, ttrss_entries.id as id,title, updated, unread,feed_id, @@ -3459,6 +3466,10 @@ function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat, $limit, $search, $search_mode, $match_on) { + $note_style = "background-color : #fff7d5; border-width : 1px; ". + "padding : 5px; border-style : dashed; border-color : #e7d796;". + "margin-top : 5px; color : #9a8c59;"; + if (!$limit) $limit = 30; $qfh_ret = queryFeedHeadlines($link, $feed, @@ -3498,8 +3509,14 @@ print "" . htmlspecialchars($line["title"]) . ""; - print ""; + print ""; + print $line["note"]; + print ""; + } + print "]]>"; print ""; } @@ -4521,7 +4538,8 @@ ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url, num_comments, - author + author, + note FROM ttrss_entries,ttrss_user_entries WHERE id = '$id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"]); @@ -4595,7 +4613,7 @@ if (!$entry_comments) $entry_comments = " "; # placeholder print "
- Tags"; + Tags "; if (!$zoom_mode) { print "$tags_str @@ -4615,6 +4633,14 @@ style=\"cursor : pointer\" style=\"cursor : pointer\" onclick=\"zoomToArticle($id)\" alt='Zoom' title='".__('Show article summary in new window')."'>"; + + $note_escaped = htmlspecialchars($line['note'], ENT_QUOTES); + + print "PubNote"; + } print "
"; print "
$entry_comments
"; @@ -4634,6 +4660,12 @@ print $article_content; + print "
"; + if ($line['note']) { + print format_article_note($id, $line['note']); + } + print "
"; + $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE post_id = '$id' AND content_url != ''"); @@ -5170,6 +5202,13 @@ // print "
"; print sanitize_rss($link, $line["content_preview"]); + + print "
"; + if ($line['note']) { + print format_article_note($id, $line['note']); + } + print "
"; + $article_content = $line["content_preview"]; $e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE @@ -5254,13 +5293,22 @@ " "; - print "$marked_pic "; - print "$published_pic "; - print "$marked_pic "; + print "$published_pic "; + print "Zoom"; + title='".__('Show article summary in new window')."'> "; + + $note_escaped = htmlspecialchars($line['note'], ENT_QUOTES); + + print "PubNote"; + + print ""; $tags_str = format_tags_string(get_article_tags($link, $id), $id); @@ -5274,9 +5322,9 @@ print ""; - print "Toggle: - Unread"; + ".__('toggle unread').""; print "
"; print ""; @@ -5706,6 +5754,19 @@ value = 0 WHERE owner_uid = '$owner_uid'"); } + function ccache_remove($link, $feed_id, $owner_uid, $is_cat = false) { + + if (!$is_cat) { + $table = "ttrss_counters_cache"; + } else { + $table = "ttrss_cat_counters_cache"; + } + + db_query($link, "DELETE FROM $table WHERE + feed_id = '$feed_id' AND owner_uid = '$owner_uid'"); + + } + function ccache_update_all($link, $owner_uid) { if (get_pref($link, 'ENABLE_FEED_CATS', $owner_uid)) { @@ -5814,6 +5875,8 @@ $unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid); } + db_query($link, "BEGIN"); + $result = db_query($link, "SELECT feed_id FROM $table WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id' LIMIT 1"); @@ -5829,6 +5892,8 @@ ($feed_id, $unread, $owner_uid, NOW())"); } + db_query($link, "COMMIT"); + if ($feed_id > 0 && $prev_unread != $unread) { if (!$is_cat) { @@ -6058,4 +6123,19 @@ return $labels_str; } + + function format_article_note($id, $note) { + + $note_escaped = htmlspecialchars($note, ENT_QUOTES); + + $str = "
"; + $str .= "
"; + $str .= "". + __('edit note').""; + $str .= "
"; + $str .= $note; + $str .= "
"; + + return $str; + } ?> diff --git a/images/art-pub-note.png b/images/art-pub-note.png new file mode 100755 index 0000000000000000000000000000000000000000..5d3008f266716e0089f29b9c499b52ea4d5a74e8 GIT binary patch literal 346 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 STaZ1}H(>N#12{jn!+!vwc|FVk delta 7142 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\n" "Language-Team: Français \n" @@ -111,16 +111,12 @@ msgid "Unknown error" msgstr "Erreur inconnue" #: errors.php:5 -msgid "" -"This program requires XmlHttpRequest to function properly. Your browser " -"doesn't seem to support it." -msgstr "" +msgid "This program requires XmlHttpRequest " +msgstr "Ce logiciel nécessite XmlHttpRequest " #: errors.php:8 -msgid "" -"This program requires cookies to function properly. Your browser doesn't " -"seem to support them." -msgstr "" +msgid "This program requires cookies " +msgstr "Les cookies doivent être activés pour ce logiciel " #: errors.php:11 msgid "Backend sanity check failed" @@ -1853,6 +1849,11 @@ msgstr "Ce flux" msgid "Create Filter" msgstr "Créer un filtre" +#: modules/popup-dialog.php:242 modules/popup-dialog.php:293 +#: modules/pref-filters.php:39 modules/pref-filters.php:96 +msgid "description" +msgstr "description" + #: modules/popup-dialog.php:245 modules/pref-filters.php:42 #: modules/pref-filters.php:402 msgid "Match" @@ -2212,6 +2213,14 @@ msgstr "Filtre %s créé" msgid "Create filter" msgstr "Créer un filtre" +#: modules/pref-filters.php:392 +msgid "filter_type_descr" +msgstr "" + +#: modules/pref-filters.php:393 +msgid "action_description" +msgstr "" + #: modules/pref-filters.php:404 #, fuzzy msgid "Field" @@ -2357,6 +2366,10 @@ msgstr "Sélectionner un thème" msgid "Change theme" msgstr "Modifier le thème" +#: modules/pref-prefs.php:388 +msgid "short_desc" +msgstr "" + #: modules/pref-prefs.php:400 modules/pref-prefs.php:405 msgid "Yes" msgstr "Oui" @@ -2746,15 +2759,6 @@ msgstr "Correspondance sur :" msgid "Internal error: Function not implemented" msgstr "" -#~ msgid "This program requires XmlHttpRequest " -#~ msgstr "Ce logiciel nécessite XmlHttpRequest " - -#~ msgid "This program requires cookies " -#~ msgstr "Les cookies doivent être activés pour ce logiciel " - -#~ msgid "description" -#~ msgstr "description" - #~ msgid "display tags" #~ msgstr "afficher les étiquettes" diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo index cbe5f001a20fd79260c08f4ea16cdd81b3243268..1e0813befd438a3e9c869e879a9c70ba34cd32ee 100644 GIT binary patch delta 23 ecmdn%yVrMvsU(+?u91O)p{bRr>1KP$I$i)-?FOCz delta 23 ecmdn%yVrMvsU(-Nu92aFk&%_D#b$fSI$i);2?n76 diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po index a5c42b4a..ba4acd31 100644 --- a/locale/hu_HU/LC_MESSAGES/messages.po +++ b/locale/hu_HU/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.2.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-21 22:58+0300\n" +"POT-Creation-Date: 2009-02-20 15:55+0300\n" "PO-Revision-Date: 2008-02-03 22:22::+0100\n" "Last-Translator: MiszterX \n" "Language-Team: HUNGARIAN \n" @@ -111,15 +111,11 @@ msgid "Unknown error" msgstr "Ismeretlen hiba" #: errors.php:5 -msgid "" -"This program requires XmlHttpRequest to function properly. Your browser " -"doesn't seem to support it." +msgid "This program requires XmlHttpRequest " msgstr "" #: errors.php:8 -msgid "" -"This program requires cookies to function properly. Your browser doesn't " -"seem to support them." +msgid "This program requires cookies " msgstr "" #: errors.php:11 @@ -1780,6 +1776,12 @@ msgstr "Ez a feed" msgid "Create Filter" msgstr "Szárő készítése" +#: modules/popup-dialog.php:242 modules/popup-dialog.php:293 +#: modules/pref-filters.php:39 modules/pref-filters.php:96 +#, fuzzy +msgid "description" +msgstr "Kiválasztottakat" + #: modules/popup-dialog.php:245 modules/pref-filters.php:42 #: modules/pref-filters.php:402 msgid "Match" @@ -2132,6 +2134,14 @@ msgstr "" msgid "Create filter" msgstr "Szárő készítése" +#: modules/pref-filters.php:392 +msgid "filter_type_descr" +msgstr "" + +#: modules/pref-filters.php:393 +msgid "action_description" +msgstr "" + #: modules/pref-filters.php:404 #, fuzzy msgid "Field" @@ -2275,6 +2285,10 @@ msgstr "Kinézet választó" msgid "Change theme" msgstr "Kinlzet megváltozatása" +#: modules/pref-prefs.php:388 +msgid "short_desc" +msgstr "" + #: modules/pref-prefs.php:400 modules/pref-prefs.php:405 msgid "Yes" msgstr "Igen" @@ -2655,10 +2669,6 @@ msgstr "Egyezés ezzel:" msgid "Internal error: Function not implemented" msgstr "" -#, fuzzy -#~ msgid "description" -#~ msgstr "Kiválasztottakat" - #~ msgid "Loading help..." #~ msgstr "Segítség betöltése..." diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo index db953c7d4c0c709ac6a8e3e0cafbe6ed41796b37..ac28ccb5fc76baf0f20a65a905fe8812aa02dd76 100644 GIT binary patch delta 8356 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 HuipOvpa)Dd delta 8736 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\n" "Language-Team: Italian \n" @@ -107,20 +107,12 @@ msgid "Unknown error" msgstr "Errore sconosciuto" #: errors.php:5 -msgid "" -"This program requires XmlHttpRequest to function properly. Your browser " -"doesn't seem to support it." +msgid "This program requires XmlHttpRequest " msgstr "" -"Questo programma richiede XmlHttpRequest per funzionare correttamente. Il " -"browser sembra non supportarla." #: errors.php:8 -msgid "" -"This program requires cookies to function properly. Your browser doesn't " -"seem to support them." +msgid "This program requires cookies " msgstr "" -"Questo programma richiede i cookie per funzionare correttamente. Il browser " -"sembra non supportarli." #: errors.php:11 msgid "Backend sanity check failed" @@ -1841,6 +1833,12 @@ msgstr "Questo notiziario" msgid "Create Filter" msgstr "Crea filtro" +#: modules/popup-dialog.php:242 modules/popup-dialog.php:293 +#: modules/pref-filters.php:39 modules/pref-filters.php:96 +#, fuzzy +msgid "description" +msgstr "Selezione" + #: modules/popup-dialog.php:245 modules/pref-filters.php:42 #: modules/pref-filters.php:402 msgid "Match" @@ -2186,6 +2184,14 @@ msgstr "Filtro %s creato" msgid "Create filter" msgstr "Crea filtro" +#: modules/pref-filters.php:392 +msgid "filter_type_descr" +msgstr "" + +#: modules/pref-filters.php:393 +msgid "action_description" +msgstr "" + #: modules/pref-filters.php:404 msgid "Field" msgstr "Campo" @@ -2326,6 +2332,10 @@ msgstr "Seleziona tema" msgid "Change theme" msgstr "Cambia tema" +#: modules/pref-prefs.php:388 +msgid "short_desc" +msgstr "" + #: modules/pref-prefs.php:400 modules/pref-prefs.php:405 msgid "Yes" msgstr "Sì" @@ -2690,10 +2700,6 @@ msgstr "Corrisponde a:" msgid "Internal error: Function not implemented" msgstr "Errore interno: funzione non implementata" -#, fuzzy -#~ msgid "description" -#~ msgstr "Selezione" - #~ msgid "display tags" #~ msgstr "visualizza etichette" @@ -2752,8 +2758,8 @@ msgstr "Errore interno: funzione non implementata" #~ "\t\t\tIn base all'insieme di caratteri attuale del database si " #~ "potrebbero avere delle corruzioni dei dati (caratteri accentati persi, " #~ "ecc.). \n" -#~ "\t\t\tDopo l'aggiornamento, occorre impostare l'opzione a «utf8» " -#~ "MYSQL_CHARSET in config.php." +#~ "\t\t\tDopo l'aggiornamento, occorre impostare l'opzione a " +#~ "«utf8» MYSQL_CHARSET in config.php." #~ msgid "Converting database..." #~ msgstr "Conversione del database..." @@ -3041,6 +3047,20 @@ msgstr "Errore interno: funzione non implementata" #~ msgid "Test" #~ msgstr "Prova" +#~ msgid "" +#~ "This program requires XmlHttpRequest to function properly. Your browser " +#~ "doesn't seem to support it." +#~ msgstr "" +#~ "Questo programma richiede XmlHttpRequest per funzionare correttamente. Il " +#~ "browser sembra non supportarla." + +#~ msgid "" +#~ "This program requires cookies to function properly. Your browser doesn't " +#~ "seem to support them." +#~ msgstr "" +#~ "Questo programma richiede i cookie per funzionare correttamente. Il " +#~ "browser sembra non supportarli." + #~ msgid "Filter expression" #~ msgstr "Espressione del filtro" diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo index 88b75a07d2e6df7d02c537a953bb4e049ea53cdd..c033df8512f6aadc97c5da6fe14e25db86fd6781 100644 GIT binary patch delta 9317 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

sB6!`C?cIc-E_TSzqctF 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 Cw9uUZ diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po index 33e410fa..111447df 100644 --- a/locale/ja_JP/LC_MESSAGES/messages.po +++ b/locale/ja_JP/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tt-rss unstable\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-21 22:58+0300\n" +"POT-Creation-Date: 2009-02-20 15:55+0300\n" "PO-Revision-Date: 2008-09-25 12:43+0900\n" "Last-Translator: Tadashi Jokagi \n" "Language-Team: Japanese \n" @@ -108,16 +108,12 @@ msgid "Unknown error" msgstr "未知のエラー" #: errors.php:5 -msgid "" -"This program requires XmlHttpRequest to function properly. Your browser " -"doesn't seem to support it." -msgstr "" +msgid "This program requires XmlHttpRequest " +msgstr "このプログラムは、XmlHttpRequest を要求します" #: errors.php:8 -msgid "" -"This program requires cookies to function properly. Your browser doesn't " -"seem to support them." -msgstr "" +msgid "This program requires cookies " +msgstr "このプログラムはクッキーを要求します" #: errors.php:11 msgid "Backend sanity check failed" @@ -1778,6 +1774,11 @@ msgstr "このフィード" msgid "Create Filter" msgstr "フィルターを作成する" +#: modules/popup-dialog.php:242 modules/popup-dialog.php:293 +#: modules/pref-filters.php:39 modules/pref-filters.php:96 +msgid "description" +msgstr "説明" + #: modules/popup-dialog.php:245 modules/pref-filters.php:42 #: modules/pref-filters.php:402 msgid "Match" @@ -2123,6 +2124,14 @@ msgstr "フィルター %s を作成しました" msgid "Create filter" msgstr "フィルターを作成する" +#: modules/pref-filters.php:392 +msgid "filter_type_descr" +msgstr "filter_type_descr" + +#: modules/pref-filters.php:393 +msgid "action_description" +msgstr "action_description" + #: modules/pref-filters.php:404 #, fuzzy msgid "Field" @@ -2264,6 +2273,10 @@ msgstr "テーマを選択する" msgid "Change theme" msgstr "テーマを変更する" +#: modules/pref-prefs.php:388 +msgid "short_desc" +msgstr "" + #: modules/pref-prefs.php:400 modules/pref-prefs.php:405 msgid "Yes" msgstr "はい" @@ -2621,21 +2634,6 @@ msgstr "対象項目:" msgid "Internal error: Function not implemented" msgstr "インターナルエラー: 機能が実装されていません" -#~ msgid "This program requires XmlHttpRequest " -#~ msgstr "このプログラムは、XmlHttpRequest を要求します" - -#~ msgid "This program requires cookies " -#~ msgstr "このプログラムはクッキーを要求します" - -#~ msgid "description" -#~ msgstr "説明" - -#~ msgid "filter_type_descr" -#~ msgstr "filter_type_descr" - -#~ msgid "action_description" -#~ msgstr "action_description" - #~ msgid "display tags" #~ msgstr "タグの表示" diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo index 3b003ad63384300fd506b049287dadfc401a2e28..88cb33f28e62cf5e070f23cc12d100ccb2158fc3 100644 GIT binary patch delta 10043 zcmYk?30PLuzQ^(XqT&Q9gP@Or{8ipdjF^yg62CS-zTP&O==s zOQJG|1}z)CIn>Rv92!q*9?j}rB|G0AYdz1c=kfWhwf5d?`2YWVBggaPUp{B6d_3O< z)?DlG-(VldX@>Iy9Ve)U<6MZ+sN=-6a~!%(EH=kPtcQcK4vxgS_y`8!6l{QH_WD!y z`g2&H@vW%m_oAQUc%0Ymg%f7L`3$FV!#B1+IHmeVXEbW!T#UdOsENE7f}2qrs>B35 zhGBRW-RPU@IHA}EHBXOfJ&tof4Sxo*P!r^%PF#xY(3x#riaP0P>qZQu{~~H5hp;i8 zzySOT-FOW(kAHi|X@p^@emwfKzSD_D6YP&IaXczii>yzh9@v1|`Ae9DuVGF60mJbZ z)B?U~juVWb7>x4ti~2$lO~sEuvIP&|OO@FXflpLQbtYFuPMp}UEiz^AjxbraM? zEm0@#hPrPI*2a9)^ChVJmSQAsMWyI%d>C(F7T%w3BDoiv(!b=Pkx1hXCSyz&6Z%o8 zosUPIc&hC$Ky6?JDk2;0^>S1s520%36KsNCqE3DjGq7$~6MpKR0MuQZQSW$QdSFfUqjoEMAcF(D&*bm_$Umc{+x+4 zl*0w6jjTdF@EnHV9((;=)Je{vHgp{op}RN$1A3asjm1d%*{D=3#@4tB+hQd~;Ex#V zp;5D!nK%ix!wl2}6RZnSDcXiR@gQpAk-g3PoQ+!G2~;HZqass*y6|=7$(i&q;LOswPmE+#1+8BldaWn?uPSnQVK;3r+b;8T2`~OBos&-#Znk2Nq9 zwb8*Cg}MERzjnNW0o}L(lW`j=M5j?Xufh@7xWCzG0qV;+6Sa{o=!^SMui>lKlXmyyypQLwP=jSW;otnm~UN-T5!4Tzku4ECGwKAtqfT6d3e$!fqc)g=b+Hp_!roX9^HI;uMAgO; zR0=krPQDMjxg6(RtV7=!Y@Vx&^;zEurlAeEQB|9WX*dWIa3RLwe)PffsA9Wdy^Sg= zzx&Md(KwTSU)1K|wfjZe%RH!RZ z3!FmT|FhLK#C#9JP*vX3_H$4vS%KQXcJ!!tUZqhF521?U1ZpE6V-387y6=1R!+&8z z{KNKrhnkZIp*GeIt6wwQ&qbwdA=bv-sC5nwCI0$C9b&*A-@^uY*4}UhweY{}^6ax!%R&yM?DvV+E_Rsr@S5YVZ9Cd)7unpe9P;5EM%$tr%)ll1?iGB3`ucVEh1k?$q+wn!H57x67g6mKz*>A5`qH=!%YqP#{ ziiUFfg}v|{wxECAjyD`*a@`E|U=-@aNvPcSL^lpX6R%TaTfAsIrCBDXE4m=IRA_M{BVLMnHrgZ zy1p1|VL9p`2drRu52G(GMoqjNHQ{>H$@bvO zcm&IF>SPnKP~xhh>wwC2cho|oFa;-}Hogv<PyUCq9XKug{^X^E<4Cf1+Nq zzfd`?lV`>QQTH`LUra!v>!cztgtH#`206Fw^}$n2gok4h<0G*p>pLINXn|Kz5%AA9 zMV5m7=#Rxx+=eQykOK2dWFe-}-+@ozdF+Cdr<$VOf#vi+!)%;8&D6@bsEF1qB>p;K zD2;j;VU0nZC>85tI@ZDd=#N9}c$V$wp>jP7HP4gigKMxZu0y3}8)}|%)O`mF?fZX} z0Y3&#qBe96mFur?GF5*S!5Kc?{6*s-)C47{3CmCmJ&vmKXR#r^f?D_;)cqgY@pGv4 zzMoF~18Cf2KqsqFZ2AGXl71`H_{-K~s2ceMTjJMt{2r>P{7TG5;xUsSC>4d@97gal>u`$j=P5dls-o5C?w^1j) zjEc;!R?j^e3Uz}S=6#RE82VjMH%>xrsMNZ^jxWP_#-Brl_+8ZZ;UmVcYI7%GI1pzfb)U5XL(H(_@? zj7{(ksz!q5n%AuZDnbKLMV_m1z5fL?nxe=0JgR6aPz#Ce?qtm8UOa>zEp(SgCk$I)eohZZ{VaGI_1dgPZDf<}??#2V z(s~?KL#I*qT|qr}14Hl*hGRgP`Qep_O6|Nd;@_XfA_fBSLsZpYKo#9()X9HAck^aC(W_WM4k9?)P!qLwXzX)pgpLCkD(jCKyBzx)P13zMdo#j#xMqkpeCAv zDxzZ4>$Af4D^b;Z3bnv*s9Nw{T>Xo!6M}j^8{L?X!MGCRa2xiojBb1h>*EKg1*$ZSF&cfIHg8ERs+NXh6qZ=m zV*>r7w*L#J(r>tm_$Sinv&t0Bbksr%QMp@IRh~RuUO+Y zniCbHa{2^n!u_a|A3?np@1f@T43*OFZT}aHp??pXVw+87zFwP%e>ejp8EAqf7>Fw| z6t|#u`Z}iIhu93OQ1>_8Y$B9`nr9g5zNx7DwxS|*6x-k}R3yW;@N)#aZ6W?Dnt2Qi z#OSV8BFkVDGcN-Pz@NMR8$+Tvpu9u;n+vTB= zN#hhMWTD&552FZF5#5Jw%tl3IiS2JhZQv+|;b~OyUbFs%nyKRBwH$H%VI0{u0IoJXVQ4c(ex^D~m;x24}dr=b|MxE$5D#zDQZ;S6v^ZJHhBKKsMqZI??s1tmO?eJSvP8;nq8%n_L^gEzJI0Jj)MohzRP#X_=(d0e?Rg~$d zdHZ269D&ie9)tA$zePhQIEyN(udTOH8}NV0L?RY-!a=B1l-mAEbkncI3-|^0z>5De zuiwkbYV7Xr(Ud$JFyP#MOAer*2SMu#dQm-C){nu(@_ie z#i_UiRYSK>_t)9OKhI(s7T^W+WYZY1mtEsNY=cYonUL{{R|g45*l%!J4=Q72=(!_xOnQ zJVwy}1N|`gp!thN3-qTy6!qnM7*%{zuqDpLTDS>ykR7N{n#hf+G!s9D+W2zR#$LjXSc!_zbyU&c_RvtMn!IKr zkciq)S5zuSplYEEgK!z@gd0$idJ$Emdr-A<635_YScLJfn}1i>h>Ae)8|HtS3Bz3a zo(LLkX)M7wti;ZE2@^5wkoh5!iOcBk#VkyH)7)ZO2&sCTAi`H?j z9$r^;hHGHOfanTW=e|Dt0>}e*`SZ{J{*TU^Y~emE(^mNJqM`aEAED?m-l8|8&|rwX?(b=zc($u zjjNkCD?Z;R)5rT!{Et43eY^(~Zu#`~@xGWi(KWzZH>t$c)w>`mv|jc9%ZmlBxxAZ` z;(R*!RD6`wz~#!QIG@}n#XDwVWW}M0%l-VbOY;h+jh~cLl3kov`cll zDJqyS$DNy#GpWSM%_}I)DIQ-srzpof;9Xl7SFhyJ!s62EzV}$+@R}(}Deb($MeXXP zB&M`=w@XV;OY;sXYHqu!>FqmK%qmLj*1_qUQ(BtiE-EgZTs&dw)SOaxesRvsoMLz0 zwA{ktsS`@36izG2pHNg%z*y1oT_pv_ca@e_WbZF(7@Rp_+N6TKX_HGP=9J_Y=grJ1 zD9Q1jIhxt|AAM&;UWt3!oJVs?OG-+MkH5hZ#ZK@4zu!G!rrR7y=kX>UYuhNFgSh`O Kg?HSs#Qy*%f~ST6 delta 10083 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 BzY+id diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po index dd1588ea..6192f638 100644 --- a/locale/nb_NO/LC_MESSAGES/messages.po +++ b/locale/nb_NO/LC_MESSAGES/messages.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Tiny Tiny RSS 1.3.2\n" +"Project-Id-Version: Tiny Tiny RSS 1.2.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-21 22:58+0300\n" -"PO-Revision-Date: 2009-03-21 19:22+0100\n" +"POT-Creation-Date: 2009-02-20 15:55+0300\n" +"PO-Revision-Date: 2009-02-20 13:47+0100\n" "Last-Translator: Christian Lomsdalen \n" "Language-Team: Norwegian BokmÃ¥l \n" "MIME-Version: 1.0\n" @@ -108,20 +108,12 @@ msgid "Unknown error" msgstr "Ukjent feil" #: errors.php:5 -msgid "" -"This program requires XmlHttpRequest to function properly. Your browser " -"doesn't seem to support it." -msgstr "" -"Dette programmet krever XmlHttpRequest for Ã¥ fungere slik det skal. Din " -"nettleser ser ikke ut til Ã¥ støtte dette." +msgid "This program requires XmlHttpRequest " +msgstr "Dette programmet krever XmlHttpRequest " #: errors.php:8 -msgid "" -"This program requires cookies to function properly. Your browser doesn't " -"seem to support them." -msgstr "" -"Dette programmet krever cookies for Ã¥ fungere ordentlig. Din nettleser ser " -"ikke ut til Ã¥ støtte dette." +msgid "This program requires cookies " +msgstr "Dette programmet krever informasjonskapsler pÃ¥slÃ¥tt" #: errors.php:11 msgid "Backend sanity check failed" @@ -1778,6 +1770,11 @@ msgstr "Denne nyhetsstrømmen" msgid "Create Filter" msgstr "Lag filter" +#: modules/popup-dialog.php:242 modules/popup-dialog.php:293 +#: modules/pref-filters.php:39 modules/pref-filters.php:96 +msgid "description" +msgstr "beskrivelse" + #: modules/popup-dialog.php:245 modules/pref-filters.php:42 #: modules/pref-filters.php:402 msgid "Match" @@ -2119,6 +2116,14 @@ msgstr "Laget filter %s" msgid "Create filter" msgstr "Lag filter" +#: modules/pref-filters.php:392 +msgid "filter_type_descr" +msgstr "Beskrivelse av filtertype" + +#: modules/pref-filters.php:393 +msgid "action_description" +msgstr "Handlingsbeskrivelse" + #: modules/pref-filters.php:404 msgid "Field" msgstr "Felt" @@ -2257,6 +2262,10 @@ msgstr "Velg utseende" msgid "Change theme" msgstr "Endre utseende" +#: modules/pref-prefs.php:388 +msgid "short_desc" +msgstr "kort beskrivelse" + #: modules/pref-prefs.php:400 modules/pref-prefs.php:405 msgid "Yes" msgstr "Ja" @@ -2621,35 +2630,19 @@ msgstr "Match pÃ¥:" msgid "Internal error: Function not implemented" msgstr "Intern feil: funksjonen er ikke implementert" -#~ msgid "Publish article with a note" -#~ msgstr "Publiser artikkelen med et notat" - -#~ msgid "toggle unread" -#~ msgstr "Merk som ulest" - -#~ msgid "edit note" -#~ msgstr "Endre notat" - -#~ msgid "Please enter a note for this article:" -#~ msgstr "Vennligst skriv inn et notat for denne artikkelen:" - -#~ msgid "This program requires XmlHttpRequest " -#~ msgstr "Dette programmet krever XmlHttpRequest " - -#~ msgid "This program requires cookies " -#~ msgstr "Dette programmet krever informasjonskapsler pÃ¥slÃ¥tt" - -#~ msgid "description" -#~ msgstr "beskrivelse" - -#~ msgid "filter_type_descr" -#~ msgstr "Beskrivelse av filtertype" - -#~ msgid "action_description" -#~ msgstr "Handlingsbeskrivelse" +#~ msgid "" +#~ "This program requires XmlHttpRequest to function properly. Your browser " +#~ "doesn't seem to support it." +#~ msgstr "" +#~ "Dette programmet krever XmlHttpRequest for Ã¥ fungere slik det skal. Din " +#~ "nettleser ser ikke ut til Ã¥ støtte dette." -#~ msgid "short_desc" -#~ msgstr "kort beskrivelse" +#~ msgid "" +#~ "This program requires cookies to function properly. Your browser doesn't " +#~ "seem to support them." +#~ msgstr "" +#~ "Dette programmet krever cookies for Ã¥ fungere ordentlig. Din nettleser " +#~ "ser ikke ut til Ã¥ støtte dette." #~ msgid "display tags" #~ msgstr "Vis stikkord" @@ -2675,6 +2668,9 @@ msgstr "Intern feil: funksjonen er ikke implementert" #~ msgid "Address changed." #~ msgstr "Adresse er endret" +#~ msgid "Please enter label title:" +#~ msgstr "Vennligst skriv inn merkelapp:" + #~ msgid "" #~ "Rescore articles in all feeds? This operation may take a lot of time." #~ msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo index e31ede0ffb9d945f7cb2807efa8bff9d68947080..d6e88e467dea40e593f40e339e9077dee9091170 100644 GIT binary patch delta 4081 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 MXYx6m?RGx-8zd{Vf&c&j delta 3675 zcmYk;e@vBC9LMp4f^b35026-z7f}I!fc)~B7;0sZf))W{8Y*)AnP>`_`QsWY{s>Ja zQAJFQ#1Rr8aoc=Wo!8_O$AEFZY7d22w4`X^^6n4WD%)}AM$5e9CIMuda zhe~i4W@9rZGQa7hF_;SvFdE%GjiCr88y~|QBvVs}s?dDoV>WUM#wLu%gQ!GWk)cc* zszRNZhgVVKrZA|!mxj5_Z#*>gg<8}N^{9awFa{fK{{(79EvWmyvYtn+>?#K0EmWoc zw158xHDP$9Kha)DE+!j&%J5kl`eG4kf~lwpyr_g~Py?(&CAJ<_`mMHq$a)OZxPB6c z;AK=It|-4zs7Duz8Yel5`fK7eE@+}GREbC18>U*zQ5kztE3HK(x*m1^PSjpGiCWO7 zsQb=gEOuZQyoJ5-4)#M=H1(%CW)KhlarB_}z+_G;{TzFJH7e0Y)Mngk`}iXMRQ{bQjsTPT4e056b7fO+Ff_T!=$uR)|`W7vr$b_79^5YDImq9aX{$sFhqo zCHxm^Aw4;%Vo9jYISMsy87i?F)O@}jH29AB5S3Xg^4QEd)WAQYGXDcLU;y7zKN7X_ z1k~P0MI|;8mFPHBWeZRfmSZ}uMBRVfug|p5&==335@p%_gi}gC{+5d*wcpGzY z5Tnh(*{BKHPz(AF3j&P!2{qn8%Bkz=sD2KH>;2ECq1UYxRoc0zmDbpPz3uNty*@`V z15cqUbRG2wgDC@ZnOIaMJg5mLpei^8HGTI2iRvJgCYRq7o>z&OlYZ!bd|D*nqlmJL(ba z!BqSP_4kLUzX$RyO&E?!s2^(cCZZ-t#zB~hT1c_|`*c)7vrq}vq88@cL_=TLhkCYW zQ4_S={zc?tu5r>tK|DY=hN7P3P)=+MGugTbRhiAmQ!&lx##U59S5R-!4P-o@`IUw; zx{Z1Ss;^2M&PfBMqps(po>>WMZ%*Uur)q#A>bxsNBqFlOvDDqomrl5X^=Aja*LzQ|9Iu$^@1+BJ9|{|VH4eHsI?4TG>9-PnPu z*d5fk53CVM)L)q=(vZ2R%%)ivp(a>k-GoYXC%SPzYT_?Z34Lp?ccLb`hkA5j)L#k3 zU{{R8u{a=^`fImWaG?sDFa(2A`~yc|0DT>=5F3aWiIIeda1*734(*|0r)BpM?U#vZ z#D05yIL;^ZTT(&1uIIm=h7Of@v(sWzS$E-dVy*2fd+mwIwqJ$|hyvT6V%5*^Tf{`7 zh+tjLKf~axTxJt<_54Sx$DtB!Bf1g#@!3b{(5`2Tm|4UdgpLEmIARa6g-{iB?95mwZtew$CDaP@Az_JtFG8%6?zFasu@a*AVP>oj||&+4QCUJ zh%{n1p+g&4d+Jp}Z$%eEN1h+^HqOwCtXHbqUR;7Tgv<6DF{g2S_bA^&dqp%6m5=nF zrd>z8Nid-EF0H_ogpNsmobv$NZooA}FtM5#Mm$eM5`~10nM6484F7VOdK!BP{n&0I z9zEWnqZjUoy*L5iBgPXE#8D!Ph$T{qsYGw$T_T3~|45?oRLi!A-(4+V$8-b)S1oZ@ y&z`ruv9s^Y(9Gc(>F$h-(b=O~a{GPJy=6>tbeEXr-o?%xrs~}1wX`d}{_cO1K|kF9 diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 4189c1b0..7bf396ee 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tt-rss 1.2.14.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-21 22:58+0300\n" +"POT-Creation-Date: 2009-02-20 15:55+0300\n" "PO-Revision-Date: 2007-10-24 00:47-0200\n" "Last-Translator: Marcelo Jorge VIeira (metal) \n" "Language-Team: Portuguese/Brazil\n" @@ -111,16 +111,12 @@ msgid "Unknown error" msgstr "Erro desconhecido" #: errors.php:5 -msgid "" -"This program requires XmlHttpRequest to function properly. Your browser " -"doesn't seem to support it." -msgstr "" +msgid "This program requires XmlHttpRequest " +msgstr "Este programa requer XmlHttpRequest" #: errors.php:8 -msgid "" -"This program requires cookies to function properly. Your browser doesn't " -"seem to support them." -msgstr "" +msgid "This program requires cookies " +msgstr "Este programa requer cookies " #: errors.php:11 msgid "Backend sanity check failed" @@ -1775,6 +1771,11 @@ msgstr "" msgid "Create Filter" msgstr "Criar um usuário" +#: modules/popup-dialog.php:242 modules/popup-dialog.php:293 +#: modules/pref-filters.php:39 modules/pref-filters.php:96 +msgid "description" +msgstr "descrição" + #: modules/popup-dialog.php:245 modules/pref-filters.php:42 #: modules/pref-filters.php:402 msgid "Match" @@ -2126,6 +2127,14 @@ msgstr "" msgid "Create filter" msgstr "" +#: modules/pref-filters.php:392 +msgid "filter_type_descr" +msgstr "filter_type_descr" + +#: modules/pref-filters.php:393 +msgid "action_description" +msgstr "action_description" + #: modules/pref-filters.php:404 #, fuzzy msgid "Field" @@ -2268,6 +2277,10 @@ msgstr "Selecionar o tema" msgid "Change theme" msgstr "Mudar Tema" +#: modules/pref-prefs.php:388 +msgid "short_desc" +msgstr "short_desc" + #: modules/pref-prefs.php:400 modules/pref-prefs.php:405 msgid "Yes" msgstr "Sim" @@ -2652,24 +2665,6 @@ msgstr "" msgid "Internal error: Function not implemented" msgstr "" -#~ msgid "This program requires XmlHttpRequest " -#~ msgstr "Este programa requer XmlHttpRequest" - -#~ msgid "This program requires cookies " -#~ msgstr "Este programa requer cookies " - -#~ msgid "description" -#~ msgstr "descrição" - -#~ msgid "filter_type_descr" -#~ msgstr "filter_type_descr" - -#~ msgid "action_description" -#~ msgstr "action_description" - -#~ msgid "short_desc" -#~ msgstr "short_desc" - #~ msgid "Please select only one category." #~ msgstr "Por favor selecione somente uma categoria." diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index a98afcade9b13d9fe8c8c79be0e32fd60afafd29..a99c5307394aacc551674573973506670d4cb951 100644 GIT binary patch delta 11638 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\n" "Language-Team: Русский \n" @@ -114,18 +114,12 @@ msgid "Unknown error" msgstr "Неизвестная ошибка" #: errors.php:5 -msgid "" -"This program requires XmlHttpRequest to function properly. Your browser " -"doesn't seem to support it." -msgstr "" -"Программе требуется функционал XmlHttpRequest. Ваш браузер его не " -"поддерживает." +msgid "This program requires XmlHttpRequest " +msgstr "Этой программе нужен XmlHttpRequest " #: errors.php:8 -msgid "" -"This program requires cookies to function properly. Your browser doesn't " -"seem to support them." -msgstr "Для работы программы необходимы куки. Ваш браузер их не поддерживает." +msgid "This program requires cookies " +msgstr "Этой программе нужны включённые куки" #: errors.php:11 msgid "Backend sanity check failed" @@ -1805,6 +1799,11 @@ msgstr "Этот канал" msgid "Create Filter" msgstr "Создать фильтр" +#: modules/popup-dialog.php:242 modules/popup-dialog.php:293 +#: modules/pref-filters.php:39 modules/pref-filters.php:96 +msgid "description" +msgstr "описание" + #: modules/popup-dialog.php:245 modules/pref-filters.php:42 #: modules/pref-filters.php:402 msgid "Match" @@ -2146,6 +2145,14 @@ msgstr "Добавлен фильтр %s" msgid "Create filter" msgstr "Создать фильтр" +#: modules/pref-filters.php:392 +msgid "filter_type_descr" +msgstr "описание типа фильтра" + +#: modules/pref-filters.php:393 +msgid "action_description" +msgstr "описание действия" + #: modules/pref-filters.php:404 msgid "Field" msgstr "Поле" @@ -2286,6 +2293,10 @@ msgstr "Выбор темы" msgid "Change theme" msgstr "Изменить тему" +#: modules/pref-prefs.php:388 +msgid "short_desc" +msgstr "краткое описание" + #: modules/pref-prefs.php:400 modules/pref-prefs.php:405 msgid "Yes" msgstr "Да" @@ -2648,24 +2659,6 @@ msgstr "Соответствие:" msgid "Internal error: Function not implemented" msgstr "Внутренняя ошибка: Функция не реализована" -#~ msgid "This program requires XmlHttpRequest " -#~ msgstr "Этой программе нужен XmlHttpRequest " - -#~ msgid "This program requires cookies " -#~ msgstr "Этой программе нужны включённые куки" - -#~ msgid "description" -#~ msgstr "описание" - -#~ msgid "filter_type_descr" -#~ msgstr "описание типа фильтра" - -#~ msgid "action_description" -#~ msgstr "описание действия" - -#~ msgid "short_desc" -#~ msgstr "краткое описание" - #~ msgid "display tags" #~ msgstr "показать теги" @@ -2816,6 +2809,19 @@ msgstr "Внутренняя ошибка: Функция не реализов #~ msgid "Fatal Error" #~ msgstr "Фатальная Ошибка" +#~ msgid "" +#~ "This program requires XmlHttpRequest to function properly. Your browser " +#~ "doesn't seem to support it." +#~ msgstr "" +#~ "Программе требуется функционал XmlHttpRequest. Ваш браузер его не " +#~ "поддерживает." + +#~ msgid "" +#~ "This program requires cookies to function properly. Your browser doesn't " +#~ "seem to support them." +#~ msgstr "" +#~ "Для работы программы необходимы куки. Ваш браузер их не поддерживает." + #~ msgid "Modify score" #~ msgstr "Изменить оценку" diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo index d076aa7121ab3a6f09c65dbed5d4a0d5bda26f24..2cf4755bc30cf7a66aeaddf0c9a3938a47eacf83 100644 GIT binary patch delta 5527 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 delta 5284 zcmYk=32>Ih9mnx~b0;L^c=P5Y$qRu%xDt|ZrjS556OI7}-$iF9>d=FXUt}N6GYxMKn^D27!1XyP!Z2X&EO?uY_kFR&+OrU zad;ZT@e*d?HSCF=3}a?sK2FCvRDidUF$K+F0V?uEsK}S2BHn6P9@=&Rr zfSSR4)Pu{cYcP*`9ctiXs3p0Hk6|!7QyH0x3UD^+{YAFD7Ne-IK<%x-YxaSi7(&B4 zI1JxK1=50Any60hri(*$*uz?c%2Y9S!O=)8<^|MJZ9@gJ3)z?Ew-}1&kz*V%A5u_i zKSjN83zf157=+0=ZXju>U0Z;h95dQF7d4ZWsEln!?STeVW=^0Nub?J$2lagj@2vZ* ze;Nh7Scu9%IVwftFbt<+Fjm_8b5McKw=O{iyb^Uhe~Ak82r45Vq9&+{_C_>noODcM zeB-B}H7iDKqG6~#F$tBr1*phtQ7PProH(=B*3a7dO>EuOxo$r`RKJ~2GtR?)I0Q9; zr5Ml**HBPO>rg4%gBtLUsLXtXTI0K@;}gQpQy?8t?+r%Hd^+l!zleH&4{F9I(T^8U zOLZ3&P-r*uPj*a7H}{27)XXO%%WtY}{dH8zeuH{(A1bgDr~xja0{q<8AD|`{(cQft zi{aEWQ8Ul67Ir89x=~6)B#uNsPQW%;gRRE|6~IPRz?+eMWR9X{dIOb#Z?G4p^l(o> zIja9^>ta-(uiyZz3s6u>&!7Uhi5l<=)KY}?ba!(W>V6R_kU_{;rVLqjvk2sP|t&b-dc%e+~70*o`_hr%;)`joJgT{mH-9u&BTL;zU$^DyqX;)Bvk& z{dMbG$f}sVn1a_)GymG&Pv>kYkS?g1=bjt*PiW8!n^E8L?Wl+k zV+H=xn#TrU|Cy!e!v@rIC$Tl9sQy||13$9$*dMsW-6+Kji?v5 z+WN0i5${7zm^p!(@m>CH^^TyudCB>Zrkb2sOY5 zsLk`KZT~Oog>O+a2p!~hl!aQduGkJop_ZZw75FODQf)&Gd=_!Q-eGKd|-lwtf+nvFoTA-a!QtG}wJF3VTqGNA+7`+b7%llc?ukR6FCF zA5&0At1%DXK+X6JYA-a|`}a{PjvV3+l!MAd4_oht3b+I{^HHcz_e|6$cs6RBTI)It zC{;TsuokA#dIGif=TW=-y7f!j-nPuWpM}aqzO4_$VCrL0flNSU@(I)@c@}Ez=b-|x zE+hYXu$BfzyaF}w8>mS4pfYh3^}=P;_uvKw<6YGA|3jrTVyGKX9P0fHThB-Bv4Pe} zs7yXPl>BSctffH#)T3r}*m@cj;NMY8@d@%NFn4Tw*J17qi%^*?Mg=_1))!a@xHyEGRoa6S*Ts#74;=7!APt? z^*0GS>HI%IK})b4m5HtPf!(N0vme9pG%A(na5^^QNgP)0{#!7z!tFR8mBGH&5va}j zIBJ|})*oWJ&i`r(k@z-hW(}wa4_W_U@1Mqa+ApBi`ZIg~OVoRhPy4zoEX6{l>WW*P>>&33Z${qc&Y5vb^RZ zDii*(?k~A~>`eV>Bx$B@EWawEDO{#O=erq|i5Ba_vCg3c{l&=rlh2!YQ5Ak#xZ<7L z31yydoL*jUjM}^&4g#h)X8U5PC2;XuruB#2VnUn-Z*tHhgyb@KgrGDUOm@WTpgVwzG6?J^T3za zKgd2AWBm{JGbulZ-*R>1QmU_VHE^}H&l#sOso0a{Y)>jtqFa|W+_{ldmg=)l=$|*= z{Vbvo?F>%N_M|&=k}Evzodd~UPpES$Im?sm+(<6-c%0mn5|6)eUP`-^#xwchp^5Wq z7Cuv1>#v$KXLgOLe$M}V<nI6_VU diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index f7cc51a8..77a647ed 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiny Tiny RSS1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-21 22:58+0300\n" +"POT-Creation-Date: 2009-02-20 15:55+0300\n" "PO-Revision-Date: 2007-08-19 19:03+0800\n" "Last-Translator: sluke \n" "Language-Team: hicode.org \n" @@ -107,16 +107,12 @@ msgid "Unknown error" msgstr "未知错误" #: errors.php:5 -msgid "" -"This program requires XmlHttpRequest to function properly. Your browser " -"doesn't seem to support it." -msgstr "" +msgid "This program requires XmlHttpRequest " +msgstr "本程序需要xmlhttprequest支持" #: errors.php:8 -msgid "" -"This program requires cookies to function properly. Your browser doesn't " -"seem to support them." -msgstr "" +msgid "This program requires cookies " +msgstr "本程序需要开启cookies" #: errors.php:11 msgid "Backend sanity check failed" @@ -1818,6 +1814,11 @@ msgstr "本feed" msgid "Create Filter" msgstr "创建过滤器" +#: modules/popup-dialog.php:242 modules/popup-dialog.php:293 +#: modules/pref-filters.php:39 modules/pref-filters.php:96 +msgid "description" +msgstr "描述" + #: modules/popup-dialog.php:245 modules/pref-filters.php:42 #: modules/pref-filters.php:402 msgid "Match" @@ -2175,6 +2176,15 @@ msgstr "创建过滤器 %s" msgid "Create filter" msgstr "创建过滤器" +#: modules/pref-filters.php:392 +msgid "filter_type_descr" +msgstr "" + +#: modules/pref-filters.php:393 +#, fuzzy +msgid "action_description" +msgstr "描述" + #: modules/pref-filters.php:404 #, fuzzy msgid "Field" @@ -2320,6 +2330,10 @@ msgstr "选择模板" msgid "Change theme" msgstr "更改模板" +#: modules/pref-prefs.php:388 +msgid "short_desc" +msgstr "short_desc" + #: modules/pref-prefs.php:400 modules/pref-prefs.php:405 msgid "Yes" msgstr "是" @@ -2712,22 +2726,6 @@ msgstr "匹配:" msgid "Internal error: Function not implemented" msgstr "" -#~ msgid "This program requires XmlHttpRequest " -#~ msgstr "本程序需要xmlhttprequest支持" - -#~ msgid "This program requires cookies " -#~ msgstr "本程序需要开启cookies" - -#~ msgid "description" -#~ msgstr "描述" - -#, fuzzy -#~ msgid "action_description" -#~ msgstr "描述" - -#~ msgid "short_desc" -#~ msgstr "short_desc" - #~ msgid "display tags" #~ msgstr "显示标签" diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index afcd82d3..8b22bf85 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -87,8 +87,9 @@ } if ($subop == "publ") { - $pub = $_GET["pub"]; - $id = db_escape_string($_GET["id"]); + $pub = $_REQUEST["pub"]; + $id = db_escape_string($_REQUEST["id"]); + $note = trim(strip_tags(db_escape_string($_REQUEST["note"]))); if ($pub == "1") { $pub = "true"; @@ -96,18 +97,36 @@ $pub = "false"; } + if ($note != 'undefined') { + $note_qpart = "note = '$note',"; + } + // FIXME this needs collision testing - $result = db_query($link, "UPDATE ttrss_user_entries SET published = $pub + $result = db_query($link, "UPDATE ttrss_user_entries SET + $note_qpart + published = $pub WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); - print ""; + + print ""; + + print ""; getGlobalCounters($link); getLabelCounters($link); if (get_pref($link, 'ENABLE_FEED_CATS')) { getCategoryCounters($link); } - print ""; + print ""; + + if ($note != 'undefined') { + $note_size = strlen($note); + print ""; + print ""; + print ""; + } + + print ""; return; } diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index fae1fbe2..36a0e4d3 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -702,8 +702,12 @@ if (file_exists($icons_dir . "/$id.ico")) { unlink($icons_dir . "/$id.ico"); } + + ccache_remove($link, $id, $_SESSION["uid"]); + } else { label_remove($link, -11-$id, $_SESSION["uid"]); + ccache_remove($link, -11-$id, $_SESSION["uid"]); } } } @@ -992,6 +996,9 @@ if ($num_feeds == 0) { db_query($link, "DELETE FROM ttrss_feed_categories WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]); + + ccache_remove($link, $id, $_SESSION["uid"], true); + } else { print format_warning(__("Unable to delete non empty feed categories.")); @@ -1369,26 +1376,28 @@ print ""; diff --git a/sanity_check.php b/sanity_check.php index e813f368..51dc1b5f 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 18); - define('SCHEMA_VERSION', 54); + define('SCHEMA_VERSION', 55); if (!file_exists("config.php")) { print "Fatal Error: You forgot to copy diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 65e4ffb4..ac057fd5 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -138,6 +138,7 @@ create table ttrss_user_entries ( published bool not null default 0, last_read datetime, score int not null default 0, + note text, unread bool not null default 1, index (ref_id), foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE, @@ -224,7 +225,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB; -insert into ttrss_version values (54); +insert into ttrss_version values (55); create table ttrss_enclosures (id serial not null primary key, content_url text not null, diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index eecc1d29..57d2e95d 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -126,6 +126,7 @@ create table ttrss_user_entries ( published boolean not null default false, last_read timestamp, score int not null default 0, + note text, unread boolean not null default true); -- create index ttrss_user_entries_feed_id_index on ttrss_user_entries(feed_id); @@ -200,7 +201,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (54); +insert into ttrss_version values (55); create table ttrss_enclosures (id serial not null primary key, content_url text not null, diff --git a/schema/versions/mysql/55.sql b/schema/versions/mysql/55.sql new file mode 100644 index 00000000..75f55b3c --- /dev/null +++ b/schema/versions/mysql/55.sql @@ -0,0 +1,7 @@ +begin; + +alter table ttrss_user_entries add column note text; + +update ttrss_version set schema_version = 55; + +commit; diff --git a/schema/versions/pgsql/55.sql b/schema/versions/pgsql/55.sql new file mode 100644 index 00000000..75f55b3c --- /dev/null +++ b/schema/versions/pgsql/55.sql @@ -0,0 +1,7 @@ +begin; + +alter table ttrss_user_entries add column note text; + +update ttrss_version set schema_version = 55; + +commit; diff --git a/tt-rss.css b/tt-rss.css index 22c8a40c..3946d6fc 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -66,9 +66,34 @@ div.postReply div.postEnclosures { div.postReply img.tagsPic { width : 16px; height : 16px; + margin-left : 4px; vertical-align : middle; } +div.articleNote div.articleNoteOps { + float : right; + color : #9a8c59; +} + +div.articleNote div.articleNoteOps a { + color : #9a8c59; +} + +div.articleNote div.articleNoteOps a:hover { + color : black; +} + +div.articleNote { + background-color : #fff7d5; + border-width : 1px; + padding : 5px; + border-style : dashed; + border-color : #e7d796; + font-size : 8px; + margin-top : 5px; + color : #9a8c59; +} + div.postReply span.author { font-size : 12px; } @@ -2160,3 +2185,11 @@ div#offlineModeDrop { color : #909090; } +optgroup { + color : #5050aa; + font-style : normal; +} + +option { + color : black; +} diff --git a/tt-rss.php b/tt-rss.php index 7a492f84..2dcc9ca1 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -188,26 +188,25 @@ window.onload = init; diff --git a/version.php b/version.php index e4e7cb85..4946d7e8 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@ diff --git a/viewfeed.js b/viewfeed.js index be1a442e..d21e3e62 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -15,6 +15,39 @@ var post_under_pointer = false; var last_requested_article = false; +function toggle_published_callback(transport) { + try { + if (transport.responseXML) { + + all_counters_callback2(transport); + + var note = transport.responseXML.getElementsByTagName("note")[0]; + + if (note) { + var note_id = note.getAttribute("id"); + var note_size = note.getAttribute("size"); + var note_content = note.firstChild.nodeValue; + + var container = $('POSTNOTE-' + note_id); + + cache_invalidate(note_id); + + if (container) { + if (note_size == "0") { + Element.hide(container); + } else { + container.innerHTML = note_content; + Element.show(container); + } + } + } + } + + } catch (e) { + exception_error("toggle_published_callback", e, transport); + } +} + function catchup_callback2(transport, callback) { try { debug("catchup_callback2 " + transport + ", " + callback); @@ -592,13 +625,19 @@ function toggleMark(id, client_only, no_effects) { } } -function togglePub(id, client_only, no_effects) { +function togglePub(id, client_only, no_effects, note) { try { var query = "backend.php?op=rpc&id=" + id + "&subop=publ"; query = query + "&afid=" + getActiveFeedId(); + + if (note != undefined) { + query = query + "¬e=" + param_escape(note); + } else { + query = query + "¬e=undefined"; + } if (tagsAreDisplayed()) { query = query + "&omode=tl"; @@ -613,11 +652,10 @@ function togglePub(id, client_only, no_effects) { var vfeedu = $("FEEDU--2"); var crow = $("RROW-" + id); - if (mark_img.src.match("pub_unset")) { + if (mark_img.src.match("pub_unset") || note != undefined) { mark_img.src = mark_img.src.replace("pub_unset", "pub_set"); mark_img.alt = __("Unpublish article"); query = query + "&pub=1"; - } else { //mark_img.src = "images/pub_unset.png"; @@ -635,7 +673,7 @@ function togglePub(id, client_only, no_effects) { if (!client_only) { new Ajax.Request(query, { onComplete: function(transport) { - all_counters_callback2(transport); + toggle_published_callback(transport); } }); } @@ -2147,3 +2185,18 @@ function toggleHeadlineActions() { exception_error("toggleHeadlineActions", e); } } + +function publishWithNote(id, def_note) { + try { + if (!def_note) def_note = ''; + + var note = prompt(__("Please enter a note for this article:"), def_note); + + if (note != undefined) { + togglePub(id, false, false, note); + } + + } catch (e) { + exception_error("publishWithNote", e); + } +} -- 2.39.2