From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Fri, 14 Sep 2007 03:14:20 +0000 (+0100)
Subject: update translations
X-Git-Tag: 1.2.15~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a5372e09c371b204633ad7c2f4349c639167a904;p=tt-rss.git

update translations
---

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index c71cf45a..cf9e2590 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 6c939d7c..39b94581 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-26 14:32+0400\n"
+"POT-Creation-Date: 2007-09-14 11:14+0400\n"
 "PO-Revision-Date: 2007-08-22 21:56+0200\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -146,51 +146,51 @@ msgstr ""
 "Votre version de MySQL n'est pas gérée pour le moment. Reportez-vous au \n"
 "\t\tsite officiel pour plus d'informations."
 
-#: functions.php:2240 functions.php:2579 functions.php:2934 functions.php:3660
+#: functions.php:2265 functions.php:2604 functions.php:2959 functions.php:3718
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2249 functions.php:2581 functions.php:2936 functions.php:3667
-#: modules/pref-feeds.php:1038
+#: functions.php:2274 functions.php:2606 functions.php:2961 functions.php:3725
+#: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2258 functions.php:2583 functions.php:2938 functions.php:3645
+#: functions.php:2283 functions.php:2608 functions.php:2963 functions.php:3703
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2501 modules/popup-dialog.php:141
+#: functions.php:2526 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2530 functions.php:2569 functions.php:2912 functions.php:3824
-#: functions.php:3854 modules/pref-feeds.php:880
+#: functions.php:2555 functions.php:2594 functions.php:2937 functions.php:3882
+#: functions.php:3912 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2559 functions.php:3078
+#: functions.php:2584 functions.php:3103
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2561 functions.php:3080
+#: functions.php:2586 functions.php:3105
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2898 functions.php:2900
+#: functions.php:2923 functions.php:2925
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:2916 functions.php:2929 functions.php:2946
+#: functions.php:2941 functions.php:2954 functions.php:2971
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3178
+#: functions.php:3235
 msgid "New headlines for last 24 hours, as of "
 msgstr "Nouveaux en-têtes dans les dernières 24 heures, à compter de "
 
-#: functions.php:3222
+#: functions.php:3280
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
@@ -198,131 +198,131 @@ msgstr ""
 "Vous recevez ce courrier électronique parce que vous avez activé la synthèse "
 "quotidienne dans TIny Tiny RSS sur "
 
-#: functions.php:3224
+#: functions.php:3282
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 "Pour vous désinscrire, modifiez votre configuration ou contactez "
 "l'administrateur de votre TIny Tiny RSS.\n"
 
-#: functions.php:3455 functions.php:3502 functions.php:4522
+#: functions.php:3513 functions.php:3560 functions.php:4580
 #: modules/pref-feeds.php:655 modules/pref-feeds.php:842
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
-#: functions.php:3456 functions.php:3503 modules/pref-feeds.php:656
+#: functions.php:3514 functions.php:3561 modules/pref-feeds.php:656
 #: modules/pref-feeds.php:843 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:3457 functions.php:3461 functions.php:3504 functions.php:3507
+#: functions.php:3515 functions.php:3519 functions.php:3562 functions.php:3565
 #: tt-rss.php:169
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3458 functions.php:3505 modules/pref-feeds.php:657
+#: functions.php:3516 functions.php:3563 modules/pref-feeds.php:657
 #: modules/pref-feeds.php:844 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:3460
+#: functions.php:3518
 msgid "Toggle"
 msgstr "Marquages spéciaux&nbsp;"
 
-#: functions.php:3462 functions.php:3508 tt-rss.php:168
+#: functions.php:3520 functions.php:3566 tt-rss.php:168
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3463
+#: functions.php:3521
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3466 localized_schema.php:15
+#: functions.php:3524 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3467
+#: functions.php:3525
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:3468
+#: functions.php:3526
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3470
+#: functions.php:3528
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3471
+#: functions.php:3529
 #, fuzzy
 msgid "Below active article"
 msgstr "Filtrer l'article"
 
