diff --git a/functions.php b/functions.php
index ac2699c95..0a55695aa 100644
--- a/functions.php
+++ b/functions.php
@@ -13,6 +13,7 @@
 					"auto"  => "Detect automatically",
 					"en_US" => "English",
 					"fr_FR" => "Français",
+					"nb_NO" => "Norsk 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 7de6457f0..a9fd95cf0 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 3caa78887..e07b49945 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: 2007-11-21 23:37+0300\n"
+"POT-Creation-Date: 2007-12-27 19:12+0300\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"
@@ -84,23 +84,23 @@ msgstr "Utilisateur"
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: backend.php:365
+#: backend.php:370
 msgid "Registered"
 msgstr "Abonné"
 
-#: backend.php:366
+#: backend.php:371
 msgid "Last logged in"
 msgstr "Dernière connexion"
 
-#: backend.php:367
+#: backend.php:372
 msgid "Stored articles"
 msgstr "Articles mémorisés"
 
-#: backend.php:374
+#: backend.php:379
 msgid "Subscribed feeds count"
 msgstr "Nombre d'abonnements à des flux"
 
-#: backend.php:387
+#: backend.php:392
 msgid "Subscribed feeds"
 msgstr "Abonnements à des flux"
 
@@ -166,170 +166,170 @@ 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:2415 functions.php:2754 functions.php:3116 functions.php:3923
+#: functions.php:2421 functions.php:2760 functions.php:3122 functions.php:3929
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2424 functions.php:2756 functions.php:3118 functions.php:3930
+#: functions.php:2430 functions.php:2762 functions.php:3124 functions.php:3936
 #: modules/pref-feeds.php:1068
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2433 functions.php:2758 functions.php:3120 functions.php:3908
+#: functions.php:2439 functions.php:2764 functions.php:3126 functions.php:3914
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:2676 modules/popup-dialog.php:151
+#: functions.php:2682 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2705 functions.php:2744 functions.php:3094 functions.php:4087
-#: functions.php:4117 modules/pref-feeds.php:880
+#: functions.php:2711 functions.php:2750 functions.php:3100 functions.php:4093
+#: functions.php:4123 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2734 functions.php:3260
+#: functions.php:2740 functions.php:3266
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2736 functions.php:3262
+#: functions.php:2742 functions.php:3268
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:3080 functions.php:3082
+#: functions.php:3086 functions.php:3088
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:3098 functions.php:3111 functions.php:3128
+#: functions.php:3104 functions.php:3117 functions.php:3134
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3714 functions.php:3761 functions.php:4891
+#: functions.php:3720 functions.php:3767 functions.php:4897
 #: modules/pref-feeds.php:655 modules/pref-feeds.php:842
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
-#: functions.php:3715 functions.php:3762 modules/pref-feeds.php:656
+#: functions.php:3721 functions.php:3768 modules/pref-feeds.php:656
 #: modules/pref-feeds.php:843 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:3716 functions.php:3720 functions.php:3763 functions.php:3766
+#: functions.php:3722 functions.php:3726 functions.php:3769 functions.php:3772
 #: tt-rss.php:175
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3717 functions.php:3764 modules/pref-feeds.php:657
+#: functions.php:3723 functions.php:3770 modules/pref-feeds.php:657
 #: modules/pref-feeds.php:844 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:3719
+#: functions.php:3725
 msgid "Toggle"
 msgstr "Marquages spéciaux&nbsp;"
 
-#: functions.php:3721 functions.php:3767 tt-rss.php:174
+#: functions.php:3727 functions.php:3773 tt-rss.php:174
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3722
+#: functions.php:3728
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3725 localized_schema.php:15
+#: functions.php:3731 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3726
+#: functions.php:3732
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:3727
+#: functions.php:3733
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3729
+#: functions.php:3735
 msgid "Above active article"
 msgstr "Au-dessus de l'article courant"
 
-#: functions.php:3730
+#: functions.php:3736
 msgid "Below active article"
 msgstr "En dessous de l'article courant"
 
-#: functions.php:3732
+#: functions.php:3738
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3740
+#: functions.php:3746
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3741
+#: functions.php:3747
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3742
+#: functions.php:3748
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3752 functions.php:3778
+#: functions.php:3758 functions.php:3784
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3766
+#: functions.php:3772
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3769
+#: functions.php:3775
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3770
+#: functions.php:3776
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3771 modules/pref-filters.php:263
+#: functions.php:3777 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3821
+#: functions.php:3827
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:4157
+#: functions.php:4163
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:4174
+#: functions.php:4180
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4399
+#: functions.php:4405
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:4454
+#: functions.php:4460
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4485 functions.php:4852
+#: functions.php:4491 functions.php:4858
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4487 functions.php:4854
+#: functions.php:4493 functions.php:4860
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4560
+#: functions.php:4566
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4627
+#: functions.php:4633
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -337,334 +337,334 @@ 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:4825
+#: functions.php:4831
 msgid "Show article"
 msgstr "Afficher l'article"
 
-#: functions.php:4954
+#: functions.php:4960
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
-#: localized_js.php:32
+#: localized_js.php:35
 msgid "display feeds"
 msgstr "afficher les flux"
 
-#: localized_js.php:33
+#: localized_js.php:36
 msgid "display tags"
 msgstr "afficher les étiquettes"
 
-#: localized_js.php:34 prefs.php:131 tt-rss.php:75
+#: localized_js.php:37 prefs.php:131 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "Ouverture en cours, veuillez patienter..."
 
-#: localized_js.php:35
+#: localized_js.php:38
 msgid "All feeds updated."
 msgstr "Mise à jour des flux terminée."
 
-#: localized_js.php:36
+#: localized_js.php:39
 msgid "Marking all feeds as read..."
 msgstr "Marquage de tous les flux comme lus..."
 
-#: localized_js.php:37
+#: localized_js.php:40
 msgid "Adding feed..."
 msgstr "Ajout d'un flux..."
 
-#: localized_js.php:38
+#: localized_js.php:41
 msgid "Removing feed..."
 msgstr "Suppression d'un flux..."
 
-#: localized_js.php:39
+#: localized_js.php:42
 msgid "Saving feed..."
 msgstr "Enregistrement d'un flux..."
 
-#: localized_js.php:40
+#: localized_js.php:43
 msgid "Can't add category: no name specified."
 msgstr "Impossible d'ajouter une catégorie : aucun nom fourni."
 
-#: localized_js.php:41
+#: localized_js.php:44
 msgid "Adding feed category..."
 msgstr "Ajout d'une catégorie de flux..."
 
-#: localized_js.php:42 localized_js.php:101
+#: localized_js.php:45 localized_js.php:104
 msgid "Can't add user: no login specified."
 msgstr "Impossible d'ajouter un utilisateur : aucun nom fourni."
 
-#: localized_js.php:44
+#: localized_js.php:47
 msgid "Adding user..."
 msgstr "Ajout d'un utilisateur..."
 
-#: localized_js.php:45 localized_js.php:99
+#: localized_js.php:48 localized_js.php:102
 msgid "Can't create label: missing SQL expression."
 msgstr "Impossible de créer un intitulé : expression SQL manquante."
 
-#: localized_js.php:46 localized_js.php:100
+#: localized_js.php:49 localized_js.php:103
 msgid "Can't create label: missing caption."
 msgstr "Impossible de créer un intitulé : descriptif manquant."
 
-#: localized_js.php:47
+#: localized_js.php:50
 msgid "Remove selected labels?"
 msgstr "Supprimer les intitulés sélectionnés ?"
 
-#: localized_js.php:48
+#: localized_js.php:51
 msgid "Removing selected labels..."
 msgstr "Suppression des intitulés sélectionnés..."
 
-#: localized_js.php:49 localized_js.php:68 localized_js.php:102
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105
 msgid "No labels are selected."
 msgstr "Aucun intitulé sélectionné."
 
-#: localized_js.php:50
+#: localized_js.php:53
 msgid "Remove selected users?"
 msgstr "Supprimer les utilisateurs sélectionnés ?"
 
-#: localized_js.php:51
+#: localized_js.php:54
 msgid "Removing selected users..."
 msgstr "Suppression des utilisateurs sélectionnés..."
 
-#: localized_js.php:52 localized_js.php:70 localized_js.php:72
-#: localized_js.php:103
+#: localized_js.php:55 localized_js.php:73 localized_js.php:75
+#: localized_js.php:106
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
-#: localized_js.php:53
+#: localized_js.php:56
 msgid "Remove selected filters?"
 msgstr "Supprimer les filtres sélectionnés ?"
 
-#: localized_js.php:54
+#: localized_js.php:57
 msgid "Removing selected filters..."
 msgstr "Suppression des filtres sélectionnés..."
 
-#: localized_js.php:55 localized_js.php:78 localized_js.php:104
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
-#: localized_js.php:56
+#: localized_js.php:59
 msgid "Unsubscribe from selected feeds?"
 msgstr "Se désinscrire des flux sélectionnés ?"
 
-#: localized_js.php:57
+#: localized_js.php:60
 msgid "Unsubscribing from selected feeds..."
 msgstr "Désinscription des flux sélectionnés..."
 
-#: localized_js.php:58 localized_js.php:76 localized_js.php:80
-#: localized_js.php:105 localized_js.php:108
+#: 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 "Aucun flux sélectionné."
 
-#: localized_js.php:59
+#: localized_js.php:62
 msgid "Remove selected categories?"
 msgstr "Supprimer les catégories sélectionnées ?"
 
-#: localized_js.php:60
+#: localized_js.php:63
 msgid "Removing selected categories..."
 msgstr "Suppression des catégories sélectionnées..."
 
-#: localized_js.php:61 localized_js.php:82 localized_js.php:106
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109
 msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 
-#: localized_js.php:62
+#: localized_js.php:65
 msgid "Saving category..."
 msgstr "Enregistrement de la catégorie..."
 
-#: localized_js.php:63
+#: localized_js.php:66
 msgid "Loading help..."
 msgstr "Ouverture de l'aide..."
 
-#: localized_js.php:64
+#: localized_js.php:67
 msgid "Saving label..."
 msgstr "Enregistrement de l'intitulé..."
 
-#: localized_js.php:65 localized_js.php:107
+#: localized_js.php:68 localized_js.php:110
 msgid "Login field cannot be blank."
 msgstr "Le nom ne peut pas être vide."
 
-#: localized_js.php:66
+#: localized_js.php:69
 msgid "Saving user..."
 msgstr "Enregistrement de l'utilisateur..."
 
-#: localized_js.php:67
+#: localized_js.php:70
 msgid "Saving filter..."
 msgstr "Enregistrement du filtre..."
 
-#: localized_js.php:69
+#: localized_js.php:72
 msgid "Please select only one label."
 msgstr "Veuillez sélectionner un seul intitulé."
 
-#: localized_js.php:71 localized_js.php:73
+#: localized_js.php:74 localized_js.php:76
 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 
-#: localized_js.php:74
+#: localized_js.php:77
 msgid "Reset password of selected user?"
 msgstr "Réinitialiser le mot de passe de l'utilisateur sélectionné ?"
 
-#: localized_js.php:75
+#: localized_js.php:78
 msgid "Resetting password for selected user..."
 msgstr "Réinitialisation du mot de passe de l'utilisateur sélectionné..."
 
-#: localized_js.php:77
+#: localized_js.php:80
 msgid "Please select only one feed."
 msgstr "Veuillez sélectionner un seul flux."
 
-#: localized_js.php:79
+#: localized_js.php:82
 msgid "Please select only one filter."
 msgstr "Veuillez sélectionner un seul filtre."
 
-#: localized_js.php:81
+#: localized_js.php:84
 msgid "Please select one feed."
 msgstr "Veuillez sélectionner un flux."
 
-#: localized_js.php:83
+#: localized_js.php:86
 msgid "Please select only one category."
 msgstr "Veuillez sélectionner une seule catégorie."
 
-#: localized_js.php:84
+#: localized_js.php:87
 msgid "No OPML file to upload."
 msgstr "Aucun fichier OPML à envoyer."
 
-#: localized_js.php:85
+#: localized_js.php:88
 msgid "Changing category of selected feeds..."
 msgstr "Modification de la catégorie des flux sélectionnés..."
 
-#: localized_js.php:86
+#: localized_js.php:89
 msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 
-#: localized_js.php:87
+#: localized_js.php:90
 msgid "Trying to change password..."
 msgstr "Tentative de modification du mot de passe..."
 
-#: localized_js.php:88
+#: localized_js.php:91
 msgid "Trying to change e-mail..."
 msgstr "Tentative de modification de l'adresse électronique..."
 
-#: localized_js.php:89
+#: localized_js.php:92
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
-#: localized_js.php:90
+#: localized_js.php:93
 msgid "Could not update headlines (missing XML object)"
 msgstr "Impossible de mettre à jour l'en-têtes (objet XML manquant)"
 
-#: localized_js.php:91
+#: localized_js.php:94
 msgid "Could not display article (missing XML object)"
 msgstr "Impossible d'afficher l'article (objet XML manquant)"
 
-#: localized_js.php:92 tt-rss.php:217 tt-rss.php:221
+#: localized_js.php:95 tt-rss.php:217 tt-rss.php:221
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
-#: localized_js.php:93
+#: localized_js.php:96
 msgid "Replace current publishing address with a new one?"
 msgstr "Remplacer l'adresse de publication actuelle ?"
 
-#: localized_js.php:94
+#: localized_js.php:97
 msgid "Address changed."
 msgstr "Adresse modifiée."
 
-#: localized_js.php:95
+#: localized_js.php:98
 msgid "Could not change address."
 msgstr "Impossible de changer l'adresse."
 
-#: localized_js.php:96
+#: localized_js.php:99
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désinscrire de la catégorie."
 
-#: localized_js.php:97
+#: localized_js.php:100
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: localized_js.php:98
+#: localized_js.php:101
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: localized_js.php:109
+#: localized_js.php:112
 msgid "Can't add filter: nothing to match on."
 msgstr "Impossible d'ajouter un filtre : aucune correspondance."
 
-#: localized_js.php:110
+#: localized_js.php:113
 msgid "Can't subscribe: no feed URL given."
 msgstr "Impossible de s'inscrire : aucune URL de flux n'a été fournie."
 
-#: localized_js.php:111
+#: localized_js.php:114
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "Se désinscrire de %s ?"
 
-#: localized_js.php:112
+#: localized_js.php:115
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
-#: localized_js.php:113
+#: localized_js.php:116
 #, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
-#: localized_js.php:114
+#: localized_js.php:117
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
 
