From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Tue, 8 Apr 2008 05:13:57 +0000 (+0100)
Subject: update translations, fix nb_NO menu title
X-Git-Tag: 1.2.22~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=592535d709bf017d9d7de556da1391925281d6bc;p=tt-rss.git

update translations, fix nb_NO menu title
---

diff --git a/functions.php b/functions.php
index d1bc05cc..6f5e0288 100644
--- a/functions.php
+++ b/functions.php
@@ -20,7 +20,7 @@
 					"en_US" => "English",
 					"fr_FR" => "Français",
 					"hu_HU" => "Magyar (Hungarian)",
-					"nb_NO" => "Norsk Bokmål",
+					"nb_NO" => "Norwegian bokmål",
 					"ru_RU" => "Русский",
 					"pt_BR" => "Portuguese/Brazil",
 					"zh_CN" => "Simplified Chinese");
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index bc441b69..4214f751 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 20c48268..0ac119af 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-02-20 11:27+0300\n"
+"POT-Creation-Date: 2008-04-08 13:13+0400\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -85,31 +85,35 @@ msgstr "Page"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:134 modules/pref-users.php:252
+#: backend.php:134
 msgid "User"
 msgstr "Utilisateur"
 
-#: backend.php:135 modules/pref-users.php:252
+#: backend.php:135
+msgid "Power User"
+msgstr ""
+
+#: backend.php:136
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: backend.php:393
+#: backend.php:394
 msgid "Registered"
 msgstr "Abonné"
 
-#: backend.php:394
+#: backend.php:395
 msgid "Last logged in"
 msgstr "Dernière connexion"
 
-#: backend.php:395
+#: backend.php:396
 msgid "Stored articles"
 msgstr "Articles mémorisés"
 
-#: backend.php:402
+#: backend.php:403
 msgid "Subscribed feeds count"
 msgstr "Nombre d'abonnements à des flux"
 
-#: backend.php:417
+#: backend.php:418
 msgid "Subscribed feeds"
 msgstr "Abonnements à des flux"
 
@@ -175,192 +179,197 @@ 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:2505 functions.php:2844 functions.php:3212 functions.php:4065
+#: functions.php:2516 functions.php:2855 functions.php:3223 functions.php:4076
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2514 functions.php:2846 functions.php:3214 functions.php:4072
-#: modules/pref-feeds.php:1085
+#: functions.php:2525 functions.php:2857 functions.php:3225 functions.php:4083
+#: modules/pref-feeds.php:1082
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2523 functions.php:2848 functions.php:3216 functions.php:4050
+#: functions.php:2534 functions.php:2859 functions.php:3227 functions.php:4061
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:2766 modules/popup-dialog.php:151
+#: functions.php:2777 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2795 functions.php:2834 functions.php:3190 functions.php:4229
-#: functions.php:4259 modules/pref-feeds.php:897
+#: functions.php:2806 functions.php:2845 functions.php:3201 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:894
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2824 functions.php:3356
+#: functions.php:2835 functions.php:3367
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2826 functions.php:3358
+#: functions.php:2837 functions.php:3369
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:3176 functions.php:3178
+#: functions.php:3187 functions.php:3189
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:3194 functions.php:3207 functions.php:3224
+#: functions.php:3205 functions.php:3218 functions.php:3235
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3820 functions.php:3874 functions.php:5033
-#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
+#: functions.php:3831 functions.php:3885 functions.php:5050
+#: modules/pref-feeds.php:669 modules/pref-feeds.php:856
 #: modules/pref-filters.php:255 modules/pref-labels.php:239
 #: modules/pref-users.php:211
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
-#: functions.php:3821 functions.php:3875 modules/pref-feeds.php:673
-#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: functions.php:3832 functions.php:3886 modules/pref-feeds.php:670
+#: modules/pref-feeds.php:857 modules/pref-filters.php:256
 #: modules/pref-labels.php:240 modules/pref-users.php:212
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:3822 functions.php:3826 functions.php:3876 functions.php:3879
-#: tt-rss.php:183
+#: functions.php:3833 functions.php:3837 functions.php:3887 functions.php:3890
+#: tt-rss.php:185
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3823 functions.php:3877 modules/pref-feeds.php:674
-#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: functions.php:3834 functions.php:3888 modules/pref-feeds.php:671
+#: modules/pref-feeds.php:858 modules/pref-filters.php:257
 #: modules/pref-labels.php:241 modules/pref-users.php:213
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:3825
+#: functions.php:3836
 msgid "Toggle"
 msgstr "Marquages spéciaux&nbsp;"
 
-#: functions.php:3827 functions.php:3880 tt-rss.php:182
+#: functions.php:3838 functions.php:3891 tt-rss.php:184
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3828
+#: functions.php:3839
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3831 localized_schema.php:15
+#: functions.php:3842 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3832
+#: functions.php:3843
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:3833
+#: functions.php:3844
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3839
+#: functions.php:3850
 msgid "Above active article"
 msgstr "Au-dessus de l'article courant"
 
-#: functions.php:3840
+#: functions.php:3851
 msgid "Below active article"
 msgstr "En dessous de l'article courant"
 
-#: functions.php:3845
+#: functions.php:3856
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3853
+#: functions.php:3864
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3854
+#: functions.php:3865
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3855
+#: functions.php:3866
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3865 functions.php:3891
+#: functions.php:3876 functions.php:3902
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3879
+#: functions.php:3890
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3882
+#: functions.php:3893
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3883
+#: functions.php:3894
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3884 modules/pref-filters.php:263
+#: functions.php:3895 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3903 modules/popup-dialog.php:61 modules/pref-feeds.php:779
+#: functions.php:3914 modules/popup-dialog.php:61 modules/pref-feeds.php:776
 msgid "Subscribe to feed"
 msgstr "S'inscrire à un flux"
 
-#: functions.php:3906 functions.php:3907 functions.php:3908 functions.php:3909
+#: functions.php:3917 functions.php:3918 functions.php:3919 functions.php:3920
 msgid "Placeholder"
 msgstr ""
 
-#: functions.php:3912 modules/pref-feed-browser.php:110
+#: functions.php:3923 modules/pref-feed-browser.php:110
 msgid "Show"
 msgstr "Afficher"
 
-#: functions.php:3913
+#: functions.php:3924
 #, fuzzy
 msgid "Update errors"
 msgstr "Erreurs de mise à jour"
 
-#: functions.php:3956
+#: functions.php:3967
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:4038
+#: functions.php:4049
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4299
+#: functions.php:4310
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:4316
+#: functions.php:4327
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4541
+#: functions.php:4552
 #, fuzzy
 msgid " - "
 msgstr "- par "
 
-#: functions.php:4596
+#: functions.php:4607
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4627 functions.php:4994
+#: functions.php:4638 functions.php:5009
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4629 functions.php:4996
+#: functions.php:4640 functions.php:5011
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4702 modules/pref-feed-browser.php:74
+#: functions.php:4650 functions.php:5020
+#, fuzzy
+msgid "unknown type"
+msgstr "Erreur inconnue"
+
+#: functions.php:4716 modules/pref-feed-browser.php:74
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4769
+#: functions.php:4783
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -368,13 +377,24 @@ 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:4967
+#: functions.php:4981
 msgid "Show article"
 msgstr "Afficher l'article"
 
-#: functions.php:5096
-msgid "No articles found."
-msgstr "Aucun article trouvé."
+#: functions.php:5117
+#, fuzzy
+msgid "No unread articles found to display."
+msgstr "Aucun article à marquer"
+
+#: functions.php:5120
+#, fuzzy
+msgid "No starred articles found to display."
+msgstr "Aucun article à marquer"
+
+#: functions.php:5123
+#, fuzzy
+msgid "No articles found to display."
+msgstr "Aucun article à marquer"
 
 #: localized_js.php:35
 msgid "display feeds"
@@ -582,7 +602,7 @@ msgstr "Impossible de mettre à jour l'en-têtes (objet XML manquant)"
 msgid "Could not display article (missing XML object)"
 msgstr "Impossible d'afficher l'article (objet XML manquant)"
 
-#: localized_js.php:95 tt-rss.php:225 tt-rss.php:229
+#: localized_js.php:95 tt-rss.php:227 tt-rss.php:231
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
@@ -646,15 +666,15 @@ msgstr "Veuillez saisir le titre de l'intitulé :"
 msgid "Save current configuration?"
 msgstr "Enregistrer la configuration actuelle ?"
 
-#: localized_js.php:120 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:25
 msgid "Old password cannot be blank."
 msgstr "L'ancien mot de passe ne peut pas être vide."
 
-#: localized_js.php:121 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:30
 msgid "New password cannot be blank."
 msgstr "Le nouveau mot de passe ne peut pas être vide."
 
-#: localized_js.php:122 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:35
 msgid "Entered passwords do not match."
 msgstr "Les mots de passe saisie ne sont pas identiques."
 
@@ -701,7 +721,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:872 modules/pref-feeds.php:933
+#: modules/pref-feeds.php:869 modules/pref-feeds.php:930
 msgid "Title"
 msgstr "Titre"
 
@@ -1213,12 +1233,12 @@ msgstr "Contenu"
 msgid "tag cloud"
 msgstr "Nuage d'étiquettes"
 
-#: tt-rss.php:140 modules/pref-feeds.php:1020
+#: tt-rss.php:140 modules/pref-feeds.php:1017
 msgid "Actions..."
 msgstr "Actions..."
 
 #: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:766
+#: modules/pref-feeds.php:763
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1271,27 +1291,27 @@ msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:171 modules/popup-dialog.php:139
+#: tt-rss.php:173 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "View:"
 msgstr "Afficher&nbsp;:"
 
-#: tt-rss.php:180
+#: tt-rss.php:182
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: tt-rss.php:181
+#: tt-rss.php:183
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: tt-rss.php:186
+#: tt-rss.php:188
 msgid "Limit:"
 msgstr "Limite&nbsp;:"
 
-#: tt-rss.php:211
+#: tt-rss.php:213
 msgid "Update"
 msgstr "Mettre à jour"
 
@@ -1358,7 +1378,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:723
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:720
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
@@ -1682,108 +1702,108 @@ msgstr "Inscrit à <b>%s</b>."
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:590
+#: modules/pref-feeds.php:587
 msgid "Category editor"
 msgstr "Éditeur de catégorie"
 
-#: modules/pref-feeds.php:613
+#: modules/pref-feeds.php:610
 #, 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:641
+#: modules/pref-feeds.php:638
 msgid "Unable to delete non empty feed categories."
 msgstr "Impossible de supprimer une catégorie de flux non vide."
 
-#: modules/pref-feeds.php:658
+#: modules/pref-feeds.php:655
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: modules/pref-feeds.php:718
+#: modules/pref-feeds.php:715
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:729 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:322
+#: modules/pref-feeds.php:726 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:320
 msgid "Remove"
 msgstr "Supprimer"
 
-#: modules/pref-feeds.php:751
+#: modules/pref-feeds.php:748
 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:784
+#: modules/pref-feeds.php:781
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:858
+#: modules/pref-feeds.php:855
 msgid "Show last article times"
 msgstr "Afficher l'heure du dernier article"
 
-#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:934
 msgid "Last&nbsp;Article"
 msgstr "Dernier&nbsp;article"
 
-#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:938
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
+#: modules/pref-feeds.php:1005 modules/pref-feeds.php:1019
 msgid "Selection:"
 msgstr "Sélection&nbsp;:"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1011
 msgid "Recategorize"
 msgstr "Changer de catégorie"
 
-#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:320
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:318
 msgid "Edit"
 msgstr "Modifier"
 
-#: modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:1021
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1025
+#: modules/pref-feeds.php:1022
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1023
 msgid "Unsubscribe"
 msgstr "Se désinscrire"
 
-#: modules/pref-feeds.php:1031
+#: modules/pref-feeds.php:1028
 msgid "Other:"
 msgstr "Autre&nbsp;:"
 
-#: modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:1029
 msgid "Edit categories"
 msgstr "Modifier les catégories"
 
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1056
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1063
+#: modules/pref-feeds.php:1060
 msgid "File:"
 msgstr "Fichier&nbsp;:"
 
-#: modules/pref-feeds.php:1066
+#: modules/pref-feeds.php:1063
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1073
+#: modules/pref-feeds.php:1070
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1076
+#: modules/pref-feeds.php:1073
 msgid "Firefox Integration"
 msgstr "Intégration à Firefox"
 
-#: modules/pref-feeds.php:1078
+#: modules/pref-feeds.php:1075
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1791,20 +1811,22 @@ 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:1082
+#: modules/pref-feeds.php:1079
 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:1091
+#: modules/pref-feeds.php:1088
+#, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the address specified below."
+"by anyone who knows the URL specified below."
 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:1098
-msgid "Generate another address"
+#: modules/pref-feeds.php:1095
+#, fuzzy
+msgid "Generate another link"
 msgstr "Générer une autre adresse"
 
 #: modules/pref-filters.php:22
@@ -1879,31 +1901,31 @@ msgstr "Expression SQL"
 msgid "No labels defined."
 msgstr "Aucun intitulé défini."
 
-#: modules/pref-prefs.php:55
+#: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "Le mot de passe a été modifié."
 
-#: modules/pref-prefs.php:57
+#: modules/pref-prefs.php:62
 msgid "Old password is incorrect."
 msgstr "L'ancien mot de passe n'est pas correct."
 
-#: modules/pref-prefs.php:107
+#: modules/pref-prefs.php:112
 msgid "The configuration was saved."
 msgstr "La configuration a été enregistrée."
 
-#: modules/pref-prefs.php:133
+#: modules/pref-prefs.php:138
 msgid "E-mail has been changed."
 msgstr "L'adresse électronique a été modifiée."
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
+#: modules/pref-prefs.php:150 modules/pref-prefs.php:210
 msgid "The configuration was reset to defaults."
 msgstr "La configuration a été réinitialisée à ses valeurs par défaut."
 
-#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
 msgid "Change theme"
 msgstr "Modifier le thème"
 
-#: modules/pref-prefs.php:190
+#: modules/pref-prefs.php:195
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
@@ -1911,67 +1933,72 @@ msgstr ""
 "Le mot de passe actuel est celui par défaut.\n"
 "\t\t\t\t\t\tVeuillez le modifier."
 
-#: modules/pref-prefs.php:217
+#: modules/pref-prefs.php:222
 msgid "Personal data"
 msgstr "Données personnelles"
 
-#: modules/pref-prefs.php:224
+#: modules/pref-prefs.php:229
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: modules/pref-prefs.php:237
+#: modules/pref-prefs.php:238
+#, fuzzy
+msgid "Access level"
+msgstr "Permissions&nbsp;:"
+
+#: modules/pref-prefs.php:251
 msgid "Change e-mail"
 msgstr "Modifier l'adresse électronique"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:257
 msgid "Authentication"
 msgstr "Identification"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:259
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:264
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: modules/pref-prefs.php:256
+#: modules/pref-prefs.php:270
 msgid "Confirm password"
 msgstr "Confirmation du mot de passe"
 
-#: modules/pref-prefs.php:271
+#: modules/pref-prefs.php:285
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: modules/pref-prefs.php:287
+#: modules/pref-prefs.php:301
 msgid "Themes"
 msgstr "Thèmes"
 
-#: modules/pref-prefs.php:288
+#: modules/pref-prefs.php:302
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
-#: modules/pref-prefs.php:290
+#: modules/pref-prefs.php:304
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
-#: modules/pref-prefs.php:359
+#: modules/pref-prefs.php:377
 msgid "short_desc"
 msgstr ""
 
-#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
 msgid "Yes"
 msgstr "Oui"
 
-#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
 msgid "No"
 msgstr "Non"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:413
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:417
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
@@ -2041,10 +2068,13 @@ msgstr "Permissions"
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: modules/pref-users.php:318
+#: modules/pref-users.php:316
 msgid "User details"
 msgstr "Détails de l'utilisateur"
 
-#: modules/pref-users.php:324
+#: modules/pref-users.php:322
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
+
+#~ msgid "No articles found."
+#~ msgstr "Aucun article trouvé."
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 46ad3180..06379f63 100644
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 368a7f3c..ab2e618a 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.2.19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-03 22:22+0100\n"
+"POT-Creation-Date: 2008-04-08 13:13+0400\n"
 "PO-Revision-Date: 2008-02-03 22:22::+0100\n"
 "Last-Translator: MiszterX <miszterx@miszterx.hu>\n"
 "Language-Team: HUNGARIAN <miszterx@miszterx.hu>\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 "Használd az alapértelmezettet"
 
@@ -76,31 +76,44 @@ msgstr "Napi"
 msgid "Weekly"
 msgstr "Heti"
 
-#: backend.php:124 modules/pref-users.php:249
+#: backend.php:124
+#, fuzzy
+msgid "Magpie"
+msgstr "Oldal"
+
+#: backend.php:125
+msgid "SimplePie"
+msgstr ""
+
+#: backend.php:134
 msgid "User"
 msgstr "Felhasználó"
 
