tweak quickAddFeed dialog

diff --git a/functions.js b/functions.js
index 220c56bbecd2d738ee8436c624ab938deacbb3d2..732e73ec846a2b4853d1aa09df9787b0a07054cc 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1395,6 +1395,30 @@ function showBlockElement(id, h_id) {
        } 
 }
 
+function appearBlockElement_afh(effect) {
+
+}
+
+function checkboxToggleElement(elem, id) {
+       if (elem.checked) {
+               Effect.SlideDown(id, {duration : 1.0});
+       } else {
+               Effect.SlideUp(id, {duration : 1.0});
+       }
+}
+
+function appearBlockElement(id, h_id) {
+
+       try {
+               Effect.Fade(h_id);
+               Effect.SlideDown(id, {duration : 1.0, afterFinish: appearBlockElement_afh});
+       } catch (e) {
+               exception_error("appearBlockElement", e);
+       }
+
+}
+
+
 function hideParentElement(e) {
        e.parentNode.style.display = "none";
 }

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index d9f9227489670cd62ee448f5b86339d5e65c95ec..608d2d5ed05722c3d3ab8302509603caf06f3034 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 6aab3cb968236b1ff5e1761f8e51e06ec4488514..f91a67d9579c664854d9ba8d3a2cbc2839f1f02e 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: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 23:38+0400\n"
+"POT-Creation-Date: 2007-08-12 00:43+0400\n"
 "PO-Revision-Date: 2007-08-10 16:30+0200\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -146,45 +146,45 @@ 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:2231 modules/popup-dialog.php:135
+#: functions.php:2236 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2260 functions.php:2299 functions.php:2623 functions.php:3407
-#: functions.php:3437 modules/pref-feeds.php:890
+#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3412
+#: functions.php:3442 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2289 functions.php:3247
+#: functions.php:2294 functions.php:3252
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2291 functions.php:3281
+#: functions.php:2296 functions.php:3286
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2309 functions.php:2645 functions.php:3258
+#: functions.php:2314 functions.php:2650 functions.php:3263
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2311 functions.php:2647 functions.php:3265
+#: functions.php:2316 functions.php:2652 functions.php:3270
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2609 functions.php:2611
+#: functions.php:2614 functions.php:2616
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:2627 functions.php:2640 functions.php:2655
+#: functions.php:2632 functions.php:2645 functions.php:2660
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:2880
+#: functions.php:2885
 msgid "New headlines for last 24 hours, as of "
 msgstr "Nouveaux en-têtes dans les dernières 24 heures, à compter de "
 
-#: functions.php:2924
+#: functions.php:2929
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
@@ -192,118 +192,118 @@ msgstr ""
 "Vous recevez ce courrier électronique parce que vous avez activé la synthèse "
 "quotidienne dans TIny Tiny RSS sur "
 
-#: functions.php:2926
+#: functions.php:2931
 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:3132 functions.php:3174 functions.php:4078
+#: functions.php:3137 functions.php:3179 functions.php:4085
 #: modules/pref-feeds.php:615 modules/pref-feeds.php:852
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
-#: functions.php:3133 functions.php:3175 modules/pref-feeds.php:616
+#: functions.php:3138 functions.php:3180 modules/pref-feeds.php:616
 #: modules/pref-feeds.php:853 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:3134 functions.php:3138 functions.php:3176 functions.php:3179
+#: functions.php:3139 functions.php:3143 functions.php:3181 functions.php:3184
 #: tt-rss.php:172
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3135 functions.php:3177 modules/pref-feeds.php:617
+#: functions.php:3140 functions.php:3182 modules/pref-feeds.php:617
 #: modules/pref-feeds.php:854 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:3137
+#: functions.php:3142
 msgid "Toggle"
 msgstr "Marquages spéciaux&nbsp;"
 
-#: functions.php:3139 functions.php:3180 tt-rss.php:171
+#: functions.php:3144 functions.php:3185 tt-rss.php:171
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3140
+#: functions.php:3145
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3143 localized_schema.php:15
+#: functions.php:3148 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3144
+#: functions.php:3149
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3145
+#: functions.php:3150
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3153
+#: functions.php:3158
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3154
+#: functions.php:3159
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3155
+#: functions.php:3160
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3165 functions.php:3191
+#: functions.php:3170 functions.php:3196
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3179
+#: functions.php:3184
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3182
+#: functions.php:3187
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3183
+#: functions.php:3188
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3184 modules/pref-filters.php:263
+#: functions.php:3189 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3229
+#: functions.php:3234
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3479
+#: functions.php:3484
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:3496
+#: functions.php:3501
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:3718
+#: functions.php:3723
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:3767
+#: functions.php:3772
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:3836
+#: functions.php:3843
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:3898
+#: functions.php:3905
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -311,7 +311,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:4139
+#: functions.php:4148
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
@@ -323,7 +323,7 @@ msgstr "afficher les flux"
 msgid "display tags"
 msgstr "afficher les étiquettes"
 
-#: localized_js.php:34 prefs.php:126 tt-rss.php:79
+#: localized_js.php:34 prefs.php:127 tt-rss.php:79
 msgid "Loading, please wait..."
 msgstr "Ouverture en cours, veuillez patienter..."
 