-#: localized_js.php:115
+#: localized_js.php:118
 msgid "Please enter label title:"
 msgstr "Veuillez saisir le titre de l'intitulé :"
 
-#: localized_js.php:116
+#: localized_js.php:119
 msgid "Save current configuration?"
 msgstr "Enregistrer la configuration actuelle ?"
 
-#: localized_js.php:117 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:20
 msgid "Old password cannot be blank."
 msgstr "L'ancien mot de passe ne peut pas être vide."
 
-#: localized_js.php:118 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:25
 msgid "New password cannot be blank."
 msgstr "Le nouveau mot de passe ne peut pas être vide."
 
-#: localized_js.php:119 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:30
 msgid "Entered passwords do not match."
 msgstr "Les mots de passe saisie ne sont pas identiques."
 
-#: localized_js.php:120
+#: localized_js.php:123
 msgid "No articles found to mark"
 msgstr "Aucun article à marquer"
 
-#: localized_js.php:121
+#: localized_js.php:124
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Marquer %d article(s) comme lu(s) ?"
 
-#: localized_js.php:122
+#: localized_js.php:125
 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 
-#: localized_js.php:123
+#: localized_js.php:126
 msgid "Star article"
 msgstr "Marquer comme remarquable"
 
-#: localized_js.php:124
+#: localized_js.php:127
 msgid "Unstar article"
 msgstr "Ne plus marquer comme remarquable"
 
-#: localized_js.php:125
+#: localized_js.php:128
 msgid "Please wait..."
 msgstr "Veuillez patienter..."
 
-#: localized_js.php:126 localized_schema.php:17
+#: localized_js.php:129 localized_schema.php:17
 msgid "Publish article"
 msgstr "Publier l'article"
 
-#: localized_js.php:127
+#: localized_js.php:130
 msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 
-#: localized_js.php:128
+#: localized_js.php:131
 msgid "You can't clear this type of feed."
 msgstr "Vous ne pouvez pas purger ce type de flux."
 
-#: localized_js.php:129
+#: localized_js.php:132
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "Supprimer tous les articles non remarquables dans %s ?"
@@ -911,21 +911,22 @@ msgstr "Développer automatiquement les articles en affichage combiné"
 msgid "Purge unread articles"
 msgstr "Purger les articles non lus"
 
-#: login_form.php:83 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
 msgstr "Nom&nbsp;:"
 
-#: login_form.php:85 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
 msgid "Password:"
 msgstr "Mot de passe&nbsp;:"
 
-#: login_form.php:87
+#: login_form.php:90
 msgid "Language:"
 msgstr "Langue&nbsp;:"
 
-#: login_form.php:100 modules/pref-users.php:215
-msgid "Login"
+#: login_form.php:104
+#, fuzzy
+msgid "Log in"
 msgstr "Se connecter"
 
 #: mysql_convert_unicode.php:28 update.php:28
@@ -1388,7 +1389,7 @@ msgstr "URL du flux&nbsp;:"
 msgid "Category:"
 msgstr "Catégorie&nbsp;:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:107
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
 #: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr "S'inscrire"
@@ -1535,15 +1536,15 @@ msgstr ""
 "Ce panneau affiche les flux auxquels d'autres utilisateurs du même système "
 "se sont inscrits, au cas où cela présenterait un intérêt pour vous."
 
-#: modules/pref-feed-browser.php:93
+#: modules/pref-feed-browser.php:94
 msgid "Top"
 msgstr "Top"
 
-#: modules/pref-feed-browser.php:102
+#: modules/pref-feed-browser.php:103
 msgid "Show"
 msgstr "Afficher"
 
-#: modules/pref-feed-browser.php:152 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
 msgid "No feeds found to subscribe."
 msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
 
@@ -1956,6 +1957,10 @@ msgstr ""
 msgid "Create user"
 msgstr "Créer l'utilisateur"
 
+#: modules/pref-users.php:215
+msgid "Login"
+msgstr "Se connecter"
+
 #: modules/pref-users.php:216
 msgid "Access Level"
 msgstr "Permissions"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