-#: functions.php:3473
+#: functions.php:3531
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3481
+#: functions.php:3539
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3482
+#: functions.php:3540
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3483
+#: functions.php:3541
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3493 functions.php:3519
+#: functions.php:3551 functions.php:3577
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3507
+#: functions.php:3565
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3510
+#: functions.php:3568
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3511
+#: functions.php:3569
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3512 modules/pref-filters.php:263
+#: functions.php:3570 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3558
+#: functions.php:3616
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3894
+#: functions.php:3952
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:3911
+#: functions.php:3969
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4136
+#: functions.php:4194
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:4185
+#: functions.php:4243
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4256
+#: functions.php:4314
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4318
+#: functions.php:4376
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -330,7 +330,7 @@ msgstr ""
 "Impossible d'afficher le flux (la requête l'a pas abouti). Veuillez vérifier "
 "la syntaxe de son intitulé ou la configuration locale."
 
-#: functions.php:4585
+#: functions.php:4643
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
@@ -342,7 +342,7 @@ msgstr "afficher les flux"
 msgid "display tags"
 msgstr "afficher les étiquettes"
 
-#: localized_js.php:34 prefs.php:127 tt-rss.php:75
+#: localized_js.php:34 prefs.php:128 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "Ouverture en cours, veuillez patienter..."
 
@@ -979,51 +979,51 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "Revenir à la configuration"
 
-#: prefs.php:84
+#: prefs.php:85
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
-#: prefs.php:90 tt-rss.php:108
+#: prefs.php:91 tt-rss.php:108
 msgid "Hello,"
 msgstr "Bonjour,"
 
-#: prefs.php:91 tt-rss.php:109
+#: prefs.php:92 tt-rss.php:109
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: prefs.php:99
+#: prefs.php:100
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
-#: prefs.php:105 tt-rss.php:132
+#: prefs.php:106 tt-rss.php:132
 msgid "Preferences"
 msgstr "Configuration"
 
-#: prefs.php:107
+#: prefs.php:108
 msgid "My Feeds"
 msgstr "Mes flux"
 
-#: prefs.php:110
+#: prefs.php:111
 msgid "Other Feeds"
 msgstr "Autres flux"
 
-#: prefs.php:113
+#: prefs.php:114
 msgid "Published Articles"
 msgstr "Articles publiés"
 
-#: prefs.php:115
+#: prefs.php:116
 msgid "Content Filtering"
 msgstr "Filtrage de contenu"
 
-#: prefs.php:118
+#: prefs.php:119
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
-#: prefs.php:122
+#: prefs.php:123
 msgid "User Manager"
 msgstr "Gestionnaire d'utilisateurs"
 
-#: prefs.php:130 tt-rss.php:78
+#: prefs.php:131 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1112,6 +1112,12 @@ msgstr ""
 "moment"
 
 #: sanity_check.php:70
+msgid ""
+"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+"DIGEST_FROM_ADDRESS"
+msgstr ""
+
+#: sanity_check.php:74
 msgid "Fatal Error"
 msgstr "Erreur critique"
 
@@ -1649,7 +1655,21 @@ msgstr "Importer"
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
+#: modules/pref-feeds.php:1038
+msgid "Firefox Integration"
+msgstr ""
+
+#: modules/pref-feeds.php:1040
+msgid ""
+"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
+"link below."
+msgstr ""
+
 #: modules/pref-feeds.php:1044
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: modules/pref-feeds.php:1053
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the address specified below."
@@ -1657,7 +1677,7 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire."
 
-#: modules/pref-feeds.php:1051
+#: modules/pref-feeds.php:1060
 msgid "Generate another address"
 msgstr "Générer une autre adresse"
 
@@ -1733,31 +1753,31 @@ msgstr "Expression SQL"
 msgid "No labels defined."
 msgstr "Aucun intitulé défini."
 
-#: modules/pref-prefs.php:51
+#: modules/pref-prefs.php:55
 msgid "Password has been changed."
 msgstr "Le mot de passe a été modifié."
 
-#: modules/pref-prefs.php:53
+#: modules/pref-prefs.php:57
 msgid "Old password is incorrect."
 msgstr "L'ancien mot de passe n'est pas correct."
 
-#: modules/pref-prefs.php:103
+#: modules/pref-prefs.php:107
 msgid "The configuration was saved."
 msgstr "La configuration a été enregistrée."
 
-#: modules/pref-prefs.php:129
+#: modules/pref-prefs.php:133
 msgid "E-mail has been changed."
 msgstr "L'adresse électronique a été modifiée."
 
-#: modules/pref-prefs.php:141 modules/pref-prefs.php:201
+#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
 msgid "The configuration was reset to defaults."
 msgstr "La configuration a été réinitialisée à ses valeurs par défaut."
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:302
+#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
 msgid "Change theme"
 msgstr "Modifier le thème"
 