-#: backend.php:125 modules/pref-users.php:249
+#: backend.php:135
+msgid "Power User"
+msgstr ""
+
+#: backend.php:136
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: backend.php:370
+#: backend.php:394
 msgid "Registered"
 msgstr "Regisztrált"
 
-#: backend.php:371
+#: backend.php:395
 msgid "Last logged in"
 msgstr "Utolsó belépés"
 
-#: backend.php:372
+#: backend.php:396
 msgid "Stored articles"
 msgstr "Tárolt hírek"
 
-#: backend.php:379
+#: backend.php:403
 msgid "Subscribed feeds count"
 msgstr ""
 
-#: backend.php:392
+#: backend.php:418
 msgid "Subscribed feeds"
 msgstr "Feliratkozott feedek"
 
@@ -109,15 +122,11 @@ msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
 #: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
+msgid "This program requires XmlHttpRequest "
 msgstr ""
 
 #: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
+msgid "This program requires cookies "
 msgstr ""
 
 #: errors.php:11
@@ -162,181 +171,218 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2425 functions.php:2764 functions.php:3129 functions.php:3936
+#: functions.php:2516 functions.php:2855 functions.php:3223 functions.php:4076
 msgid "Starred articles"
 msgstr "Csillagost hírek"
 
-#: functions.php:2434 functions.php:2766 functions.php:3131 functions.php:3943
-#: modules/pref-feeds.php:1068
+#: functions.php:2525 functions.php:2857 functions.php:3225 functions.php:4083
+#: modules/pref-feeds.php:1082
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: functions.php:2443 functions.php:2768 functions.php:3133 functions.php:3921
+#: functions.php:2534 functions.php:2859 functions.php:3227 functions.php:4061
 msgid "Fresh articles"
 msgstr "Olvasatlan hírek"
 
-#: functions.php:2686 modules/popup-dialog.php:151
+#: functions.php:2777 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Minden feed"
 
-#: functions.php:2715 functions.php:2754 functions.php:3107 functions.php:4100
-#: functions.php:4130 modules/pref-feeds.php:880
+#: functions.php:2806 functions.php:2845 functions.php:3201 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:894
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: functions.php:2744 functions.php:3273
+#: functions.php:2835 functions.php:3367
 msgid "Special"
 msgstr "Speciális"
 
-#: functions.php:2746 functions.php:3275
+#: functions.php:2837 functions.php:3369
 msgid "Labels"
 msgstr "Címkék"
 
-#: functions.php:3093 functions.php:3095
+#: functions.php:3187 functions.php:3189
 msgid "Search results"
 msgstr "Keresési találatok"
 
-#: functions.php:3111 functions.php:3124 functions.php:3141
+#: functions.php:3205 functions.php:3218 functions.php:3235
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3727 functions.php:3774 functions.php:4904
-#: modules/pref-feeds.php:655 modules/pref-feeds.php:842
+#: functions.php:3831 functions.php:3885 functions.php:5050
+#: modules/pref-feeds.php:669 modules/pref-feeds.php:856
 #: modules/pref-filters.php:255 modules/pref-labels.php:239
-#: modules/pref-users.php:208
+#: modules/pref-users.php:211
 msgid "Select:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3728 functions.php:3775 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:3832 functions.php:3886 modules/pref-feeds.php:670
+#: modules/pref-feeds.php:857 modules/pref-filters.php:256
+#: modules/pref-labels.php:240 modules/pref-users.php:212
 msgid "All"
 msgstr "Mind"
 
-#: functions.php:3729 functions.php:3733 functions.php:3776 functions.php:3779
-#: tt-rss.php:175
+#: functions.php:3833 functions.php:3837 functions.php:3887 functions.php:3890
+#: tt-rss.php:185
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: functions.php:3730 functions.php:3777 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:3834 functions.php:3888 modules/pref-feeds.php:671
+#: modules/pref-feeds.php:858 modules/pref-filters.php:257
+#: modules/pref-labels.php:241 modules/pref-users.php:213
 msgid "None"
 msgstr "Egyiksem"
 
-#: functions.php:3732
+#: functions.php:3836
 msgid "Toggle"
 msgstr "Megjelöl"
 
-#: functions.php:3734 functions.php:3780 tt-rss.php:174
+#: functions.php:3838 functions.php:3891 tt-rss.php:184
 msgid "Starred"
 msgstr "Csillagoz"
 
-#: functions.php:3735
+#: functions.php:3839
 msgid "Published"
 msgstr "Publikál"
 
-#: functions.php:3738 localized_schema.php:15
+#: functions.php:3842 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 
-#: functions.php:3739
+#: functions.php:3843
 msgid "Selection"
 msgstr "Kiválasztottakat"
 
-#: functions.php:3740
+#: functions.php:3844
 msgid "This page"
 msgstr "Ez az oldalt"
 
-#: functions.php:3742
+#: functions.php:3850
 msgid "Above active article"
 msgstr "Aktív hír felett"
 
-#: functions.php:3743
+#: functions.php:3851
 msgid "Below active article"
 msgstr "Aktív hír alatt"
 
-#: functions.php:3745
+#: functions.php:3856
 msgid "Entire feed"
 msgstr "Összes feed"
 
-#: functions.php:3753
+#: functions.php:3864
 msgid "Next page"
 msgstr "Következő oldal"
 
-#: functions.php:3754
+#: functions.php:3865
 msgid "Previous page"
 msgstr "Előző oldal"
 
-#: functions.php:3755
+#: functions.php:3866
 msgid "First page"
 msgstr "Első oldal"
 
-#: functions.php:3765 functions.php:3791
+#: functions.php:3876 functions.php:3902
 msgid "Convert to label"
 msgstr ""
 
-#: functions.php:3779
+#: functions.php:3890
 msgid "Toggle:"
 msgstr "Megjelöl:"
 
-#: functions.php:3782
+#: functions.php:3893
 msgid "Mark as read:"
 msgstr ""
 
-#: functions.php:3783
+#: functions.php:3894
 msgid "Page"
 msgstr "Oldal"
 
-#: functions.php:3784 modules/pref-filters.php:263
+#: functions.php:3895 modules/pref-filters.php:263
 msgid "Feed"
 msgstr ""
 
-#: functions.php:3834
+#: functions.php:3914 modules/popup-dialog.php:61 modules/pref-feeds.php:776
+msgid "Subscribe to feed"
+msgstr "Feliratkozás feedre"
+
+#: functions.php:3917 functions.php:3918 functions.php:3919 functions.php:3920
+msgid "Placeholder"
+msgstr ""
+
+#: functions.php:3923 modules/pref-feed-browser.php:110
+msgid "Show"
+msgstr "Mutasd"
+
+#: functions.php:3924
+#, fuzzy
+msgid "Update errors"
+msgstr "Frissítési hiba"
+
+#: functions.php:3967
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4170
+#: functions.php:4049
+msgid "Dashboard"
+msgstr ""
+
+#: functions.php:4310
 msgid "No feeds to display."
 msgstr ""
 
-#: functions.php:4187
+#: functions.php:4327
 msgid "Tags"
 msgstr ""
 
-#: functions.php:4412
-msgid " - by "
+#: functions.php:4552
+msgid " - "
 msgstr ""
 
-#: functions.php:4467
+#: functions.php:4607
 msgid "no tags"
 msgstr ""
 
-#: functions.php:4498 functions.php:4865
+#: functions.php:4638 functions.php:5009
 msgid "Attachment:"
 msgstr "Csatolmány:"
 
-#: functions.php:4500 functions.php:4867
+#: functions.php:4640 functions.php:5011
 msgid "Attachments:"
 msgstr "Csatolmányok:"
 
-#: functions.php:4573
+#: functions.php:4650 functions.php:5020
+#, fuzzy
+msgid "unknown type"
+msgstr "Ismeretlen hiba"
+
+#: functions.php:4716 modules/pref-feed-browser.php:74
 msgid "Feed not found."
 msgstr "Feed nem található"
 
-#: functions.php:4640
+#: functions.php:4783
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4838
+#: functions.php:4981
 msgid "Show article"
 msgstr ""
 
-#: functions.php:4967
-msgid "No articles found."
+#: functions.php:5117
+#, fuzzy
+msgid "No unread articles found to display."
+msgstr "Nincs megjeleníthető hír"
+
+#: functions.php:5120
+#, fuzzy
+msgid "No starred articles found to display."
+msgstr "Nincs megjeleníthető hír"
+
+#: functions.php:5123
+#, fuzzy
+msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
 #: localized_js.php:35
@@ -545,7 +591,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:217 tt-rss.php:221
+#: localized_js.php:95 tt-rss.php:227 tt-rss.php:231
 msgid "No feed selected."
 msgstr ""
 
@@ -609,15 +655,15 @@ msgstr "Add meg a címke címét:"
 msgid "Save current configuration?"
 msgstr ""
 
-#: localized_js.php:120 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:25
 msgid "Old password cannot be blank."
 msgstr ""
 
-#: localized_js.php:121 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:30
 msgid "New password cannot be blank."
 msgstr ""
 
-#: localized_js.php:122 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:35
 msgid "Entered passwords do not match."
 msgstr ""
 
@@ -664,7 +710,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:869 modules/pref-feeds.php:930
 msgid "Title"
 msgstr "Cím"
 
@@ -813,81 +859,95 @@ msgstr ""
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "Maximum kor a friss híreknek (órákban)"
 
+#: localized_schema.php:52
+msgid "Hide feedlist"
+msgstr ""
+
 #: localized_schema.php:53
-msgid "Advanced"
+msgid ""
+"This option hides feedlist and allows it to be toggled on the fly, useful "
+"for small screens."
 msgstr ""
 
 #: localized_schema.php:55
+msgid "Advanced"
+msgstr ""
+
+#: localized_schema.php:57
 msgid "Blacklisted tags"
 msgstr "Feketelistás tagek"
 
-#: localized_schema.php:56
+#: localized_schema.php:58
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
 msgstr ""
 
-#: localized_schema.php:57
+#: localized_schema.php:59
 msgid "Confirm marking feed as read"
 msgstr ""
 
-#: localized_schema.php:58
+#: localized_schema.php:60
 msgid "Enable icons in feedlist"
 msgstr ""
 
-#: localized_schema.php:59
+#: localized_schema.php:61
 msgid "Enable labels"
 msgstr ""
 
-#: localized_schema.php:60
+#: localized_schema.php:62
 msgid ""
 "Experimental support for virtual feeds based on user crafted SQL queries. "
 "This feature is highly experimental and at this point not user friendly. Use "
 "with caution."
 msgstr ""
 
-#: localized_schema.php:61
+#: localized_schema.php:63
 msgid "Long date format"
 msgstr ""
 
-#: localized_schema.php:62
+#: localized_schema.php:64
 msgid "Set articles as unread on update"
 msgstr ""
 
-#: localized_schema.php:63
+#: localized_schema.php:65
 msgid "Short date format"
 msgstr ""
 
-#: localized_schema.php:64
+#: localized_schema.php:66
 msgid "Show additional information in feedlist"
 msgstr ""
 
-#: localized_schema.php:65
+#: localized_schema.php:67
 msgid "Strip unsafe tags from articles"
 msgstr ""
 
-#: localized_schema.php:66
+#: localized_schema.php:68
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
-#: localized_schema.php:67
+#: localized_schema.php:69
 msgid "Use more accessible date/time format for headlines"
 msgstr ""
 
-#: localized_schema.php:68
+#: localized_schema.php:70
 msgid "Automatically expand articles in combined mode"
 msgstr ""
 
-#: localized_schema.php:69
+#: localized_schema.php:71
 msgid "Purge unread articles"
 msgstr ""
 
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: localized_schema.php:72
+msgid "Show special feeds when hiding read feeds"
+msgstr ""
+
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
 #: modules/pref-users.php:29
 msgid "Login:"
 msgstr "Felhasználó:"
 
-#: 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 "Jelszó:"
 
@@ -1053,9 +1113,7 @@ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
 msgstr ""
 
 #: sanity_check.php:53
-msgid ""
-"config: SESSION_EXPIRE_TIME should be greater or equal "
-"toSESSION_COOKIE_LIFETIME"
+msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
 msgstr ""
 
 #: sanity_check.php:62
@@ -1095,12 +1153,12 @@ msgstr "Hozzászólás?"
 msgid "tag cloud"
 msgstr "tag felhő"
 
-#: tt-rss.php:140 modules/pref-feeds.php:1003
+#: tt-rss.php:140 modules/pref-feeds.php:1017
 msgid "Actions..."
 msgstr "Műveletek"
 
 #: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:749
+#: modules/pref-feeds.php:763
 msgid "Search"
 msgstr "Keresés"
 
@@ -1144,27 +1202,36 @@ msgstr "Más művelet:"
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Szűrők létrehozása"
 
-#: tt-rss.php:163 modules/popup-dialog.php:139
+#: tt-rss.php:163
+#, fuzzy
+msgid "Collapse feedlist"
+msgstr "Minden feed"
+
+#: tt-rss.php:165
+msgid "Toggle Feedlist"
+msgstr ""
+
+#: tt-rss.php:173 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Keresés"
 
-#: tt-rss.php:170
+#: tt-rss.php:180
 msgid "View:"
 msgstr "Nézet"
 
-#: tt-rss.php:172
+#: tt-rss.php:182
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:173
+#: tt-rss.php:183
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: tt-rss.php:178
+#: tt-rss.php:188
 msgid "Limit:"
 msgstr "Limit:"
 
-#: tt-rss.php:203
+#: tt-rss.php:213
 msgid "Update"
 msgstr "Frissítés"
 
@@ -1228,7 +1295,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:720
 msgid "Close this window"
 msgstr ""
 
@@ -1292,27 +1359,23 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:762
-msgid "Subscribe to feed"
-msgstr "Feliratkozás feedre"
-
-#: 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 "Kategória:"
 
-#: 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 "Feliratkozás"
 
 #: 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 "Mégse"
@@ -1365,6 +1428,12 @@ msgstr "Készít"
 msgid "Create filter"
 msgstr "Szárő készítése"
 
+#: modules/popup-dialog.php:283 modules/popup-dialog.php:314
+#: modules/pref-filters.php:40 modules/pref-filters.php:72
+#, fuzzy
+msgid "description"
+msgstr "Kiválasztottakat"
+
 #: modules/popup-dialog.php:288 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "Egyezés"
@@ -1385,7 +1454,7 @@ msgstr "Művelet:"
 msgid "Params:"
 msgstr "Paraméterek"
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
 msgid "Options:"
 msgstr "Beállítások:"
 
@@ -1413,7 +1482,7 @@ msgstr "Tegek szerkesztése"
 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 "Mentés"
@@ -1430,7 +1499,7 @@ msgstr "Mutasd a legnépszerűbb tageket"
 msgid "browse more"
 msgstr "tovább böngészik"
 
-#: 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 böngészése letilva az adminisztrátor által."
 
@@ -1438,211 +1507,223 @@ msgstr "Feed böngészése letilva az adminisztrátor által."
 msgid "Feed information:"
 msgstr "Feed információ:"
 
-#: modules/pref-feed-browser.php:51
+#: modules/pref-feed-browser.php:38
+#, fuzzy
+msgid "Site:"
+msgstr "Cím:"
+
+#: modules/pref-feed-browser.php:40
+#, fuzzy
+msgid "Last updated:"
+msgstr "Frissítve"
+
+#: 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 "Top"
 
-#: modules/pref-feed-browser.php:103
-msgid "Show"
-msgstr "Mutasd"
-
-#: 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 "Nem található feed a feliratkozáshoz."
 
-#: modules/pref-feeds.php:38
+#: modules/pref-feeds.php:39
 msgid "Subscribed to feeds:"
 msgstr "Feliratkozott feedek:"
 
-#: modules/pref-feeds.php:57
+#: modules/pref-feeds.php:58
 msgid "Other feeds: Top 25"
 msgstr "Más feedek: Top 25"
 
-#: modules/pref-feeds.php:61
+#: modules/pref-feeds.php:62
 msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "Mutasd a top 25 regisztrált feedet, népszerűség szerint:"
 
-#: modules/pref-feeds.php:145
+#: modules/pref-feeds.php:146
 msgid "Feed editor"
 msgstr "Feed editor"
 
-#: modules/pref-feeds.php:157
+#: modules/pref-feeds.php:158
 msgid "Title:"
 msgstr "Cím:"
 
-#: modules/pref-feeds.php:193
+#: modules/pref-feeds.php:194
 msgid "Update Interval:"
 msgstr "Frissítési intervallum:"
 
-#: modules/pref-feeds.php:202
+#: modules/pref-feeds.php:203
 msgid "Link to:"
 msgstr "Linkel ehhez:"
 
