more translation work

diff --git a/functions.js b/functions.js
index 11f3cf39dc7915cb93c86495a29519a5ab48d7ce..4798c3c20db266034ef254135bcb7c8626ee837a 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1518,7 +1518,7 @@ function addFilter() {
        var reg_exp = form.reg_exp.value;
 
        if (reg_exp == "") {
-               alert("Can't add filter: nothing to match on.");
+               alert(__("Can't add filter: nothing to match on."));
                return false;
        }
 
@@ -1554,7 +1554,7 @@ function qaddFeed() {
        var feed_url = form.feed_url.value;
 
        if (feed_url == "") {
-               alert("Can't subscribe: no feed URL given.");
+               alert(__("Can't subscribe: no feed URL given."));
                return false;
        }
 

diff --git a/functions.php b/functions.php
index 25a8913a3c4813449f51397b49734ae1cec20651..7c162be12f08429f5e98d1a91cad1f80b85d47ca 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -16,7 +16,11 @@
        
                        # Get locale from Accept-Language header
                        $lang = al2gt(array("en_US", "ru_RU", "zh_CN", "fr_FR"), "text/html");
-       
+
+                       if (defined('_TRANSLATION_OVERRIDE_DEFAULT')) {
+                               $lang = _TRANSLATION_OVERRIDE_DEFAULT;
+                       }
+
                        if ($lang) {
                                _setlocale(LC_MESSAGES, $lang);
                                _bindtextdomain("messages", "locale");
@@ -2207,7 +2211,7 @@
 
                print "<select id=\"$id\" name=\"$id\" $attributes>";
                if ($include_all_feeds) { 
-                       print "<option value=\"0\">All feeds</option>";
+                       print "<option value=\"0\">".__('All feeds')."</option>";
                }
        
                $result = db_query($link, "SELECT id,title FROM ttrss_feeds
@@ -3113,7 +3117,7 @@
                                                <a href=\"$sel_unread_link\">".__('Unread')."</a>,
                                                <a href=\"$sel_none_link\">".__('None')."</a></li>
                                        <li class=\"vsep\">&nbsp;</li>
-                                       <li class=\"top\">Toggle<ul>
+                                       <li class=\"top\">".__('Toggle')."<ul>
                                                <li onclick=\"$tog_unread_link\">".__('Unread')."</li>
                                                <li onclick=\"$tog_marked_link\">".__('Starred')."</li>
                                                <li onclick=\"$tog_published_link\">".__('Published')."</li>

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 62d4760a3e9470b4aa3d9acc7c954f3d5c255f27..85b739482da897841bd3aa5d379b32c32fdcbe85 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 d10dccf157b1ba080ac720dbbe4703eef61bee7a..a5af8f6aaf6ba46bd252952cf53b02ed45df759d 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-10 23:25+0400\n"
+"POT-Creation-Date: 2007-08-11 00:14+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,40 +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:2239 functions.php:2278 functions.php:2602 functions.php:3386
-#: functions.php:3416 modules/pref-feeds.php:890
+#: functions.php:2214 modules/popup-dialog.php:135
+#: modules/pref-filters.php:290
+msgid "All feeds"
+msgstr "Tous les flux"
+
+#: functions.php:2243 functions.php:2282 functions.php:2606 functions.php:3390
+#: functions.php:3420 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2268 functions.php:3226
+#: functions.php:2272 functions.php:3230
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2270 functions.php:3260
+#: functions.php:2274 functions.php:3264
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2288 functions.php:2624 functions.php:3237
+#: functions.php:2292 functions.php:2628 functions.php:3241
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2290 functions.php:2626 functions.php:3244
+#: functions.php:2294 functions.php:2630 functions.php:3248
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2588 functions.php:2590
+#: functions.php:2592 functions.php:2594
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:2606 functions.php:2619 functions.php:2634
+#: functions.php:2610 functions.php:2623 functions.php:2638
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:2859
+#: functions.php:2863
 msgid "New headlines for last 24 hours, as of "
 msgstr "Nouveaux en-têtes dans les dernières 24 heures, à compter de "
 
-#: functions.php:2903
+#: functions.php:2907
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
@@ -187,118 +192,122 @@ msgstr ""
 "Vous recevez ce courrier électronique parce que vous avez activé la synthèse "
 "quotidienne dans TIny Tiny RSS sur "
 
-#: functions.php:2905
+#: functions.php:2909
 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:3111 functions.php:3153 functions.php:4053
+#: functions.php:3115 functions.php:3157 functions.php:4057
 #: 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:3112 functions.php:3154 modules/pref-feeds.php:616
+#: functions.php:3116 functions.php:3158 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:3113 functions.php:3117 functions.php:3155 functions.php:3158
+#: functions.php:3117 functions.php:3121 functions.php:3159 functions.php:3162
 #: tt-rss.php:172
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3114 functions.php:3156 modules/pref-feeds.php:617
+#: functions.php:3118 functions.php:3160 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:3118 functions.php:3159 tt-rss.php:171
+#: functions.php:3120
+msgid "Toggle"
+msgstr "Marquages spéciaux&nbsp;"
+
+#: functions.php:3122 functions.php:3163 tt-rss.php:171
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3119
+#: functions.php:3123
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3122
+#: functions.php:3126
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3123
+#: functions.php:3127
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3124
+#: functions.php:3128
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3132
+#: functions.php:3136
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3133
+#: functions.php:3137
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3134
+#: functions.php:3138
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3144 functions.php:3170
+#: functions.php:3148 functions.php:3174
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3158
+#: functions.php:3162
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3161
+#: functions.php:3165
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3162
+#: functions.php:3166
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3163 modules/pref-filters.php:263
+#: functions.php:3167 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3208
+#: functions.php:3212
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3458
+#: functions.php:3462
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:3475
+#: functions.php:3479
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:3697
+#: functions.php:3701
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:3742
+#: functions.php:3746
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:3754
+#: functions.php:3758
 msgid "Tags:"
 msgstr "Étiquettes&nbsp,:"
 
-#: functions.php:3811
+#: functions.php:3815
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:3873
+#: functions.php:3877
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -306,7 +315,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:4114
+#: functions.php:4118
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
@@ -350,7 +359,7 @@ msgstr "Impossible d'ajouter une catégorie&nbsp;: aucun nom fourni."
 msgid "Adding feed category..."
 msgstr "Ajout d'une catégorie de flux..."
 
-#: localized_js.php:42
+#: localized_js.php:42 localized_js.php:101
 msgid "Can't add user: no login specified."
 msgstr "Impossible d'ajouter un utilisateur&nbsp;: aucun nom fourni."
 
@@ -358,11 +367,11 @@ msgstr "Impossible d'ajouter un utilisateur&nbsp;: aucun nom fourni."
 msgid "Adding user..."
 msgstr "Ajout d'un utilisateur..."
 
-#: localized_js.php:45
+#: localized_js.php:45 localized_js.php:99
 msgid "Can't create label: missing SQL expression."
 msgstr "Impossible de créer un intitulé&nbsp;: expression SQL manquante."
 
-#: localized_js.php:46
+#: localized_js.php:46 localized_js.php:100
 msgid "Can't create label: missing caption."
 msgstr "Impossible de créer un intitulé&nbsp;: descriptif manquant."
 
@@ -374,7 +383,7 @@ msgstr "Supprimer les intitulés sélectionnés&nbsp;?"
 msgid "Removing selected labels..."
 msgstr "Suppression des intitulés sélectionnés..."
 
-#: localized_js.php:49 localized_js.php:68
+#: localized_js.php:49 localized_js.php:68 localized_js.php:102
 msgid "No labels are selected."
 msgstr "Aucun intitulé sélectionné."
 
@@ -387,6 +396,7 @@ msgid "Removing selected users..."
 msgstr "Suppression des utilisateurs sélectionnés..."
 
 #: localized_js.php:52 localized_js.php:70 localized_js.php:72
+#: localized_js.php:103
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
@@ -398,7 +408,7 @@ msgstr "Supprimer les filtres sélectionnés&nbsp;?"
 msgid "Removing selected filters..."
 msgstr "Suppression des filtres sélectionnés..."
 
-#: localized_js.php:55 localized_js.php:78
+#: localized_js.php:55 localized_js.php:78 localized_js.php:104
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
@@ -411,6 +421,7 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "Désinscription des flux sélectionnés..."
 
 #: localized_js.php:58 localized_js.php:76 localized_js.php:80
+#: localized_js.php:105 localized_js.php:108
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
@@ -422,7 +433,7 @@ msgstr "Supprimer les catégories sélectionnées&nbsp;?"
 msgid "Removing selected categories..."
 msgstr "Suppression des catégories sélectionnées..."
 
-#: localized_js.php:61 localized_js.php:82
+#: localized_js.php:61 localized_js.php:82 localized_js.php:106
 msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 
@@ -438,7 +449,7 @@ msgstr "Ouverture de l'aide..."
 msgid "Saving label..."
 msgstr "Enregistrement de l'intitulé..."
 
-#: localized_js.php:65
+#: localized_js.php:65 localized_js.php:107
 msgid "Login field cannot be blank."
 msgstr "Le nom ne peut pas être vide."
 
@@ -530,11 +541,52 @@ msgstr "Adresse modifiée."
 msgid "Could not change address."
 msgstr "Impossible de changer l'adresse."
 
-#: login_form.php:49 modules/pref-feeds.php:264 modules/pref-users.php:29
+#: localized_js.php:96
+msgid "You can't unsubscribe from the category."
+msgstr ""
+
+#: localized_js.php:97
+#, fuzzy
+msgid "Please select some feed first."
+msgstr "Veuillez sélectionner un flux."
+
+#: localized_js.php:98
+msgid "You can't edit this kind of feed."
+msgstr ""
+
+#: localized_js.php:109
+msgid "Can't add filter: nothing to match on."
+msgstr ""
+
+#: localized_js.php:110
+msgid "Can't subscribe: no feed URL given."
+msgstr ""
+
+#: localized_schema.php:5 modules/popup-dialog.php:166
+#: modules/pref-feeds.php:865 modules/pref-feeds.php:926
+msgid "Title"
+msgstr "Titre"
+
+#: localized_schema.php:6
+#, fuzzy
+msgid "Title or Content"
+msgstr "Titre ou contenu"
+
+#: localized_schema.php:7
+#, fuzzy
+msgid "Link"
+msgstr "Lier à&nbsp;:"
+
+#: localized_schema.php:8 modules/popup-dialog.php:167
+msgid "Content"
+msgstr "Contenu"
+
+#: login_form.php:49 modules/popup-dialog.php:90 modules/pref-feeds.php:264
+#: modules/pref-users.php:29
 msgid "Login:"
 msgstr "Nom&nbsp;:"
 
-#: login_form.php:51 modules/pref-feeds.php:270
+#: login_form.php:51 modules/popup-dialog.php:91 modules/pref-feeds.php:270
 msgid "Password:"
 msgstr "Mot de passe&nbsp;:"
 
@@ -921,10 +973,18 @@ msgstr ""
 msgid "Subscribe to feed"
 msgstr "S'inscrire à un flux"
 
+#: modules/popup-dialog.php:62 modules/pref-feeds.php:165
+msgid "Feed URL:"
+msgstr "URL du flux&nbsp;:"
+
 #: modules/popup-dialog.php:70 modules/pref-feeds.php:173
 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"
@@ -942,10 +1002,6 @@ msgstr "Annuler"
 msgid "Where:"
 msgstr "Emplacement&nbsp;:"
 
-#: modules/popup-dialog.php:135 modules/pref-filters.php:290
-msgid "All feeds"
-msgstr "Tous les flux"
-
 #: modules/popup-dialog.php:148
 msgid "This feed"
 msgstr "Ce flux"
@@ -954,15 +1010,6 @@ msgstr "Ce flux"
 msgid "Match on:"
 msgstr "Correspondance sur&nbsp;:"
 
-#: modules/popup-dialog.php:166 modules/pref-feeds.php:865
-#: modules/pref-feeds.php:926
-msgid "Title"
-msgstr "Titre"
-
-#: modules/popup-dialog.php:167
-msgid "Content"
-msgstr "Contenu"
-
 #: modules/popup-dialog.php:168
 msgid "Title or content"
 msgstr "Titre ou contenu"
@@ -991,6 +1038,11 @@ msgstr "Créer"
 msgid "Create filter"
 msgstr "Créer un filtre"
 
+#: modules/popup-dialog.php:262 modules/popup-dialog.php:293
+#: modules/pref-filters.php:40 modules/pref-filters.php:72
+msgid "description"
+msgstr ""
+
 #: modules/popup-dialog.php:267 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
@@ -1057,6 +1109,20 @@ msgstr "Affichage des étiquettes les plus populaires "
 msgid "browse more"
 msgstr "en afficher plus"
 
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
+msgid "Feed browser is administratively disabled."
+msgstr "Le navigateur de flux a été désactivé par l'administrateur."
+
+#: modules/pref-feed-browser.php:15
+#, fuzzy
+msgid "Feed information:"
+msgstr "Actions sur ce flux&nbsp;:"
+
+#: modules/pref-feed-browser.php:51
+#, fuzzy
+msgid "Last headlines:"
+msgstr "Dernière connexion"
+
 #: modules/pref-feed-browser.php:77
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
@@ -1073,14 +1139,14 @@ msgstr "Top"
 msgid "Show"
 msgstr "Afficher"
 
+#: modules/pref-feed-browser.php:152 modules/pref-feeds.php:111
+msgid "No feeds found to subscribe."
+msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
+
 #: modules/pref-feeds.php:38
 msgid "Subscribed to feeds:"
 msgstr "Inscrit aux flux&nbsp;:"
 
-#: modules/pref-feeds.php:53
-msgid "Feed browser is administratively disabled."
-msgstr "Le navigateur de flux a été désactivé par l'administrateur."
-
 #: modules/pref-feeds.php:57
 msgid "Other feeds: Top 25"
 msgstr "Autres flux&nbsp;: Top 25"
@@ -1090,10 +1156,6 @@ msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr ""
 "Affichage des 25 meilleurs flux enregistrés, classés par popularité&nbsp;:"
 
-#: modules/pref-feeds.php:111
-msgid "No feeds found to subscribe."
-msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
-
 #: modules/pref-feeds.php:145
 msgid "Feed editor"
 msgstr "Éditeur de flux"
@@ -1102,10 +1164,6 @@ msgstr "Éditeur de flux"
 msgid "Title:"
 msgstr "Titre&nbsp;:"
 
-#: modules/pref-feeds.php:165
-msgid "Feed URL:"
-msgstr "URL du flux&nbsp;:"
-
 #: modules/pref-feeds.php:193
 msgid "Update Interval:"
 msgstr "Fréquence de mise à jour&nbsp;:"
@@ -1322,6 +1380,15 @@ msgstr "Le mot de passe a été modifié."
 msgid "Old password is incorrect."
 msgstr "L'ancien mot de passe n'est pas correct."
 
+#: modules/pref-prefs.php:59 modules/pref-prefs.php:388
+#, fuzzy
+msgid "Save configuration"
+msgstr "La configuration a été enregistrée."
+
+#: modules/pref-prefs.php:127 modules/pref-prefs.php:392
+msgid "Reset to defaults"
+msgstr "Revenir aux valeurs par défaut"
+
 #: modules/pref-prefs.php:185
 msgid ""
 "Your password is at default value, \n"
@@ -1374,6 +1441,19 @@ msgstr "Thèmes"
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
+#: modules/pref-prefs.php:285
+msgid "Default"
+msgstr "Utiliser la valeur par défaut"
+
+#: modules/pref-prefs.php:301
+#, fuzzy
+msgid "Change theme"
+msgstr "Modifier l'adresse électronique"
+
+#: modules/pref-prefs.php:353
+msgid "short_desc"
+msgstr ""
+
 #: modules/pref-users.php:12
 msgid "User editor"
 msgstr "Éditeur d'utilisateur"

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 4e1ad740921c396908975d44838c2a572d0cdabd..39e8976a1bcfefab6b7f4a7e4e31b2b496b24d90 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 f19cf6f5a9161b7dbe9b86356dc5a94281fbadd9..d35df99424ce94b16ef0aef85b33ba7af0e837b4 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-10 23:25+0400\n"
+"POT-Creation-Date: 2007-08-11 00:14+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,162 +140,172 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2239 functions.php:2278 functions.php:2602 functions.php:3386
-#: functions.php:3416 modules/pref-feeds.php:890
+#: functions.php:2214 modules/popup-dialog.php:135
+#: modules/pref-filters.php:290
+msgid "All feeds"
+msgstr "Все каналы"
+
+#: functions.php:2243 functions.php:2282 functions.php:2606 functions.php:3390
+#: functions.php:3420 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2268 functions.php:3226
+#: functions.php:2272 functions.php:3230
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2270 functions.php:3260
+#: functions.php:2274 functions.php:3264
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2288 functions.php:2624 functions.php:3237
+#: functions.php:2292 functions.php:2628 functions.php:3241
 msgid "Starred articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2290 functions.php:2626 functions.php:3244
+#: functions.php:2294 functions.php:2630 functions.php:3248
 #, fuzzy
 msgid "Published articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2588 functions.php:2590
+#: functions.php:2592 functions.php:2594
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2606 functions.php:2619 functions.php:2634
+#: functions.php:2610 functions.php:2623 functions.php:2638
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:2859
+#: functions.php:2863
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:2903
+#: functions.php:2907
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:2905
+#: functions.php:2909
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3111 functions.php:3153 functions.php:4053
+#: functions.php:3115 functions.php:3157 functions.php:4057
 #: 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:3112 functions.php:3154 modules/pref-feeds.php:616
+#: functions.php:3116 functions.php:3158 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:3113 functions.php:3117 functions.php:3155 functions.php:3158
+#: functions.php:3117 functions.php:3121 functions.php:3159 functions.php:3162
 #: tt-rss.php:172
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3114 functions.php:3156 modules/pref-feeds.php:617
+#: functions.php:3118 functions.php:3160 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:3118 functions.php:3159 tt-rss.php:171
+#: functions.php:3120
+#, fuzzy
+msgid "Toggle"
+msgstr "Изменить:"
+
+#: functions.php:3122 functions.php:3163 tt-rss.php:171
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3119
+#: functions.php:3123
 msgid "Published"
 msgstr ""
 
-#: functions.php:3122
+#: functions.php:3126
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3123
+#: functions.php:3127
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3124
+#: functions.php:3128
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3132
+#: functions.php:3136
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3133
+#: functions.php:3137
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3134
+#: functions.php:3138
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3144 functions.php:3170
+#: functions.php:3148 functions.php:3174
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3158
+#: functions.php:3162
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3161
+#: functions.php:3165
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3162
+#: functions.php:3166
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3163 modules/pref-filters.php:263
+#: functions.php:3167 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3208
+#: functions.php:3212
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3458
+#: functions.php:3462
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3475
+#: functions.php:3479
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:3697
+#: functions.php:3701
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:3742
+#: functions.php:3746
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:3754
+#: functions.php:3758
 msgid "Tags:"
 msgstr "Теги:"
 
-#: functions.php:3811
+#: functions.php:3815
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:3873
+#: functions.php:3877
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4114
+#: functions.php:4118
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -339,7 +349,7 @@ msgstr ""
 msgid "Adding feed category..."
 msgstr "Категория добавляется..."
 
-#: localized_js.php:42
+#: localized_js.php:42 localized_js.php:101
 msgid "Can't add user: no login specified."
 msgstr ""
 
@@ -347,11 +357,11 @@ msgstr ""
 msgid "Adding user..."
 msgstr "Пользователь добавляется..."
 
-#: localized_js.php:45
+#: localized_js.php:45 localized_js.php:99
 msgid "Can't create label: missing SQL expression."
 msgstr ""
 
-#: localized_js.php:46
+#: localized_js.php:46 localized_js.php:100
 msgid "Can't create label: missing caption."
 msgstr ""
 
@@ -363,7 +373,7 @@ msgstr "Удалить выбранные метки?"
 msgid "Removing selected labels..."
 msgstr "Выбранные метки удаляются..."
 
-#: localized_js.php:49 localized_js.php:68
+#: localized_js.php:49 localized_js.php:68 localized_js.php:102
 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
@@ -376,6 +386,7 @@ msgid "Removing selected users..."
 msgstr "Выбранные пользователи удаляются..."
 
 #: localized_js.php:52 localized_js.php:70 localized_js.php:72
+#: localized_js.php:103
 msgid "No users are selected."
 msgstr "Нет выбранных пользователей."
 
@@ -387,7 +398,7 @@ msgstr "Удалить выбраннфе фильтры?"
 msgid "Removing selected filters..."
 msgstr "Выбранные фильтры удаляются..."
 
-#: localized_js.php:55 localized_js.php:78
+#: localized_js.php:55 localized_js.php:78 localized_js.php:104
 msgid "No filters are selected."
 msgstr "Нет выбранных фильтров."
 
@@ -400,6 +411,7 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "Выбранные каналы удаляются..."
 
 #: localized_js.php:58 localized_js.php:76 localized_js.php:80
+#: localized_js.php:105 localized_js.php:108
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
@@ -411,7 +423,7 @@ msgstr "Удалить выбранные категории?"
 msgid "Removing selected categories..."
 msgstr "Выбранные категории удаляются..."
 
-#: localized_js.php:61 localized_js.php:82
+#: localized_js.php:61 localized_js.php:82 localized_js.php:106
 msgid "No categories are selected."
 msgstr "Нет выбранных категорий."
 
@@ -427,7 +439,7 @@ msgstr "Идет загрузка помощи..."
 msgid "Saving label..."
 msgstr "Идет сохранение метки..."
 
-#: localized_js.php:65
+#: localized_js.php:65 localized_js.php:107
 msgid "Login field cannot be blank."
 msgstr ""
 
@@ -519,11 +531,52 @@ msgstr ""
 msgid "Could not change address."
 msgstr ""
 
-#: login_form.php:49 modules/pref-feeds.php:264 modules/pref-users.php:29
+#: localized_js.php:96
+msgid "You can't unsubscribe from the category."
+msgstr ""
+
+#: localized_js.php:97
+#, fuzzy
+msgid "Please select some feed first."
+msgstr "Пожалуйста выберите только один канал."
+
+#: localized_js.php:98
+msgid "You can't edit this kind of feed."
+msgstr ""
+
+#: localized_js.php:109
+msgid "Can't add filter: nothing to match on."
+msgstr ""
+
+#: localized_js.php:110
+msgid "Can't subscribe: no feed URL given."
+msgstr ""
+
+#: localized_schema.php:5 modules/popup-dialog.php:166
+#: modules/pref-feeds.php:865 modules/pref-feeds.php:926
+msgid "Title"
+msgstr "Заголовок"
+
+#: localized_schema.php:6
+#, fuzzy
+msgid "Title or Content"
+msgstr "Заголовок или содержимое"
+
+#: localized_schema.php:7
+#, fuzzy
+msgid "Link"
+msgstr "Связать с:"
+
+#: localized_schema.php:8 modules/popup-dialog.php:167
+msgid "Content"
+msgstr "Содержимое"
+
+#: login_form.php:49 modules/popup-dialog.php:90 modules/pref-feeds.php:264
+#: modules/pref-users.php:29
 msgid "Login:"
 msgstr "Пользователь:"
 
-#: login_form.php:51 modules/pref-feeds.php:270
+#: login_form.php:51 modules/popup-dialog.php:91 modules/pref-feeds.php:270
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -871,10 +924,18 @@ msgstr ""
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
+#: modules/popup-dialog.php:62 modules/pref-feeds.php:165
+msgid "Feed URL:"
+msgstr "URL канала:"
+
 #: modules/popup-dialog.php:70 modules/pref-feeds.php:173
 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"
@@ -892,10 +953,6 @@ msgstr "Отмена"
 msgid "Where:"
 msgstr "Где:"
 
-#: modules/popup-dialog.php:135 modules/pref-filters.php:290
-msgid "All feeds"
-msgstr "Все каналы"
-
 #: modules/popup-dialog.php:148
 msgid "This feed"
 msgstr "Этот канал"
@@ -904,15 +961,6 @@ msgstr "Этот канал"
 msgid "Match on:"
 msgstr "Искать по:"
 
-#: modules/popup-dialog.php:166 modules/pref-feeds.php:865
-#: modules/pref-feeds.php:926
-msgid "Title"
-msgstr "Заголовок"
-
-#: modules/popup-dialog.php:167
-msgid "Content"
-msgstr "Содержимое"
-
 #: modules/popup-dialog.php:168
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
@@ -941,6 +989,11 @@ msgstr "Создать"
 msgid "Create filter"
 msgstr "Создать фильтр"
 
+#: modules/popup-dialog.php:262 modules/popup-dialog.php:293
+#: modules/pref-filters.php:40 modules/pref-filters.php:72
+msgid "description"
+msgstr ""
+
 #: modules/popup-dialog.php:267 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "Поиск:"
@@ -1007,6 +1060,20 @@ msgstr ""
 msgid "browse more"
 msgstr ""
 
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
+msgid "Feed browser is administratively disabled."
+msgstr "Другие каналы отключены администратором"
+
+#: modules/pref-feed-browser.php:15
+#, fuzzy
+msgid "Feed information:"
+msgstr "Действия над каналами:"
+
+#: modules/pref-feed-browser.php:51
+#, fuzzy
+msgid "Last headlines:"
+msgstr "Последний вход"
+
 #: modules/pref-feed-browser.php:77
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
@@ -1021,14 +1088,14 @@ msgstr "Топ"
 msgid "Show"
 msgstr "Показать"
 
+#: modules/pref-feed-browser.php:152 modules/pref-feeds.php:111
+msgid "No feeds found to subscribe."
+msgstr "Каналы для подписки не найдены."
+
 #: modules/pref-feeds.php:38
 msgid "Subscribed to feeds:"
 msgstr "Подписаны каналы:"
 
-#: modules/pref-feeds.php:53
-msgid "Feed browser is administratively disabled."
-msgstr "Другие каналы отключены администратором"
-
 #: modules/pref-feeds.php:57
 msgid "Other feeds: Top 25"
 msgstr "Топ 25 каналов"
@@ -1037,10 +1104,6 @@ msgstr "Топ 25 каналов"
 msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "Топ 25 популярных каналов:"
 
-#: modules/pref-feeds.php:111
-msgid "No feeds found to subscribe."
-msgstr "Каналы для подписки не найдены."
-
 #: modules/pref-feeds.php:145
 msgid "Feed editor"
 msgstr "Редактор канала"
@@ -1049,10 +1112,6 @@ msgstr "Редактор канала"
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: modules/pref-feeds.php:165
-msgid "Feed URL:"
-msgstr "URL канала:"
-
 #: modules/pref-feeds.php:193
 msgid "Update Interval:"
 msgstr "Интервал обновления:"
@@ -1265,6 +1324,16 @@ msgstr "Пароль был изменен."
 msgid "Old password is incorrect."
 msgstr "Старый пароль неправилен."
 
+#: modules/pref-prefs.php:59 modules/pref-prefs.php:388
+#, fuzzy
+msgid "Save configuration"
+msgstr "Конфигурация сохранена."
+
+#: modules/pref-prefs.php:127 modules/pref-prefs.php:392
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Сбросить настройки?"
+
 #: modules/pref-prefs.php:185
 msgid ""
 "Your password is at default value, \n"
@@ -1315,6 +1384,20 @@ msgstr "Темы"
 msgid "Select theme"
 msgstr "Выбор темы"
 
+#: modules/pref-prefs.php:285
+#, fuzzy
+msgid "Default"
+msgstr "По умолчанию"
+
+#: modules/pref-prefs.php:301
+#, fuzzy
+msgid "Change theme"
+msgstr "Изменить e-mail"
+
+#: modules/pref-prefs.php:353
+msgid "short_desc"
+msgstr ""
+
 #: modules/pref-users.php:12
 msgid "User editor"
 msgstr "Редактор пользователей"

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index d156d71c9c06ab10703e4e89572e4027059636a3..951fc61bc413b9618d492877e9f81e2a72994b7c 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 06aa4579ed1a2410ef9dfa1ae0344e86e9364479..706ce53148331a039cb8e6c801da961ab536e04a 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-10 23:25+0400\n"
+"POT-Creation-Date: 2007-08-11 00:14+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,162 +141,172 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2239 functions.php:2278 functions.php:2602 functions.php:3386
-#: functions.php:3416 modules/pref-feeds.php:890
+#: functions.php:2214 modules/popup-dialog.php:135
+#: modules/pref-filters.php:290
+msgid "All feeds"
+msgstr "所有feed"
+
+#: functions.php:2243 functions.php:2282 functions.php:2606 functions.php:3390
+#: functions.php:3420 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2268 functions.php:3226
+#: functions.php:2272 functions.php:3230
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2270 functions.php:3260
+#: functions.php:2274 functions.php:3264
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2288 functions.php:2624 functions.php:3237
+#: functions.php:2292 functions.php:2628 functions.php:3241
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2290 functions.php:2626 functions.php:3244
+#: functions.php:2294 functions.php:2630 functions.php:3248
 #, fuzzy
 msgid "Published articles"
 msgstr "星级文章"
 
-#: functions.php:2588 functions.php:2590
+#: functions.php:2592 functions.php:2594
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:2606 functions.php:2619 functions.php:2634
+#: functions.php:2610 functions.php:2623 functions.php:2638
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:2859
+#: functions.php:2863
 msgid "New headlines for last 24 hours, as of "
 msgstr "24小时最新头条,截至"
 
-#: functions.php:2903
+#: functions.php:2907
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr "由于您启用了Tiny Tiny RSS每日文摘，会收到此邮件。"
 
-#: functions.php:2905
+#: functions.php:2909
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr "若要退订,访问你的配置选项或联络管理员。\n"
 
-#: functions.php:3111 functions.php:3153 functions.php:4053
+#: functions.php:3115 functions.php:3157 functions.php:4057
 #: 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:3112 functions.php:3154 modules/pref-feeds.php:616
+#: functions.php:3116 functions.php:3158 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:3113 functions.php:3117 functions.php:3155 functions.php:3158
+#: functions.php:3117 functions.php:3121 functions.php:3159 functions.php:3162
 #: tt-rss.php:172
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3114 functions.php:3156 modules/pref-feeds.php:617
+#: functions.php:3118 functions.php:3160 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:3118 functions.php:3159 tt-rss.php:171
+#: functions.php:3120
+#, fuzzy
+msgid "Toggle"
+msgstr "触发:"
+
+#: functions.php:3122 functions.php:3163 tt-rss.php:171
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3119
+#: functions.php:3123
 msgid "Published"
 msgstr ""
 
-#: functions.php:3122
+#: functions.php:3126
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3123
+#: functions.php:3127
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3124
+#: functions.php:3128
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3132
+#: functions.php:3136
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3133
+#: functions.php:3137
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3134
+#: functions.php:3138
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3144 functions.php:3170
+#: functions.php:3148 functions.php:3174
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3158
+#: functions.php:3162
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3161
+#: functions.php:3165
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3162
+#: functions.php:3166
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3163 modules/pref-filters.php:263
+#: functions.php:3167 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3208
+#: functions.php:3212
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3458
+#: functions.php:3462
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:3475
+#: functions.php:3479
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:3697
+#: functions.php:3701
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:3742
+#: functions.php:3746
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:3754
+#: functions.php:3758
 msgid "Tags:"
 msgstr "标签:"
 
-#: functions.php:3811
+#: functions.php:3815
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:3873
+#: functions.php:3877
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4114
+#: functions.php:4118
 msgid "No articles found."
 msgstr "未找到文章。"
 
@@ -340,7 +350,7 @@ msgstr "添加分类失败：未指定分类名"
 msgid "Adding feed category..."
 msgstr "添加feed分类..."
 
-#: localized_js.php:42
+#: localized_js.php:42 localized_js.php:101
 msgid "Can't add user: no login specified."
 msgstr "添加用户失败：未登录。"
 
@@ -348,11 +358,11 @@ msgstr "添加用户失败：未登录。"
 msgid "Adding user..."
 msgstr "添加用户..."
 
-#: localized_js.php:45
+#: localized_js.php:45 localized_js.php:99
 msgid "Can't create label: missing SQL expression."
 msgstr "创建标签失败：缺少或错误的SQL表达式。"
 
-#: localized_js.php:46
+#: localized_js.php:46 localized_js.php:100
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：缺少标题。"
 
@@ -364,7 +374,7 @@ msgstr "移除选定标记?"
 msgid "Removing selected labels..."
 msgstr "移除选定标记..."
 
-#: localized_js.php:49 localized_js.php:68
+#: localized_js.php:49 localized_js.php:68 localized_js.php:102
 msgid "No labels are selected."
 msgstr "未选定标记."
 
@@ -377,6 +387,7 @@ msgid "Removing selected users..."
 msgstr "移除选定用户..."
 
 #: localized_js.php:52 localized_js.php:70 localized_js.php:72
+#: localized_js.php:103
 msgid "No users are selected."
 msgstr "未选定用户."
 
@@ -388,7 +399,7 @@ msgstr "移除选定的过滤器？"
 msgid "Removing selected filters..."
 msgstr "移除选定的过滤器..."
 
-#: localized_js.php:55 localized_js.php:78
+#: localized_js.php:55 localized_js.php:78 localized_js.php:104
 msgid "No filters are selected."
 msgstr "未选定过滤器。"
 
@@ -401,6 +412,7 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "退订选定feed..."
 
 #: localized_js.php:58 localized_js.php:76 localized_js.php:80
+#: localized_js.php:105 localized_js.php:108
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
@@ -412,7 +424,7 @@ msgstr "移除选定分类?"
 msgid "Removing selected categories..."
 msgstr "移除选定分类..."
 
-#: localized_js.php:61 localized_js.php:82
+#: localized_js.php:61 localized_js.php:82 localized_js.php:106
 msgid "No categories are selected."
 msgstr "未选定分类。"
 
@@ -428,7 +440,7 @@ msgstr "读取帮助..."
 msgid "Saving label..."
 msgstr "保存标记..."
 
-#: localized_js.php:65
+#: localized_js.php:65 localized_js.php:107
 msgid "Login field cannot be blank."
 msgstr "登陆框不能留空。"
 
@@ -521,11 +533,52 @@ msgstr ""
 msgid "Could not change address."
 msgstr "未能更新数据库"
 
-#: login_form.php:49 modules/pref-feeds.php:264 modules/pref-users.php:29
+#: localized_js.php:96
+msgid "You can't unsubscribe from the category."
+msgstr ""
+
+#: localized_js.php:97
+#, fuzzy
+msgid "Please select some feed first."
+msgstr "请只选择一个feed."
+
+#: localized_js.php:98
+msgid "You can't edit this kind of feed."
+msgstr ""
+
+#: localized_js.php:109
+msgid "Can't add filter: nothing to match on."
+msgstr ""
+
+#: localized_js.php:110
+msgid "Can't subscribe: no feed URL given."
+msgstr ""
+
+#: localized_schema.php:5 modules/popup-dialog.php:166
+#: modules/pref-feeds.php:865 modules/pref-feeds.php:926
+msgid "Title"
+msgstr "标题"
+
+#: localized_schema.php:6
+#, fuzzy
+msgid "Title or Content"
+msgstr "标题或内容"
+
+#: localized_schema.php:7
+#, fuzzy
+msgid "Link"
+msgstr "链接:"
+
+#: localized_schema.php:8 modules/popup-dialog.php:167
+msgid "Content"
+msgstr "内容"
+
+#: login_form.php:49 modules/popup-dialog.php:90 modules/pref-feeds.php:264
+#: modules/pref-users.php:29
 msgid "Login:"
 msgstr "登陆:"
 
-#: login_form.php:51 modules/pref-feeds.php:270
+#: login_form.php:51 modules/popup-dialog.php:91 modules/pref-feeds.php:270
 msgid "Password:"
 msgstr "密码:"
 
@@ -889,10 +942,18 @@ msgstr ""
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
+#: modules/popup-dialog.php:62 modules/pref-feeds.php:165
+msgid "Feed URL:"
+msgstr "Feed URL:"
+
 #: modules/popup-dialog.php:70 modules/pref-feeds.php:173
 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"
@@ -910,10 +971,6 @@ msgstr "取消"
 msgid "Where:"
 msgstr "地点:"
 
-#: modules/popup-dialog.php:135 modules/pref-filters.php:290
-msgid "All feeds"
-msgstr "所有feed"
-
 #: modules/popup-dialog.php:148
 msgid "This feed"
 msgstr "本feed"
@@ -922,15 +979,6 @@ msgstr "本feed"
 msgid "Match on:"
 msgstr "匹配:"
 
-#: modules/popup-dialog.php:166 modules/pref-feeds.php:865
-#: modules/pref-feeds.php:926
-msgid "Title"
-msgstr "标题"
-
-#: modules/popup-dialog.php:167
-msgid "Content"
-msgstr "内容"
-
 #: modules/popup-dialog.php:168
 msgid "Title or content"
 msgstr "标题或内容"
@@ -959,6 +1007,11 @@ msgstr "创建"
 msgid "Create filter"
 msgstr "创建过滤器"
 
+#: modules/popup-dialog.php:262 modules/popup-dialog.php:293
+#: modules/pref-filters.php:40 modules/pref-filters.php:72
+msgid "description"
+msgstr ""
+
 #: modules/popup-dialog.php:267 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "匹配："
@@ -1026,6 +1079,20 @@ msgstr "显示最热标签"
 msgid "browse more"
 msgstr "浏览所有"
 
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
+msgid "Feed browser is administratively disabled."
+msgstr "Feed 浏览器有限制"
+
+#: modules/pref-feed-browser.php:15
+#, fuzzy
+msgid "Feed information:"
+msgstr "Feed 操作："
+
+#: modules/pref-feed-browser.php:51
+#, fuzzy
+msgid "Last headlines:"
+msgstr "最后登陆"
+
 #: modules/pref-feed-browser.php:77
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
@@ -1040,14 +1107,14 @@ msgstr "Top"
 msgid "Show"
 msgstr "显示"
 
+#: modules/pref-feed-browser.php:152 modules/pref-feeds.php:111
+msgid "No feeds found to subscribe."
+msgstr "无feed可订阅。"
+
 #: modules/pref-feeds.php:38
 msgid "Subscribed to feeds:"
 msgstr "订阅feed:"
 
-#: modules/pref-feeds.php:53
-msgid "Feed browser is administratively disabled."
-msgstr "Feed 浏览器有限制"
-
 #: modules/pref-feeds.php:57
 msgid "Other feeds: Top 25"
 msgstr " 其他feed: Top 25"
@@ -1056,10 +1123,6 @@ msgstr " 其他feed: Top 25"
 msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "显示按受欢迎度排序的25个注册feed:"
 
-#: modules/pref-feeds.php:111
-msgid "No feeds found to subscribe."
-msgstr "无feed可订阅。"
-
 #: modules/pref-feeds.php:145
 msgid "Feed editor"
 msgstr "Feed编辑"
@@ -1068,10 +1131,6 @@ msgstr "Feed编辑"
 msgid "Title:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:165
-msgid "Feed URL:"
-msgstr "Feed URL:"
-
 #: modules/pref-feeds.php:193
 msgid "Update Interval:"
 msgstr "更新间隔:"
@@ -1284,6 +1343,16 @@ msgstr "密码已更改."
 msgid "Old password is incorrect."
 msgstr "原密码错误."
 
+#: modules/pref-prefs.php:59 modules/pref-prefs.php:388
+#, fuzzy
+msgid "Save configuration"
+msgstr "设置已保存."
+
+#: modules/pref-prefs.php:127 modules/pref-prefs.php:392
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "重置默认项？"
+
 #: modules/pref-prefs.php:185
 msgid ""
 "Your password is at default value, \n"
@@ -1334,6 +1403,20 @@ msgstr "模板"
 msgid "Select theme"
 msgstr "选择模板"
 
+#: modules/pref-prefs.php:285
+#, fuzzy
+msgid "Default"
+msgstr "用户默认"
+
+#: modules/pref-prefs.php:301
+#, fuzzy
+msgid "Change theme"
+msgstr "更改 e-mail"
+
+#: modules/pref-prefs.php:353
+msgid "short_desc"
+msgstr ""
+
 #: modules/pref-users.php:12
 msgid "User editor"
 msgstr "用户编辑"

diff --git a/localized_js.php b/localized_js.php
index a1c423c19833d1b89725ba1511ebd1c929e80a9b..0d66cdacf592e106c5e5013d3ec39f1f455d50fc 100644 (file)
--- a/localized_js.php
+++ b/localized_js.php
@@ -93,5 +93,30 @@ print T_js_decl("No feed selected.");
 print T_js_decl("Replace current publishing address with a new one?");
 print T_js_decl("Address changed.");
 print T_js_decl("Could not change address.");
+print T_js_decl("You can't unsubscribe from the category.");
+print T_js_decl("Please select some feed first.");
+print T_js_decl("You can't edit this kind of feed.");
+print T_js_decl("Can't create label: missing SQL expression.");
+print T_js_decl("Can't create label: missing caption.");
+print T_js_decl("Can't add user: no login specified.");
+print T_js_decl("No labels are selected.");
+print T_js_decl("No users are selected.");
+print T_js_decl("No filters are selected.");
+print T_js_decl("No feeds are selected.");
+print T_js_decl("No categories are selected.");
+print T_js_decl("Login field cannot be blank.");
+print T_js_decl("No feeds are selected.");
+print T_js_decl("Can't add filter: nothing to match on.");
+print T_js_decl("Can't subscribe: no feed URL given.");
+#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(
+#print T_js_decl(
+#print T_js_decl(
 
 ?>

diff --git a/localized_schema.php b/localized_schema.php
new file mode 100644 (file)
index 0000000..fbae9b1
--- /dev/null
+++ b/localized_schema.php
@@ -0,0 +1,21 @@
+<?
+       /* 
+        * This is a dummy plug for gettext to know we have some translatable strings in the schema.
+        *      This file is not otherwise used.         
+        */
+
+       # filters
+
+       __("Title");
+       __("Title or Content");
+       __("Link");
+       __("Content");
+
+       __("Filter article");
+       __("Mark as read");
+       __("Set starred");
+       __("Publish article");
+       __("Assign tags");
+
+
+?>

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 2805f76537cbc94c4f5bcb2be70888a4631890a7..498514b083f1a7f0e0a46d0107096e684aebeee7 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -59,7 +59,7 @@
                        print "<input type=\"hidden\" name=\"from\" value=\"tt-rss\">"; 
 
                        print "<table width='100%'>
-                       <tr><td>Feed URL:</td><td>
+                       <tr><td>".__('Feed URL:')."</td><td>
                                <input class=\"iedit\" onblur=\"javascript:enableHotkeys()\" 
                                        onkeypress=\"return filterCR(event, qaddFeed)\"
                                        onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
@@ -83,12 +83,12 @@
 
                        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>";
+                                       \"fadd_login_prompt\")'>".__('Click here if this feed requires authentication.')."</a></div>";
 
                        print "<div id='fadd_login_container'>
                                <table width='100%'>
-                                       <tr><td>Login:</td><td><input name='auth_login' class='iedit'></td></tr>
-                                       <tr><td>Password:</td><td><input type='password'
+                                       <tr><td>".__('Login:')."</td><td><input name='auth_login' class='iedit'></td></tr>
+                                       <tr><td>".__('Password:')."</td><td><input type='password'
                                                name='auth_pass' class='iedit'></td></tr>
                                </table>
                                </div>";
@@ -259,7 +259,7 @@
        
                        while ($line = db_fetch_assoc($result)) {
                                //array_push($filter_types, $line["description"]);
-                               $filter_types[$line["id"]] = $line["description"];
+                               $filter_types[$line["id"]] = __($line["description"]);
                        }
 
                        print "<table width='100%'>";
@@ -290,7 +290,7 @@
                                ORDER BY name");
 
                        while ($line = db_fetch_assoc($result)) {
-                               printf("<option value='%d'>%s</option>", $line["id"], $line["description"]);
+                               printf("<option value='%d'>%s</option>", $line["id"], __($line["description"]));
                        }
        
                        print "</select>";

diff --git a/modules/pref-feed-browser.php b/modules/pref-feed-browser.php
index 104dd93f5519491a63c56025086f48299273ed78..4759a5f6a30f476b879559d44eee2d06cd762668 100644 (file)
--- a/modules/pref-feed-browser.php
+++ b/modules/pref-feed-browser.php
@@ -2,7 +2,7 @@
        function module_pref_feed_browser($link) {
 
                if (!ENABLE_FEED_BROWSER) {
-                       print "Feed browser is administratively disabled.";
+                       print __("Feed browser is administratively disabled.");
                        return;
                }
 
@@ -12,7 +12,7 @@
                        $id = db_escape_string($_GET["id"]);
 
                        print "<div class=\"browserFeedInfo\">";
-                       print "<b>Feed information:</b>";
+                       print "<b>".__('Feed information:')."</b>";
                        print "<div class=\"detailsPart\">";
 
                        $result = db_query($link, "SELECT 
@@ -48,7 +48,7 @@
 
                        if (db_num_rows($result) > 0) {
                                
-                               print "<b>Last headlines:</b><br>";
+                               print "<b>".__('Last headlines:')."</b><br>";
                                
                                print "<div class=\"detailsPart\">";
                                print "<ul class=\"compact\">";
@@ -149,7 +149,7 @@
                }
 
                if ($feedctr == 0) {
-                       print "<li>No feeds found to subscribe.</li>";
+                       print "<li>".__('No feeds found to subscribe.')."</li>";
                }
 
                print "</ul>";

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 3c0f6129c648b0e6fd4cff24098bd0cbf6eea1fe..e043323e03f05cb0e63ee269e443a0982b4eda91 100644 (file)
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -37,7 +37,7 @@
        
                        while ($line = db_fetch_assoc($result)) {
                                //array_push($filter_types, $line["description"]);
-                               $filter_types[$line["id"]] = $line["description"];
+                               $filter_types[$line["id"]] = __($line["description"]);
                        }
 
                        print "<table width='100%'>";
@@ -69,7 +69,7 @@
 
                        while ($line = db_fetch_assoc($result)) {
                                $is_sel = ($line["id"] == $action_id) ? "selected" : "";                        
-                               printf("<option value='%d' $is_sel>%s</option>", $line["id"], $line["description"]);
+                               printf("<option value='%d' $is_sel>%s</option>", $line["id"], __($line["description"]));
                        }
        
                        print "</select>";

diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 036a7607f397043bc5baff0e74584106db7be23f..7ade0391bc313982080e8aa725311d769fd4fb3d 100644 (file)
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -56,7 +56,7 @@
 
                        return;
 
-               } else if ($subop == "Save configuration") {
+               } else if ($subop == __("Save configuration")) {
 
                        $_SESSION["prefs_op_result"] = "save-config";
 
@@ -124,7 +124,7 @@
                
                        return;
 
-               } else if ($subop == "Reset to defaults") {
+               } else if ($subop == __("Reset to defaults")) {
 
                        $_SESSION["prefs_op_result"] = "reset-to-defaults";
 
@@ -282,7 +282,7 @@
                                print "<tr><td colspan='3'><h3>".__("Themes")."</h3></tr></td>";
                                print "<tr><td width=\"40%\">".__("Select theme")."</td>";
                                print "<td><select name=\"theme\">";
-                               print "<option>Default</option>";
+                               print "<option value='Default'>".__('Default')."</option>";
                                print "<option disabled>--------</option>";                             
                                
                                while ($line = db_fetch_assoc($result)) {       
@@ -296,8 +296,9 @@
                                print "</select></td></tr>";
                                print "</table>";
                                print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
+                               print "<input type=\"hidden\" name=\"subop\" value=\"Change theme\">";
                                print "<p><input class=\"button\" type=\"submit\" 
-                                       value=\"Change theme\" name=\"subop\">";
+                                       value=\"".__('Change theme')."\">";
                                print "</form>";
                        }
 
@@ -332,7 +333,7 @@
                                
                                        $active_section = $line["section_name"];                                
                                        
-                                       print "<tr><td colspan=\"3\"><h3>$active_section</h3></td></tr>";
+                                       print "<tr><td colspan=\"3\"><h3>".__($active_section)."</h3></td></tr>";
 //                                     print "<tr class=\"title\">
 //                                             <td width=\"25%\">Option</td><td>Value</td></tr>";
 
@@ -349,9 +350,9 @@
                                $def_value = $line["def_value"];
                                $help_text = $line["help_text"];
 
-                               print "<td width=\"40%\" id=\"$pref_name\">" . $line["short_desc"];
+                               print "<td width=\"40%\" id=\"$pref_name\">" . __($line["short_desc"]);
 
-                               if ($help_text) print "<div class=\"prefHelp\">$help_text</div>";
+                               if ($help_text) print "<div class=\"prefHelp\">".__($help_text)."</div>";
                                
                                print "</td>";
 
@@ -384,11 +385,11 @@
                        print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
 
                        print "<p><input class=\"button\" type=\"submit\" 
-                               name=\"subop\" value=\"Save configuration\">";
+                               name=\"subop\" value=\"".__('Save configuration')."\">";
                                
                        print "&nbsp;<input class=\"button\" type=\"submit\" 
                                name=\"subop\" onclick=\"return validatePrefsReset()\" 
-                               value=\"Reset to defaults\"></p>";
+                               value=\"".__('Reset to defaults')."\"></p>";
 
                        print "</form>";
 

diff --git a/prefs.js b/prefs.js
index 071bb8a4ca203baad49f7200435031ac4bd77308..6609bcac2c20c45f6b5107691a60840957980a40 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -279,12 +279,12 @@ function addLabel() {
        var description = form.description.value;
 
        if (sql_exp == "") {
-               alert("Can't create label: missing SQL expression.");
+               alert(__("Can't create label: missing SQL expression."));
                return false;
        }
 
        if (description == "") {
-               alert("Can't create label: missing caption.");
+               alert(__("Can't create label: missing caption."));
                return false;
        }
 
@@ -356,7 +356,7 @@ function addUser() {
        var sqlexp = document.getElementById("uadd_box");
 
        if (sqlexp.value.length == 0) {
-               alert("Can't add user: no login specified.");
+               alert(__("Can't add user: no login specified."));
        } else {
                notify_progress("Adding user...");
 
@@ -546,7 +546,7 @@ function removeSelectedLabels() {
                        xmlhttp.send(null);
                }
        } else {
-               alert("No labels are selected.");
+               alert(__("No labels are selected."));
        }
 
        return false;
@@ -575,7 +575,7 @@ function removeSelectedUsers() {
                }
 
        } else {
-               alert("No users are selected.");
+               alert(__("No users are selected."));
        }
 
        return false;
@@ -603,7 +603,7 @@ function removeSelectedFilters() {
                        xmlhttp.send(null);
                }
        } else {
-               alert("No filters are selected.");
+               alert(__("No filters are selected."));
        }
 
        return false;
@@ -635,7 +635,7 @@ function removeSelectedFeeds() {
 
        } else {
 
-               alert("No feeds are selected.");
+               alert(__("No feeds are selected."));
 
        }
        
@@ -666,7 +666,7 @@ function removeSelectedFeedCats() {
 
        } else {
 
-               alert("No categories are selected.");
+               alert(__("No categories are selected."));
 
        }
 
@@ -900,7 +900,7 @@ function userEditSave() {
        var login = document.forms["user_edit_form"].login.value;
 
        if (login.length == 0) {
-               alert("Login field cannot be blank.");
+               alert(__("Login field cannot be blank."));
                return;
        }
        
@@ -1488,7 +1488,7 @@ function feedBrowserSubscribe() {
                        xmlhttp.onreadystatechange=feedlist_callback;
                        xmlhttp.send(null);
                } else {
-                       alert("No feeds are selected.");
+                       alert(__("No feeds are selected."));
                }
 
        } catch (e) {

diff --git a/tt-rss.css b/tt-rss.css
index 61ae3fa144772a83d571644ceaf704a621962fdd..a0ef19ce9dbbaf16a47f560ff21f60b6e766a667 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1545,7 +1545,7 @@ ul.headlineDropdownMenu {
 
 ul.headlineDropdownMenu li.top {
        float : left;
-       width : 9em;
+       width : 11em;
        background-image : url("images/down_arrow.png");
        background-position : center right;
        background-repeat : no-repeat;
@@ -1597,7 +1597,7 @@ ul.headlineDropdownMenu ul {
        padding : 0px;
        display : none;
        background-color : white;
-       width : 9em;
+       width : 11em;
        z-index : 3;
        top : auto;
        left : auto;

diff --git a/tt-rss.js b/tt-rss.js
index cf68a0f503f09e07d394af004f86e17d9770158b..e7a21a73d9cdf83fed8b3edb99782f4db3afbaaa 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -491,18 +491,20 @@ function quickMenuGo(opid) {
                        var actid = getActiveFeedId();
 
                        if (activeFeedIsCat()) {
-                               alert("You can't unsubscribe from the category.");
+                               alert(__("You can't unsubscribe from the category."));
                                return;
                        }       
 
                        if (!actid) {
-                               alert("Please select some feed first.");
+                               alert(__("Please select some feed first."));
                                return;
                        }
 
                        var fn = getFeedName(actid);
-       
-                       if (confirm("Unsubscribe from " + fn + "?")) {
+
+                       var pr = __("Unsubscribe from %s?").replace("%s", fn);
+
+                       if (confirm(pr)) {
                                qfdDelete(actid);
                        }
                
@@ -667,12 +669,12 @@ function editFeedDlg(feed) {
        disableHotkeys();
 
        if (!feed) {
-               alert("Please select some feed first.");
+               alert(__("Please select some feed first."));
                return;
        }
 
        if (feed <= 0 || activeFeedIsCat() || tagsAreDisplayed()) {
-               alert("You can't edit this kind of feed.");
+               alert(__("You can't edit this kind of feed."));
                return;
        }