@@ -558,7 +558,7 @@ msgstr ""
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_schema.php:9 modules/popup-dialog.php:166
+#: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
 msgid "Title"
 msgstr "Titre"
@@ -573,7 +573,7 @@ msgstr "Titre ou contenu"
 msgid "Link"
 msgstr "Lier à&nbsp;:"
 
-#: localized_schema.php:12 modules/popup-dialog.php:167
+#: localized_schema.php:12 modules/popup-dialog.php:173
 msgid "Content"
 msgstr "Contenu"
 
@@ -805,51 +805,51 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "Revenir à la configuration"
 
-#: prefs.php:83
+#: prefs.php:84
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
-#: prefs.php:89 tt-rss.php:112
+#: prefs.php:90 tt-rss.php:112
 msgid "Hello,"
 msgstr "Bonjour,"
 
-#: prefs.php:90 tt-rss.php:113
+#: prefs.php:91 tt-rss.php:113
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: prefs.php:98
+#: prefs.php:99
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
-#: prefs.php:104 tt-rss.php:136
+#: prefs.php:105 tt-rss.php:136
 msgid "Preferences"
 msgstr "Configuration"
 
-#: prefs.php:106
+#: prefs.php:107
 msgid "My Feeds"
 msgstr "Mes flux"
 
-#: prefs.php:109
+#: prefs.php:110
 msgid "Other Feeds"
 msgstr "Autres flux"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Published Articles"
 msgstr "Articles publiés"
 
-#: prefs.php:114
+#: prefs.php:115
 msgid "Content Filtering"
 msgstr "Filtrage de contenu"
 
-#: prefs.php:117
+#: prefs.php:118
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
-#: prefs.php:121
+#: prefs.php:122
 msgid "User Manager"
 msgstr "Gestionnaire d'utilisateurs"
 
-#: prefs.php:129 tt-rss.php:82
+#: prefs.php:130 tt-rss.php:82
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -949,7 +949,7 @@ msgstr "Nuage d'étiquettes"
 msgid "Actions..."
 msgstr "Actions..."
 
-#: tt-rss.php:135 modules/popup-dialog.php:111 modules/popup-dialog.php:180
+#: tt-rss.php:135 modules/popup-dialog.php:117 modules/popup-dialog.php:186
 #: modules/pref-feeds.php:759
 msgid "Search"
 msgstr "Rechercher"
@@ -994,7 +994,7 @@ msgstr "Autres actions&nbsp;:"
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Créer un filtre"
 
-#: tt-rss.php:160 modules/popup-dialog.php:123
+#: tt-rss.php:160 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
@@ -1174,131 +1174,131 @@ msgstr "URL du flux&nbsp;:"
 msgid "Category:"
 msgstr "Catégorie&nbsp;:"
 
-#: modules/popup-dialog.php:86
-msgid "Click here if this feed requires authentication."
-msgstr ""
-
 #: modules/popup-dialog.php:101 modules/pref-feed-browser.php:107
 #: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: modules/popup-dialog.php:104 modules/popup-dialog.php:183
-#: modules/popup-dialog.php:235 modules/popup-dialog.php:322
-#: modules/popup-dialog.php:418 modules/pref-feeds.php:120
+#: modules/popup-dialog.php:104 modules/popup-dialog.php:189
+#: modules/popup-dialog.php:241 modules/popup-dialog.php:328
+#: modules/popup-dialog.php:424 modules/pref-feeds.php:120
 #: modules/pref-feeds.php:331 modules/pref-feeds.php:714
 #: modules/pref-filters.php:118 modules/pref-users.php:58
 msgid "Cancel"
 msgstr "Annuler"
 
-#: modules/popup-dialog.php:132
+#: modules/popup-dialog.php:110
+msgid "This feed requires authentication."
+msgstr ""
+
+#: modules/popup-dialog.php:138
 msgid "Where:"
 msgstr "Emplacement&nbsp;:"
 
-#: modules/popup-dialog.php:148
+#: modules/popup-dialog.php:154
 msgid "This feed"
 msgstr "Ce flux"
 
-#: modules/popup-dialog.php:163
+#: modules/popup-dialog.php:169
 msgid "Match on:"
 msgstr "Correspondance sur&nbsp;:"
 
-#: modules/popup-dialog.php:168
+#: modules/popup-dialog.php:174
 msgid "Title or content"
 msgstr "Titre ou contenu"
 
-#: modules/popup-dialog.php:192 modules/pref-labels.php:216
+#: modules/popup-dialog.php:198 modules/pref-labels.php:216
 msgid "Create label"
 msgstr "Créer un intitulé"
 
-#: modules/popup-dialog.php:202
+#: modules/popup-dialog.php:208
 msgid "Caption:"
 msgstr "Descriptif&nbsp;:"
 
-#: modules/popup-dialog.php:211
+#: modules/popup-dialog.php:217
 msgid "SQL Expression:"
 msgstr "Expression SQL&nbsp;:"
 