-#: modules/pref-feeds.php:219
+#: modules/pref-feeds.php:220
 msgid "Not linked"
 msgstr "Nem linkelt"
 
-#: 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 "Frissítés"
+
+#: 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 "Képek helyi tárolása"
 
-#: 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:587
 msgid "Category editor"
 msgstr ""
 
-#: modules/pref-feeds.php:596
+#: modules/pref-feeds.php:610
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr ""
 
-#: modules/pref-feeds.php:624
+#: modules/pref-feeds.php:638
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:641
+#: modules/pref-feeds.php:655
 msgid "Create category"
 msgstr "Kategória létrehozása"
 
-#: modules/pref-feeds.php:701
+#: modules/pref-feeds.php:715
 msgid "No feed categories defined."
 msgstr "Nincs feed kategória definiálva"
 
-#: modules/pref-feeds.php:712 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:319
+#: modules/pref-feeds.php:726 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:320
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: modules/pref-feeds.php:734
+#: modules/pref-feeds.php:748
 msgid "Some feeds have update errors (click for details)"
 msgstr "Néhány feed frissítésével gond akadt (kattints a részletekhez)"
 
-#: modules/pref-feeds.php:767
+#: modules/pref-feeds.php:781
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:841
+#: modules/pref-feeds.php:855
 msgid "Show last article times"
 msgstr "Mutasd az utolsó hír időpontját"
 
-#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:934
 msgid "Last&nbsp;Article"
 msgstr "Utolsó&nbsp;Hír"
 
-#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:938
 msgid "Updated"
 msgstr "Frissítve"
 
-#: modules/pref-feeds.php:991 modules/pref-feeds.php:1005
+#: modules/pref-feeds.php:1005 modules/pref-feeds.php:1019
 msgid "Selection:"
 msgstr "Kiválaszt:"
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1011
 msgid "Recategorize"
 msgstr "Újrakategorizál"
 
-#: modules/pref-feeds.php:1006 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:317
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:318
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: modules/pref-feeds.php:1007
+#: modules/pref-feeds.php:1021
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1008
+#: modules/pref-feeds.php:1022
 msgid "Clear feed data"
 msgstr "Feed adatok törlése"
 
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1023
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1028
 msgid "Other:"
 msgstr "Más:"
 
-#: modules/pref-feeds.php:1015
+#: modules/pref-feeds.php:1029
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: modules/pref-feeds.php:1042
+#: modules/pref-feeds.php:1056
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1046
+#: modules/pref-feeds.php:1060
 msgid "File:"
 msgstr "File:"
 
-#: modules/pref-feeds.php:1049
+#: modules/pref-feeds.php:1063
 msgid "Import"
 msgstr "Importálás"
 
-#: modules/pref-feeds.php:1056
+#: modules/pref-feeds.php:1070
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1073
 msgid "Firefox Integration"
 msgstr "Firefox integráció"
 
-#: modules/pref-feeds.php:1061
+#: modules/pref-feeds.php:1075
 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:1079
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1088
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the address specified below."
+"by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1081
-msgid "Generate another address"
+#: modules/pref-feeds.php:1095
+#, fuzzy
+msgid "Generate another link"
 msgstr "Másik cím genrálása"
 
 #: modules/pref-filters.php:22
@@ -1675,6 +1756,14 @@ msgstr "Egyezés"
 msgid "Action"
 msgstr "Művelet"
 
+#: modules/pref-filters.php:297
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:298
+msgid "action_description"
+msgstr ""
+
 #: modules/pref-filters.php:302
 msgid "(Disabled)"
 msgstr "(Kikapcsolva)"
@@ -1709,93 +1798,102 @@ msgstr ""
 msgid "No labels defined."
 msgstr "Nincs címke definiálva."
 
-#: modules/pref-prefs.php:55
+#: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "A jelszó meg lett változtatva."
 
-#: modules/pref-prefs.php:57
+#: modules/pref-prefs.php:62
 msgid "Old password is incorrect."
 msgstr "A régi jelszó nem helyes."
 
-#: modules/pref-prefs.php:107
+#: modules/pref-prefs.php:112
 msgid "The configuration was saved."
 msgstr "A konfiguráció elmentve."
 
-#: modules/pref-prefs.php:133
+#: modules/pref-prefs.php:138
 msgid "E-mail has been changed."
 msgstr "E-mail megváltoztatva."
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
+#: modules/pref-prefs.php:150 modules/pref-prefs.php:210
 msgid "The configuration was reset to defaults."
 msgstr "A konfiguráció visszaállítva az alapértelmezettre."
 
-#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
 msgid "Change theme"
 msgstr "Kinlzet megváltozatása"
 
-#: modules/pref-prefs.php:190
+#: modules/pref-prefs.php:195
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
 msgstr ""
 
-#: modules/pref-prefs.php:217
+#: modules/pref-prefs.php:222
 msgid "Personal data"
 msgstr "Személyes adatok"
 
-#: modules/pref-prefs.php:224
+#: modules/pref-prefs.php:229
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:237
+#: modules/pref-prefs.php:238
+#, fuzzy
+msgid "Access level"
+msgstr "Hozzáférési szint:"
+
+#: modules/pref-prefs.php:251
 msgid "Change e-mail"
 msgstr "E-mail megváltoztatása"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:257
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:259
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:264
 msgid "New password"
 msgstr "Új jelszó"
 
-#: modules/pref-prefs.php:256
+#: modules/pref-prefs.php:270
 msgid "Confirm password"
 msgstr "Jelszó jóváhagyása"
 
-#: modules/pref-prefs.php:271
+#: modules/pref-prefs.php:285
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: modules/pref-prefs.php:287
+#: modules/pref-prefs.php:301
 msgid "Themes"
 msgstr "Kinézetek"
 
-#: modules/pref-prefs.php:288
+#: modules/pref-prefs.php:302
 msgid "Select theme"
 msgstr "Kinézet választó"
 
-#: modules/pref-prefs.php:290
+#: modules/pref-prefs.php:304
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:377
+msgid "short_desc"
+msgstr ""
+
+#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
 msgid "Yes"
 msgstr "Igen"
 
-#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
 msgid "No"
 msgstr "Nem"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:413
 msgid "Save configuration"
 msgstr "Konfiguráció mentése"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:417
 msgid "Reset to defaults"
 msgstr "Visszaállítás az alapértelmezettre"
 
@@ -1820,53 +1918,53 @@ msgstr "Hozzáférési szint:"
 msgid "Changed password of user <b>%s</b>."
 msgstr ""
 
-#: modules/pref-users.php:123
+#: modules/pref-users.php:126
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: modules/pref-users.php:130
+#: modules/pref-users.php:133
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: modules/pref-users.php:134
+#: modules/pref-users.php:137
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr ""
 
-#: 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 ""
 
-#: modules/pref-users.php:158
+#: modules/pref-users.php:161
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr ""
 
-#: modules/pref-users.php:193
+#: modules/pref-users.php:196
 msgid "Create user"
 msgstr "Felhasználó létrehozása"
 
-#: modules/pref-users.php:215
+#: modules/pref-users.php:218
 msgid "Login"
 msgstr "Belépés"
 
-#: modules/pref-users.php:216
+#: modules/pref-users.php:219
 msgid "Access Level"
 msgstr "Hozzáférési szint"
 
-#: modules/pref-users.php:217
+#: modules/pref-users.php:220
 msgid "Last login"
 msgstr "Utolsó belépés"
 
-#: modules/pref-users.php:315
+#: modules/pref-users.php:316
 msgid "User details"
 msgstr "Részletek a felhasználórol "
 
-#: modules/pref-users.php:321
+#: modules/pref-users.php:322
 msgid "Reset password"
 msgstr "Jelszó reset"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 13bee9b7..dd419b07 100644
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index 33f11f25..44a87a9a 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -1,15 +1,16 @@
-# Norwegian Bokmål for Tiny Tiny RSS.
-# Copyright (C) 2007
-# This file is distributed under the same license as the Tiny Tiny RSS package.
-# Christian Lomsdalen <christian@vindstille.net>, 2007.
-# 
+# Norwegian bokmål for Tiny Tiny RSS.
+# Copyright (C) 2007
+# This file is distributed under the same license as the Tiny Tiny RSS package.
+# Christian Lomsdalen <christian@vindstille.net>, 2007.
+# Daniel Aleksandersen <aleksandersen+webcontact@runbox.com>, 2007
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.2.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-20 11:27+0300\n"
+"POT-Creation-Date: 2008-04-08 13:13+0400\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
-"Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
+"Language-Team: Norwegian bokmål <christian@vindstille.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +21,7 @@ msgstr "Bruk standard"
 
 #: backend.php:104
 msgid "Never purge"
-msgstr "Slett aldri"
+msgstr "Fjern aldri"
 
 #: backend.php:105
 msgid "1 week old"
@@ -83,33 +84,37 @@ msgstr "Side"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:134 modules/pref-users.php:252
+#: backend.php:134
 msgid "User"
 msgstr "Bruker"
 
-#: backend.php:135 modules/pref-users.php:252
+#: backend.php:135
+msgid "Power User"
+msgstr ""
+
+#: backend.php:136
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:393
+#: backend.php:394
 msgid "Registered"
 msgstr "Registrert"
 
-#: backend.php:394
+#: backend.php:395
 msgid "Last logged in"
-msgstr "Sist innlogget"
+msgstr "Forrige innlogging"
 
-#: backend.php:395
+#: backend.php:396
 msgid "Stored articles"
 msgstr "Lagrede artikler"
 
-#: backend.php:402
+#: backend.php:403
 msgid "Subscribed feeds count"
-msgstr "Antall nyhetsstrømmer som abonneres på"
+msgstr "Antall nyhetskanaler som det abonneres på"
 
-#: backend.php:417
+#: backend.php:418
 msgid "Subscribed feeds"
-msgstr "Nyhetsstrømmer som abonneres på"
+msgstr "Nyhetskanaler som det abonneres på"
 
 #: errors.php:3
 msgid "Unknown error"
@@ -121,7 +126,7 @@ msgstr "Dette programmet krever XmlHttpRequest "
 
 #: errors.php:8
 msgid "This program requires cookies "
-msgstr "Dette programmet krever informasjonskapsler påslått"
+msgstr "Dette programmet krever at informasjonskapsler blir godkjent"
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -152,7 +157,7 @@ msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
 msgstr ""
-"Kunne ikke vise nyhetsstrøm: spørring feilet. Vennligst sjekk "
+"Kunne ikke vise nyhetskanal: spørring feilet. Vennligst sjekk "
 "merkelappsyntaks eller den lokale konfigurasjonen"
 
 #: errors.php:23
@@ -172,238 +177,254 @@ msgstr ""
 "Din utgave av MySQL er i øyeblikket ikke støttet. Vennligst besøk den \n"
 "\t\toffisielle siden for mer informasjon."
 
-#: functions.php:2505 functions.php:2844 functions.php:3212 functions.php:4065
+#: functions.php:2516 functions.php:2855 functions.php:3223 functions.php:4076
 msgid "Starred articles"
-msgstr "Favorittartikler"
+msgstr "Merkede artikler"
 
-#: functions.php:2514 functions.php:2846 functions.php:3214 functions.php:4072
-#: modules/pref-feeds.php:1085
+#: functions.php:2525 functions.php:2857 functions.php:3225 functions.php:4083
+#: modules/pref-feeds.php:1082
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: functions.php:2523 functions.php:2848 functions.php:3216 functions.php:4050
+#: functions.php:2534 functions.php:2859 functions.php:3227 functions.php:4061
 msgid "Fresh articles"
-msgstr "Ferske artikler"
+msgstr "Uleste artikler"
 
-#: functions.php:2766 modules/popup-dialog.php:151
+#: functions.php:2777 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
-msgstr "Alle Nyhetsstrømmer"
+msgstr "Alle Nyhetskanaler"
 
-#: functions.php:2795 functions.php:2834 functions.php:3190 functions.php:4229
-#: functions.php:4259 modules/pref-feeds.php:897
+#: functions.php:2806 functions.php:2845 functions.php:3201 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:894
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: functions.php:2824 functions.php:3356
+#: functions.php:2835 functions.php:3367
 msgid "Special"
-msgstr "Snarveier"
+msgstr "Hurtigkanaler"
 
-#: functions.php:2826 functions.php:3358
+#: functions.php:2837 functions.php:3369
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: functions.php:3176 functions.php:3178
+#: functions.php:3187 functions.php:3189
 msgid "Search results"
 msgstr "Søkeresultat"
 
-#: functions.php:3194 functions.php:3207 functions.php:3224
+#: functions.php:3205 functions.php:3218 functions.php:3235
 msgid "Searched for"
 msgstr "Søkte etter"
 
-#: functions.php:3820 functions.php:3874 functions.php:5033
-#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
+#: functions.php:3831 functions.php:3885 functions.php:5050
+#: modules/pref-feeds.php:669 modules/pref-feeds.php:856
 #: modules/pref-filters.php:255 modules/pref-labels.php:239
 #: modules/pref-users.php:211
 msgid "Select:"
 msgstr "Velg:"
 
-#: functions.php:3821 functions.php:3875 modules/pref-feeds.php:673
-#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: functions.php:3832 functions.php:3886 modules/pref-feeds.php:670
+#: modules/pref-feeds.php:857 modules/pref-filters.php:256
 #: modules/pref-labels.php:240 modules/pref-users.php:212
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:3822 functions.php:3826 functions.php:3876 functions.php:3879
-#: tt-rss.php:183
+#: functions.php:3833 functions.php:3837 functions.php:3887 functions.php:3890
+#: tt-rss.php:185
 msgid "Unread"
 msgstr "Ulest"
 
-#: functions.php:3823 functions.php:3877 modules/pref-feeds.php:674
-#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: functions.php:3834 functions.php:3888 modules/pref-feeds.php:671
+#: modules/pref-feeds.php:858 modules/pref-filters.php:257
 #: modules/pref-labels.php:241 modules/pref-users.php:213
 msgid "None"
 msgstr "Ingen"
 
-#: functions.php:3825
+#: functions.php:3836
 msgid "Toggle"
 msgstr "Vis"
 
-#: functions.php:3827 functions.php:3880 tt-rss.php:182
+#: functions.php:3838 functions.php:3891 tt-rss.php:184
 msgid "Starred"
 msgstr "Favoritter"
 
-#: functions.php:3828
+#: functions.php:3839
 msgid "Published"
 msgstr "Publisert"
 
-#: functions.php:3831 localized_schema.php:15
+#: functions.php:3842 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: functions.php:3832
+#: functions.php:3843
 msgid "Selection"
 msgstr "Utvalg"
 
-#: functions.php:3833
+#: functions.php:3844
 msgid "This page"
 msgstr "Denne siden"
 
-#: functions.php:3839
+#: functions.php:3850
 msgid "Above active article"
 msgstr "Ovenfor aktiv artikkel"
 
-#: functions.php:3840
+#: functions.php:3851
 msgid "Below active article"
 msgstr "Nedenfor aktiv artikkel"
 
-#: functions.php:3845
+#: functions.php:3856
 msgid "Entire feed"
-msgstr "Hele nyhetsstrømmen"
+msgstr "Hele nyhetskanalmen"
 
-#: functions.php:3853
+#: functions.php:3864
 msgid "Next page"
 msgstr "Neste side"
 
-#: functions.php:3854
+#: functions.php:3865
 msgid "Previous page"
 msgstr "Forrige side"
 
-#: functions.php:3855
+#: functions.php:3866
 msgid "First page"
 msgstr "Første side"
 
-#: functions.php:3865 functions.php:3891
+#: functions.php:3876 functions.php:3902
 msgid "Convert to label"
 msgstr "Konverter til merkelapp"
 
-#: functions.php:3879
+#: functions.php:3890
 msgid "Toggle:"
 msgstr "Vis:"
 
-#: functions.php:3882
+#: functions.php:3893
 msgid "Mark as read:"
 msgstr "Marker som lest:"
 
-#: functions.php:3883
+#: functions.php:3894
 msgid "Page"
 msgstr "Side"
 
-#: functions.php:3884 modules/pref-filters.php:263
+#: functions.php:3895 modules/pref-filters.php:263
 msgid "Feed"
-msgstr "Nyhetsstrøm"
+msgstr "Nyhetskanal"
 
-#: functions.php:3903 modules/popup-dialog.php:61 modules/pref-feeds.php:779
+#: functions.php:3914 modules/popup-dialog.php:61 modules/pref-feeds.php:776
 msgid "Subscribe to feed"
-msgstr "Abonner på nyhetsstrøm"
+msgstr "Abonner på nyhetskanal"
 
-#: functions.php:3906 functions.php:3907 functions.php:3908 functions.php:3909
+#: functions.php:3917 functions.php:3918 functions.php:3919 functions.php:3920
 msgid "Placeholder"
 msgstr ""
 