new file mode 100644
index 000000000..7f2a582c1
Binary files /dev/null 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
new file mode 100644
index 000000000..386e57fef
--- /dev/null
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -0,0 +1,1875 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tiny Tiny RSS 1.2.18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-27 19:12+0300\n"
+"Last-Translator: Christian Lomsdalen <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"
+
+#: backend.php:103 backend.php:112
+msgid "Use default"
+msgstr "Bruk standard"
+
+#: backend.php:104
+msgid "Never purge"
+msgstr "Slett aldri"
+
+#: backend.php:105
+msgid "1 week old"
+msgstr "1 uke gammel"
+
+#: backend.php:106
+msgid "2 weeks old"
+msgstr "2 uker gammel"
+
+#: backend.php:107
+msgid "1 month old"
+msgstr "1 måned gammel"
+
+#: backend.php:108
+msgid "2 months old"
+msgstr "2 måneder gammel"
+
+#: backend.php:109
+msgid "3 months old"
+msgstr "3 måneder gammel"
+
+#: backend.php:113
+msgid "Disable updates"
+msgstr "Slå av oppdateringer"
+
+#: backend.php:114
+msgid "Each 15 minutes"
+msgstr "Hvert 15. minutt"
+
+#: backend.php:115
+msgid "Each 30 minutes"
+msgstr "Hvert 30. minutt"
+
+#: backend.php:116
+msgid "Hourly"
+msgstr "På timen"
+
+#: backend.php:117
+msgid "Each 4 hours"
+msgstr "Hver 4. time"
+
+#: backend.php:118
+msgid "Each 12 hours"
+msgstr "Hver 12. time"
+
+#: backend.php:119
+msgid "Daily"
+msgstr "Daglig"
+
+#: backend.php:120
+msgid "Weekly"
+msgstr "Ukentlig"
+
+#: backend.php:124 modules/pref-users.php:249
+msgid "User"
+msgstr "Bruker"
+
+#: backend.php:125 modules/pref-users.php:249
+msgid "Administrator"
+msgstr "Administrator"
+
+#: backend.php:370
+msgid "Registered"
+msgstr "Registrert"
+
+#: backend.php:371
+msgid "Last logged in"
+msgstr "Sist innlogget"
+
+#: backend.php:372
+msgid "Stored articles"
+msgstr "Lagrede artikler"
+
+#: backend.php:379
+msgid "Subscribed feeds count"
+msgstr "Antall nyhetsstrømmer som abonneres på"
+
+#: backend.php:392
+msgid "Subscribed feeds"
+msgstr "Nyhetsstrømmer som abonneres på"
+
+#: errors.php:3
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
+#: errors.php:5
+msgid "This program requires XmlHttpRequest "
+msgstr "Dette programmet krever XmlHttpRequest "
+
+#: errors.php:8
+msgid "This program requires cookies "
+msgstr "Dette programmet krever informasjonskapsler påslått"
+
+#: errors.php:11
+msgid "Backend sanity check failed"
+msgstr ""
+
+#: errors.php:13
+msgid "Frontend sanity check failed."
+msgstr ""
+
+#: errors.php:15
+msgid ""
+"Incorrect database schema version. &lt;a href='update.php'&gt;Please "
+"update&lt;/a&gt;."
+msgstr ""
+
+#: errors.php:17
+msgid "Request not authorized."
+msgstr "Forespørsel ikke autorisert"
+
+#: errors.php:19
+msgid "No operation to perform."
+msgstr "Ingen handling å utføre"
+
+#: errors.php:21
+msgid ""
+"Could not display feed: query failed. Please check label match syntax or "
+"local configuration."
+msgstr ""
+
+#: errors.php:23
+msgid "Denied. Your access level is insufficient to access this page."
+msgstr ""
+
+#: errors.php:25
+msgid "Configuration check failed"
+msgstr "Konfigurasjonssjekken feilet"
+
+#: errors.php:27
+msgid ""
+"Your version of MySQL is not currently supported. Please see \n"
+"\t\tofficial site for more information."
+msgstr ""
+
+#: functions.php:2421 functions.php:2760 functions.php:3122 functions.php:3929
+msgid "Starred articles"
+msgstr "Favorittartikler"
+
+#: functions.php:2430 functions.php:2762 functions.php:3124 functions.php:3936
+#: modules/pref-feeds.php:1068
+msgid "Published articles"
+msgstr "Publiserte artikler"
+
+#: functions.php:2439 functions.php:2764 functions.php:3126 functions.php:3914
+msgid "Fresh articles"
+msgstr "Ferske artikler"
+
+#: functions.php:2682 modules/popup-dialog.php:151
+#: modules/pref-filters.php:290
+msgid "All feeds"
+msgstr "Alle Nyhetsstrømmer"
+
+#: functions.php:2711 functions.php:2750 functions.php:3100 functions.php:4093
+#: functions.php:4123 modules/pref-feeds.php:880
+msgid "Uncategorized"
+msgstr "Ukategorisert"
+
+#: functions.php:2740 functions.php:3266
+msgid "Special"
+msgstr "Snarvei"
+
+#: functions.php:2742 functions.php:3268
+msgid "Labels"
+msgstr "Merkelapper"
+
+#: functions.php:3086 functions.php:3088
+msgid "Search results"
+msgstr "Søkeresultat"
+
+#: functions.php:3104 functions.php:3117 functions.php:3134
+msgid "Searched for"
+msgstr ""
+
+#: functions.php:3720 functions.php:3767 functions.php:4897
+#: modules/pref-feeds.php:655 modules/pref-feeds.php:842
+#: modules/pref-filters.php:255 modules/pref-labels.php:234
+#: modules/pref-users.php:208
+msgid "Select:"
+msgstr "Velg:"
+
+#: functions.php:3721 functions.php:3768 modules/pref-feeds.php:656
+#: modules/pref-feeds.php:843 modules/pref-filters.php:256
+#: modules/pref-labels.php:235 modules/pref-users.php:209
+msgid "All"
+msgstr "Alle"
+
+#: functions.php:3722 functions.php:3726 functions.php:3769 functions.php:3772
+#: tt-rss.php:175
+msgid "Unread"
+msgstr "Ulest"
+
+#: functions.php:3723 functions.php:3770 modules/pref-feeds.php:657
+#: modules/pref-feeds.php:844 modules/pref-filters.php:257
+#: modules/pref-labels.php:236 modules/pref-users.php:210
+msgid "None"
+msgstr "Ingen"
+
+#: functions.php:3725
+msgid "Toggle"
+msgstr ""
+
+#: functions.php:3727 functions.php:3773 tt-rss.php:174
+msgid "Starred"
+msgstr "Favoritt"
+
+#: functions.php:3728
+msgid "Published"
+msgstr "Publisert"
+
+#: functions.php:3731 localized_schema.php:15
+msgid "Mark as read"
+msgstr "Marker som lest"
+
+#: functions.php:3732
+msgid "Selection"
+msgstr "Utvalg"
+
+#: functions.php:3733
+msgid "This page"
+msgstr "Denne siden"
+
+#: functions.php:3735
+msgid "Above active article"
+msgstr "Ovenfor aktiv artikkel"
+
+#: functions.php:3736
+msgid "Below active article"
+msgstr "Nedenfor aktiv artikkel"
+
+#: functions.php:3738
+msgid "Entire feed"
+msgstr "Hele nyhetsstrømmen"
+
+#: functions.php:3746
+msgid "Next page"
+msgstr "Neste side"
+
+#: functions.php:3747
+msgid "Previous page"
+msgstr "Forrige side"
+
+#: functions.php:3748
+msgid "First page"
+msgstr "Første side"
+
+#: functions.php:3758 functions.php:3784
+msgid "Convert to label"
+msgstr ""
+
+#: functions.php:3772
+msgid "Toggle:"
+msgstr ""
+
+#: functions.php:3775
+msgid "Mark as read:"
+msgstr "Marker som lest:"
+
+#: functions.php:3776
+msgid "Page"
+msgstr "Side"
+
+#: functions.php:3777 modules/pref-filters.php:263
+msgid "Feed"
+msgstr "Nyhetsstrøm"
+
+#: functions.php:3827
+msgid "Generated feed"
+msgstr "Generert nyhetsstrøm"
+
+#: functions.php:4163
+msgid "No feeds to display."
+msgstr "Ingen nyhetstrømmer å vise"
+
+#: functions.php:4180
+msgid "Tags"
+msgstr "Tagger"
+
+#: functions.php:4405
+msgid " - by "
+msgstr "- av"
+
+#: functions.php:4460
+msgid "no tags"
+msgstr "Ingen tagger"
+
+#: functions.php:4491 functions.php:4858
+msgid "Attachment:"
+msgstr ""
+
+#: functions.php:4493 functions.php:4860
+msgid "Attachments:"
+msgstr ""
+
+#: functions.php:4566
+msgid "Feed not found."
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: functions.php:4633
+msgid ""
+"Could not display feed (query failed). Please check label match syntax or "
+"local configuration."
+msgstr ""
+
+#: functions.php:4831
+msgid "Show article"
+msgstr "Vis artikkelen"
+
+#: functions.php:4960
+msgid "No articles found."
+msgstr "Ingen artikler ble funnet"
+
+#: localized_js.php:35
+msgid "display feeds"
+msgstr "Vis nyhetsstrømmer"
+
+#: localized_js.php:36
+msgid "display tags"
+msgstr "Vis tagger"
+
+#: localized_js.php:37 prefs.php:131 tt-rss.php:75
+msgid "Loading, please wait..."
+msgstr "laster, vennligst vent"
+
+#: localized_js.php:38
+msgid "All feeds updated."
+msgstr "Alle nyhetsstrømmer er oppdatert"
+
+#: localized_js.php:39
+msgid "Marking all feeds as read..."
+msgstr "Marker alle nyhetsstrømmer som lest"
+
+#: localized_js.php:40
+msgid "Adding feed..."
+msgstr "Legger til nyhetsstrøm..."
+
+#: localized_js.php:41
+msgid "Removing feed..."
+msgstr "Fjerner nyhetsstrøm..."
+
+#: localized_js.php:42
+msgid "Saving feed..."
+msgstr "Lagrer Nyhetsstrøm"
+
+#: localized_js.php:43
+msgid "Can't add category: no name specified."
+msgstr ""
+
+#: localized_js.php:44
+msgid "Adding feed category..."
+msgstr "Legger til kategori for nyhetsstrømmer"
+
+#: localized_js.php:45 localized_js.php:104
+msgid "Can't add user: no login specified."
+msgstr ""
+
+#: localized_js.php:47
+msgid "Adding user..."
+msgstr "Legger til bruker.."
+
+#: localized_js.php:48 localized_js.php:102
+msgid "Can't create label: missing SQL expression."
+msgstr ""
+
+#: localized_js.php:49 localized_js.php:103
+msgid "Can't create label: missing caption."
+msgstr ""
+
+#: localized_js.php:50
+msgid "Remove selected labels?"
+msgstr ""
+
+#: localized_js.php:51
+msgid "Removing selected labels..."
+msgstr ""
+
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+msgid "No labels are selected."
+msgstr ""
+
+#: localized_js.php:53
+msgid "Remove selected users?"
+msgstr ""
+
+#: localized_js.php:54
+msgid "Removing selected users..."
+msgstr ""
+
+#: localized_js.php:55 localized_js.php:73 localized_js.php:75
+#: localized_js.php:106
+msgid "No users are selected."
+msgstr ""
+
+#: localized_js.php:56
+msgid "Remove selected filters?"
+msgstr ""
+
+#: localized_js.php:57
+msgid "Removing selected filters..."
+msgstr ""
+
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+msgid "No filters are selected."
+msgstr ""
+
+#: localized_js.php:59
+msgid "Unsubscribe from selected feeds?"
+msgstr ""
+
+#: localized_js.php:60
+msgid "Unsubscribing from selected feeds..."
+msgstr ""
+
+#: 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 ""
+
+#: localized_js.php:62
+msgid "Remove selected categories?"
+msgstr ""
+
+#: localized_js.php:63
+msgid "Removing selected categories..."
+msgstr ""
+
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+msgid "No categories are selected."
+msgstr ""
+
+#: localized_js.php:65
+msgid "Saving category..."
+msgstr ""
+
+#: localized_js.php:66
+msgid "Loading help..."
+msgstr ""
+
+#: localized_js.php:67
+msgid "Saving label..."
+msgstr ""
+
+#: localized_js.php:68 localized_js.php:110
+msgid "Login field cannot be blank."
+msgstr ""
+
+#: localized_js.php:69
+msgid "Saving user..."
+msgstr ""
+
+#: localized_js.php:70
+msgid "Saving filter..."
+msgstr ""
+
+#: localized_js.php:72
+msgid "Please select only one label."
+msgstr ""
+
+#: localized_js.php:74 localized_js.php:76
+msgid "Please select only one user."
+msgstr ""
+
+#: localized_js.php:77
+msgid "Reset password of selected user?"
+msgstr ""
+
+#: localized_js.php:78
+msgid "Resetting password for selected user..."
+msgstr ""
+
+#: localized_js.php:80
+msgid "Please select only one feed."
+msgstr ""
+
+#: localized_js.php:82
+msgid "Please select only one filter."
+msgstr ""
+
+#: localized_js.php:84
+msgid "Please select one feed."
+msgstr ""
+
+#: localized_js.php:86
+msgid "Please select only one category."
+msgstr ""
+
+#: localized_js.php:87
+msgid "No OPML file to upload."
+msgstr ""
+
+#: localized_js.php:88
+msgid "Changing category of selected feeds..."
+msgstr ""
+
+#: localized_js.php:89
+msgid "Reset to defaults?"
+msgstr ""
+
+#: localized_js.php:90
+msgid "Trying to change password..."
+msgstr ""
+
+#: localized_js.php:91
+msgid "Trying to change e-mail..."
+msgstr ""
+
+#: localized_js.php:92
+msgid "No articles are selected."
+msgstr ""
+
+#: localized_js.php:93
+msgid "Could not update headlines (missing XML object)"
+msgstr ""
+
+#: localized_js.php:94
+msgid "Could not display article (missing XML object)"
+msgstr ""
+
+#: localized_js.php:95 tt-rss.php:217 tt-rss.php:221
+msgid "No feed selected."
+msgstr ""
+
+#: localized_js.php:96
+msgid "Replace current publishing address with a new one?"
+msgstr ""
+
+#: localized_js.php:97
+msgid "Address changed."
+msgstr ""
+
+#: localized_js.php:98
+msgid "Could not change address."
+msgstr ""
+
+#: localized_js.php:99
+msgid "You can't unsubscribe from the category."
+msgstr ""
+
+#: localized_js.php:100
+msgid "Please select some feed first."
+msgstr ""
+
+#: localized_js.php:101
+msgid "You can't edit this kind of feed."
+msgstr ""
+
+#: localized_js.php:112
+msgid "Can't add filter: nothing to match on."
+msgstr ""
+
+#: localized_js.php:113
+msgid "Can't subscribe: no feed URL given."
+msgstr ""
+
+#: localized_js.php:114
+#, php-format
+msgid "Unsubscribe from %s?"
+msgstr ""
+
+#: localized_js.php:115
+#, php-format
+msgid "Mark all visible articles in %s as read?"
+msgstr ""
+
+#: localized_js.php:116
+#, php-format
+msgid "Mark all articles in %s as read?"
+msgstr ""
+
+#: localized_js.php:117
+#, php-format
+msgid "Mark %d selected articles in %s as read?"
+msgstr ""
+
+#: localized_js.php:118
+msgid "Please enter label title:"
+msgstr ""
+
+#: localized_js.php:119
+msgid "Save current configuration?"
+msgstr ""
+
+#: localized_js.php:120 modules/pref-prefs.php:20
+msgid "Old password cannot be blank."
+msgstr ""
+
+#: localized_js.php:121 modules/pref-prefs.php:25
+msgid "New password cannot be blank."
+msgstr ""
+
+#: localized_js.php:122 modules/pref-prefs.php:30
+msgid "Entered passwords do not match."
+msgstr ""
+
+#: localized_js.php:123
+msgid "No articles found to mark"
+msgstr ""
+
+#: localized_js.php:124
+#, php-format
+msgid "Mark %d article(s) as read?"
+msgstr ""
+
+#: localized_js.php:125
+msgid "No article is selected."
+msgstr ""
+
+#: localized_js.php:126
+msgid "Star article"
+msgstr ""
+
+#: localized_js.php:127
+msgid "Unstar article"
+msgstr ""
+
+#: localized_js.php:128
+msgid "Please wait..."
+msgstr ""
+
+#: localized_js.php:129 localized_schema.php:17
+msgid "Publish article"
+msgstr ""
+
+#: localized_js.php:130
+msgid "Unpublish article"
+msgstr ""
+
+#: localized_js.php:131
+msgid "You can't clear this type of feed."
+msgstr ""
+
+#: localized_js.php:132
+#, php-format
+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
+msgid "Title"
+msgstr ""
+
+#: localized_schema.php:10
+msgid "Title or Content"
+msgstr ""
+
+#: localized_schema.php:11
+msgid "Link"
+msgstr ""
+
+#: localized_schema.php:12 modules/popup-dialog.php:183
+msgid "Content"
+msgstr ""
+
+#: localized_schema.php:14
+msgid "Filter article"
+msgstr ""
+
+#: localized_schema.php:16
+msgid "Set starred"
+msgstr ""
+
+#: localized_schema.php:18
+msgid "Assign tags"
+msgstr ""
+
+#: localized_schema.php:22
+msgid "General"
+msgstr ""
+
+#: localized_schema.php:24
+msgid "Allow duplicate posts"
+msgstr ""
+
+#: localized_schema.php:25
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+
+#: localized_schema.php:26
+msgid "Default interval between feed updates (in minutes)"
+msgstr ""
+
+#: localized_schema.php:27
+msgid "Enable e-mail digest"
+msgstr ""
+
+#: localized_schema.php:28
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+
+#: localized_schema.php:29
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+
+#: localized_schema.php:30
+msgid "Update post on checksum change"
+msgstr ""
+
+#: localized_schema.php:32
+msgid "Interface"
+msgstr ""
+
+#: localized_schema.php:34
+msgid "Combined feed display"
+msgstr ""
+
+#: localized_schema.php:35
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+
+#: localized_schema.php:36
+msgid "Default article limit"
+msgstr ""
+
+#: localized_schema.php:37
+msgid ""
+"Default limit for articles to display, any custom number you like (0 - "
+"disables)."
+msgstr ""
+
+#: localized_schema.php:38
+msgid "Enable feed categories"
+msgstr "Tillatt kategorisering av nyhetsstrømmer"
+
+#: localized_schema.php:39
+msgid "Enable search toolbar"
+msgstr "Vis søkelinjen"
+
+#: localized_schema.php:40
+msgid "Hide feeds with no unread messages"
+msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
+
+#: localized_schema.php:41
+msgid "Mark articles as read automatically"
+msgstr "Marker artikler som leste automatisk"
+
+#: localized_schema.php:42
+msgid ""
+"This option enables marking articles as read automatically in combined mode "
+"while you scroll article list."
+msgstr ""
+
+#: localized_schema.php:43
+msgid "On catchup show next feed"
+msgstr ""
+
+#: 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 "
+"uleste artikler."
+
+#: localized_schema.php:45
+msgid "Open article links in new browser window"
+msgstr "Åpne artikkel-lenker i nytt nettleservindu"
+
+#: localized_schema.php:46
+msgid "Reverse headline order (oldest first)"
+msgstr ""
+
+#: localized_schema.php:47
+msgid "Show content preview in headlines list"
+msgstr ""
+
+#: localized_schema.php:48
+msgid "Sort feeds by unread articles count"
+msgstr ""
+
+#: localized_schema.php:49
+msgid "User stylesheet URL"
+msgstr ""
+
+#: localized_schema.php:50
+msgid "Link to user stylesheet to override default style, disabled if empty."
+msgstr ""
+
+#: localized_schema.php:51
+msgid "Maximum age of fresh articles (in hours)"
+msgstr ""
+
+#: localized_schema.php:53
+msgid "Advanced"
+msgstr ""
+
+#: localized_schema.php:55
+msgid "Blacklisted tags"
+msgstr ""
+
+#: localized_schema.php:56
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+
+#: localized_schema.php:57
+msgid "Confirm marking feed as read"
+msgstr ""
+
+#: localized_schema.php:58
+msgid "Enable icons in feedlist"
+msgstr ""
+
+#: localized_schema.php:59
+msgid "Enable labels"
+msgstr ""
+
+#: localized_schema.php:60
+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
+msgid "Long date format"
+msgstr ""
+
+#: localized_schema.php:62
+msgid "Set articles as unread on update"
+msgstr ""
+
+#: localized_schema.php:63
+msgid "Short date format"
+msgstr ""
+
+#: localized_schema.php:64
+msgid "Show additional information in feedlist"
+msgstr ""
+
+#: localized_schema.php:65
+msgid "Strip unsafe tags from articles"
+msgstr ""
+
+#: localized_schema.php:66
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
+
+#: localized_schema.php:67
+msgid "Use more accessible date/time format for headlines"
+msgstr ""
+
+#: localized_schema.php:68
+msgid "Automatically expand articles in combined mode"
+msgstr ""
+
+#: localized_schema.php:69
+msgid "Purge unread articles"
+msgstr ""
+
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: modules/pref-users.php:29
+msgid "Login:"
+msgstr ""
+
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+msgid "Password:"
+msgstr ""
+
+#: login_form.php:90
+msgid "Language:"
+msgstr ""
+
+#: login_form.php:104
+#, fuzzy
+msgid "Log in"
+msgstr "Siste innlogging"
+
+#: mysql_convert_unicode.php:28 update.php:28
+msgid "Your access level is insufficient to run this script."
+msgstr ""
+
+#: mysql_convert_unicode.php:54
+msgid "MySQL Charset Updater"
+msgstr ""
+
+#: mysql_convert_unicode.php:61
+msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
+msgstr ""
+
+#: mysql_convert_unicode.php:64 mysql_convert_unicode.php:105 update.php:103
+#: update.php:171
+msgid "Return to Tiny Tiny RSS"
+msgstr ""
+
+#: mysql_convert_unicode.php:69 update.php:111
+msgid "Please backup your database before proceeding."
+msgstr ""
+
+#: mysql_convert_unicode.php:71
+msgid ""
+"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+"\t\t\tDepending on current database charset you may experience data "
+"corruption (lost accent characters, etc.). \n"
+"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
+"php to 'utf8'."
+msgstr ""
+
+#: mysql_convert_unicode.php:77 update.php:127
+msgid "Perform updates"
+msgstr ""
+
+#: mysql_convert_unicode.php:82
+msgid "Converting database..."
+msgstr ""
+
+#: opml.php:108 opml.php:112
+msgid "OPML Utility"
+msgstr ""
+
+#: opml.php:133
+msgid "Importing OPML (using DOMXML extension)..."
+msgstr ""
+
+#: opml.php:137
+msgid "Importing OPML (using DOMDocument extension)..."
+msgstr ""
+
+#: opml.php:141
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+
+#: opml.php:145
+msgid "Return to preferences"
+msgstr ""
+
+#: prefs.php:85
+msgid "Unknown Error"
+msgstr ""
+
+#: prefs.php:91 tt-rss.php:108
+msgid "Hello,"
+msgstr ""
+
+#: prefs.php:93 prefs.php:103
+msgid "Exit preferences"
+msgstr ""
+
+#: prefs.php:95 tt-rss.php:118
+msgid "Logout"
+msgstr ""
+
+#: prefs.php:109 tt-rss.php:110 tt-rss.php:142
+msgid "Preferences"
+msgstr ""
+
+#: prefs.php:111
+msgid "My Feeds"
+msgstr ""
+
+#: prefs.php:114
+msgid "Other Feeds"
+msgstr ""
+
+#: prefs.php:117
+msgid "Published Articles"
+msgstr ""
+
+#: prefs.php:119
+msgid "Content Filtering"
+msgstr ""
+
+#: prefs.php:122
+msgid "Label Editor"
+msgstr ""
+
+#: prefs.php:126
+msgid "User Manager"
+msgstr ""
+
+#: prefs.php:134 tt-rss.php:78
+msgid ""
+"Your browser doesn't support Javascript, which is required\n"
+"\t\tfor this application to function properly. Please check your\n"
+"\t\tbrowser settings."
+msgstr ""
+
+#: sanity_check.php:8
+msgid ""
+"<b>Fatal Error</b>: You forgot to copy \n"
+"\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
+msgstr ""
+
+#: sanity_check.php:16
+msgid "config: your config file version is incorrect. See config.php-dist.\n"
+msgstr ""
+
+#: sanity_check.php:20
+msgid ""
+"<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
+"\t\t\toption from config.php\n"
+msgstr ""
+
+#: sanity_check.php:26
+msgid ""
+"<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
+"\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
+"them \n"
+"\t\tfrom your TT-RSS instance.\n"
+msgstr ""
+
+#: sanity_check.php:33
+msgid ""
+"<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
+"\t\t\tto 0 in single user mode.\n"
+msgstr ""
+
+#: sanity_check.php:39
+msgid ""
+"<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
+"\t\t\tdoesn't seem to support CURL functions."
+msgstr ""
+
+#: sanity_check.php:45
+msgid "config: SESSION_EXPIRE_TIME is undefined"
+msgstr ""
+
+#: sanity_check.php:49
+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 to"
+msgstr ""
+
+#: sanity_check.php:62
+msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
+msgstr ""
+
+#: sanity_check.php:66
+msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
+msgstr ""
+
+#: sanity_check.php:70
+msgid ""
+"config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
+"DIGEST_FROM_ADDRESS"
+msgstr ""
+
+#: sanity_check.php:74
+msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
+msgstr ""
+
+#: sanity_check.php:78
+msgid ""
+"config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
+"and read about other ways to update feeds on the <a href='http://tt-rss.spb."
+"ru/trac/wiki/UpdatingFeeds'>wiki</a>."
+msgstr ""
+
+#: sanity_check.php:83
+msgid "Fatal Error"
+msgstr ""
+
+#: tt-rss.php:114
+msgid "Comments?"
+msgstr ""
+
+#: tt-rss.php:131
+msgid "tag cloud"
+msgstr ""
+
+#: tt-rss.php:140 modules/pref-feeds.php:1003
+msgid "Actions..."
+msgstr ""
+
+#: tt-rss.php:141 modules/popup-dialog.php:127 modules/popup-dialog.php:196
+#: modules/pref-feeds.php:749
+msgid "Search"
+msgstr ""
+
+#: tt-rss.php:144
+msgid "Feed actions:"
+msgstr ""
+
+#: tt-rss.php:145
+msgid "&nbsp;&nbsp;Subscribe to feed"
+msgstr ""
+
+#: tt-rss.php:146
+msgid "&nbsp;&nbsp;Edit this feed"
+msgstr ""
+
+#: tt-rss.php:147
+msgid "&nbsp;&nbsp;Clear articles"
+msgstr ""
+
+#: tt-rss.php:148
+msgid "&nbsp;&nbsp;Unsubscribe"
+msgstr ""
+
+#: tt-rss.php:150
+msgid "All feeds:"
+msgstr ""
+
+#: tt-rss.php:151
+msgid "&nbsp;&nbsp;Mark as read"
+msgstr ""
+
+#: tt-rss.php:152
+msgid "&nbsp;&nbsp;(Un)hide read feeds"
+msgstr ""
+
+#: tt-rss.php:154
+msgid "Other actions:"
+msgstr ""
+
+#: tt-rss.php:155
+msgid "&nbsp;&nbsp;Create filter"
+msgstr ""
+
+#: tt-rss.php:163 modules/popup-dialog.php:139
+msgid "Search:"
+msgstr ""
+
+#: tt-rss.php:170
+msgid "View:"
+msgstr ""
+
+#: tt-rss.php:172
+msgid "Adaptive"
+msgstr ""
+
+#: tt-rss.php:173
+msgid "All Articles"
+msgstr ""
+
+#: tt-rss.php:178
+msgid "Limit:"
+msgstr ""
+
+#: tt-rss.php:203
+msgid "Update"
+msgstr ""
+
+#: update.php:53
+msgid "Database Updater"
+msgstr ""
+
+#: update.php:94
+msgid "Could not update database"
+msgstr ""
+
+#: update.php:97
+msgid "Could not find necessary schema file, need version:"
+msgstr ""
+
+#: update.php:98
+msgid ", found: "
+msgstr ""
+
+#: update.php:101
+msgid "Tiny Tiny RSS database is up to date."
+msgstr ""
+
+#: update.php:113
+#, php-format
+msgid ""
+"Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
+"<b>%d</b>)."
+msgstr ""
+
+#: update.php:132
+msgid "Performing updates..."
+msgstr ""
+
+#: update.php:138
+#, php-format
+msgid "Updating to version %d..."
+msgstr ""
+
+#: update.php:151
+msgid "Checking version... "
+msgstr ""
+
+#: update.php:157
+msgid "OK!"
+msgstr ""
+
+#: update.php:159
+msgid "ERROR!"
+msgstr ""
+
+#: update.php:167
+#, php-format
+msgid ""
+"Finished. Performed <b>%d</b> update(s) up to schema\n"
+"\t\t\tversion <b>%d</b>."
+msgstr ""
+
+#: modules/help.php:17
+msgid "Help topic not found."
+msgstr ""
+
+#: modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:458 modules/pref-feeds.php:706
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: modules/opml_domdoc.php:54
+#, php-format
+msgid "Adding category <b>%s</b>...<br>"
+msgstr ""
+
+#: modules/opml_domdoc.php:103 modules/opml_domxml.php:106
+msgid "Already imported."
+msgstr "Allerede importert."
+
+#: modules/opml_domdoc.php:123 modules/opml_domxml.php:125
+msgid "Done."
+msgstr "Ferdig."
+
+#: modules/opml_domdoc.php:134 modules/opml_domxml.php:139
+msgid "Error while parsing document."
+msgstr ""
+
+#: modules/opml_domdoc.php:138 modules/opml_domxml.php:143
+msgid "Error: please upload OPML file."
+msgstr ""
+
+#: modules/opml_domxml.php:56
+#, php-format
+msgid "Adding category <b>%s</b>."
+msgstr ""
+
+#: modules/opml_domxml.php:136
+msgid "Error: can't find body element."
+msgstr ""
+
+#: modules/popup-dialog.php:8
+msgid "Notice"
+msgstr ""
+
+#: modules/popup-dialog.php:12
+msgid ""
+"Update daemon is enabled in configuration, but daemon\n"
+"\t\t\t\t\tprocess is not running, which prevents all feeds from updating. "
+"Please\n"
+"\t\t\t\t\tstart the daemon process or contact instance owner."
+msgstr ""
+
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+msgid "Last update:"
+msgstr "Siste oppdatering:"
+
+#: modules/popup-dialog.php:26
+msgid ""
+"You are running the latest version of Tiny Tiny RSS. The\n"
+"\t\t\t\t\t\tfact that you are seeing this dialog is probably a bug."
+msgstr ""
+
+#: modules/popup-dialog.php:35
+msgid ""
+"TT-RSS has detected that update daemon is taking too long to\n"
+"\t\t\t\t\tperform a feed update. This could indicate a problem like crash\n"
+"\t\t\t\t\tor a hang. Please check the daemon process or contact instance\n"
+"\t\t\t\t\towner."
+msgstr ""
+
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:762
+msgid "Subscribe to feed"
+msgstr ""
+
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:165
+msgid "Feed URL:"
+msgstr ""
+
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:173
+msgid "Category:"
+msgstr ""
+
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
+#: modules/pref-feeds.php:118
+msgid "Subscribe"
+msgstr ""
+
+#: modules/popup-dialog.php:114 modules/popup-dialog.php:199
+#: modules/popup-dialog.php:251 modules/popup-dialog.php:338
+#: modules/popup-dialog.php:434 modules/pref-feeds.php:120
+#: modules/pref-feeds.php:352 modules/pref-filters.php:118
+#: modules/pref-users.php:58
+msgid "Cancel"
+msgstr ""
+
+#: modules/popup-dialog.php:120
+msgid "This feed requires authentication."
+msgstr ""
+
+#: modules/popup-dialog.php:148
+msgid "Where:"
+msgstr ""
+
+#: modules/popup-dialog.php:164
+msgid "This feed"
+msgstr ""
+
+#: modules/popup-dialog.php:179
+msgid "Match on:"
+msgstr ""
+
+#: modules/popup-dialog.php:184
+msgid "Title or content"
+msgstr ""
+
+#: modules/popup-dialog.php:208 modules/pref-labels.php:216
+msgid "Create label"
+msgstr ""
+
+#: modules/popup-dialog.php:218
+msgid "Caption:"
+msgstr ""
+
+#: modules/popup-dialog.php:227
+msgid "SQL Expression:"
+msgstr ""
+
+#: modules/popup-dialog.php:240
+msgid "Test"
+msgstr ""
+
+#: modules/popup-dialog.php:247 modules/popup-dialog.php:334
+msgid "Create"
+msgstr ""
+
+#: modules/popup-dialog.php:260 modules/pref-filters.php:229
+msgid "Create filter"
+msgstr ""
+
+#: modules/popup-dialog.php:278 modules/popup-dialog.php:309
+#: modules/pref-filters.php:40 modules/pref-filters.php:72
+msgid "description"
+msgstr ""
+
+#: modules/popup-dialog.php:283 modules/pref-filters.php:45
+msgid "Match:"
+msgstr ""
+
+#: modules/popup-dialog.php:289 modules/pref-filters.php:51
+msgid "On field:"
+msgstr ""
+
+#: modules/popup-dialog.php:294 modules/pref-filters.php:56
+msgid "Feed:"
+msgstr ""
+
+#: modules/popup-dialog.php:300 modules/pref-filters.php:62
+msgid "Action:"
+msgstr ""
+
+#: modules/popup-dialog.php:316 modules/pref-filters.php:79
+msgid "Params:"
+msgstr ""
+
+#: modules/popup-dialog.php:320 modules/pref-feeds.php:283
+msgid "Options:"
+msgstr ""
+
+#: modules/popup-dialog.php:323 modules/pref-filters.php:103
+msgid "Inverse match"
+msgstr ""
+
+#: modules/popup-dialog.php:349
+msgid "Update Errors"
+msgstr ""
+
+#: modules/popup-dialog.php:352
+msgid "These feeds have not been updated because of errors:"
+msgstr ""
+
+#: modules/popup-dialog.php:371
+msgid "Close"
+msgstr ""
+
+#: modules/popup-dialog.php:380
+msgid "Edit Tags"
+msgstr ""
+
+#: modules/popup-dialog.php:385
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: modules/popup-dialog.php:430 modules/pref-feeds.php:350
+#: modules/pref-filters.php:114 modules/pref-users.php:55
+msgid "Save"
+msgstr ""
+
+#: modules/popup-dialog.php:443
+msgid "Tag cloud"
+msgstr ""
+
+#: modules/popup-dialog.php:446
+msgid "Showing most popular tags "
+msgstr ""
+
+#: modules/popup-dialog.php:447
+msgid "browse more"
+msgstr ""
+
+#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
+msgid "Feed browser is administratively disabled."
+msgstr ""
+
+#: modules/pref-feed-browser.php:15
+msgid "Feed information:"
+msgstr ""
+
+#: modules/pref-feed-browser.php:51
+msgid "Last headlines:"
+msgstr ""
+
+#: modules/pref-feed-browser.php:77
+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
+msgid "Top"
+msgstr ""
+
+#: modules/pref-feed-browser.php:103
+msgid "Show"
+msgstr ""
+
+#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
+msgid "No feeds found to subscribe."
+msgstr ""
+
+#: modules/pref-feeds.php:38
+msgid "Subscribed to feeds:"
+msgstr ""
+
+#: modules/pref-feeds.php:57
+msgid "Other feeds: Top 25"
+msgstr ""
+
+#: modules/pref-feeds.php:61
+msgid "Showing top 25 registered feeds, sorted by popularity:"
+msgstr ""
+
+#: modules/pref-feeds.php:145
+msgid "Feed editor"
+msgstr ""
+
+#: modules/pref-feeds.php:157
+msgid "Title:"
+msgstr ""
+
+#: modules/pref-feeds.php:193
+msgid "Update Interval:"
+msgstr ""
+
+#: modules/pref-feeds.php:202
+msgid "Link to:"
+msgstr ""
+
+#: modules/pref-feeds.php:219
+msgid "Not linked"
+msgstr ""
+
+#: modules/pref-feeds.php:253
+msgid "Article purging:"
+msgstr ""
+
+#: modules/pref-feeds.php:285
+msgid "Hide from \"Other Feeds\""
+msgstr ""
+
+#: modules/pref-feeds.php:296
+msgid "Right-to-left content"
+msgstr ""
+
+#: modules/pref-feeds.php:307
+msgid "Hide from my feed list"
+msgstr ""
+
+#: modules/pref-feeds.php:319
+msgid "Include in e-mail digest"
+msgstr ""
+
+#: modules/pref-feeds.php:340
+msgid "Cache images locally"
+msgstr ""
+
+#: modules/pref-feeds.php:486
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr ""
+
+#: modules/pref-feeds.php:488
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr ""
+
+#: modules/pref-feeds.php:573
+msgid "Category editor"
+msgstr ""
+
+#: modules/pref-feeds.php:596
+#, php-format
+msgid "Category <b>$%s</b> already exists in the database."
+msgstr ""
+
+#: modules/pref-feeds.php:624
+msgid "Unable to delete non empty feed categories."
+msgstr ""
+
+#: modules/pref-feeds.php:641
+msgid "Create category"
+msgstr ""
+
+#: modules/pref-feeds.php:701
+msgid "No feed categories defined."
+msgstr ""
+
+#: modules/pref-feeds.php:712 modules/pref-filters.php:345
+#: modules/pref-labels.php:294 modules/pref-users.php:319
+msgid "Remove"
+msgstr ""
+
+#: modules/pref-feeds.php:734
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+
+#: modules/pref-feeds.php:767
+msgid "Top 25"
+msgstr ""
+
+#: modules/pref-feeds.php:841
+msgid "Show last article times"
+msgstr ""
+
+#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
+msgid "Last&nbsp;Article"
+msgstr ""
+
+#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
+msgid "Updated"
+msgstr ""
+
+#: modules/pref-feeds.php:991 modules/pref-feeds.php:1005
+msgid "Selection:"
+msgstr ""
+
+#: modules/pref-feeds.php:997
+msgid "Recategorize"
+msgstr ""
+
+#: modules/pref-feeds.php:1006 modules/pref-filters.php:343
+#: modules/pref-labels.php:292 modules/pref-users.php:317
+msgid "Edit"
+msgstr ""
+
+#: modules/pref-feeds.php:1007
+msgid "Manual purge"
+msgstr ""
+
+#: modules/pref-feeds.php:1008
+msgid "Clear feed data"
+msgstr ""
+
+#: modules/pref-feeds.php:1009
+msgid "Unsubscribe"
+msgstr ""
+
+#: modules/pref-feeds.php:1014
+msgid "Other:"
+msgstr ""
+
+#: modules/pref-feeds.php:1015
+msgid "Edit categories"
+msgstr ""
+
+#: modules/pref-feeds.php:1042
+msgid "OPML"
+msgstr ""
+
+#: modules/pref-feeds.php:1046
+msgid "File:"
+msgstr ""
+
+#: modules/pref-feeds.php:1049
+msgid "Import"
+msgstr ""
+
+#: modules/pref-feeds.php:1056
+msgid "Export OPML"
+msgstr ""
+
+#: modules/pref-feeds.php:1059
+msgid "Firefox Integration"
+msgstr ""
+
+#: modules/pref-feeds.php:1061
+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
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: modules/pref-feeds.php:1074
+msgid ""
+"Published articles are exported as a public RSS feed and can be subscribed "
+"by anyone who knows the address specified below."
+msgstr ""
+
+#: modules/pref-feeds.php:1081
+msgid "Generate another address"
+msgstr ""
+
+#: modules/pref-filters.php:22
+msgid "Filter editor"
+msgstr ""
+
+#: modules/pref-filters.php:94
+msgid "Enabled"
+msgstr ""
+
+#: modules/pref-filters.php:154
+#, php-format
+msgid "Saved filter <b>%s</b>"
+msgstr ""
+
+#: modules/pref-filters.php:194
+#, php-format
+msgid "Created filter <b>%s</b>"
+msgstr ""
+
+#: modules/pref-filters.php:262
+msgid "Filter expression"
+msgstr ""
+
+#: modules/pref-filters.php:264
+msgid "Match"
+msgstr ""
+
+#: modules/pref-filters.php:265
+msgid "Action"
+msgstr ""
+
+#: 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 ""
+
+#: modules/pref-filters.php:320
+msgid "(Inverse)"
+msgstr ""
+
+#: modules/pref-filters.php:335 modules/pref-filters.php:356
+msgid "No filters defined."
+msgstr ""
+
+#: modules/pref-labels.php:164
+#, php-format
+msgid "Saved label <b>%s</b>"
+msgstr ""
+
+#: modules/pref-labels.php:194
+#, php-format
+msgid "Created label <b>%s</b>"
+msgstr ""
+
+#: modules/pref-labels.php:241
+msgid "Caption"
+msgstr ""
+
+#: modules/pref-labels.php:242
+msgid "SQL Expression"
+msgstr ""
+
+#: modules/pref-labels.php:284 modules/pref-labels.php:297
+msgid "No labels defined."
+msgstr ""
+
+#: modules/pref-prefs.php:55
+msgid "Password has been changed."
+msgstr ""
+
+#: modules/pref-prefs.php:57
+msgid "Old password is incorrect."
+msgstr ""
+
+#: modules/pref-prefs.php:107
+msgid "The configuration was saved."
+msgstr ""
+
+#: modules/pref-prefs.php:133
+msgid "E-mail has been changed."
+msgstr ""
+
+#: modules/pref-prefs.php:145 modules/pref-prefs.php:205
+msgid "The configuration was reset to defaults."
+msgstr ""
+
+#: modules/pref-prefs.php:149 modules/pref-prefs.php:306
+msgid "Change theme"
+msgstr ""
+
+#: modules/pref-prefs.php:190
+msgid ""
+"Your password is at default value, \n"
+"\t\t\t\t\t\tplease change it."
+msgstr ""
+
+#: modules/pref-prefs.php:217
+msgid "Personal data"
+msgstr ""
+
+#: modules/pref-prefs.php:224
+msgid "E-mail"
+msgstr "E-post"
+
+#: modules/pref-prefs.php:237
+msgid "Change e-mail"
+msgstr "Skift e-post"
+
+#: modules/pref-prefs.php:243
+msgid "Authentication"
+msgstr "Autentifisering"
+
+#: modules/pref-prefs.php:245
+msgid "Old password"
+msgstr "Gammelt passord"
+
+#: modules/pref-prefs.php:250
+msgid "New password"
+msgstr "Nytt passord"
+
+#: modules/pref-prefs.php:256
+msgid "Confirm password"
+msgstr "Bekreft passord"
+
+#: modules/pref-prefs.php:271
+msgid "Change password"
+msgstr "Endre passord"
+
+#: modules/pref-prefs.php:287
+msgid "Themes"
+msgstr "Utseender"
+
+#: modules/pref-prefs.php:288
+msgid "Select theme"
+msgstr "Velg utseende"
+
+#: modules/pref-prefs.php:290
+msgid "Default"
+msgstr "Standard"
+
+#: modules/pref-prefs.php:359
+msgid "short_desc"
+msgstr ""
+
+#: modules/pref-prefs.php:371 modules/pref-prefs.php:376
+msgid "Yes"
+msgstr "Ja"
+
+#: modules/pref-prefs.php:373 modules/pref-prefs.php:376
+msgid "No"
+msgstr "Nei"
+
+#: modules/pref-prefs.php:395
+msgid "Save configuration"
+msgstr "Lagre konfigurasjonen"
+
+#: modules/pref-prefs.php:399
+msgid "Reset to defaults"
+msgstr "Tilbake til standard"
+
+#: modules/pref-users.php:12
+msgid "User editor"
+msgstr "Brukeradministrering"
+
+#: modules/pref-users.php:33
+msgid "Change password:"
+msgstr "Bytt passord:"
+
+#: modules/pref-users.php:37
+msgid "E-mail:"
+msgstr "E-post:"
+
+#: modules/pref-users.php:43
+msgid "Access level:"
+msgstr "Tilgangsnivå:"
+
+#: modules/pref-users.php:78
+#, php-format
+msgid "Changed password of user <b>%s</b>."
+msgstr ""
+
+#: modules/pref-users.php:123
+#, php-format
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr ""
+
+#: modules/pref-users.php:130
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr ""
+
+#: modules/pref-users.php:134
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr ""
+
+#: modules/pref-users.php:154
+#, 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:193
+msgid "Create user"
+msgstr "Lag bruker"
+
+#: modules/pref-users.php:215
+msgid "Login"
+msgstr ""
+
+#: modules/pref-users.php:216
+msgid "Access Level"
+msgstr "Tilgangsnivå"
+
+#: modules/pref-users.php:217
+msgid "Last login"
+msgstr "Siste innlogging"
+
+#: modules/pref-users.php:315
+msgid "User details"
+msgstr "Brukerdetaljer"
+
+#: modules/pref-users.php:321
+msgid "Reset password"
+msgstr "Nullstill passordet"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 4e04eb33e..98b46e08f 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 c39d40b55..39240c1e5 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: 2007-11-21 23:37+0300\n"
+"POT-Creation-Date: 2007-12-27 19:12+0300\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"
@@ -84,25 +84,25 @@ msgstr "Usuário"
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:365
+#: backend.php:370
 msgid "Registered"
 msgstr ""
 