-#: modules/popup-dialog.php:224
+#: modules/popup-dialog.php:230
 msgid "Test"
 msgstr "Tester"
 
-#: modules/popup-dialog.php:231 modules/popup-dialog.php:318
+#: modules/popup-dialog.php:237 modules/popup-dialog.php:324
 msgid "Create"
 msgstr "Créer"
 
-#: modules/popup-dialog.php:244 modules/pref-filters.php:229
+#: modules/popup-dialog.php:250 modules/pref-filters.php:229
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: modules/popup-dialog.php:262 modules/popup-dialog.php:293
+#: modules/popup-dialog.php:268 modules/popup-dialog.php:299
 #: modules/pref-filters.php:40 modules/pref-filters.php:72
 msgid "description"
 msgstr ""
 
-#: modules/popup-dialog.php:267 modules/pref-filters.php:45
+#: modules/popup-dialog.php:273 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
 
-#: modules/popup-dialog.php:273 modules/pref-filters.php:51
+#: modules/popup-dialog.php:279 modules/pref-filters.php:51
 msgid "On field:"
 msgstr "Sur le champ&nbsp;:"
 
-#: modules/popup-dialog.php:278 modules/pref-filters.php:56
+#: modules/popup-dialog.php:284 modules/pref-filters.php:56
 msgid "Feed:"
 msgstr "Flux&nbsp;:"
 
-#: modules/popup-dialog.php:284 modules/pref-filters.php:62
+#: modules/popup-dialog.php:290 modules/pref-filters.php:62
 msgid "Action:"
 msgstr "Action&nbsp;:"
 
-#: modules/popup-dialog.php:300 modules/pref-filters.php:79
+#: modules/popup-dialog.php:306 modules/pref-filters.php:79
 msgid "Params:"
 msgstr "Paramètres&nbsp;:"
 
-#: modules/popup-dialog.php:304 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:310 modules/pref-feeds.php:283
 msgid "Options:"
 msgstr "Options&nbsp;:"
 
-#: modules/popup-dialog.php:307 modules/pref-filters.php:103
+#: modules/popup-dialog.php:313 modules/pref-filters.php:103
 msgid "Inverse match"
 msgstr "Correspondance inverse"
 
-#: modules/popup-dialog.php:333
+#: modules/popup-dialog.php:339
 msgid "Update Errors"
 msgstr "Erreurs de mise à jour"
 
-#: modules/popup-dialog.php:336
+#: modules/popup-dialog.php:342
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs&nbsp;:"
 
-#: modules/popup-dialog.php:355 modules/popup-dialog.php:442
+#: modules/popup-dialog.php:361 modules/popup-dialog.php:448
 msgid "Close"
 msgstr "Fermer"
 
-#: modules/popup-dialog.php:364
+#: modules/popup-dialog.php:370
 msgid "Edit Tags"
 msgstr "Modifier les étiquettes"
 
-#: modules/popup-dialog.php:369
+#: modules/popup-dialog.php:375
 msgid "Tags for this article (separated by commas):"
 msgstr "Étiquettes pour cet article (séparées par des virgules)&nbsp;:"
 
-#: modules/popup-dialog.php:414 modules/pref-feeds.php:329
+#: modules/popup-dialog.php:420 modules/pref-feeds.php:329
 #: modules/pref-feeds.php:712 modules/pref-filters.php:114
 #: modules/pref-users.php:55
 msgid "Save"
 msgstr "Enregistrer"
 
-#: modules/popup-dialog.php:427
+#: modules/popup-dialog.php:433
 msgid "Tag cloud"
 msgstr "Nuage d'étiquettes"
 
-#: modules/popup-dialog.php:430
+#: modules/popup-dialog.php:436
 msgid "Showing most popular tags "
 msgstr "Affichage des étiquettes les plus populaires "
 
-#: modules/popup-dialog.php:431
+#: modules/popup-dialog.php:437
 msgid "browse more"
 msgstr "en afficher plus"
 

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 7b067437b5a2bbff278bade64f9d1a88281a1a94..59ee04ebe27491fc5ef6a77293c3fdc16a43e40d 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 79554d82bc9efcf2276c690089a4db78ff811a1e..55c7bdcf10a5c053f7e043a44c900b805d2915ab 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-08-11 23:38+0400\n"
+"POT-Creation-Date: 2007-08-12 00:43+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -140,168 +140,168 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2231 modules/popup-dialog.php:135
+#: functions.php:2236 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2260 functions.php:2299 functions.php:2623 functions.php:3407
-#: functions.php:3437 modules/pref-feeds.php:890
+#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3412
+#: functions.php:3442 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2289 functions.php:3247
+#: functions.php:2294 functions.php:3252
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2291 functions.php:3281
+#: functions.php:2296 functions.php:3286
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2309 functions.php:2645 functions.php:3258
+#: functions.php:2314 functions.php:2650 functions.php:3263
 msgid "Starred articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2311 functions.php:2647 functions.php:3265
+#: functions.php:2316 functions.php:2652 functions.php:3270
 #, fuzzy
 msgid "Published articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2609 functions.php:2611
