From b2f8a550f8bf8b8abf626c729242488115186e38 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Mon, 1 Sep 2008 04:25:51 +0100
Subject: [PATCH] update nb_NO translation

---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 36169 -> 36169 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 116 +++++++------
 locale/hu_HU/LC_MESSAGES/messages.mo | Bin 11523 -> 11523 bytes
 locale/hu_HU/LC_MESSAGES/messages.po | 116 +++++++------
 locale/nb_NO/LC_MESSAGES/messages.mo | Bin 38314 -> 41155 bytes
 locale/nb_NO/LC_MESSAGES/messages.po | 244 +++++++++++++--------------
 locale/pt_BR/LC_MESSAGES/messages.mo | Bin 12587 -> 12587 bytes
 locale/pt_BR/LC_MESSAGES/messages.po | 116 +++++++------
 locale/ru_RU/LC_MESSAGES/messages.mo | Bin 23758 -> 23758 bytes
 locale/ru_RU/LC_MESSAGES/messages.po | 116 +++++++------
 locale/zh_CN/LC_MESSAGES/messages.mo | Bin 26047 -> 26047 bytes
 locale/zh_CN/LC_MESSAGES/messages.po | 116 +++++++------
 12 files changed, 429 insertions(+), 395 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index e89bc97a846a6a18583ebe0e550d27b8d66ebd73..8fecd1a2883fc698d7e703c98a9796a6a7bea15a 100644