-#: backend.php:366
+#: backend.php:371
 #, fuzzy
 msgid "Last logged in"
 msgstr "Último Login"
 
-#: backend.php:367
+#: backend.php:372
 #, fuzzy
 msgid "Stored articles"
 msgstr "Favoritos"
 
-#: backend.php:374
+#: backend.php:379
 msgid "Subscribed feeds count"
 msgstr ""
 
-#: backend.php:387
+#: backend.php:392
 msgid "Subscribed feeds"
 msgstr ""
 
@@ -162,505 +162,505 @@ msgstr ""
 "Sua versão do MySQL não é atualmente suportada. Por favor acesse \n"
 "\t\to site oficial para mais informações."
 
-#: functions.php:2415 functions.php:2754 functions.php:3116 functions.php:3923
+#: functions.php:2421 functions.php:2760 functions.php:3122 functions.php:3929
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:2424 functions.php:2756 functions.php:3118 functions.php:3930
+#: functions.php:2430 functions.php:2762 functions.php:3124 functions.php:3936
 #: modules/pref-feeds.php:1068
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:2433 functions.php:2758 functions.php:3120 functions.php:3908
+#: functions.php:2439 functions.php:2764 functions.php:3126 functions.php:3914
 msgid "Fresh articles"
 msgstr ""
 