-#: functions.php:3912 modules/pref-feed-browser.php:110
+#: functions.php:3923 modules/pref-feed-browser.php:110
 msgid "Show"
 msgstr "Vis"
 
-#: functions.php:3913
+#: functions.php:3924
 #, fuzzy
 msgid "Update errors"
 msgstr "Oppdaterer feil"
 
-#: functions.php:3956
+#: functions.php:3967
 msgid "Generated feed"
-msgstr "Generert nyhetsstrøm"
+msgstr "Generert nyhetskanal"
 
-#: functions.php:4038
+#: functions.php:4049
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4299
+#: functions.php:4310
 msgid "No feeds to display."
-msgstr "Ingen nyhetstrømmer å vise"
+msgstr "Ingen nyhetkanaler å vise"
 
-#: functions.php:4316
+#: functions.php:4327
 msgid "Tags"
-msgstr "Tagger"
+msgstr "Stikkord"
 
-#: functions.php:4541
+#: functions.php:4552
 #, fuzzy
 msgid " - "
-msgstr "- av "
+msgstr "– av "
 
-#: functions.php:4596
+#: functions.php:4607
 msgid "no tags"
-msgstr "Ingen tagger"
+msgstr "Ingen stikkord"
 
-#: functions.php:4627 functions.php:4994
+#: functions.php:4638 functions.php:5009
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: functions.php:4629 functions.php:4996
+#: functions.php:4640 functions.php:5011
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: functions.php:4702 modules/pref-feed-browser.php:74
+#: functions.php:4650 functions.php:5020
+#, fuzzy
+msgid "unknown type"
+msgstr "Ukjent feil"
+
+#: functions.php:4716 modules/pref-feed-browser.php:74
 msgid "Feed not found."
-msgstr "Nyhetsstrømmen ble ikke funnet"
+msgstr "Nyhetskanalen ble ikke funnet"
 
-#: functions.php:4769
+#: functions.php:4783
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
-"Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
+"Kunne ikke vise nyhetskanal (spørring feilet). Vennligst sjekk "
 "merkelappsyntaksen eller lokal konfigurasjon."
 
-#: functions.php:4967
+#: functions.php:4981
 msgid "Show article"
 msgstr "Vis artikkelen"
 
-#: functions.php:5096
-msgid "No articles found."
-msgstr "Ingen artikler ble funnet"
+#: functions.php:5117
+#, fuzzy
+msgid "No unread articles found to display."
+msgstr "Ingen artikler funnet som kan markeres"
+
+#: functions.php:5120
+#, fuzzy
+msgid "No starred articles found to display."
+msgstr "Ingen artikler funnet som kan markeres"
+
+#: functions.php:5123
+#, fuzzy
+msgid "No articles found to display."
+msgstr "Ingen artikler funnet som kan markeres"
 
 #: localized_js.php:35
 msgid "display feeds"
-msgstr "Vis nyhetsstrømmer"
+msgstr "Vis nyhetskanaler"
 
 #: localized_js.php:36
 msgid "display tags"
-msgstr "Vis tagger"
+msgstr "vis stikkord"
 
 #: localized_js.php:37 prefs.php:131 tt-rss.php:75
 msgid "Loading, please wait..."
-msgstr "laster, vennligst vent"
+msgstr "Vennligst vent, henter inn…"
 
 #: localized_js.php:38
 msgid "All feeds updated."
-msgstr "Alle nyhetsstrømmer er oppdatert"
+msgstr "Alle nyhetskanaler er oppdatert"
 
 #: localized_js.php:39
 msgid "Marking all feeds as read..."
-msgstr "Marker alle nyhetsstrømmer som lest"
+msgstr "Markerer alle nyhetskanaler som lest…"
 
 #: localized_js.php:40
 msgid "Adding feed..."
-msgstr "Legger til nyhetsstrøm..."
+msgstr "Legger til nyhetskanal…"
 
 #: localized_js.php:41
 msgid "Removing feed..."
-msgstr "Fjerner nyhetsstrøm..."
+msgstr "Fjerner nyhetskanal…"
 
 #: localized_js.php:42
 msgid "Saving feed..."
-msgstr "Lagrer Nyhetsstrøm"
+msgstr "Lagrer Nyhetskanal…"
 
 #: localized_js.php:43
 msgid "Can't add category: no name specified."
@@ -411,7 +432,7 @@ msgstr "Kan ikke legge til kategori: mangler navn"
 
 #: localized_js.php:44
 msgid "Adding feed category..."
-msgstr "Legger til kategori for nyhetsstrømmer"
+msgstr "Legger til kategori for nyhetskanaler…"
 
 #: localized_js.php:45 localized_js.php:104
 msgid "Can't add user: no login specified."
@@ -419,7 +440,7 @@ msgstr "Kan ikke legge til bruker: brukernavn mangler."
 
 #: localized_js.php:47
 msgid "Adding user..."
-msgstr "Legger til bruker.."
+msgstr "Legger til bruker…"
 
 #: localized_js.php:48 localized_js.php:102
 msgid "Can't create label: missing SQL expression."
@@ -435,7 +456,7 @@ msgstr "Fjerne merkede merkelapper?"
 
 #: localized_js.php:51
 msgid "Removing selected labels..."
-msgstr "Fjerner merkede merkelapper..."
+msgstr "Fjerner merkede merkelapper…"
 
 #: localized_js.php:52 localized_js.php:71 localized_js.php:105
 msgid "No labels are selected."
@@ -447,7 +468,7 @@ msgstr "Fjerne markerte brukere?"
 
 #: localized_js.php:54
 msgid "Removing selected users..."
-msgstr "Fjerner markerte brukere..."
+msgstr "Fjerner markerte brukere…"
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
 #: localized_js.php:106
@@ -460,7 +481,7 @@ msgstr "Fjerne valgte filtre?"
 
 #: localized_js.php:57
 msgid "Removing selected filters..."
-msgstr "Fjerner valgte filtre..."
+msgstr "Fjerner valgte filtre…"
 
 #: localized_js.php:58 localized_js.php:81 localized_js.php:107
 msgid "No filters are selected."
@@ -468,16 +489,16 @@ msgstr "Ingen filtre er valgt"
 
 #: localized_js.php:59
 msgid "Unsubscribe from selected feeds?"
-msgstr "Fjern abonnement på valgte nyhetsstrømmer"
+msgstr "Fjern abonnement på valgte nyhetskanaler"
 
 #: localized_js.php:60
 msgid "Unsubscribing from selected feeds..."
-msgstr "Fjerner abonnementer på valgte nyhetsstrømmer..."
+msgstr "Fjerner abonnementer på valgte nyhetskanaler…"
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
 #: localized_js.php:108 localized_js.php:111
 msgid "No feeds are selected."
-msgstr "Ingen nyhetsstrømmer er valgt"
+msgstr "Ingen nyhetskanaler er valgt"
 
 #: localized_js.php:62
 msgid "Remove selected categories?"
@@ -485,7 +506,7 @@ msgstr "Fjerne valgte kategorier?"
 
 #: localized_js.php:63
 msgid "Removing selected categories..."
-msgstr "Fjerner valgte kategorier..."
+msgstr "Fjerner valgte kategorier…"
 
 #: localized_js.php:64 localized_js.php:85 localized_js.php:109
 msgid "No categories are selected."
@@ -493,15 +514,15 @@ msgstr "Ingen kategorier er valgt."
 
 #: localized_js.php:65
 msgid "Saving category..."
-msgstr "Lagrer kategori..."
+msgstr "Lagrer kategori…"
 
 #: localized_js.php:66
 msgid "Loading help..."
-msgstr "Laster hjelp..."
+msgstr "Henter hjelp…"
 
 #: localized_js.php:67
 msgid "Saving label..."
-msgstr "Lagrer merkelapp..."
+msgstr "Lagrer merkelapp…"
 
 #: localized_js.php:68 localized_js.php:110
 msgid "Login field cannot be blank."
@@ -509,11 +530,11 @@ msgstr "Brukernavn kan ikke være blankt"
 
 #: localized_js.php:69
 msgid "Saving user..."
-msgstr "Lagrer bruker..."
+msgstr "Lagrer bruker…"
 
 #: localized_js.php:70
 msgid "Saving filter..."
-msgstr "Lagrer filter..."
+msgstr "Lagrer filter…"
 
 #: localized_js.php:72
 msgid "Please select only one label."
@@ -529,11 +550,11 @@ msgstr "Nullstill passordet til utvalgte bruker?"
 
 #: localized_js.php:78
 msgid "Resetting password for selected user..."
-msgstr "Nullstiller passordet for utvalgte bruker..."
+msgstr "Nullstiller passordet for utvalgte bruker…"
 
 #: localized_js.php:80
 msgid "Please select only one feed."
-msgstr "Vennligst velg kun en nyhetsstrøm"
+msgstr "Vennligst velg kun en nyhetskanal"
 
 #: localized_js.php:82
 msgid "Please select only one filter."
@@ -541,7 +562,7 @@ msgstr "Vennligst velg kun et filter"
 
 #: localized_js.php:84
 msgid "Please select one feed."
-msgstr "Vennligst velg en nyhetsstrøm"
+msgstr "Vennligst velg en nyhetskanal"
 
 #: localized_js.php:86
 msgid "Please select only one category."
@@ -553,7 +574,7 @@ msgstr "Ingen OPML-fil til å lastes opp."
 
 #: localized_js.php:88
 msgid "Changing category of selected feeds..."
-msgstr "Endrer kategori for utvalgte nyhetsstrømmer"
+msgstr "Endrer kategori for utvalgte nyhetskanaler…"
 
 #: localized_js.php:89
 msgid "Reset to defaults?"
@@ -561,11 +582,11 @@ msgstr "Tilbakefør til standardinnstillingene"
 
 #: localized_js.php:90
 msgid "Trying to change password..."
-msgstr "Prøver å endre passordet..."
+msgstr "Prøver å endre passordet…"
 
 #: localized_js.php:91
 msgid "Trying to change e-mail..."
-msgstr "Prøver å endre e-posten..."
+msgstr "Prøver å endre e-posten…"
 
 #: localized_js.php:92
 msgid "No articles are selected."
@@ -579,9 +600,9 @@ msgstr "Kunne ikke oppdatere overskriftene (manglende XML objekt)."
 msgid "Could not display article (missing XML object)"
 msgstr "Kunne ikke vise artikkelen (manglende XML objekt)."
 
-#: localized_js.php:95 tt-rss.php:225 tt-rss.php:229
+#: localized_js.php:95 tt-rss.php:227 tt-rss.php:231
 msgid "No feed selected."
-msgstr "Ingen valgt nyhetsstrøm"
+msgstr "Ingen kanal er valgt"
 
 #: localized_js.php:96
 msgid "Replace current publishing address with a new one?"
@@ -601,11 +622,11 @@ msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
 #: localized_js.php:100
 msgid "Please select some feed first."
-msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+msgstr "Vennligst velg en eller flere nyhetskanaler først"
 
 #: localized_js.php:101
 msgid "You can't edit this kind of feed."
-msgstr "Du kan ikke endre denne typen nyhetsstrøm"
+msgstr "Du kan ikke endre denne typen nyhetskanal"
 
 #: localized_js.php:112
 msgid "Can't add filter: nothing to match on."
@@ -613,7 +634,7 @@ msgstr "Kan ikke legge til filter, ingen match på kriteriene"
 
 #: localized_js.php:113
 msgid "Can't subscribe: no feed URL given."
-msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
+msgstr "Kan ikke abonnere: Ingen nyhetskanalsadresse er blitt gitt"
 
 #: localized_js.php:114
 #, php-format
@@ -643,15 +664,15 @@ msgstr "Vennligst skriv inn merkelapp:"
 msgid "Save current configuration?"
 msgstr "Lagre nåværende konfigurasjon?"
 
-#: localized_js.php:120 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:25
 msgid "Old password cannot be blank."
 msgstr "Gammelt passord kan ikke være blankt."
 
-#: localized_js.php:121 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:30
 msgid "New password cannot be blank."
 msgstr "Nytt passord kan ikke vært blankt."
 
-#: localized_js.php:122 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:35
 msgid "Entered passwords do not match."
 msgstr "Innskrivne passord matcher ikke."
 
@@ -678,7 +699,7 @@ msgstr "Fjern favorittmerkingen fra artiklen"
 
 #: localized_js.php:128
 msgid "Please wait..."
-msgstr "Vennligst vent..."
+msgstr "Vennligst vent…"
 
 #: localized_js.php:129 localized_schema.php:17
 msgid "Publish article"
@@ -690,7 +711,7 @@ msgstr "Fjern publiseringen av artikkelen."
 
 #: localized_js.php:131
 msgid "You can't clear this type of feed."
-msgstr "Du kan ikke rydde opp i denne typen nyhetsstrøm"
+msgstr "Du kan ikke rydde opp i denne typen nyhetskanal"
 
 #: localized_js.php:132
 #, php-format
@@ -698,7 +719,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:872 modules/pref-feeds.php:933
+#: modules/pref-feeds.php:869 modules/pref-feeds.php:930
 msgid "Title"
 msgstr "Tittel"
 
@@ -724,7 +745,7 @@ msgstr "Sett som favorittartikkel"
 
 #: localized_schema.php:18
 msgid "Assign tags"
-msgstr "Tildel tagger"
+msgstr "Tildel stikkord"
 
 #: localized_schema.php:22
 msgid "General"
@@ -741,13 +762,13 @@ msgid ""
 "different feeds to appear only once."
 msgstr ""
 "Dette valget er brukervennlig hvis du leser flere globale "
-"nyhetsstrømssamlere som har delvis overlappende brukerbase. Når denne er "
-"avskrudd kan samme post fra flere forskjellige nyhetsstrømmer vises på en "
+"nyhetskanalssamlere som har delvis overlappende brukerbase. NÃ¥r denne er "
+"avskrudd kan samme post fra flere forskjellige nyhetskanaler vises på en "
 "gang."
 
 #: localized_schema.php:26
 msgid "Default interval between feed updates (in minutes)"
-msgstr "Standard intervall mellom nyhetsstrømsoppdateringer (i minutter)"
+msgstr "Standard intervall mellom nyhetskanalsoppdateringer (i minutter)"
 
 #: localized_schema.php:27
 msgid "Enable e-mail digest"
@@ -775,14 +796,14 @@ msgstr "Grensesnitt"
 
 #: localized_schema.php:34
 msgid "Combined feed display"
-msgstr "Kombinert nyhetsstrømsvisning"
+msgstr "Kombinert nyhetskanalsvisning"
 
 #: localized_schema.php:35
 msgid ""
 "Display expanded list of feed articles, instead of separate displays for "
 "headlines and article content"
 msgstr ""
-"Viser en utvidet liste over nyhetsstrømsartikler isteden for en separat "
+"Viser en utvidet liste over nyhetskanalsartikler isteden for en separat "
 "visning av titler og artikler."
 
 #: localized_schema.php:36
@@ -799,7 +820,7 @@ msgstr ""
 
 #: localized_schema.php:38
 msgid "Enable feed categories"
-msgstr "Tillatt kategorisering av nyhetsstrømmer"
+msgstr "Tillatt kategorisering av nyhetskanaler"
 
 #: localized_schema.php:39
 msgid "Enable search toolbar"
@@ -807,7 +828,7 @@ msgstr "Vis søkelinjen"
 
 #: localized_schema.php:40
 msgid "Hide feeds with no unread messages"
-msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
+msgstr "Skjul nyhetskanaler med ingen uleste meldinger"
 
 #: localized_schema.php:41
 msgid "Mark articles as read automatically"
@@ -823,14 +844,14 @@ msgstr ""
 
 #: localized_schema.php:43
 msgid "On catchup show next feed"
-msgstr "Ved oppdatering vis neste nyhetsstrøm"
+msgstr "Ved oppdatering vis neste nyhetskanal"
 
 #: localized_schema.php:44
 msgid ""
 "When \"Mark as read\" button is clicked in toolbar, automatically open next "
 "feed with unread articles."
 msgstr ""
-"Når \"Marker som lest\" knappen blir klikket, åpne neste nyhetsstrøm med "
+"Når \"Marker som lest\" knappen blir klikket, åpne neste nyhetskanal med "
 "uleste artikler."
 
 #: localized_schema.php:45
@@ -847,7 +868,7 @@ msgstr "Vis innholdsforhåndsvisning i titteloversikten"
 
 #: localized_schema.php:48
 msgid "Sort feeds by unread articles count"
-msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
+msgstr "Sorter nyhetskanaler ut i fra antall uleste artikler"
 
 #: localized_schema.php:49
 msgid "User stylesheet URL"
@@ -866,7 +887,7 @@ msgstr "Maksimal alder på ferske artikler (i timer)"
 #: localized_schema.php:52
 #, fuzzy
 msgid "Hide feedlist"
-msgstr "Skjul fra min nyhetsstrømslisten"
+msgstr "Skjul fra min nyhetskanalslisten"
 
 #: localized_schema.php:53
 msgid ""