-#: modules/pref-prefs.php:186
+#: modules/pref-prefs.php:190
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
@@ -1765,67 +1785,67 @@ msgstr ""
 "Le mot de passe actuel est celui par défaut.\n"
 "\t\t\t\t\t\tVeuillez le modifier."
 
-#: modules/pref-prefs.php:213
+#: modules/pref-prefs.php:217
 msgid "Personal data"
 msgstr "Données personnelles"
 
-#: modules/pref-prefs.php:220
+#: modules/pref-prefs.php:224
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: modules/pref-prefs.php:233
+#: modules/pref-prefs.php:237
 msgid "Change e-mail"
 msgstr "Modifier l'adresse électronique"
 
-#: modules/pref-prefs.php:239
+#: modules/pref-prefs.php:243
 msgid "Authentication"
 msgstr "Identification"
 
-#: modules/pref-prefs.php:241
+#: modules/pref-prefs.php:245
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: modules/pref-prefs.php:246
+#: modules/pref-prefs.php:250
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: modules/pref-prefs.php:252
+#: modules/pref-prefs.php:256
 msgid "Confirm password"
 msgstr "Confirmation du mot de passe"
 
-#: modules/pref-prefs.php:267
+#: modules/pref-prefs.php:271
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: modules/pref-prefs.php:283
+#: modules/pref-prefs.php:287
 msgid "Themes"
 msgstr "Thèmes"
 
-#: modules/pref-prefs.php:284
+#: modules/pref-prefs.php:288
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
-#: modules/pref-prefs.php:286
+#: modules/pref-prefs.php:290
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
-#: modules/pref-prefs.php:355
+#: modules/pref-prefs.php:359
 msgid "short_desc"
 msgstr ""
 
-#: modules/pref-prefs.php:367 modules/pref-prefs.php:372
+#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
 msgid "Yes"
 msgstr "Oui"
 
-#: modules/pref-prefs.php:369 modules/pref-prefs.php:372
+#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
 msgid "No"
 msgstr "Non"
 
-#: modules/pref-prefs.php:391
+#: modules/pref-prefs.php:395
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:399
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 22a2ced3..74d4149d 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 f1e57b92..be428410 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-26 14:32+0400\n"
+"POT-Creation-Date: 2007-09-14 11:14+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <cthulhoo@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -140,186 +140,186 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2240 functions.php:2579 functions.php:2934 functions.php:3660
+#: functions.php:2265 functions.php:2604 functions.php:2959 functions.php:3718
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2249 functions.php:2581 functions.php:2936 functions.php:3667
-#: modules/pref-feeds.php:1038
+#: functions.php:2274 functions.php:2606 functions.php:2961 functions.php:3725
+#: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2258 functions.php:2583 functions.php:2938 functions.php:3645
+#: functions.php:2283 functions.php:2608 functions.php:2963 functions.php:3703
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2501 modules/popup-dialog.php:141
+#: functions.php:2526 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2530 functions.php:2569 functions.php:2912 functions.php:3824
-#: functions.php:3854 modules/pref-feeds.php:880
+#: functions.php:2555 functions.php:2594 functions.php:2937 functions.php:3882
+#: functions.php:3912 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2559 functions.php:3078
+#: functions.php:2584 functions.php:3103
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2561 functions.php:3080
+#: functions.php:2586 functions.php:3105
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2898 functions.php:2900
+#: functions.php:2923 functions.php:2925
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2916 functions.php:2929 functions.php:2946
+#: functions.php:2941 functions.php:2954 functions.php:2971
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3178
+#: functions.php:3235
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:3222
+#: functions.php:3280
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:3224
+#: functions.php:3282
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3455 functions.php:3502 functions.php:4522
+#: functions.php:3513 functions.php:3560 functions.php:4580
 #: modules/pref-feeds.php:655 modules/pref-feeds.php:842
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3456 functions.php:3503 modules/pref-feeds.php:656
+#: functions.php:3514 functions.php:3561 modules/pref-feeds.php:656
 #: modules/pref-feeds.php:843 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Все"
 
