update translations

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index e723ad5f521564b0cb2899622355670b7578b14d..1b818ce565c1d9ec53d9745c5a8a6fe87da17151 100644 (file)
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 46d41f44e009b5189f611995b0636810847eb689..48399eb613c7887456dff31b40ce95e3ae7685bf 100644 (file)
--- 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-09-20 11:00+0400\n"
+"POT-Creation-Date: 2007-09-25 12:10+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:2274 functions.php:2613 functions.php:2968 functions.php:3727
+#: functions.php:2277 functions.php:2616 functions.php:2971 functions.php:3730
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2283 functions.php:2615 functions.php:2970 functions.php:3734
+#: functions.php:2286 functions.php:2618 functions.php:2973 functions.php:3737
 #: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2292 functions.php:2617 functions.php:2972 functions.php:3712
+#: functions.php:2295 functions.php:2620 functions.php:2975 functions.php:3715
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2535 modules/popup-dialog.php:141
+#: functions.php:2538 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2564 functions.php:2603 functions.php:2946 functions.php:3891
-#: functions.php:3921 modules/pref-feeds.php:880
+#: functions.php:2567 functions.php:2606 functions.php:2949 functions.php:3894
+#: functions.php:3924 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2593 functions.php:3112
+#: functions.php:2596 functions.php:3115
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2595 functions.php:3114
+#: functions.php:2598 functions.php:3117
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2932 functions.php:2934
+#: functions.php:2935 functions.php:2937
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:2950 functions.php:2963 functions.php:2980
+#: functions.php:2953 functions.php:2966 functions.php:2983
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3244
+#: functions.php:3247
 msgid "New headlines for last 24 hours, as of "
 msgstr "Nouveaux en-têtes dans les dernières 24 heures, à compter de "
 
-#: functions.php:3289
+#: functions.php:3292
 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:3291
+#: functions.php:3294
 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:3522 functions.php:3569 functions.php:4589
+#: functions.php:3525 functions.php:3572 functions.php:4592
 #: 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:3523 functions.php:3570 modules/pref-feeds.php:656
+#: functions.php:3526 functions.php:3573 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:3524 functions.php:3528 functions.php:3571 functions.php:3574
-#: tt-rss.php:169
+#: functions.php:3527 functions.php:3531 functions.php:3574 functions.php:3577
+#: tt-rss.php:165
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3525 functions.php:3572 modules/pref-feeds.php:657
+#: functions.php:3528 functions.php:3575 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:3527
+#: functions.php:3530
 msgid "Toggle"
 msgstr "Marquages spéciaux&nbsp;"
 
-#: functions.php:3529 functions.php:3575 tt-rss.php:168
+#: functions.php:3532 functions.php:3578 tt-rss.php:164
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3530
+#: functions.php:3533
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3533 localized_schema.php:15
+#: functions.php:3536 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3534
+#: functions.php:3537
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:3535
+#: functions.php:3538
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3537
+#: functions.php:3540
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3538
+#: functions.php:3541
 #, fuzzy
 msgid "Below active article"
 msgstr "Filtrer l'article"
 
-#: functions.php:3540
+#: functions.php:3543
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3548
+#: functions.php:3551
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3549
+#: functions.php:3552
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3550
+#: functions.php:3553
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3560 functions.php:3586
+#: functions.php:3563 functions.php:3589
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3574
+#: functions.php:3577
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3577
+#: functions.php:3580
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3578
+#: functions.php:3581
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3579 modules/pref-filters.php:263
+#: functions.php:3582 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3625
+#: functions.php:3628
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3961
+#: functions.php:3964
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:3978
+#: functions.php:3981
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4203
+#: functions.php:4206
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:4252
+#: functions.php:4255
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4323
+#: functions.php:4326
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4385
+#: functions.php:4388
 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:4652
+#: functions.php:4655
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
@@ -540,7 +540,7 @@ msgstr "Impossible de mettre à jour l'en-têtes (objet XML manquant)"
 msgid "Could not display article (missing XML object)"
 msgstr "Impossible d'afficher l'article (objet XML manquant)"
 
-#: localized_js.php:92 tt-rss.php:211 tt-rss.php:215
+#: localized_js.php:92 tt-rss.php:207 tt-rss.php:211
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
@@ -1122,6 +1122,13 @@ msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
 msgstr ""
 
 #: sanity_check.php:78
+msgid ""
+"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
+"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
+"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+msgstr ""
+
+#: sanity_check.php:83
 msgid "Fatal Error"
 msgstr "Erreur critique"
 