+#: functions.php:2614 functions.php:2616
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2627 functions.php:2640 functions.php:2655
+#: functions.php:2632 functions.php:2645 functions.php:2660
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:2880
+#: functions.php:2885
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:2924
+#: functions.php:2929
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:2926
+#: functions.php:2931
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3132 functions.php:3174 functions.php:4078
+#: functions.php:3137 functions.php:3179 functions.php:4085
 #: modules/pref-feeds.php:615 modules/pref-feeds.php:852
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3133 functions.php:3175 modules/pref-feeds.php:616
+#: functions.php:3138 functions.php:3180 modules/pref-feeds.php:616
 #: modules/pref-feeds.php:853 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Все"
 
-#: functions.php:3134 functions.php:3138 functions.php:3176 functions.php:3179
+#: functions.php:3139 functions.php:3143 functions.php:3181 functions.php:3184
 #: tt-rss.php:172
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3135 functions.php:3177 modules/pref-feeds.php:617
+#: functions.php:3140 functions.php:3182 modules/pref-feeds.php:617
 #: modules/pref-feeds.php:854 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3137
+#: functions.php:3142
 #, fuzzy
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3139 functions.php:3180 tt-rss.php:171
+#: functions.php:3144 functions.php:3185 tt-rss.php:171
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3140
+#: functions.php:3145
 msgid "Published"
 msgstr ""
 
-#: functions.php:3143 localized_schema.php:15
+#: functions.php:3148 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3144
+#: functions.php:3149
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3145
+#: functions.php:3150
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3153
+#: functions.php:3158
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3154
+#: functions.php:3159
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3155
+#: functions.php:3160
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3165 functions.php:3191
+#: functions.php:3170 functions.php:3196
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3179
+#: functions.php:3184
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3182
+#: functions.php:3187
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3183
+#: functions.php:3188
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3184 modules/pref-filters.php:263
+#: functions.php:3189 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3229
+#: functions.php:3234
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3479
+#: functions.php:3484
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3496
+#: functions.php:3501
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:3718
+#: functions.php:3723
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:3767
+#: functions.php:3772
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:3836
+#: functions.php:3843
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:3898
+#: functions.php:3905
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4139
+#: functions.php:4148
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -313,7 +313,7 @@ msgstr "показать каналы"
 msgid "display tags"
 msgstr "показать теги"
 
-#: localized_js.php:34 prefs.php:126 tt-rss.php:79
+#: localized_js.php:34 prefs.php:127 tt-rss.php:79
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_schema.php:9 modules/popup-dialog.php:166
+#: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
 msgid "Title"
 msgstr "Заголовок"
@@ -563,7 +563,7 @@ msgstr "Заголовок или содержимое"
 msgid "Link"
 msgstr "Связать с:"
 
-#: localized_schema.php:12 modules/popup-dialog.php:167
+#: localized_schema.php:12 modules/popup-dialog.php:173
 msgid "Content"
 msgstr "Содержимое"
 
@@ -793,52 +793,52 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "Вернуться к настройкам"
 
-#: prefs.php:83
+#: prefs.php:84
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: prefs.php:89 tt-rss.php:112
+#: prefs.php:90 tt-rss.php:112
 msgid "Hello,"
 msgstr "Привет,"
 
-#: prefs.php:90 tt-rss.php:113
+#: prefs.php:91 tt-rss.php:113
 msgid "Logout"
 msgstr "Выход"
 
-#: prefs.php:98
+#: prefs.php:99
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:104 tt-rss.php:136
+#: prefs.php:105 tt-rss.php:136
 msgid "Preferences"
 msgstr "Настройки"
 
-#: prefs.php:106
+#: prefs.php:107
 msgid "My Feeds"
 msgstr "Мои каналы"
 
-#: prefs.php:109
+#: prefs.php:110
 msgid "Other Feeds"
 msgstr "Другие каналы"
 
-#: prefs.php:112
+#: prefs.php:113
 #, fuzzy
 msgid "Published Articles"
 msgstr "Все статьи"
 
-#: prefs.php:114
+#: prefs.php:115
 msgid "Content Filtering"
 msgstr "Фильтры"
 
-#: prefs.php:117
+#: prefs.php:118
 msgid "Label Editor"
 msgstr "Метки"
 
-#: prefs.php:121
+#: prefs.php:122
 msgid "User Manager"
 msgstr "Пользователи"
 
-#: prefs.php:129 tt-rss.php:82
+#: prefs.php:130 tt-rss.php:82
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -913,7 +913,7 @@ msgstr ""
 msgid "Actions..."
 msgstr "Действия..."
 
-#: tt-rss.php:135 modules/popup-dialog.php:111 modules/popup-dialog.php:180
+#: tt-rss.php:135 modules/popup-dialog.php:117 modules/popup-dialog.php:186
 #: modules/pref-feeds.php:759
 msgid "Search"
 msgstr "Поиск"
@@ -958,7 +958,7 @@ msgstr "Другие действия:"
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:160 modules/popup-dialog.php:123
+#: tt-rss.php:160 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "Искать:"
 
@@ -1125,131 +1125,131 @@ msgstr "URL канала:"
 msgid "Category:"
 msgstr "Категория:"
 