-#: functions.php:3457 functions.php:3461 functions.php:3504 functions.php:3507
+#: functions.php:3515 functions.php:3519 functions.php:3562 functions.php:3565
 #: tt-rss.php:169
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3458 functions.php:3505 modules/pref-feeds.php:657
+#: functions.php:3516 functions.php:3563 modules/pref-feeds.php:657
 #: modules/pref-feeds.php:844 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3460
+#: functions.php:3518
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3462 functions.php:3508 tt-rss.php:168
+#: functions.php:3520 functions.php:3566 tt-rss.php:168
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3463
+#: functions.php:3521
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3466 localized_schema.php:15
+#: functions.php:3524 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3467
+#: functions.php:3525
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3468
+#: functions.php:3526
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3470
+#: functions.php:3528
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3471
+#: functions.php:3529
 #, fuzzy
 msgid "Below active article"
 msgstr "Отфильтровать статью"
 
-#: functions.php:3473
+#: functions.php:3531
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3481
+#: functions.php:3539
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3482
+#: functions.php:3540
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3483
+#: functions.php:3541
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3493 functions.php:3519
+#: functions.php:3551 functions.php:3577
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3507
+#: functions.php:3565
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3510
+#: functions.php:3568
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3511
+#: functions.php:3569
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3512 modules/pref-filters.php:263
+#: functions.php:3570 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3558
+#: functions.php:3616
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3894
+#: functions.php:3952
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3911
+#: functions.php:3969
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4136
+#: functions.php:4194
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:4185
+#: functions.php:4243
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4256
+#: functions.php:4314
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4318
+#: functions.php:4376
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4585
+#: functions.php:4643
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -331,7 +331,7 @@ msgstr "показать каналы"
 msgid "display tags"
 msgstr "показать теги"
 
-#: localized_js.php:34 prefs.php:127 tt-rss.php:75
+#: localized_js.php:34 prefs.php:128 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -943,51 +943,51 @@ msgstr "Расширение DOMXML не найдено. Оно необходи
 msgid "Return to preferences"
 msgstr "Вернуться к настройкам"
 
-#: prefs.php:84
+#: prefs.php:85
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: prefs.php:90 tt-rss.php:108
+#: prefs.php:91 tt-rss.php:108
 msgid "Hello,"
 msgstr "Привет,"
 
-#: prefs.php:91 tt-rss.php:109
+#: prefs.php:92 tt-rss.php:109
 msgid "Logout"
 msgstr "Выход"
 
-#: prefs.php:99
+#: prefs.php:100
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:105 tt-rss.php:132
+#: prefs.php:106 tt-rss.php:132
 msgid "Preferences"
 msgstr "Настройки"
 
-#: prefs.php:107
+#: prefs.php:108
 msgid "My Feeds"
 msgstr "Мои каналы"
 
-#: prefs.php:110
+#: prefs.php:111
 msgid "Other Feeds"
 msgstr "Другие каналы"
 
-#: prefs.php:113
+#: prefs.php:114
 msgid "Published Articles"
 msgstr "Опубликованные статьи"
 
-#: prefs.php:115
+#: prefs.php:116
 msgid "Content Filtering"
 msgstr "Фильтры"
 
-#: prefs.php:118
+#: prefs.php:119
 msgid "Label Editor"
 msgstr "Метки"
 
-#: prefs.php:122
+#: prefs.php:123
 msgid "User Manager"
 msgstr "Пользователи"
 
-#: prefs.php:130 tt-rss.php:78
+#: prefs.php:131 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1051,6 +1051,12 @@ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
 msgstr ""
 
 #: sanity_check.php:70
+msgid ""
+"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+"DIGEST_FROM_ADDRESS"
+msgstr ""
+
+#: sanity_check.php:74
 msgid "Fatal Error"
 msgstr "Фатальная Ошибка"
 
@@ -1571,13 +1577,27 @@ msgstr "Импортировать"
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
+#: modules/pref-feeds.php:1038
+msgid "Firefox Integration"
+msgstr ""
+
+#: modules/pref-feeds.php:1040
+msgid ""
+"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
+"link below."
+msgstr ""
+
 #: modules/pref-feeds.php:1044
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: modules/pref-feeds.php:1053
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the address specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1051
+#: modules/pref-feeds.php:1060
 msgid "Generate another address"
 msgstr "Создать другой адрес"
 
@@ -1654,98 +1674,98 @@ msgstr "SQL выражение"
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 
-#: modules/pref-prefs.php:51
+#: modules/pref-prefs.php:55
 msgid "Password has been changed."
 msgstr "Пароль был изменен."
 