@@ -880,23 +901,23 @@ msgstr "Avansert"
 
 #: localized_schema.php:57
 msgid "Blacklisted tags"
-msgstr "Svartelistede tagger"
+msgstr "Svartelistede stikkord"
 
 #: localized_schema.php:58
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
 msgstr ""
-"Når tagger blir automatisk funnet i artikler skal følgende tagger ikke bli "
+"Når tagger blir automatisk funnet i artikler skal følgende stikkord ikke bli "
 "oppdaget (komma-separert liste)"
 
 #: localized_schema.php:59
 msgid "Confirm marking feed as read"
-msgstr "Bekreft markeringen av nyhetsstrøm som lest"
+msgstr "Bekreft markeringen av nyhetskanal som lest"
 
 #: localized_schema.php:60
 msgid "Enable icons in feedlist"
-msgstr "Tillat ikoner i nyhetsstrømslisten"
+msgstr "Tillat ikoner i nyhetskanalslisten"
 
 #: localized_schema.php:61
 msgid "Enable labels"
@@ -908,7 +929,7 @@ msgid ""
 "This feature is highly experimental and at this point not user friendly. Use "
 "with caution."
 msgstr ""
-"Eksperimentel støtte for virtuelle nyhetsstrømmer basert på brukerlagde SQL-"
+"Eksperimentel støtte for virtuelle nyhetskanaler basert på brukerlagde SQL-"
 "spørringer. Denne funksjonen er veldig eksperimentel og er på nåværende "
 "tidspunkt ikke brukervennlig. Benytt med varsomhet."
 
@@ -926,11 +947,11 @@ msgstr "Kort datoformat"
 
 #: localized_schema.php:66
 msgid "Show additional information in feedlist"
-msgstr "Vis tilleggsinformasjon i nyhetsstrømslisten"
+msgstr "Vis tilleggsinformasjon i nyhetskanalslisten"
 
 #: localized_schema.php:67
 msgid "Strip unsafe tags from articles"
-msgstr "Fjern utrygge tagger fra artiklene"
+msgstr "Fjern utrygge stikkord fra artiklene"
 
 #: localized_schema.php:68
 msgid "Strip all but most common HTML tags when reading articles."
@@ -1012,7 +1033,7 @@ msgstr "Utfør oppdateringene"
 
 #: mysql_convert_unicode.php:82
 msgid "Converting database..."
-msgstr "Konverterer database..."
+msgstr "Konverterer database…"
 
 #: opml.php:108 opml.php:112
 msgid "OPML Utility"
@@ -1020,11 +1041,11 @@ msgstr "OPML-verktøy"
 
 #: opml.php:133
 msgid "Importing OPML (using DOMXML extension)..."
-msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
+msgstr "Importerer OPML (bruker DOMXML-utvidelsen)…"
 
 #: opml.php:137
 msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
+msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)…"
 
 #: opml.php:141
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
@@ -1033,7 +1054,7 @@ msgstr ""
 
 #: opml.php:145
 msgid "Return to preferences"
-msgstr "Returner til innstillinger"
+msgstr "Returner til brukervalg"
 
 #: prefs.php:85
 msgid "Unknown Error"
@@ -1045,7 +1066,7 @@ msgstr "Hei, "
 
 #: prefs.php:93 prefs.php:103
 msgid "Exit preferences"
-msgstr "Forlat innstillinger"
+msgstr "Forlat brukervalg"
 
 #: prefs.php:95 tt-rss.php:118
 msgid "Logout"
@@ -1053,15 +1074,15 @@ msgstr "Logg ut"
 
 #: prefs.php:109 tt-rss.php:110 tt-rss.php:142
 msgid "Preferences"
-msgstr "Innstillinger"
+msgstr "Brukervalg"
 
 #: prefs.php:111
 msgid "My Feeds"
-msgstr "Mine nyhetsstrømmer"
+msgstr "Mine nyhetskanaler"
 
 #: prefs.php:114
 msgid "Other Feeds"
-msgstr "Andres nyhetsstrømmer"
+msgstr "Andres nyhetskanaler"
 
 #: prefs.php:117
 msgid "Published Articles"
@@ -1178,8 +1199,8 @@ msgid ""
 "ru/trac/wiki/UpdatingFeeds'>wiki</a>."
 msgstr ""
 "config: valget DAEMON_REFRESH_ONLY er avlegs. Vennligst fjern dette valget "
-"og les om andre måter å oppdatere nyhetsstrømmer i <a href='http://tt-rss."
-"spb.ru/trac/wiki/UpdatingFeeds'>wikien</a>."
+"og les om andre måter å oppdatere nyhetskanaler i <a href='http://tt-rss.spb."
+"ru/trac/wiki/UpdatingFeeds'>wikien</a>."
 
 #: sanity_check.php:83
 msgid "Fatal Error"
@@ -1191,28 +1212,28 @@ msgstr "Kommentarer?"
 
 #: tt-rss.php:131
 msgid "tag cloud"
-msgstr "Tag-sky"
+msgstr "stikkordskurv"
 
-#: tt-rss.php:140 modules/pref-feeds.php:1020
+#: tt-rss.php:140 modules/pref-feeds.php:1017
 msgid "Actions..."
-msgstr "Handlinger..."
+msgstr "Handlinger…"
 
 #: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:766
+#: modules/pref-feeds.php:763
 msgid "Search"
 msgstr "Søk"
 
 #: tt-rss.php:144
 msgid "Feed actions:"
-msgstr "Nyhetsstrømshandlinger:"
+msgstr "Nyhetskanalshandlinger:"
 
 #: tt-rss.php:145
 msgid "&nbsp;&nbsp;Subscribe to feed"
-msgstr "&nbsp;&nbsp;Abonner på nyhetsstrømmen"
+msgstr "&nbsp;&nbsp;Abonner på en nyhetskanal"
 
 #: tt-rss.php:146
 msgid "&nbsp;&nbsp;Edit this feed"
-msgstr "&nbsp;&nbsp;Endre på nyhetsstrømmen"
+msgstr "&nbsp;&nbsp;Endre på nyhetskanalmen"
 
 #: tt-rss.php:147
 msgid "&nbsp;&nbsp;Clear articles"
@@ -1224,7 +1245,7 @@ msgstr "&nbsp;&nbsp;Fjern abonnement"
 
 #: tt-rss.php:150
 msgid "All feeds:"
-msgstr "Alle nyhetsstrømmer:"
+msgstr "Alle nyhetskanaler:"
 
 #: tt-rss.php:151
 msgid "&nbsp;&nbsp;Mark as read"
@@ -1232,7 +1253,7 @@ msgstr "&nbsp;&nbsp;Marker som lest"
 
 #: tt-rss.php:152
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
-msgstr "&nbsp;&nbsp;Skjul/vis leste nyhetsstrømmer"
+msgstr "&nbsp;&nbsp;Skjul/vis leste nyhetskanaler"
 
 #: tt-rss.php:154
 msgid "Other actions:"
@@ -1245,33 +1266,33 @@ msgstr "&nbsp;&nbsp;Lag filter"
 #: tt-rss.php:163
 #, fuzzy
 msgid "Collapse feedlist"
-msgstr "Skjul fra min nyhetsstrømslisten"
+msgstr "Alle Nyhetskanaler"
 
 #: tt-rss.php:165
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:171 modules/popup-dialog.php:139
+#: tt-rss.php:173 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Søk:"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "View:"
 msgstr "Vis:"
 
-#: tt-rss.php:180
+#: tt-rss.php:182
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: tt-rss.php:181
+#: tt-rss.php:183
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: tt-rss.php:186
+#: tt-rss.php:188
 msgid "Limit:"
 msgstr "Antall:"
 
-#: tt-rss.php:211
+#: tt-rss.php:213
 msgid "Update"
 msgstr "Oppdater"
 
@@ -1306,16 +1327,16 @@ msgstr ""
 
 #: update.php:132
 msgid "Performing updates..."
-msgstr "Utfører oppdateringer..."
+msgstr "Utfører oppdateringer…"
 
 #: update.php:138
 #, php-format
 msgid "Updating to version %d..."
-msgstr "Oppdaterer til versjon %d..."
+msgstr "Oppdaterer til versjon %d…"
 
 #: update.php:151
 msgid "Checking version... "
-msgstr "Sjekker utgave..."
+msgstr "Sjekker utgave…"
 
 #: update.php:157
 msgid "OK!"
@@ -1339,14 +1360,14 @@ 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:723
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:720
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
 #: modules/opml_domdoc.php:54
 #, php-format
 msgid "Adding category <b>%s</b>...<br>"
-msgstr "Legger til kategori <b>%s</b>...<br>"
+msgstr "Legger til kategori <b>%s</b>…<br>"
 
 #: modules/opml_domdoc.php:103 modules/opml_domxml.php:106
 msgid "Already imported."
@@ -1385,7 +1406,7 @@ msgid ""
 "\t\t\t\t\tstart the daemon process or contact instance owner."
 msgstr ""
 "Oppdateringsprosessen er åpnet for i konfigurasjonsfilen, men \n"
-"\t\t\t\t\tprosessen blir ikke kjørt, noe som gjør at ingen nyhetsstrømmer "
+"\t\t\t\t\tprosessen blir ikke kjørt, noe som gjør at ingen nyhetskanaler "
 "blir oppdatert. Vennligst\n"
 "\t\t\t\t\tstart prosessen eller konakt administratoren."
 
@@ -1409,13 +1430,13 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 "TT-RSS har oppdaget at oppdateringsmetoden bruker for lang tid å oppdatere "
-"nyhetsstrømmene. Dette kan indikere et krasj eller at noe henger. Vennligst "
+"nyhetskanalmene. Dette kan indikere et krasj eller at noe henger. Vennligst "
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
-"nyhetsstrømmen"
+"nyhetskanalmen"
 
 #: modules/popup-dialog.php:72 modules/pref-feeds.php:166
 msgid "Feed URL:"
-msgstr "Nyhetsstrømsadresse:"
+msgstr "Nyhetskanalsadresse:"
 
 #: modules/popup-dialog.php:80 modules/pref-feeds.php:174
 msgid "Category:"
@@ -1436,7 +1457,7 @@ msgstr "Avbryt"
 
 #: modules/popup-dialog.php:120
 msgid "This feed requires authentication."
-msgstr "Denne nyhetsstrømmen krever autentifisering"
+msgstr "Denne nyhetskanalmen krever autentifisering"
 
 #: modules/popup-dialog.php:148
 msgid "Where:"
@@ -1444,7 +1465,7 @@ msgstr "Hvor:"
 
 #: modules/popup-dialog.php:164
 msgid "This feed"
-msgstr "Denne nyhetsstrømmen"
+msgstr "Denne nyhetskanalmen"
 
 #: modules/popup-dialog.php:179
 msgid "Match on:"
@@ -1498,7 +1519,7 @@ msgstr "PÃ¥ felt:"
 
 #: modules/popup-dialog.php:299 modules/pref-filters.php:56
 msgid "Feed:"
-msgstr "Nyhetsstrøm:"
+msgstr "Nyhetskanal:"
 
 #: modules/popup-dialog.php:305 modules/pref-filters.php:62
 msgid "Action:"
@@ -1522,7 +1543,7 @@ msgstr "Oppdaterer feil"
 
 #: modules/popup-dialog.php:357
 msgid "These feeds have not been updated because of errors:"
-msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
+msgstr "Disse nyhetskanalmene kunne ikke oppdateres på grunn av feil:"
 
 #: modules/popup-dialog.php:376
 msgid "Close"
@@ -1530,11 +1551,11 @@ msgstr "Steng"
 
 #: modules/popup-dialog.php:385
 msgid "Edit Tags"
-msgstr "Endre tagger"
+msgstr "Endre stikkord"
 
 #: modules/popup-dialog.php:390
 msgid "Tags for this article (separated by commas):"
-msgstr "Denne artikkelens tagger (separert med kommaer):"
+msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
 #: modules/popup-dialog.php:435 modules/pref-feeds.php:365
 #: modules/pref-filters.php:114 modules/pref-users.php:55
@@ -1543,11 +1564,11 @@ msgstr "Lagre"
 
 #: modules/popup-dialog.php:448
 msgid "Tag cloud"
-msgstr "Tag-sky"
+msgstr "Stikkordskurv"
 
 #: modules/popup-dialog.php:451
 msgid "Showing most popular tags "
-msgstr "Vis mest populære tagger"
+msgstr "Vis mest populære stikkord"
 
 #: modules/popup-dialog.php:452
 msgid "browse more"
@@ -1555,11 +1576,11 @@ msgstr "utforsk videre"
 
 #: modules/pref-feed-browser.php:5 modules/pref-feeds.php:54
 msgid "Feed browser is administratively disabled."
-msgstr "Nyhetsstrømsutforsker er administrativt avskrudd"
+msgstr "Nyhetskanalsutforsker er administrativt avskrudd"
 
 #: modules/pref-feed-browser.php:15
 msgid "Feed information:"
-msgstr "Nyhetsstrømsinformasjon:"
+msgstr "Nyhetskanalsinformasjon:"
 
 #: modules/pref-feed-browser.php:38
 #, fuzzy
@@ -1580,7 +1601,7 @@ msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
 "case you are interested in them too."
 msgstr ""
-"Denne siden viser nyhetsstrømmer som andre brukere av systemet abonnerer på, "
+"Denne siden viser nyhetskanaler som andre brukere av systemet abonnerer på, "
 "i tilfelle du skulle være interessert i de også."
 
 #: modules/pref-feed-browser.php:101
@@ -1589,23 +1610,23 @@ msgstr "Topp"
 
 #: 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å"
+msgstr "Ingen nyhetskanaler ble funnet for å abonneres på"
 
 #: modules/pref-feeds.php:39
 msgid "Subscribed to feeds:"
-msgstr "Abonnerer på følgende nyhetsstrømmer:"
+msgstr "Abonnerer på følgende nyhetskanaler:"
 
 #: modules/pref-feeds.php:58
 msgid "Other feeds: Top 25"
-msgstr "Andre nyhetsstrømmer: Topp 25"
+msgstr "Andre nyhetskanaler: Topp 25"
 
 #: modules/pref-feeds.php:62
 msgid "Showing top 25 registered feeds, sorted by popularity:"
-msgstr "Viser topp 25 nyhetsstrømmer, sortert etter popularitet:"
+msgstr "Viser topp 25 nyhetskanaler, sortert etter popularitet:"
 
 #: modules/pref-feeds.php:146
 msgid "Feed editor"
-msgstr "Nyhetsstrømsredigerer"
+msgstr "Nyhetskanalsredigerer"
 
 #: modules/pref-feeds.php:158
 msgid "Title:"
@@ -1634,7 +1655,7 @@ msgstr "Oppdater"
 
 #: modules/pref-feeds.php:300
 msgid "Hide from \"Other Feeds\""
-msgstr "Skjul fra \"Andre nyhetsstrømmer\""
+msgstr "Skjul fra \"Andre nyhetskanaler\""
 
 #: modules/pref-feeds.php:311
 msgid "Right-to-left content"
@@ -1642,7 +1663,7 @@ msgstr "Innhold som vises fra høyre til venstre"
 
 #: modules/pref-feeds.php:322
 msgid "Hide from my feed list"
-msgstr "Skjul fra min nyhetsstrømslisten"
+msgstr "Skjul fra min nyhetskanalslisten"
 
 #: modules/pref-feeds.php:334
 msgid "Include in e-mail digest"
@@ -1662,127 +1683,129 @@ msgstr "Abonnerer på <b>%s</b>"
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:590
+#: modules/pref-feeds.php:587
 msgid "Category editor"
 msgstr "Kategoriredigerer"
 
-#: modules/pref-feeds.php:613
+#: modules/pref-feeds.php:610
 #, 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:641
+#: modules/pref-feeds.php:638
 msgid "Unable to delete non empty feed categories."
 msgstr "Kunne ikke slette kategorien, den var ikke tom"
 
-#: modules/pref-feeds.php:658
+#: modules/pref-feeds.php:655
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: modules/pref-feeds.php:718
+#: modules/pref-feeds.php:715
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: modules/pref-feeds.php:729 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:322
+#: modules/pref-feeds.php:726 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:320
 msgid "Remove"
 msgstr "Fjern"
 
-#: modules/pref-feeds.php:751
+#: modules/pref-feeds.php:748
 msgid "Some feeds have update errors (click for details)"
-msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
+msgstr "Noen nyhetskanaler har oppdateringsfeil (trykk for detaljer)"
 
-#: modules/pref-feeds.php:784
+#: modules/pref-feeds.php:781
 msgid "Top 25"
 msgstr "Topp 25"
 
-#: modules/pref-feeds.php:858
+#: modules/pref-feeds.php:855
 msgid "Show last article times"
 msgstr "Vis tidspunktene for siste artikkel"
 
