From 8c0edbc36cf1d22de2afee93eda1b09f48db9252 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 21 Aug 2007 11:34:43 +0100 Subject: [PATCH] localization fixes and updates (bumps schema) --- locale/fr_FR/LC_MESSAGES/messages.mo | Bin 34227 -> 34319 bytes locale/fr_FR/LC_MESSAGES/messages.po | 92 ++++++++++++++------------- locale/ru_RU/LC_MESSAGES/messages.mo | Bin 25597 -> 25597 bytes locale/ru_RU/LC_MESSAGES/messages.po | 60 +++++++++-------- locale/zh_CN/LC_MESSAGES/messages.mo | Bin 28248 -> 28248 bytes locale/zh_CN/LC_MESSAGES/messages.po | 60 +++++++++-------- localized_schema.php | 1 + sanity_check.php | 2 +- schema/ttrss_schema_mysql.sql | 5 +- schema/ttrss_schema_pgsql.sql | 5 +- schema/versions/mysql/20.sql | 3 + schema/versions/pgsql/20.sql | 3 + 12 files changed, 126 insertions(+), 105 deletions(-) create mode 100644 schema/versions/mysql/20.sql create mode 100644 schema/versions/pgsql/20.sql diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo index 128af0475b3dd6af505828409debee429214d15b..642fa24647ed31555aa63a5af3a265ef9cfbd880 100644 GIT binary patch delta 8414 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 O=#MB1sp{$bDCB<, 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 aa00d3fa96cc367dddcf71e1e18532da2cc4c310..ed15850fd18e5ab7b70efd70f010726d05a8b9ab 100644 GIT binary patch delta 19 bcmex+obm5*#tr?(EEZPAhMOlFXBhwhTqp\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 88f0a0b6838839e3e7bf858517541f7dc00c03d7..e252f2b4cd81016f2f5ff4caa2c6df33404fe637 100644 GIT binary patch delta 19 acmca{hw;W8#tkN3EEZPAhMO(C6jT6Izy|C9 delta 19 acmca{hw;W8#tkN3EGAZlrkgFi6jT6IrUvQ& 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;