-#: modules/pref-prefs.php:53
+#: modules/pref-prefs.php:57
 msgid "Old password is incorrect."
 msgstr "Старый пароль неправилен."
 
-#: modules/pref-prefs.php:103
+#: modules/pref-prefs.php:107
 msgid "The configuration was saved."
 msgstr "Конфигурация сохранена."
 
-#: modules/pref-prefs.php:129
+#: modules/pref-prefs.php:133
 #, fuzzy
 msgid "E-mail has been changed."
 msgstr "Пароль был изменен."
 
-#: modules/pref-prefs.php:141 modules/pref-prefs.php:201
+#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
 msgid "The configuration was reset to defaults."
 msgstr "Настройки были сброшены по-умолчанию."
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:302
+#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
 msgid "Change theme"
 msgstr "Изменить тему"
 
-#: modules/pref-prefs.php:186
+#: modules/pref-prefs.php:190
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
 msgstr ""
 
-#: modules/pref-prefs.php:213
+#: modules/pref-prefs.php:217
 msgid "Personal data"
 msgstr "Личные данные"
 
-#: modules/pref-prefs.php:220
+#: modules/pref-prefs.php:224
 msgid "E-mail"
 msgstr ""
 
-#: modules/pref-prefs.php:233
+#: modules/pref-prefs.php:237
 msgid "Change e-mail"
 msgstr "Изменить e-mail"
 
-#: modules/pref-prefs.php:239
+#: modules/pref-prefs.php:243
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: modules/pref-prefs.php:241
+#: modules/pref-prefs.php:245
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: modules/pref-prefs.php:246
+#: modules/pref-prefs.php:250
 msgid "New password"
 msgstr "Новый пароль"
 
-#: modules/pref-prefs.php:252
+#: modules/pref-prefs.php:256
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: modules/pref-prefs.php:267
+#: modules/pref-prefs.php:271
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: modules/pref-prefs.php:283
+#: modules/pref-prefs.php:287
 msgid "Themes"
 msgstr "Темы"
 
-#: modules/pref-prefs.php:284
+#: modules/pref-prefs.php:288
 msgid "Select theme"
 msgstr "Выбор темы"
 
-#: modules/pref-prefs.php:286
+#: modules/pref-prefs.php:290
 msgid "Default"
 msgstr "По умолчанию"
 
-#: modules/pref-prefs.php:355
+#: modules/pref-prefs.php:359
 msgid "short_desc"
 msgstr ""
 
-#: modules/pref-prefs.php:367 modules/pref-prefs.php:372
+#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
 msgid "Yes"
 msgstr "Да"
 
-#: modules/pref-prefs.php:369 modules/pref-prefs.php:372
+#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
 msgid "No"
 msgstr "Нет"
 
-#: modules/pref-prefs.php:391
+#: modules/pref-prefs.php:395
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:399
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index efdb8799..b4354244 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 1bcb7007..bb61464b 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-26 14:32+0400\n"
+"POT-Creation-Date: 2007-09-14 11:14+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -136,185 +136,185 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2240 functions.php:2579 functions.php:2934 functions.php:3660
+#: functions.php:2265 functions.php:2604 functions.php:2959 functions.php:3718
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2249 functions.php:2581 functions.php:2936 functions.php:3667
-#: modules/pref-feeds.php:1038
+#: functions.php:2274 functions.php:2606 functions.php:2961 functions.php:3725
+#: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2258 functions.php:2583 functions.php:2938 functions.php:3645
+#: functions.php:2283 functions.php:2608 functions.php:2963 functions.php:3703
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2501 modules/popup-dialog.php:141
+#: functions.php:2526 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2530 functions.php:2569 functions.php:2912 functions.php:3824
-#: functions.php:3854 modules/pref-feeds.php:880
+#: functions.php:2555 functions.php:2594 functions.php:2937 functions.php:3882
+#: functions.php:3912 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2559 functions.php:3078
+#: functions.php:2584 functions.php:3103
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2561 functions.php:3080
+#: functions.php:2586 functions.php:3105
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2898 functions.php:2900
+#: functions.php:2923 functions.php:2925
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:2916 functions.php:2929 functions.php:2946
+#: functions.php:2941 functions.php:2954 functions.php:2971
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3178
+#: functions.php:3235
 msgid "New headlines for last 24 hours, as of "
 msgstr "24小时最新提要,截至"
 