-#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:934
 msgid "Last&nbsp;Article"
 msgstr "Siste&nbsp;Artikkel"
 
-#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:938
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
+#: modules/pref-feeds.php:1005 modules/pref-feeds.php:1019
 msgid "Selection:"
 msgstr "Utvalg:"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1011
 msgid "Recategorize"
 msgstr "Rekategoriser"
 
-#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:320
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:318
 msgid "Edit"
 msgstr "Rediger"
 
-#: modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:1021
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: modules/pref-feeds.php:1025
+#: modules/pref-feeds.php:1022
 msgid "Clear feed data"
-msgstr "Slett nyhetsstrømsdata"
+msgstr "Slett nyhetskanalsdata"
 
-#: modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1023
 msgid "Unsubscribe"
-msgstr "Avabonner"
+msgstr "Fjern abonnement(ene)"
 
-#: modules/pref-feeds.php:1031
+#: modules/pref-feeds.php:1028
 msgid "Other:"
 msgstr "Andre:"
 
-#: modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:1029
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1056
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1063
+#: modules/pref-feeds.php:1060
 msgid "File:"
 msgstr "Fil:"
 
-#: modules/pref-feeds.php:1066
+#: modules/pref-feeds.php:1063
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1073
+#: modules/pref-feeds.php:1070
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1076
+#: modules/pref-feeds.php:1073
 msgid "Firefox Integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1078
+#: modules/pref-feeds.php:1075
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
-"Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
+"Denne Tiny Tiny RSS siden kan bli brukt som nyhetskanalsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1082
+#: modules/pref-feeds.php:1079
 msgid "Click here to register this site as a feed reader."
-msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
+msgstr "Trykk her for å registrere denne siden som nyhetskanalsleser"
 
-#: modules/pref-feeds.php:1091
+#: modules/pref-feeds.php:1088
+#, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the address specified below."
+"by anyone who knows the URL specified below."
 msgstr ""
-"Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetsstrøm og "
+"Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: modules/pref-feeds.php:1098
-msgid "Generate another address"
+#: modules/pref-feeds.php:1095
+#, fuzzy
+msgid "Generate another link"
 msgstr "Genererer en ny adresse"
 
 #: modules/pref-filters.php:22
@@ -1857,31 +1880,31 @@ msgstr "SQL-uttrykk"
 msgid "No labels defined."
 msgstr "Ingen merkelapper er valgt"
 
-#: modules/pref-prefs.php:55
+#: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "Passord har blitt endret."
 
-#: modules/pref-prefs.php:57
+#: modules/pref-prefs.php:62
 msgid "Old password is incorrect."
 msgstr "Gammelt passord er feil"
 
-#: modules/pref-prefs.php:107
+#: modules/pref-prefs.php:112
 msgid "The configuration was saved."
 msgstr "Konfigurasjonen er lagret."
 
-#: modules/pref-prefs.php:133
+#: modules/pref-prefs.php:138
 msgid "E-mail has been changed."
 msgstr "E-post har blitt endret."
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
+#: modules/pref-prefs.php:150 modules/pref-prefs.php:210
 msgid "The configuration was reset to defaults."
 msgstr "Konfigurasjonen er satt tilbake til standard"
 
-#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
 msgid "Change theme"
 msgstr "Endre utseende"
 
-#: modules/pref-prefs.php:190
+#: modules/pref-prefs.php:195
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
@@ -1889,67 +1912,72 @@ msgstr ""
 "Passordet ditt er et standardpassord, \n"
 "\t\t\t\t\t\tVennligst bytt."
 
-#: modules/pref-prefs.php:217
+#: modules/pref-prefs.php:222
 msgid "Personal data"
 msgstr "Personlig informasjon"
 
-#: modules/pref-prefs.php:224
+#: modules/pref-prefs.php:229
 msgid "E-mail"
 msgstr "E-post"
 
-#: modules/pref-prefs.php:237
+#: modules/pref-prefs.php:238
+#, fuzzy
+msgid "Access level"
+msgstr "Tilgangsnivå:"
+
+#: modules/pref-prefs.php:251
 msgid "Change e-mail"
 msgstr "Skift e-post"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:257
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:259
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:264
 msgid "New password"
 msgstr "Nytt passord"
 
-#: modules/pref-prefs.php:256
+#: modules/pref-prefs.php:270
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: modules/pref-prefs.php:271
+#: modules/pref-prefs.php:285
 msgid "Change password"
 msgstr "Endre passord"
 
-#: modules/pref-prefs.php:287
+#: modules/pref-prefs.php:301
 msgid "Themes"
 msgstr "Utseender"
 
-#: modules/pref-prefs.php:288
+#: modules/pref-prefs.php:302
 msgid "Select theme"
 msgstr "Velg utseende"
 
-#: modules/pref-prefs.php:290
+#: modules/pref-prefs.php:304
 msgid "Default"
 msgstr "Standard"
 
-#: modules/pref-prefs.php:359
+#: modules/pref-prefs.php:377
 msgid "short_desc"
 msgstr "kort beskrivelse"
 
-#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
 msgid "Yes"
 msgstr "Ja"
 
-#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
 msgid "No"
 msgstr "Nei"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:413
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:417
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
@@ -2019,10 +2047,13 @@ msgstr "Tilgangsnivå"
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: modules/pref-users.php:318
+#: modules/pref-users.php:316
 msgid "User details"
 msgstr "Brukerdetaljer"
 
-#: modules/pref-users.php:324
+#: modules/pref-users.php:322
 msgid "Reset password"
 msgstr "Nullstill passordet"
+
+#~ msgid "No articles found."
+#~ msgstr "Ingen artikler ble funnet"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index becda889..1f850540 100644
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 2d8540d5..140ae686 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-02-20 11:27+0300\n"
+"POT-Creation-Date: 2008-04-08 13:13+0400\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -85,33 +85,37 @@ msgstr "Página"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:134 modules/pref-users.php:252
+#: backend.php:134
 msgid "User"
 msgstr "Usuário"
 
-#: backend.php:135 modules/pref-users.php:252
+#: backend.php:135
+msgid "Power User"
+msgstr ""
+
+#: backend.php:136
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:393
+#: backend.php:394
 msgid "Registered"
 msgstr ""
 
-#: backend.php:394
+#: backend.php:395
 #, fuzzy
 msgid "Last logged in"
 msgstr "Último Login"
 
-#: backend.php:395
+#: backend.php:396
 #, fuzzy
 msgid "Stored articles"
 msgstr "Favoritos"
 
-#: backend.php:402
+#: backend.php:403
 msgid "Subscribed feeds count"
 msgstr ""
 
-#: backend.php:417
+#: backend.php:418
 msgid "Subscribed feeds"
 msgstr ""
 
@@ -171,205 +175,221 @@ msgstr ""
 "Sua versão do MySQL não é atualmente suportada. Por favor acesse \n"
 "\t\to site oficial para mais informações."
 
-#: functions.php:2505 functions.php:2844 functions.php:3212 functions.php:4065
+#: functions.php:2516 functions.php:2855 functions.php:3223 functions.php:4076
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:2514 functions.php:2846 functions.php:3214 functions.php:4072
-#: modules/pref-feeds.php:1085
+#: functions.php:2525 functions.php:2857 functions.php:3225 functions.php:4083
+#: modules/pref-feeds.php:1082
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:2523 functions.php:2848 functions.php:3216 functions.php:4050
+#: functions.php:2534 functions.php:2859 functions.php:3227 functions.php:4061
 msgid "Fresh articles"
 msgstr ""
 
-#: functions.php:2766 modules/popup-dialog.php:151
+#: functions.php:2777 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:2795 functions.php:2834 functions.php:3190 functions.php:4229
-#: functions.php:4259 modules/pref-feeds.php:897
+#: functions.php:2806 functions.php:2845 functions.php:3201 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:894
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: functions.php:2824 functions.php:3356
+#: functions.php:2835 functions.php:3367
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2826 functions.php:3358
+#: functions.php:2837 functions.php:3369
 msgid "Labels"
 msgstr ""
 
-#: functions.php:3176 functions.php:3178
+#: functions.php:3187 functions.php:3189
 msgid "Search results"
 msgstr ""
 
-#: functions.php:3194 functions.php:3207 functions.php:3224
+#: functions.php:3205 functions.php:3218 functions.php:3235
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3820 functions.php:3874 functions.php:5033
-#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
+#: functions.php:3831 functions.php:3885 functions.php:5050
+#: modules/pref-feeds.php:669 modules/pref-feeds.php:856
 #: modules/pref-filters.php:255 modules/pref-labels.php:239
 #: modules/pref-users.php:211
 msgid "Select:"
 msgstr "Selecione:"
 
-#: functions.php:3821 functions.php:3875 modules/pref-feeds.php:673
-#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: functions.php:3832 functions.php:3886 modules/pref-feeds.php:670
+#: modules/pref-feeds.php:857 modules/pref-filters.php:256
 #: modules/pref-labels.php:240 modules/pref-users.php:212
 msgid "All"
 msgstr "Todos"
 
-#: functions.php:3822 functions.php:3826 functions.php:3876 functions.php:3879
-#: tt-rss.php:183
+#: functions.php:3833 functions.php:3837 functions.php:3887 functions.php:3890
+#: tt-rss.php:185
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:3823 functions.php:3877 modules/pref-feeds.php:674
-#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: functions.php:3834 functions.php:3888 modules/pref-feeds.php:671
+#: modules/pref-feeds.php:858 modules/pref-filters.php:257
 #: modules/pref-labels.php:241 modules/pref-users.php:213
 msgid "None"
 msgstr "Nenhum"
 
-#: functions.php:3825
+#: functions.php:3836
 msgid "Toggle"
 msgstr ""
 
-#: functions.php:3827 functions.php:3880 tt-rss.php:182
+#: functions.php:3838 functions.php:3891 tt-rss.php:184
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:3828
+#: functions.php:3839
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:3831 localized_schema.php:15
+#: functions.php:3842 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: functions.php:3832
+#: functions.php:3843
 msgid "Selection"
 msgstr "Seleção"
 
-#: functions.php:3833
+#: functions.php:3844
 msgid "This page"
 msgstr ""
 
-#: functions.php:3839
+#: functions.php:3850
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3840
+#: functions.php:3851
 msgid "Below active article"
 msgstr ""
 
-#: functions.php:3845
+#: functions.php:3856
 msgid "Entire feed"
 msgstr ""
 
-#: functions.php:3853
+#: functions.php:3864
 msgid "Next page"
 msgstr "Próxima página"
 
-#: functions.php:3854
+#: functions.php:3865
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: functions.php:3855
+#: functions.php:3866
 msgid "First page"
 msgstr "Primeira página"
 
-#: functions.php:3865 functions.php:3891
+#: functions.php:3876 functions.php:3902
 msgid "Convert to label"
 msgstr ""
 
-#: functions.php:3879
+#: functions.php:3890
 msgid "Toggle:"
 msgstr ""
 
-#: functions.php:3882
+#: functions.php:3893
 msgid "Mark as read:"
 msgstr "Marcar como lido:"
 
-#: functions.php:3883
+#: functions.php:3894
 msgid "Page"
 msgstr "Página"
 
-#: functions.php:3884 modules/pref-filters.php:263
+#: functions.php:3895 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3903 modules/popup-dialog.php:61 modules/pref-feeds.php:779
+#: functions.php:3914 modules/popup-dialog.php:61 modules/pref-feeds.php:776
 msgid "Subscribe to feed"
 msgstr ""
 
-#: functions.php:3906 functions.php:3907 functions.php:3908 functions.php:3909
+#: functions.php:3917 functions.php:3918 functions.php:3919 functions.php:3920
 msgid "Placeholder"
 msgstr ""
 
-#: functions.php:3912 modules/pref-feed-browser.php:110
+#: functions.php:3923 modules/pref-feed-browser.php:110
 msgid "Show"
 msgstr ""
 
-#: functions.php:3913
+#: functions.php:3924
 #, fuzzy
 msgid "Update errors"
 msgstr "Atualizar"
 
-#: functions.php:3956
+#: functions.php:3967
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4038
+#: functions.php:4049
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4299
+#: functions.php:4310
 msgid "No feeds to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:4316
+#: functions.php:4327
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4541
+#: functions.php:4552
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: functions.php:4596
+#: functions.php:4607
 msgid "no tags"
 msgstr "sem tags"
 
-#: functions.php:4627 functions.php:4994
+#: functions.php:4638 functions.php:5009
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4629 functions.php:4996
+#: functions.php:4640 functions.php:5011
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4702 modules/pref-feed-browser.php:74
+#: functions.php:4650 functions.php:5020
+#, fuzzy
+msgid "unknown type"
+msgstr "Erro desconhecido"
+
+#: functions.php:4716 modules/pref-feed-browser.php:74
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: functions.php:4769
+#: functions.php:4783
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4967
+#: functions.php:4981
 #, fuzzy
 msgid "Show article"
 msgstr "Favoritos"
 
-#: functions.php:5096
-msgid "No articles found."
-msgstr ""
+#: functions.php:5117
+#, fuzzy
+msgid "No unread articles found to display."
+msgstr "Sem Feeds para exibir."
+
+#: functions.php:5120
+#, fuzzy
+msgid "No starred articles found to display."
+msgstr "Sem Feeds para exibir."
+
+#: functions.php:5123
+#, fuzzy
+msgid "No articles found to display."
+msgstr "Sem Feeds para exibir."
 
 #: localized_js.php:35
 msgid "display feeds"
@@ -577,7 +597,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:225 tt-rss.php:229
+#: localized_js.php:95 tt-rss.php:227 tt-rss.php:231
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
@@ -641,15 +661,15 @@ msgstr ""
 msgid "Save current configuration?"
 msgstr "Salvar a configuração atual?"
 
-#: localized_js.php:120 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:25
 msgid "Old password cannot be blank."
 msgstr "A senha antiga não pode ser vazia."
 
-#: localized_js.php:121 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:30
 msgid "New password cannot be blank."
 msgstr "A nova senha não pode ser vazia."
 
-#: localized_js.php:122 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:35
 msgid "Entered passwords do not match."
 msgstr "As senhas informadas não conferem."
 
@@ -697,7 +717,7 @@ msgid "Erase all non-starred articles in %s?"
 msgstr ""
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:872 modules/pref-feeds.php:933
+#: modules/pref-feeds.php:869 modules/pref-feeds.php:930
 msgid "Title"
 msgstr "Título"
 
@@ -1146,12 +1166,12 @@ msgstr "Conteúdo"
 msgid "tag cloud"
 msgstr "núvem de tags"
 
-#: tt-rss.php:140 modules/pref-feeds.php:1020
+#: tt-rss.php:140 modules/pref-feeds.php:1017
 msgid "Actions..."
 msgstr "Ações..."
 
 #: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:766
+#: modules/pref-feeds.php:763
 msgid "Search"
 msgstr ""
 
@@ -1205,27 +1225,27 @@ msgstr "Todos os feeds"
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:171 modules/popup-dialog.php:139
+#: tt-rss.php:173 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "View:"
 msgstr ""
 
-#: tt-rss.php:180
+#: tt-rss.php:182
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:181
+#: tt-rss.php:183
 msgid "All Articles"
 msgstr ""
 
-#: tt-rss.php:186
+#: tt-rss.php:188
 msgid "Limit:"
 msgstr "Limite:"
 
-#: tt-rss.php:211
+#: tt-rss.php:213
 msgid "Update"
 msgstr "Atualizar"
 
@@ -1289,7 +1309,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:723
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:720
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
@@ -1600,125 +1620,126 @@ msgstr ""
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:590
+#: modules/pref-feeds.php:587
 msgid "Category editor"
 msgstr "Editor de Categoria"
 
-#: modules/pref-feeds.php:613
+#: modules/pref-feeds.php:610
 #, 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:641
+#: modules/pref-feeds.php:638
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:658
+#: modules/pref-feeds.php:655
 msgid "Create category"
 msgstr "Criar categoria"
 
-#: modules/pref-feeds.php:718
+#: modules/pref-feeds.php:715
 msgid "No feed categories defined."
 msgstr ""
 
-#: modules/pref-feeds.php:729 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:322
+#: modules/pref-feeds.php:726 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:320
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/pref-feeds.php:751
+#: modules/pref-feeds.php:748
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: modules/pref-feeds.php:784
+#: modules/pref-feeds.php:781
 msgid "Top 25"
 msgstr ""
 
-#: modules/pref-feeds.php:858
+#: modules/pref-feeds.php:855
 msgid "Show last article times"
 msgstr ""
 
-#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:934
 msgid "Last&nbsp;Article"
 msgstr ""
 
-#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:938
 msgid "Updated"
 msgstr "Atualizado"
 
-#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
+#: modules/pref-feeds.php:1005 modules/pref-feeds.php:1019
 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1011
 msgid "Recategorize"
 msgstr ""
 