-#: modules/popup-dialog.php:86
-msgid "Click here if this feed requires authentication."
-msgstr ""
-
 #: modules/popup-dialog.php:101 modules/pref-feed-browser.php:107
 #: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: modules/popup-dialog.php:104 modules/popup-dialog.php:183
-#: modules/popup-dialog.php:235 modules/popup-dialog.php:322
-#: modules/popup-dialog.php:418 modules/pref-feeds.php:120
+#: modules/popup-dialog.php:104 modules/popup-dialog.php:189
+#: modules/popup-dialog.php:241 modules/popup-dialog.php:328
+#: modules/popup-dialog.php:424 modules/pref-feeds.php:120
 #: modules/pref-feeds.php:331 modules/pref-feeds.php:714
 #: modules/pref-filters.php:118 modules/pref-users.php:58
 msgid "Cancel"
 msgstr "Отмена"
 
-#: modules/popup-dialog.php:132
+#: modules/popup-dialog.php:110
+msgid "This feed requires authentication."
+msgstr ""
+
+#: modules/popup-dialog.php:138
 msgid "Where:"
 msgstr "Где:"
 
-#: modules/popup-dialog.php:148
+#: modules/popup-dialog.php:154
 msgid "This feed"
 msgstr "Этот канал"
 
-#: modules/popup-dialog.php:163
+#: modules/popup-dialog.php:169
 msgid "Match on:"
 msgstr "Искать по:"
 
-#: modules/popup-dialog.php:168
+#: modules/popup-dialog.php:174
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
-#: modules/popup-dialog.php:192 modules/pref-labels.php:216
+#: modules/popup-dialog.php:198 modules/pref-labels.php:216
 msgid "Create label"
 msgstr "Создать метку"
 
-#: modules/popup-dialog.php:202
+#: modules/popup-dialog.php:208
 msgid "Caption:"
 msgstr "Заголовок:"
 
-#: modules/popup-dialog.php:211
+#: modules/popup-dialog.php:217
 msgid "SQL Expression:"
 msgstr "SQL выражение:"
 
-#: modules/popup-dialog.php:224
+#: modules/popup-dialog.php:230
 msgid "Test"
 msgstr "Проверить"
 
-#: modules/popup-dialog.php:231 modules/popup-dialog.php:318
+#: modules/popup-dialog.php:237 modules/popup-dialog.php:324
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:244 modules/pref-filters.php:229
+#: modules/popup-dialog.php:250 modules/pref-filters.php:229
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: modules/popup-dialog.php:262 modules/popup-dialog.php:293
+#: modules/popup-dialog.php:268 modules/popup-dialog.php:299
 #: modules/pref-filters.php:40 modules/pref-filters.php:72
 msgid "description"
 msgstr ""
 
-#: modules/popup-dialog.php:267 modules/pref-filters.php:45
+#: modules/popup-dialog.php:273 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "Поиск:"
 
-#: modules/popup-dialog.php:273 modules/pref-filters.php:51
+#: modules/popup-dialog.php:279 modules/pref-filters.php:51
 msgid "On field:"
 msgstr "По полю:"
 
-#: modules/popup-dialog.php:278 modules/pref-filters.php:56
+#: modules/popup-dialog.php:284 modules/pref-filters.php:56
 msgid "Feed:"
 msgstr "Канал:"
 
-#: modules/popup-dialog.php:284 modules/pref-filters.php:62
+#: modules/popup-dialog.php:290 modules/pref-filters.php:62
 msgid "Action:"
 msgstr "Действие:"
 
-#: modules/popup-dialog.php:300 modules/pref-filters.php:79
+#: modules/popup-dialog.php:306 modules/pref-filters.php:79
 msgid "Params:"
 msgstr "Параметры:"
 
-#: modules/popup-dialog.php:304 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:310 modules/pref-feeds.php:283
 msgid "Options:"
 msgstr "Дополнительно:"
 
-#: modules/popup-dialog.php:307 modules/pref-filters.php:103
+#: modules/popup-dialog.php:313 modules/pref-filters.php:103
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: modules/popup-dialog.php:333
+#: modules/popup-dialog.php:339
 msgid "Update Errors"
 msgstr "Ошибки обновления"
 
-#: modules/popup-dialog.php:336
+#: modules/popup-dialog.php:342
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не было обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:355 modules/popup-dialog.php:442
+#: modules/popup-dialog.php:361 modules/popup-dialog.php:448
 msgid "Close"
 msgstr "Закрыть"
 
-#: modules/popup-dialog.php:364
+#: modules/popup-dialog.php:370
 msgid "Edit Tags"
 msgstr "Редактировать теги"
 
-#: modules/popup-dialog.php:369
+#: modules/popup-dialog.php:375
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:414 modules/pref-feeds.php:329
+#: modules/popup-dialog.php:420 modules/pref-feeds.php:329
 #: modules/pref-feeds.php:712 modules/pref-filters.php:114
 #: modules/pref-users.php:55
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/popup-dialog.php:427
+#: modules/popup-dialog.php:433
 msgid "Tag cloud"
 msgstr ""
 