-#: functions.php:2676 modules/popup-dialog.php:151
+#: functions.php:2682 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:2705 functions.php:2744 functions.php:3094 functions.php:4087
-#: functions.php:4117 modules/pref-feeds.php:880
+#: functions.php:2711 functions.php:2750 functions.php:3100 functions.php:4093
+#: functions.php:4123 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: functions.php:2734 functions.php:3260
+#: functions.php:2740 functions.php:3266
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2736 functions.php:3262
+#: functions.php:2742 functions.php:3268
 msgid "Labels"
 msgstr ""
 
-#: functions.php:3080 functions.php:3082
+#: functions.php:3086 functions.php:3088
 msgid "Search results"
 msgstr ""
 
-#: functions.php:3098 functions.php:3111 functions.php:3128
+#: functions.php:3104 functions.php:3117 functions.php:3134
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3714 functions.php:3761 functions.php:4891
+#: functions.php:3720 functions.php:3767 functions.php:4897
 #: modules/pref-feeds.php:655 modules/pref-feeds.php:842
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "Selecione:"
 
-#: functions.php:3715 functions.php:3762 modules/pref-feeds.php:656
+#: functions.php:3721 functions.php:3768 modules/pref-feeds.php:656
 #: modules/pref-feeds.php:843 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Todos"
 
-#: functions.php:3716 functions.php:3720 functions.php:3763 functions.php:3766
+#: functions.php:3722 functions.php:3726 functions.php:3769 functions.php:3772
 #: tt-rss.php:175
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:3717 functions.php:3764 modules/pref-feeds.php:657
+#: functions.php:3723 functions.php:3770 modules/pref-feeds.php:657
 #: modules/pref-feeds.php:844 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Nenhum"
 
-#: functions.php:3719
+#: functions.php:3725
 msgid "Toggle"
 msgstr ""
 
-#: functions.php:3721 functions.php:3767 tt-rss.php:174
+#: functions.php:3727 functions.php:3773 tt-rss.php:174
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:3722
+#: functions.php:3728
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:3725 localized_schema.php:15
+#: functions.php:3731 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: functions.php:3726
+#: functions.php:3732
 msgid "Selection"
 msgstr "Seleção"
 
-#: functions.php:3727
+#: functions.php:3733
 msgid "This page"
 msgstr ""
 
-#: functions.php:3729
+#: functions.php:3735
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3730
+#: functions.php:3736
 msgid "Below active article"
 msgstr ""
 
-#: functions.php:3732
+#: functions.php:3738
 msgid "Entire feed"
 msgstr ""
 
-#: functions.php:3740
+#: functions.php:3746
 msgid "Next page"
 msgstr "Próxima página"
 
-#: functions.php:3741
+#: functions.php:3747
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: functions.php:3742
+#: functions.php:3748
 msgid "First page"
 msgstr "Primeira página"
 
-#: functions.php:3752 functions.php:3778
+#: functions.php:3758 functions.php:3784
 msgid "Convert to label"
 msgstr ""
 
-#: functions.php:3766
+#: functions.php:3772
 msgid "Toggle:"
 msgstr ""
 
-#: functions.php:3769
+#: functions.php:3775
 msgid "Mark as read:"
 msgstr "Marcar como lido:"
 
-#: functions.php:3770
+#: functions.php:3776
 msgid "Page"
 msgstr "Página"
 
-#: functions.php:3771 modules/pref-filters.php:263
+#: functions.php:3777 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3821
+#: functions.php:3827
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4157
+#: functions.php:4163
 msgid "No feeds to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:4174
+#: functions.php:4180
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4399
+#: functions.php:4405
 msgid " - by "
 msgstr " - por "
 
-#: functions.php:4454
+#: functions.php:4460
 msgid "no tags"
 msgstr "sem tags"
 
-#: functions.php:4485 functions.php:4852
+#: functions.php:4491 functions.php:4858
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4487 functions.php:4854
+#: functions.php:4493 functions.php:4860
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4560
+#: functions.php:4566
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: functions.php:4627
+#: functions.php:4633
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4825
+#: functions.php:4831
 #, fuzzy
 msgid "Show article"
 msgstr "Favoritos"
 
-#: functions.php:4954
+#: functions.php:4960
 msgid "No articles found."
 msgstr ""
 
-#: localized_js.php:32
+#: localized_js.php:35
 msgid "display feeds"
 msgstr ""
 
-#: localized_js.php:33
+#: localized_js.php:36
 msgid "display tags"
 msgstr ""
 
-#: localized_js.php:34 prefs.php:131 tt-rss.php:75
+#: localized_js.php:37 prefs.php:131 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr ""
 
-#: localized_js.php:35
+#: localized_js.php:38
 msgid "All feeds updated."
 msgstr ""
 
-#: localized_js.php:36
+#: localized_js.php:39
 msgid "Marking all feeds as read..."
 msgstr "Marcando todos os feeds como lidos..."
 
-#: localized_js.php:37
+#: localized_js.php:40
 msgid "Adding feed..."
 msgstr "Adicionando o Feed..."
 
-#: localized_js.php:38
+#: localized_js.php:41
 msgid "Removing feed..."
 msgstr "Removendo o Feed..."
 
-#: localized_js.php:39
+#: localized_js.php:42
 msgid "Saving feed..."
 msgstr "Salvando o Feed..."
 
-#: localized_js.php:40
+#: localized_js.php:43
 msgid "Can't add category: no name specified."
 msgstr ""
 
-#: localized_js.php:41
+#: localized_js.php:44
 msgid "Adding feed category..."
 msgstr ""
 
-#: localized_js.php:42 localized_js.php:101
+#: localized_js.php:45 localized_js.php:104
 msgid "Can't add user: no login specified."
 msgstr ""
 
-#: localized_js.php:44
+#: localized_js.php:47
 msgid "Adding user..."
 msgstr "Adicionando o usuário…"
 
-#: localized_js.php:45 localized_js.php:99
+#: localized_js.php:48 localized_js.php:102
 msgid "Can't create label: missing SQL expression."
 msgstr ""
 
-#: localized_js.php:46 localized_js.php:100
+#: localized_js.php:49 localized_js.php:103
 msgid "Can't create label: missing caption."
 msgstr ""
 
-#: localized_js.php:47
+#: localized_js.php:50
 msgid "Remove selected labels?"
 msgstr ""
 
-#: localized_js.php:48
+#: localized_js.php:51
 msgid "Removing selected labels..."
 msgstr ""
 
-#: localized_js.php:49 localized_js.php:68 localized_js.php:102
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105
 msgid "No labels are selected."
 msgstr ""
 
-#: localized_js.php:50
+#: localized_js.php:53
 msgid "Remove selected users?"
 msgstr "Remover os usuários selecionados?"
 
-#: localized_js.php:51
+#: localized_js.php:54
 msgid "Removing selected users..."
 msgstr "Removendo usuários selecionados…"
 