-#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:320
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:318
 msgid "Edit"
 msgstr "Editar"
 
-#: modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:1021
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1025
+#: modules/pref-feeds.php:1022
 msgid "Clear feed data"
 msgstr ""
 
-#: modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1023
 msgid "Unsubscribe"
 msgstr ""
 
-#: modules/pref-feeds.php:1031
+#: modules/pref-feeds.php:1028
 #, fuzzy
 msgid "Other:"
 msgstr "Onde:"
 
-#: modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:1029
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1056
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1063
+#: modules/pref-feeds.php:1060
 msgid "File:"
 msgstr "Arquivo:"
 
-#: modules/pref-feeds.php:1066
+#: modules/pref-feeds.php:1063
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1073
+#: modules/pref-feeds.php:1070
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1076
+#: modules/pref-feeds.php:1073
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1078
+#: modules/pref-feeds.php:1075
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1082
+#: modules/pref-feeds.php:1079
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1091
+#: modules/pref-feeds.php:1088
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the address specified below."
+"by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1098
-msgid "Generate another address"
+#: modules/pref-feeds.php:1095
+#, fuzzy
+msgid "Generate another link"
 msgstr "Gerar um outro endereço"
 
 #: modules/pref-filters.php:22
@@ -1793,31 +1814,31 @@ msgstr "Expressão SQL"
 msgid "No labels defined."
 msgstr ""
 
-#: modules/pref-prefs.php:55
+#: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr ""
 
-#: modules/pref-prefs.php:57
+#: modules/pref-prefs.php:62
 msgid "Old password is incorrect."
 msgstr "Senha antiga incorreta"
 
-#: modules/pref-prefs.php:107
+#: modules/pref-prefs.php:112
 msgid "The configuration was saved."
 msgstr ""
 
-#: modules/pref-prefs.php:133
+#: modules/pref-prefs.php:138
 msgid "E-mail has been changed."
 msgstr "E-mail alterado."
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
+#: modules/pref-prefs.php:150 modules/pref-prefs.php:210
 msgid "The configuration was reset to defaults."
 msgstr ""
 
-#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
 msgid "Change theme"
 msgstr "Mudar Tema"
 
-#: modules/pref-prefs.php:190
+#: modules/pref-prefs.php:195
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
@@ -1825,67 +1846,72 @@ msgstr ""
 "Sua senha é a padrão, \n"
 "\t\t\t\t\t\tvocê deve mudá-la."
 
-#: modules/pref-prefs.php:217
+#: modules/pref-prefs.php:222
 msgid "Personal data"
 msgstr ""
 
-#: modules/pref-prefs.php:224
+#: modules/pref-prefs.php:229
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:237
+#: modules/pref-prefs.php:238
+#, fuzzy
+msgid "Access level"
+msgstr "Nível de acesso:"
+
+#: modules/pref-prefs.php:251
 msgid "Change e-mail"
 msgstr "Mudar E-mail"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:257
 msgid "Authentication"
 msgstr ""
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:259
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:264
 msgid "New password"
 msgstr "Senha nova"
 
-#: modules/pref-prefs.php:256
+#: modules/pref-prefs.php:270
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
-#: modules/pref-prefs.php:271
+#: modules/pref-prefs.php:285
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: modules/pref-prefs.php:287
+#: modules/pref-prefs.php:301
 msgid "Themes"
 msgstr "Temas"
 
-#: modules/pref-prefs.php:288
+#: modules/pref-prefs.php:302
 msgid "Select theme"
 msgstr "Selecionar o tema"
 
-#: modules/pref-prefs.php:290
+#: modules/pref-prefs.php:304
 msgid "Default"
 msgstr "Padrão"
 
-#: modules/pref-prefs.php:359
+#: modules/pref-prefs.php:377
 msgid "short_desc"
 msgstr "short_desc"
 
-#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
 msgid "Yes"
 msgstr "Sim"
 
-#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
 msgid "No"
 msgstr "Não"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:413
 msgid "Save configuration"
 msgstr "Salvar configuração"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:417
 msgid "Reset to defaults"
 msgstr ""
 
@@ -1955,11 +1981,11 @@ msgstr "Nível de acesso"
 msgid "Last login"
 msgstr "Último Login"
 
-#: modules/pref-users.php:318
+#: modules/pref-users.php:316
 msgid "User details"
 msgstr "Detalhes do usuário"
 
-#: modules/pref-users.php:324
+#: modules/pref-users.php:322
 msgid "Reset password"
 msgstr ""
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 4c2dd0a8..461b7799 100644
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 0652370f..7fc752c6 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-02-20 11:27+0300\n"
+"POT-Creation-Date: 2008-04-08 13:13+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <cthulhoo@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -85,34 +85,38 @@ msgstr "Страница"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:134 modules/pref-users.php:252
+#: backend.php:134
 msgid "User"
 msgstr "Пользователь"
 
-#: backend.php:135 modules/pref-users.php:252
+#: backend.php:135
+msgid "Power User"
+msgstr ""
+
+#: backend.php:136
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:393
+#: backend.php:394
 msgid "Registered"
 msgstr ""
 
-#: backend.php:394
+#: backend.php:395
 #, fuzzy
 msgid "Last logged in"
 msgstr "Последний вход"
 
-#: backend.php:395
+#: backend.php:396
 #, fuzzy
 msgid "Stored articles"
 msgstr "Отмеченные"
 
-#: backend.php:402
+#: backend.php:403
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "Подписаны каналы:"
 
-#: backend.php:417
+#: backend.php:418
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "Подписаны каналы:"
@@ -173,207 +177,223 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2505 functions.php:2844 functions.php:3212 functions.php:4065
+#: functions.php:2516 functions.php:2855 functions.php:3223 functions.php:4076
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2514 functions.php:2846 functions.php:3214 functions.php:4072
-#: modules/pref-feeds.php:1085
+#: functions.php:2525 functions.php:2857 functions.php:3225 functions.php:4083
+#: modules/pref-feeds.php:1082
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2523 functions.php:2848 functions.php:3216 functions.php:4050
+#: functions.php:2534 functions.php:2859 functions.php:3227 functions.php:4061
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2766 modules/popup-dialog.php:151
+#: functions.php:2777 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2795 functions.php:2834 functions.php:3190 functions.php:4229
-#: functions.php:4259 modules/pref-feeds.php:897
+#: functions.php:2806 functions.php:2845 functions.php:3201 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:894
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2824 functions.php:3356
+#: functions.php:2835 functions.php:3367
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2826 functions.php:3358
+#: functions.php:2837 functions.php:3369
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:3176 functions.php:3178
+#: functions.php:3187 functions.php:3189
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:3194 functions.php:3207 functions.php:3224
+#: functions.php:3205 functions.php:3218 functions.php:3235
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3820 functions.php:3874 functions.php:5033
-#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
+#: functions.php:3831 functions.php:3885 functions.php:5050
+#: modules/pref-feeds.php:669 modules/pref-feeds.php:856
 #: modules/pref-filters.php:255 modules/pref-labels.php:239
 #: modules/pref-users.php:211
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3821 functions.php:3875 modules/pref-feeds.php:673
-#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: functions.php:3832 functions.php:3886 modules/pref-feeds.php:670
+#: modules/pref-feeds.php:857 modules/pref-filters.php:256
 #: modules/pref-labels.php:240 modules/pref-users.php:212
 msgid "All"
 msgstr "Все"
 
-#: functions.php:3822 functions.php:3826 functions.php:3876 functions.php:3879
-#: tt-rss.php:183
+#: functions.php:3833 functions.php:3837 functions.php:3887 functions.php:3890
+#: tt-rss.php:185
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3823 functions.php:3877 modules/pref-feeds.php:674
-#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: functions.php:3834 functions.php:3888 modules/pref-feeds.php:671
+#: modules/pref-feeds.php:858 modules/pref-filters.php:257
 #: modules/pref-labels.php:241 modules/pref-users.php:213
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3825
+#: functions.php:3836
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3827 functions.php:3880 tt-rss.php:182
+#: functions.php:3838 functions.php:3891 tt-rss.php:184
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3828
+#: functions.php:3839
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3831 localized_schema.php:15
+#: functions.php:3842 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3832
+#: functions.php:3843
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3833
+#: functions.php:3844
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3839
+#: functions.php:3850
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3840
+#: functions.php:3851
 #, fuzzy
 msgid "Below active article"
 msgstr "Отфильтровать статью"
 
-#: functions.php:3845
+#: functions.php:3856
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3853
+#: functions.php:3864
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3854
+#: functions.php:3865
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3855
+#: functions.php:3866
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3865 functions.php:3891
+#: functions.php:3876 functions.php:3902
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3879
+#: functions.php:3890
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3882
+#: functions.php:3893
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3883
+#: functions.php:3894
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3884 modules/pref-filters.php:263
+#: functions.php:3895 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3903 modules/popup-dialog.php:61 modules/pref-feeds.php:779
+#: functions.php:3914 modules/popup-dialog.php:61 modules/pref-feeds.php:776
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: functions.php:3906 functions.php:3907 functions.php:3908 functions.php:3909
+#: functions.php:3917 functions.php:3918 functions.php:3919 functions.php:3920
 msgid "Placeholder"
 msgstr ""
 
-#: functions.php:3912 modules/pref-feed-browser.php:110
+#: functions.php:3923 modules/pref-feed-browser.php:110
 msgid "Show"
 msgstr "Показать"
 
-#: functions.php:3913
+#: functions.php:3924
 #, fuzzy
 msgid "Update errors"
 msgstr "Ошибки обновления"
 
-#: functions.php:3956
+#: functions.php:3967
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4038
+#: functions.php:4049
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4299
+#: functions.php:4310
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:4316
+#: functions.php:4327
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4541
+#: functions.php:4552
 #, fuzzy
 msgid " - "
 msgstr ", автор - "
 
-#: functions.php:4596
+#: functions.php:4607
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4627 functions.php:4994
+#: functions.php:4638 functions.php:5009
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4629 functions.php:4996
+#: functions.php:4640 functions.php:5011
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4702 modules/pref-feed-browser.php:74
+#: functions.php:4650 functions.php:5020
+#, fuzzy
+msgid "unknown type"
+msgstr "Неизвестная ошибка"
+
+#: functions.php:4716 modules/pref-feed-browser.php:74
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4769
+#: functions.php:4783
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4967
+#: functions.php:4981
 #, fuzzy
 msgid "Show article"
 msgstr "Отмеченные"
 
-#: functions.php:5096
-msgid "No articles found."
+#: functions.php:5117
+#, fuzzy
+msgid "No unread articles found to display."
+msgstr "Статей не найдено."
+
+#: functions.php:5120
+#, fuzzy
+msgid "No starred articles found to display."
+msgstr "Статей не найдено."
+
+#: functions.php:5123
+#, fuzzy
+msgid "No articles found to display."
 msgstr "Статей не найдено."
 
 #: localized_js.php:35
@@ -582,7 +602,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:225 tt-rss.php:229
+#: localized_js.php:95 tt-rss.php:227 tt-rss.php:231
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -647,15 +667,15 @@ msgstr ""
 msgid "Save current configuration?"
 msgstr "Сохранить конфигурацию"
 
-#: localized_js.php:120 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:25
 msgid "Old password cannot be blank."
 msgstr "Старый пароль не может быть пустым."
 
-#: localized_js.php:121 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:30
 msgid "New password cannot be blank."
 msgstr "Новый пароль не может быть пустым."
 
-#: localized_js.php:122 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:35
 msgid "Entered passwords do not match."
 msgstr "Пароли не совпадают."
 
@@ -709,7 +729,7 @@ msgid "Erase all non-starred articles in %s?"
 msgstr "Помечаю все каналы как прочитанные..."
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:872 modules/pref-feeds.php:933
+#: modules/pref-feeds.php:869 modules/pref-feeds.php:930
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1158,12 +1178,12 @@ msgstr "Содержимое"
 msgid "tag cloud"
 msgstr "облако тегов"
 
-#: tt-rss.php:140 modules/pref-feeds.php:1020
+#: tt-rss.php:140 modules/pref-feeds.php:1017
 msgid "Actions..."
 msgstr "Действия..."
 
 #: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:766
+#: modules/pref-feeds.php:763
 msgid "Search"
 msgstr "Поиск"
 
@@ -1218,27 +1238,27 @@ msgstr "Изм. прочитанное"
 msgid "Toggle Feedlist"
 msgstr "Изм. прочитанное"
 
-#: tt-rss.php:171 modules/popup-dialog.php:139
+#: tt-rss.php:173 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "View:"
 msgstr "Показать:"
 
-#: tt-rss.php:180
+#: tt-rss.php:182
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:181
+#: tt-rss.php:183
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:186
+#: tt-rss.php:188
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:211
+#: tt-rss.php:213
 msgid "Update"
 msgstr "Обновить"
 
@@ -1302,7 +1322,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:723
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:720
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -1612,127 +1632,128 @@ msgstr "Добавлена подписка на <b>%s</b>."
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:590
+#: modules/pref-feeds.php:587
 msgid "Category editor"
 msgstr "Редактор категорий"
 
-#: modules/pref-feeds.php:613
+#: modules/pref-feeds.php:610
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:641
+#: modules/pref-feeds.php:638
 msgid "Unable to delete non empty feed categories."
 msgstr "Не могу удалить не пустую категорию"
 
-#: modules/pref-feeds.php:658
+#: modules/pref-feeds.php:655
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:718
+#: modules/pref-feeds.php:715
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:729 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:322
+#: modules/pref-feeds.php:726 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:320
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/pref-feeds.php:751
+#: modules/pref-feeds.php:748
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)"
 
-#: modules/pref-feeds.php:784
+#: modules/pref-feeds.php:781
 msgid "Top 25"
 msgstr "Топ 25"
 
-#: modules/pref-feeds.php:858
+#: modules/pref-feeds.php:855
 msgid "Show last article times"
 msgstr "Показать дату последней статьи"
 
-#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:934
 msgid "Last&nbsp;Article"
 msgstr "Последняя&nbsp;статья"
 
-#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:938
 msgid "Updated"
 msgstr "Обновлено"
 
-#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
+#: modules/pref-feeds.php:1005 modules/pref-feeds.php:1019
 #, fuzzy
 msgid "Selection:"
 msgstr "Выбрать:"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1011
 msgid "Recategorize"
 msgstr "Изменить категорию"
 
-#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:320
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:318
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:1021
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1025
+#: modules/pref-feeds.php:1022
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Все каналы обновлены."
 
-#: modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1023
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: modules/pref-feeds.php:1031
+#: modules/pref-feeds.php:1028
 #, fuzzy
 msgid "Other:"
 msgstr "Где:"
 
-#: modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:1029
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1056
 msgid "OPML"
 msgstr ""
 
-#: modules/pref-feeds.php:1063
+#: modules/pref-feeds.php:1060
 #, fuzzy
 msgid "File:"
 msgstr "Заголовок:"
 
-#: modules/pref-feeds.php:1066
+#: modules/pref-feeds.php:1063
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1073
+#: modules/pref-feeds.php:1070
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1076
+#: modules/pref-feeds.php:1073
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1078
+#: modules/pref-feeds.php:1075
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1082
+#: modules/pref-feeds.php:1079
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1091
+#: modules/pref-feeds.php:1088
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the address specified below."
+"by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1098
-msgid "Generate another address"
+#: modules/pref-feeds.php:1095
+#, fuzzy
+msgid "Generate another link"
 msgstr "Создать другой адрес"
 
 #: modules/pref-filters.php:22
@@ -1808,98 +1829,103 @@ msgstr "SQL выражение"
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 
-#: modules/pref-prefs.php:55
+#: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "Пароль был изменен."
 
-#: modules/pref-prefs.php:57
+#: modules/pref-prefs.php:62
 msgid "Old password is incorrect."
 msgstr "Старый пароль неправилен."
 
-#: modules/pref-prefs.php:107
+#: modules/pref-prefs.php:112
 msgid "The configuration was saved."
 msgstr "Конфигурация сохранена."
 
-#: modules/pref-prefs.php:133
+#: modules/pref-prefs.php:138
 #, fuzzy
 msgid "E-mail has been changed."
 msgstr "Пароль был изменен."
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
+#: modules/pref-prefs.php:150 modules/pref-prefs.php:210
 msgid "The configuration was reset to defaults."
 msgstr "Настройки были сброшены по-умолчанию."
 
-#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
 msgid "Change theme"
 msgstr "Изменить тему"
 
-#: modules/pref-prefs.php:190
+#: modules/pref-prefs.php:195
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
 msgstr ""
 
-#: modules/pref-prefs.php:217
+#: modules/pref-prefs.php:222
 msgid "Personal data"
 msgstr "Личные данные"
 
-#: modules/pref-prefs.php:224
+#: modules/pref-prefs.php:229
 msgid "E-mail"
 msgstr ""
 