-#: functions.php:3222
+#: functions.php:3280
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr "由于您启用了Tiny Tiny RSS每日文摘，会收到此邮件。"
 
-#: functions.php:3224
+#: functions.php:3282
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr "若要退订,访问你的配置选项或联络管理员。\n"
 
-#: functions.php:3455 functions.php:3502 functions.php:4522
+#: functions.php:3513 functions.php:3560 functions.php:4580
 #: modules/pref-feeds.php:655 modules/pref-feeds.php:842
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3456 functions.php:3503 modules/pref-feeds.php:656
+#: functions.php:3514 functions.php:3561 modules/pref-feeds.php:656
 #: modules/pref-feeds.php:843 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "所有"
 
-#: functions.php:3457 functions.php:3461 functions.php:3504 functions.php:3507
+#: functions.php:3515 functions.php:3519 functions.php:3562 functions.php:3565
 #: tt-rss.php:169
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3458 functions.php:3505 modules/pref-feeds.php:657
+#: functions.php:3516 functions.php:3563 modules/pref-feeds.php:657
 #: modules/pref-feeds.php:844 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "无"
 
-#: functions.php:3460
+#: functions.php:3518
 msgid "Toggle"
 msgstr "触发开关"
 
-#: functions.php:3462 functions.php:3508 tt-rss.php:168
+#: functions.php:3520 functions.php:3566 tt-rss.php:168
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3463
+#: functions.php:3521
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3466 localized_schema.php:15
+#: functions.php:3524 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3467
+#: functions.php:3525
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3468
+#: functions.php:3526
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3470
+#: functions.php:3528
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3471
+#: functions.php:3529
 #, fuzzy
 msgid "Below active article"
 msgstr "过滤文章"
 
-#: functions.php:3473
+#: functions.php:3531
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3481
+#: functions.php:3539
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3482
+#: functions.php:3540
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3483
+#: functions.php:3541
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3493 functions.php:3519
+#: functions.php:3551 functions.php:3577
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3507
+#: functions.php:3565
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3510
+#: functions.php:3568
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3511
+#: functions.php:3569
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3512 modules/pref-filters.php:263
+#: functions.php:3570 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3558
+#: functions.php:3616
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3894
+#: functions.php:3952
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:3911
+#: functions.php:3969
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4136
+#: functions.php:4194
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:4185
+#: functions.php:4243
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4256
+#: functions.php:4314
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4318
+#: functions.php:4376
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4585
+#: functions.php:4643
 msgid "No articles found."
 msgstr "未找到文章。"
 
@@ -326,7 +326,7 @@ msgstr "显示Feed"
 msgid "display tags"
 msgstr "显示标签"
 
-#: localized_js.php:34 prefs.php:127 tt-rss.php:75
+#: localized_js.php:34 prefs.php:128 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "读取中，请等待..."
 
@@ -940,51 +940,51 @@ msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
-#: prefs.php:84
+#: prefs.php:85
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: prefs.php:90 tt-rss.php:108
+#: prefs.php:91 tt-rss.php:108
 msgid "Hello,"
 msgstr "你好,"
 
-#: prefs.php:91 tt-rss.php:109
+#: prefs.php:92 tt-rss.php:109
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:99
+#: prefs.php:100
 msgid "Exit preferences"
 msgstr "退出我的最爱"
 
-#: prefs.php:105 tt-rss.php:132
+#: prefs.php:106 tt-rss.php:132
 msgid "Preferences"
 msgstr "我的最爱"
 
-#: prefs.php:107
+#: prefs.php:108
 msgid "My Feeds"
 msgstr "我的feed"
 
-#: prefs.php:110
+#: prefs.php:111
 msgid "Other Feeds"
 msgstr "其他feed"
 
-#: prefs.php:113
+#: prefs.php:114
 msgid "Published Articles"
 msgstr "已发布文章"
 
-#: prefs.php:115
+#: prefs.php:116
 msgid "Content Filtering"
 msgstr "内容过滤器"
 
-#: prefs.php:118
+#: prefs.php:119
 msgid "Label Editor"
 msgstr "标记编辑"
 
-#: prefs.php:122
+#: prefs.php:123
 msgid "User Manager"
 msgstr "用户管理"
 
