From e400230ebd2bcc68c66b7bc1edd19bab56b3fd9e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Tue, 21 Aug 2007 02:22:29 +0100
Subject: [PATCH] update translations

---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 33448 -> 33448 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 115 ++++++++++++++++-----------
 locale/ru_RU/LC_MESSAGES/messages.mo | Bin 25597 -> 25597 bytes
 locale/ru_RU/LC_MESSAGES/messages.po | 114 +++++++++++++++-----------
 locale/zh_CN/LC_MESSAGES/messages.mo | Bin 28248 -> 28248 bytes
 locale/zh_CN/LC_MESSAGES/messages.po | 115 ++++++++++++++++-----------
 localized_js.php                     |   8 ++
 localized_schema.php                 |   1 +
 login_form.php                       |   2 +-
 modules/pref-feeds.php               |   2 +-
 modules/pref-filters.php             |   3 +
 modules/pref-prefs.php               |   2 +-
 modules/pref-users.php               |   2 +-
 tt-rss.css                           |   4 +-
 14 files changed, 218 insertions(+), 150 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 2178f4ba303ec5258057af9bc9121a36f1a894a5..5e17e4aab065726cc9314696a770368a339451ac 100644
GIT binary patch
delta 22
ecmZ3{%Cw@DX~R|zc0&aNODiLz&3ioFSONfEun0#0

delta 22
ecmZ3{%Cw@DX~R|zb^`@NODhwL&3ioFSONfE;0R9u

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 99073751..5fdaac48 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-20 19:48+0400\n"
+"POT-Creation-Date: 2007-08-21 09:22+0400\n"
 "PO-Revision-Date: 2007-08-14 16:43+0200\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -76,11 +76,11 @@ msgstr "Une fois par jour"
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:118
+#: backend.php:118 modules/pref-users.php:249
 msgid "User"
 msgstr "Utilisateur"
 
-#: backend.php:119
+#: backend.php:119 modules/pref-users.php:249
 msgid "Administrator"
 msgstr "Administrateur"
 
@@ -151,6 +151,7 @@ msgid "Starred articles"
 msgstr "Articles remarquables"
 
 #: functions.php:2034 functions.php:2342 functions.php:2681 functions.php:3365
+#: modules/pref-feeds.php:1002
 msgid "Published articles"
 msgstr "Articles publiés"
 
@@ -586,6 +587,18 @@ msgstr ""
 msgid "Save current configuration?"
 msgstr "Enregistrer la configuration"
 
+#: localized_js.php:116 modules/pref-prefs.php:20
+msgid "Old password cannot be blank."
+msgstr "L'ancien mot de passe ne peut pas être vide."
+
+#: localized_js.php:117 modules/pref-prefs.php:25
+msgid "New password cannot be blank."
+msgstr "Le nouveau mot de passe ne peut pas être vide."
+
+#: localized_js.php:118 modules/pref-prefs.php:30
+msgid "Entered passwords do not match."
+msgstr "Les mots de passe saisie ne sont pas identiques."
+
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:820 modules/pref-feeds.php:881
 msgid "Title"
@@ -689,14 +702,18 @@ 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 "Hide feeds with no unread messages"
 msgstr "Masquer les flux sans article non lu"
 
-#: localized_schema.php:39
+#: localized_schema.php:40
 msgid "Mark articles as read automatically"
 msgstr "Marquer les articles comme lus automatiquement"
 
-#: localized_schema.php:40
+#: localized_schema.php:41
 msgid ""
 "This option enables marking articles as read automatically in combined mode "
 "while you scroll article list."
@@ -704,11 +721,11 @@ 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:41
+#: localized_schema.php:42
 msgid "On catchup show next feed"
 msgstr "Sauter automatiquement au flux suivant"
 
-#: localized_schema.php:42
+#: localized_schema.php:43
 msgid ""
 "When \"Mark as read\" button is clicked in toolbar, automatically open next "
 "feed with unread articles."
@@ -716,41 +733,41 @@ msgstr ""
 "Lorsque vous cliquez sur «&nbsp;Marquer comme lus&nbsp;», le prochain flux "
 "contenant des articles non lus est automatiquement affiché"
 
-#: localized_schema.php:43
+#: localized_schema.php:44
 msgid "Open article links in new browser window"
 msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre"
 
-#: localized_schema.php:44
+#: localized_schema.php:45
 msgid "Reverse headline order (oldest first)"
 msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
 
-#: localized_schema.php:45
+#: localized_schema.php:46
 msgid "Show content preview in headlines list"
 msgstr "Donner un aperçu du contenu dans la liste des en-têtes"
 
-#: localized_schema.php:46
+#: localized_schema.php:47
 msgid "Sort feeds by unread articles count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: localized_schema.php:47
+#: localized_schema.php:48
 msgid "User stylesheet URL"
 msgstr "URL de la feuille de style personnalisée"
 
-#: localized_schema.php:48
+#: localized_schema.php:49
 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:50
+#: localized_schema.php:51
 msgid "Advanced"
 msgstr "Avancé"
 
-#: localized_schema.php:52
+#: localized_schema.php:53
 msgid "Blacklisted tags"
 msgstr "Étiquettes exclues"
 
-#: localized_schema.php:53
+#: localized_schema.php:54
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
@@ -758,19 +775,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:54
+#: localized_schema.php:55
 msgid "Confirm marking feed as read"
 msgstr "Demander confirmation pour marquer un flux comme lu"
 
-#: localized_schema.php:55
+#: localized_schema.php:56
 msgid "Enable icons in feedlist"
 msgstr "Afficher les icônes dans la liste des flux"
 
-#: localized_schema.php:56
+#: localized_schema.php:57
 msgid "Enable labels"
 msgstr "Utiliser les intitulés"
 
-#: localized_schema.php:57
+#: localized_schema.php:58
 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 "
@@ -780,33 +797,33 @@ msgstr ""
 "personnalisées. Cette fonctionnalité est hautement expérimentale et pas "
 "encore ergonomique. Utilisez-là avec précaution."
 
-#: localized_schema.php:58
+#: localized_schema.php:59
 msgid "Long date format"
 msgstr "Format de date long"
 
-#: localized_schema.php:59
+#: localized_schema.php:60
 msgid "Set articles as unread on update"
 msgstr "Marquer les articles comme non lus lors des mises à jour"
 
-#: localized_schema.php:60
+#: localized_schema.php:61
 msgid "Short date format"
 msgstr "Format de date court"
 
-#: localized_schema.php:61
+#: localized_schema.php:62
 msgid "Show additional information in feedlist"
 msgstr "Afficher des informations supplémentaires dans la liste des flux"
 
-#: localized_schema.php:62
+#: localized_schema.php:63
 msgid "Strip unsafe tags from articles"
 msgstr "Éliminer les étiquettes non sûres des articles"
 
-#: localized_schema.php:63
+#: localized_schema.php:64
 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:64
+#: localized_schema.php:65
 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"
 
@@ -823,6 +840,10 @@ msgstr "Mot de passe&nbsp;:"
 msgid "Language:"
 msgstr ""
 
+#: login_form.php:100 modules/pref-users.php:215
+msgid "Login"
+msgstr "Se connecter"
+
 #: opml.php:106 opml.php:110
 msgid "OPML Utility"
 msgstr "Outil OPML"
@@ -1459,7 +1480,7 @@ msgstr "Créer la catégorie"
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:677 modules/pref-filters.php:342
+#: modules/pref-feeds.php:677 modules/pref-filters.php:345
 #: modules/pref-labels.php:294 modules/pref-users.php:319
 msgid "Remove"
 msgstr "Supprimer"
@@ -1486,7 +1507,7 @@ msgstr "Dernier&nbsp;article"
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: modules/pref-feeds.php:953 modules/pref-filters.php:340
+#: modules/pref-feeds.php:953 modules/pref-filters.php:343
 #: modules/pref-labels.php:292 modules/pref-users.php:317
 msgid "Edit"
 msgstr "Modifier"
@@ -1557,15 +1578,24 @@ msgstr "Correspondance"
 msgid "Action"
 msgstr "Action"
 
-#: modules/pref-filters.php:299
+#: modules/pref-filters.php:297
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:298
+#, fuzzy
+msgid "action_description"
+msgstr "description"
+
+#: modules/pref-filters.php:302
 msgid "(Disabled)"
 msgstr "(Désactivé)"
 
-#: modules/pref-filters.php:317
+#: modules/pref-filters.php:320
 msgid "(Inverse)"
 msgstr "(Inverse)"
 
-#: modules/pref-filters.php:332 modules/pref-filters.php:353
+#: modules/pref-filters.php:335 modules/pref-filters.php:356
 msgid "No filters defined."
 msgstr "Aucun filtre défini."
 
@@ -1591,18 +1621,6 @@ msgstr "Expression SQL"
 msgid "No labels defined."
 msgstr "Aucun intitulé défini."
 
-#: modules/pref-prefs.php:20
-msgid "Old password cannot be blank."
-msgstr "L'ancien mot de passe ne peut pas être vide."
-
-#: modules/pref-prefs.php:25
-msgid "New password cannot be blank."
-msgstr "Le nouveau mot de passe ne peut pas être vide."
-
-#: modules/pref-prefs.php:30
-msgid "Entered passwords do not match."
-msgstr "Les mots de passe saisie ne sont pas identiques."
-
 #: modules/pref-prefs.php:51
 msgid "Password has been changed."
 msgstr "Le mot de passe a été modifié."
@@ -1640,6 +1658,11 @@ msgstr ""
 msgid "Personal data"
 msgstr "Données personnelles"
 
+#: modules/pref-prefs.php:220
+#, fuzzy
+msgid "E-mail"
+msgstr "Adresse électronique&nbsp;:"
+
 #: modules/pref-prefs.php:233
 msgid "Change e-mail"
 msgstr "Modifier l'adresse électronique"
@@ -1745,10 +1768,6 @@ msgstr ""
 msgid "Create user"
 msgstr "Créer l'utilisateur"
 
-#: modules/pref-users.php:215
-msgid "Login"
-msgstr "Se connecter"
-
 #: modules/pref-users.php:216
 msgid "Access Level"
 msgstr "Permissions"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index b81353ff498250ae801b9a384b42dc3161debe92..225630aabcc3c09e3da5d1bed5408f3e0e2d078e 100644
GIT binary patch
delta 22
ecmex+obm5*#tl8j?1l;kmR3ean<pD*82|uqxd?0k

delta 22
ecmex+obm5*#tl8j>;?*kmR2Sfn<pD*82|uq=?HWH

diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 9b7c60e4..fe974cfd 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-20 19:48+0400\n"
+"POT-Creation-Date: 2007-08-21 09:22+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"
@@ -76,11 +76,11 @@ msgstr "Раз в день"
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:118
+#: backend.php:118 modules/pref-users.php:249
 msgid "User"
 msgstr "Пользователь"
 
-#: backend.php:119
+#: backend.php:119 modules/pref-users.php:249
 msgid "Administrator"
 msgstr "Администратор"
 
@@ -145,6 +145,7 @@ msgid "Starred articles"
 msgstr "Отмеченные"
 
 #: functions.php:2034 functions.php:2342 functions.php:2681 functions.php:3365
+#: modules/pref-feeds.php:1002
 msgid "Published articles"
 msgstr "Опубликованные"
 
@@ -574,6 +575,18 @@ msgstr ""
 msgid "Save current configuration?"
 msgstr "Сохранить конфигурацию"
 
+#: localized_js.php:116 modules/pref-prefs.php:20
+msgid "Old password cannot be blank."
+msgstr "Старый пароль не может быть пустым."
+
+#: localized_js.php:117 modules/pref-prefs.php:25
+msgid "New password cannot be blank."
+msgstr "Новый пароль не может быть пустым."
+
+#: localized_js.php:118 modules/pref-prefs.php:30
+msgid "Entered passwords do not match."
+msgstr "Пароли не совпадают."
+
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:820 modules/pref-feeds.php:881
 msgid "Title"
@@ -667,111 +680,115 @@ msgid "Enable feed categories"
 msgstr "Включить категории каналов"
 
 #: localized_schema.php:38
+msgid "Enable search toolbar"
+msgstr ""
+
+#: localized_schema.php:39
 msgid "Hide feeds with no unread messages"
 msgstr "Спрятать каналы без непрочитанных статей"
 
-#: localized_schema.php:39
+#: localized_schema.php:40
 msgid "Mark articles as read automatically"
 msgstr "Отмечать статьи как прочитанные автоматически"
 
-#: localized_schema.php:40
+#: localized_schema.php:41
 msgid ""
 "This option enables marking articles as read automatically in combined mode "
 "while you scroll article list."
 msgstr ""
 
-#: localized_schema.php:41
+#: localized_schema.php:42
 msgid "On catchup show next feed"
 msgstr "Показывать следующий канал при отметке как прочитанный"
 
-#: localized_schema.php:42
+#: localized_schema.php:43
 msgid ""
 "When \"Mark as read\" button is clicked in toolbar, automatically open next "
 "feed with unread articles."
 msgstr ""
 
-#: localized_schema.php:43
+#: localized_schema.php:44
 msgid "Open article links in new browser window"
 msgstr ""
 
-#: localized_schema.php:44
+#: localized_schema.php:45
 msgid "Reverse headline order (oldest first)"
 msgstr ""
 
-#: localized_schema.php:45
+#: localized_schema.php:46
 msgid "Show content preview in headlines list"
 msgstr ""
 
-#: localized_schema.php:46
+#: localized_schema.php:47
 msgid "Sort feeds by unread articles count"
 msgstr ""
 
-#: localized_schema.php:47
+#: localized_schema.php:48
 msgid "User stylesheet URL"
 msgstr "URL пользовательского файла стилей"
 
-#: localized_schema.php:48
+#: localized_schema.php:49
 msgid "Link to user stylesheet to override default style, disabled if empty."
 msgstr ""
 
-#: localized_schema.php:50
+#: localized_schema.php:51
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: localized_schema.php:52
+#: localized_schema.php:53
 msgid "Blacklisted tags"
 msgstr "Черный список тегов"
 
-#: localized_schema.php:53
+#: localized_schema.php:54
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
 msgstr ""
 
-#: localized_schema.php:54
+#: localized_schema.php:55
 msgid "Confirm marking feed as read"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:56
 msgid "Enable icons in feedlist"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:57
 msgid "Enable labels"
 msgstr "Включить метки"
 
-#: localized_schema.php:57
+#: localized_schema.php:58
 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:58
+#: localized_schema.php:59
 msgid "Long date format"
 msgstr ""
 
-#: localized_schema.php:59
+#: localized_schema.php:60
 msgid "Set articles as unread on update"
 msgstr ""
 
-#: localized_schema.php:60
+#: localized_schema.php:61
 msgid "Short date format"
 msgstr "Короткий формат даты"
 
-#: localized_schema.php:61
+#: localized_schema.php:62
 msgid "Show additional information in feedlist"
 msgstr "Показивать расширенную информацию в списке каналов"
 
-#: localized_schema.php:62
+#: localized_schema.php:63
 msgid "Strip unsafe tags from articles"
 msgstr "Вырезать небезопасные теги из статей"
 
-#: localized_schema.php:63
+#: localized_schema.php:64
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Вырезать все, кроме основных HTML тегов при показе статей."
 
-#: localized_schema.php:64
+#: localized_schema.php:65
 msgid "Use more accessible date/time format for headlines"
 msgstr "Использовать более удобный формат отображения даты/времени"
 
@@ -788,6 +805,10 @@ msgstr "Пароль:"
 msgid "Language:"
 msgstr "Язык:"
 
+#: login_form.php:100 modules/pref-users.php:215
+msgid "Login"
+msgstr "Пользователь:"
+
 #: opml.php:106 opml.php:110
 msgid "OPML Utility"
 msgstr "Утилита OPML"
@@ -1380,7 +1401,7 @@ msgstr "Создать категорию"
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:677 modules/pref-filters.php:342
+#: modules/pref-feeds.php:677 modules/pref-filters.php:345
 #: modules/pref-labels.php:294 modules/pref-users.php:319
 msgid "Remove"
 msgstr "Удалить"
@@ -1405,7 +1426,7 @@ msgstr "Последняя&nbsp;статья"
 msgid "Updated"
 msgstr "Обновлено"
 
-#: modules/pref-feeds.php:953 modules/pref-filters.php:340
+#: modules/pref-feeds.php:953 modules/pref-filters.php:343
 #: modules/pref-labels.php:292 modules/pref-users.php:317
 msgid "Edit"
 msgstr "Редактировать"
@@ -1474,15 +1495,24 @@ msgstr "Искать"
 msgid "Action"
 msgstr "Действие"
 
-#: modules/pref-filters.php:299
+#: modules/pref-filters.php:297
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:298
+#, fuzzy
+msgid "action_description"
+msgstr "описание"
+
+#: modules/pref-filters.php:302
 msgid "(Disabled)"
 msgstr "(Отключен)"
 
-#: modules/pref-filters.php:317
+#: modules/pref-filters.php:320
 msgid "(Inverse)"
 msgstr "(Инвертирован)"
 
-#: modules/pref-filters.php:332 modules/pref-filters.php:353
+#: modules/pref-filters.php:335 modules/pref-filters.php:356
 msgid "No filters defined."
 msgstr "Фильтры отсутствуют."
 
@@ -1508,18 +1538,6 @@ msgstr "SQL выражение"
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 
-#: modules/pref-prefs.php:20
-msgid "Old password cannot be blank."
-msgstr "Старый пароль не может быть пустым."
-
-#: modules/pref-prefs.php:25
-msgid "New password cannot be blank."
-msgstr "Новый пароль не может быть пустым."
-
-#: modules/pref-prefs.php:30
-msgid "Entered passwords do not match."
-msgstr "Пароли не совпадают."
-
 #: modules/pref-prefs.php:51
 msgid "Password has been changed."
 msgstr "Пароль был изменен."
@@ -1555,6 +1573,10 @@ msgstr ""
 msgid "Personal data"
 msgstr "Личные данные"
 
+#: modules/pref-prefs.php:220
+msgid "E-mail"
+msgstr ""
+
 #: modules/pref-prefs.php:233
 msgid "Change e-mail"
 msgstr "Изменить e-mail"
@@ -1658,10 +1680,6 @@ msgstr "Пароль пользователя <b>%s</b> изменен на <b>%
 msgid "Create user"
 msgstr "Добавить пользователя"
 
-#: modules/pref-users.php:215
-msgid "Login"
-msgstr "Пользователь:"
-
 #: modules/pref-users.php:216
 msgid "Access Level"
 msgstr "Уровень доступа:"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index a374610ffc02cb7e36520a70a878af4f6330e7fc..bdcc1ffa8c9ca2c6e1957526bd0fb57a92eb98fb 100644
GIT binary patch
delta 22
dcmca{hw;W8#tnvE?1l;kmR3ean=QN)Q~+ot2W|iW

delta 22
dcmca{hw;W8#tnvE>;?*kmR2Sfn=QN)Q~+pI2X+7e

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 34b0af86..04d36644 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-20 19:48+0400\n"
+"POT-Creation-Date: 2007-08-21 09:22+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"
@@ -72,11 +72,11 @@ msgstr "每天"
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:118
+#: backend.php:118 modules/pref-users.php:249
 msgid "User"
 msgstr "用户"
 
-#: backend.php:119
+#: backend.php:119 modules/pref-users.php:249
 msgid "Administrator"
 msgstr "管理员"
 
@@ -141,6 +141,7 @@ msgid "Starred articles"
 msgstr "星级文章"
 
 #: functions.php:2034 functions.php:2342 functions.php:2681 functions.php:3365
+#: modules/pref-feeds.php:1002
 msgid "Published articles"
 msgstr "已发布文章"
 
@@ -569,6 +570,18 @@ msgstr "请输入标签主题"
 msgid "Save current configuration?"
 msgstr "保存设置"
 
+#: localized_js.php:116 modules/pref-prefs.php:20
+msgid "Old password cannot be blank."
+msgstr "原密码不可留空."
+
+#: localized_js.php:117 modules/pref-prefs.php:25
+msgid "New password cannot be blank."
+msgstr "新密码不可留空."
+
+#: localized_js.php:118 modules/pref-prefs.php:30
+msgid "Entered passwords do not match."
+msgstr "两次输入密码不通."
+
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:820 modules/pref-feeds.php:881
 msgid "Title"
@@ -664,112 +677,116 @@ msgid "Enable feed categories"
 msgstr "开启feed分类"
 
 #: localized_schema.php:38
+msgid "Enable search toolbar"
+msgstr ""
+
+#: localized_schema.php:39
 msgid "Hide feeds with no unread messages"
 msgstr "隐藏feed源以读信息"
 
-#: localized_schema.php:39
+#: localized_schema.php:40
 msgid "Mark articles as read automatically"
 msgstr "自动标志文章为已读"
 
-#: localized_schema.php:40
+#: localized_schema.php:41
 msgid ""
 "This option enables marking articles as read automatically in combined mode "
 "while you scroll article list."
 msgstr "启用该选项时，当你在联合模式下滚动文章列表时自动编辑文章为已读。"
 
-#: localized_schema.php:41
+#: localized_schema.php:42
 msgid "On catchup show next feed"
 msgstr "自动显示未读"
 
-#: localized_schema.php:42
+#: localized_schema.php:43
 msgid ""
 "When \"Mark as read\" button is clicked in toolbar, automatically open next "
 "feed with unread articles."
 msgstr ""
 "当工具栏上 \"标志为已读 \" 按钮被点击时,自动打开下一个RSS源中未读文章。"
 
-#: localized_schema.php:43
+#: localized_schema.php:44
 msgid "Open article links in new browser window"
 msgstr "新窗口打开文章连结"
 
-#: localized_schema.php:44
+#: localized_schema.php:45
 msgid "Reverse headline order (oldest first)"
 msgstr "反向提要排列（从旧到新）"
 
-#: localized_schema.php:45
+#: localized_schema.php:46
 msgid "Show content preview in headlines list"
 msgstr "在提要列表中显示内容预览"
 
-#: localized_schema.php:46
+#: localized_schema.php:47
 msgid "Sort feeds by unread articles count"
 msgstr "以未读文章数量排序feed源"
 
-#: localized_schema.php:47
+#: localized_schema.php:48
 msgid "User stylesheet URL"
 msgstr "用户样式表 URL"
 
-#: localized_schema.php:48
+#: localized_schema.php:49
 msgid "Link to user stylesheet to override default style, disabled if empty."
 msgstr "用户样式表优先，留空为不启用。"
 
-#: localized_schema.php:50
+#: localized_schema.php:51
 msgid "Advanced"
 msgstr "高级"
 
-#: localized_schema.php:52
+#: localized_schema.php:53
 msgid "Blacklisted tags"
 msgstr "被列入黑名单的标签"
 
-#: localized_schema.php:53
+#: localized_schema.php:54
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
 msgstr "自动检测文章中标签时，这些标签不适用（用半角逗号隔开）"
 
-#: localized_schema.php:54
+#: localized_schema.php:55
 msgid "Confirm marking feed as read"
 msgstr "确认标记所有Feed为已读..."
 
-#: localized_schema.php:55
+#: localized_schema.php:56
 msgid "Enable icons in feedlist"
 msgstr "feed列表中不启用ico"
 
-#: localized_schema.php:56
+#: localized_schema.php:57
 msgid "Enable labels"
 msgstr "开启标签"
 
-#: localized_schema.php:57
+#: localized_schema.php:58
 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:58
+#: localized_schema.php:59
 msgid "Long date format"
 msgstr "长的时间格式"
 
-#: localized_schema.php:59
+#: localized_schema.php:60
 msgid "Set articles as unread on update"
 msgstr "更新后标记文章为未读"
 
-#: localized_schema.php:60
+#: localized_schema.php:61
 msgid "Short date format"
 msgstr "短的时间格式"
 
-#: localized_schema.php:61
+#: localized_schema.php:62
 msgid "Show additional information in feedlist"
 msgstr "在feed列表中显示附加信息"
 
-#: localized_schema.php:62
+#: localized_schema.php:63
 msgid "Strip unsafe tags from articles"
 msgstr "从文章中过滤不安全标签"
 
-#: localized_schema.php:63
+#: localized_schema.php:64
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "阅读文章时过滤所有常见html标签"
 
-#: localized_schema.php:64
+#: localized_schema.php:65
 msgid "Use more accessible date/time format for headlines"
 msgstr "提要使用更方便的 日期／时间 格式"
 
@@ -786,6 +803,10 @@ msgstr "密码:"
 msgid "Language:"
 msgstr "语言："
 
+#: login_form.php:100 modules/pref-users.php:215
+msgid "Login"
+msgstr "登陆"
+
 #: opml.php:106 opml.php:110
 msgid "OPML Utility"
 msgstr "通用OPML"
@@ -1394,7 +1415,7 @@ msgstr "创建分类"
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:677 modules/pref-filters.php:342
+#: modules/pref-feeds.php:677 modules/pref-filters.php:345
 #: modules/pref-labels.php:294 modules/pref-users.php:319
 msgid "Remove"
 msgstr "移除"
@@ -1419,7 +1440,7 @@ msgstr "最后&nbsp;文章"
 msgid "Updated"
 msgstr "已更新"
 
-#: modules/pref-feeds.php:953 modules/pref-filters.php:340
+#: modules/pref-feeds.php:953 modules/pref-filters.php:343
 #: modules/pref-labels.php:292 modules/pref-users.php:317
 msgid "Edit"
 msgstr "编辑"
@@ -1488,15 +1509,24 @@ msgstr "匹配"
 msgid "Action"
 msgstr "操作"
 
-#: modules/pref-filters.php:299
+#: modules/pref-filters.php:297
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:298
+#, fuzzy
+msgid "action_description"
+msgstr "描述"
+
+#: modules/pref-filters.php:302
 msgid "(Disabled)"
 msgstr "(不可用)"
 
-#: modules/pref-filters.php:317
+#: modules/pref-filters.php:320
 msgid "(Inverse)"
 msgstr "(逆)"
 
-#: modules/pref-filters.php:332 modules/pref-filters.php:353
+#: modules/pref-filters.php:335 modules/pref-filters.php:356
 msgid "No filters defined."
 msgstr "未定义过滤器。"
 
@@ -1522,18 +1552,6 @@ msgstr "SQL 表达式"
 msgid "No labels defined."
 msgstr "未定义标记."
 
-#: modules/pref-prefs.php:20
-msgid "Old password cannot be blank."
-msgstr "原密码不可留空."
-
-#: modules/pref-prefs.php:25
-msgid "New password cannot be blank."
-msgstr "新密码不可留空."
-
-#: modules/pref-prefs.php:30
-msgid "Entered passwords do not match."
-msgstr "两次输入密码不通."
-
 #: modules/pref-prefs.php:51
 msgid "Password has been changed."
 msgstr "密码已更改."
@@ -1569,6 +1587,11 @@ msgstr "您的密码是默认的，请修改。"
 msgid "Personal data"
 msgstr "个人数据"
 
+#: modules/pref-prefs.php:220
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail:"
+
 #: modules/pref-prefs.php:233
 msgid "Change e-mail"
 msgstr "更改 e-mail"
@@ -1674,10 +1697,6 @@ msgstr ""
 msgid "Create user"
 msgstr "创建用户"
 
-#: modules/pref-users.php:215
-msgid "Login"
-msgstr "登陆"
-
 #: modules/pref-users.php:216
 msgid "Access Level"
 msgstr "等级:"
diff --git a/localized_js.php b/localized_js.php
index 424b050c..d2ab9467 100644
--- a/localized_js.php
+++ b/localized_js.php
@@ -113,6 +113,14 @@ print T_js_decl("Mark all visible articles in %s as read?");
 print T_js_decl("Mark all selected articles in %s as read?");
 print T_js_decl("Please enter label title:");
 print T_js_decl("Save current configuration?");
+print T_js_decl("Old password cannot be blank.");
+print T_js_decl("New password cannot be blank.");
+print T_js_decl("Entered passwords do not match.");
+#print T_js_decl(
+#print T_js_decl(
+#print T_js_decl(
+#print T_js_decl(
+#print T_js_decl(
 #print T_js_decl(
 #print T_js_decl(
 #print T_js_decl(
diff --git a/localized_schema.php b/localized_schema.php
index aac03712..87a1d8ff 100644
--- a/localized_schema.php
+++ b/localized_schema.php
@@ -35,6 +35,7 @@
 	__("Display expanded list of feed articles, instead of separate displays for headlines and article content");
 	__("Default article limit");
 	__("Enable feed categories");
+	__("Enable search toolbar");
 	__("Hide feeds with no unread messages");
 	__("Mark articles as read automatically");
 	__("This option enables marking articles as read automatically in combined mode while you scroll article list.");
diff --git a/login_form.php b/login_form.php
index a8f6de74..f67d27b4 100644
--- a/login_form.php
+++ b/login_form.php
@@ -97,7 +97,7 @@ window.onload = init;
 				<label for="remember_me">Remember me on this computer</label>
 			</td></tr> -->
 			<tr><td colspan="2" align="right" class="innerLoginCell">
-				<input type="submit" class="button" value="Login" name='click'>
+			<input type="submit" class="button" value="<?php echo __('Login') ?>" name='click'>
 				<input type="hidden" name="action" value="login">
 				<input type="hidden" name="rt" 
 					value="<?php if ($return_to != 'none') { echo $return_to; } ?>">
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 799957e2..e5a231ee 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -999,7 +999,7 @@
 				value=\"".__('Export OPML')."\">";			
 
 
-		print "<h3>Published articles</h3>";
+		print "<h3>".__("Published articles")."</h3>";
 
 		if (!get_pref($link, "_PREFS_PUBLISH_KEY")) {
 			set_pref($link, "_PREFS_PUBLISH_KEY", generate_publish_key());
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index e043323e..f2aef95a 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -294,6 +294,9 @@
 				print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"filter\");' 
 					type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
 
+				$line["filter_type_descr"] = __($line["filter_type_descr"]);
+				$line["action_description"] = __($line["action_description"]);
+
 				if (!$enabled) {
 					$line["reg_exp"] = "<span class=\"insensitive\">" . 
 						$line["reg_exp"] . " " .  __("(Disabled)")."</span>";
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 27dfd675..a3132ce4 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -217,7 +217,7 @@
 					
 				$email = db_fetch_result($result, 0, "email");
 	
-				print "<tr><td width=\"40%\">E-mail</td>";
+				print "<tr><td width=\"40%\">".__('E-mail')."</td>";
 				print "<td><input class=\"editbox\" name=\"email\" 
 					onkeypress=\"return filterCR(event, changeUserEmail)\"
 					value=\"$email\"></td></tr>";
diff --git a/modules/pref-users.php b/modules/pref-users.php
index 702b0fb1..e554da4c 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -246,7 +246,7 @@
 					strtotime($line["last_login"]));
 			}				
 
-			$access_level_names = array(0 => "User", 10 => "Administrator");
+			$access_level_names = array(0 => __("User"), 10 => __("Administrator"));
 
 //			if (!$edit_uid || $subop != "edit") {
 
diff --git a/tt-rss.css b/tt-rss.css
index e2bf62be..7efc0142 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -610,7 +610,7 @@ div.prefsTabSelected {
 div.notice {
 	background : #ffffff;
 	border : 1px solid #88b0f0;
-	width : 50%;
+	width : 60%;
 	padding : 5px;
 	margin : 0px 0px 5px 0px;
 	font-size : 9pt;
@@ -620,7 +620,7 @@ div.warning {
 	background : #fff7d5;
 	border : 1px solid #d7c47a;
 	font-size : 9pt;
-	width : 50%;
+	width : 60%;
 	padding : 5px;
 	margin : 0px 0px 5px 0px;
 }
-- 
2.39.5