-#: modules/pref-prefs.php:237
+#: modules/pref-prefs.php:238
+#, fuzzy
+msgid "Access level"
+msgstr "Уровень доступа:"
+
+#: modules/pref-prefs.php:251
 msgid "Change e-mail"
 msgstr "Изменить e-mail"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:257
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:259
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:264
 msgid "New password"
 msgstr "Новый пароль"
 
-#: modules/pref-prefs.php:256
+#: modules/pref-prefs.php:270
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: modules/pref-prefs.php:271
+#: modules/pref-prefs.php:285
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: modules/pref-prefs.php:287
+#: modules/pref-prefs.php:301
 msgid "Themes"
 msgstr "Темы"
 
-#: modules/pref-prefs.php:288
+#: modules/pref-prefs.php:302
 msgid "Select theme"
 msgstr "Выбор темы"
 
-#: modules/pref-prefs.php:290
+#: modules/pref-prefs.php:304
 msgid "Default"
 msgstr "По умолчанию"
 
-#: modules/pref-prefs.php:359
+#: modules/pref-prefs.php:377
 msgid "short_desc"
 msgstr ""
 
-#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
 msgid "Yes"
 msgstr "Да"
 
-#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
 msgid "No"
 msgstr "Нет"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:413
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:417
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
@@ -1967,14 +1993,17 @@ msgstr "Уровень доступа:"
 msgid "Last login"
 msgstr "Последний вход"
 
-#: modules/pref-users.php:318
+#: modules/pref-users.php:316
 msgid "User details"
 msgstr "Подробнее..."
 
-#: modules/pref-users.php:324
+#: modules/pref-users.php:322
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
+#~ msgid "No articles found."
+#~ msgstr "Статей не найдено."
+
 #~ msgid "New headlines for last 24 hours, as of "
 #~ msgstr "Новые заголовки за последние 24 часа, на "
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 3dc3e1dc..1fcd21c3 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index e748a1a8..40e37462 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-02-20 11:27+0300\n"
+"POT-Creation-Date: 2008-04-08 13:13+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -81,34 +81,38 @@ msgstr "页"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:134 modules/pref-users.php:252
+#: backend.php:134
 msgid "User"
 msgstr "用户"
 
-#: backend.php:135 modules/pref-users.php:252
+#: backend.php:135
+msgid "Power User"
+msgstr ""
+
+#: backend.php:136
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:393
+#: backend.php:394
 msgid "Registered"
 msgstr ""
 
-#: backend.php:394
+#: backend.php:395
 #, fuzzy
 msgid "Last logged in"
 msgstr "最后登陆"
 
-#: backend.php:395
+#: backend.php:396
 #, fuzzy
 msgid "Stored articles"
 msgstr "星级文章"
 
-#: backend.php:402
+#: backend.php:403
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "订阅feed:"
 
-#: backend.php:417
+#: backend.php:418
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "订阅feed:"
@@ -169,206 +173,222 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2505 functions.php:2844 functions.php:3212 functions.php:4065
+#: functions.php:2516 functions.php:2855 functions.php:3223 functions.php:4076
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2514 functions.php:2846 functions.php:3214 functions.php:4072
-#: modules/pref-feeds.php:1085
+#: functions.php:2525 functions.php:2857 functions.php:3225 functions.php:4083
+#: modules/pref-feeds.php:1082
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2523 functions.php:2848 functions.php:3216 functions.php:4050
+#: functions.php:2534 functions.php:2859 functions.php:3227 functions.php:4061
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2766 modules/popup-dialog.php:151
+#: functions.php:2777 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2795 functions.php:2834 functions.php:3190 functions.php:4229
-#: functions.php:4259 modules/pref-feeds.php:897
+#: functions.php:2806 functions.php:2845 functions.php:3201 functions.php:4240
+#: functions.php:4270 modules/pref-feeds.php:894
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2824 functions.php:3356
+#: functions.php:2835 functions.php:3367
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2826 functions.php:3358
+#: functions.php:2837 functions.php:3369
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3176 functions.php:3178
+#: functions.php:3187 functions.php:3189
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:3194 functions.php:3207 functions.php:3224
+#: functions.php:3205 functions.php:3218 functions.php:3235
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3820 functions.php:3874 functions.php:5033
-#: modules/pref-feeds.php:672 modules/pref-feeds.php:859
+#: functions.php:3831 functions.php:3885 functions.php:5050
+#: modules/pref-feeds.php:669 modules/pref-feeds.php:856
 #: modules/pref-filters.php:255 modules/pref-labels.php:239
 #: modules/pref-users.php:211
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3821 functions.php:3875 modules/pref-feeds.php:673
-#: modules/pref-feeds.php:860 modules/pref-filters.php:256
+#: functions.php:3832 functions.php:3886 modules/pref-feeds.php:670
+#: modules/pref-feeds.php:857 modules/pref-filters.php:256
 #: modules/pref-labels.php:240 modules/pref-users.php:212
 msgid "All"
 msgstr "所有"
 
-#: functions.php:3822 functions.php:3826 functions.php:3876 functions.php:3879
-#: tt-rss.php:183
+#: functions.php:3833 functions.php:3837 functions.php:3887 functions.php:3890
+#: tt-rss.php:185
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3823 functions.php:3877 modules/pref-feeds.php:674
-#: modules/pref-feeds.php:861 modules/pref-filters.php:257
+#: functions.php:3834 functions.php:3888 modules/pref-feeds.php:671
+#: modules/pref-feeds.php:858 modules/pref-filters.php:257
 #: modules/pref-labels.php:241 modules/pref-users.php:213
 msgid "None"
 msgstr "无"
 
-#: functions.php:3825
+#: functions.php:3836
 msgid "Toggle"
 msgstr "触发开关"
 
-#: functions.php:3827 functions.php:3880 tt-rss.php:182
+#: functions.php:3838 functions.php:3891 tt-rss.php:184
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3828
+#: functions.php:3839
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3831 localized_schema.php:15
+#: functions.php:3842 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3832
+#: functions.php:3843
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3833
+#: functions.php:3844
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3839
+#: functions.php:3850
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3840
+#: functions.php:3851
 #, fuzzy
 msgid "Below active article"
 msgstr "过滤文章"
 
-#: functions.php:3845
+#: functions.php:3856
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3853
+#: functions.php:3864
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3854
+#: functions.php:3865
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3855
+#: functions.php:3866
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3865 functions.php:3891
+#: functions.php:3876 functions.php:3902
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3879
+#: functions.php:3890
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3882
+#: functions.php:3893
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3883
+#: functions.php:3894
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3884 modules/pref-filters.php:263
+#: functions.php:3895 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3903 modules/popup-dialog.php:61 modules/pref-feeds.php:779
+#: functions.php:3914 modules/popup-dialog.php:61 modules/pref-feeds.php:776
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: functions.php:3906 functions.php:3907 functions.php:3908 functions.php:3909
+#: functions.php:3917 functions.php:3918 functions.php:3919 functions.php:3920
 msgid "Placeholder"
 msgstr ""
 
-#: functions.php:3912 modules/pref-feed-browser.php:110
+#: functions.php:3923 modules/pref-feed-browser.php:110
 msgid "Show"
 msgstr "显示"
 
-#: functions.php:3913
+#: functions.php:3924
 #, fuzzy
 msgid "Update errors"
 msgstr "更新错误"
 
-#: functions.php:3956
+#: functions.php:3967
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4038
+#: functions.php:4049
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4299
+#: functions.php:4310
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4316
+#: functions.php:4327
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4541
+#: functions.php:4552
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4596
+#: functions.php:4607
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4627 functions.php:4994
+#: functions.php:4638 functions.php:5009
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4629 functions.php:4996
+#: functions.php:4640 functions.php:5011
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4702 modules/pref-feed-browser.php:74
+#: functions.php:4650 functions.php:5020
+#, fuzzy
+msgid "unknown type"
+msgstr "未知错误"
+
+#: functions.php:4716 modules/pref-feed-browser.php:74
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4769
+#: functions.php:4783
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4967
+#: functions.php:4981
 #, fuzzy
 msgid "Show article"
 msgstr "星级文章"
 
-#: functions.php:5096
-msgid "No articles found."
+#: functions.php:5117
+#, fuzzy
+msgid "No unread articles found to display."
+msgstr "未找到文章。"
+
+#: functions.php:5120
+#, fuzzy
+msgid "No starred articles found to display."
+msgstr "未找到文章。"
+
+#: functions.php:5123
+#, fuzzy
+msgid "No articles found to display."
 msgstr "未找到文章。"
 
 #: localized_js.php:35
@@ -577,7 +597,7 @@ msgstr "更新提要失败（缺少XML支持）"
 msgid "Could not display article (missing XML object)"
 msgstr "显示条目失败（缺少XML支持）"
 
-#: localized_js.php:95 tt-rss.php:225 tt-rss.php:229
+#: localized_js.php:95 tt-rss.php:227 tt-rss.php:231
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -642,15 +662,15 @@ msgstr "请输入标签主题"
 msgid "Save current configuration?"
 msgstr "保存设置"
 
-#: localized_js.php:120 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:25
 msgid "Old password cannot be blank."
 msgstr "原密码不可留空."
 
-#: localized_js.php:121 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:30
 msgid "New password cannot be blank."
 msgstr "新密码不可留空."
 
-#: localized_js.php:122 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:35
 msgid "Entered passwords do not match."
 msgstr "两次输入密码不通."
 
@@ -704,7 +724,7 @@ msgid "Erase all non-starred articles in %s?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:872 modules/pref-feeds.php:933
+#: modules/pref-feeds.php:869 modules/pref-feeds.php:930
 msgid "Title"
 msgstr "标题"
 
@@ -1164,12 +1184,12 @@ msgstr "内容"
 msgid "tag cloud"
 msgstr "标签簇"
 
-#: tt-rss.php:140 modules/pref-feeds.php:1020
+#: tt-rss.php:140 modules/pref-feeds.php:1017
 msgid "Actions..."
 msgstr "激活..."
 
 #: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:766
+#: modules/pref-feeds.php:763
 msgid "Search"
 msgstr "搜索"
 
@@ -1223,27 +1243,27 @@ msgstr "隐藏我的Feed列表"
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:171 modules/popup-dialog.php:139
+#: tt-rss.php:173 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "View:"
 msgstr "浏览:"
 
-#: tt-rss.php:180
+#: tt-rss.php:182
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:181
+#: tt-rss.php:183
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:186
+#: tt-rss.php:188
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:211
+#: tt-rss.php:213
 msgid "Update"
 msgstr "更新"
 
@@ -1309,7 +1329,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:723
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:720
 msgid "Close this window"
 msgstr "关闭此窗口"
 
@@ -1625,127 +1645,129 @@ msgstr "订阅到 <b>%s</b>."
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:590
+#: modules/pref-feeds.php:587
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:613
+#: modules/pref-feeds.php:610
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:641
+#: modules/pref-feeds.php:638
 msgid "Unable to delete non empty feed categories."
 msgstr "不能删除非空分类。"
 
-#: modules/pref-feeds.php:658
+#: modules/pref-feeds.php:655
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:718
+#: modules/pref-feeds.php:715
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:729 modules/pref-filters.php:345
-#: modules/pref-labels.php:299 modules/pref-users.php:322
+#: modules/pref-feeds.php:726 modules/pref-filters.php:345
+#: modules/pref-labels.php:299 modules/pref-users.php:320
 msgid "Remove"
 msgstr "移除"
 
-#: modules/pref-feeds.php:751
+#: modules/pref-feeds.php:748
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:784
+#: modules/pref-feeds.php:781
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:858
+#: modules/pref-feeds.php:855
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:875 modules/pref-feeds.php:937
+#: modules/pref-feeds.php:872 modules/pref-feeds.php:934
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:878 modules/pref-feeds.php:941
+#: modules/pref-feeds.php:875 modules/pref-feeds.php:938
 msgid "Updated"
 msgstr "已更新"
 
-#: modules/pref-feeds.php:1008 modules/pref-feeds.php:1022
+#: modules/pref-feeds.php:1005 modules/pref-feeds.php:1019
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1011
 msgid "Recategorize"
 msgstr "再分类"
 
-#: modules/pref-feeds.php:1023 modules/pref-filters.php:343
-#: modules/pref-labels.php:297 modules/pref-users.php:320
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:343
+#: modules/pref-labels.php:297 modules/pref-users.php:318
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:1021
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1025
+#: modules/pref-feeds.php:1022
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1026
+#: modules/pref-feeds.php:1023
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: modules/pref-feeds.php:1031
+#: modules/pref-feeds.php:1028
 #, fuzzy
 msgid "Other:"
 msgstr "地点:"
 
-#: modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:1029
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1056
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1063
+#: modules/pref-feeds.php:1060
 #, fuzzy
 msgid "File:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:1066
+#: modules/pref-feeds.php:1063
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1073
+#: modules/pref-feeds.php:1070
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1076
+#: modules/pref-feeds.php:1073
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1078
+#: modules/pref-feeds.php:1075
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1082
+#: modules/pref-feeds.php:1079
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1091
+#: modules/pref-feeds.php:1088
+#, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the address specified below."
+"by anyone who knows the URL specified below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1098
-msgid "Generate another address"
+#: modules/pref-feeds.php:1095
+#, fuzzy
+msgid "Generate another link"
 msgstr "生成另一个地址"
 
 #: modules/pref-filters.php:22
@@ -1821,99 +1843,104 @@ msgstr "SQL 表达式"
 msgid "No labels defined."
 msgstr "未定义标记."
 
-#: modules/pref-prefs.php:55
+#: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "密码已更改."
 
-#: modules/pref-prefs.php:57
+#: modules/pref-prefs.php:62
 msgid "Old password is incorrect."
 msgstr "原密码错误."
 
-#: modules/pref-prefs.php:107
+#: modules/pref-prefs.php:112
 msgid "The configuration was saved."
 msgstr "设置已保存."
 
-#: modules/pref-prefs.php:133
+#: modules/pref-prefs.php:138
 #, fuzzy
 msgid "E-mail has been changed."
 msgstr "密码已更改."
 
-#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
+#: modules/pref-prefs.php:150 modules/pref-prefs.php:210
 msgid "The configuration was reset to defaults."
 msgstr "设置重置为默认"
 
-#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
 msgid "Change theme"
 msgstr "更改模板"
 
-#: modules/pref-prefs.php:190
+#: modules/pref-prefs.php:195
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
 msgstr "您的密码是默认的，请修改。"
 
-#: modules/pref-prefs.php:217
+#: modules/pref-prefs.php:222
 msgid "Personal data"
 msgstr "个人数据"
 
-#: modules/pref-prefs.php:224
+#: modules/pref-prefs.php:229
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail:"
 
-#: modules/pref-prefs.php:237
+#: modules/pref-prefs.php:238
+#, fuzzy
+msgid "Access level"
+msgstr "等级:"
+
+#: modules/pref-prefs.php:251
 msgid "Change e-mail"
 msgstr "更改 e-mail"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:257
 msgid "Authentication"
 msgstr "认证"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:259
 msgid "Old password"
 msgstr "原密码"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:264
 msgid "New password"
 msgstr "新密码"
 
-#: modules/pref-prefs.php:256
+#: modules/pref-prefs.php:270
 msgid "Confirm password"
 msgstr "验证密码"
 
-#: modules/pref-prefs.php:271
+#: modules/pref-prefs.php:285
 msgid "Change password"
 msgstr "更改密码"
 
-#: modules/pref-prefs.php:287
+#: modules/pref-prefs.php:301
 msgid "Themes"
 msgstr "模板"
 
-#: modules/pref-prefs.php:288
+#: modules/pref-prefs.php:302
 msgid "Select theme"
 msgstr "选择模板"
 
-#: modules/pref-prefs.php:290
+#: modules/pref-prefs.php:304
 msgid "Default"
 msgstr "默认"
 
-#: modules/pref-prefs.php:359
+#: modules/pref-prefs.php:377
 msgid "short_desc"
 msgstr "short_desc"
 
-#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
 msgid "Yes"
 msgstr "是"
 
-#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
+#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
 msgid "No"
 msgstr "否"
 
-#: modules/pref-prefs.php:395
+#: modules/pref-prefs.php:413
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:417
 msgid "Reset to defaults"
 msgstr "恢复到默认？"
 
@@ -1983,14 +2010,17 @@ msgstr "等级:"
 msgid "Last login"
 msgstr "最后登陆"
 
-#: modules/pref-users.php:318
+#: modules/pref-users.php:316
 msgid "User details"
 msgstr "用户详细"
 
-#: modules/pref-users.php:324
+#: modules/pref-users.php:322
 msgid "Reset password"
 msgstr "重置密码"
 
+#~ msgid "No articles found."
+#~ msgstr "未找到文章。"
+
 #~ msgid "New headlines for last 24 hours, as of "
 #~ msgstr "24小时最新提要,截至"