@@ -1159,51 +1166,47 @@ msgstr "&nbsp;&nbsp;Créer un filtre"
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;Se désinscrire"
 
-#: tt-rss.php:141
+#: tt-rss.php:140
 msgid "All feeds:"
 msgstr "Tous les flux&nbsp;:"
 
-#: tt-rss.php:143
-msgid "&nbsp;&nbsp;Update"
-msgstr "&nbsp;&nbsp;Mettre à jour"
-
-#: tt-rss.php:145
+#: tt-rss.php:141
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "Marquer comme lus"
 
-#: tt-rss.php:146
+#: tt-rss.php:142
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 
-#: tt-rss.php:148
+#: tt-rss.php:144
 msgid "Other actions:"
 msgstr "Autres actions&nbsp;:"
 
-#: tt-rss.php:149
+#: tt-rss.php:145
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Créer un filtre"
 
-#: tt-rss.php:157 modules/popup-dialog.php:129
+#: tt-rss.php:153 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
-#: tt-rss.php:164
+#: tt-rss.php:160
 msgid "View:"
 msgstr "Afficher&nbsp;:"
 
-#: tt-rss.php:166
+#: tt-rss.php:162
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: tt-rss.php:167
+#: tt-rss.php:163
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: tt-rss.php:172
+#: tt-rss.php:168
 msgid "Limit:"
 msgstr "Limite&nbsp;:"
 
-#: tt-rss.php:197
+#: tt-rss.php:193
 msgid "Update"
 msgstr "Mettre à jour"
 
@@ -1917,3 +1920,6 @@ msgstr "Détails de l'utilisateur"
 #: modules/pref-users.php:321
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
+
+#~ msgid "&nbsp;&nbsp;Update"
+#~ msgstr "&nbsp;&nbsp;Mettre à jour"

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 38be5748fbb9b209de64fd97603065631e2f7da7..365e7e90cc7bfe0cb4f86eaabc16cf638d70a4c5 100644 (file)
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 a4becd08dc5ac295d158eaf752914a4783e67478..259072611cc47055d10c1750f4746a160f8f71a4 100644 (file)
--- 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-09-20 11:00+0400\n"
+"POT-Creation-Date: 2007-09-25 12:10+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:2274 functions.php:2613 functions.php:2968 functions.php:3727
+#: functions.php:2277 functions.php:2616 functions.php:2971 functions.php:3730
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2283 functions.php:2615 functions.php:2970 functions.php:3734
+#: functions.php:2286 functions.php:2618 functions.php:2973 functions.php:3737
 #: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2292 functions.php:2617 functions.php:2972 functions.php:3712
+#: functions.php:2295 functions.php:2620 functions.php:2975 functions.php:3715
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2535 modules/popup-dialog.php:141
+#: functions.php:2538 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2564 functions.php:2603 functions.php:2946 functions.php:3891
-#: functions.php:3921 modules/pref-feeds.php:880
+#: functions.php:2567 functions.php:2606 functions.php:2949 functions.php:3894
+#: functions.php:3924 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2593 functions.php:3112
+#: functions.php:2596 functions.php:3115
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2595 functions.php:3114
+#: functions.php:2598 functions.php:3117
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2932 functions.php:2934
+#: functions.php:2935 functions.php:2937
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2950 functions.php:2963 functions.php:2980
+#: functions.php:2953 functions.php:2966 functions.php:2983
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3244
+#: functions.php:3247
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:3289
+#: functions.php:3292
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:3291
+#: functions.php:3294
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3522 functions.php:3569 functions.php:4589
+#: functions.php:3525 functions.php:3572 functions.php:4592
 #: 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:3523 functions.php:3570 modules/pref-feeds.php:656
+#: functions.php:3526 functions.php:3573 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:3524 functions.php:3528 functions.php:3571 functions.php:3574
-#: tt-rss.php:169
+#: functions.php:3527 functions.php:3531 functions.php:3574 functions.php:3577
+#: tt-rss.php:165
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3525 functions.php:3572 modules/pref-feeds.php:657
+#: functions.php:3528 functions.php:3575 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:3527
+#: functions.php:3530
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3529 functions.php:3575 tt-rss.php:168
+#: functions.php:3532 functions.php:3578 tt-rss.php:164
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3530
+#: functions.php:3533
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3533 localized_schema.php:15
+#: functions.php:3536 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3534
+#: functions.php:3537
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3535
+#: functions.php:3538
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3537
+#: functions.php:3540
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3538
+#: functions.php:3541
 #, fuzzy
 msgid "Below active article"
 msgstr "Отфильтровать статью"
 
