diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo index 128af0475..642fa2464 100644 Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po index cf5461c01..c75ea812e 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.po +++ b/locale/fr_FR/LC_MESSAGES/messages.po @@ -1,14 +1,14 @@ -# translation of messages.po to Français -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Thibaut Cousin , 2007. +# translation of messages.po to Français +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Thibaut Cousin , 2007. msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-21 14:15+0400\n" -"PO-Revision-Date: 2007-08-20 23:36+0200\n" +"POT-Creation-Date: 2007-08-21 18:31+0400\n" +"PO-Revision-Date: 2007-08-21 12:37+0200\n" "Last-Translator: Thibaut Cousin \n" "Language-Team: Français \n" "MIME-Version: 1.0\n" @@ -570,12 +570,12 @@ msgstr "Se désinscrire de %s ?" #: localized_js.php:112 #, php-format msgid "Mark all visible articles in %s as read?" -msgstr "Marquer tous les articles de %s visibles comme lus ?" +msgstr "Marquer tous les articles visibles de %s comme lus ?" #: localized_js.php:113 #, php-format msgid "Mark all selected articles in %s as read?" -msgstr "Marquer tous les flux sélectionnés dans %s comme lus ?" +msgstr "Marquer tous les articles sélectionnés de %s comme lus ?" #: localized_js.php:114 msgid "Please enter label title:" @@ -696,22 +696,28 @@ msgid "Default article limit" msgstr "Nombre maximal d'articles par défaut" #: localized_schema.php:37 +msgid "" +"Default limit for articles to display, any custom number you like (0 - " +"disables)." +msgstr "" + +#: localized_schema.php:38 msgid "Enable feed categories" msgstr "Utiliser les catégories de flux" -#: localized_schema.php:38 -msgid "Enable search toolbar" -msgstr "" - #: localized_schema.php:39 +msgid "Enable search toolbar" +msgstr "Activer la barre de recherche" + +#: localized_schema.php:40 msgid "Hide feeds with no unread messages" msgstr "Masquer les flux sans article non lu" -#: localized_schema.php:40 +#: localized_schema.php:41 msgid "Mark articles as read automatically" msgstr "Marquer les articles comme lus automatiquement" -#: localized_schema.php:41 +#: localized_schema.php:42 msgid "" "This option enables marking articles as read automatically in combined mode " "while you scroll article list." @@ -719,53 +725,53 @@ msgstr "" "Cette option active le marquage automatique des articles comme lus en " "affichage combiné, pendant que vous faites défiler la liste des articles" -#: localized_schema.php:42 +#: localized_schema.php:43 msgid "On catchup show next feed" msgstr "Sauter automatiquement au flux suivant" -#: localized_schema.php:43 +#: localized_schema.php:44 msgid "" "When \"Mark as read\" button is clicked in toolbar, automatically open next " "feed with unread articles." msgstr "" -"Lorsque vous cliquez sur « Marquer comme lu », le prochain flux " +"Lorsque vous cliquez sur « Marquer comme lus », le prochain flux " "contenant des articles non lus est automatiquement affiché" -#: localized_schema.php:44 +#: localized_schema.php:45 msgid "Open article links in new browser window" msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre" -#: localized_schema.php:45 +#: localized_schema.php:46 msgid "Reverse headline order (oldest first)" msgstr "Inverser l'order des en-têtes (les plus anciens en premier)" -#: localized_schema.php:46 +#: localized_schema.php:47 msgid "Show content preview in headlines list" msgstr "Donner un aperçu du contenu dans la liste des en-têtes" -#: localized_schema.php:47 +#: localized_schema.php:48 msgid "Sort feeds by unread articles count" msgstr "Trier les flux par nombre d'articles non lus" -#: localized_schema.php:48 +#: localized_schema.php:49 msgid "User stylesheet URL" msgstr "URL de la feuille de style personnalisée" -#: localized_schema.php:49 +#: localized_schema.php:50 msgid "Link to user stylesheet to override default style, disabled if empty." msgstr "" "Lien vers une feuille de style personnalisée pour remplacer le style par " "défaut (laisser vide pour ne pas en utiliser)" -#: localized_schema.php:51 +#: localized_schema.php:52 msgid "Advanced" msgstr "Avancé" -#: localized_schema.php:53 +#: localized_schema.php:54 msgid "Blacklisted tags" msgstr "Étiquettes exclues" -#: localized_schema.php:54 +#: localized_schema.php:55 msgid "" "When auto-detecting tags in articles these tags will not be applied (comma-" "separated list)." @@ -773,19 +779,19 @@ msgstr "" "Lors de l'autodétection des étiquettes dans les articles, ces étiquettes ne " "sont pas utilisées (en faire une liste, séparées par des virgules)" -#: localized_schema.php:55 +#: localized_schema.php:56 msgid "Confirm marking feed as read" msgstr "Demander confirmation pour marquer un flux comme lu" -#: localized_schema.php:56 +#: localized_schema.php:57 msgid "Enable icons in feedlist" msgstr "Afficher les icônes dans la liste des flux" -#: localized_schema.php:57 +#: localized_schema.php:58 msgid "Enable labels" msgstr "Utiliser les intitulés" -#: localized_schema.php:58 +#: localized_schema.php:59 msgid "" "Experimental support for virtual feeds based on user crafted SQL queries. " "This feature is highly experimental and at this point not user friendly. Use " @@ -795,33 +801,33 @@ msgstr "" "personnalisées. Cette fonctionnalité est hautement expérimentale et pas " "encore ergonomique. Utilisez-là avec précaution." -#: localized_schema.php:59 +#: localized_schema.php:60 msgid "Long date format" msgstr "Format de date long" -#: localized_schema.php:60 +#: localized_schema.php:61 msgid "Set articles as unread on update" msgstr "Marquer les articles comme non lus lors des mises à jour" -#: localized_schema.php:61 +#: localized_schema.php:62 msgid "Short date format" msgstr "Format de date court" -#: localized_schema.php:62 +#: localized_schema.php:63 msgid "Show additional information in feedlist" msgstr "Afficher des informations supplémentaires dans la liste des flux" -#: localized_schema.php:63 +#: localized_schema.php:64 msgid "Strip unsafe tags from articles" msgstr "Éliminer les étiquettes non sûres des articles" -#: localized_schema.php:64 +#: localized_schema.php:65 msgid "Strip all but most common HTML tags when reading articles." msgstr "" "Élimine toutes les balises HTML sauf les plus courantes lors de la lecture " "des articles" -#: localized_schema.php:65 +#: localized_schema.php:66 msgid "Use more accessible date/time format for headlines" msgstr "Afficher la date et l'heure de manière plus lisible dans les en-têtes" @@ -1039,11 +1045,11 @@ msgstr "  Mettre à jour" #: tt-rss.php:148 msgid "  Mark as read" -msgstr "  Marquer comme lus" +msgstr "Marquer comme lus" #: tt-rss.php:149 msgid "  (Un)hide read feeds" -msgstr "  (Dé)Masquer les flux lus" +msgstr "(Dé)Masquer les flux lus" #: tt-rss.php:151 msgid "Other actions:" @@ -1580,9 +1586,8 @@ msgid "filter_type_descr" msgstr "" #: modules/pref-filters.php:298 -#, fuzzy msgid "action_description" -msgstr "description" +msgstr "" #: modules/pref-filters.php:302 msgid "(Disabled)" @@ -1655,9 +1660,8 @@ msgid "Personal data" msgstr "Données personnelles" #: modules/pref-prefs.php:220 -#, fuzzy msgid "E-mail" -msgstr "Adresse électronique :" +msgstr "Adresse électronique" #: modules/pref-prefs.php:233 msgid "Change e-mail" diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index aa00d3fa9..ed15850fd 100644 Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 1f29196b9..20f1dff56 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-08-21 14:15+0400\n" +"POT-Creation-Date: 2007-08-21 18:31+0400\n" "PO-Revision-Date: 2007-08-18 15:14+0400\n" "Last-Translator: Andrew Dolgov \n" "Language-Team: Русский \n" @@ -676,119 +676,125 @@ msgid "Default article limit" msgstr "Количество статей по умолчанию" #: localized_schema.php:37 +msgid "" +"Default limit for articles to display, any custom number you like (0 - " +"disables)." +msgstr "" + +#: localized_schema.php:38 msgid "Enable feed categories" msgstr "Включить категории каналов" -#: localized_schema.php:38 +#: localized_schema.php:39 msgid "Enable search toolbar" msgstr "" -#: localized_schema.php:39 +#: localized_schema.php:40 msgid "Hide feeds with no unread messages" msgstr "Спрятать каналы без непрочитанных статей" -#: localized_schema.php:40 +#: localized_schema.php:41 msgid "Mark articles as read automatically" msgstr "Отмечать статьи как прочитанные автоматически" -#: localized_schema.php:41 +#: localized_schema.php:42 msgid "" "This option enables marking articles as read automatically in combined mode " "while you scroll article list." msgstr "" -#: localized_schema.php:42 +#: localized_schema.php:43 msgid "On catchup show next feed" msgstr "Показывать следующий канал при отметке как прочитанный" -#: localized_schema.php:43 +#: localized_schema.php:44 msgid "" "When \"Mark as read\" button is clicked in toolbar, automatically open next " "feed with unread articles." msgstr "" -#: localized_schema.php:44 +#: localized_schema.php:45 msgid "Open article links in new browser window" msgstr "" -#: localized_schema.php:45 +#: localized_schema.php:46 msgid "Reverse headline order (oldest first)" msgstr "" -#: localized_schema.php:46 +#: localized_schema.php:47 msgid "Show content preview in headlines list" msgstr "" -#: localized_schema.php:47 +#: localized_schema.php:48 msgid "Sort feeds by unread articles count" msgstr "" -#: localized_schema.php:48 +#: localized_schema.php:49 msgid "User stylesheet URL" msgstr "URL пользовательского файла стилей" -#: localized_schema.php:49 +#: localized_schema.php:50 msgid "Link to user stylesheet to override default style, disabled if empty." msgstr "" -#: localized_schema.php:51 +#: localized_schema.php:52 msgid "Advanced" msgstr "Расширенные" -#: localized_schema.php:53 +#: localized_schema.php:54 msgid "Blacklisted tags" msgstr "Черный список тегов" -#: localized_schema.php:54 +#: localized_schema.php:55 msgid "" "When auto-detecting tags in articles these tags will not be applied (comma-" "separated list)." msgstr "" -#: localized_schema.php:55 +#: localized_schema.php:56 msgid "Confirm marking feed as read" msgstr "" -#: localized_schema.php:56 +#: localized_schema.php:57 msgid "Enable icons in feedlist" msgstr "" -#: localized_schema.php:57 +#: localized_schema.php:58 msgid "Enable labels" msgstr "Включить метки" -#: localized_schema.php:58 +#: localized_schema.php:59 msgid "" "Experimental support for virtual feeds based on user crafted SQL queries. " "This feature is highly experimental and at this point not user friendly. Use " "with caution." msgstr "" -#: localized_schema.php:59 +#: localized_schema.php:60 msgid "Long date format" msgstr "" -#: localized_schema.php:60 +#: localized_schema.php:61 msgid "Set articles as unread on update" msgstr "" -#: localized_schema.php:61 +#: localized_schema.php:62 msgid "Short date format" msgstr "Короткий формат даты" -#: localized_schema.php:62 +#: localized_schema.php:63 msgid "Show additional information in feedlist" msgstr "Показивать расширенную информацию в списке каналов" -#: localized_schema.php:63 +#: localized_schema.php:64 msgid "Strip unsafe tags from articles" msgstr "Вырезать небезопасные теги из статей" -#: localized_schema.php:64 +#: localized_schema.php:65 msgid "Strip all but most common HTML tags when reading articles." msgstr "Вырезать все, кроме основных HTML тегов при показе статей." -#: localized_schema.php:65 +#: localized_schema.php:66 msgid "Use more accessible date/time format for headlines" msgstr "Использовать более удобный формат отображения даты/времени" diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo index 88f0a0b68..e252f2b4c 100644 Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index ee06d49d0..8a12d28b8 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: 2007-08-21 14:15+0400\n" +"POT-Creation-Date: 2007-08-21 18:31+0400\n" "PO-Revision-Date: 2007-08-19 19:03+0800\n" "Last-Translator: sluke \n" "Language-Team: hicode.org \n" @@ -673,120 +673,126 @@ msgid "Default article limit" msgstr "默认文章限制" #: localized_schema.php:37 +msgid "" +"Default limit for articles to display, any custom number you like (0 - " +"disables)." +msgstr "" + +#: localized_schema.php:38 msgid "Enable feed categories" msgstr "开启feed分类" -#: localized_schema.php:38 +#: localized_schema.php:39 msgid "Enable search toolbar" msgstr "" -#: localized_schema.php:39 +#: localized_schema.php:40 msgid "Hide feeds with no unread messages" msgstr "隐藏feed源以读信息" -#: localized_schema.php:40 +#: localized_schema.php:41 msgid "Mark articles as read automatically" msgstr "自动标志文章为已读" -#: localized_schema.php:41 +#: localized_schema.php:42 msgid "" "This option enables marking articles as read automatically in combined mode " "while you scroll article list." msgstr "启用该选项时,当你在联合模式下滚动文章列表时自动编辑文章为已读。" -#: localized_schema.php:42 +#: localized_schema.php:43 msgid "On catchup show next feed" msgstr "自动显示未读" -#: localized_schema.php:43 +#: localized_schema.php:44 msgid "" "When \"Mark as read\" button is clicked in toolbar, automatically open next " "feed with unread articles." msgstr "" "当工具栏上 \"标志为已读 \" 按钮被点击时,自动打开下一个RSS源中未读文章。" -#: localized_schema.php:44 +#: localized_schema.php:45 msgid "Open article links in new browser window" msgstr "新窗口打开文章连结" -#: localized_schema.php:45 +#: localized_schema.php:46 msgid "Reverse headline order (oldest first)" msgstr "反向提要排列(从旧到新)" -#: localized_schema.php:46 +#: localized_schema.php:47 msgid "Show content preview in headlines list" msgstr "在提要列表中显示内容预览" -#: localized_schema.php:47 +#: localized_schema.php:48 msgid "Sort feeds by unread articles count" msgstr "以未读文章数量排序feed源" -#: localized_schema.php:48 +#: localized_schema.php:49 msgid "User stylesheet URL" msgstr "用户样式表 URL" -#: localized_schema.php:49 +#: localized_schema.php:50 msgid "Link to user stylesheet to override default style, disabled if empty." msgstr "用户样式表优先,留空为不启用。" -#: localized_schema.php:51 +#: localized_schema.php:52 msgid "Advanced" msgstr "高级" -#: localized_schema.php:53 +#: localized_schema.php:54 msgid "Blacklisted tags" msgstr "被列入黑名单的标签" -#: localized_schema.php:54 +#: localized_schema.php:55 msgid "" "When auto-detecting tags in articles these tags will not be applied (comma-" "separated list)." msgstr "自动检测文章中标签时,这些标签不适用(用半角逗号隔开)" -#: localized_schema.php:55 +#: localized_schema.php:56 msgid "Confirm marking feed as read" msgstr "确认标记所有Feed为已读..." -#: localized_schema.php:56 +#: localized_schema.php:57 msgid "Enable icons in feedlist" msgstr "feed列表中不启用ico" -#: localized_schema.php:57 +#: localized_schema.php:58 msgid "Enable labels" msgstr "开启标签" -#: localized_schema.php:58 +#: localized_schema.php:59 msgid "" "Experimental support for virtual feeds based on user crafted SQL queries. " "This feature is highly experimental and at this point not user friendly. Use " "with caution." msgstr "SQL支持,这是测试功能,请谨慎使用。" -#: localized_schema.php:59 +#: localized_schema.php:60 msgid "Long date format" msgstr "长的时间格式" -#: localized_schema.php:60 +#: localized_schema.php:61 msgid "Set articles as unread on update" msgstr "更新后标记文章为未读" -#: localized_schema.php:61 +#: localized_schema.php:62 msgid "Short date format" msgstr "短的时间格式" -#: localized_schema.php:62 +#: localized_schema.php:63 msgid "Show additional information in feedlist" msgstr "在feed列表中显示附加信息" -#: localized_schema.php:63 +#: localized_schema.php:64 msgid "Strip unsafe tags from articles" msgstr "从文章中过滤不安全标签" -#: localized_schema.php:64 +#: localized_schema.php:65 msgid "Strip all but most common HTML tags when reading articles." msgstr "阅读文章时过滤所有常见html标签" -#: localized_schema.php:65 +#: localized_schema.php:66 msgid "Use more accessible date/time format for headlines" msgstr "提要使用更方便的 日期/时间 格式" diff --git a/localized_schema.php b/localized_schema.php index 87a1d8ffe..7d254724d 100644 --- a/localized_schema.php +++ b/localized_schema.php @@ -34,6 +34,7 @@ __("Combined feed display"); __("Display expanded list of feed articles, instead of separate displays for headlines and article content"); __("Default article limit"); + __("Default limit for articles to display, any custom number you like (0 - disables)."); __("Enable feed categories"); __("Enable search toolbar"); __("Hide feeds with no unread messages"); diff --git a/sanity_check.php b/sanity_check.php index 74dca1160..b1c145d2b 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 7); - define('SCHEMA_VERSION', 19); + define('SCHEMA_VERSION', 20); 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 e55038b7f..dfa489c42 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -196,7 +196,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 (19); +insert into ttrss_version values (20); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null) TYPE=InnoDB; @@ -234,8 +234,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ 'Default limit for articles to display, any custom number you like (0 - disables).'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 'Allow duplicate posts',1, - '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.'); + '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.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET_URL', 2, '', 'User stylesheet URL',2, 'Link to user stylesheet to override default style, disabled if empty.'); diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index abf74b7ed..f7ad3e4bb 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -177,7 +177,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 (19); +insert into ttrss_version values (20); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null); @@ -211,8 +211,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ 'Default limit for articles to display, any custom number you like (0 - disables).'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 'Allow duplicate posts',1, - '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.'); + '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.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET_URL', 2, '', 'User stylesheet URL',2, 'Link to user stylesheet to override default style, disabled if empty.'); diff --git a/schema/versions/mysql/20.sql b/schema/versions/mysql/20.sql new file mode 100644 index 000000000..347654512 --- /dev/null +++ b/schema/versions/mysql/20.sql @@ -0,0 +1,3 @@ +UPDATE ttrss_prefs SET help_text = '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.' WHERE pref_name = 'ALLOW_DUPLICATE_POSTS'; + +update ttrss_version set schema_version = 20; diff --git a/schema/versions/pgsql/20.sql b/schema/versions/pgsql/20.sql new file mode 100644 index 000000000..347654512 --- /dev/null +++ b/schema/versions/pgsql/20.sql @@ -0,0 +1,3 @@ +UPDATE ttrss_prefs SET help_text = '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.' WHERE pref_name = 'ALLOW_DUPLICATE_POSTS'; + +update ttrss_version set schema_version = 20;