-#: prefs.php:130 tt-rss.php:78
+#: prefs.php:131 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1057,6 +1057,12 @@ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
 msgstr "设置: DATABASE_BACKED_SESSIONS 受到 MySQL 影响"
 
 #: sanity_check.php:70
+msgid ""
+"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+"DIGEST_FROM_ADDRESS"
+msgstr ""
+
+#: sanity_check.php:74
 msgid "Fatal Error"
 msgstr "致命错误"
 
@@ -1584,13 +1590,27 @@ msgstr "导入"
 msgid "Export OPML"
 msgstr "导出OPML"
 
+#: modules/pref-feeds.php:1038
+msgid "Firefox Integration"
+msgstr ""
+
+#: modules/pref-feeds.php:1040
+msgid ""
+"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
+"link below."
+msgstr ""
+
 #: modules/pref-feeds.php:1044
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: modules/pref-feeds.php:1053
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the address specified below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1051
+#: modules/pref-feeds.php:1060
 msgid "Generate another address"
 msgstr "生成另一个地址"
 
@@ -1667,99 +1687,99 @@ msgstr "SQL 表达式"
 msgid "No labels defined."
 msgstr "未定义标记."
 
-#: modules/pref-prefs.php:51
+#: modules/pref-prefs.php:55
 msgid "Password has been changed."
 msgstr "密码已更改."
 
-#: modules/pref-prefs.php:53
+#: modules/pref-prefs.php:57
 msgid "Old password is incorrect."
 msgstr "原密码错误."
 
-#: modules/pref-prefs.php:103
+#: modules/pref-prefs.php:107
 msgid "The configuration was saved."
 msgstr "设置已保存."
 
-#: modules/pref-prefs.php:129
+#: modules/pref-prefs.php:133
 #, fuzzy
 msgid "E-mail has been changed."
 msgstr "密码已更改."
 
-#: modules/pref-prefs.php:141 modules/pref-prefs.php:201
+#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
 msgid "The configuration was reset to defaults."
 msgstr "设置重置为默认"
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:302
+#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
 msgid "Change theme"
 msgstr "更改模板"
 
-#: modules/pref-prefs.php:186
+#: modules/pref-prefs.php:190
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
 msgstr "您的密码是默认的，请修改。"
 
-#: modules/pref-prefs.php:213
+#: modules/pref-prefs.php:217
 msgid "Personal data"
 msgstr "个人数据"
 
-#: modules/pref-prefs.php:220
+#: modules/pref-prefs.php:224
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail:"
 
-#: modules/pref-prefs.php:233
+#: modules/pref-prefs.php:237
 msgid "Change e-mail"
 msgstr "更改 e-mail"
 
-#: modules/pref-prefs.php:239
+#: modules/pref-prefs.php:243
 msgid "Authentication"
 msgstr "认证"
 
-#: modules/pref-prefs.php:241
+#: modules/pref-prefs.php:245
 msgid "Old password"
 msgstr "原密码"
 
-#: modules/pref-prefs.php:246
+#: modules/pref-prefs.php:250
 msgid "New password"
 msgstr "新密码"
 
-#: modules/pref-prefs.php:252
+#: modules/pref-prefs.php:256
 msgid "Confirm password"
 msgstr "验证密码"
 
-#: modules/pref-prefs.php:267
+#: modules/pref-prefs.php:271
 msgid "Change password"
 msgstr "更改密码"
 
-#: modules/pref-prefs.php:283
+#: modules/pref-prefs.php:287
 msgid "Themes"
 msgstr "模板"
 
-#: modules/pref-prefs.php:284
+#: modules/pref-prefs.php:288
 msgid "Select theme"
 msgstr "选择模板"
 
-#: modules/pref-prefs.php:286
+#: modules/pref-prefs.php:290
 msgid "Default"
 msgstr "默认"
 
-#: modules/pref-prefs.php:355
+#: modules/pref-prefs.php:359
 msgid "short_desc"
 msgstr "short_desc"
 
-#: modules/pref-prefs.php:367 modules/pref-prefs.php:372
+#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
 msgid "Yes"
 msgstr "是"
 
-#: modules/pref-prefs.php:369 modules/pref-prefs.php:372
+#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
 msgid "No"
 msgstr "否"
 
-#: modules/pref-prefs.php:391
+#: modules/pref-prefs.php:395
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:399
 msgid "Reset to defaults"
 msgstr "恢复到默认？"