-#: localized_js.php:52 localized_js.php:70 localized_js.php:72
-#: localized_js.php:103
+#: localized_js.php:55 localized_js.php:73 localized_js.php:75
+#: localized_js.php:106
 msgid "No users are selected."
 msgstr "Nenhum usuário foi selecionado."
 
-#: localized_js.php:53
+#: localized_js.php:56
 msgid "Remove selected filters?"
 msgstr "Remover os filtros selecionados?"
 
-#: localized_js.php:54
+#: localized_js.php:57
 msgid "Removing selected filters..."
 msgstr "Removendo filtros selecionados…"
 
-#: localized_js.php:55 localized_js.php:78 localized_js.php:104
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107
 msgid "No filters are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: localized_js.php:56
+#: localized_js.php:59
 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 
-#: localized_js.php:57
+#: localized_js.php:60
 msgid "Unsubscribing from selected feeds..."
 msgstr ""
 
-#: localized_js.php:58 localized_js.php:76 localized_js.php:80
-#: localized_js.php:105 localized_js.php:108
+#: 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 "Nenhum feed foi selecionado."
 
-#: localized_js.php:59
+#: localized_js.php:62
 msgid "Remove selected categories?"
 msgstr "Remover as categorias selecionadas?"
 
-#: localized_js.php:60
+#: localized_js.php:63
 msgid "Removing selected categories..."
 msgstr "Removendo categorias selecionadas…"
 
-#: localized_js.php:61 localized_js.php:82 localized_js.php:106
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109
 msgid "No categories are selected."
 msgstr "Nenhuma categoria foi selecionada."
 
-#: localized_js.php:62
+#: localized_js.php:65
 msgid "Saving category..."
 msgstr "Salvando categoria..."
 
-#: localized_js.php:63
+#: localized_js.php:66
 msgid "Loading help..."
 msgstr ""
 
-#: localized_js.php:64
+#: localized_js.php:67
 msgid "Saving label..."
 msgstr ""
 
-#: localized_js.php:65 localized_js.php:107
+#: localized_js.php:68 localized_js.php:110
 msgid "Login field cannot be blank."
 msgstr "O campo de Login não pode ser vazio."
 
-#: localized_js.php:66
+#: localized_js.php:69
 msgid "Saving user..."
 msgstr "Salvando usuário"
 
-#: localized_js.php:67
+#: localized_js.php:70
 msgid "Saving filter..."
 msgstr "Salvando o filtro..."
 
-#: localized_js.php:69
+#: localized_js.php:72
 msgid "Please select only one label."
 msgstr ""
 
-#: localized_js.php:71 localized_js.php:73
+#: localized_js.php:74 localized_js.php:76
 msgid "Please select only one user."
 msgstr "Por favor selecione somente um usuário."
 
-#: localized_js.php:74
+#: localized_js.php:77
 msgid "Reset password of selected user?"
 msgstr ""
 
-#: localized_js.php:75
+#: localized_js.php:78
 msgid "Resetting password for selected user..."
 msgstr ""
 
-#: localized_js.php:77
+#: localized_js.php:80
 msgid "Please select only one feed."
 msgstr "Por favor selecione somente um feed"
 
-#: localized_js.php:79
+#: localized_js.php:82
 msgid "Please select only one filter."
 msgstr "Por favor selecione somente um filtro."
 
-#: localized_js.php:81
+#: localized_js.php:84
 msgid "Please select one feed."
 msgstr "Por favor selecione  um feed."
 
-#: localized_js.php:83
+#: localized_js.php:86
 msgid "Please select only one category."
 msgstr "Por favor selecione somente uma categoria."
 
-#: localized_js.php:84
+#: localized_js.php:87
 msgid "No OPML file to upload."
 msgstr "Nenhum arquivo OPML para upload."
 
-#: localized_js.php:85
+#: localized_js.php:88
 msgid "Changing category of selected feeds..."
 msgstr "Alterando a categoria dos feeds selecionados…"
 
-#: localized_js.php:86
+#: localized_js.php:89
 msgid "Reset to defaults?"
 msgstr ""
 
-#: localized_js.php:87
+#: localized_js.php:90
 msgid "Trying to change password..."
 msgstr "Tentando alterar senha ..."
 
-#: localized_js.php:88
+#: localized_js.php:91
 msgid "Trying to change e-mail..."
 msgstr "Tentando mudar o E-mail..."
 
-#: localized_js.php:89
+#: localized_js.php:92
 msgid "No articles are selected."
 msgstr ""
 
-#: localized_js.php:90
+#: localized_js.php:93
 msgid "Could not update headlines (missing XML object)"
 msgstr ""
 
-#: localized_js.php:91
+#: localized_js.php:94
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:92 tt-rss.php:217 tt-rss.php:221
+#: localized_js.php:95 tt-rss.php:217 tt-rss.php:221
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: localized_js.php:93
+#: localized_js.php:96
 msgid "Replace current publishing address with a new one?"
 msgstr ""
 
-#: localized_js.php:94
+#: localized_js.php:97
 msgid "Address changed."
 msgstr "Endereço alterado."
 
-#: localized_js.php:95
+#: localized_js.php:98
 msgid "Could not change address."
 msgstr ""
 
-#: localized_js.php:96
+#: localized_js.php:99
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: localized_js.php:97
+#: localized_js.php:100
 msgid "Please select some feed first."
 msgstr ""
 
-#: localized_js.php:98
+#: localized_js.php:101
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: localized_js.php:109
+#: localized_js.php:112
 msgid "Can't add filter: nothing to match on."
 msgstr ""
 
-#: localized_js.php:110
+#: localized_js.php:113
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_js.php:111
+#: localized_js.php:114
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: localized_js.php:112
+#: localized_js.php:115
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: localized_js.php:113
+#: localized_js.php:116
 #, fuzzy, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: localized_js.php:114
+#: localized_js.php:117
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
 
-#: localized_js.php:115
+#: localized_js.php:118
 msgid "Please enter label title:"
 msgstr ""
 
-#: localized_js.php:116
+#: localized_js.php:119
 msgid "Save current configuration?"
 msgstr "Salvar a configuração atual?"
 
-#: localized_js.php:117 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:20
 msgid "Old password cannot be blank."
 msgstr "A senha antiga não pode ser vazia."
 
-#: localized_js.php:118 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:25
 msgid "New password cannot be blank."
 msgstr "A nova senha não pode ser vazia."
 
-#: localized_js.php:119 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:30
 msgid "Entered passwords do not match."
 msgstr "As senhas informadas não conferem."
 
-#: localized_js.php:120
+#: localized_js.php:123
 msgid "No articles found to mark"
 msgstr ""
 
-#: localized_js.php:121
+#: localized_js.php:124
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr ""
 
-#: localized_js.php:122
+#: localized_js.php:125
 msgid "No article is selected."
 msgstr ""
 
-#: localized_js.php:123
+#: localized_js.php:126
 #, fuzzy
 msgid "Star article"
 msgstr "Favoritos"
 
-#: localized_js.php:124
+#: localized_js.php:127
 msgid "Unstar article"
 msgstr ""
 
-#: localized_js.php:125
+#: localized_js.php:128
 msgid "Please wait..."
 msgstr ""
 
-#: localized_js.php:126 localized_schema.php:17
+#: localized_js.php:129 localized_schema.php:17
 msgid "Publish article"
 msgstr ""
 
-#: localized_js.php:127
+#: localized_js.php:130
 msgid "Unpublish article"
 msgstr ""
 
-#: localized_js.php:128
+#: localized_js.php:131
 msgid "You can't clear this type of feed."
 msgstr ""
 
-#: localized_js.php:129
+#: localized_js.php:132
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr ""
@@ -884,21 +884,22 @@ msgstr ""
 msgid "Purge unread articles"
 msgstr ""
 
-#: login_form.php:83 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
 msgstr "Login:"
 
-#: login_form.php:85 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
 msgid "Password:"
 msgstr "Senha:"
 
-#: login_form.php:87
+#: login_form.php:90
 msgid "Language:"
 msgstr "Língua:"
 
-#: login_form.php:100 modules/pref-users.php:215
-msgid "Login"
+#: login_form.php:104
+#, fuzzy
+msgid "Log in"
 msgstr "Login"
 
 #: mysql_convert_unicode.php:28 update.php:28
@@ -1310,7 +1311,7 @@ msgstr "Feed URL:"
 msgid "Category:"
 msgstr "Categoria:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:107
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
 #: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr ""
@@ -1455,15 +1456,15 @@ msgid ""
 "case you are interested in them too."
 msgstr ""
 
-#: modules/pref-feed-browser.php:93
+#: modules/pref-feed-browser.php:94
 msgid "Top"
 msgstr ""
 
-#: modules/pref-feed-browser.php:102
+#: modules/pref-feed-browser.php:103
 msgid "Show"
 msgstr ""
 
-#: modules/pref-feed-browser.php:152 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
 msgid "No feeds found to subscribe."
 msgstr ""
 
@@ -1871,6 +1872,10 @@ msgstr ""
 msgid "Create user"
 msgstr "Criar um usuário"
 
+#: modules/pref-users.php:215
+msgid "Login"
+msgstr "Login"
+
 #: modules/pref-users.php:216
 msgid "Access Level"
 msgstr "Nível de acesso"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 7d72ce96a..9656965bd 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 f61342500..86c6bb9d4 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: 2007-11-21 23:37+0300\n"
+"POT-Creation-Date: 2007-12-27 19:12+0300\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"
@@ -84,26 +84,26 @@ msgstr "Пользователь"
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:365
+#: backend.php:370
 msgid "Registered"
 msgstr ""
 
-#: backend.php:366
+#: backend.php:371
 #, fuzzy
 msgid "Last logged in"
 msgstr "Последний вход"
 
-#: backend.php:367
+#: backend.php:372
 #, fuzzy
 msgid "Stored articles"
 msgstr "Отмеченные"
 
-#: backend.php:374
+#: backend.php:379
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "Подписаны каналы:"
 
-#: backend.php:387
+#: backend.php:392
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "Подписаны каналы:"
@@ -164,515 +164,515 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2415 functions.php:2754 functions.php:3116 functions.php:3923
+#: functions.php:2421 functions.php:2760 functions.php:3122 functions.php:3929
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2424 functions.php:2756 functions.php:3118 functions.php:3930
+#: functions.php:2430 functions.php:2762 functions.php:3124 functions.php:3936
 #: modules/pref-feeds.php:1068
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2433 functions.php:2758 functions.php:3120 functions.php:3908
+#: functions.php:2439 functions.php:2764 functions.php:3126 functions.php:3914
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2676 modules/popup-dialog.php:151
+#: functions.php:2682 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2705 functions.php:2744 functions.php:3094 functions.php:4087
-#: functions.php:4117 modules/pref-feeds.php:880
+#: functions.php:2711 functions.php:2750 functions.php:3100 functions.php:4093
+#: functions.php:4123 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2734 functions.php:3260
+#: functions.php:2740 functions.php:3266
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2736 functions.php:3262
+#: functions.php:2742 functions.php:3268
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:3080 functions.php:3082
+#: functions.php:3086 functions.php:3088
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:3098 functions.php:3111 functions.php:3128
+#: functions.php:3104 functions.php:3117 functions.php:3134
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3714 functions.php:3761 functions.php:4891
+#: functions.php:3720 functions.php:3767 functions.php:4897
 #: modules/pref-feeds.php:655 modules/pref-feeds.php:842
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3715 functions.php:3762 modules/pref-feeds.php:656
+#: functions.php:3721 functions.php:3768 modules/pref-feeds.php:656
 #: modules/pref-feeds.php:843 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Все"
 
-#: functions.php:3716 functions.php:3720 functions.php:3763 functions.php:3766
+#: functions.php:3722 functions.php:3726 functions.php:3769 functions.php:3772
 #: tt-rss.php:175
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3717 functions.php:3764 modules/pref-feeds.php:657
+#: functions.php:3723 functions.php:3770 modules/pref-feeds.php:657
 #: modules/pref-feeds.php:844 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3719
+#: functions.php:3725
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3721 functions.php:3767 tt-rss.php:174
+#: functions.php:3727 functions.php:3773 tt-rss.php:174
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3722
+#: functions.php:3728
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3725 localized_schema.php:15
+#: functions.php:3731 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3726
+#: functions.php:3732
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3727
+#: functions.php:3733
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3729
+#: functions.php:3735
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3730
+#: functions.php:3736
 #, fuzzy
 msgid "Below active article"
 msgstr "Отфильтровать статью"
 
-#: functions.php:3732
+#: functions.php:3738
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3740
+#: functions.php:3746
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3741
+#: functions.php:3747
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3742
+#: functions.php:3748
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3752 functions.php:3778
+#: functions.php:3758 functions.php:3784
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3766
+#: functions.php:3772
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3769
+#: functions.php:3775
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3770
+#: functions.php:3776
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3771 modules/pref-filters.php:263
+#: functions.php:3777 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3821
+#: functions.php:3827
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4157
+#: functions.php:4163
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:4174
+#: functions.php:4180
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4399
+#: functions.php:4405
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:4454
+#: functions.php:4460
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4485 functions.php:4852
+#: functions.php:4491 functions.php:4858
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4487 functions.php:4854
+#: functions.php:4493 functions.php:4860
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4560
+#: functions.php:4566
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4627
+#: functions.php:4633
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4825
+#: functions.php:4831
 #, fuzzy
 msgid "Show article"
 msgstr "Отмеченные"
 
-#: functions.php:4954
+#: functions.php:4960
 msgid "No articles found."
 msgstr "Статей не найдено."
 
-#: localized_js.php:32
+#: localized_js.php:35
 msgid "display feeds"
 msgstr "показать каналы"
 
-#: localized_js.php:33
+#: localized_js.php:36
 msgid "display tags"
 msgstr "показать теги"
 
-#: localized_js.php:34 prefs.php:131 tt-rss.php:75
+#: localized_js.php:37 prefs.php:131 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
-#: localized_js.php:35
+#: localized_js.php:38
 msgid "All feeds updated."
 msgstr "Все каналы обновлены."
 
-#: localized_js.php:36
+#: localized_js.php:39
 msgid "Marking all feeds as read..."
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: localized_js.php:37
+#: localized_js.php:40
 msgid "Adding feed..."
 msgstr "Канал добавляется..."
 
-#: localized_js.php:38
+#: localized_js.php:41
 msgid "Removing feed..."
 msgstr "Канал удаляется..."
 