-#: functions.php:3540
+#: functions.php:3543
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3548
+#: functions.php:3551
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3549
+#: functions.php:3552
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3550
+#: functions.php:3553
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3560 functions.php:3586
+#: functions.php:3563 functions.php:3589
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3574
+#: functions.php:3577
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3577
+#: functions.php:3580
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3578
+#: functions.php:3581
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3579 modules/pref-filters.php:263
+#: functions.php:3582 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3625
+#: functions.php:3628
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3961
+#: functions.php:3964
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3978
+#: functions.php:3981
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4203
+#: functions.php:4206
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:4252
+#: functions.php:4255
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4323
+#: functions.php:4326
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4385
+#: functions.php:4388
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4652
+#: functions.php:4655
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -529,7 +529,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:92 tt-rss.php:211 tt-rss.php:215
+#: localized_js.php:92 tt-rss.php:207 tt-rss.php:211
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -1061,6 +1061,13 @@ msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
 msgstr ""
 
 #: sanity_check.php:78
+msgid ""
+"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
+"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
+"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+msgstr ""
+
+#: sanity_check.php:83
 msgid "Fatal Error"
 msgstr "Фатальная Ошибка"
 
@@ -1098,51 +1105,47 @@ msgstr "&nbsp;&nbsp;Создать фильтр"
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;Отписаться"
 
-#: tt-rss.php:141
+#: tt-rss.php:140
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: tt-rss.php:143
-msgid "&nbsp;&nbsp;Update"
-msgstr "&nbsp;&nbsp;Обновить"
-
-#: tt-rss.php:145
+#: tt-rss.php:141
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "&nbsp;&nbsp;Пометить как прочитанные"
 
-#: tt-rss.php:146
+#: tt-rss.php:142
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;Спрятать прочитанные"
 
-#: tt-rss.php:148
+#: tt-rss.php:144
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: tt-rss.php:149
+#: tt-rss.php:145
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:157 modules/popup-dialog.php:129
+#: tt-rss.php:153 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:164
+#: tt-rss.php:160
 msgid "View:"
 msgstr "Показать:"
 
-#: tt-rss.php:166
+#: tt-rss.php:162
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:167
+#: tt-rss.php:163
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:172
+#: tt-rss.php:168
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:197
+#: tt-rss.php:193
 msgid "Update"
 msgstr "Обновить"
 
@@ -1836,6 +1839,9 @@ msgstr "Подробнее..."
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
+#~ msgid "&nbsp;&nbsp;Update"
+#~ msgstr "&nbsp;&nbsp;Обновить"
+
 #~ msgid "Tags:"
 #~ msgstr "Теги:"
 

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index f50e745341d61b77338586c5b771f1450a799e46..2c9951b5fc41a89394448dd817f1c1ff6fb88b86 100644 (file)
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 6a402e8b7cd79d42caaca6ed053c396b7f67a243..284c1265f8591aec892151ad76cd7c5e72bdc126 100644 (file)
--- 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-09-20 11:00+0400\n"
+"POT-Creation-Date: 2007-09-25 12:10+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:2274 functions.php:2613 functions.php:2968 functions.php:3727
+#: functions.php:2277 functions.php:2616 functions.php:2971 functions.php:3730
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2283 functions.php:2615 functions.php:2970 functions.php:3734
+#: functions.php:2286 functions.php:2618 functions.php:2973 functions.php:3737
 #: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2292 functions.php:2617 functions.php:2972 functions.php:3712
+#: functions.php:2295 functions.php:2620 functions.php:2975 functions.php:3715
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2535 modules/popup-dialog.php:141
+#: functions.php:2538 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2564 functions.php:2603 functions.php:2946 functions.php:3891
-#: functions.php:3921 modules/pref-feeds.php:880
+#: functions.php:2567 functions.php:2606 functions.php:2949 functions.php:3894
+#: functions.php:3924 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2593 functions.php:3112
+#: functions.php:2596 functions.php:3115
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2595 functions.php:3114
+#: functions.php:2598 functions.php:3117
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2932 functions.php:2934
+#: functions.php:2935 functions.php:2937
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:2950 functions.php:2963 functions.php:2980
+#: functions.php:2953 functions.php:2966 functions.php:2983
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3244
+#: functions.php:3247
 msgid "New headlines for last 24 hours, as of "
 msgstr "24小时最新提要,截至"
 