-#: modules/popup-dialog.php:430
+#: modules/popup-dialog.php:436
 msgid "Showing most popular tags "
 msgstr ""
 
-#: modules/popup-dialog.php:431
+#: modules/popup-dialog.php:437
 msgid "browse more"
 msgstr ""
 

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 6b421a2219919e6e228c234d5ad0e3a4815a7143..e586b5f17ec458d15de8c84f17db7214ec55bfcb 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 ce294e6f224bdabaa5f1f20d54685dfaf04fadba..01053d5bb1881580847e8953784a50824a5180b3 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 23:38+0400\n"
+"POT-Creation-Date: 2007-08-12 00:43+0400\n"
 "PO-Revision-Date: 2007-06-10 11:56+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -141,168 +141,168 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2231 modules/popup-dialog.php:135
+#: functions.php:2236 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2260 functions.php:2299 functions.php:2623 functions.php:3407
-#: functions.php:3437 modules/pref-feeds.php:890
+#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3412
+#: functions.php:3442 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2289 functions.php:3247
+#: functions.php:2294 functions.php:3252
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2291 functions.php:3281
+#: functions.php:2296 functions.php:3286
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2309 functions.php:2645 functions.php:3258
+#: functions.php:2314 functions.php:2650 functions.php:3263
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2311 functions.php:2647 functions.php:3265
+#: functions.php:2316 functions.php:2652 functions.php:3270
 #, fuzzy
 msgid "Published articles"
 msgstr "星级文章"
 
-#: functions.php:2609 functions.php:2611
+#: functions.php:2614 functions.php:2616
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:2627 functions.php:2640 functions.php:2655
+#: functions.php:2632 functions.php:2645 functions.php:2660
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:2880
+#: functions.php:2885
 msgid "New headlines for last 24 hours, as of "
 msgstr "24小时最新头条,截至"
 
-#: functions.php:2924
+#: functions.php:2929
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr "由于您启用了Tiny Tiny RSS每日文摘，会收到此邮件。"
 
-#: functions.php:2926
+#: functions.php:2931
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr "若要退订,访问你的配置选项或联络管理员。\n"
 
-#: functions.php:3132 functions.php:3174 functions.php:4078
+#: functions.php:3137 functions.php:3179 functions.php:4085
 #: modules/pref-feeds.php:615 modules/pref-feeds.php:852
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3133 functions.php:3175 modules/pref-feeds.php:616
+#: functions.php:3138 functions.php:3180 modules/pref-feeds.php:616
 #: modules/pref-feeds.php:853 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "所有"
 
-#: functions.php:3134 functions.php:3138 functions.php:3176 functions.php:3179
+#: functions.php:3139 functions.php:3143 functions.php:3181 functions.php:3184
 #: tt-rss.php:172
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3135 functions.php:3177 modules/pref-feeds.php:617
+#: functions.php:3140 functions.php:3182 modules/pref-feeds.php:617
 #: modules/pref-feeds.php:854 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "无"
 
-#: functions.php:3137
+#: functions.php:3142
 #, fuzzy
 msgid "Toggle"
 msgstr "触发:"
 
-#: functions.php:3139 functions.php:3180 tt-rss.php:171
+#: functions.php:3144 functions.php:3185 tt-rss.php:171
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3140
+#: functions.php:3145
 msgid "Published"
 msgstr ""
 
-#: functions.php:3143 localized_schema.php:15
+#: functions.php:3148 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3144
+#: functions.php:3149
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3145
+#: functions.php:3150
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3153
+#: functions.php:3158
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3154
+#: functions.php:3159
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3155
+#: functions.php:3160
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3165 functions.php:3191
+#: functions.php:3170 functions.php:3196
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3179
+#: functions.php:3184
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3182
+#: functions.php:3187
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3183
+#: functions.php:3188
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3184 modules/pref-filters.php:263
+#: functions.php:3189 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3229
+#: functions.php:3234
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3479
+#: functions.php:3484
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:3496
+#: functions.php:3501
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:3718
+#: functions.php:3723
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:3767
+#: functions.php:3772
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:3836
+#: functions.php:3843
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:3898
+#: functions.php:3905
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4139
+#: functions.php:4148
 msgid "No articles found."
 msgstr "未找到文章。"
 
@@ -314,7 +314,7 @@ msgstr "显示Feed"
 msgid "display tags"
 msgstr "显示标签"
 
-#: localized_js.php:34 prefs.php:126 tt-rss.php:79
+#: localized_js.php:34 prefs.php:127 tt-rss.php:79
 msgid "Loading, please wait..."
 msgstr "读取中，请等待..."
 
@@ -550,7 +550,7 @@ msgstr ""
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_schema.php:9 modules/popup-dialog.php:166
+#: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
 msgid "Title"
 msgstr "标题"
@@ -565,7 +565,7 @@ msgstr "标题或内容"
 msgid "Link"
 msgstr "链接:"
 
-#: localized_schema.php:12 modules/popup-dialog.php:167
+#: localized_schema.php:12 modules/popup-dialog.php:173
 msgid "Content"
 msgstr "内容"
 