GIT binary patch
delta 25
gcmX>(i|OPnrVS!~T$Z{9h6;v;Rz{|q<@~hm0d5=zS^xk5

delta 25
gcmX>(i|OPnrVS!~To$@U77B(YRz`-K<@~hm0d9T=VE_OC

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 4938c913..c2057be1 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-28 14:21+0400\n"
+"POT-Creation-Date: 2008-09-01 11:25+0400\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -106,23 +106,23 @@ msgstr ""
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: backend.php:424 modules/pref-users.php:311
+#: backend.php:449 modules/pref-users.php:311
 msgid "Registered"
 msgstr "Abonné"
 
-#: backend.php:425
+#: backend.php:450
 msgid "Last logged in"
 msgstr "Dernière connexion"
 
-#: backend.php:426
+#: backend.php:451
 msgid "Stored articles"
 msgstr "Articles mémorisés"
 
-#: backend.php:433
+#: backend.php:458
 msgid "Subscribed feeds count"
 msgstr "Nombre d'abonnements à des flux"
 
-#: backend.php:448
+#: backend.php:473
 msgid "Subscribed feeds"
 msgstr "Abonnements à des flux"
 
@@ -188,16 +188,16 @@ 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:2570 functions.php:2934 functions.php:3310 functions.php:4165
+#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4171
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4172
+#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4178
 #: modules/pref-feeds.php:1158
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4150
+#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4156
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
@@ -206,8 +206,8 @@ msgstr "Nouveaux articles"
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4326
-#: functions.php:4356 modules/pref-feeds.php:989
+#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4332
+#: functions.php:4362 modules/pref-feeds.php:989
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -228,7 +228,7 @@ msgstr "Résultats de recherche"
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3948 functions.php:3998 functions.php:5249
+#: functions.php:3948 functions.php:3998 functions.php:5255
 #: modules/pref-feeds.php:770 modules/pref-feeds.php:951
 #: modules/pref-filters.php:309 modules/pref-labels.php:275
 #: modules/pref-users.php:302
@@ -242,7 +242,7 @@ msgid "All"
 msgstr "Tout"
 
 #: functions.php:3950 functions.php:3956 functions.php:4000 functions.php:4003
-#: tt-rss.php:191
+#: tt-rss.php:192
 msgid "Unread"
 msgstr "Non lus"
 
@@ -266,7 +266,7 @@ msgstr "Actions..."
 msgid "Selection toggle:"
 msgstr "Sélection&nbsp;:"
 
-#: functions.php:3957 functions.php:4004 tt-rss.php:190
+#: functions.php:3957 functions.php:4004 tt-rss.php:191
 msgid "Starred"
 msgstr "Remarquables"
 
@@ -316,53 +316,53 @@ msgstr "Convertir en intitulé"
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:4100
+#: functions.php:4106
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4138
+#: functions.php:4144
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4376
+#: functions.php:4382
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:4393
+#: functions.php:4399
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4619
+#: functions.php:4625
 #, fuzzy
 msgid " - "
 msgstr "- par "
 
-#: functions.php:4674
+#: functions.php:4680
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4705 functions.php:5199
+#: functions.php:4711 functions.php:5205
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4707 functions.php:5201
+#: functions.php:4713 functions.php:5207
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4717 functions.php:5210
+#: functions.php:4723 functions.php:5216
 #, fuzzy
 msgid "unknown type"
 msgstr "Erreur inconnue"
 
-#: functions.php:4723 functions.php:5216
+#: functions.php:4729 functions.php:5222
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4799 modules/pref-feed-browser.php:75
+#: functions.php:4805 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4868
+#: functions.php:4874
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -370,76 +370,76 @@ 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:4981
+#: functions.php:4987
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5179
+#: functions.php:5185
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Articles mémorisés"
 
-#: functions.php:5316
+#: functions.php:5322
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5319
+#: functions.php:5325
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5322
+#: functions.php:5328
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5688
+#: functions.php:5694
 #, fuzzy
 msgid "Match "
 msgstr "Correspondance"
 
-#: functions.php:5696
+#: functions.php:5702
 #, fuzzy
 msgid "Unread articles"
 msgstr "Articles mémorisés"
 
-#: functions.php:5697
+#: functions.php:5703
 #, fuzzy
 msgid "Updated articles"
 msgstr "Articles mémorisés"
 
-#: functions.php:5698
+#: functions.php:5704
 #, fuzzy
 msgid "Title contains"
 msgstr "Titre ou contenu"
 
-#: functions.php:5699
+#: functions.php:5705
 #, fuzzy
 msgid "Content contains"
 msgstr "Filtrage de contenu"
 
-#: functions.php:5700
+#: functions.php:5706
 msgid "Score equals"
 msgstr ""
 
-#: functions.php:5701
+#: functions.php:5707
 msgid "Score is greater than"
 msgstr ""
 
-#: functions.php:5702
+#: functions.php:5708
 msgid "Score is less than"
 msgstr ""
 
-#: functions.php:5703
+#: functions.php:5709
 msgid "Articles newer than X hours"
 msgstr ""
 
-#: functions.php:5704
+#: functions.php:5710
 msgid "Articles newer than X days"
 msgstr ""
 
-#: functions.php:5713
+#: functions.php:5719
 msgid "Add"
 msgstr ""
 
@@ -649,7 +649,7 @@ msgstr "Impossible de mettre à jour l'en-têtes (objet XML manquant)"
 msgid "Could not display article (missing XML object)"
 msgstr "Impossible d'afficher l'article (objet XML manquant)"
 
-#: localized_js.php:95 tt-rss.php:233 tt-rss.php:246
+#: localized_js.php:95 tt-rss.php:234 tt-rss.php:247
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
@@ -806,6 +806,11 @@ msgstr "Articles mémorisés"
 msgid "Rescoring articles..."
 msgstr "Articles mémorisés"
 
+#: localized_js.php:141
+#, fuzzy
+msgid "Reset category order?"
+msgstr "Supprimer les catégories sélectionnées ?"
+
 #: localized_schema.php:9 modules/popup-dialog.php:165
 #: modules/pref-feeds.php:964 modules/pref-feeds.php:1025
 msgid "Title"
@@ -1407,45 +1412,50 @@ msgstr "&nbsp;&nbsp;Créer un filtre"
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;S'inscrire à ce flux"
 
-#: tt-rss.php:161
+#: tt-rss.php:160
+#, fuzzy
+msgid "&nbsp;&nbsp;Reset category order"
+msgstr "&nbsp;&nbsp;S'inscrire à ce flux"
+
+#: tt-rss.php:162
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Purger les articles"
 
-#: tt-rss.php:169
+#: tt-rss.php:170
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:179
+#: tt-rss.php:180
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
-#: tt-rss.php:186
+#: tt-rss.php:187
 msgid "View:"
 msgstr "Afficher&nbsp;:"
 
-#: tt-rss.php:188
+#: tt-rss.php:189
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: tt-rss.php:189
+#: tt-rss.php:190
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: tt-rss.php:194
+#: tt-rss.php:195
 msgid "Limit:"
 msgstr "Limite&nbsp;:"
 
-#: tt-rss.php:219 modules/pref-feeds.php:251
+#: tt-rss.php:220 modules/pref-feeds.php:251
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: tt-rss.php:237
+#: tt-rss.php:238
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index a911b347f441c99372e05592cccdb3d921f533d6..14f7e18e3faff1d61e1a00d63d5821cb110c62a2 100644
GIT binary patch
delta 23
ecmZpUYL41qEX!r7Yhb8gXlP|*y4hCt7(W0~?*@?o

delta 23
ecmZpUYL41qEX!q~Yh<BdXkuk#xY<_r7(W10Q3jX*

diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 1912951f..9900ad2a 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.2.19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-28 14:21+0400\n"
+"POT-Creation-Date: 2008-09-01 11:25+0400\n"
 "PO-Revision-Date: 2008-02-03 22:22::+0100\n"
 "Last-Translator: MiszterX <miszterx@miszterx.hu>\n"
 "Language-Team: HUNGARIAN <miszterx@miszterx.hu>\n"
@@ -106,23 +106,23 @@ msgstr ""
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: backend.php:424 modules/pref-users.php:311
+#: backend.php:449 modules/pref-users.php:311
 msgid "Registered"
 msgstr "Regisztrált"
 
-#: backend.php:425
+#: backend.php:450
 msgid "Last logged in"
 msgstr "Utolsó belépés"
 
-#: backend.php:426
+#: backend.php:451
 msgid "Stored articles"
 msgstr "Tárolt hírek"
 
-#: backend.php:433
+#: backend.php:458
 msgid "Subscribed feeds count"
 msgstr ""
 
-#: backend.php:448
+#: backend.php:473
 msgid "Subscribed feeds"
 msgstr "Feliratkozott feedek"
 
@@ -180,16 +180,16 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4165
+#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4171
 msgid "Starred articles"
 msgstr "Csillagost hírek"
 
-#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4172
+#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4178
 #: modules/pref-feeds.php:1158
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4150
+#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4156
 msgid "Fresh articles"
 msgstr "Olvasatlan hírek"
 
@@ -198,8 +198,8 @@ msgstr "Olvasatlan hírek"
 msgid "All feeds"
 msgstr "Minden feed"
 
-#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4326
-#: functions.php:4356 modules/pref-feeds.php:989
+#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4332
+#: functions.php:4362 modules/pref-feeds.php:989
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
@@ -220,7 +220,7 @@ msgstr "Keresési találatok"
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3948 functions.php:3998 functions.php:5249
+#: functions.php:3948 functions.php:3998 functions.php:5255
 #: modules/pref-feeds.php:770 modules/pref-feeds.php:951
 #: modules/pref-filters.php:309 modules/pref-labels.php:275
 #: modules/pref-users.php:302
@@ -234,7 +234,7 @@ msgid "All"
 msgstr "Mind"
 
 #: functions.php:3950 functions.php:3956 functions.php:4000 functions.php:4003
-#: tt-rss.php:191
+#: tt-rss.php:192
 msgid "Unread"
 msgstr "Olvasatlan"
 
@@ -258,7 +258,7 @@ msgstr "Műveletek"
 msgid "Selection toggle:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3957 functions.php:4004 tt-rss.php:190
+#: functions.php:3957 functions.php:4004 tt-rss.php:191
 msgid "Starred"
 msgstr "Csillagoz"
 
@@ -308,127 +308,127 @@ msgstr ""
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4100
+#: functions.php:4106
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4138
+#: functions.php:4144
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4376
+#: functions.php:4382
 msgid "No feeds to display."
 msgstr ""
 
-#: functions.php:4393
+#: functions.php:4399
 msgid "Tags"
 msgstr ""
 
-#: functions.php:4619
+#: functions.php:4625
 msgid " - "
 msgstr ""
 
-#: functions.php:4674
+#: functions.php:4680
 msgid "no tags"
 msgstr ""
 
-#: functions.php:4705 functions.php:5199
+#: functions.php:4711 functions.php:5205
 msgid "Attachment:"
 msgstr "Csatolmány:"
 
-#: functions.php:4707 functions.php:5201
+#: functions.php:4713 functions.php:5207
 msgid "Attachments:"
 msgstr "Csatolmányok:"
 
-#: functions.php:4717 functions.php:5210
+#: functions.php:4723 functions.php:5216
 #, fuzzy
 msgid "unknown type"
 msgstr "Ismeretlen hiba"
 
-#: functions.php:4723 functions.php:5216
+#: functions.php:4729 functions.php:5222
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4799 modules/pref-feed-browser.php:75
+#: functions.php:4805 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Feed nem található"
 
-#: functions.php:4868
+#: functions.php:4874
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4981
+#: functions.php:4987
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5179
+#: functions.php:5185
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Tárolt hírek"
 
-#: functions.php:5316
+#: functions.php:5322
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5319
+#: functions.php:5325
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5322
+#: functions.php:5328
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5688
+#: functions.php:5694
 #, fuzzy
 msgid "Match "
 msgstr "Egyezés"
 
-#: functions.php:5696
+#: functions.php:5702
 #, fuzzy
 msgid "Unread articles"
 msgstr "Tárolt hírek"
 
-#: functions.php:5697
+#: functions.php:5703
 #, fuzzy
 msgid "Updated articles"
 msgstr "Tárolt hírek"
 
-#: functions.php:5698
+#: functions.php:5704
 #, fuzzy
 msgid "Title contains"
 msgstr "Cím vagy tartalom"
 
-#: functions.php:5699
+#: functions.php:5705
 #, fuzzy
 msgid "Content contains"
 msgstr "Tartalomszűrő"
 
-#: functions.php:5700
+#: functions.php:5706
 msgid "Score equals"
 msgstr ""
 
-#: functions.php:5701
+#: functions.php:5707
 msgid "Score is greater than"
 msgstr ""
 
-#: functions.php:5702
+#: functions.php:5708
 msgid "Score is less than"
 msgstr ""
 
-#: functions.php:5703
+#: functions.php:5709
 msgid "Articles newer than X hours"
 msgstr ""
 
-#: functions.php:5704
+#: functions.php:5710
 msgid "Articles newer than X days"
 msgstr ""
 
-#: functions.php:5713
+#: functions.php:5719
 msgid "Add"
 msgstr ""
 
@@ -638,7 +638,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:233 tt-rss.php:246
+#: localized_js.php:95 tt-rss.php:234 tt-rss.php:247
 msgid "No feed selected."
 msgstr ""
 
@@ -793,6 +793,11 @@ msgstr "Tárolt hírek"
 msgid "Rescoring articles..."
 msgstr "Tárolt hírek"
 
+#: localized_js.php:141
+#, fuzzy
+msgid "Reset category order?"
+msgstr "Kiválasztott kategória eltávolítása?"
+
 #: localized_schema.php:9 modules/popup-dialog.php:165
 #: modules/pref-feeds.php:964 modules/pref-feeds.php:1025
 msgid "Title"
@@ -1324,45 +1329,50 @@ msgstr "&nbsp;&nbsp;Szűrők létrehozása"
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
 
-#: tt-rss.php:161
+#: tt-rss.php:160
+#, fuzzy
+msgid "&nbsp;&nbsp;Reset category order"
+msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
+
+#: tt-rss.php:162
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Hírek törlése"
 
-#: tt-rss.php:169
+#: tt-rss.php:170
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Minden feed"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:179
+#: tt-rss.php:180
 msgid "Search:"
 msgstr "Keresés"
 
-#: tt-rss.php:186
+#: tt-rss.php:187
 msgid "View:"
 msgstr "Nézet"
 
-#: tt-rss.php:188
+#: tt-rss.php:189
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:189
+#: tt-rss.php:190
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: tt-rss.php:194
+#: tt-rss.php:195
 msgid "Limit:"
 msgstr "Limit:"
 
-#: tt-rss.php:219 modules/pref-feeds.php:251
+#: tt-rss.php:220 modules/pref-feeds.php:251
 msgid "Update"
 msgstr "Frissítés"
 
-#: tt-rss.php:237
+#: tt-rss.php:238
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 189d8de436a048ed5f1949c399b2169fecc45877..c1d09d69816c5dad12227d996db7cd5d73f8b583 100644
GIT binary patch
delta 12591
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
I-p;Z97ZuaUPyhe`

delta 10077
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
F{ujlr{GR{-

diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index c2007990..0498821d 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.2.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-28 14:21+0400\n"
-"PO-Revision-Date: 2008-05-26 22:15+0100\n"
+"POT-Creation-Date: 2008-09-01 11:25+0400\n"
+"PO-Revision-Date: 2008-08-31 19:39+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
 "MIME-Version: 1.0\n"
@@ -44,9 +44,8 @@ msgid "3 months old"
 msgstr "3 måneder gammel"
 
 #: backend.php:117
-#, fuzzy
 msgid "Default interval"
-msgstr "Oppdateringsintervall:"
+msgstr "Standard intervall:"
 
 #: backend.php:118
 msgid "Disable updates"
@@ -104,23 +103,23 @@ msgstr "Superbruker"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:424 modules/pref-users.php:311
+#: backend.php:449 modules/pref-users.php:311
 msgid "Registered"
 msgstr "Registrert"
 
-#: backend.php:425
+#: backend.php:450
 msgid "Last logged in"
 msgstr "Sist innlogget"
 
-#: backend.php:426
+#: backend.php:451
 msgid "Stored articles"
 msgstr "Lagrede artikler"
 
-#: backend.php:433
+#: backend.php:458
 msgid "Subscribed feeds count"
 msgstr "Antall nyhetsstrømmer som abonneres på"
 
-#: backend.php:448
+#: backend.php:473
 msgid "Subscribed feeds"
 msgstr "Nyhetsstrømmer som abonneres på"
 
@@ -185,16 +184,16 @@ msgstr ""
 "Din utgave av MySQL er i øyeblikket ikke støttet. Vennligst besøk den \n"
 "\t\toffisielle siden for mer informasjon."
 
-#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4165
+#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4171
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4172
+#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4178
 #: modules/pref-feeds.php:1158
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4150
+#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4156
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
@@ -203,8 +202,8 @@ msgstr "Ferske artikler"
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4326
-#: functions.php:4356 modules/pref-feeds.php:989
+#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4332
+#: functions.php:4362 modules/pref-feeds.php:989
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
@@ -225,7 +224,7 @@ msgstr "Søkeresultat"
 msgid "Searched for"
 msgstr "Søkte etter"
 
-#: functions.php:3948 functions.php:3998 functions.php:5249
+#: functions.php:3948 functions.php:3998 functions.php:5255
 #: modules/pref-feeds.php:770 modules/pref-feeds.php:951
 #: modules/pref-filters.php:309 modules/pref-labels.php:275
 #: modules/pref-users.php:302
@@ -239,14 +238,13 @@ msgid "All"
 msgstr "Alle"
 
 #: functions.php:3950 functions.php:3956 functions.php:4000 functions.php:4003
-#: tt-rss.php:191
+#: tt-rss.php:192
 msgid "Unread"
 msgstr "Ulest"
 
 #: functions.php:3951
-#, fuzzy
 msgid "Invert"
-msgstr "(Motsatt)"
+msgstr "Motsatt"
 
 #: functions.php:3952 functions.php:4001 modules/pref-feeds.php:772
 #: modules/pref-feeds.php:953 modules/pref-filters.php:311
@@ -262,7 +260,7 @@ msgstr "Handlinger..."
 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
 
-#: functions.php:3957 functions.php:4004 tt-rss.php:190
+#: functions.php:3957 functions.php:4004 tt-rss.php:191
 msgid "Starred"
 msgstr "Favoritter"
 
@@ -311,51 +309,51 @@ msgstr "Konverter til merkelapp"
 msgid "Generated feed"
 msgstr "Generert nyhetsstrøm"
 
-#: functions.php:4100
+#: functions.php:4106
 msgid "Click to collapse category"
-msgstr ""
+msgstr "Velg for å slå sammen kategorien"
 
-#: functions.php:4138
+#: functions.php:4144
 msgid "Dashboard"
 msgstr "Skrivebord"
 
-#: functions.php:4376
+#: functions.php:4382
 msgid "No feeds to display."
 msgstr "Ingen nyhetstrømmer å vise"
 
-#: functions.php:4393
+#: functions.php:4399
 msgid "Tags"
 msgstr "Tagger"
 
-#: functions.php:4619
+#: functions.php:4625
 msgid " - "
 msgstr "-"
 
-#: functions.php:4674
+#: functions.php:4680
 msgid "no tags"
 msgstr "Ingen tagger"
 
-#: functions.php:4705 functions.php:5199
+#: functions.php:4711 functions.php:5205
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: functions.php:4707 functions.php:5201
+#: functions.php:4713 functions.php:5207
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: functions.php:4717 functions.php:5210
+#: functions.php:4723 functions.php:5216
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: functions.php:4723 functions.php:5216
+#: functions.php:4729 functions.php:5222
 msgid "audio/mpeg"
-msgstr ""
+msgstr "Lyd/mpeg"
 
-#: functions.php:4799 modules/pref-feed-browser.php:75
+#: functions.php:4805 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: functions.php:4868
+#: functions.php:4874
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -363,74 +361,69 @@ msgstr ""
 "Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
 "merkelappsyntaksen eller lokal konfigurasjon."
 
-#: functions.php:4981
+#: functions.php:4987
 msgid "(Click to change)"
 msgstr "(Trykk for å endre)"
 
-#: functions.php:5179
+#: functions.php:5185
 msgid "Click to expand article"
 msgstr "Trykk for å utvide artikkel"
 
-#: functions.php:5316
+#: functions.php:5322
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: functions.php:5319
+#: functions.php:5325
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: functions.php:5322
+#: functions.php:5328
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: functions.php:5688
-#, fuzzy
+#: functions.php:5694
 msgid "Match "
 msgstr "Match"
 
-#: functions.php:5696
-#, fuzzy
+#: functions.php:5702
 msgid "Unread articles"
-msgstr "Lagrede artikler"
+msgstr "Uleste artikler"
 
-#: functions.php:5697
-#, fuzzy
+#: functions.php:5703
 msgid "Updated articles"
-msgstr "Lagrede artikler"
+msgstr "Oppdaterte artikler"
 
-#: functions.php:5698
-#, fuzzy
+#: functions.php:5704
 msgid "Title contains"
-msgstr "Tittel eller innhold"
+msgstr "Tittel inneholder"
 
-#: functions.php:5699
-#, fuzzy
+#: functions.php:5705
 msgid "Content contains"
-msgstr "Innholdsfilter"
+msgstr "Innholdet inneholder"
 
-#: functions.php:5700
+#: functions.php:5706
 msgid "Score equals"
-msgstr ""
+msgstr "Poeng er lik"
 
-#: functions.php:5701
+#: functions.php:5707
 msgid "Score is greater than"
-msgstr ""
+msgstr "Fler poeng enn"
 
-#: functions.php:5702
+#: functions.php:5708
 msgid "Score is less than"
-msgstr ""
+msgstr "Færre poeng enn"
 
-#: functions.php:5703
+#: functions.php:5709
 msgid "Articles newer than X hours"
-msgstr ""
+msgstr "Artikler nyere enn X timer"
 
-#: functions.php:5704
+#: functions.php:5710
 msgid "Articles newer than X days"
-msgstr ""
+msgstr "Artikler nyere enn X dager"
 
-#: functions.php:5713
+#: functions.php:5719
 msgid "Add"
-msgstr ""
+msgstr "Legg til"
 
 #: localized_js.php:35
 msgid "display feeds"
@@ -638,7 +631,7 @@ msgstr "Kunne ikke oppdatere overskriftene (manglende XML objekt)."
 msgid "Could not display article (missing XML object)"
 msgstr "Kunne ikke vise artikkelen (manglende XML objekt)."
 
-#: localized_js.php:95 tt-rss.php:233 tt-rss.php:246
+#: localized_js.php:95 tt-rss.php:234 tt-rss.php:247
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
@@ -790,6 +783,10 @@ msgstr "Endre poengene for artiklene i %s?"
 msgid "Rescoring articles..."
 msgstr "Endrer poengsummen for artiklene..."
 
+#: localized_js.php:141
+msgid "Reset category order?"
+msgstr "Tilbakestill kategorirekkefølgen?"
+
 #: localized_schema.php:9 modules/popup-dialog.php:165
 #: modules/pref-feeds.php:964 modules/pref-feeds.php:1025
 msgid "Title"
@@ -1005,9 +1002,8 @@ msgid "Confirm marking feed as read"
 msgstr "Bekreft markeringen av nyhetsstrøm som lest"
 
 #: localized_schema.php:62
-#, fuzzy
 msgid "Enable feed icons"
-msgstr "Tillatt kategorisering av nyhetsstrømmer"
+msgstr "Bruk nyhetsstrømsikoner"
 
 #: localized_schema.php:63
 msgid "Enable labels"
@@ -1066,19 +1062,22 @@ msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
 #: localized_schema.php:75
 msgid "Prefer more accurate feedlist counters to UI speed"
 msgstr ""
+"Foretrekk en mer treffsikker nyhetsstrømsliste i motsetning til hastighet på "
+"brukergrensesnittet."
 
 #: localized_schema.php:76
 msgid "Enable inline MP3 player"
-msgstr ""
+msgstr "Skru på den innebygde MP3-spilleren"
 
 #: localized_schema.php:77
 msgid ""
 "Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
 msgstr ""
+"Bruk den flashbaserte XSPF spilleren for å spille MP3-formaterte podcaster."
 
 #: localized_schema.php:78
 msgid "Do not show images in articles"
-msgstr ""
+msgstr "Ikke vis bilder i artiklene"
 
 #: login_form.php:103 modules/popup-dialog.php:107 modules/pref-feeds.php:285
 msgid "Login:"
@@ -1098,7 +1097,7 @@ msgstr "Logg inn"
 
 #: login_form.php:142
 msgid "Limit bandwidth usage"
-msgstr ""
+msgstr "Begrens båndbreddebruken"
 
 #: mysql_convert_unicode.php:28 update.php:28
 msgid "Your access level is insufficient to run this script."
@@ -1279,7 +1278,7 @@ msgstr "config: SESSION_EXPIRE_TIME er for lav (mindre enn 60)"
 #, fuzzy
 msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
 msgstr ""
-"Konfigurer: SESSION_EXPIRE_TIME må være høyere eller lavere enn "
+"Konfigurer: SESSION_EXPIRE_TIME må være høyere eller lik "
 "SESSION_COOKIE_LIFETIME"
 
 #: sanity_check.php:62
@@ -1377,43 +1376,47 @@ msgstr "&nbsp;&nbsp;Lag filter"
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Tilbakestill de grafiske instillingene"
 
-#: tt-rss.php:161
+#: tt-rss.php:160
+msgid "&nbsp;&nbsp;Reset category order"
+msgstr "&nbsp;&nbsp;Endre rekkefølgen på kategoriene"
+
+#: tt-rss.php:162
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Tastatursnarveier"
 
-#: tt-rss.php:169
+#: tt-rss.php:170
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 msgid "Toggle Feedlist"
 msgstr "Vis nyhetskanallisten"
 
-#: tt-rss.php:179
+#: tt-rss.php:180
 msgid "Search:"
 msgstr "Søk:"
 
-#: tt-rss.php:186
+#: tt-rss.php:187
 msgid "View:"
 msgstr "Vis:"
 
-#: tt-rss.php:188
+#: tt-rss.php:189
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: tt-rss.php:189
+#: tt-rss.php:190
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: tt-rss.php:194
+#: tt-rss.php:195
 msgid "Limit:"
 msgstr "Antall:"
 
-#: tt-rss.php:219 modules/pref-feeds.php:251
+#: tt-rss.php:220 modules/pref-feeds.php:251
 msgid "Update"
 msgstr "Oppdater"
 
-#: tt-rss.php:237
+#: tt-rss.php:238
 msgid "Drag me to resize panels"
 msgstr "Dra i meg for å endre størrelsen på panelene."
 
@@ -1556,19 +1559,16 @@ msgstr ""
 "nyhetsstrømmen"
 
 #: modules/popup-dialog.php:61
-#, fuzzy
 msgid "Subscribe to Feed"
 msgstr "Abonner på nyhetsstrøm"
 
 #: modules/popup-dialog.php:73 modules/pref-feeds.php:171
-#, fuzzy
 msgid "URL:"
-msgstr "Nyhetsstrømsadresse:"
+msgstr "Nettadresse:"
 
 #: modules/popup-dialog.php:84 modules/pref-feeds.php:183
-#, fuzzy
 msgid "Place in category:"
-msgstr "Lagrer kategori..."
+msgstr "Plasser i kategori..."
 
 #: modules/popup-dialog.php:104 modules/pref-feeds.php:280
 #: modules/pref-prefs.php:259 modules/pref-users.php:44
@@ -1593,9 +1593,8 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #: modules/popup-dialog.php:162
-#, fuzzy
 msgid "match on:"
-msgstr "Matcher:"
+msgstr "Match på:"
 
 #: modules/popup-dialog.php:167
 msgid "Title or content"
@@ -1603,14 +1602,13 @@ msgstr "Tittel eller innhold"
 
 #: modules/popup-dialog.php:172
 msgid "Limit search to:"
-msgstr ""
+msgstr "Begrens søket til:"
 
 #: modules/popup-dialog.php:188
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
 #: modules/popup-dialog.php:223
-#, fuzzy
 msgid "Create Label"
 msgstr "Lag merkelapp"
 
@@ -1620,9 +1618,8 @@ msgid "Caption"
 msgstr "Overskrift"
 
 #: modules/popup-dialog.php:241 modules/pref-labels.php:46
-#, fuzzy
 msgid "Match SQL"
-msgstr "Match"
+msgstr "Match SQL"
 
 #: modules/popup-dialog.php:265 modules/pref-labels.php:68
 msgid "Help"
@@ -1637,7 +1634,6 @@ msgid "Create"
 msgstr "Lag"
 
 #: modules/popup-dialog.php:288
-#, fuzzy
 msgid "Create Filter"
 msgstr "Lag filter"
 
@@ -1652,29 +1648,25 @@ msgid "Match"
 msgstr "Match"
 
 #: modules/popup-dialog.php:366 modules/pref-filters.php:50
-#, fuzzy
 msgid "on field"
 msgstr "PÃ¥ felt:"
 
 #: modules/popup-dialog.php:371 modules/pref-filters.php:55
-#, fuzzy
 msgid "in"
-msgstr "Lenke"
+msgstr "i"
 
 #: modules/popup-dialog.php:376 modules/pref-filters.php:60
-#, fuzzy
 msgid "Perform Action"
-msgstr "Utfør oppdateringene"
+msgstr "Utfør handlingen"
 
 #: modules/popup-dialog.php:393 modules/pref-filters.php:80
 msgid "with parameters:"
-msgstr ""
+msgstr "med parametrene:"
 
 #: modules/popup-dialog.php:403 modules/pref-feeds.php:298
 #: modules/pref-filters.php:90 modules/pref-users.php:60
-#, fuzzy
 msgid "Options"
-msgstr "Valg:"
+msgstr "Alternativer:"
 
 #: modules/popup-dialog.php:409 modules/pref-filters.php:102
 msgid "Enabled"
@@ -1758,9 +1750,8 @@ msgid "Show"
 msgstr "Vis"
 
 #: modules/pref-feed-browser.php:172 modules/pref-feeds.php:107
-#, fuzzy
 msgid "No feeds found."
-msgstr "Ingen nyhetsstrømmer ble funnet for å abonneres på"
+msgstr "Ingen nyhetsstrømmer ble funnet."
 
 #: modules/pref-feeds.php:39
 msgid "Subscribed to feeds:"
@@ -1775,14 +1766,12 @@ msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "Viser topp 25 nyhetsstrømmer, sortert etter popularitet:"
 
 #: modules/pref-feeds.php:145
-#, fuzzy
 msgid "Feed Editor"
 msgstr "Nyhetsstrømsredigerer"
 
 #: modules/pref-feeds.php:200
-#, fuzzy
 msgid "Link to feed:"
-msgstr "Link til:"
+msgstr "Lenk til nyhetsstrøm:"
 
 #: modules/pref-feeds.php:217
 msgid "Not linked"
@@ -1790,7 +1779,7 @@ msgstr "Ikke linket til"
 
 #: modules/pref-feeds.php:265
 msgid "using"
-msgstr ""
+msgstr "bruker"
 
 #: modules/pref-feeds.php:275
 msgid "Article purging:"
@@ -1968,9 +1957,8 @@ msgid "Generate another link"
 msgstr "Genererer en ny adresse"
 
 #: modules/pref-filters.php:22
-#, fuzzy
 msgid "Filter Editor"
-msgstr "Filterredigering"
+msgstr "Filteradministrering"
 
 #: modules/pref-filters.php:169
 #, php-format
@@ -2034,7 +2022,7 @@ msgstr ""
 
 #: modules/pref-labels.php:99
 msgid "Error: SQL expression is blank."
-msgstr ""
+msgstr "Feil: SQL uttrykket er blankt."
 
 #: modules/pref-labels.php:179
 #, php-format
@@ -2163,24 +2151,20 @@ msgid "Your access level is insufficient to open this tab."
 msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
 
 #: modules/pref-users.php:17
-#, fuzzy
 msgid "User Editor"
 msgstr "Brukeradministrering"
 
 #: modules/pref-users.php:47
-#, fuzzy
 msgid "Access level: "
 msgstr "Tilgangsnivå:"
 
 #: modules/pref-users.php:54
-#, fuzzy
 msgid "Change password to"
-msgstr "Endre passord"
+msgstr "Endre passordet til"
 
 #: modules/pref-users.php:63
-#, fuzzy
 msgid "E-mail: "
-msgstr "E-post:"
+msgstr "E-post: "
 
 #: modules/pref-users.php:99
 #, php-format
@@ -2252,6 +2236,20 @@ msgstr "Ingen brukere er valgt"
 msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
+#~ msgid ""
+#~ "This program requires XmlHttpRequest to function properly. Your browser "
+#~ "doesn't seem to support it."
+#~ msgstr ""
+#~ "Dette programmet krever XmlHttpRequest for å fungere slik det skal. Din "
+#~ "nettleser ser ikke ut til å støtte dette."
+
+#~ msgid ""
+#~ "This program requires cookies to function properly. Your browser doesn't "
+#~ "seem to support them."
+#~ msgstr ""
+#~ "Dette programmet krever cookies for å fungere ordentlig. Din nettleser "
+#~ "ser ikke ut til å støtte dette."
+
 #~ msgid "Enable icons in feedlist"
 #~ msgstr "Tillat ikoner i nyhetsstrømslisten"
 
@@ -2288,20 +2286,6 @@ msgstr "Ingen matchende brukere ble funnet"
 #~ msgid "Change password:"
 #~ msgstr "Bytt passord:"
 
-#~ msgid ""
-#~ "This program requires XmlHttpRequest to function properly. Your browser "
-#~ "doesn't seem to support it."
-#~ msgstr ""
-#~ "Dette programmet krever XmlHttpRequest for å fungere slik det skal. Din "
-#~ "nettleser ser ikke ut til å støtte dette."
-
-#~ msgid ""
-#~ "This program requires cookies to function properly. Your browser doesn't "
-#~ "seem to support them."
-#~ msgstr ""
-#~ "Dette programmet krever cookies for å fungere ordentlig. Din nettleser "
-#~ "ser ikke ut til å støtte dette."
-
 #~ msgid "Show article"
 #~ msgstr "Vis artikkelen"
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 01c0400d43627139cf857e870b3dd5de13a79a38..015bdb6ca92ce6f706f12b59e1bbd239135ff13a 100644
GIT binary patch
delta 23
ecmZ3Tv^r^nj69d6u7RO~p`n$L>1H)~Rv`da&ISnp

delta 23
ecmZ3Tv^r^nj69cxu91a;p^24|;bt{?Rv`dbFa{6+

diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 84088a8e..eececf64 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-28 14:21+0400\n"
+"POT-Creation-Date: 2008-09-01 11:25+0400\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -106,25 +106,25 @@ msgstr ""
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:424 modules/pref-users.php:311
+#: backend.php:449 modules/pref-users.php:311
 msgid "Registered"
 msgstr ""
 
-#: backend.php:425
+#: backend.php:450
 #, fuzzy
 msgid "Last logged in"
 msgstr "Último Login"
 
-#: backend.php:426
+#: backend.php:451
 #, fuzzy
 msgid "Stored articles"
 msgstr "Favoritos"
 
-#: backend.php:433
+#: backend.php:458
 msgid "Subscribed feeds count"
 msgstr ""
 
-#: backend.php:448
+#: backend.php:473
 msgid "Subscribed feeds"
 msgstr ""
 
@@ -184,16 +184,16 @@ msgstr ""
 "Sua versão do MySQL não é atualmente suportada. Por favor acesse \n"
 "\t\to site oficial para mais informações."
 
-#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4165
+#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4171
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4172
+#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4178
 #: modules/pref-feeds.php:1158
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4150
+#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4156
 msgid "Fresh articles"
 msgstr ""
 
@@ -202,8 +202,8 @@ msgstr ""
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4326
-#: functions.php:4356 modules/pref-feeds.php:989
+#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4332
+#: functions.php:4362 modules/pref-feeds.php:989
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
@@ -224,7 +224,7 @@ msgstr ""
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3948 functions.php:3998 functions.php:5249
+#: functions.php:3948 functions.php:3998 functions.php:5255
 #: modules/pref-feeds.php:770 modules/pref-feeds.php:951
 #: modules/pref-filters.php:309 modules/pref-labels.php:275
 #: modules/pref-users.php:302
@@ -238,7 +238,7 @@ msgid "All"
 msgstr "Todos"
 
 #: functions.php:3950 functions.php:3956 functions.php:4000 functions.php:4003
-#: tt-rss.php:191
+#: tt-rss.php:192
 msgid "Unread"
 msgstr "Não Lido"
 
@@ -262,7 +262,7 @@ msgstr "Ações..."
 msgid "Selection toggle:"
 msgstr "Seleção"
 
-#: functions.php:3957 functions.php:4004 tt-rss.php:190
+#: functions.php:3957 functions.php:4004 tt-rss.php:191
 msgid "Starred"
 msgstr "Favoritos"
 
@@ -311,127 +311,127 @@ msgstr ""
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4100
+#: functions.php:4106
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4138
+#: functions.php:4144
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4376
+#: functions.php:4382
 msgid "No feeds to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:4393
+#: functions.php:4399
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4619
+#: functions.php:4625
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: functions.php:4674
+#: functions.php:4680
 msgid "no tags"
 msgstr "sem tags"
 
-#: functions.php:4705 functions.php:5199
+#: functions.php:4711 functions.php:5205
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4707 functions.php:5201
+#: functions.php:4713 functions.php:5207
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4717 functions.php:5210
+#: functions.php:4723 functions.php:5216
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: functions.php:4723 functions.php:5216
+#: functions.php:4729 functions.php:5222
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4799 modules/pref-feed-browser.php:75
+#: functions.php:4805 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: functions.php:4868
+#: functions.php:4874
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4981
+#: functions.php:4987
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5179
+#: functions.php:5185
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Favoritos"
 
-#: functions.php:5316
+#: functions.php:5322
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5319
+#: functions.php:5325
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5322
+#: functions.php:5328
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5688
+#: functions.php:5694
 msgid "Match "
 msgstr ""
 
-#: functions.php:5696
+#: functions.php:5702
 #, fuzzy
 msgid "Unread articles"
 msgstr "Favoritos"
 
-#: functions.php:5697
+#: functions.php:5703
 #, fuzzy
 msgid "Updated articles"
 msgstr "Favoritos"
 
-#: functions.php:5698
+#: functions.php:5704
 #, fuzzy
 msgid "Title contains"
 msgstr "Título ou conteúdo"
 
-#: functions.php:5699
+#: functions.php:5705
 #, fuzzy
 msgid "Content contains"
 msgstr "Filtrando o conteúdo"
 
-#: functions.php:5700
+#: functions.php:5706
 msgid "Score equals"
 msgstr ""
 
-#: functions.php:5701
+#: functions.php:5707
 msgid "Score is greater than"
 msgstr ""
 
-#: functions.php:5702
+#: functions.php:5708
 msgid "Score is less than"
 msgstr ""
 
-#: functions.php:5703
+#: functions.php:5709
 msgid "Articles newer than X hours"
 msgstr ""
 
-#: functions.php:5704
+#: functions.php:5710
 msgid "Articles newer than X days"
 msgstr ""
 
-#: functions.php:5713
+#: functions.php:5719
 msgid "Add"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:233 tt-rss.php:246
+#: localized_js.php:95 tt-rss.php:234 tt-rss.php:247
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
@@ -798,6 +798,11 @@ msgstr "Favoritos"
 msgid "Rescoring articles..."
 msgstr "Favoritos"
 
+#: localized_js.php:141
+#, fuzzy
+msgid "Reset category order?"
+msgstr "Remover as categorias selecionadas?"
+
 #: localized_schema.php:9 modules/popup-dialog.php:165
 #: modules/pref-feeds.php:964 modules/pref-feeds.php:1025
 msgid "Title"
@@ -1336,45 +1341,50 @@ msgstr "&nbsp;&nbsp;Criar filtro"
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Editar esse Feed"
 
-#: tt-rss.php:161
+#: tt-rss.php:160
+#, fuzzy
+msgid "&nbsp;&nbsp;Reset category order"
+msgstr "&nbsp;&nbsp;Editar esse Feed"
+
+#: tt-rss.php:162
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: tt-rss.php:169
+#: tt-rss.php:170
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:179
+#: tt-rss.php:180
 msgid "Search:"
 msgstr ""
 
-#: tt-rss.php:186
+#: tt-rss.php:187
 msgid "View:"
 msgstr ""
 
-#: tt-rss.php:188
+#: tt-rss.php:189
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:189
+#: tt-rss.php:190
 msgid "All Articles"
 msgstr ""
 
-#: tt-rss.php:194
+#: tt-rss.php:195
 msgid "Limit:"
 msgstr "Limite:"
 
-#: tt-rss.php:219 modules/pref-feeds.php:251
+#: tt-rss.php:220 modules/pref-feeds.php:251
 msgid "Update"
 msgstr "Atualizar"
 
-#: tt-rss.php:237
+#: tt-rss.php:238
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 016b9549b7461cc281c60914f76b6dc8047cc126..cb7923fd1bc52142bede5e9672c66df9195c3f73 100644
GIT binary patch
delta 25
gcmX@Nlkwb6#tp^#T$Z{9h6;v;Rz{|qYxM(l0eVLWGynhq

delta 25
gcmX@Nlkwb6#tp^#To$@U77B(YRz`-KYxM(l0eYzjI{*Lx

diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 72da53e7..045021d2 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-28 14:21+0400\n"
+"POT-Creation-Date: 2008-09-01 11:25+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <cthulhoo@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -106,26 +106,26 @@ msgstr ""
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:424 modules/pref-users.php:311
+#: backend.php:449 modules/pref-users.php:311
 msgid "Registered"
 msgstr ""
 
-#: backend.php:425
+#: backend.php:450
 #, fuzzy
 msgid "Last logged in"
 msgstr "Последний вход"
 
-#: backend.php:426
+#: backend.php:451
 #, fuzzy
 msgid "Stored articles"
 msgstr "Отмеченные"
 
-#: backend.php:433
+#: backend.php:458
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "Подписаны каналы:"
 
-#: backend.php:448
+#: backend.php:473
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "Подписаны каналы:"
@@ -186,16 +186,16 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4165
+#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4171
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4172
+#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4178
 #: modules/pref-feeds.php:1158
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4150
+#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4156
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
@@ -205,8 +205,8 @@ msgstr "Отмеченные"
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4326
-#: functions.php:4356 modules/pref-feeds.php:989
+#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4332
+#: functions.php:4362 modules/pref-feeds.php:989
 msgid "Uncategorized"
 msgstr "Нет категории"
 
@@ -227,7 +227,7 @@ msgstr "Результаты поиска"
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3948 functions.php:3998 functions.php:5249
+#: functions.php:3948 functions.php:3998 functions.php:5255
 #: modules/pref-feeds.php:770 modules/pref-feeds.php:951
 #: modules/pref-filters.php:309 modules/pref-labels.php:275
 #: modules/pref-users.php:302
@@ -241,7 +241,7 @@ msgid "All"
 msgstr "Все"
 
 #: functions.php:3950 functions.php:3956 functions.php:4000 functions.php:4003
-#: tt-rss.php:191
+#: tt-rss.php:192
 msgid "Unread"
 msgstr "Новые"
 
@@ -265,7 +265,7 @@ msgstr "Действия..."
 msgid "Selection toggle:"
 msgstr "Выбрать:"
 
-#: functions.php:3957 functions.php:4004 tt-rss.php:190
+#: functions.php:3957 functions.php:4004 tt-rss.php:191
 msgid "Starred"
 msgstr "Отмеченные"
 
@@ -316,128 +316,128 @@ msgstr "Превратить в метку"
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4100
+#: functions.php:4106
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4138
+#: functions.php:4144
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4376
+#: functions.php:4382
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:4393
+#: functions.php:4399
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4619
+#: functions.php:4625
 #, fuzzy
 msgid " - "
 msgstr ", автор - "
 
-#: functions.php:4674
+#: functions.php:4680
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4705 functions.php:5199
+#: functions.php:4711 functions.php:5205
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4707 functions.php:5201
+#: functions.php:4713 functions.php:5207
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4717 functions.php:5210
+#: functions.php:4723 functions.php:5216
 #, fuzzy
 msgid "unknown type"
 msgstr "Неизвестная ошибка"
 
-#: functions.php:4723 functions.php:5216
+#: functions.php:4729 functions.php:5222
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4799 modules/pref-feed-browser.php:75
+#: functions.php:4805 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4868
+#: functions.php:4874
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4981
+#: functions.php:4987
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5179
+#: functions.php:5185
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Отмеченные"
 
-#: functions.php:5316
+#: functions.php:5322
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:5319
+#: functions.php:5325
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:5322
+#: functions.php:5328
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:5688
+#: functions.php:5694
 #, fuzzy
 msgid "Match "
 msgstr "Искать"
 
-#: functions.php:5696
+#: functions.php:5702
 #, fuzzy
 msgid "Unread articles"
 msgstr "Отмеченные"
 
-#: functions.php:5697
+#: functions.php:5703
 #, fuzzy
 msgid "Updated articles"
 msgstr "Отмеченные"
 
-#: functions.php:5698
+#: functions.php:5704
 #, fuzzy
 msgid "Title contains"
 msgstr "Заголовок или содержимое"
 
-#: functions.php:5699
+#: functions.php:5705
 #, fuzzy
 msgid "Content contains"
 msgstr "Фильтры"
 
-#: functions.php:5700
+#: functions.php:5706
 msgid "Score equals"
 msgstr ""
 
-#: functions.php:5701
+#: functions.php:5707
 msgid "Score is greater than"
 msgstr ""
 
-#: functions.php:5702
+#: functions.php:5708
 msgid "Score is less than"
 msgstr ""
 
-#: functions.php:5703
+#: functions.php:5709
 msgid "Articles newer than X hours"
 msgstr ""
 
-#: functions.php:5704
+#: functions.php:5710
 msgid "Articles newer than X days"
 msgstr ""
 
-#: functions.php:5713
+#: functions.php:5719
 msgid "Add"
 msgstr ""
 
@@ -647,7 +647,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:233 tt-rss.php:246
+#: localized_js.php:95 tt-rss.php:234 tt-rss.php:247
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -812,6 +812,11 @@ msgstr "Отмеченные"
 msgid "Rescoring articles..."
 msgstr "Отмеченные"
 
+#: localized_js.php:141
+#, fuzzy
+msgid "Reset category order?"
+msgstr "Удалить выбранные категории?"
+
 #: localized_schema.php:9 modules/popup-dialog.php:165
 #: modules/pref-feeds.php:964 modules/pref-feeds.php:1025
 msgid "Title"
@@ -1351,46 +1356,51 @@ msgstr "&nbsp;&nbsp;Создать фильтр"
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Подписаться"
 
-#: tt-rss.php:161
+#: tt-rss.php:160
+#, fuzzy
+msgid "&nbsp;&nbsp;Reset category order"
+msgstr "&nbsp;&nbsp;Подписаться"
+
+#: tt-rss.php:162
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:169
+#: tt-rss.php:170
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Изм. прочитанное"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 #, fuzzy
 msgid "Toggle Feedlist"
 msgstr "Изм. прочитанное"
 
-#: tt-rss.php:179
+#: tt-rss.php:180
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:186
+#: tt-rss.php:187
 msgid "View:"
 msgstr "Показать:"
 
-#: tt-rss.php:188
+#: tt-rss.php:189
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:189
+#: tt-rss.php:190
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:194
+#: tt-rss.php:195
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:219 modules/pref-feeds.php:251
+#: tt-rss.php:220 modules/pref-feeds.php:251
 msgid "Update"
 msgstr "Обновить"
 
-#: tt-rss.php:237
+#: tt-rss.php:238
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 2e30d552a4ef086823d1263e3e01872b8be610e2..731ca87ea512d669963fa4688d01dfad6807adf6 100644
GIT binary patch
delta 25
hcmdmgnsNVW#tp14T$Z{9h6;v;Rz{|q`CT?B0swQ82ipJu

delta 25
hcmdmgnsNVW#tp14To$@U77B(YRz`-K`CT?B0swRL2jTz#

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 7a0a53a2..729d1766 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-28 14:21+0400\n"
+"POT-Creation-Date: 2008-09-01 11:25+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -102,26 +102,26 @@ msgstr ""
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:424 modules/pref-users.php:311
+#: backend.php:449 modules/pref-users.php:311
 msgid "Registered"
 msgstr ""
 
-#: backend.php:425
+#: backend.php:450
 #, fuzzy
 msgid "Last logged in"
 msgstr "最后登陆"
 
-#: backend.php:426
+#: backend.php:451
 #, fuzzy
 msgid "Stored articles"
 msgstr "星级文章"
 
-#: backend.php:433
+#: backend.php:458
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "订阅feed:"
 
-#: backend.php:448
+#: backend.php:473
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "订阅feed:"
@@ -182,16 +182,16 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4165
+#: functions.php:2570 functions.php:2934 functions.php:3310 functions.php:4171
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4172
+#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4178
 #: modules/pref-feeds.php:1158
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4150
+#: functions.php:2602 functions.php:2938 functions.php:3316 functions.php:4156
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
@@ -201,8 +201,8 @@ msgstr "星级文章"
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4326
-#: functions.php:4356 modules/pref-feeds.php:989
+#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4332
+#: functions.php:4362 modules/pref-feeds.php:989
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -223,7 +223,7 @@ msgstr "搜索结果"
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3948 functions.php:3998 functions.php:5249
+#: functions.php:3948 functions.php:3998 functions.php:5255
 #: modules/pref-feeds.php:770 modules/pref-feeds.php:951
 #: modules/pref-filters.php:309 modules/pref-labels.php:275
 #: modules/pref-users.php:302
@@ -237,7 +237,7 @@ msgid "All"
 msgstr "所有"
 
 #: functions.php:3950 functions.php:3956 functions.php:4000 functions.php:4003
-#: tt-rss.php:191
+#: tt-rss.php:192
 msgid "Unread"
 msgstr "未读"
 
@@ -261,7 +261,7 @@ msgstr "激活..."
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:3957 functions.php:4004 tt-rss.php:190
+#: functions.php:3957 functions.php:4004 tt-rss.php:191
 msgid "Starred"
 msgstr "星级"
 
@@ -311,128 +311,128 @@ msgstr "转换标签"
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4100
+#: functions.php:4106
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4138
+#: functions.php:4144
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4376
+#: functions.php:4382
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4393
+#: functions.php:4399
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4619
+#: functions.php:4625
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4674
+#: functions.php:4680
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4705 functions.php:5199
+#: functions.php:4711 functions.php:5205
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4707 functions.php:5201
+#: functions.php:4713 functions.php:5207
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4717 functions.php:5210
+#: functions.php:4723 functions.php:5216
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4723 functions.php:5216
+#: functions.php:4729 functions.php:5222
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4799 modules/pref-feed-browser.php:75
+#: functions.php:4805 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4868
+#: functions.php:4874
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4981
+#: functions.php:4987
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5179
+#: functions.php:5185
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5316
+#: functions.php:5322
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5319
+#: functions.php:5325
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5322
+#: functions.php:5328
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5688
+#: functions.php:5694
 #, fuzzy
 msgid "Match "
 msgstr "匹配"
 
-#: functions.php:5696
+#: functions.php:5702
 #, fuzzy
 msgid "Unread articles"
 msgstr "星级文章"
 
-#: functions.php:5697
+#: functions.php:5703
 #, fuzzy
 msgid "Updated articles"
 msgstr "星级文章"
 
-#: functions.php:5698
+#: functions.php:5704
 #, fuzzy
 msgid "Title contains"
 msgstr "标题或内容"
 
-#: functions.php:5699
+#: functions.php:5705
 #, fuzzy
 msgid "Content contains"
 msgstr "内容过滤器"
 
-#: functions.php:5700
+#: functions.php:5706
 msgid "Score equals"
 msgstr ""
 
-#: functions.php:5701
+#: functions.php:5707
 msgid "Score is greater than"
 msgstr ""
 
-#: functions.php:5702
+#: functions.php:5708
 msgid "Score is less than"
 msgstr ""
 
-#: functions.php:5703
+#: functions.php:5709
 msgid "Articles newer than X hours"
 msgstr ""
 
-#: functions.php:5704
+#: functions.php:5710
 msgid "Articles newer than X days"
 msgstr ""
 
-#: functions.php:5713
+#: functions.php:5719
 msgid "Add"
 msgstr ""
 
@@ -642,7 +642,7 @@ msgstr "更新提要失败（缺少XML支持）"
 msgid "Could not display article (missing XML object)"
 msgstr "显示条目失败（缺少XML支持）"
 
-#: localized_js.php:95 tt-rss.php:233 tt-rss.php:246
+#: localized_js.php:95 tt-rss.php:234 tt-rss.php:247
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -807,6 +807,11 @@ msgstr "星级文章"
 msgid "Rescoring articles..."
 msgstr "星级文章"
 
+#: localized_js.php:141
+#, fuzzy
+msgid "Reset category order?"
+msgstr "移除选定分类?"
+
 #: localized_schema.php:9 modules/popup-dialog.php:165
 #: modules/pref-feeds.php:964 modules/pref-feeds.php:1025
 msgid "Title"
@@ -1357,45 +1362,50 @@ msgstr "&nbsp;&nbsp;创建过滤器"
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:161
+#: tt-rss.php:160
+#, fuzzy
+msgid "&nbsp;&nbsp;Reset category order"
+msgstr "&nbsp;&nbsp;订阅feed"
+
+#: tt-rss.php:162
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:169
+#: tt-rss.php:170
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:179
+#: tt-rss.php:180
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:186
+#: tt-rss.php:187
 msgid "View:"
 msgstr "浏览:"
 
-#: tt-rss.php:188
+#: tt-rss.php:189
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:189
+#: tt-rss.php:190
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:194
+#: tt-rss.php:195
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:219 modules/pref-feeds.php:251
+#: tt-rss.php:220 modules/pref-feeds.php:251
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:237
+#: tt-rss.php:238
 msgid "Drag me to resize panels"
 msgstr ""
 
-- 
2.39.5