-#: functions.php:3289
+#: functions.php:3292
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr "由于您启用了Tiny Tiny RSS每日文摘，会收到此邮件。"
 
-#: functions.php:3291
+#: functions.php:3294
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr "若要退订,访问你的配置选项或联络管理员。\n"
 
-#: functions.php:3522 functions.php:3569 functions.php:4589
+#: functions.php:3525 functions.php:3572 functions.php:4592
 #: 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:3523 functions.php:3570 modules/pref-feeds.php:656
+#: functions.php:3526 functions.php:3573 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:3524 functions.php:3528 functions.php:3571 functions.php:3574
-#: tt-rss.php:169
+#: functions.php:3527 functions.php:3531 functions.php:3574 functions.php:3577
+#: tt-rss.php:165
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3525 functions.php:3572 modules/pref-feeds.php:657
+#: functions.php:3528 functions.php:3575 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:3527
+#: functions.php:3530
 msgid "Toggle"
 msgstr "触发开关"
 
-#: functions.php:3529 functions.php:3575 tt-rss.php:168
+#: functions.php:3532 functions.php:3578 tt-rss.php:164
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3530
+#: functions.php:3533
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3533 localized_schema.php:15
+#: functions.php:3536 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3534
+#: functions.php:3537
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3535
+#: functions.php:3538
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3537
+#: functions.php:3540
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3538
+#: functions.php:3541
 #, fuzzy
 msgid "Below active article"
 msgstr "过滤文章"
 
-#: functions.php:3540
+#: functions.php:3543
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3548
+#: functions.php:3551
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3549
+#: functions.php:3552
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3550
+#: functions.php:3553
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3560 functions.php:3586
+#: functions.php:3563 functions.php:3589
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3574
+#: functions.php:3577
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3577
+#: functions.php:3580
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3578
+#: functions.php:3581
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3579 modules/pref-filters.php:263
+#: functions.php:3582 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3625
+#: functions.php:3628
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3961
+#: functions.php:3964
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:3978
+#: functions.php:3981
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4203
+#: functions.php:4206
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:4252
+#: functions.php:4255
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4323
+#: functions.php:4326
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4385
+#: functions.php:4388
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4652
+#: functions.php:4655
 msgid "No articles found."
 msgstr "未找到文章。"
 
@@ -524,7 +524,7 @@ msgstr "更新提要失败（缺少XML支持）"
 msgid "Could not display article (missing XML object)"
 msgstr "显示条目失败（缺少XML支持）"
 
-#: localized_js.php:92 tt-rss.php:211 tt-rss.php:215
+#: localized_js.php:92 tt-rss.php:207 tt-rss.php:211
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -1067,6 +1067,13 @@ msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
 msgstr ""
 
 #: sanity_check.php:78
+msgid ""
+"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
+"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
+"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+msgstr ""
+
+#: sanity_check.php:83
 msgid "Fatal Error"
 msgstr "致命错误"
 
@@ -1104,51 +1111,47 @@ msgstr "&nbsp;&nbsp;创建过滤器"
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;退订"
 
-#: tt-rss.php:141
+#: tt-rss.php:140
 msgid "All feeds:"
 msgstr "所有feed:"
 
-#: tt-rss.php:143
-msgid "&nbsp;&nbsp;Update"
-msgstr "&nbsp;&nbsp;更新"
-
-#: tt-rss.php:145
+#: tt-rss.php:141
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "&nbsp;&nbsp;标记未已读"
 
-#: tt-rss.php:146
+#: tt-rss.php:142
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
-#: tt-rss.php:148
+#: tt-rss.php:144
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:149
+#: tt-rss.php:145
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:157 modules/popup-dialog.php:129
+#: tt-rss.php:153 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:164
+#: tt-rss.php:160
 msgid "View:"
 msgstr "浏览:"
 
-#: tt-rss.php:166
+#: tt-rss.php:162
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:167
+#: tt-rss.php:163
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:172
+#: tt-rss.php:168
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:197
+#: tt-rss.php:193
 msgid "Update"
 msgstr "更新"
 
@@ -1851,3 +1854,6 @@ msgstr "用户详细"
 #: modules/pref-users.php:321
 msgid "Reset password"
 msgstr "重置密码"
+
+#~ msgid "&nbsp;&nbsp;Update"
+#~ msgstr "&nbsp;&nbsp;更新"