@@ -795,52 +795,52 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
-#: prefs.php:83
+#: prefs.php:84
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: prefs.php:89 tt-rss.php:112
+#: prefs.php:90 tt-rss.php:112
 msgid "Hello,"
 msgstr "你好,"
 
-#: prefs.php:90 tt-rss.php:113
+#: prefs.php:91 tt-rss.php:113
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:98
+#: prefs.php:99
 msgid "Exit preferences"
 msgstr "退出我的最爱"
 
-#: prefs.php:104 tt-rss.php:136
+#: prefs.php:105 tt-rss.php:136
 msgid "Preferences"
 msgstr "我的最爱"
 
-#: prefs.php:106
+#: prefs.php:107
 msgid "My Feeds"
 msgstr "我的feed"
 
-#: prefs.php:109
+#: prefs.php:110
 msgid "Other Feeds"
 msgstr "其他feed"
 
-#: prefs.php:112
+#: prefs.php:113
 #, fuzzy
 msgid "Published Articles"
 msgstr "所有文章"
 
-#: prefs.php:114
+#: prefs.php:115
 msgid "Content Filtering"
 msgstr "内容过滤器"
 
-#: prefs.php:117
+#: prefs.php:118
 msgid "Label Editor"
 msgstr "标记编辑"
 
-#: prefs.php:121
+#: prefs.php:122
 msgid "User Manager"
 msgstr "用户管理"
 
-#: prefs.php:129 tt-rss.php:82
+#: prefs.php:130 tt-rss.php:82
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -924,7 +924,7 @@ msgstr "标签簇"
 msgid "Actions..."
 msgstr "激活..."
 
-#: tt-rss.php:135 modules/popup-dialog.php:111 modules/popup-dialog.php:180
+#: tt-rss.php:135 modules/popup-dialog.php:117 modules/popup-dialog.php:186
 #: modules/pref-feeds.php:759
 msgid "Search"
 msgstr "搜索"
@@ -969,7 +969,7 @@ msgstr "其他操作:"
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:160 modules/popup-dialog.php:123
+#: tt-rss.php:160 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "搜索:"
 
@@ -1143,131 +1143,131 @@ msgstr "Feed URL:"
 msgid "Category:"
 msgstr "分类:"
 
-#: modules/popup-dialog.php:86
-msgid "Click here if this feed requires authentication."
-msgstr ""
-
 #: modules/popup-dialog.php:101 modules/pref-feed-browser.php:107
 #: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr "订阅"
 
-#: modules/popup-dialog.php:104 modules/popup-dialog.php:183
-#: modules/popup-dialog.php:235 modules/popup-dialog.php:322
-#: modules/popup-dialog.php:418 modules/pref-feeds.php:120
+#: modules/popup-dialog.php:104 modules/popup-dialog.php:189
+#: modules/popup-dialog.php:241 modules/popup-dialog.php:328
+#: modules/popup-dialog.php:424 modules/pref-feeds.php:120
 #: modules/pref-feeds.php:331 modules/pref-feeds.php:714
 #: modules/pref-filters.php:118 modules/pref-users.php:58
 msgid "Cancel"
 msgstr "取消"
 
-#: modules/popup-dialog.php:132
+#: modules/popup-dialog.php:110
+msgid "This feed requires authentication."
+msgstr ""
+
+#: modules/popup-dialog.php:138
 msgid "Where:"
 msgstr "地点:"
 
-#: modules/popup-dialog.php:148
+#: modules/popup-dialog.php:154
 msgid "This feed"
 msgstr "本feed"
 
-#: modules/popup-dialog.php:163
+#: modules/popup-dialog.php:169
 msgid "Match on:"
 msgstr "匹配:"
 
-#: modules/popup-dialog.php:168
+#: modules/popup-dialog.php:174
 msgid "Title or content"
 msgstr "标题或内容"
 
-#: modules/popup-dialog.php:192 modules/pref-labels.php:216
+#: modules/popup-dialog.php:198 modules/pref-labels.php:216
 msgid "Create label"
 msgstr "创建标记"
 
-#: modules/popup-dialog.php:202
+#: modules/popup-dialog.php:208
 msgid "Caption:"
 msgstr "说明:"
 
-#: modules/popup-dialog.php:211
+#: modules/popup-dialog.php:217
 msgid "SQL Expression:"
 msgstr "SQL 表达式:"
 
-#: modules/popup-dialog.php:224
+#: modules/popup-dialog.php:230
 msgid "Test"
 msgstr "测试"
 
-#: modules/popup-dialog.php:231 modules/popup-dialog.php:318
+#: modules/popup-dialog.php:237 modules/popup-dialog.php:324
 msgid "Create"
 msgstr "创建"
 
-#: modules/popup-dialog.php:244 modules/pref-filters.php:229
+#: modules/popup-dialog.php:250 modules/pref-filters.php:229
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: modules/popup-dialog.php:262 modules/popup-dialog.php:293
+#: modules/popup-dialog.php:268 modules/popup-dialog.php:299
 #: modules/pref-filters.php:40 modules/pref-filters.php:72
 msgid "description"
 msgstr ""
 
