summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2008-02-15 18:42:56 +0100
committerAndrew Dolgov <[email protected]>2008-02-15 18:42:56 +0100
commit80d72112f3b65ed4e5f9cf35c6aafe2481282ad7 (patch)
tree6f09581e53189ef7b83f7758e742352085fddfc5 /locale
parent37b29ac9c4c89c90fa1b54851196c817ee4b61c7 (diff)
update translations
Diffstat (limited to 'locale')
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin38353 -> 38323 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po303
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.mobin35776 -> 35747 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.po303
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.mobin13406 -> 13375 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.po303
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin25438 -> 25399 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po303
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin27634 -> 27602 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po303
10 files changed, 830 insertions, 685 deletions
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 71ec58c11..2f863d084 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 9334a2773..67d72ee35 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-23 14:50+0300\n"
+"POT-Creation-Date: 2008-02-15 23:42+0300\n"
"PO-Revision-Date: 2007-11-20 23:01+0100\n"
"Last-Translator: Thibaut Cousin <[email protected]>\n"
"Language-Team: Français <[email protected]>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: backend.php:103 backend.php:112
+#: backend.php:103 backend.php:112 backend.php:123
msgid "Use default"
msgstr "Utiliser la valeur par défaut"
@@ -76,31 +76,40 @@ msgstr "Une fois par jour"
msgid "Weekly"
msgstr "Une fois par semaine"
-#: backend.php:124 modules/pref-users.php:249
+#: backend.php:124
+#, fuzzy
+msgid "Magpie"
+msgstr "Page"
+
+#: backend.php:125
+msgid "SimplePie"
+msgstr ""
+
+#: backend.php:134 modules/pref-users.php:252
msgid "User"
msgstr "Utilisateur"
-#: backend.php:125 modules/pref-users.php:249
+#: backend.php:135 modules/pref-users.php:252
msgid "Administrator"
msgstr "Administrateur"
-#: backend.php:370
+#: backend.php:405
msgid "Registered"
msgstr "Abonné"
-#: backend.php:371
+#: backend.php:406
msgid "Last logged in"
msgstr "Dernière connexion"
-#: backend.php:372
+#: backend.php:407
msgid "Stored articles"
msgstr "Articles mémorisés"
-#: backend.php:379
+#: backend.php:414
msgid "Subscribed feeds count"
msgstr "Nombre d'abonnements à des flux"
-#: backend.php:392
+#: backend.php:429
msgid "Subscribed feeds"
msgstr "Abonnements à des flux"
@@ -166,170 +175,175 @@ 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:2427 functions.php:2766 functions.php:3131 functions.php:3938
+#: functions.php:2505 functions.php:2844 functions.php:3209 functions.php:4035
msgid "Starred articles"
msgstr "Articles remarquables"
-#: functions.php:2436 functions.php:2768 functions.php:3133 functions.php:3945
-#: modules/pref-feeds.php:1068
+#: functions.php:2514 functions.php:2846 functions.php:3211 functions.php:4042
+#: modules/pref-feeds.php:1085
msgid "Published articles"
msgstr "Articles publiés"
-#: functions.php:2445 functions.php:2770 functions.php:3135 functions.php:3923
+#: functions.php:2523 functions.php:2848 functions.php:3213 functions.php:4020
msgid "Fresh articles"
msgstr "Nouveaux articles"
-#: functions.php:2688 modules/popup-dialog.php:151
+#: functions.php:2766 modules/popup-dialog.php:151
#: modules/pref-filters.php:290
msgid "All feeds"
msgstr "Tous les flux"
-#: functions.php:2717 functions.php:2756 functions.php:3109 functions.php:4102
-#: functions.php:4132 modules/pref-feeds.php:880
+#: functions.php:2795 functions.php:2834 functions.php:3187 functions.php:4199
+#: functions.php:4229 modules/pref-feeds.php:897
msgid "Uncategorized"
msgstr "Sans catégorie"
-#: functions.php:2746 functions.php:3275
+#: functions.php:2824 functions.php:3353
msgid "Special"
msgstr "Spécial"
-#: functions.php:2748 functions.php:3277
+#: functions.php:2826 functions.php:3355
msgid "Labels"
msgstr "Intitulé"
-#: functions.php:3095 functions.php:3097
+#: functions.php:3173 functions.php:3175
msgid "Search results"
msgstr "Résultats de recherche"
-#: functions.php:3113 functions.php:3126 functions.php:3143
+#: functions.php:3191 functions.php:3204 functions.php:3221
msgid "Searched for"
msgstr "Recherché"
-#: functions.php:3729 functions.php:3776 functions.php:4906
-#: modules/pref-feeds.php:655 modules/pref-feeds.php:842
+#: functions.php:3814 functions.php:3868 functions.php:5003
+#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
#: modules/pref-filters.php:255 modules/pref-labels.php:239
-#: modules/pref-users.php:208
+#: modules/pref-users.php:211
msgid "Select:"
msgstr "Sélectionner&nbsp;:"
-#: functions.php:3730 functions.php:3777 modules/pref-feeds.php:656
-#: modules/pref-feeds.php:843 modules/pref-filters.php:256
-#: modules/pref-labels.php:240 modules/pref-users.php:209
+#: functions.php:3815 functions.php:3869 modules/pref-feeds.php:673
+#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: modules/pref-labels.php:240 modules/pref-users.php:212
msgid "All"
msgstr "Tout"
-#: functions.php:3731 functions.php:3735 functions.php:3778 functions.php:3781
+#: functions.php:3816 functions.php:3820 functions.php:3870 functions.php:3873
#: tt-rss.php:175
msgid "Unread"
msgstr "Non lus"
-#: functions.php:3732 functions.php:3779 modules/pref-feeds.php:657
-#: modules/pref-feeds.php:844 modules/pref-filters.php:257
-#: modules/pref-labels.php:241 modules/pref-users.php:210
+#: functions.php:3817 functions.php:3871 modules/pref-feeds.php:674
+#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: modules/pref-labels.php:241 modules/pref-users.php:213
msgid "None"
msgstr "Aucun"
-#: functions.php:3734
+#: functions.php:3819
msgid "Toggle"
msgstr "Marquages spéciaux&nbsp;"
-#: functions.php:3736 functions.php:3782 tt-rss.php:174
+#: functions.php:3821 functions.php:3874 tt-rss.php:174
msgid "Starred"
msgstr "Remarquables"
-#: functions.php:3737
+#: functions.php:3822
msgid "Published"
msgstr "Publiés"
-#: functions.php:3740 localized_schema.php:15
+#: functions.php:3825 localized_schema.php:15
msgid "Mark as read"
msgstr "Marquer comme lu"
-#: functions.php:3741
+#: functions.php:3826
msgid "Selection"
msgstr "La sélection"
-#: functions.php:3742
+#: functions.php:3827
msgid "This page"
msgstr "Cette page"
-#: functions.php:3744
+#: functions.php:3833
msgid "Above active article"
msgstr "Au-dessus de l'article courant"
-#: functions.php:3745
+#: functions.php:3834
msgid "Below active article"
msgstr "En dessous de l'article courant"
-#: functions.php:3747
+#: functions.php:3839
msgid "Entire feed"
msgstr "Tout le flux"
-#: functions.php:3755
+#: functions.php:3847
msgid "Next page"
msgstr "Page suivante"
-#: functions.php:3756
+#: functions.php:3848
msgid "Previous page"
msgstr "Page précédente"
-#: functions.php:3757
+#: functions.php:3849
msgid "First page"
msgstr "Première page"
-#: functions.php:3767 functions.php:3793
+#: functions.php:3859 functions.php:3885
msgid "Convert to label"
msgstr "Convertir en intitulé"
-#: functions.php:3781
+#: functions.php:3873
msgid "Toggle:"
msgstr "Marquages spéciaux&nbsp;:"
-#: functions.php:3784
+#: functions.php:3876
msgid "Mark as read:"
msgstr "Marquer comme lu&nbsp;:"
-#: functions.php:3785
+#: functions.php:3877
msgid "Page"
msgstr "Page"
-#: functions.php:3786 modules/pref-filters.php:263
+#: functions.php:3878 modules/pref-filters.php:263
msgid "Feed"
msgstr "Flux"
-#: functions.php:3836
+#: functions.php:3928
msgid "Generated feed"
msgstr "Flux généré"
-#: functions.php:4172
+#: functions.php:4008
+msgid "Dashboard"
+msgstr ""
+
+#: functions.php:4269
msgid "No feeds to display."
msgstr "Aucun flux à afficher."
-#: functions.php:4189
+#: functions.php:4286
msgid "Tags"
msgstr "Étiquettes"
-#: functions.php:4414
-msgid " - by "
+#: functions.php:4511
+#, fuzzy
+msgid " - "
msgstr "- par "
-#: functions.php:4469
+#: functions.php:4566
msgid "no tags"
msgstr "aucune étiquette"
-#: functions.php:4500 functions.php:4867
+#: functions.php:4597 functions.php:4964
msgid "Attachment:"
msgstr ""
-#: functions.php:4502 functions.php:4869
+#: functions.php:4599 functions.php:4966
msgid "Attachments:"
msgstr ""
-#: functions.php:4575
+#: functions.php:4672 modules/pref-feed-browser.php:74
msgid "Feed not found."
msgstr "Flux non trouvé."
-#: functions.php:4642
+#: functions.php:4739
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -337,11 +351,11 @@ 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:4840
+#: functions.php:4937
msgid "Show article"
msgstr "Afficher l'article"
-#: functions.php:4969
+#: functions.php:5066
msgid "No articles found."
msgstr "Aucun article trouvé."
@@ -670,7 +684,7 @@ msgid "Erase all non-starred articles in %s?"
msgstr "Supprimer tous les articles non remarquables dans %s ?"
#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:855 modules/pref-feeds.php:916
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:933
msgid "Title"
msgstr "Titre"
@@ -915,12 +929,12 @@ msgstr "Purger les articles non lus"
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
#: modules/pref-users.php:29
msgid "Login:"
msgstr "Nom&nbsp;:"
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
msgid "Password:"
msgstr "Mot de passe&nbsp;:"
@@ -1171,12 +1185,12 @@ msgstr "Contenu"
msgid "tag cloud"
msgstr "Nuage d'étiquettes"
-#: tt-rss.php:140 modules/pref-feeds.php:1003
+#: tt-rss.php:140 modules/pref-feeds.php:1020
msgid "Actions..."
msgstr "Actions..."
#: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:749
+#: modules/pref-feeds.php:766
msgid "Search"
msgstr "Rechercher"
@@ -1307,7 +1321,7 @@ msgid "Help topic not found."
msgstr "Sujet non trouvé dans l'aide."
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:706
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:723
msgid "Close this window"
msgstr "Fermer cette fenêtre"
@@ -1381,27 +1395,27 @@ msgstr ""
"\t\t\t\t\tVeuillez vérifier son état ou bien contacter l'administrateur de "
"votre Tiny Tiny RSS."
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:762
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:779
msgid "Subscribe to feed"
msgstr "S'inscrire à un flux"
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:165
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
msgid "Feed URL:"
msgstr "URL du flux&nbsp;:"
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:173
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
msgid "Category:"
msgstr "Catégorie&nbsp;:"
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
-#: modules/pref-feeds.php:118
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
+#: modules/pref-feeds.php:119
msgid "Subscribe"
msgstr "S'inscrire"
#: modules/popup-dialog.php:114 modules/popup-dialog.php:199
#: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:352 modules/pref-filters.php:118
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
+#: modules/pref-feeds.php:367 modules/pref-filters.php:118
#: modules/pref-users.php:58
msgid "Cancel"
msgstr "Annuler"
@@ -1480,7 +1494,7 @@ msgstr "Action&nbsp;:"
msgid "Params:"
msgstr "Paramètres&nbsp;:"
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
msgid "Options:"
msgstr "Options&nbsp;:"
@@ -1508,7 +1522,7 @@ msgstr "Modifier les étiquettes"
msgid "Tags for this article (separated by commas):"
msgstr "Étiquettes pour cet article (séparées par des virgules)&nbsp;:"
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:350
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
#: modules/pref-filters.php:114 modules/pref-users.php:55
msgid "Save"
msgstr "Enregistrer"
@@ -1525,7 +1539,7 @@ 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
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:54
msgid "Feed browser is administratively disabled."
msgstr "Le navigateur de flux a été désactivé par l'administrateur."
@@ -1533,11 +1547,21 @@ msgstr "Le navigateur de flux a été désactivé par l'administrateur."
msgid "Feed information:"
msgstr "Information sur le flux&nbsp;:"
-#: modules/pref-feed-browser.php:51
+#: modules/pref-feed-browser.php:38
+#, fuzzy
+msgid "Site:"
+msgstr "Titre&nbsp;:"
+
+#: modules/pref-feed-browser.php:40
+#, fuzzy
+msgid "Last updated:"
+msgstr "Dernière mise à jour&nbsp;:"
+
+#: modules/pref-feed-browser.php:55
msgid "Last headlines:"
msgstr "Derniers en-têtes&nbsp;:"
-#: modules/pref-feed-browser.php:77
+#: modules/pref-feed-browser.php:84
msgid ""
"This panel shows feeds subscribed by other users of this system, just in "
"case you are interested in them too."
@@ -1545,187 +1569,192 @@ msgstr ""
"Ce panneau affiche les flux auxquels d'autres utilisateurs du même système "
"se sont inscrits, au cas où cela présenterait un intérêt pour vous."
-#: modules/pref-feed-browser.php:94
+#: modules/pref-feed-browser.php:101
msgid "Top"
msgstr "Top"
-#: modules/pref-feed-browser.php:103
+#: modules/pref-feed-browser.php:110
msgid "Show"
msgstr "Afficher"
-#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
msgid "No feeds found to subscribe."
msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
-#: modules/pref-feeds.php:38
+#: modules/pref-feeds.php:39
msgid "Subscribed to feeds:"
msgstr "Inscrit aux flux&nbsp;:"
-#: modules/pref-feeds.php:57
+#: modules/pref-feeds.php:58
msgid "Other feeds: Top 25"
msgstr "Autres flux&nbsp;: Top 25"
-#: modules/pref-feeds.php:61
+#: modules/pref-feeds.php:62
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:145
+#: modules/pref-feeds.php:146
msgid "Feed editor"
msgstr "Éditeur de flux"
-#: modules/pref-feeds.php:157
+#: modules/pref-feeds.php:158
msgid "Title:"
msgstr "Titre&nbsp;:"
-#: modules/pref-feeds.php:193
+#: modules/pref-feeds.php:194
msgid "Update Interval:"
msgstr "Fréquence de mise à jour&nbsp;:"
-#: modules/pref-feeds.php:202
+#: modules/pref-feeds.php:203
msgid "Link to:"
msgstr "Lier à&nbsp;:"
-#: modules/pref-feeds.php:219
+#: modules/pref-feeds.php:220
msgid "Not linked"
msgstr "Non lié"
-#: modules/pref-feeds.php:253
+#: modules/pref-feeds.php:254
msgid "Article purging:"
msgstr "Purge des articles&nbsp;:"
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:267
+#, fuzzy
+msgid "Update using:"
+msgstr "Mettre à jour"
+
+#: modules/pref-feeds.php:300
msgid "Hide from \"Other Feeds\""
msgstr "Masquer dans «&nbsp;Autres flux&nbsp;»"
-#: modules/pref-feeds.php:296
+#: modules/pref-feeds.php:311
msgid "Right-to-left content"
msgstr "Contenu écrit de droite à gauche"
-#: modules/pref-feeds.php:307
+#: modules/pref-feeds.php:322
msgid "Hide from my feed list"
msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
-#: modules/pref-feeds.php:319
+#: modules/pref-feeds.php:334
msgid "Include in e-mail digest"
msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
-#: modules/pref-feeds.php:340
+#: modules/pref-feeds.php:355
msgid "Cache images locally"
msgstr "Enregistrer localement les images"
-#: modules/pref-feeds.php:486
+#: modules/pref-feeds.php:503
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Inscrit à <b>%s</b>."
-#: modules/pref-feeds.php:488
+#: modules/pref-feeds.php:505
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Déjà inscrit à <b>%s</b>."
-#: modules/pref-feeds.php:573
+#: modules/pref-feeds.php:590
msgid "Category editor"
msgstr "Éditeur de catégorie"
-#: modules/pref-feeds.php:596
+#: modules/pref-feeds.php:613
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "La catégorie <b>%s</b> existe déjà dans la base de données."
-#: modules/pref-feeds.php:624
+#: modules/pref-feeds.php:641
msgid "Unable to delete non empty feed categories."
msgstr "Impossible de supprimer une catégorie de flux non vide."
-#: modules/pref-feeds.php:641
+#: modules/pref-feeds.php:658
msgid "Create category"
msgstr "Créer la catégorie"
-#: modules/pref-feeds.php:701
+#: modules/pref-feeds.php:718
msgid "No feed categories defined."
msgstr "Aucune catégorie de flux définie."
-#: modules/pref-feeds.php:712 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:319
+#: modules/pref-feeds.php:729 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:322
msgid "Remove"
msgstr "Supprimer"
-#: modules/pref-feeds.php:734
+#: modules/pref-feeds.php:751
msgid "Some feeds have update errors (click for details)"
msgstr ""
"Des erreurs sont survenues pendant la mise à jour de certains flux (cliquez "
"ici pour les détails)"
-#: modules/pref-feeds.php:767
+#: modules/pref-feeds.php:784
msgid "Top 25"
msgstr "Top 25"
-#: modules/pref-feeds.php:841
+#: modules/pref-feeds.php:858
msgid "Show last article times"
msgstr "Afficher l'heure du dernier article"
-#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
msgid "Last&nbsp;Article"
msgstr "Dernier&nbsp;article"
-#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
+#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
msgid "Updated"
msgstr "Mis à jour"
-#: modules/pref-feeds.php:991 modules/pref-feeds.php:1005
+#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
msgid "Selection:"
msgstr "Sélection&nbsp;:"
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1014
msgid "Recategorize"
msgstr "Changer de catégorie"
-#: modules/pref-feeds.php:1006 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:317
+#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:320
msgid "Edit"
msgstr "Modifier"
-#: modules/pref-feeds.php:1007
+#: modules/pref-feeds.php:1024
msgid "Manual purge"
msgstr "Purger manuellement"
-#: modules/pref-feeds.php:1008
+#: modules/pref-feeds.php:1025
msgid "Clear feed data"
msgstr "Purger les données de flux"
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1026
msgid "Unsubscribe"
msgstr "Se désinscrire"
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1031
msgid "Other:"
msgstr "Autre&nbsp;:"
-#: modules/pref-feeds.php:1015
+#: modules/pref-feeds.php:1032
msgid "Edit categories"
msgstr "Modifier les catégories"
-#: modules/pref-feeds.php:1042
+#: modules/pref-feeds.php:1059
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1046
+#: modules/pref-feeds.php:1063
msgid "File:"
msgstr "Fichier&nbsp;:"
-#: modules/pref-feeds.php:1049
+#: modules/pref-feeds.php:1066
msgid "Import"
msgstr "Importer"
-#: modules/pref-feeds.php:1056
+#: modules/pref-feeds.php:1073
msgid "Export OPML"
msgstr "Exporter en OPML"
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1076
msgid "Firefox Integration"
msgstr "Intégration à Firefox"
-#: modules/pref-feeds.php:1061
+#: modules/pref-feeds.php:1078
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -1733,11 +1762,11 @@ msgstr ""
"Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
"en cliquant sur le lien ci-dessous."
-#: modules/pref-feeds.php:1065
+#: modules/pref-feeds.php:1082
msgid "Click here to register this site as a feed reader."
msgstr "Cliquez ici pour enregistrer ce site comme lecteur de flux."
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1091
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the address specified below."
@@ -1745,7 +1774,7 @@ msgstr ""
"Les articles publiés sont exportés comme un flux RSS public et toute "
"personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire."
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1098
msgid "Generate another address"
msgstr "Générer une autre adresse"
@@ -1938,22 +1967,22 @@ msgstr "Permissions&nbsp;:"
msgid "Changed password of user <b>%s</b>."
msgstr "Mot de passe de l'utilisateur <b>%s</b> modifié."
-#: modules/pref-users.php:123
+#: modules/pref-users.php:126
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "Utilisateur <b>%s</b> ajouté avec le mot de passe <b>%s</b>"
-#: modules/pref-users.php:130
+#: modules/pref-users.php:133
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Impossible de créer l'utilisateur <b>%s</b>"
-#: modules/pref-users.php:134
+#: modules/pref-users.php:137
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "L'utilisateur <b>%s</b> existe déjà."
-#: modules/pref-users.php:154
+#: modules/pref-users.php:157
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -1962,31 +1991,31 @@ msgstr ""
"Mot de passe de l'utilisateur <b>%s</b>\n"
"\t\t\t\t\tmodifié en <b>%s</b>"
-#: modules/pref-users.php:158
+#: modules/pref-users.php:161
#, fuzzy, php-format
msgid "Notifying <b>%s</b>."
msgstr "Ajout de la catégorie <b>%s</b>."
-#: modules/pref-users.php:193
+#: modules/pref-users.php:196
msgid "Create user"
msgstr "Créer l'utilisateur"
-#: modules/pref-users.php:215
+#: modules/pref-users.php:218
msgid "Login"
msgstr "Se connecter"
-#: modules/pref-users.php:216
+#: modules/pref-users.php:219
msgid "Access Level"
msgstr "Permissions"
-#: modules/pref-users.php:217
+#: modules/pref-users.php:220
msgid "Last login"
msgstr "Dernière connexion"
-#: modules/pref-users.php:315
+#: modules/pref-users.php:318
msgid "User details"
msgstr "Détails de l'utilisateur"
-#: modules/pref-users.php:321
+#: modules/pref-users.php:324
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 04d1e940e..d075e7335 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.mo
+++ b/locale/nb_NO/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index 58de426cc..009347b66 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS 1.2.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-23 14:50+0300\n"
+"POT-Creation-Date: 2008-02-15 23:42+0300\n"
"Last-Translator: Christian Lomsdalen <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: backend.php:103 backend.php:112
+#: backend.php:103 backend.php:112 backend.php:123
msgid "Use default"
msgstr "Bruk standard"
@@ -74,31 +74,40 @@ msgstr "Daglig"
msgid "Weekly"
msgstr "Ukentlig"
-#: backend.php:124 modules/pref-users.php:249
+#: backend.php:124
+#, fuzzy
+msgid "Magpie"
+msgstr "Side"
+
+#: backend.php:125
+msgid "SimplePie"
+msgstr ""
+
+#: backend.php:134 modules/pref-users.php:252
msgid "User"
msgstr "Bruker"
-#: backend.php:125 modules/pref-users.php:249
+#: backend.php:135 modules/pref-users.php:252
msgid "Administrator"
msgstr "Administrator"
-#: backend.php:370
+#: backend.php:405
msgid "Registered"
msgstr "Registrert"
-#: backend.php:371
+#: backend.php:406
msgid "Last logged in"
msgstr "Sist innlogget"
-#: backend.php:372
+#: backend.php:407
msgid "Stored articles"
msgstr "Lagrede artikler"
-#: backend.php:379
+#: backend.php:414
msgid "Subscribed feeds count"
msgstr "Antall nyhetsstrømmer som abonneres på"
-#: backend.php:392
+#: backend.php:429
msgid "Subscribed feeds"
msgstr "Nyhetsstrømmer som abonneres på"
@@ -163,170 +172,175 @@ msgstr ""
"Din utgave av MySQL er i øyeblikket ikke støttet. Vennligst besøk den \n"
"\t\toffisielle siden for mer informasjon."
-#: functions.php:2427 functions.php:2766 functions.php:3131 functions.php:3938
+#: functions.php:2505 functions.php:2844 functions.php:3209 functions.php:4035
msgid "Starred articles"
msgstr "Favorittartikler"
-#: functions.php:2436 functions.php:2768 functions.php:3133 functions.php:3945
-#: modules/pref-feeds.php:1068
+#: functions.php:2514 functions.php:2846 functions.php:3211 functions.php:4042
+#: modules/pref-feeds.php:1085
msgid "Published articles"
msgstr "Publiserte artikler"
-#: functions.php:2445 functions.php:2770 functions.php:3135 functions.php:3923
+#: functions.php:2523 functions.php:2848 functions.php:3213 functions.php:4020
msgid "Fresh articles"
msgstr "Ferske artikler"
-#: functions.php:2688 modules/popup-dialog.php:151
+#: functions.php:2766 modules/popup-dialog.php:151
#: modules/pref-filters.php:290
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
-#: functions.php:2717 functions.php:2756 functions.php:3109 functions.php:4102
-#: functions.php:4132 modules/pref-feeds.php:880
+#: functions.php:2795 functions.php:2834 functions.php:3187 functions.php:4199
+#: functions.php:4229 modules/pref-feeds.php:897
msgid "Uncategorized"
msgstr "Ukategorisert"
-#: functions.php:2746 functions.php:3275
+#: functions.php:2824 functions.php:3353
msgid "Special"
msgstr "Snarveier"
-#: functions.php:2748 functions.php:3277
+#: functions.php:2826 functions.php:3355
msgid "Labels"
msgstr "Merkelapper"
-#: functions.php:3095 functions.php:3097
+#: functions.php:3173 functions.php:3175
msgid "Search results"
msgstr "Søkeresultat"
-#: functions.php:3113 functions.php:3126 functions.php:3143
+#: functions.php:3191 functions.php:3204 functions.php:3221
msgid "Searched for"
msgstr "Søkte etter"
-#: functions.php:3729 functions.php:3776 functions.php:4906
-#: modules/pref-feeds.php:655 modules/pref-feeds.php:842
+#: functions.php:3814 functions.php:3868 functions.php:5003
+#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
#: modules/pref-filters.php:255 modules/pref-labels.php:239
-#: modules/pref-users.php:208
+#: modules/pref-users.php:211
msgid "Select:"
msgstr "Velg:"
-#: functions.php:3730 functions.php:3777 modules/pref-feeds.php:656
-#: modules/pref-feeds.php:843 modules/pref-filters.php:256
-#: modules/pref-labels.php:240 modules/pref-users.php:209
+#: functions.php:3815 functions.php:3869 modules/pref-feeds.php:673
+#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: modules/pref-labels.php:240 modules/pref-users.php:212
msgid "All"
msgstr "Alle"
-#: functions.php:3731 functions.php:3735 functions.php:3778 functions.php:3781
+#: functions.php:3816 functions.php:3820 functions.php:3870 functions.php:3873
#: tt-rss.php:175
msgid "Unread"
msgstr "Ulest"
-#: functions.php:3732 functions.php:3779 modules/pref-feeds.php:657
-#: modules/pref-feeds.php:844 modules/pref-filters.php:257
-#: modules/pref-labels.php:241 modules/pref-users.php:210
+#: functions.php:3817 functions.php:3871 modules/pref-feeds.php:674
+#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: modules/pref-labels.php:241 modules/pref-users.php:213
msgid "None"
msgstr "Ingen"
-#: functions.php:3734
+#: functions.php:3819
msgid "Toggle"
msgstr "Vis"
-#: functions.php:3736 functions.php:3782 tt-rss.php:174
+#: functions.php:3821 functions.php:3874 tt-rss.php:174
msgid "Starred"
msgstr "Favoritter"
-#: functions.php:3737
+#: functions.php:3822
msgid "Published"
msgstr "Publisert"
-#: functions.php:3740 localized_schema.php:15
+#: functions.php:3825 localized_schema.php:15
msgid "Mark as read"
msgstr "Marker som lest"
-#: functions.php:3741
+#: functions.php:3826
msgid "Selection"
msgstr "Utvalg"
-#: functions.php:3742
+#: functions.php:3827
msgid "This page"
msgstr "Denne siden"
-#: functions.php:3744
+#: functions.php:3833
msgid "Above active article"
msgstr "Ovenfor aktiv artikkel"
-#: functions.php:3745
+#: functions.php:3834
msgid "Below active article"
msgstr "Nedenfor aktiv artikkel"
-#: functions.php:3747
+#: functions.php:3839
msgid "Entire feed"
msgstr "Hele nyhetsstrømmen"
-#: functions.php:3755
+#: functions.php:3847
msgid "Next page"
msgstr "Neste side"
-#: functions.php:3756
+#: functions.php:3848
msgid "Previous page"
msgstr "Forrige side"
-#: functions.php:3757
+#: functions.php:3849
msgid "First page"
msgstr "Første side"
-#: functions.php:3767 functions.php:3793
+#: functions.php:3859 functions.php:3885
msgid "Convert to label"
msgstr "Konverter til merkelapp"
-#: functions.php:3781
+#: functions.php:3873
msgid "Toggle:"
msgstr "Vis:"
-#: functions.php:3784
+#: functions.php:3876
msgid "Mark as read:"
msgstr "Marker som lest:"
-#: functions.php:3785
+#: functions.php:3877
msgid "Page"
msgstr "Side"
-#: functions.php:3786 modules/pref-filters.php:263
+#: functions.php:3878 modules/pref-filters.php:263
msgid "Feed"
msgstr "Nyhetsstrøm"
-#: functions.php:3836
+#: functions.php:3928
msgid "Generated feed"
msgstr "Generert nyhetsstrøm"
-#: functions.php:4172
+#: functions.php:4008
+msgid "Dashboard"
+msgstr ""
+
+#: functions.php:4269
msgid "No feeds to display."
msgstr "Ingen nyhetstrømmer å vise"
-#: functions.php:4189
+#: functions.php:4286
msgid "Tags"
msgstr "Tagger"
-#: functions.php:4414
-msgid " - by "
+#: functions.php:4511
+#, fuzzy
+msgid " - "
msgstr "- av "
-#: functions.php:4469
+#: functions.php:4566
msgid "no tags"
msgstr "Ingen tagger"
-#: functions.php:4500 functions.php:4867
+#: functions.php:4597 functions.php:4964
msgid "Attachment:"
msgstr "Vedlegg:"
-#: functions.php:4502 functions.php:4869
+#: functions.php:4599 functions.php:4966
msgid "Attachments:"
msgstr "Vedlegg:"
-#: functions.php:4575
+#: functions.php:4672 modules/pref-feed-browser.php:74
msgid "Feed not found."
msgstr "Nyhetsstrømmen ble ikke funnet"
-#: functions.php:4642
+#: functions.php:4739
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -334,11 +348,11 @@ msgstr ""
"Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
"merkelappsyntaksen eller lokal konfigurasjon."
-#: functions.php:4840
+#: functions.php:4937
msgid "Show article"
msgstr "Vis artikkelen"
-#: functions.php:4969
+#: functions.php:5066
msgid "No articles found."
msgstr "Ingen artikler ble funnet"
@@ -667,7 +681,7 @@ msgid "Erase all non-starred articles in %s?"
msgstr "Fjern alle ikke-favoriserte artikler i %s?"
#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:855 modules/pref-feeds.php:916
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:933
msgid "Title"
msgstr "Tittel"
@@ -910,12 +924,12 @@ msgstr "Slett uleste artikler"
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
#: modules/pref-users.php:29
msgid "Login:"
msgstr "Brukernavn:"
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
msgid "Password:"
msgstr "Passord:"
@@ -1151,12 +1165,12 @@ msgstr "Kommentarer?"
msgid "tag cloud"
msgstr "Tag-sky"
-#: tt-rss.php:140 modules/pref-feeds.php:1003
+#: tt-rss.php:140 modules/pref-feeds.php:1020
msgid "Actions..."
msgstr "Handlinger..."
#: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:749
+#: modules/pref-feeds.php:766
msgid "Search"
msgstr "Søk"
@@ -1288,7 +1302,7 @@ msgid "Help topic not found."
msgstr "Hjelp-emne kunne ikke bli funnet"
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:706
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:723
msgid "Close this window"
msgstr "Lukk dette vinduet"
@@ -1362,27 +1376,27 @@ msgstr ""
"sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
"nyhetsstrømmen"
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:762
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:779
msgid "Subscribe to feed"
msgstr "Abonner på nyhetsstrøm"
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:165
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
msgid "Feed URL:"
msgstr "Nyhetsstrømsadresse:"
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:173
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
msgid "Category:"
msgstr "Kategori:"
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
-#: modules/pref-feeds.php:118
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
+#: modules/pref-feeds.php:119
msgid "Subscribe"
msgstr "Abonner"
#: modules/popup-dialog.php:114 modules/popup-dialog.php:199
#: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:352 modules/pref-filters.php:118
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
+#: modules/pref-feeds.php:367 modules/pref-filters.php:118
#: modules/pref-users.php:58
msgid "Cancel"
msgstr "Avbryt"
@@ -1461,7 +1475,7 @@ msgstr "Handling:"
msgid "Params:"
msgstr "Parametre:"
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
msgid "Options:"
msgstr "Valg:"
@@ -1489,7 +1503,7 @@ msgstr "Endre tagger"
msgid "Tags for this article (separated by commas):"
msgstr "Denne artikkelens tagger (separert med kommaer):"
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:350
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
#: modules/pref-filters.php:114 modules/pref-users.php:55
msgid "Save"
msgstr "Lagre"
@@ -1506,7 +1520,7 @@ msgstr "Vis mest populære tagger"
msgid "browse more"
msgstr "utforsk videre"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:54
msgid "Feed browser is administratively disabled."
msgstr "Nyhetsstrømsutforsker er administrativt avskrudd"
@@ -1514,11 +1528,21 @@ msgstr "Nyhetsstrømsutforsker er administrativt avskrudd"
msgid "Feed information:"
msgstr "Nyhetsstrømsinformasjon:"
-#: modules/pref-feed-browser.php:51
+#: modules/pref-feed-browser.php:38
+#, fuzzy
+msgid "Site:"
+msgstr "Tittel:"
+
+#: modules/pref-feed-browser.php:40
+#, fuzzy
+msgid "Last updated:"
+msgstr "Siste oppdatering:"
+
+#: modules/pref-feed-browser.php:55
msgid "Last headlines:"
msgstr "Siste artikler:"
-#: modules/pref-feed-browser.php:77
+#: modules/pref-feed-browser.php:84
msgid ""
"This panel shows feeds subscribed by other users of this system, just in "
"case you are interested in them too."
@@ -1526,184 +1550,189 @@ msgstr ""
"Denne siden viser nyhetsstrømmer som andre brukere av systemet abonnerer på, "
"i tilfelle du skulle være interessert i de også."
-#: modules/pref-feed-browser.php:94
+#: modules/pref-feed-browser.php:101
msgid "Top"
msgstr "Topp"
-#: modules/pref-feed-browser.php:103
+#: modules/pref-feed-browser.php:110
msgid "Show"
msgstr "Vis"
-#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
msgid "No feeds found to subscribe."
msgstr "Ingen nyhetsstrømmer ble funnet for å abonneres på"
-#: modules/pref-feeds.php:38
+#: modules/pref-feeds.php:39
msgid "Subscribed to feeds:"
msgstr "Abonnerer på følgende nyhetsstrømmer:"
-#: modules/pref-feeds.php:57
+#: modules/pref-feeds.php:58
msgid "Other feeds: Top 25"
msgstr "Andre nyhetsstrømmer: Topp 25"
-#: modules/pref-feeds.php:61
+#: modules/pref-feeds.php:62
msgid "Showing top 25 registered feeds, sorted by popularity:"
msgstr "Viser topp 25 nyhetsstrømmer, sortert etter popularitet:"
-#: modules/pref-feeds.php:145
+#: modules/pref-feeds.php:146
msgid "Feed editor"
msgstr "Nyhetsstrømsredigerer"
-#: modules/pref-feeds.php:157
+#: modules/pref-feeds.php:158
msgid "Title:"
msgstr "Tittel:"
-#: modules/pref-feeds.php:193
+#: modules/pref-feeds.php:194
msgid "Update Interval:"
msgstr "Oppdateringsintervall:"
-#: modules/pref-feeds.php:202
+#: modules/pref-feeds.php:203
msgid "Link to:"
msgstr "Link til:"
-#: modules/pref-feeds.php:219
+#: modules/pref-feeds.php:220
msgid "Not linked"
msgstr "Ikke linket til"
-#: modules/pref-feeds.php:253
+#: modules/pref-feeds.php:254
msgid "Article purging:"
msgstr "Slett artikler:"
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:267
+#, fuzzy
+msgid "Update using:"
+msgstr "Oppdater"
+
+#: modules/pref-feeds.php:300
msgid "Hide from \"Other Feeds\""
msgstr "Skjul fra \"Andre nyhetsstrømmer\""
-#: modules/pref-feeds.php:296
+#: modules/pref-feeds.php:311
msgid "Right-to-left content"
msgstr "Innhold som vises fra høyre til venstre"
-#: modules/pref-feeds.php:307
+#: modules/pref-feeds.php:322
msgid "Hide from my feed list"
msgstr "Skjul fra min nyhetsstrømslisten"
-#: modules/pref-feeds.php:319
+#: modules/pref-feeds.php:334
msgid "Include in e-mail digest"
msgstr "Inkluder i e-postsammendraget"
-#: modules/pref-feeds.php:340
+#: modules/pref-feeds.php:355
msgid "Cache images locally"
msgstr "Mellomlagre bilder lokalt på serveren"
-#: modules/pref-feeds.php:486
+#: modules/pref-feeds.php:503
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Abonnerer på <b>%s</b>"
-#: modules/pref-feeds.php:488
+#: modules/pref-feeds.php:505
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Abonnerer allerede på <b>%s</b>"
-#: modules/pref-feeds.php:573
+#: modules/pref-feeds.php:590
msgid "Category editor"
msgstr "Kategoriredigerer"
-#: modules/pref-feeds.php:596
+#: modules/pref-feeds.php:613
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
-#: modules/pref-feeds.php:624
+#: modules/pref-feeds.php:641
msgid "Unable to delete non empty feed categories."
msgstr "Kunne ikke slette kategorien, den var ikke tom"
-#: modules/pref-feeds.php:641
+#: modules/pref-feeds.php:658
msgid "Create category"
msgstr "Lag kategori"
-#: modules/pref-feeds.php:701
+#: modules/pref-feeds.php:718
msgid "No feed categories defined."
msgstr "Ingen kategorier ble markert"
-#: modules/pref-feeds.php:712 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:319
+#: modules/pref-feeds.php:729 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:322
msgid "Remove"
msgstr "Fjern"
-#: modules/pref-feeds.php:734
+#: modules/pref-feeds.php:751
msgid "Some feeds have update errors (click for details)"
msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
-#: modules/pref-feeds.php:767
+#: modules/pref-feeds.php:784
msgid "Top 25"
msgstr "Topp 25"
-#: modules/pref-feeds.php:841
+#: modules/pref-feeds.php:858
msgid "Show last article times"
msgstr "Vis tidspunktene for siste artikkel"
-#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
msgid "Last&nbsp;Article"
msgstr "Siste&nbsp;Artikkel"
-#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
+#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
msgid "Updated"
msgstr "Oppdatert"
-#: modules/pref-feeds.php:991 modules/pref-feeds.php:1005
+#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
msgid "Selection:"
msgstr "Utvalg:"
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1014
msgid "Recategorize"
msgstr "Rekategoriser"
-#: modules/pref-feeds.php:1006 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:317
+#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:320
msgid "Edit"
msgstr "Rediger"
-#: modules/pref-feeds.php:1007
+#: modules/pref-feeds.php:1024
msgid "Manual purge"
msgstr "Slett manuelt"
-#: modules/pref-feeds.php:1008
+#: modules/pref-feeds.php:1025
msgid "Clear feed data"
msgstr "Slett nyhetsstrømsdata"
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1026
msgid "Unsubscribe"
msgstr "Avabonner"
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1031
msgid "Other:"
msgstr "Andre:"
-#: modules/pref-feeds.php:1015
+#: modules/pref-feeds.php:1032
msgid "Edit categories"
msgstr "Rediger kategorier"
-#: modules/pref-feeds.php:1042
+#: modules/pref-feeds.php:1059
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1046
+#: modules/pref-feeds.php:1063
msgid "File:"
msgstr "Fil:"
-#: modules/pref-feeds.php:1049
+#: modules/pref-feeds.php:1066
msgid "Import"
msgstr "Importer"
-#: modules/pref-feeds.php:1056
+#: modules/pref-feeds.php:1073
msgid "Export OPML"
msgstr "Eksporter OPML"
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1076
msgid "Firefox Integration"
msgstr "Firefox integrering"
-#: modules/pref-feeds.php:1061
+#: modules/pref-feeds.php:1078
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -1711,11 +1740,11 @@ msgstr ""
"Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
"ved å trykke på lenken nedenfor."
-#: modules/pref-feeds.php:1065
+#: modules/pref-feeds.php:1082
msgid "Click here to register this site as a feed reader."
msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1091
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the address specified below."
@@ -1723,7 +1752,7 @@ msgstr ""
"Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetsstrøm og "
"kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1098
msgid "Generate another address"
msgstr "Genererer en ny adresse"
@@ -1916,22 +1945,22 @@ msgstr "Tilgangsnivå:"
msgid "Changed password of user <b>%s</b>."
msgstr "Byttet passord for bruker <b>%s</b>."
-#: modules/pref-users.php:123
+#: modules/pref-users.php:126
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
-#: modules/pref-users.php:130
+#: modules/pref-users.php:133
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Kunne ikke lage brukeren <b>%s</b>"
-#: modules/pref-users.php:134
+#: modules/pref-users.php:137
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "Brukeren <b>%s</b> finnes allerede."
-#: modules/pref-users.php:154
+#: modules/pref-users.php:157
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -1940,31 +1969,31 @@ msgstr ""
"Byttet passord forbruker <b>%s</b>\n"
"\t\t\t\t\t til <b>%s</b>"
-#: modules/pref-users.php:158
+#: modules/pref-users.php:161
#, fuzzy, php-format
msgid "Notifying <b>%s</b>."
msgstr "Legger til kategori <b>%</b>"
-#: modules/pref-users.php:193
+#: modules/pref-users.php:196
msgid "Create user"
msgstr "Lag bruker"
-#: modules/pref-users.php:215
+#: modules/pref-users.php:218
msgid "Login"
msgstr "Logg inn"
-#: modules/pref-users.php:216
+#: modules/pref-users.php:219
msgid "Access Level"
msgstr "Tilgangsnivå"
-#: modules/pref-users.php:217
+#: modules/pref-users.php:220
msgid "Last login"
msgstr "Siste innlogging"
-#: modules/pref-users.php:315
+#: modules/pref-users.php:318
msgid "User details"
msgstr "Brukerdetaljer"
-#: modules/pref-users.php:321
+#: modules/pref-users.php:324
msgid "Reset password"
msgstr "Nullstill passordet"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 12b645cfd..e7cb80092 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.mo
+++ b/locale/pt_BR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 6ba708f2d..7b46f3314 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss 1.2.14.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-23 14:50+0300\n"
+"POT-Creation-Date: 2008-02-15 23:42+0300\n"
"PO-Revision-Date: 2007-10-24 00:47-0200\n"
"Last-Translator: Marcelo Jorge VIeira (metal) <[email protected]>\n"
"Language-Team: Portuguese/Brazil\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: backend.php:103 backend.php:112
+#: backend.php:103 backend.php:112 backend.php:123
msgid "Use default"
msgstr "Usar o padrão"
@@ -76,33 +76,42 @@ msgstr "Diariamente"
msgid "Weekly"
msgstr "Semanalmente"
-#: backend.php:124 modules/pref-users.php:249
+#: backend.php:124
+#, fuzzy
+msgid "Magpie"
+msgstr "Página"
+
+#: backend.php:125
+msgid "SimplePie"
+msgstr ""
+
+#: backend.php:134 modules/pref-users.php:252
msgid "User"
msgstr "Usuário"
-#: backend.php:125 modules/pref-users.php:249
+#: backend.php:135 modules/pref-users.php:252
msgid "Administrator"
msgstr "Administrador"
-#: backend.php:370
+#: backend.php:405
msgid "Registered"
msgstr ""
-#: backend.php:371
+#: backend.php:406
#, fuzzy
msgid "Last logged in"
msgstr "Último Login"
-#: backend.php:372
+#: backend.php:407
#, fuzzy
msgid "Stored articles"
msgstr "Favoritos"
-#: backend.php:379
+#: backend.php:414
msgid "Subscribed feeds count"
msgstr ""
-#: backend.php:392
+#: backend.php:429
msgid "Subscribed feeds"
msgstr ""
@@ -162,181 +171,186 @@ msgstr ""
"Sua versão do MySQL não é atualmente suportada. Por favor acesse \n"
"\t\to site oficial para mais informações."
-#: functions.php:2427 functions.php:2766 functions.php:3131 functions.php:3938
+#: functions.php:2505 functions.php:2844 functions.php:3209 functions.php:4035
msgid "Starred articles"
msgstr ""
-#: functions.php:2436 functions.php:2768 functions.php:3133 functions.php:3945
-#: modules/pref-feeds.php:1068
+#: functions.php:2514 functions.php:2846 functions.php:3211 functions.php:4042
+#: modules/pref-feeds.php:1085
msgid "Published articles"
msgstr ""
-#: functions.php:2445 functions.php:2770 functions.php:3135 functions.php:3923
+#: functions.php:2523 functions.php:2848 functions.php:3213 functions.php:4020
msgid "Fresh articles"
msgstr ""
-#: functions.php:2688 modules/popup-dialog.php:151
+#: functions.php:2766 modules/popup-dialog.php:151
#: modules/pref-filters.php:290
msgid "All feeds"
msgstr "Todos os feeds"
-#: functions.php:2717 functions.php:2756 functions.php:3109 functions.php:4102
-#: functions.php:4132 modules/pref-feeds.php:880
+#: functions.php:2795 functions.php:2834 functions.php:3187 functions.php:4199
+#: functions.php:4229 modules/pref-feeds.php:897
msgid "Uncategorized"
msgstr "Não Categorizado"
-#: functions.php:2746 functions.php:3275
+#: functions.php:2824 functions.php:3353
msgid "Special"
msgstr "Especial"
-#: functions.php:2748 functions.php:3277
+#: functions.php:2826 functions.php:3355
msgid "Labels"
msgstr ""
-#: functions.php:3095 functions.php:3097
+#: functions.php:3173 functions.php:3175
msgid "Search results"
msgstr ""
-#: functions.php:3113 functions.php:3126 functions.php:3143
+#: functions.php:3191 functions.php:3204 functions.php:3221
msgid "Searched for"
msgstr ""
-#: functions.php:3729 functions.php:3776 functions.php:4906
-#: modules/pref-feeds.php:655 modules/pref-feeds.php:842
+#: functions.php:3814 functions.php:3868 functions.php:5003
+#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
#: modules/pref-filters.php:255 modules/pref-labels.php:239
-#: modules/pref-users.php:208
+#: modules/pref-users.php:211
msgid "Select:"
msgstr "Selecione:"
-#: functions.php:3730 functions.php:3777 modules/pref-feeds.php:656
-#: modules/pref-feeds.php:843 modules/pref-filters.php:256
-#: modules/pref-labels.php:240 modules/pref-users.php:209
+#: functions.php:3815 functions.php:3869 modules/pref-feeds.php:673
+#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: modules/pref-labels.php:240 modules/pref-users.php:212
msgid "All"
msgstr "Todos"
-#: functions.php:3731 functions.php:3735 functions.php:3778 functions.php:3781
+#: functions.php:3816 functions.php:3820 functions.php:3870 functions.php:3873
#: tt-rss.php:175
msgid "Unread"
msgstr "Não Lido"
-#: functions.php:3732 functions.php:3779 modules/pref-feeds.php:657
-#: modules/pref-feeds.php:844 modules/pref-filters.php:257
-#: modules/pref-labels.php:241 modules/pref-users.php:210
+#: functions.php:3817 functions.php:3871 modules/pref-feeds.php:674
+#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: modules/pref-labels.php:241 modules/pref-users.php:213
msgid "None"
msgstr "Nenhum"
-#: functions.php:3734
+#: functions.php:3819
msgid "Toggle"
msgstr ""
-#: functions.php:3736 functions.php:3782 tt-rss.php:174
+#: functions.php:3821 functions.php:3874 tt-rss.php:174
msgid "Starred"
msgstr "Favoritos"
-#: functions.php:3737
+#: functions.php:3822
msgid "Published"
msgstr "Publicado"
-#: functions.php:3740 localized_schema.php:15
+#: functions.php:3825 localized_schema.php:15
msgid "Mark as read"
msgstr "Marcar como lido"
-#: functions.php:3741
+#: functions.php:3826
msgid "Selection"
msgstr "Seleção"
-#: functions.php:3742
+#: functions.php:3827
msgid "This page"
msgstr ""
-#: functions.php:3744
+#: functions.php:3833
msgid "Above active article"
msgstr ""
-#: functions.php:3745
+#: functions.php:3834
msgid "Below active article"
msgstr ""
-#: functions.php:3747
+#: functions.php:3839
msgid "Entire feed"
msgstr ""
-#: functions.php:3755
+#: functions.php:3847
msgid "Next page"
msgstr "Próxima página"
-#: functions.php:3756
+#: functions.php:3848
msgid "Previous page"
msgstr "Página anterior"
-#: functions.php:3757
+#: functions.php:3849
msgid "First page"
msgstr "Primeira página"
-#: functions.php:3767 functions.php:3793
+#: functions.php:3859 functions.php:3885
msgid "Convert to label"
msgstr ""
-#: functions.php:3781
+#: functions.php:3873
msgid "Toggle:"
msgstr ""
-#: functions.php:3784
+#: functions.php:3876
msgid "Mark as read:"
msgstr "Marcar como lido:"
-#: functions.php:3785
+#: functions.php:3877
msgid "Page"
msgstr "Página"
-#: functions.php:3786 modules/pref-filters.php:263
+#: functions.php:3878 modules/pref-filters.php:263
msgid "Feed"
msgstr "Feed"
-#: functions.php:3836
+#: functions.php:3928
msgid "Generated feed"
msgstr ""
-#: functions.php:4172
+#: functions.php:4008
+msgid "Dashboard"
+msgstr ""
+
+#: functions.php:4269
msgid "No feeds to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:4189
+#: functions.php:4286
msgid "Tags"
msgstr "Tags"
-#: functions.php:4414
-msgid " - by "
+#: functions.php:4511
+#, fuzzy
+msgid " - "
msgstr " - por "
-#: functions.php:4469
+#: functions.php:4566
msgid "no tags"
msgstr "sem tags"
-#: functions.php:4500 functions.php:4867
+#: functions.php:4597 functions.php:4964
msgid "Attachment:"
msgstr ""
-#: functions.php:4502 functions.php:4869
+#: functions.php:4599 functions.php:4966
msgid "Attachments:"
msgstr ""
-#: functions.php:4575
+#: functions.php:4672 modules/pref-feed-browser.php:74
msgid "Feed not found."
msgstr "Feed não encontrado."
-#: functions.php:4642
+#: functions.php:4739
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:4840
+#: functions.php:4937
#, fuzzy
msgid "Show article"
msgstr "Favoritos"
-#: functions.php:4969
+#: functions.php:5066
msgid "No articles found."
msgstr ""
@@ -666,7 +680,7 @@ msgid "Erase all non-starred articles in %s?"
msgstr ""
#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:855 modules/pref-feeds.php:916
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:933
msgid "Title"
msgstr "Título"
@@ -888,12 +902,12 @@ msgstr ""
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
#: modules/pref-users.php:29
msgid "Login:"
msgstr "Login:"
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
msgid "Password:"
msgstr "Senha:"
@@ -1105,12 +1119,12 @@ msgstr "Conteúdo"
msgid "tag cloud"
msgstr "núvem de tags"
-#: tt-rss.php:140 modules/pref-feeds.php:1003
+#: tt-rss.php:140 modules/pref-feeds.php:1020
msgid "Actions..."
msgstr "Ações..."
#: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:749
+#: modules/pref-feeds.php:766
msgid "Search"
msgstr ""
@@ -1239,7 +1253,7 @@ msgid "Help topic not found."
msgstr "Tópico de ajuda não encontrado."
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:706
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:723
msgid "Close this window"
msgstr "Fechar esta janela"
@@ -1303,27 +1317,27 @@ msgid ""
"\t\t\t\t\towner."
msgstr ""
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:762
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:779
msgid "Subscribe to feed"
msgstr ""
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:165
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
msgid "Feed URL:"
msgstr "Feed URL:"
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:173
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
msgid "Category:"
msgstr "Categoria:"
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
-#: modules/pref-feeds.php:118
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
+#: modules/pref-feeds.php:119
msgid "Subscribe"
msgstr ""
#: modules/popup-dialog.php:114 modules/popup-dialog.php:199
#: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:352 modules/pref-filters.php:118
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
+#: modules/pref-feeds.php:367 modules/pref-filters.php:118
#: modules/pref-users.php:58
msgid "Cancel"
msgstr "Cancelar"
@@ -1402,7 +1416,7 @@ msgstr "Ação:"
msgid "Params:"
msgstr ""
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
msgid "Options:"
msgstr "Opções:"
@@ -1430,7 +1444,7 @@ msgstr "Editar Tags"
msgid "Tags for this article (separated by commas):"
msgstr ""
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:350
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
#: modules/pref-filters.php:114 modules/pref-users.php:55
msgid "Save"
msgstr "Salvar"
@@ -1447,7 +1461,7 @@ msgstr "Exibir as Tags mais populares."
msgid "browse more"
msgstr ""
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:54
msgid "Feed browser is administratively disabled."
msgstr ""
@@ -1455,212 +1469,227 @@ msgstr ""
msgid "Feed information:"
msgstr "Informações do Feed:"
-#: modules/pref-feed-browser.php:51
+#: modules/pref-feed-browser.php:38
+#, fuzzy
+msgid "Site:"
+msgstr "Título"
+
+#: modules/pref-feed-browser.php:40
+#, fuzzy
+msgid "Last updated:"
+msgstr "Atualizado"
+
+#: modules/pref-feed-browser.php:55
msgid "Last headlines:"
msgstr ""
-#: modules/pref-feed-browser.php:77
+#: modules/pref-feed-browser.php:84
msgid ""
"This panel shows feeds subscribed by other users of this system, just in "
"case you are interested in them too."
msgstr ""
-#: modules/pref-feed-browser.php:94
+#: modules/pref-feed-browser.php:101
msgid "Top"
msgstr ""
-#: modules/pref-feed-browser.php:103
+#: modules/pref-feed-browser.php:110
msgid "Show"
msgstr ""
-#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
msgid "No feeds found to subscribe."
msgstr ""
-#: modules/pref-feeds.php:38
+#: modules/pref-feeds.php:39
msgid "Subscribed to feeds:"
msgstr ""
-#: modules/pref-feeds.php:57
+#: modules/pref-feeds.php:58
msgid "Other feeds: Top 25"
msgstr ""
-#: modules/pref-feeds.php:61
+#: modules/pref-feeds.php:62
msgid "Showing top 25 registered feeds, sorted by popularity:"
msgstr ""
-#: modules/pref-feeds.php:145
+#: modules/pref-feeds.php:146
msgid "Feed editor"
msgstr "Editor de Feed"
-#: modules/pref-feeds.php:157
+#: modules/pref-feeds.php:158
msgid "Title:"
msgstr "Título"
-#: modules/pref-feeds.php:193
+#: modules/pref-feeds.php:194
msgid "Update Interval:"
msgstr ""
-#: modules/pref-feeds.php:202
+#: modules/pref-feeds.php:203
msgid "Link to:"
msgstr ""
-#: modules/pref-feeds.php:219
+#: modules/pref-feeds.php:220
msgid "Not linked"
msgstr ""
-#: modules/pref-feeds.php:253
+#: modules/pref-feeds.php:254
msgid "Article purging:"
msgstr ""
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:267
+#, fuzzy
+msgid "Update using:"
+msgstr "Atualizar"
+
+#: modules/pref-feeds.php:300
msgid "Hide from \"Other Feeds\""
msgstr ""
-#: modules/pref-feeds.php:296
+#: modules/pref-feeds.php:311
msgid "Right-to-left content"
msgstr ""
-#: modules/pref-feeds.php:307
+#: modules/pref-feeds.php:322
msgid "Hide from my feed list"
msgstr ""
-#: modules/pref-feeds.php:319
+#: modules/pref-feeds.php:334
msgid "Include in e-mail digest"
msgstr ""
-#: modules/pref-feeds.php:340
+#: modules/pref-feeds.php:355
msgid "Cache images locally"
msgstr ""
-#: modules/pref-feeds.php:486
+#: modules/pref-feeds.php:503
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:488
+#: modules/pref-feeds.php:505
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:573
+#: modules/pref-feeds.php:590
msgid "Category editor"
msgstr "Editor de Categoria"
-#: modules/pref-feeds.php:596
+#: modules/pref-feeds.php:613
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "A categoria <b>$%s</b> já existe na base de dados."
-#: modules/pref-feeds.php:624
+#: modules/pref-feeds.php:641
msgid "Unable to delete non empty feed categories."
msgstr ""
-#: modules/pref-feeds.php:641
+#: modules/pref-feeds.php:658
msgid "Create category"
msgstr "Criar categoria"
-#: modules/pref-feeds.php:701
+#: modules/pref-feeds.php:718
msgid "No feed categories defined."
msgstr ""
-#: modules/pref-feeds.php:712 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:319
+#: modules/pref-feeds.php:729 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:322
msgid "Remove"
msgstr "Remover"
-#: modules/pref-feeds.php:734
+#: modules/pref-feeds.php:751
msgid "Some feeds have update errors (click for details)"
msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
-#: modules/pref-feeds.php:767
+#: modules/pref-feeds.php:784
msgid "Top 25"
msgstr ""
-#: modules/pref-feeds.php:841
+#: modules/pref-feeds.php:858
msgid "Show last article times"
msgstr ""
-#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
msgid "Last&nbsp;Article"
msgstr ""
-#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
+#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
msgid "Updated"
msgstr "Atualizado"
-#: modules/pref-feeds.php:991 modules/pref-feeds.php:1005
+#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
#, fuzzy
msgid "Selection:"
msgstr "Seleção"
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1014
msgid "Recategorize"
msgstr ""
-#: modules/pref-feeds.php:1006 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:317
+#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:320
msgid "Edit"
msgstr "Editar"
-#: modules/pref-feeds.php:1007
+#: modules/pref-feeds.php:1024
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1008
+#: modules/pref-feeds.php:1025
msgid "Clear feed data"
msgstr ""
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1026
msgid "Unsubscribe"
msgstr ""
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1031
#, fuzzy
msgid "Other:"
msgstr "Onde:"
-#: modules/pref-feeds.php:1015
+#: modules/pref-feeds.php:1032
msgid "Edit categories"
msgstr "Editar categorias"
-#: modules/pref-feeds.php:1042
+#: modules/pref-feeds.php:1059
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1046
+#: modules/pref-feeds.php:1063
msgid "File:"
msgstr "Arquivo:"
-#: modules/pref-feeds.php:1049
+#: modules/pref-feeds.php:1066
msgid "Import"
msgstr "Importar"
-#: modules/pref-feeds.php:1056
+#: modules/pref-feeds.php:1073
msgid "Export OPML"
msgstr "Exportar OPML"
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1076
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1061
+#: modules/pref-feeds.php:1078
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1065
+#: modules/pref-feeds.php:1082
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1091
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the address specified below."
msgstr ""
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1098
msgid "Generate another address"
msgstr "Gerar um outro endereço"
@@ -1853,22 +1882,22 @@ msgstr "Nível de acesso:"
msgid "Changed password of user <b>%s</b>."
msgstr "Alterada a senha do usuário <b>%s</b>."
-#: modules/pref-users.php:123
+#: modules/pref-users.php:126
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "Adicionado usuário <b>%s</b> com senha <b>%s</b>"
-#: modules/pref-users.php:130
+#: modules/pref-users.php:133
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Não pode criar o usuário <b>%s</b>"
-#: modules/pref-users.php:134
+#: modules/pref-users.php:137
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "O usuário <b>%s</b> já existe."
-#: modules/pref-users.php:154
+#: modules/pref-users.php:157
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -1877,32 +1906,32 @@ msgstr ""
"Alterada a senha do usuário <b>%s</b>\n"
"\t\t\t\t\t para <b>%s</b>"
-#: modules/pref-users.php:158
+#: modules/pref-users.php:161
#, fuzzy, php-format
msgid "Notifying <b>%s</b>."
msgstr "Adicionando a categoria <b>%s</b>."
-#: modules/pref-users.php:193
+#: modules/pref-users.php:196
msgid "Create user"
msgstr "Criar um usuário"
-#: modules/pref-users.php:215
+#: modules/pref-users.php:218
msgid "Login"
msgstr "Login"
-#: modules/pref-users.php:216
+#: modules/pref-users.php:219
msgid "Access Level"
msgstr "Nível de acesso"
-#: modules/pref-users.php:217
+#: modules/pref-users.php:220
msgid "Last login"
msgstr "Último Login"
-#: modules/pref-users.php:315
+#: modules/pref-users.php:318
msgid "User details"
msgstr "Detalhes do usuário"
-#: modules/pref-users.php:321
+#: modules/pref-users.php:324
msgid "Reset password"
msgstr ""
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 779adab19..455ce7719 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index eb42fd503..800994523 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-23 14:50+0300\n"
+"POT-Creation-Date: 2008-02-15 23:42+0300\n"
"PO-Revision-Date: 2007-08-18 15:14+0400\n"
"Last-Translator: Andrew Dolgov <[email protected]>\n"
"Language-Team: Русский <[email protected]>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: backend.php:103 backend.php:112
+#: backend.php:103 backend.php:112 backend.php:123
msgid "Use default"
msgstr "По умолчанию"
@@ -76,34 +76,43 @@ msgstr "Раз в день"
msgid "Weekly"
msgstr "Раз в неделю"
-#: backend.php:124 modules/pref-users.php:249
+#: backend.php:124
+#, fuzzy
+msgid "Magpie"
+msgstr "Страница"
+
+#: backend.php:125
+msgid "SimplePie"
+msgstr ""
+
+#: backend.php:134 modules/pref-users.php:252
msgid "User"
msgstr "Пользователь"
-#: backend.php:125 modules/pref-users.php:249
+#: backend.php:135 modules/pref-users.php:252
msgid "Administrator"
msgstr "Администратор"
-#: backend.php:370
+#: backend.php:405
msgid "Registered"
msgstr ""
-#: backend.php:371
+#: backend.php:406
#, fuzzy
msgid "Last logged in"
msgstr "Последний вход"
-#: backend.php:372
+#: backend.php:407
#, fuzzy
msgid "Stored articles"
msgstr "Отмеченные"
-#: backend.php:379
+#: backend.php:414
#, fuzzy
msgid "Subscribed feeds count"
msgstr "Подписаны каналы:"
-#: backend.php:392
+#: backend.php:429
#, fuzzy
msgid "Subscribed feeds"
msgstr "Подписаны каналы:"
@@ -164,184 +173,189 @@ msgid ""
"\t\tofficial site for more information."
msgstr ""
-#: functions.php:2427 functions.php:2766 functions.php:3131 functions.php:3938
+#: functions.php:2505 functions.php:2844 functions.php:3209 functions.php:4035
msgid "Starred articles"
msgstr "Отмеченные"
-#: functions.php:2436 functions.php:2768 functions.php:3133 functions.php:3945
-#: modules/pref-feeds.php:1068
+#: functions.php:2514 functions.php:2846 functions.php:3211 functions.php:4042
+#: modules/pref-feeds.php:1085
msgid "Published articles"
msgstr "Опубликованные"
-#: functions.php:2445 functions.php:2770 functions.php:3135 functions.php:3923
+#: functions.php:2523 functions.php:2848 functions.php:3213 functions.php:4020
#, fuzzy
msgid "Fresh articles"
msgstr "Отмеченные"
-#: functions.php:2688 modules/popup-dialog.php:151
+#: functions.php:2766 modules/popup-dialog.php:151
#: modules/pref-filters.php:290
msgid "All feeds"
msgstr "Все каналы"
-#: functions.php:2717 functions.php:2756 functions.php:3109 functions.php:4102
-#: functions.php:4132 modules/pref-feeds.php:880
+#: functions.php:2795 functions.php:2834 functions.php:3187 functions.php:4199
+#: functions.php:4229 modules/pref-feeds.php:897
msgid "Uncategorized"
msgstr "Нет категории"
-#: functions.php:2746 functions.php:3275
+#: functions.php:2824 functions.php:3353
msgid "Special"
msgstr "Особые"
-#: functions.php:2748 functions.php:3277
+#: functions.php:2826 functions.php:3355
msgid "Labels"
msgstr "Метки"
-#: functions.php:3095 functions.php:3097
+#: functions.php:3173 functions.php:3175
msgid "Search results"
msgstr "Результаты поиска"
-#: functions.php:3113 functions.php:3126 functions.php:3143
+#: functions.php:3191 functions.php:3204 functions.php:3221
msgid "Searched for"
msgstr "Поиск"
-#: functions.php:3729 functions.php:3776 functions.php:4906
-#: modules/pref-feeds.php:655 modules/pref-feeds.php:842
+#: functions.php:3814 functions.php:3868 functions.php:5003
+#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
#: modules/pref-filters.php:255 modules/pref-labels.php:239
-#: modules/pref-users.php:208
+#: modules/pref-users.php:211
msgid "Select:"
msgstr "Выбрать:"
-#: functions.php:3730 functions.php:3777 modules/pref-feeds.php:656
-#: modules/pref-feeds.php:843 modules/pref-filters.php:256
-#: modules/pref-labels.php:240 modules/pref-users.php:209
+#: functions.php:3815 functions.php:3869 modules/pref-feeds.php:673
+#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: modules/pref-labels.php:240 modules/pref-users.php:212
msgid "All"
msgstr "Все"
-#: functions.php:3731 functions.php:3735 functions.php:3778 functions.php:3781
+#: functions.php:3816 functions.php:3820 functions.php:3870 functions.php:3873
#: tt-rss.php:175
msgid "Unread"
msgstr "Новые"
-#: functions.php:3732 functions.php:3779 modules/pref-feeds.php:657
-#: modules/pref-feeds.php:844 modules/pref-filters.php:257
-#: modules/pref-labels.php:241 modules/pref-users.php:210
+#: functions.php:3817 functions.php:3871 modules/pref-feeds.php:674
+#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: modules/pref-labels.php:241 modules/pref-users.php:213
msgid "None"
msgstr "Ничего"
-#: functions.php:3734
+#: functions.php:3819
msgid "Toggle"
msgstr "Изменить:"
-#: functions.php:3736 functions.php:3782 tt-rss.php:174
+#: functions.php:3821 functions.php:3874 tt-rss.php:174
msgid "Starred"
msgstr "Отмеченные"
-#: functions.php:3737
+#: functions.php:3822
msgid "Published"
msgstr "Опубликован"
-#: functions.php:3740 localized_schema.php:15
+#: functions.php:3825 localized_schema.php:15
msgid "Mark as read"
msgstr "Как прочитанные"
-#: functions.php:3741
+#: functions.php:3826
#, fuzzy
msgid "Selection"
msgstr "Выбрать:"
-#: functions.php:3742
+#: functions.php:3827
msgid "This page"
msgstr "Эту страницу"
-#: functions.php:3744
+#: functions.php:3833
msgid "Above active article"
msgstr ""
-#: functions.php:3745
+#: functions.php:3834
#, fuzzy
msgid "Below active article"
msgstr "Отфильтровать статью"
-#: functions.php:3747
+#: functions.php:3839
msgid "Entire feed"
msgstr "Весь канал"
-#: functions.php:3755
+#: functions.php:3847
msgid "Next page"
msgstr "След. стр."
-#: functions.php:3756
+#: functions.php:3848
msgid "Previous page"
msgstr "Пред. cтр."
-#: functions.php:3757
+#: functions.php:3849
msgid "First page"
msgstr "На первую"
-#: functions.php:3767 functions.php:3793
+#: functions.php:3859 functions.php:3885
msgid "Convert to label"
msgstr "Превратить в метку"
-#: functions.php:3781
+#: functions.php:3873
msgid "Toggle:"
msgstr "Изменить:"
-#: functions.php:3784
+#: functions.php:3876
msgid "Mark as read:"
msgstr "Пометить как прочит.:"
-#: functions.php:3785
+#: functions.php:3877
msgid "Page"
msgstr "Страница"
-#: functions.php:3786 modules/pref-filters.php:263
+#: functions.php:3878 modules/pref-filters.php:263
msgid "Feed"
msgstr "Канал"
-#: functions.php:3836
+#: functions.php:3928
msgid "Generated feed"
msgstr ""
-#: functions.php:4172
+#: functions.php:4008
+msgid "Dashboard"
+msgstr ""
+
+#: functions.php:4269
msgid "No feeds to display."
msgstr "Нет каналов для отображения."
-#: functions.php:4189
+#: functions.php:4286
msgid "Tags"
msgstr "Теги"
-#: functions.php:4414
-msgid " - by "
+#: functions.php:4511
+#, fuzzy
+msgid " - "
msgstr ", автор - "
-#: functions.php:4469
+#: functions.php:4566
msgid "no tags"
msgstr "нет тегов"
-#: functions.php:4500 functions.php:4867
+#: functions.php:4597 functions.php:4964
msgid "Attachment:"
msgstr ""
-#: functions.php:4502 functions.php:4869
+#: functions.php:4599 functions.php:4966
msgid "Attachments:"
msgstr ""
-#: functions.php:4575
+#: functions.php:4672 modules/pref-feed-browser.php:74
msgid "Feed not found."
msgstr "Канал не найден."
-#: functions.php:4642
+#: functions.php:4739
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:4840
+#: functions.php:4937
#, fuzzy
msgid "Show article"
msgstr "Отмеченные"
-#: functions.php:4969
+#: functions.php:5066
msgid "No articles found."
msgstr "Статей не найдено."
@@ -678,7 +692,7 @@ msgid "Erase all non-starred articles in %s?"
msgstr "Помечаю все каналы как прочитанные..."
#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:855 modules/pref-feeds.php:916
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:933
msgid "Title"
msgstr "Заголовок"
@@ -901,12 +915,12 @@ msgstr "Отмеченные"
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
#: modules/pref-users.php:29
msgid "Login:"
msgstr "Пользователь:"
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
msgid "Password:"
msgstr "Пароль:"
@@ -1116,12 +1130,12 @@ msgstr "Содержимое"
msgid "tag cloud"
msgstr "облако тегов"
-#: tt-rss.php:140 modules/pref-feeds.php:1003
+#: tt-rss.php:140 modules/pref-feeds.php:1020
msgid "Actions..."
msgstr "Действия..."
#: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:749
+#: modules/pref-feeds.php:766
msgid "Search"
msgstr "Поиск"
@@ -1250,7 +1264,7 @@ msgid "Help topic not found."
msgstr "Раздел помощи не найден."
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:706
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:723
msgid "Close this window"
msgstr "Закрыть это окно"
@@ -1314,27 +1328,27 @@ msgid ""
"\t\t\t\t\towner."
msgstr ""
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:762
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:779
msgid "Subscribe to feed"
msgstr "Подписаться на канал"
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:165
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
msgid "Feed URL:"
msgstr "URL канала:"
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:173
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
msgid "Category:"
msgstr "Категория:"
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
-#: modules/pref-feeds.php:118
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
+#: modules/pref-feeds.php:119
msgid "Subscribe"
msgstr "Подписаться"
#: modules/popup-dialog.php:114 modules/popup-dialog.php:199
#: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:352 modules/pref-filters.php:118
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
+#: modules/pref-feeds.php:367 modules/pref-filters.php:118
#: modules/pref-users.php:58
msgid "Cancel"
msgstr "Отмена"
@@ -1412,7 +1426,7 @@ msgstr "Действие:"
msgid "Params:"
msgstr "Параметры:"
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
msgid "Options:"
msgstr "Дополнительно:"
@@ -1440,7 +1454,7 @@ msgstr "Редактировать теги"
msgid "Tags for this article (separated by commas):"
msgstr "Теги для этой статьи (разделенные запятыми):"
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:350
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
#: modules/pref-filters.php:114 modules/pref-users.php:55
msgid "Save"
msgstr "Сохранить"
@@ -1457,7 +1471,7 @@ msgstr "Самые популярные теги "
msgid "browse more"
msgstr "еще"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:54
msgid "Feed browser is administratively disabled."
msgstr "Другие каналы отключены администратором"
@@ -1465,214 +1479,229 @@ msgstr "Другие каналы отключены администратор�
msgid "Feed information:"
msgstr "Информация о канале:"
-#: modules/pref-feed-browser.php:51
+#: modules/pref-feed-browser.php:38
+#, fuzzy
+msgid "Site:"
+msgstr "Заголовок:"
+
+#: modules/pref-feed-browser.php:40
+#, fuzzy
+msgid "Last updated:"
+msgstr "Обновлено"
+
+#: modules/pref-feed-browser.php:55
msgid "Last headlines:"
msgstr "Последние заголовки:"
-#: modules/pref-feed-browser.php:77
+#: modules/pref-feed-browser.php:84
msgid ""
"This panel shows feeds subscribed by other users of this system, just in "
"case you are interested in them too."
msgstr ""
-#: modules/pref-feed-browser.php:94
+#: modules/pref-feed-browser.php:101
msgid "Top"
msgstr "Топ"
-#: modules/pref-feed-browser.php:103
+#: modules/pref-feed-browser.php:110
msgid "Show"
msgstr "Показать"
-#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
msgid "No feeds found to subscribe."
msgstr "Каналы для подписки не найдены."
-#: modules/pref-feeds.php:38
+#: modules/pref-feeds.php:39
msgid "Subscribed to feeds:"
msgstr "Подписаны каналы:"
-#: modules/pref-feeds.php:57
+#: modules/pref-feeds.php:58
msgid "Other feeds: Top 25"
msgstr "Топ 25 каналов"
-#: modules/pref-feeds.php:61
+#: modules/pref-feeds.php:62
msgid "Showing top 25 registered feeds, sorted by popularity:"
msgstr "Топ 25 популярных каналов:"
-#: modules/pref-feeds.php:145
+#: modules/pref-feeds.php:146
msgid "Feed editor"
msgstr "Редактор канала"
-#: modules/pref-feeds.php:157
+#: modules/pref-feeds.php:158
msgid "Title:"
msgstr "Заголовок:"
-#: modules/pref-feeds.php:193
+#: modules/pref-feeds.php:194
msgid "Update Interval:"
msgstr "Интервал обновления:"
-#: modules/pref-feeds.php:202
+#: modules/pref-feeds.php:203
msgid "Link to:"
msgstr "Связать с:"
-#: modules/pref-feeds.php:219
+#: modules/pref-feeds.php:220
msgid "Not linked"
msgstr "Нет связей"
-#: modules/pref-feeds.php:253
+#: modules/pref-feeds.php:254
msgid "Article purging:"
msgstr "Удаление сообщений:"
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:267
+#, fuzzy
+msgid "Update using:"
+msgstr "Обновить"
+
+#: modules/pref-feeds.php:300
msgid "Hide from \"Other Feeds\""
msgstr "Спрятать из \"Других каналов\""
-#: modules/pref-feeds.php:296
+#: modules/pref-feeds.php:311
msgid "Right-to-left content"
msgstr "Язык канала пишется справа налево"
-#: modules/pref-feeds.php:307
+#: modules/pref-feeds.php:322
msgid "Hide from my feed list"
msgstr "Спрятать из моего списка каналов"
-#: modules/pref-feeds.php:319
+#: modules/pref-feeds.php:334
msgid "Include in e-mail digest"
msgstr "Включить в дайджест"
-#: modules/pref-feeds.php:340
+#: modules/pref-feeds.php:355
msgid "Cache images locally"
msgstr ""
-#: modules/pref-feeds.php:486
+#: modules/pref-feeds.php:503
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Добавлена подписка на <b>%s</b>."
-#: modules/pref-feeds.php:488
+#: modules/pref-feeds.php:505
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Канал <b>%s</b> уже подписан."
-#: modules/pref-feeds.php:573
+#: modules/pref-feeds.php:590
msgid "Category editor"
msgstr "Редактор категорий"
-#: modules/pref-feeds.php:596
+#: modules/pref-feeds.php:613
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "Категория <b>$%s</b> уже существует."
-#: modules/pref-feeds.php:624
+#: modules/pref-feeds.php:641
msgid "Unable to delete non empty feed categories."
msgstr "Не могу удалить не пустую категорию"
-#: modules/pref-feeds.php:641
+#: modules/pref-feeds.php:658
msgid "Create category"
msgstr "Создать категорию"
-#: modules/pref-feeds.php:701
+#: modules/pref-feeds.php:718
msgid "No feed categories defined."
msgstr "Категории отсутствуют."
-#: modules/pref-feeds.php:712 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:319
+#: modules/pref-feeds.php:729 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:322
msgid "Remove"
msgstr "Удалить"
-#: modules/pref-feeds.php:734
+#: modules/pref-feeds.php:751
msgid "Some feeds have update errors (click for details)"
msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)"
-#: modules/pref-feeds.php:767
+#: modules/pref-feeds.php:784
msgid "Top 25"
msgstr "Топ 25"
-#: modules/pref-feeds.php:841
+#: modules/pref-feeds.php:858
msgid "Show last article times"
msgstr "Показать дату последней статьи"
-#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
msgid "Last&nbsp;Article"
msgstr "Последняя&nbsp;статья"
-#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
+#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
msgid "Updated"
msgstr "Обновлено"
-#: modules/pref-feeds.php:991 modules/pref-feeds.php:1005
+#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
#, fuzzy
msgid "Selection:"
msgstr "Выбрать:"
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1014
msgid "Recategorize"
msgstr "Изменить категорию"
-#: modules/pref-feeds.php:1006 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:317
+#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:320
msgid "Edit"
msgstr "Редактировать"
-#: modules/pref-feeds.php:1007
+#: modules/pref-feeds.php:1024
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1008
+#: modules/pref-feeds.php:1025
#, fuzzy
msgid "Clear feed data"
msgstr "Все каналы обновлены."
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1026
msgid "Unsubscribe"
msgstr "Отписаться"
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1031
#, fuzzy
msgid "Other:"
msgstr "Где:"
-#: modules/pref-feeds.php:1015
+#: modules/pref-feeds.php:1032
msgid "Edit categories"
msgstr "Редактировать категории"
-#: modules/pref-feeds.php:1042
+#: modules/pref-feeds.php:1059
msgid "OPML"
msgstr ""
-#: modules/pref-feeds.php:1046
+#: modules/pref-feeds.php:1063
#, fuzzy
msgid "File:"
msgstr "Заголовок:"
-#: modules/pref-feeds.php:1049
+#: modules/pref-feeds.php:1066
msgid "Import"
msgstr "Импортировать"
-#: modules/pref-feeds.php:1056
+#: modules/pref-feeds.php:1073
msgid "Export OPML"
msgstr "Экспортировать OPML"
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1076
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1061
+#: modules/pref-feeds.php:1078
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1065
+#: modules/pref-feeds.php:1082
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1091
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the address specified below."
msgstr ""
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1098
msgid "Generate another address"
msgstr "Создать другой адрес"
@@ -1865,54 +1894,54 @@ msgstr "Уровень доступа:"
msgid "Changed password of user <b>%s</b>."
msgstr "Пароль пользователя <b>%s</b> изменен."
-#: modules/pref-users.php:123
+#: modules/pref-users.php:126
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
-#: modules/pref-users.php:130
+#: modules/pref-users.php:133
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Не могу добавить пользователя <b>%s</b>"
-#: modules/pref-users.php:134
+#: modules/pref-users.php:137
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "Пользователь <b>%s</b> уже существует."
-#: modules/pref-users.php:154
+#: modules/pref-users.php:157
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
"\t\t\t\t\t to <b>%s</b>"
msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
-#: modules/pref-users.php:158
+#: modules/pref-users.php:161
#, fuzzy, php-format
msgid "Notifying <b>%s</b>."
msgstr "Добавляется категория <b>%s</b>."
-#: modules/pref-users.php:193
+#: modules/pref-users.php:196
msgid "Create user"
msgstr "Добавить пользователя"
-#: modules/pref-users.php:215
+#: modules/pref-users.php:218
msgid "Login"
msgstr "Пользователь:"
-#: modules/pref-users.php:216
+#: modules/pref-users.php:219
msgid "Access Level"
msgstr "Уровень доступа:"
-#: modules/pref-users.php:217
+#: modules/pref-users.php:220
msgid "Last login"
msgstr "Последний вход"
-#: modules/pref-users.php:315
+#: modules/pref-users.php:318
msgid "User details"
msgstr "Подробнее..."
-#: modules/pref-users.php:321
+#: modules/pref-users.php:324
msgid "Reset password"
msgstr "Сбросить пароль"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index a52406a64..4dce58129 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index e9fc9c125..506554dfd 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-23 14:50+0300\n"
+"POT-Creation-Date: 2008-02-15 23:42+0300\n"
"PO-Revision-Date: 2007-08-19 19:03+0800\n"
"Last-Translator: sluke <[email protected]>\n"
"Language-Team: hicode.org <[email protected]>\n"
@@ -12,7 +12,7 @@ msgstr ""
"X-Poedit-Country: china\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: backend.php:103 backend.php:112
+#: backend.php:103 backend.php:112 backend.php:123
msgid "Use default"
msgstr "用户默认"
@@ -72,34 +72,43 @@ msgstr "每天"
msgid "Weekly"
msgstr "每周"
-#: backend.php:124 modules/pref-users.php:249
+#: backend.php:124
+#, fuzzy
+msgid "Magpie"
+msgstr "页"
+
+#: backend.php:125
+msgid "SimplePie"
+msgstr ""
+
+#: backend.php:134 modules/pref-users.php:252
msgid "User"
msgstr "用户"
-#: backend.php:125 modules/pref-users.php:249
+#: backend.php:135 modules/pref-users.php:252
msgid "Administrator"
msgstr "管理员"
-#: backend.php:370
+#: backend.php:405
msgid "Registered"
msgstr ""
-#: backend.php:371
+#: backend.php:406
#, fuzzy
msgid "Last logged in"
msgstr "最后登陆"
-#: backend.php:372
+#: backend.php:407
#, fuzzy
msgid "Stored articles"
msgstr "星级文章"
-#: backend.php:379
+#: backend.php:414
#, fuzzy
msgid "Subscribed feeds count"
msgstr "订阅feed:"
-#: backend.php:392
+#: backend.php:429
#, fuzzy
msgid "Subscribed feeds"
msgstr "订阅feed:"
@@ -160,183 +169,188 @@ msgstr ""
"不支持你的MySQL版本. 请访问 \n"
"\t\t官方网站获取更多信息。"
-#: functions.php:2427 functions.php:2766 functions.php:3131 functions.php:3938
+#: functions.php:2505 functions.php:2844 functions.php:3209 functions.php:4035
msgid "Starred articles"
msgstr "星级文章"
-#: functions.php:2436 functions.php:2768 functions.php:3133 functions.php:3945
-#: modules/pref-feeds.php:1068
+#: functions.php:2514 functions.php:2846 functions.php:3211 functions.php:4042
+#: modules/pref-feeds.php:1085
msgid "Published articles"
msgstr "已发布文章"
-#: functions.php:2445 functions.php:2770 functions.php:3135 functions.php:3923
+#: functions.php:2523 functions.php:2848 functions.php:3213 functions.php:4020
#, fuzzy
msgid "Fresh articles"
msgstr "星级文章"
-#: functions.php:2688 modules/popup-dialog.php:151
+#: functions.php:2766 modules/popup-dialog.php:151
#: modules/pref-filters.php:290
msgid "All feeds"
msgstr "所有feed"
-#: functions.php:2717 functions.php:2756 functions.php:3109 functions.php:4102
-#: functions.php:4132 modules/pref-feeds.php:880
+#: functions.php:2795 functions.php:2834 functions.php:3187 functions.php:4199
+#: functions.php:4229 modules/pref-feeds.php:897
msgid "Uncategorized"
msgstr "未分类"
-#: functions.php:2746 functions.php:3275
+#: functions.php:2824 functions.php:3353
msgid "Special"
msgstr "专用"
-#: functions.php:2748 functions.php:3277
+#: functions.php:2826 functions.php:3355
msgid "Labels"
msgstr "标记"
-#: functions.php:3095 functions.php:3097
+#: functions.php:3173 functions.php:3175
msgid "Search results"
msgstr "搜索结果"
-#: functions.php:3113 functions.php:3126 functions.php:3143
+#: functions.php:3191 functions.php:3204 functions.php:3221
msgid "Searched for"
msgstr "搜索"
-#: functions.php:3729 functions.php:3776 functions.php:4906
-#: modules/pref-feeds.php:655 modules/pref-feeds.php:842
+#: functions.php:3814 functions.php:3868 functions.php:5003
+#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
#: modules/pref-filters.php:255 modules/pref-labels.php:239
-#: modules/pref-users.php:208
+#: modules/pref-users.php:211
msgid "Select:"
msgstr "选择:"
-#: functions.php:3730 functions.php:3777 modules/pref-feeds.php:656
-#: modules/pref-feeds.php:843 modules/pref-filters.php:256
-#: modules/pref-labels.php:240 modules/pref-users.php:209
+#: functions.php:3815 functions.php:3869 modules/pref-feeds.php:673
+#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: modules/pref-labels.php:240 modules/pref-users.php:212
msgid "All"
msgstr "所有"
-#: functions.php:3731 functions.php:3735 functions.php:3778 functions.php:3781
+#: functions.php:3816 functions.php:3820 functions.php:3870 functions.php:3873
#: tt-rss.php:175
msgid "Unread"
msgstr "未读"
-#: functions.php:3732 functions.php:3779 modules/pref-feeds.php:657
-#: modules/pref-feeds.php:844 modules/pref-filters.php:257
-#: modules/pref-labels.php:241 modules/pref-users.php:210
+#: functions.php:3817 functions.php:3871 modules/pref-feeds.php:674
+#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: modules/pref-labels.php:241 modules/pref-users.php:213
msgid "None"
msgstr "无"
-#: functions.php:3734
+#: functions.php:3819
msgid "Toggle"
msgstr "触发开关"
-#: functions.php:3736 functions.php:3782 tt-rss.php:174
+#: functions.php:3821 functions.php:3874 tt-rss.php:174
msgid "Starred"
msgstr "星级"
-#: functions.php:3737
+#: functions.php:3822
msgid "Published"
msgstr "已发布"
-#: functions.php:3740 localized_schema.php:15
+#: functions.php:3825 localized_schema.php:15
msgid "Mark as read"
msgstr "标记为已读"
-#: functions.php:3741
+#: functions.php:3826
msgid "Selection"
msgstr "选择:"
-#: functions.php:3742
+#: functions.php:3827
msgid "This page"
msgstr "本页"
-#: functions.php:3744
+#: functions.php:3833
msgid "Above active article"
msgstr ""
-#: functions.php:3745
+#: functions.php:3834
#, fuzzy
msgid "Below active article"
msgstr "过滤文章"
-#: functions.php:3747
+#: functions.php:3839
msgid "Entire feed"
msgstr "输入feed"
-#: functions.php:3755
+#: functions.php:3847
msgid "Next page"
msgstr "下页"
-#: functions.php:3756
+#: functions.php:3848
msgid "Previous page"
msgstr "上页"
-#: functions.php:3757
+#: functions.php:3849
msgid "First page"
msgstr "首页"
-#: functions.php:3767 functions.php:3793
+#: functions.php:3859 functions.php:3885
msgid "Convert to label"
msgstr "转换标签"
-#: functions.php:3781
+#: functions.php:3873
msgid "Toggle:"
msgstr "触发:"
-#: functions.php:3784
+#: functions.php:3876
msgid "Mark as read:"
msgstr "标记为已读:"
-#: functions.php:3785
+#: functions.php:3877
msgid "Page"
msgstr "页"
-#: functions.php:3786 modules/pref-filters.php:263
+#: functions.php:3878 modules/pref-filters.php:263
msgid "Feed"
msgstr "Feed"
-#: functions.php:3836
+#: functions.php:3928
msgid "Generated feed"
msgstr "产生feed"
-#: functions.php:4172
+#: functions.php:4008
+msgid "Dashboard"
+msgstr ""
+
+#: functions.php:4269
msgid "No feeds to display."
msgstr "无feed显示。"
-#: functions.php:4189
+#: functions.php:4286
msgid "Tags"
msgstr "标签"
-#: functions.php:4414
-msgid " - by "
+#: functions.php:4511
+#, fuzzy
+msgid " - "
msgstr ", 由 - "
-#: functions.php:4469
+#: functions.php:4566
msgid "no tags"
msgstr "无标签"
-#: functions.php:4500 functions.php:4867
+#: functions.php:4597 functions.php:4964
msgid "Attachment:"
msgstr ""
-#: functions.php:4502 functions.php:4869
+#: functions.php:4599 functions.php:4966
msgid "Attachments:"
msgstr ""
-#: functions.php:4575
+#: functions.php:4672 modules/pref-feed-browser.php:74
msgid "Feed not found."
msgstr "未找到Feed."
-#: functions.php:4642
+#: functions.php:4739
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
-#: functions.php:4840
+#: functions.php:4937
#, fuzzy
msgid "Show article"
msgstr "星级文章"
-#: functions.php:4969
+#: functions.php:5066
msgid "No articles found."
msgstr "未找到文章。"
@@ -673,7 +687,7 @@ msgid "Erase all non-starred articles in %s?"
msgstr "标记 %s 中所有访问过的主题为已读"
#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:855 modules/pref-feeds.php:916
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:933
msgid "Title"
msgstr "标题"
@@ -899,12 +913,12 @@ msgstr "星级文章"
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
#: modules/pref-users.php:29
msgid "Login:"
msgstr "登陆:"
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
msgid "Password:"
msgstr "密码:"
@@ -1122,12 +1136,12 @@ msgstr "内容"
msgid "tag cloud"
msgstr "标签簇"
-#: tt-rss.php:140 modules/pref-feeds.php:1003
+#: tt-rss.php:140 modules/pref-feeds.php:1020
msgid "Actions..."
msgstr "激活..."
#: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:749
+#: modules/pref-feeds.php:766
msgid "Search"
msgstr "搜索"
@@ -1258,7 +1272,7 @@ msgid "Help topic not found."
msgstr "未找到帮助主题。"
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:706
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:723
msgid "Close this window"
msgstr "关闭此窗口"
@@ -1327,27 +1341,27 @@ msgid ""
"\t\t\t\t\towner."
msgstr "TT-RSS检测到更新时间过长,请刷新或者检查RSS源地址。"
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:762
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:779
msgid "Subscribe to feed"
msgstr "订阅feed"
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:165
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
msgid "Feed URL:"
msgstr "Feed URL:"
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:173
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
msgid "Category:"
msgstr "分类:"
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
-#: modules/pref-feeds.php:118
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
+#: modules/pref-feeds.php:119
msgid "Subscribe"
msgstr "订阅"
#: modules/popup-dialog.php:114 modules/popup-dialog.php:199
#: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:352 modules/pref-filters.php:118
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
+#: modules/pref-feeds.php:367 modules/pref-filters.php:118
#: modules/pref-users.php:58
msgid "Cancel"
msgstr "取消"
@@ -1426,7 +1440,7 @@ msgstr "操作:"
msgid "Params:"
msgstr "参数:"
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
msgid "Options:"
msgstr "选项:"
@@ -1454,7 +1468,7 @@ msgstr "编辑标签"
msgid "Tags for this article (separated by commas):"
msgstr "本文的标签,请用逗号分开:"
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:350
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
#: modules/pref-filters.php:114 modules/pref-users.php:55
msgid "Save"
msgstr "保存"
@@ -1471,7 +1485,7 @@ msgstr "显示最热标签"
msgid "browse more"
msgstr "浏览更多"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:54
msgid "Feed browser is administratively disabled."
msgstr "Feed 浏览器有限制"
@@ -1479,214 +1493,229 @@ msgstr "Feed 浏览器有限制"
msgid "Feed information:"
msgstr "Feed 信息:"
-#: modules/pref-feed-browser.php:51
+#: modules/pref-feed-browser.php:38
+#, fuzzy
+msgid "Site:"
+msgstr "标题:"
+
+#: modules/pref-feed-browser.php:40
+#, fuzzy
+msgid "Last updated:"
+msgstr "已更新"
+
+#: modules/pref-feed-browser.php:55
msgid "Last headlines:"
msgstr "最新提要:"
-#: modules/pref-feed-browser.php:77
+#: modules/pref-feed-browser.php:84
msgid ""
"This panel shows feeds subscribed by other users of this system, just in "
"case you are interested in them too."
msgstr "本控制面板显示系统其他用户订阅的feed,如果您感兴趣。"
-#: modules/pref-feed-browser.php:94
+#: modules/pref-feed-browser.php:101
msgid "Top"
msgstr "Top"
-#: modules/pref-feed-browser.php:103
+#: modules/pref-feed-browser.php:110
msgid "Show"
msgstr "显示"
-#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
msgid "No feeds found to subscribe."
msgstr "无feed可订阅。"
-#: modules/pref-feeds.php:38
+#: modules/pref-feeds.php:39
msgid "Subscribed to feeds:"
msgstr "订阅feed:"
-#: modules/pref-feeds.php:57
+#: modules/pref-feeds.php:58
msgid "Other feeds: Top 25"
msgstr " 其他feed: Top 25"
-#: modules/pref-feeds.php:61
+#: modules/pref-feeds.php:62
msgid "Showing top 25 registered feeds, sorted by popularity:"
msgstr "显示按受欢迎度排序的25个注册feed:"
-#: modules/pref-feeds.php:145
+#: modules/pref-feeds.php:146
msgid "Feed editor"
msgstr "Feed编辑"
-#: modules/pref-feeds.php:157
+#: modules/pref-feeds.php:158
msgid "Title:"
msgstr "标题:"
-#: modules/pref-feeds.php:193
+#: modules/pref-feeds.php:194
msgid "Update Interval:"
msgstr "更新间隔:"
-#: modules/pref-feeds.php:202
+#: modules/pref-feeds.php:203
msgid "Link to:"
msgstr "链接:"
-#: modules/pref-feeds.php:219
+#: modules/pref-feeds.php:220
msgid "Not linked"
msgstr "无链接"
-#: modules/pref-feeds.php:253
+#: modules/pref-feeds.php:254
msgid "Article purging:"
msgstr "文章清理:"
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:267
+#, fuzzy
+msgid "Update using:"
+msgstr "更新"
+
+#: modules/pref-feeds.php:300
msgid "Hide from \"Other Feeds\""
msgstr "隐藏\"其他 Feed\""
-#: modules/pref-feeds.php:296
+#: modules/pref-feeds.php:311
msgid "Right-to-left content"
msgstr "由右-左阅读习惯"
-#: modules/pref-feeds.php:307
+#: modules/pref-feeds.php:322
msgid "Hide from my feed list"
msgstr "隐藏我的Feed列表"
-#: modules/pref-feeds.php:319
+#: modules/pref-feeds.php:334
msgid "Include in e-mail digest"
msgstr "包括电子邮件文摘"
-#: modules/pref-feeds.php:340
+#: modules/pref-feeds.php:355
msgid "Cache images locally"
msgstr ""
-#: modules/pref-feeds.php:486
+#: modules/pref-feeds.php:503
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "订阅到 <b>%s</b>."
-#: modules/pref-feeds.php:488
+#: modules/pref-feeds.php:505
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "已经订阅到 <b>%s</b>."
-#: modules/pref-feeds.php:573
+#: modules/pref-feeds.php:590
msgid "Category editor"
msgstr "分类编辑"
-#: modules/pref-feeds.php:596
+#: modules/pref-feeds.php:613
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "分类 <b>$%s</b>已经存在."
-#: modules/pref-feeds.php:624
+#: modules/pref-feeds.php:641
msgid "Unable to delete non empty feed categories."
msgstr "不能删除非空分类。"
-#: modules/pref-feeds.php:641
+#: modules/pref-feeds.php:658
msgid "Create category"
msgstr "创建分类"
-#: modules/pref-feeds.php:701
+#: modules/pref-feeds.php:718
msgid "No feed categories defined."
msgstr "未定义feed分类"
-#: modules/pref-feeds.php:712 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:319
+#: modules/pref-feeds.php:729 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:322
msgid "Remove"
msgstr "移除"
-#: modules/pref-feeds.php:734
+#: modules/pref-feeds.php:751
msgid "Some feeds have update errors (click for details)"
msgstr "有些feed更新错误(点击了解详情) "
-#: modules/pref-feeds.php:767
+#: modules/pref-feeds.php:784
msgid "Top 25"
msgstr "Top 25"
-#: modules/pref-feeds.php:841
+#: modules/pref-feeds.php:858
msgid "Show last article times"
msgstr "显示最近文章时间"
-#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
msgid "Last&nbsp;Article"
msgstr "最后&nbsp;文章"
-#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
+#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
msgid "Updated"
msgstr "已更新"
-#: modules/pref-feeds.php:991 modules/pref-feeds.php:1005
+#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
#, fuzzy
msgid "Selection:"
msgstr "选择:"
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1014
msgid "Recategorize"
msgstr "再分类"
-#: modules/pref-feeds.php:1006 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:317
+#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:320
msgid "Edit"
msgstr "编辑"
-#: modules/pref-feeds.php:1007
+#: modules/pref-feeds.php:1024
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1008
+#: modules/pref-feeds.php:1025
#, fuzzy
msgid "Clear feed data"
msgstr "所有Feed已更新。"
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1026
msgid "Unsubscribe"
msgstr "退订"
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1031
#, fuzzy
msgid "Other:"
msgstr "地点:"
-#: modules/pref-feeds.php:1015
+#: modules/pref-feeds.php:1032
msgid "Edit categories"
msgstr "编辑分类"
-#: modules/pref-feeds.php:1042
+#: modules/pref-feeds.php:1059
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1046
+#: modules/pref-feeds.php:1063
#, fuzzy
msgid "File:"
msgstr "标题:"
-#: modules/pref-feeds.php:1049
+#: modules/pref-feeds.php:1066
msgid "Import"
msgstr "导入"
-#: modules/pref-feeds.php:1056
+#: modules/pref-feeds.php:1073
msgid "Export OPML"
msgstr "导出OPML"
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1076
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1061
+#: modules/pref-feeds.php:1078
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1065
+#: modules/pref-feeds.php:1082
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1091
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the address specified below."
msgstr "本站文章作为一个公开的RSS源,可以被大众订阅。"
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1098
msgid "Generate another address"
msgstr "生成另一个地址"
@@ -1880,22 +1909,22 @@ msgstr "等级:"
msgid "Changed password of user <b>%s</b>."
msgstr "更改用<b>%s</b>密码"
-#: modules/pref-users.php:123
+#: modules/pref-users.php:126
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "添加用 <b>%s</b> ,密码为<b>%s</b>"
-#: modules/pref-users.php:130
+#: modules/pref-users.php:133
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "创建用户 <b>%s</b> 失败"
-#: modules/pref-users.php:134
+#: modules/pref-users.php:137
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "用户 <b>%s</b> 已存在。"
-#: modules/pref-users.php:154
+#: modules/pref-users.php:157
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -1904,32 +1933,32 @@ msgstr ""
"更改用户 <b>%s</b>\n"
"\t\t\t\t\t 的密码为 <b>%s</b>"
-#: modules/pref-users.php:158
+#: modules/pref-users.php:161
#, fuzzy, php-format
msgid "Notifying <b>%s</b>."
msgstr "添加分类 <b>%s</b>."
-#: modules/pref-users.php:193
+#: modules/pref-users.php:196
msgid "Create user"
msgstr "创建用户"
-#: modules/pref-users.php:215
+#: modules/pref-users.php:218
msgid "Login"
msgstr "登陆"
-#: modules/pref-users.php:216
+#: modules/pref-users.php:219
msgid "Access Level"
msgstr "等级:"
-#: modules/pref-users.php:217
+#: modules/pref-users.php:220
msgid "Last login"
msgstr "最后登陆"
-#: modules/pref-users.php:315
+#: modules/pref-users.php:318
msgid "User details"
msgstr "用户详细"
-#: modules/pref-users.php:321
+#: modules/pref-users.php:324
msgid "Reset password"
msgstr "重置密码"