-#: localized_js.php:39
+#: localized_js.php:42
 msgid "Saving feed..."
 msgstr "Идет сохранение..."
 
-#: localized_js.php:40
+#: localized_js.php:43
 msgid "Can't add category: no name specified."
 msgstr "Не могу добавить категорию без имени"
 
-#: localized_js.php:41
+#: localized_js.php:44
 msgid "Adding feed category..."
 msgstr "Категория добавляется..."
 
-#: localized_js.php:42 localized_js.php:101
+#: localized_js.php:45 localized_js.php:104
 msgid "Can't add user: no login specified."
 msgstr ""
 
-#: localized_js.php:44
+#: localized_js.php:47
 msgid "Adding user..."
 msgstr "Пользователь добавляется..."
 
-#: localized_js.php:45 localized_js.php:99
+#: localized_js.php:48 localized_js.php:102
 msgid "Can't create label: missing SQL expression."
 msgstr ""
 
-#: localized_js.php:46 localized_js.php:100
+#: localized_js.php:49 localized_js.php:103
 msgid "Can't create label: missing caption."
 msgstr ""
 
-#: localized_js.php:47
+#: localized_js.php:50
 msgid "Remove selected labels?"
 msgstr "Удалить выбранные метки?"
 
-#: localized_js.php:48
+#: localized_js.php:51
 msgid "Removing selected labels..."
 msgstr "Выбранные метки удаляются..."
 
-#: localized_js.php:49 localized_js.php:68 localized_js.php:102
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105
 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
-#: localized_js.php:50
+#: localized_js.php:53
 msgid "Remove selected users?"
 msgstr "Удалить выбранных пользователей?"
 
-#: localized_js.php:51
+#: localized_js.php:54
 msgid "Removing selected users..."
 msgstr "Выбранные пользователи удаляются..."
 
-#: localized_js.php:52 localized_js.php:70 localized_js.php:72
-#: localized_js.php:103
+#: localized_js.php:55 localized_js.php:73 localized_js.php:75
+#: localized_js.php:106
 msgid "No users are selected."
 msgstr "Нет выбранных пользователей."
 
-#: localized_js.php:53
+#: localized_js.php:56
 msgid "Remove selected filters?"
 msgstr "Удалить выбраннфе фильтры?"
 
-#: localized_js.php:54
+#: localized_js.php:57
 msgid "Removing selected filters..."
 msgstr "Выбранные фильтры удаляются..."
 
-#: localized_js.php:55 localized_js.php:78 localized_js.php:104
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107
 msgid "No filters are selected."
 msgstr "Нет выбранных фильтров."
 
-#: localized_js.php:56
+#: localized_js.php:59
 msgid "Unsubscribe from selected feeds?"
 msgstr "Отписаться от выбранных каналов?"
 
-#: localized_js.php:57
+#: localized_js.php:60
 msgid "Unsubscribing from selected feeds..."
 msgstr "Выбранные каналы удаляются..."
 
-#: localized_js.php:58 localized_js.php:76 localized_js.php:80
-#: localized_js.php:105 localized_js.php:108
+#: 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 "Нет выбранных каналов."
 
-#: localized_js.php:59
+#: localized_js.php:62
 msgid "Remove selected categories?"
 msgstr "Удалить выбранные категории?"
 
-#: localized_js.php:60
+#: localized_js.php:63
 msgid "Removing selected categories..."
 msgstr "Выбранные категории удаляются..."
 
-#: localized_js.php:61 localized_js.php:82 localized_js.php:106
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109
 msgid "No categories are selected."
 msgstr "Нет выбранных категорий."
 
-#: localized_js.php:62
+#: localized_js.php:65
 msgid "Saving category..."
 msgstr "Категория сохраняется..."
 
-#: localized_js.php:63
+#: localized_js.php:66
 msgid "Loading help..."
 msgstr "Идет загрузка помощи..."
 
-#: localized_js.php:64
+#: localized_js.php:67
 msgid "Saving label..."
 msgstr "Идет сохранение метки..."
 
-#: localized_js.php:65 localized_js.php:107
+#: localized_js.php:68 localized_js.php:110
 msgid "Login field cannot be blank."
 msgstr ""
 
-#: localized_js.php:66
+#: localized_js.php:69
 msgid "Saving user..."
 msgstr "Идет сохранение пользователя..."
 
-#: localized_js.php:67
+#: localized_js.php:70
 msgid "Saving filter..."
 msgstr "Идет сохранение фильтра..."
 
-#: localized_js.php:69
+#: localized_js.php:72
 msgid "Please select only one label."
 msgstr "Пожалуйста выберите одну метку."
 
-#: localized_js.php:71 localized_js.php:73
+#: localized_js.php:74 localized_js.php:76
 msgid "Please select only one user."
 msgstr "Пожалуйста выберите одного пользователя."
 
-#: localized_js.php:74
+#: localized_js.php:77
 msgid "Reset password of selected user?"
 msgstr "Сбросить пароль выбранного пользователя?"
 
-#: localized_js.php:75
+#: localized_js.php:78
 msgid "Resetting password for selected user..."
 msgstr "Пароль пользователя сбрасывается..."
 
-#: localized_js.php:77
+#: localized_js.php:80
 msgid "Please select only one feed."
 msgstr "Пожалуйста выберите только один канал."
 
-#: localized_js.php:79
+#: localized_js.php:82
 msgid "Please select only one filter."
 msgstr "Пожалуйста выберите только один фильтр."
 
-#: localized_js.php:81
+#: localized_js.php:84
 msgid "Please select one feed."
 msgstr "Пожалуйста выберите только один канал."
 
-#: localized_js.php:83
+#: localized_js.php:86
 msgid "Please select only one category."
 msgstr "Пожалуйста выберите только одну категорию."
 
-#: localized_js.php:84
+#: localized_js.php:87
 msgid "No OPML file to upload."
 msgstr "Нет файла OPML для загрузки."
 
-#: localized_js.php:85
+#: localized_js.php:88
 msgid "Changing category of selected feeds..."
 msgstr "Идет изменение категории..."
 
-#: localized_js.php:86
+#: localized_js.php:89
 msgid "Reset to defaults?"
 msgstr "Сбросить настройки?"
 
-#: localized_js.php:87
+#: localized_js.php:90
 msgid "Trying to change password..."
 msgstr "Идет сохранение пароля..."
 
-#: localized_js.php:88
+#: localized_js.php:91
 msgid "Trying to change e-mail..."
 msgstr "Идет изменение e-mail..."
 
-#: localized_js.php:89
+#: localized_js.php:92
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
-#: localized_js.php:90
+#: localized_js.php:93
 msgid "Could not update headlines (missing XML object)"
 msgstr ""
 
-#: localized_js.php:91
+#: localized_js.php:94
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:92 tt-rss.php:217 tt-rss.php:221
+#: localized_js.php:95 tt-rss.php:217 tt-rss.php:221
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
-#: localized_js.php:93
+#: localized_js.php:96
 msgid "Replace current publishing address with a new one?"
 msgstr "Изменить текущий адрес публикации на новый?"
 
-#: localized_js.php:94
+#: localized_js.php:97
 msgid "Address changed."
 msgstr "Адрес изменен."
 
-#: localized_js.php:95
+#: localized_js.php:98
 msgid "Could not change address."
 msgstr "Не получилось изменить адрес."
 
-#: localized_js.php:96
+#: localized_js.php:99
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
-#: localized_js.php:97
+#: localized_js.php:100
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь анал."
 
-#: localized_js.php:98
+#: localized_js.php:101
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: localized_js.php:109
+#: localized_js.php:112
 msgid "Can't add filter: nothing to match on."
 msgstr "Не могу создать фильтр:"
 
-#: localized_js.php:110
+#: localized_js.php:113
 msgid "Can't subscribe: no feed URL given."
 msgstr "Не могу подписаться: нет URL"
 
-#: localized_js.php:111
+#: localized_js.php:114
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 
-#: localized_js.php:112
+#: localized_js.php:115
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: localized_js.php:113
+#: localized_js.php:116
 #, fuzzy, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: localized_js.php:114
+#: localized_js.php:117
 #, fuzzy, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: localized_js.php:115
+#: localized_js.php:118
 msgid "Please enter label title:"
 msgstr ""
 
-#: localized_js.php:116
+#: localized_js.php:119
 #, fuzzy
 msgid "Save current configuration?"
 msgstr "Сохранить конфигурацию"
 
-#: localized_js.php:117 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:20
 msgid "Old password cannot be blank."
 msgstr "Старый пароль не может быть пустым."
 
-#: localized_js.php:118 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:25
 msgid "New password cannot be blank."
 msgstr "Новый пароль не может быть пустым."
 
-#: localized_js.php:119 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:30
 msgid "Entered passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: localized_js.php:120
+#: localized_js.php:123
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "Статей не найдено."
 
-#: localized_js.php:121
+#: localized_js.php:124
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: localized_js.php:122
+#: localized_js.php:125
 #, fuzzy
 msgid "No article is selected."
 msgstr "Нет выбранных статей."
 
-#: localized_js.php:123
+#: localized_js.php:126
 #, fuzzy
 msgid "Star article"
 msgstr "Отмеченные"
 
-#: localized_js.php:124
+#: localized_js.php:127
 #, fuzzy
 msgid "Unstar article"
 msgstr "Отмеченные"
 
-#: localized_js.php:125
+#: localized_js.php:128
 #, fuzzy
 msgid "Please wait..."
 msgstr "Идет загрузка..."
 
-#: localized_js.php:126 localized_schema.php:17
+#: localized_js.php:129 localized_schema.php:17
 msgid "Publish article"
 msgstr "Опубликовать"
 
-#: localized_js.php:127
+#: localized_js.php:130
 #, fuzzy
 msgid "Unpublish article"
 msgstr "Опубликовать"
 
-#: localized_js.php:128
+#: localized_js.php:131
 #, fuzzy
 msgid "You can't clear this type of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: localized_js.php:129
+#: localized_js.php:132
 #, fuzzy, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "Помечаю все каналы как прочитанные..."
@@ -897,21 +897,22 @@ msgstr ""
 msgid "Purge unread articles"
 msgstr "Отмеченные"
 
-#: login_form.php:83 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
 msgstr "Пользователь:"
 
-#: login_form.php:85 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
 msgid "Password:"
 msgstr "Пароль:"
 
-#: login_form.php:87
+#: login_form.php:90
 msgid "Language:"
 msgstr "Язык:"
 
-#: login_form.php:100 modules/pref-users.php:215
-msgid "Login"
+#: login_form.php:104
+#, fuzzy
+msgid "Log in"
 msgstr "Пользователь:"
 
 #: mysql_convert_unicode.php:28 update.php:28
@@ -1321,7 +1322,7 @@ msgstr "URL канала:"
 msgid "Category:"
 msgstr "Категория:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:107
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
 #: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr "Подписаться"
@@ -1466,15 +1467,15 @@ msgid ""
 "case you are interested in them too."
 msgstr ""
 
-#: modules/pref-feed-browser.php:93
+#: modules/pref-feed-browser.php:94
 msgid "Top"
 msgstr "Топ"
 
-#: modules/pref-feed-browser.php:102
+#: modules/pref-feed-browser.php:103
 msgid "Show"
 msgstr "Показать"
 
-#: modules/pref-feed-browser.php:152 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
 msgid "No feeds found to subscribe."
 msgstr "Каналы для подписки не найдены."
 
@@ -1882,6 +1883,10 @@ msgstr "Пароль пользователя <b>%s</b> изменен на <b>%
 msgid "Create user"
 msgstr "Добавить пользователя"
 
+#: modules/pref-users.php:215
+msgid "Login"
+msgstr "Пользователь:"
+
 #: modules/pref-users.php:216
 msgid "Access Level"
 msgstr "Уровень доступа:"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index f462a74fd..597f7036e 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 5062f01ea..8d8d8e9de 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: 2007-11-21 23:37+0300\n"
+"POT-Creation-Date: 2007-12-27 19:12+0300\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"
@@ -80,26 +80,26 @@ msgstr "用户"
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:365
+#: backend.php:370
 msgid "Registered"
 msgstr ""
 
-#: backend.php:366
+#: backend.php:371
 #, fuzzy
 msgid "Last logged in"
 msgstr "最后登陆"
 
-#: backend.php:367
+#: backend.php:372
 #, fuzzy
 msgid "Stored articles"
 msgstr "星级文章"
 
-#: backend.php:374
+#: backend.php:379
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "订阅feed:"
 
-#: backend.php:387
+#: backend.php:392
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "订阅feed:"
@@ -160,514 +160,514 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2415 functions.php:2754 functions.php:3116 functions.php:3923
+#: functions.php:2421 functions.php:2760 functions.php:3122 functions.php:3929
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2424 functions.php:2756 functions.php:3118 functions.php:3930
+#: functions.php:2430 functions.php:2762 functions.php:3124 functions.php:3936
 #: modules/pref-feeds.php:1068
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2433 functions.php:2758 functions.php:3120 functions.php:3908
+#: functions.php:2439 functions.php:2764 functions.php:3126 functions.php:3914
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2676 modules/popup-dialog.php:151
+#: functions.php:2682 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2705 functions.php:2744 functions.php:3094 functions.php:4087
-#: functions.php:4117 modules/pref-feeds.php:880
+#: functions.php:2711 functions.php:2750 functions.php:3100 functions.php:4093
+#: functions.php:4123 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2734 functions.php:3260
+#: functions.php:2740 functions.php:3266
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2736 functions.php:3262
+#: functions.php:2742 functions.php:3268
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3080 functions.php:3082
+#: functions.php:3086 functions.php:3088
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:3098 functions.php:3111 functions.php:3128
+#: functions.php:3104 functions.php:3117 functions.php:3134
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3714 functions.php:3761 functions.php:4891
+#: functions.php:3720 functions.php:3767 functions.php:4897
 #: modules/pref-feeds.php:655 modules/pref-feeds.php:842
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3715 functions.php:3762 modules/pref-feeds.php:656
+#: functions.php:3721 functions.php:3768 modules/pref-feeds.php:656
 #: modules/pref-feeds.php:843 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "所有"
 
-#: functions.php:3716 functions.php:3720 functions.php:3763 functions.php:3766
+#: functions.php:3722 functions.php:3726 functions.php:3769 functions.php:3772
 #: tt-rss.php:175
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3717 functions.php:3764 modules/pref-feeds.php:657
+#: functions.php:3723 functions.php:3770 modules/pref-feeds.php:657
 #: modules/pref-feeds.php:844 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "无"
 
-#: functions.php:3719
+#: functions.php:3725
 msgid "Toggle"
 msgstr "触发开关"
 