-#: modules/popup-dialog.php:267 modules/pref-filters.php:45
+#: modules/popup-dialog.php:273 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "匹配："
 
-#: modules/popup-dialog.php:273 modules/pref-filters.php:51
+#: modules/popup-dialog.php:279 modules/pref-filters.php:51
 msgid "On field:"
 msgstr "于:"
 
-#: modules/popup-dialog.php:278 modules/pref-filters.php:56
+#: modules/popup-dialog.php:284 modules/pref-filters.php:56
 msgid "Feed:"
 msgstr "Feed:"
 
-#: modules/popup-dialog.php:284 modules/pref-filters.php:62
+#: modules/popup-dialog.php:290 modules/pref-filters.php:62
 msgid "Action:"
 msgstr "操作:"
 
-#: modules/popup-dialog.php:300 modules/pref-filters.php:79
+#: modules/popup-dialog.php:306 modules/pref-filters.php:79
 msgid "Params:"
 msgstr "参数:"
 
-#: modules/popup-dialog.php:304 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:310 modules/pref-feeds.php:283
 msgid "Options:"
 msgstr "选项:"
 
-#: modules/popup-dialog.php:307 modules/pref-filters.php:103
+#: modules/popup-dialog.php:313 modules/pref-filters.php:103
 msgid "Inverse match"
 msgstr "逆匹配"
 
-#: modules/popup-dialog.php:333
+#: modules/popup-dialog.php:339
 msgid "Update Errors"
 msgstr "更新错误"
 
-#: modules/popup-dialog.php:336
+#: modules/popup-dialog.php:342
 msgid "These feeds have not been updated because of errors:"
 msgstr "这些feed更新错误:"
 
-#: modules/popup-dialog.php:355 modules/popup-dialog.php:442
+#: modules/popup-dialog.php:361 modules/popup-dialog.php:448
 msgid "Close"
 msgstr "关闭"
 
-#: modules/popup-dialog.php:364
+#: modules/popup-dialog.php:370
 msgid "Edit Tags"
 msgstr "编辑标签"
 
-#: modules/popup-dialog.php:369
+#: modules/popup-dialog.php:375
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:414 modules/pref-feeds.php:329
+#: modules/popup-dialog.php:420 modules/pref-feeds.php:329
 #: modules/pref-feeds.php:712 modules/pref-filters.php:114
 #: modules/pref-users.php:55
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:427
+#: modules/popup-dialog.php:433
 msgid "Tag cloud"
 msgstr "标签簇"
 
-#: modules/popup-dialog.php:430
+#: modules/popup-dialog.php:436
 msgid "Showing most popular tags "
 msgstr "显示最热标签"
 
-#: modules/popup-dialog.php:431
+#: modules/popup-dialog.php:437
 #, fuzzy
 msgid "browse more"
 msgstr "浏览所有"

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 498514b083f1a7f0e0a46d0107096e684aebeee7..518252a9f22f41ab558eca4478599797a5cd42c9 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -81,11 +81,11 @@
 
                        print "</table>";
 
-                       print "<div id='fadd_login_prompt'><br/>
-                               <a href='javascript:showBlockElement(\"fadd_login_container\", 
-                                       \"fadd_login_prompt\")'>".__('Click here if this feed requires authentication.')."</a></div>";
+/*                     print "<div id='fadd_login_prompt'><br/>
+                               <a href='javascript:appearBlockElement(\"fadd_login_container\", 
+                               \"fadd_login_prompt\")'>".__('Click here if this feed requires authentication.')."</a></div>"; */
 
-                       print "<div id='fadd_login_container'>
+                       print "<div id='fadd_login_container' style='display:none'>
                                <table width='100%'>
                                        <tr><td>".__('Login:')."</td><td><input name='auth_login' class='iedit'></td></tr>
                                        <tr><td>".__('Password:')."</td><td><input type='password'
@@ -95,13 +95,19 @@
 
                        print "</form>";
 
-                       print "<div align='right'>
+                       print "<div style='float : right'>
                                <input class=\"button\"
                                        id=\"fadd_submit_btn\" disabled=\"true\"
                                        type=\"submit\" onclick=\"return qaddFeed()\" value=\"".__('Subscribe')."\">
                                <input class=\"button\"
                                        type=\"submit\" onclick=\"return closeInfoBox()\" 
-                                       value=\"".__('Cancel')."\"></div>";
+                                       value=\"".__('Cancel')."\"></div>
+                                       
+                               <div>
+                                       <input type=\"checkbox\" id=\"fadd_login_check\" 
+                                               onclick='checkboxToggleElement(this, \"fadd_login_container\")'>
+                                       <label for=\"fadd_login_check\">".
+                                       __('This feed requires authentication.')."</div>";
 
                        return;
                }

diff --git a/tt-rss.css b/tt-rss.css
index c7b3048ec318653699383ff1f7773448af4f17e4..36ae4b1a6943f9a39e658f6771df3c07d3492558 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1639,7 +1639,6 @@ a.helpLinkPic img {
 }
 
 #fadd_login_container {
-       display : none;
 }
 
 li.feedCatHolder {