-#: functions.php:3721 functions.php:3767 tt-rss.php:174
+#: functions.php:3727 functions.php:3773 tt-rss.php:174
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3722
+#: functions.php:3728
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3725 localized_schema.php:15
+#: functions.php:3731 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3726
+#: functions.php:3732
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3727
+#: functions.php:3733
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3729
+#: functions.php:3735
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3730
+#: functions.php:3736
 #, fuzzy
 msgid "Below active article"
 msgstr "过滤文章"
 
-#: functions.php:3732
+#: functions.php:3738
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3740
+#: functions.php:3746
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3741
+#: functions.php:3747
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3742
+#: functions.php:3748
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3752 functions.php:3778
+#: functions.php:3758 functions.php:3784
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3766
+#: functions.php:3772
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3769
+#: functions.php:3775
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3770
+#: functions.php:3776
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3771 modules/pref-filters.php:263
+#: functions.php:3777 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3821
+#: functions.php:3827
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4157
+#: functions.php:4163
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4174
+#: functions.php:4180
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4399
+#: functions.php:4405
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:4454
+#: functions.php:4460
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4485 functions.php:4852
+#: functions.php:4491 functions.php:4858
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4487 functions.php:4854
+#: functions.php:4493 functions.php:4860
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4560
+#: functions.php:4566
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4627
+#: functions.php:4633
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4825
+#: functions.php:4831
 #, fuzzy
 msgid "Show article"
 msgstr "星级文章"
 
-#: functions.php:4954
+#: functions.php:4960
 msgid "No articles found."
 msgstr "未找到文章。"
 
-#: localized_js.php:32
+#: localized_js.php:35
 msgid "display feeds"
 msgstr "显示Feed"
 
-#: localized_js.php:33
+#: localized_js.php:36
 msgid "display tags"
 msgstr "显示标签"
 
-#: localized_js.php:34 prefs.php:131 tt-rss.php:75
+#: localized_js.php:37 prefs.php:131 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "读取中，请等待..."
 
-#: localized_js.php:35
+#: localized_js.php:38
 msgid "All feeds updated."
 msgstr "所有Feed已更新。"
 
-#: localized_js.php:36
+#: localized_js.php:39
 msgid "Marking all feeds as read..."
 msgstr "标记所有Feed未已读..."
 
-#: localized_js.php:37
+#: localized_js.php:40
 msgid "Adding feed..."
 msgstr "添加feed中..."
 
-#: localized_js.php:38
+#: localized_js.php:41
 msgid "Removing feed..."
 msgstr "移除feed中..."
 
-#: localized_js.php:39
+#: localized_js.php:42
 msgid "Saving feed..."
 msgstr "保存feed中..."
 
-#: localized_js.php:40
+#: localized_js.php:43
 msgid "Can't add category: no name specified."
 msgstr "添加分类失败：未指定分类名"
 
-#: localized_js.php:41
+#: localized_js.php:44
 msgid "Adding feed category..."
 msgstr "添加feed分类..."
 
-#: localized_js.php:42 localized_js.php:101
+#: localized_js.php:45 localized_js.php:104
 msgid "Can't add user: no login specified."
 msgstr "添加用户失败：未登录。"
 
-#: localized_js.php:44
+#: localized_js.php:47
 msgid "Adding user..."
 msgstr "添加用户..."
 
-#: localized_js.php:45 localized_js.php:99
+#: localized_js.php:48 localized_js.php:102
 msgid "Can't create label: missing SQL expression."
 msgstr "创建标签失败：缺少或错误的SQL表达式。"
 
-#: localized_js.php:46 localized_js.php:100
+#: localized_js.php:49 localized_js.php:103
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：缺少标题。"
 
-#: localized_js.php:47
+#: localized_js.php:50
 msgid "Remove selected labels?"
 msgstr "移除选定标记?"
 
-#: localized_js.php:48
+#: localized_js.php:51
 msgid "Removing selected labels..."
 msgstr "移除选定标记..."
 
-#: localized_js.php:49 localized_js.php:68 localized_js.php:102
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105
 msgid "No labels are selected."
 msgstr "未选定标记."
 
-#: localized_js.php:50
+#: localized_js.php:53
 msgid "Remove selected users?"
 msgstr "移除选定用户?"
 
-#: localized_js.php:51
+#: localized_js.php:54
 msgid "Removing selected users..."
 msgstr "移除选定用户..."
 
-#: localized_js.php:52 localized_js.php:70 localized_js.php:72
-#: localized_js.php:103
+#: localized_js.php:55 localized_js.php:73 localized_js.php:75
+#: localized_js.php:106
 msgid "No users are selected."
 msgstr "未选定用户."
 
-#: localized_js.php:53
+#: localized_js.php:56
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: localized_js.php:54
+#: localized_js.php:57
 msgid "Removing selected filters..."
 msgstr "移除选定的过滤器..."
 
-#: localized_js.php:55 localized_js.php:78 localized_js.php:104
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107
 msgid "No filters are selected."
 msgstr "未选定过滤器。"
 
-#: localized_js.php:56
+#: localized_js.php:59
 msgid "Unsubscribe from selected feeds?"
 msgstr "退订选定feed?"
 
-#: localized_js.php:57
+#: localized_js.php:60
 msgid "Unsubscribing from selected feeds..."
 msgstr "退订选定feed..."
 
-#: localized_js.php:58 localized_js.php:76 localized_js.php:80
-#: localized_js.php:105 localized_js.php:108
+#: 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 "未选择feed."
 
-#: localized_js.php:59
+#: localized_js.php:62
 msgid "Remove selected categories?"
 msgstr "移除选定分类?"
 
-#: localized_js.php:60
+#: localized_js.php:63
 msgid "Removing selected categories..."
 msgstr "移除选定分类..."
 
-#: localized_js.php:61 localized_js.php:82 localized_js.php:106
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109
 msgid "No categories are selected."
 msgstr "未选定分类。"
 
-#: localized_js.php:62
+#: localized_js.php:65
 msgid "Saving category..."
 msgstr "保存分类..."
 
-#: localized_js.php:63
+#: localized_js.php:66
 msgid "Loading help..."
 msgstr "读取帮助..."
 
-#: localized_js.php:64
+#: localized_js.php:67
 msgid "Saving label..."
 msgstr "保存标记..."
 
-#: localized_js.php:65 localized_js.php:107
+#: localized_js.php:68 localized_js.php:110
 msgid "Login field cannot be blank."
 msgstr "登陆框不能留空。"
 
-#: localized_js.php:66
+#: localized_js.php:69
 msgid "Saving user..."
 msgstr "保存用户..."
 
-#: localized_js.php:67
+#: localized_js.php:70
 msgid "Saving filter..."
 msgstr "保存过滤器..."
 
-#: localized_js.php:69
+#: localized_js.php:72
 msgid "Please select only one label."
 msgstr "请只选择一个标记."
 
-#: localized_js.php:71 localized_js.php:73
+#: localized_js.php:74 localized_js.php:76
 msgid "Please select only one user."
 msgstr "请只选择一个用户."
 
-#: localized_js.php:74
+#: localized_js.php:77
 msgid "Reset password of selected user?"
 msgstr "重置选定用户密码?"
 
-#: localized_js.php:75
+#: localized_js.php:78
 msgid "Resetting password for selected user..."
 msgstr "重置选定用户密码..."
 
-#: localized_js.php:77
+#: localized_js.php:80
 msgid "Please select only one feed."
 msgstr "请只选择一个feed."
 
-#: localized_js.php:79
+#: localized_js.php:82
 msgid "Please select only one filter."
 msgstr "请只选择一个过滤器."
 
-#: localized_js.php:81
+#: localized_js.php:84
 msgid "Please select one feed."
 msgstr "请只选择一个feed."
 
-#: localized_js.php:83
+#: localized_js.php:86
 msgid "Please select only one category."
 msgstr "请只选择一个分类."
 
-#: localized_js.php:84
+#: localized_js.php:87
 msgid "No OPML file to upload."
 msgstr "无OPML文件上传."
 
-#: localized_js.php:85
+#: localized_js.php:88
 msgid "Changing category of selected feeds..."
 msgstr "改变选定feed所属分类..."
 
-#: localized_js.php:86
+#: localized_js.php:89
 msgid "Reset to defaults?"
 msgstr "重置默认项？"
 
-#: localized_js.php:87
+#: localized_js.php:90
 msgid "Trying to change password..."
 msgstr "尝试更改密码..."
 
-#: localized_js.php:88
+#: localized_js.php:91
 msgid "Trying to change e-mail..."
 msgstr "尝试更改e-mail..."
 
-#: localized_js.php:89
+#: localized_js.php:92
 msgid "No articles are selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:90
+#: localized_js.php:93
 msgid "Could not update headlines (missing XML object)"
 msgstr "更新提要失败（缺少XML支持）"
 
-#: localized_js.php:91
+#: localized_js.php:94
 msgid "Could not display article (missing XML object)"
 msgstr "显示条目失败（缺少XML支持）"
 
-#: localized_js.php:92 tt-rss.php:217 tt-rss.php:221
+#: localized_js.php:95 tt-rss.php:217 tt-rss.php:221
 msgid "No feed selected."
 msgstr "无选定feed."
 
-#: localized_js.php:93
+#: localized_js.php:96
 msgid "Replace current publishing address with a new one?"
 msgstr "使用新地址替换当前地址？"
 
-#: localized_js.php:94
+#: localized_js.php:97
 msgid "Address changed."
 msgstr "地址已经变更"
 
-#: localized_js.php:95
+#: localized_js.php:98
 msgid "Could not change address."
 msgstr "未能更新地址"
 
-#: localized_js.php:96
+#: localized_js.php:99
 msgid "You can't unsubscribe from the category."
 msgstr "您不能从分类中取消订阅。"
 
-#: localized_js.php:97
+#: localized_js.php:100
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: localized_js.php:98
+#: localized_js.php:101
 msgid "You can't edit this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:109
+#: localized_js.php:112
 msgid "Can't add filter: nothing to match on."
 msgstr "未能添加过滤：无匹配。"
 
-#: localized_js.php:110
+#: localized_js.php:113
 msgid "Can't subscribe: no feed URL given."
 msgstr "未能订阅：无 feed URL。"
 
-#: localized_js.php:111
+#: localized_js.php:114
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "退订%s?"
 
-#: localized_js.php:112
+#: localized_js.php:115
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:113
+#: localized_js.php:116
 #, fuzzy, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:114
+#: localized_js.php:117
 #, fuzzy, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:115
+#: localized_js.php:118
 msgid "Please enter label title:"
 msgstr "请输入标签主题"
 
-#: localized_js.php:116
+#: localized_js.php:119
 #, fuzzy
 msgid "Save current configuration?"
 msgstr "保存设置"
 
-#: localized_js.php:117 modules/pref-prefs.php:20
+#: localized_js.php:120 modules/pref-prefs.php:20
 msgid "Old password cannot be blank."
 msgstr "原密码不可留空."
 
-#: localized_js.php:118 modules/pref-prefs.php:25
+#: localized_js.php:121 modules/pref-prefs.php:25
 msgid "New password cannot be blank."
 msgstr "新密码不可留空."
 
-#: localized_js.php:119 modules/pref-prefs.php:30
+#: localized_js.php:122 modules/pref-prefs.php:30
 msgid "Entered passwords do not match."
 msgstr "两次输入密码不通."
 
-#: localized_js.php:120
+#: localized_js.php:123
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "未找到文章。"
 
-#: localized_js.php:121
+#: localized_js.php:124
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:122
+#: localized_js.php:125
 #, fuzzy
 msgid "No article is selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:123
+#: localized_js.php:126
 #, fuzzy
 msgid "Star article"
 msgstr "星级文章"
 
-#: localized_js.php:124
+#: localized_js.php:127
 #, fuzzy
 msgid "Unstar article"
 msgstr "星级文章"
 
-#: localized_js.php:125
+#: localized_js.php:128
 #, fuzzy
 msgid "Please wait..."
 msgstr "读取中，请等待..."
 
-#: localized_js.php:126 localized_schema.php:17
+#: localized_js.php:129 localized_schema.php:17
 msgid "Publish article"
 msgstr "发布文章"
 
-#: localized_js.php:127
+#: localized_js.php:130
 #, fuzzy
 msgid "Unpublish article"
 msgstr "发布文章"
 
-#: localized_js.php:128
+#: localized_js.php:131
 #, fuzzy
 msgid "You can't clear this type of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:129
+#: localized_js.php:132
 #, fuzzy, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "标记  %s 中所有访问过的主题为已读"
@@ -895,21 +895,22 @@ msgstr ""
 msgid "Purge unread articles"
 msgstr "星级文章"
 
-#: login_form.php:83 modules/popup-dialog.php:100 modules/pref-feeds.php:264
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
 msgstr "登陆:"
 
-#: login_form.php:85 modules/popup-dialog.php:101 modules/pref-feeds.php:270
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:270
 msgid "Password:"
 msgstr "密码:"
 
-#: login_form.php:87
+#: login_form.php:90
 msgid "Language:"
 msgstr "语言："
 
-#: login_form.php:100 modules/pref-users.php:215
-msgid "Login"
+#: login_form.php:104
+#, fuzzy
+msgid "Log in"
 msgstr "登陆"
 
 #: mysql_convert_unicode.php:28 update.php:28
@@ -1334,7 +1335,7 @@ msgstr "Feed URL:"
 msgid "Category:"
 msgstr "分类:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:107
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:108
 #: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr "订阅"
@@ -1479,15 +1480,15 @@ msgid ""
 "case you are interested in them too."
 msgstr "本控制面板显示系统其他用户订阅的feed，如果您感兴趣。"
 
-#: modules/pref-feed-browser.php:93
+#: modules/pref-feed-browser.php:94
 msgid "Top"
 msgstr "Top"
 
-#: modules/pref-feed-browser.php:102
+#: modules/pref-feed-browser.php:103
 msgid "Show"
 msgstr "显示"
 
-#: modules/pref-feed-browser.php:152 modules/pref-feeds.php:111
+#: modules/pref-feed-browser.php:153 modules/pref-feeds.php:111
 msgid "No feeds found to subscribe."
 msgstr "无feed可订阅。"
 
@@ -1898,6 +1899,10 @@ msgstr ""
 msgid "Create user"
 msgstr "创建用户"
 
+#: modules/pref-users.php:215
+msgid "Login"
+msgstr "登陆"
+
 #: modules/pref-users.php:216
 msgid "Access Level"
 msgstr "等级:"