summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2009-01-25 18:34:50 +0100
committerAndrew Dolgov <[email protected]>2009-01-25 18:34:50 +0100
commit89841c5d279268e5734e07c65a0eb50e1bbed041 (patch)
treeb1074b68428d40334788f00d6f1f9fc5f4f504ee /locale
parent269e4c0e34185632ad6e40ff00eee446c95d686e (diff)
update translations
Diffstat (limited to 'locale')
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin34665 -> 32860 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po804
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.mobin10751 -> 10237 bytes
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.po794
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.mobin46366 -> 44377 bytes
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.po794
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.mobin37470 -> 36735 bytes
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.po791
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.mobin43937 -> 42153 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.po794
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.mobin12280 -> 12068 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.po778
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin50435 -> 59356 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po1004
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin24837 -> 23339 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po802
16 files changed, 3383 insertions, 3178 deletions
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index e23238201..395180019 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 4c822f56d..23f2df0cb 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: 2009-01-22 00:21+0300\n"
+"POT-Creation-Date: 2009-01-25 23:34+0300\n"
"PO-Revision-Date: 2007-11-20 23:01+0100\n"
"Last-Translator: Thibaut Cousin <[email protected]>\n"
"Language-Team: Français <[email protected]>\n"
@@ -81,7 +81,7 @@ msgstr "Une fois par jour"
msgid "Weekly"
msgstr "Une fois par semaine"
-#: backend.php:122 tt-rss.php:211 modules/pref-prefs.php:317
+#: backend.php:122 tt-rss.php:213 modules/pref-prefs.php:315
msgid "Default"
msgstr "Utiliser la valeur par défaut"
@@ -94,7 +94,7 @@ msgstr "Page"
msgid "SimplePie"
msgstr ""
-#: backend.php:133 modules/pref-users.php:140
+#: backend.php:133 modules/pref-users.php:126
msgid "User"
msgstr "Utilisateur"
@@ -172,193 +172,179 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2852 modules/popup-dialog.php:175
+#: functions.php:2808 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Tous les flux"
-#: functions.php:2881 functions.php:2920 functions.php:3309 functions.php:4324
-#: functions.php:4354 modules/pref-feeds.php:1266
+#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
+#: functions.php:4248 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Sans catégorie"
-#: functions.php:2910 functions.php:3505 mobile/functions.php:33
+#: functions.php:2866 functions.php:3459 mobile/functions.php:33
msgid "Special"
msgstr "Spécial"
-#: functions.php:2912 functions.php:3338 functions.php:3507 prefs.php:144
-#: mobile/functions.php:83
+#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Intitulé"
-#: functions.php:2930 functions.php:3331 functions.php:4178 help/3.php:59
+#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Articles remarquables"
-#: functions.php:2932 functions.php:3335 functions.php:4185
-#: modules/pref-feeds.php:1441 help/3.php:60 mobile/functions.php:70
+#: functions.php:2888 functions.php:3291 functions.php:4079
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Articles publiés"
-#: functions.php:2934 functions.php:3341 functions.php:4163 help/3.php:58
+#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Nouveaux articles"
-#: functions.php:2936 functions.php:3344 functions.php:4156 help/3.php:57
+#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Tous les articles"
-#: functions.php:3295 functions.php:3297
+#: functions.php:3251 functions.php:3253
msgid "Search results"
msgstr "Résultats de recherche"
-#: functions.php:3313 functions.php:3326 functions.php:3332 functions.php:3336
-#: functions.php:3342 functions.php:3345 functions.php:3353
+#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
+#: functions.php:3298 functions.php:3301 functions.php:3309
msgid "Searched for"
msgstr "Recherché"
-#: functions.php:3984 functions.php:5351 modules/pref-feeds.php:1047
-#: modules/pref-feeds.php:1228 modules/pref-filters.php:366
-#: modules/pref-labels.php:138 modules/pref-users.php:408
+#: functions.php:3929
+msgid "Generated feed"
+msgstr "Flux généré"
+
+#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
+#: modules/pref-labels.php:129 modules/pref-users.php:401
msgid "Select:"
msgstr "Sélectionner&nbsp;:"
-#: functions.php:3985 modules/pref-feeds.php:1048 modules/pref-feeds.php:1229
-#: modules/pref-filters.php:367 modules/pref-labels.php:139
-#: modules/pref-users.php:409 mobile/functions.php:570
+#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Tout"
-#: functions.php:3986 functions.php:4002 tt-rss.php:203
+#: functions.php:3936 functions.php:3952 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Non lus"
-#: functions.php:3987 mobile/functions.php:573
+#: functions.php:3937 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(Inverse)"
-#: functions.php:3988 modules/pref-feeds.php:1049 modules/pref-feeds.php:1230
-#: modules/pref-filters.php:368 modules/pref-labels.php:140
-#: modules/pref-users.php:410 mobile/functions.php:572
+#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Aucun"
-#: functions.php:3996 tt-rss.php:152 modules/pref-feeds.php:1389
+#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Actions..."
-#: functions.php:4001
+#: functions.php:3951
#, fuzzy
msgid "Selection toggle:"
msgstr "Sélection&nbsp;:"
-#: functions.php:4003 tt-rss.php:202 mobile/functions.php:459
+#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Remarquables"
-#: functions.php:4004
+#: functions.php:3954
msgid "Published"
msgstr "Publiés"
-#: functions.php:4006
+#: functions.php:3956
msgid "Mark as read:"
msgstr "Marquer comme lu&nbsp;:"
-#: functions.php:4007 mobile/functions.php:578
+#: functions.php:3957 mobile/functions.php:578
msgid "Selection"
msgstr "La sélection"
-#: functions.php:4009 mobile/functions.php:580
+#: functions.php:3959 mobile/functions.php:580
msgid "Entire feed"
msgstr "Tout le flux"
-#: functions.php:4013
+#: functions.php:3963
#, fuzzy
msgid "Assign label:"
msgstr "Attribuer des étiquettes"
-#: functions.php:4016 tt-rss.php:169
-#, fuzzy
-msgid "Create label..."
-msgstr "Créer un intitulé"
-
-#: functions.php:4028
-#, fuzzy
-msgid "(remove)"
-msgstr "Supprimer"
-
-#: functions.php:4065
-msgid "Generated feed"
-msgstr "Flux généré"
-
-#: functions.php:4110
+#: functions.php:4004
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4374
+#: functions.php:4268
msgid "No feeds to display."
msgstr "Aucun flux à afficher."
-#: functions.php:4391 mobile/functions.php:12
+#: functions.php:4285 mobile/functions.php:12
msgid "Tags"
msgstr "Étiquettes"
-#: functions.php:4627
+#: functions.php:4521
#, fuzzy
msgid " - "
msgstr "- par "
-#: functions.php:4682 functions.php:4683
-msgid "no tags"
-msgstr "aucune étiquette"
-
-#: functions.php:4690
+#: functions.php:4545 functions.php:5220
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4698
+#: functions.php:4553
#, fuzzy
msgid "Display original article content"
msgstr "Afficher l'heure du dernier article"
-#: functions.php:4705 functions.php:5361
+#: functions.php:4560 functions.php:5211
#, fuzzy
msgid "Show article summary in new window"
msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre"
-#: functions.php:4742 functions.php:5285
+#: functions.php:4593 functions.php:5135
#, fuzzy
msgid "unknown type"
msgstr "Erreur inconnue"
-#: functions.php:4748 functions.php:5291
+#: functions.php:4599 functions.php:5141
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4784 functions.php:5325
+#: functions.php:4635 functions.php:5175
msgid "Attachment:"
msgstr ""
-#: functions.php:4786 functions.php:5327
+#: functions.php:4637 functions.php:5177
msgid "Attachments:"
msgstr ""
-#: functions.php:4806 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1098
+#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Fermer cette fenêtre"
-#: functions.php:4862 modules/pref-feed-browser.php:75
+#: functions.php:4713
msgid "Feed not found."
msgstr "Flux non trouvé."
-#: functions.php:4931 mobile/functions.php:423
+#: functions.php:4782 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -366,37 +352,51 @@ 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:5259
+#: functions.php:5109
#, fuzzy
msgid "Click to expand article"
msgstr "Articles mémorisés"
-#: functions.php:5419
+#: functions.php:5246
#, fuzzy
msgid "No unread articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5422
+#: functions.php:5249
#, fuzzy
msgid "No updated articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5425
+#: functions.php:5252
#, fuzzy
msgid "No starred articles found to display."
msgstr "Aucun article à marquer"
-#: functions.php:5429
+#: functions.php:5256
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5431
+#: functions.php:5258
#, fuzzy
msgid "No articles found to display."
msgstr "Aucun article à marquer"
+#: functions.php:5931 tt-rss.php:171
+#, fuzzy
+msgid "Create label..."
+msgstr "Créer un intitulé"
+
+#: functions.php:5944
+#, fuzzy
+msgid "(remove)"
+msgstr "Supprimer"
+
+#: functions.php:5988
+msgid "no tags"
+msgstr "aucune étiquette"
+
#: localized_js.php:35
msgid "display feeds"
msgstr "afficher les flux"
@@ -405,7 +405,7 @@ msgstr "afficher les flux"
msgid "display tags"
msgstr "afficher les étiquettes"
-#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
+#: localized_js.php:37 prefs.php:66 prefs.php:138 tt-rss.php:68
msgid "Loading, please wait..."
msgstr "Ouverture en cours, veuillez patienter..."
@@ -603,7 +603,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:257 tt-rss.php:270
+#: localized_js.php:95 tt-rss.php:259 tt-rss.php:272
msgid "No feed selected."
msgstr "Aucun flux sélectionné."
@@ -783,8 +783,8 @@ msgstr "Aucun article sélectionné."
msgid "Saving feeds..."
msgstr "Enregistrement d'un flux..."
-#: localized_schema.php:9 tt-rss.php:213 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1241 modules/pref-feeds.php:1302
+#: localized_schema.php:9 tt-rss.php:215 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Titre"
@@ -810,7 +810,7 @@ msgstr ""
msgid "Filter article"
msgstr "Filtrer l'article"
-#: localized_schema.php:16 tt-rss.php:164 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:166 mobile/functions.php:583
msgid "Mark as read"
msgstr "Marquer comme lu"
@@ -822,15 +822,20 @@ msgstr "Marquer comme remarquable"
msgid "Assign tags"
msgstr "Attribuer des étiquettes"
-#: localized_schema.php:23
+#: localized_schema.php:20
+#, fuzzy
+msgid "Assign label"
+msgstr "Attribuer des étiquettes"
+
+#: localized_schema.php:24
msgid "General"
msgstr "Général"
-#: localized_schema.php:25
+#: localized_schema.php:26
msgid "Allow duplicate posts"
msgstr "Permettre les articles en double"
-#: localized_schema.php:26
+#: localized_schema.php:27
msgid ""
"This option is useful when you are reading several planet-type aggregators "
"with partially colliding userbase. When disabled, it forces same posts from "
@@ -841,15 +846,15 @@ msgstr ""
"largement. Lorsque cette option est désactivée, les articles en double sont "
"affichées en un seul exemplaire."
-#: localized_schema.php:27
+#: localized_schema.php:28
msgid "Default interval between feed updates (in minutes)"
msgstr "Intervalle par défaut entre les mises à jour (en minutes)"
-#: localized_schema.php:28
+#: localized_schema.php:29
msgid "Enable e-mail digest"
msgstr "Activer la synthèse quotidienne par courrier électronique"
-#: localized_schema.php:29
+#: localized_schema.php:30
msgid ""
"This option enables sending daily digest of new (and unread) headlines on "
"your configured e-mail address"
@@ -857,30 +862,30 @@ msgstr ""
"Cette option active l'envoi d'une synthèse quotidienne (digest) des en-têtes "
"nouveaux et non lus à l'adresse électronique donnée"
-#: localized_schema.php:30
+#: localized_schema.php:31
msgid "Purge old posts after this number of days (0 - disables)"
msgstr ""
"Purger les articles plus vieux que le nombre de jours donné (0 pour ne "
"jamais purger)"
-#: localized_schema.php:31
+#: localized_schema.php:32
msgid "Update post on checksum change"
msgstr "Mettre à jour lors d'un changement du code de contrôle"
-#: localized_schema.php:32
+#: localized_schema.php:33
#, fuzzy
msgid "Mark articles in e-mail digest as read"
msgstr "Marquer tous les articles de %s comme lus ?"
-#: localized_schema.php:34
+#: localized_schema.php:35
msgid "Interface"
msgstr "Interface"
-#: localized_schema.php:36
+#: localized_schema.php:37
msgid "Combined feed display"
msgstr "Affichage combiné des flux"
-#: localized_schema.php:37
+#: localized_schema.php:38
msgid ""
"Display expanded list of feed articles, instead of separate displays for "
"headlines and article content"
@@ -888,33 +893,33 @@ msgstr ""
"Affiche les articles sous la forme d'une liste étendue, au lieu de deux "
"listes séparées (une pour les en-têtes et une pour le contenu)"
-#: localized_schema.php:38
+#: localized_schema.php:39
msgid "Default article limit"
msgstr "Nombre maximal d'articles par défaut"
-#: localized_schema.php:39
+#: localized_schema.php:40
msgid ""
"Default limit for articles to display, any custom number you like (0 - "
"disables)."
msgstr "Nombre maximal d'articles à afficher (0 pour supprimer toute limite)."
-#: localized_schema.php:40
+#: localized_schema.php:41
msgid "Enable feed categories"
msgstr "Utiliser les catégories de flux"
-#: localized_schema.php:41
+#: localized_schema.php:42
msgid "Enable search toolbar"
msgstr "Activer la barre de recherche"
-#: localized_schema.php:42
+#: localized_schema.php:43
msgid "Hide feeds with no unread messages"
msgstr "Masquer les flux sans article non lu"
-#: localized_schema.php:43
+#: localized_schema.php:44
msgid "Mark articles as read automatically"
msgstr "Marquer les articles comme lus automatiquement"
-#: localized_schema.php:44
+#: localized_schema.php:45
#, fuzzy
msgid ""
"This option enables marking articles as read automatically in combined mode "
@@ -923,11 +928,11 @@ msgstr ""
"Cette option active le marquage automatique des articles comme lus en "
"affichage combiné, pendant que vous faites défiler la liste des articles"
-#: localized_schema.php:45
+#: localized_schema.php:46
msgid "On catchup show next feed"
msgstr "Sauter automatiquement au flux suivant"
-#: localized_schema.php:46
+#: localized_schema.php:47
msgid ""
"When \"Mark as read\" button is clicked in toolbar, automatically open next "
"feed with unread articles."
@@ -935,66 +940,66 @@ msgstr ""
"Lorsque vous cliquez sur «&nbsp;Marquer comme lus&nbsp;», le prochain flux "
"contenant des articles non lus est automatiquement affiché"
-#: localized_schema.php:47
+#: localized_schema.php:48
msgid "Open article links in new browser window"
msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre"
-#: localized_schema.php:48
+#: localized_schema.php:49
msgid "Reverse headline order (oldest first)"
msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
-#: localized_schema.php:49
+#: localized_schema.php:50
msgid "Show content preview in headlines list"
msgstr "Donner un aperçu du contenu dans la liste des en-têtes"
-#: localized_schema.php:50
+#: localized_schema.php:51
msgid "Sort feeds by unread articles count"
msgstr "Trier les flux par nombre d'articles non lus"
-#: localized_schema.php:51
+#: localized_schema.php:52
msgid "User stylesheet URL"
msgstr "URL de la feuille de style personnalisée"
-#: localized_schema.php:52
+#: localized_schema.php:53
msgid "Link to user stylesheet to override default style, disabled if empty."
msgstr ""
"Lien vers une feuille de style personnalisée pour remplacer le style par "
"défaut (laisser vide pour ne pas en utiliser)"
-#: localized_schema.php:53
+#: localized_schema.php:54
msgid "Maximum age of fresh articles (in hours)"
msgstr "Ancienneté maximale pour un nouvel article (en heures)"
-#: localized_schema.php:54
+#: localized_schema.php:55
#, fuzzy
msgid "Hide feedlist"
msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
-#: localized_schema.php:55
+#: localized_schema.php:56
msgid ""
"This option hides feedlist and allows it to be toggled on the fly, useful "
"for small screens."
msgstr ""
-#: localized_schema.php:56
+#: localized_schema.php:57
msgid "Group headlines in virtual feeds"
msgstr ""
-#: localized_schema.php:57
+#: localized_schema.php:58
msgid ""
"When this option is enabled, headlines in Special feeds and Labels are "
"grouped by feeds"
msgstr ""
-#: localized_schema.php:59
+#: localized_schema.php:60
msgid "Advanced"
msgstr "Avancé"
-#: localized_schema.php:61
+#: localized_schema.php:62
msgid "Blacklisted tags"
msgstr "Étiquettes exclues"
-#: localized_schema.php:62
+#: localized_schema.php:63
msgid ""
"When auto-detecting tags in articles these tags will not be applied (comma-"
"separated list)."
@@ -1002,20 +1007,20 @@ msgstr ""
"Lors de l'autodétection des étiquettes dans les articles, ces étiquettes ne "
"sont pas utilisées (en faire une liste, séparées par des virgules)"
-#: localized_schema.php:63
+#: localized_schema.php:64
msgid "Confirm marking feed as read"
msgstr "Demander confirmation pour marquer un flux comme lu"
-#: localized_schema.php:64
+#: localized_schema.php:65
#, fuzzy
msgid "Enable feed icons"
msgstr "Utiliser les catégories de flux"
-#: localized_schema.php:65
+#: localized_schema.php:66
msgid "Enable labels"
msgstr "Utiliser les intitulés"
-#: localized_schema.php:66
+#: localized_schema.php:67
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 "
@@ -1025,72 +1030,72 @@ msgstr ""
"personnalisées. Cette fonctionnalité est hautement expérimentale et pas "
"encore ergonomique. Utilisez-là avec précaution."
-#: localized_schema.php:67
+#: localized_schema.php:68
msgid "Long date format"
msgstr "Format de date long"
-#: localized_schema.php:68
+#: localized_schema.php:69
msgid "Set articles as unread on update"
msgstr "Marquer les articles comme non lus lors des mises à jour"
-#: localized_schema.php:69
+#: localized_schema.php:70
msgid "Short date format"
msgstr "Format de date court"
-#: localized_schema.php:70
+#: localized_schema.php:71
msgid "Show additional information in feedlist"
msgstr "Afficher des informations supplémentaires dans la liste des flux"
-#: localized_schema.php:71
+#: localized_schema.php:72
msgid "Strip unsafe tags from articles"
msgstr "Éliminer les étiquettes non sûres des articles"
-#: localized_schema.php:72
+#: localized_schema.php:73
msgid "Strip all but most common HTML tags when reading articles."
msgstr ""
"Élimine toutes les balises HTML sauf les plus courantes lors de la lecture "
"des articles"
-#: localized_schema.php:73
+#: localized_schema.php:74
msgid "Use more accessible date/time format for headlines"
msgstr "Afficher la date et l'heure de manière plus lisible dans les en-têtes"
-#: localized_schema.php:74
+#: localized_schema.php:75
msgid "Automatically expand articles in combined mode"
msgstr "Développer automatiquement les articles en affichage combiné"
-#: localized_schema.php:75
+#: localized_schema.php:76
msgid "Purge unread articles"
msgstr "Purger les articles non lus"
-#: localized_schema.php:76
+#: localized_schema.php:77
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: localized_schema.php:77
+#: localized_schema.php:78
msgid "Prefer more accurate feedlist counters to UI speed"
msgstr ""
-#: localized_schema.php:78
+#: localized_schema.php:79
msgid "Enable inline MP3 player"
msgstr ""
-#: localized_schema.php:79
+#: localized_schema.php:80
msgid ""
"Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
msgstr ""
-#: localized_schema.php:80
+#: localized_schema.php:81
msgid "Do not show images in articles"
msgstr ""
-#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:302
-#: modules/pref-feeds.php:495 mobile/login_form.php:59
+#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:277
+#: modules/pref-feeds.php:470 mobile/login_form.php:59
msgid "Login:"
msgstr "Nom&nbsp;:"
-#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:306
-#: modules/pref-feeds.php:501 mobile/login_form.php:60
+#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:281
+#: modules/pref-feeds.php:476 mobile/login_form.php:60
msgid "Password:"
msgstr "Mot de passe&nbsp;:"
@@ -1128,7 +1133,7 @@ msgstr ""
#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
#: register.php:200 register.php:213 register.php:228 register.php:246
#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162
+#: update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Revenir à Tiny Tiny RSS"
@@ -1183,7 +1188,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Revenir à la configuration"
-#: prefs.php:77 prefs.php:156 tt-rss.php:79
+#: prefs.php:74 prefs.php:141 tt-rss.php:76
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1193,49 +1198,37 @@ msgstr ""
"\t\tpour le bon fonctionnement de ce logiciel. Veuillez modifier la\n"
"\t\tconfiguration de votre navigateur."
-#: prefs.php:104
-msgid "Unknown Error"
-msgstr "Erreur inconnue"
-
-#: prefs.php:110 tt-rss.php:115
+#: prefs.php:101 tt-rss.php:116
msgid "Hello,"
msgstr "Bonjour,"
-#: prefs.php:112 prefs.php:122 help/4.php:14
+#: prefs.php:103 prefs.php:113 help/4.php:14
msgid "Exit preferences"
msgstr "Quitter la configuration"
-#: prefs.php:114 tt-rss.php:125 mobile/functions.php:21
+#: prefs.php:105 tt-rss.php:126 mobile/functions.php:21
msgid "Logout"
msgstr "Déconnexion"
-#: prefs.php:126
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Purger les articles"
-#: prefs.php:132 tt-rss.php:117 tt-rss.php:154 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:118 tt-rss.php:156 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Configuration"
-#: prefs.php:134 help/4.php:9
+#: prefs.php:125 help/4.php:9
msgid "My Feeds"
msgstr "Mes flux"
-#: prefs.php:137 help/4.php:10
-msgid "Other Feeds"
-msgstr "Autres flux"
-
-#: prefs.php:140
-msgid "Published Articles"
-msgstr "Articles publiés"
-
-#: prefs.php:142
+#: prefs.php:127 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "Fichier&nbsp;:"
-#: prefs.php:147
+#: prefs.php:132 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "Utilisateur"
@@ -1270,7 +1263,7 @@ msgid "How much is two plus two:"
msgstr ""
#: register.php:193
-msgid "Submit registration\""
+msgid "Submit registration"
msgstr ""
#: register.php:211
@@ -1399,141 +1392,145 @@ msgstr ""
msgid "Fatal Error"
msgstr "Erreur critique"
-#: tt-rss.php:121
+#: tt-rss.php:122
#, fuzzy
msgid "Comments?"
msgstr "Contenu"
-#: tt-rss.php:138
+#: tt-rss.php:130
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr ""
+
+#: tt-rss.php:140
msgid "tag cloud"
msgstr "Nuage d'étiquettes"
-#: tt-rss.php:142
+#: tt-rss.php:144
#, fuzzy
msgid "More feeds..."
msgstr "Suppression d'un flux..."
-#: tt-rss.php:153
+#: tt-rss.php:155
#, fuzzy
msgid "Search..."
msgstr "Rechercher"
-#: tt-rss.php:156
+#: tt-rss.php:158
msgid "Feed actions:"
msgstr "Actions sur ce flux&nbsp;:"
-#: tt-rss.php:157
+#: tt-rss.php:159
#, fuzzy
msgid "Subscribe to feed..."
msgstr "S'inscrire à un flux"
-#: tt-rss.php:158
+#: tt-rss.php:160
#, fuzzy
msgid "Edit this feed..."
msgstr "Tout le flux"
-#: tt-rss.php:159
+#: tt-rss.php:161
#, fuzzy
msgid "Clear articles"
msgstr "Filtrer l'article"
-#: tt-rss.php:160
+#: tt-rss.php:162
#, fuzzy
msgid "Rescore feed"
msgstr "Suppression d'un flux..."
-#: tt-rss.php:161 modules/pref-feeds.php:397 modules/pref-feeds.php:1402
+#: tt-rss.php:163 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Se désinscrire"
-#: tt-rss.php:163
+#: tt-rss.php:165
msgid "All feeds:"
msgstr "Tous les flux&nbsp;:"
-#: tt-rss.php:165 help/3.php:44
+#: tt-rss.php:167 help/3.php:44
#, fuzzy
msgid "(Un)hide read feeds"
msgstr "(Dé)Masquer les flux lus"
-#: tt-rss.php:167
+#: tt-rss.php:169
msgid "Other actions:"
msgstr "Autres actions&nbsp;:"
-#: tt-rss.php:170
+#: tt-rss.php:172
#, fuzzy
msgid "Create filter..."
msgstr "Créer un filtre"
-#: tt-rss.php:171
+#: tt-rss.php:173
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;S'inscrire à ce flux"
-#: tt-rss.php:172
+#: tt-rss.php:174
#, fuzzy
msgid "Reset category order"
msgstr "Supprimer les catégories sélectionnées ?"
-#: tt-rss.php:174
+#: tt-rss.php:176
#, fuzzy
msgid "&nbsp;&nbsp;Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Purger les articles"
-#: tt-rss.php:182
+#: tt-rss.php:184
#, fuzzy
msgid "Collapse feedlist"
msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
-#: tt-rss.php:184
+#: tt-rss.php:186
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:192 mobile/functions.php:738
+#: tt-rss.php:194 mobile/functions.php:738
msgid "Search:"
msgstr "Rechercher&nbsp;:"
-#: tt-rss.php:200 mobile/functions.php:456
+#: tt-rss.php:202 mobile/functions.php:456
msgid "Adaptive"
msgstr "Adaptatif"
-#: tt-rss.php:201 mobile/functions.php:457
+#: tt-rss.php:203 mobile/functions.php:457
msgid "All Articles"
msgstr "Tous les articles"
-#: tt-rss.php:204
+#: tt-rss.php:206
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:205 modules/pref-feeds.php:1247 modules/pref-feeds.php:1310
+#: tt-rss.php:207 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "Mis à jour"
-#: tt-rss.php:208
+#: tt-rss.php:210
#, fuzzy
msgid "Order:"
msgstr "Autre&nbsp;:"
-#: tt-rss.php:212 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:214 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:443
#, fuzzy
msgid "Date"
msgstr "Mettre à jour"
-#: tt-rss.php:214
+#: tt-rss.php:216
msgid "Score"
msgstr ""
-#: tt-rss.php:218
+#: tt-rss.php:220
msgid "Limit:"
msgstr "Limite&nbsp;:"
-#: tt-rss.php:243 modules/pref-feeds.php:261 modules/pref-feeds.php:458
+#: tt-rss.php:245 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Mettre à jour"
-#: tt-rss.php:261
+#: tt-rss.php:263
msgid "Drag me to resize panels"
msgstr ""
@@ -1595,6 +1592,11 @@ msgid ""
"\t\t\tversion <b>%d</b>."
msgstr "Terminé. Le schéma est passé de la version <b>%d</b> à <b>%d</b>."
+#: modules/help.php:6
+#, fuzzy
+msgid "Help"
+msgstr "Bonjour,"
+
#: modules/help.php:17
msgid "Help topic not found."
msgstr "Sujet non trouvé dans l'aide."
@@ -1633,67 +1635,72 @@ msgstr "Erreur&nbsp;: impossible de trouver la balise body."
msgid "Notice"
msgstr "Avertissement"
-#: modules/popup-dialog.php:12
+#: modules/popup-dialog.php:14
+#, fuzzy
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."
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
msgstr ""
"Le démon de mise à jour est activé dans la configuration\n"
"\t\t\t\tmais il n'est pas lancé et donc rien n'est mis à jour.\n"
"\t\t\t\tVeuillez le démarrer ou contacter l'administrateur de votre Tiny "
"Tiny RSS."
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
msgid "Last update:"
msgstr "Dernière mise à jour&nbsp;:"
#: modules/popup-dialog.php:26
+#, fuzzy
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."
+"You are running the latest version of Tiny Tiny RSS. The fact that you are "
+"seeing this dialog is probably a bug."
msgstr ""
"Vous utilisez la dernière version de Tiny Tiny RSS.\n"
"\t\t\t\t\tSi vous pouvez lire ce message, vous avez sans doute trouvé un bug."
-#: modules/popup-dialog.php:35
+#: modules/popup-dialog.php:34
+#, fuzzy
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."
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
msgstr ""
"Tiny Tiny RSS a constaté que le démon de mise à jour met trop de temps\n"
"\t\t\t\t\tà mettre les flux à jour. Il a peut-être planté.\n"
"\t\t\t\t\tVeuillez vérifier son état ou bien contacter l'administrateur de "
"votre Tiny Tiny RSS."
+#: modules/popup-dialog.php:48
+msgid "Visit official site"
+msgstr ""
+
#: modules/popup-dialog.php:61
#, fuzzy
msgid "Subscribe to Feed"
msgstr "S'inscrire à un flux"
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:422 modules/pref-filters.php:403
+#: modules/popup-dialog.php:70 modules/pref-feeds.php:140
+#: modules/pref-feeds.php:397 modules/pref-filters.php:403
msgid "Feed"
msgstr "Flux"
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:181
-#: modules/pref-feeds.php:436
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:156
+#: modules/pref-feeds.php:411
#, fuzzy
msgid "URL:"
msgstr "URL du flux&nbsp;:"
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:193
-#: modules/pref-feeds.php:448
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:168
+#: modules/pref-feeds.php:423
#, fuzzy
msgid "Place in category:"
msgstr "Enregistrement de la catégorie..."
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:297
-#: modules/pref-feeds.php:492 modules/pref-prefs.php:264
-#: modules/pref-users.php:149
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:272
+#: modules/pref-feeds.php:467 modules/pref-prefs.php:262
+#: modules/pref-users.php:142
msgid "Authentication"
msgstr "Identification"
@@ -1701,23 +1708,22 @@ msgstr "Identification"
msgid "This feed requires authentication."
msgstr "Ce flux nécessite une identification."
-#: modules/popup-dialog.php:130 modules/pref-feed-browser.php:166
-#: modules/pref-feeds.php:128
+#: modules/popup-dialog.php:130 modules/pref-feeds.php:103
msgid "Subscribe"
msgstr "S'inscrire"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:130 modules/pref-feeds.php:402
-#: modules/pref-feeds.php:556 modules/pref-filters.php:166
-#: modules/pref-users.php:184
+#: modules/pref-feeds.php:105 modules/pref-feeds.php:377
+#: modules/pref-feeds.php:531 modules/pref-filters.php:166
+#: modules/pref-users.php:183
msgid "Cancel"
msgstr "Annuler"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feed-browser.php:125
-#: modules/pref-feeds.php:1143 modules/pref-filters.php:307
-#: modules/pref-labels.php:105 modules/pref-users.php:364
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-labels.php:96 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1789,9 +1795,9 @@ msgstr "Exécuter les mises à jour"
msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:315
-#: modules/pref-feeds.php:510 modules/pref-filters.php:123
-#: modules/pref-users.php:165
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:290
+#: modules/pref-feeds.php:485 modules/pref-filters.php:123
+#: modules/pref-users.php:164
#, fuzzy
msgid "Options"
msgstr "Options&nbsp;:"
@@ -1828,9 +1834,9 @@ msgstr "Modifier les étiquettes"
msgid "Tags for this article (separated by commas):"
msgstr "Étiquettes pour cet article (séparées par des virgules)&nbsp;:"
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:400
-#: modules/pref-feeds.php:554 modules/pref-filters.php:162
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:529 modules/pref-filters.php:162
+#: modules/pref-users.php:180
msgid "Save"
msgstr "Enregistrer"
@@ -1846,47 +1852,6 @@ msgstr "Affichage des étiquettes les plus populaires "
msgid "browse more"
msgstr "en afficher plus"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr "Le navigateur de flux a été désactivé par l'administrateur."
-
-#: modules/pref-feed-browser.php:15
-msgid "Feed information:"
-msgstr "Information sur le flux&nbsp;:"
-
-#: modules/pref-feed-browser.php:39
-#, fuzzy
-msgid "Site:"
-msgstr "Titre&nbsp;:"
-
-#: modules/pref-feed-browser.php:41
-#, fuzzy
-msgid "Last updated:"
-msgstr "Dernière mise à jour&nbsp;:"
-
-#: modules/pref-feed-browser.php:56
-msgid "Last headlines:"
-msgstr "Derniers en-têtes&nbsp;:"
-
-#: modules/pref-feed-browser.php:112
-msgid ""
-"Feed browser cache information is missing. Please refer to the <a "
-"class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-"FeedBrowser'>wiki</a> for more information."
-msgstr ""
-
-#: modules/pref-feed-browser.php:129
-msgid "Top"
-msgstr "Top"
-
-#: modules/pref-feed-browser.php:138
-msgid "Show"
-msgstr "Afficher"
-
-#: modules/pref-feed-browser.php:222
-msgid "Couldn't find any feeds available for subscription."
-msgstr ""
-
#: modules/pref-feeds.php:4
msgid "Check to enable field"
msgstr ""
@@ -1895,190 +1860,207 @@ msgstr ""
msgid "Subscribed to feeds:"
msgstr "Inscrit aux flux&nbsp;:"
+#: modules/pref-feeds.php:59
+msgid "Feed browser is administratively disabled."
+msgstr "Le navigateur de flux a été désactivé par l'administrateur."
+
#: modules/pref-feeds.php:63
-msgid "Other feeds: Top 25"
-msgstr "Autres flux&nbsp;: Top 25"
+#, fuzzy
+msgid "Feed Browser"
+msgstr "Éditeur de flux"
-#: modules/pref-feeds.php:67
-msgid "Showing top 25 registered feeds, sorted by popularity:"
-msgstr ""
-"Affichage des 25 meilleurs flux enregistrés, classés par popularité&nbsp;:"
+#: modules/pref-feeds.php:81
+msgid "Top"
+msgstr "Top"
-#: modules/pref-feeds.php:117
-#, fuzzy
-msgid "No feeds found."
-msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
+#: modules/pref-feeds.php:90
+msgid "Show"
+msgstr "Afficher"
-#: modules/pref-feeds.php:155
+#: modules/pref-feeds.php:130
#, fuzzy
msgid "Feed Editor"
msgstr "Éditeur de flux"
-#: modules/pref-feeds.php:210
+#: modules/pref-feeds.php:185
#, fuzzy
msgid "Link to feed:"
msgstr "Lier à&nbsp;:"
-#: modules/pref-feeds.php:227
+#: modules/pref-feeds.php:202
msgid "Not linked"
msgstr "Non lié"
-#: modules/pref-feeds.php:275 modules/pref-feeds.php:471
+#: modules/pref-feeds.php:250 modules/pref-feeds.php:446
msgid "using"
msgstr ""
-#: modules/pref-feeds.php:287 modules/pref-feeds.php:483
+#: modules/pref-feeds.php:262 modules/pref-feeds.php:458
msgid "Article purging:"
msgstr "Purge des articles&nbsp;:"
-#: modules/pref-feeds.php:329 modules/pref-feeds.php:516
+#: modules/pref-feeds.php:304 modules/pref-feeds.php:491
msgid "Hide from \"Other Feeds\""
msgstr "Masquer dans «&nbsp;Autres flux&nbsp;»"
-#: modules/pref-feeds.php:340 modules/pref-feeds.php:521
+#: modules/pref-feeds.php:315 modules/pref-feeds.php:496
msgid "Right-to-left content"
msgstr "Contenu écrit de droite à gauche"
-#: modules/pref-feeds.php:351 modules/pref-feeds.php:526
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:501
msgid "Hide from my feed list"
msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
-#: modules/pref-feeds.php:363 modules/pref-feeds.php:532
+#: modules/pref-feeds.php:338 modules/pref-feeds.php:507
msgid "Include in e-mail digest"
msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
-#: modules/pref-feeds.php:384 modules/pref-feeds.php:540
+#: modules/pref-feeds.php:359 modules/pref-feeds.php:515
msgid "Cache images locally"
msgstr "Enregistrer localement les images"
-#: modules/pref-feeds.php:412
+#: modules/pref-feeds.php:387
#, fuzzy
msgid "Multiple Feed Editor"
msgstr "Éditeur de flux"
-#: modules/pref-feeds.php:784 modules/pref-feeds.php:831
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:862
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Inscrit à <b>%s</b>."
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Déjà inscrit à <b>%s</b>."
-#: modules/pref-feeds.php:965
+#: modules/pref-feeds.php:860
+msgid "Edit subscription options"
+msgstr ""
+
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Éditeur de catégorie"
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "La catégorie <b>%s</b> existe déjà dans la base de données."
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "Impossible de supprimer une catégorie de flux non vide."
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Créer la catégorie"
-#: modules/pref-feeds.php:1093
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Aucune catégorie de flux définie."
-#: modules/pref-feeds.php:1104 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:178
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-users.php:474
msgid "Remove"
msgstr "Supprimer"
-#: modules/pref-feeds.php:1126
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr ""
"Des erreurs sont survenues pendant la mise à jour de certains flux (cliquez "
"ici pour les détails)"
-#: modules/pref-feeds.php:1148 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
msgid "Subscribe to feed"
msgstr "S'inscrire à un flux"
-#: modules/pref-feeds.php:1153
-msgid "Top 25"
-msgstr "Top 25"
+#: modules/pref-feeds.php:1134
+#, fuzzy
+msgid "More Feeds"
+msgstr "Suppression d'un flux..."
-#: modules/pref-feeds.php:1227
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Afficher l'heure du dernier article"
-#: modules/pref-feeds.php:1244 modules/pref-feeds.php:1306
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Dernier&nbsp;article"
-#: modules/pref-feeds.php:1331 modules/pref-filters.php:461
-#: modules/pref-users.php:456
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:461
+#: modules/pref-users.php:449
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1377 modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1320
+msgid "(Hidden)"
+msgstr ""
+
+#: modules/pref-feeds.php:1333
+#, php-format
+msgid "(linked to %s)"
+msgstr ""
+
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Sélection&nbsp;:"
-#: modules/pref-feeds.php:1383
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Changer de catégorie"
-#: modules/pref-feeds.php:1392 modules/pref-filters.php:485
-#: modules/pref-users.php:479
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:485
+#: modules/pref-users.php:472
msgid "Edit"
msgstr "Modifier"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "Purger manuellement"
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Purger les données de flux"
-#: modules/pref-feeds.php:1401 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
#, fuzzy
msgid "Rescore articles"
msgstr "Articles mémorisés"
-#: modules/pref-feeds.php:1407
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Autre&nbsp;:"
-#: modules/pref-feeds.php:1408
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Modifier les catégories"
-#: modules/pref-feeds.php:1415
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "Fichier&nbsp;:"
-#: modules/pref-feeds.php:1422
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importer"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Exporter en OPML"
-#: modules/pref-feeds.php:1432
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Intégration à Firefox"
-#: modules/pref-feeds.php:1434
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2086,11 +2068,11 @@ msgstr ""
"Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
"en cliquant sur le lien ci-dessous."
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr "Cliquez ici pour enregistrer ce site comme lecteur de flux."
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1429
#, fuzzy
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
@@ -2099,16 +2081,21 @@ msgstr ""
"Les articles publiés sont exportés comme un flux RSS public et toute "
"personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire."
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "Articles publiés"
-#: modules/pref-feeds.php:1454
+#: modules/pref-feeds.php:1436
#, fuzzy
msgid "Generate another link"
msgstr "Générer une autre adresse"
+#: modules/pref-feeds.php:1502
+#, fuzzy
+msgid "No feeds found."
+msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
+
#: modules/pref-filters.php:23
#, fuzzy
msgid "Filter Editor"
@@ -2163,20 +2150,20 @@ msgstr "Aucun filtre défini."
msgid "No matching filters found."
msgstr "Aucun article trouvé."
-#: modules/pref-labels.php:75
+#: modules/pref-labels.php:66
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Intitulé <b>%s</b> créé"
-#: modules/pref-labels.php:113 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Créer un intitulé"
-#: modules/pref-labels.php:184
+#: modules/pref-labels.php:175
msgid "No labels defined."
msgstr "Aucun intitulé défini."
-#: modules/pref-labels.php:186
+#: modules/pref-labels.php:177
#, fuzzy
msgid "No matching labels found."
msgstr "Aucun article trouvé."
@@ -2193,15 +2180,20 @@ msgstr "L'ancien mot de passe n'est pas correct."
msgid "The configuration was saved."
msgstr "La configuration a été enregistrée."
+#: modules/pref-prefs.php:132
+#, php-format
+msgid "Unknown option: %s"
+msgstr ""
+
#: modules/pref-prefs.php:143
msgid "E-mail has been changed."
msgstr "L'adresse électronique a été modifiée."
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:215
+#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
msgid "The configuration was reset to defaults."
msgstr "La configuration a été réinitialisée à ses valeurs par défaut."
-#: modules/pref-prefs.php:200
+#: modules/pref-prefs.php:198
msgid ""
"Your password is at default value, \n"
"\t\t\t\t\t\tplease change it."
@@ -2209,68 +2201,68 @@ msgstr ""
"Le mot de passe actuel est celui par défaut.\n"
"\t\t\t\t\t\tVeuillez le modifier."
-#: modules/pref-prefs.php:227
+#: modules/pref-prefs.php:225
msgid "Personal data"
msgstr "Données personnelles"
-#: modules/pref-prefs.php:234
+#: modules/pref-prefs.php:232
msgid "E-mail"
msgstr "Adresse électronique"
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
#, fuzzy
msgid "Access level"
msgstr "Permissions&nbsp;:"
-#: modules/pref-prefs.php:258
+#: modules/pref-prefs.php:256
msgid "Change e-mail"
msgstr "Modifier l'adresse électronique"
-#: modules/pref-prefs.php:266
+#: modules/pref-prefs.php:264
msgid "Old password"
msgstr "Ancien mot de passe"
-#: modules/pref-prefs.php:273
+#: modules/pref-prefs.php:271
msgid "New password"
msgstr "Nouveau mot de passe"
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:279
msgid "Confirm password"
msgstr "Confirmation du mot de passe"
-#: modules/pref-prefs.php:298
+#: modules/pref-prefs.php:296
msgid "Change password"
msgstr "Modifier le mot de passe"
-#: modules/pref-prefs.php:314
+#: modules/pref-prefs.php:312
msgid "Themes"
msgstr "Thèmes"
-#: modules/pref-prefs.php:315
+#: modules/pref-prefs.php:313
msgid "Select theme"
msgstr "Sélectionner un thème"
-#: modules/pref-prefs.php:333
+#: modules/pref-prefs.php:331
msgid "Change theme"
msgstr "Modifier le thème"
-#: modules/pref-prefs.php:390
+#: modules/pref-prefs.php:388
msgid "short_desc"
msgstr ""
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Oui"
-#: modules/pref-prefs.php:404 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
msgid "No"
msgstr "Non"
-#: modules/pref-prefs.php:429
+#: modules/pref-prefs.php:427
msgid "Save configuration"
msgstr "Enregistrer la configuration"
-#: modules/pref-prefs.php:433
+#: modules/pref-prefs.php:431
msgid "Reset to defaults"
msgstr "Revenir aux valeurs par défaut"
@@ -2279,63 +2271,72 @@ msgstr "Revenir aux valeurs par défaut"
msgid "Your access level is insufficient to open this tab."
msgstr "Vous n'avez pas les permissions nécessaires pour exécuter ce script."
-#: modules/pref-users.php:54 modules/pref-users.php:417
+#: modules/pref-users.php:17 modules/pref-users.php:470
+msgid "User details"
+msgstr "Détails de l'utilisateur"
+
+#: modules/pref-users.php:31
+#, fuzzy
+msgid "User not found"
+msgstr "Flux non trouvé."
+
+#: modules/pref-users.php:50 modules/pref-users.php:410
msgid "Registered"
msgstr "Abonné"
-#: modules/pref-users.php:55
+#: modules/pref-users.php:51
msgid "Last logged in"
msgstr "Dernière connexion"
-#: modules/pref-users.php:72
+#: modules/pref-users.php:58
msgid "Subscribed feeds count"
msgstr "Nombre d'abonnements à des flux"
-#: modules/pref-users.php:76
+#: modules/pref-users.php:62
msgid "Subscribed feeds"
msgstr "Abonnements à des flux"
-#: modules/pref-users.php:122
+#: modules/pref-users.php:108
#, fuzzy
msgid "User Editor"
msgstr "Éditeur d'utilisateur"
-#: modules/pref-users.php:152
+#: modules/pref-users.php:145
#, fuzzy
msgid "Access level: "
msgstr "Permissions&nbsp;:"
-#: modules/pref-users.php:159
+#: modules/pref-users.php:158
#, fuzzy
msgid "Change password to"
msgstr "Modifier le mot de passe"
-#: modules/pref-users.php:168
+#: modules/pref-users.php:167
#, fuzzy
msgid "E-mail: "
msgstr "Adresse électronique&nbsp;:"
-#: modules/pref-users.php:204
+#: modules/pref-users.php:203
#, php-format
msgid "Changed password of user <b>%s</b>."
msgstr "Mot de passe de l'utilisateur <b>%s</b> modifié."
-#: modules/pref-users.php:252
+#: modules/pref-users.php:251
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "Utilisateur <b>%s</b> ajouté avec le mot de passe <b>%s</b>"
-#: modules/pref-users.php:259
+#: modules/pref-users.php:258
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Impossible de créer l'utilisateur <b>%s</b>"
-#: modules/pref-users.php:263
+#: modules/pref-users.php:262
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "L'utilisateur <b>%s</b> existe déjà."
-#: modules/pref-users.php:283
+#: modules/pref-users.php:282
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -2344,45 +2345,41 @@ msgstr ""
"Mot de passe de l'utilisateur <b>%s</b>\n"
"\t\t\t\t\tmodifié en <b>%s</b>"
-#: modules/pref-users.php:287
+#: modules/pref-users.php:286
#, fuzzy, php-format
msgid "Notifying <b>%s</b>."
msgstr "Ajout de la catégorie <b>%s</b>."
-#: modules/pref-users.php:324
+#: modules/pref-users.php:323
msgid "[tt-rss] Password change notification"
msgstr ""
-#: modules/pref-users.php:381 help/4.php:27
+#: modules/pref-users.php:374 help/4.php:27
msgid "Create user"
msgstr "Créer l'utilisateur"
-#: modules/pref-users.php:415
+#: modules/pref-users.php:408
msgid "Login"
msgstr "Se connecter"
-#: modules/pref-users.php:416
+#: modules/pref-users.php:409
msgid "Access Level"
msgstr "Permissions"
-#: modules/pref-users.php:418
+#: modules/pref-users.php:411
msgid "Last login"
msgstr "Dernière connexion"
-#: modules/pref-users.php:477
-msgid "User details"
-msgstr "Détails de l'utilisateur"
-
-#: modules/pref-users.php:483
+#: modules/pref-users.php:476
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: modules/pref-users.php:488
+#: modules/pref-users.php:481
#, fuzzy
msgid "No users defined."
msgstr "Aucun filtre défini."
-#: modules/pref-users.php:490
+#: modules/pref-users.php:483
#, fuzzy
msgid "No matching users found."
msgstr "Aucun article trouvé."
@@ -2560,17 +2557,9 @@ msgstr ""
msgid "Press any key to close this window."
msgstr "Fermer cette fenêtre"
-#: help/4.php:11
-msgid "Content Filtering"
-msgstr "Filtrage de contenu"
-
-#: help/4.php:12
-msgid "Label Editor"
-msgstr "Éditeur d'intitulé"
-
-#: help/4.php:13
-msgid "User Manager"
-msgstr "Gestionnaire d'utilisateurs"
+#: help/4.php:10
+msgid "Other Feeds"
+msgstr "Autres flux"
#: help/4.php:19
#, fuzzy
@@ -2644,6 +2633,45 @@ msgstr "Correspondance sur&nbsp;:"
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "Unknown Error"
+#~ msgstr "Erreur inconnue"
+
+#~ msgid "Published Articles"
+#~ msgstr "Articles publiés"
+
+#~ msgid "Feed information:"
+#~ msgstr "Information sur le flux&nbsp;:"
+
+#, fuzzy
+#~ msgid "Site:"
+#~ msgstr "Titre&nbsp;:"
+
+#, fuzzy
+#~ msgid "Last updated:"
+#~ msgstr "Dernière mise à jour&nbsp;:"
+
+#~ msgid "Last headlines:"
+#~ msgstr "Derniers en-têtes&nbsp;:"
+
+#~ msgid "Other feeds: Top 25"
+#~ msgstr "Autres flux&nbsp;: Top 25"
+
+#~ msgid "Showing top 25 registered feeds, sorted by popularity:"
+#~ msgstr ""
+#~ "Affichage des 25 meilleurs flux enregistrés, classés par popularité&nbsp;:"
+
+#~ msgid "Top 25"
+#~ msgstr "Top 25"
+
+#~ msgid "Content Filtering"
+#~ msgstr "Filtrage de contenu"
+
+#~ msgid "Label Editor"
+#~ msgstr "Éditeur d'intitulé"
+
+#~ msgid "User Manager"
+#~ msgstr "Gestionnaire d'utilisateurs"
+
#~ msgid "Toggle:"
#~ msgstr "Marquages spéciaux&nbsp;:"
@@ -2718,10 +2746,6 @@ msgstr ""
#~ msgid "Match SQL"
#~ msgstr "Correspondance"
-#, fuzzy
-#~ msgid "Help"
-#~ msgstr "Bonjour,"
-
#~ msgid "Saved label <b>%s</b>"
#~ msgstr "Intitulé <b>%s</b> enregistré"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 3179538e8..66dd6fe76 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.mo
+++ b/locale/hu_HU/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 2f66456e3..6d001c9e9 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: 2009-01-22 00:21+0300\n"
+"POT-Creation-Date: 2009-01-25 23:34+0300\n"
"PO-Revision-Date: 2008-02-03 22:22::+0100\n"
"Last-Translator: MiszterX <[email protected]>\n"
"Language-Team: HUNGARIAN <[email protected]>\n"
@@ -81,7 +81,7 @@ msgstr "Napi"
msgid "Weekly"
msgstr "Heti"
-#: backend.php:122 tt-rss.php:211 modules/pref-prefs.php:317
+#: backend.php:122 tt-rss.php:213 modules/pref-prefs.php:315
msgid "Default"
msgstr "Alapértelmezett"
@@ -94,7 +94,7 @@ msgstr "Oldal"
msgid "SimplePie"
msgstr ""
-#: backend.php:133 modules/pref-users.php:140
+#: backend.php:133 modules/pref-users.php:126
msgid "User"
msgstr "Felhasználó"
@@ -164,227 +164,227 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2852 modules/popup-dialog.php:175
+#: functions.php:2808 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Minden feed"
-#: functions.php:2881 functions.php:2920 functions.php:3309 functions.php:4324
-#: functions.php:4354 modules/pref-feeds.php:1266
+#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
+#: functions.php:4248 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Kategorizálatlan"
-#: functions.php:2910 functions.php:3505 mobile/functions.php:33
+#: functions.php:2866 functions.php:3459 mobile/functions.php:33
msgid "Special"
msgstr "Speciális"
-#: functions.php:2912 functions.php:3338 functions.php:3507 prefs.php:144
-#: mobile/functions.php:83
+#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Címkék"
-#: functions.php:2930 functions.php:3331 functions.php:4178 help/3.php:59
+#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Csillagost hírek"
-#: functions.php:2932 functions.php:3335 functions.php:4185
-#: modules/pref-feeds.php:1441 help/3.php:60 mobile/functions.php:70
+#: functions.php:2888 functions.php:3291 functions.php:4079
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Publikált hírek"
-#: functions.php:2934 functions.php:3341 functions.php:4163 help/3.php:58
+#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Olvasatlan hírek"
-#: functions.php:2936 functions.php:3344 functions.php:4156 help/3.php:57
+#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Minden hír"
-#: functions.php:3295 functions.php:3297
+#: functions.php:3251 functions.php:3253
msgid "Search results"
msgstr "Keresési találatok"
-#: functions.php:3313 functions.php:3326 functions.php:3332 functions.php:3336
-#: functions.php:3342 functions.php:3345 functions.php:3353
+#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
+#: functions.php:3298 functions.php:3301 functions.php:3309
msgid "Searched for"
msgstr ""
-#: functions.php:3984 functions.php:5351 modules/pref-feeds.php:1047
-#: modules/pref-feeds.php:1228 modules/pref-filters.php:366
-#: modules/pref-labels.php:138 modules/pref-users.php:408
+#: functions.php:3929
+msgid "Generated feed"
+msgstr ""
+
+#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
+#: modules/pref-labels.php:129 modules/pref-users.php:401
msgid "Select:"
msgstr "Kiválaszt:"
-#: functions.php:3985 modules/pref-feeds.php:1048 modules/pref-feeds.php:1229
-#: modules/pref-filters.php:367 modules/pref-labels.php:139
-#: modules/pref-users.php:409 mobile/functions.php:570
+#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Mind"
-#: functions.php:3986 functions.php:4002 tt-rss.php:203
+#: functions.php:3936 functions.php:3952 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Olvasatlan"
-#: functions.php:3987 mobile/functions.php:573
+#: functions.php:3937 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(ellentét)"
-#: functions.php:3988 modules/pref-feeds.php:1049 modules/pref-feeds.php:1230
-#: modules/pref-filters.php:368 modules/pref-labels.php:140
-#: modules/pref-users.php:410 mobile/functions.php:572
+#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Egyiksem"
-#: functions.php:3996 tt-rss.php:152 modules/pref-feeds.php:1389
+#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Műveletek"
-#: functions.php:4001
+#: functions.php:3951
#, fuzzy
msgid "Selection toggle:"
msgstr "Kiválaszt:"
-#: functions.php:4003 tt-rss.php:202 mobile/functions.php:459
+#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Csillagoz"
-#: functions.php:4004
+#: functions.php:3954
msgid "Published"
msgstr "Publikál"
-#: functions.php:4006
+#: functions.php:3956
msgid "Mark as read:"
msgstr ""
-#: functions.php:4007 mobile/functions.php:578
+#: functions.php:3957 mobile/functions.php:578
msgid "Selection"
msgstr "Kiválasztottakat"
-#: functions.php:4009 mobile/functions.php:580
+#: functions.php:3959 mobile/functions.php:580
msgid "Entire feed"
msgstr "Összes feed"
-#: functions.php:4013
+#: functions.php:3963
#, fuzzy
msgid "Assign label:"
msgstr "Tag felajánlása"
-#: functions.php:4016 tt-rss.php:169
-#, fuzzy
-msgid "Create label..."
-msgstr "Címke készítése"
-
-#: functions.php:4028
-#, fuzzy
-msgid "(remove)"
-msgstr "Eltávolít"
-
-#: functions.php:4065
-msgid "Generated feed"
-msgstr ""
-
-#: functions.php:4110
+#: functions.php:4004
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4374
+#: functions.php:4268
msgid "No feeds to display."
msgstr ""
-#: functions.php:4391 mobile/functions.php:12
+#: functions.php:4285 mobile/functions.php:12
msgid "Tags"
msgstr ""
-#: functions.php:4627
+#: functions.php:4521
msgid " - "
msgstr ""
-#: functions.php:4682 functions.php:4683
-msgid "no tags"
-msgstr ""
-
-#: functions.php:4690
+#: functions.php:4545 functions.php:5220
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4698
+#: functions.php:4553
#, fuzzy
msgid "Display original article content"
msgstr "Mutasd az utolsó hír időpontját"
-#: functions.php:4705 functions.php:5361
+#: functions.php:4560 functions.php:5211
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4742 functions.php:5285
+#: functions.php:4593 functions.php:5135
#, fuzzy
msgid "unknown type"
msgstr "Ismeretlen hiba"
-#: functions.php:4748 functions.php:5291
+#: functions.php:4599 functions.php:5141
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4784 functions.php:5325
+#: functions.php:4635 functions.php:5175
msgid "Attachment:"
msgstr "Csatolmány:"
-#: functions.php:4786 functions.php:5327
+#: functions.php:4637 functions.php:5177
msgid "Attachments:"
msgstr "Csatolmányok:"
-#: functions.php:4806 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1098
+#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr ""
-#: functions.php:4862 modules/pref-feed-browser.php:75
+#: functions.php:4713
msgid "Feed not found."
msgstr "Feed nem található"
-#: functions.php:4931 mobile/functions.php:423
+#: functions.php:4782 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5259
+#: functions.php:5109
#, fuzzy
msgid "Click to expand article"
msgstr "Tárolt hírek"
-#: functions.php:5419
+#: functions.php:5246
#, fuzzy
msgid "No unread articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5422
+#: functions.php:5249
#, fuzzy
msgid "No updated articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5425
+#: functions.php:5252
#, fuzzy
msgid "No starred articles found to display."
msgstr "Nincs megjeleníthető hír"
-#: functions.php:5429
+#: functions.php:5256
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5431
+#: functions.php:5258
#, fuzzy
msgid "No articles found to display."
msgstr "Nincs megjeleníthető hír"
+#: functions.php:5931 tt-rss.php:171
+#, fuzzy
+msgid "Create label..."
+msgstr "Címke készítése"
+
+#: functions.php:5944
+#, fuzzy
+msgid "(remove)"
+msgstr "Eltávolít"
+
+#: functions.php:5988
+msgid "no tags"
+msgstr ""
+
#: localized_js.php:35
msgid "display feeds"
msgstr ""
@@ -393,7 +393,7 @@ msgstr ""
msgid "display tags"
msgstr ""
-#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
+#: localized_js.php:37 prefs.php:66 prefs.php:138 tt-rss.php:68
msgid "Loading, please wait..."
msgstr "Töltés, kérem várjon..."
@@ -591,7 +591,7 @@ msgstr ""
msgid "Could not display article (missing XML object)"
msgstr ""
-#: localized_js.php:95 tt-rss.php:257 tt-rss.php:270
+#: localized_js.php:95 tt-rss.php:259 tt-rss.php:272
msgid "No feed selected."
msgstr ""
@@ -769,8 +769,8 @@ msgstr "Leiratkozik a kiválasztott feedekről?"
msgid "Saving feeds..."
msgstr "Címke mentése"
-#: localized_schema.php:9 tt-rss.php:213 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1241 modules/pref-feeds.php:1302
+#: localized_schema.php:9 tt-rss.php:215 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Cím"
@@ -796,7 +796,7 @@ msgstr ""
msgid "Filter article"
msgstr ""
-#: localized_schema.php:16 tt-rss.php:164 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:166 mobile/functions.php:583
msgid "Mark as read"
msgstr "Olvasottá tesz"
@@ -808,249 +808,254 @@ msgstr "Csillagoz"
msgid "Assign tags"
msgstr "Tag felajánlása"
-#: localized_schema.php:23
+#: localized_schema.php:20
+#, fuzzy
+msgid "Assign label"
+msgstr "Tag felajánlása"
+
+#: localized_schema.php:24
msgid "General"
msgstr "Általános"
-#: localized_schema.php:25
+#: localized_schema.php:26
msgid "Allow duplicate posts"
msgstr "Dupla postok engedélyezése"
-#: localized_schema.php:26
+#: localized_schema.php:27
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:27
+#: localized_schema.php:28
msgid "Default interval between feed updates (in minutes)"
msgstr ""
-#: localized_schema.php:28
+#: localized_schema.php:29
msgid "Enable e-mail digest"
msgstr ""
-#: localized_schema.php:29
+#: localized_schema.php:30
msgid ""
"This option enables sending daily digest of new (and unread) headlines on "
"your configured e-mail address"
msgstr ""
-#: localized_schema.php:30
+#: localized_schema.php:31
msgid "Purge old posts after this number of days (0 - disables)"
msgstr ""
-#: localized_schema.php:31
+#: localized_schema.php:32
msgid "Update post on checksum change"
msgstr ""
-#: localized_schema.php:32
+#: localized_schema.php:33
#, fuzzy
msgid "Mark articles in e-mail digest as read"
msgstr "Minden hírt olvasottá tesz itt: %s?"
-#: localized_schema.php:34
+#: localized_schema.php:35
msgid "Interface"
msgstr ""
-#: localized_schema.php:36
+#: localized_schema.php:37
msgid "Combined feed display"
msgstr ""
-#: localized_schema.php:37
+#: localized_schema.php:38
msgid ""
"Display expanded list of feed articles, instead of separate displays for "
"headlines and article content"
msgstr ""
-#: localized_schema.php:38
+#: localized_schema.php:39
msgid "Default article limit"
msgstr "Alapértelmezett hír limit"
-#: localized_schema.php:39
+#: localized_schema.php:40
msgid ""
"Default limit for articles to display, any custom number you like (0 - "
"disables)."
msgstr ""
-#: localized_schema.php:40
+#: localized_schema.php:41
msgid "Enable feed categories"
msgstr ""
-#: localized_schema.php:41
+#: localized_schema.php:42
msgid "Enable search toolbar"
msgstr "Kereső bár engedéjezése"
-#: localized_schema.php:42
+#: localized_schema.php:43
msgid "Hide feeds with no unread messages"
msgstr ""
-#: localized_schema.php:43
+#: localized_schema.php:44
msgid "Mark articles as read automatically"
msgstr "Hírek olvasottá tétele autómatikusan"
-#: localized_schema.php:44
+#: localized_schema.php:45
msgid ""
"This option enables marking articles as read automatically in combined mode "
"(except for Fresh articles feed) while you scroll article list."
msgstr ""
-#: localized_schema.php:45
+#: localized_schema.php:46
msgid "On catchup show next feed"
msgstr ""
-#: localized_schema.php:46
+#: localized_schema.php:47
msgid ""
"When \"Mark as read\" button is clicked in toolbar, automatically open next "
"feed with unread articles."
msgstr ""
-#: localized_schema.php:47
+#: localized_schema.php:48
msgid "Open article links in new browser window"
msgstr ""
-#: localized_schema.php:48
+#: localized_schema.php:49
msgid "Reverse headline order (oldest first)"
msgstr ""
-#: localized_schema.php:49
+#: localized_schema.php:50
msgid "Show content preview in headlines list"
msgstr ""
-#: localized_schema.php:50
+#: localized_schema.php:51
msgid "Sort feeds by unread articles count"
msgstr ""
-#: localized_schema.php:51
+#: localized_schema.php:52
msgid "User stylesheet URL"
msgstr "Felhasználó stíluslap URL"
-#: localized_schema.php:52
+#: localized_schema.php:53
msgid "Link to user stylesheet to override default style, disabled if empty."
msgstr ""
-#: localized_schema.php:53
+#: localized_schema.php:54
msgid "Maximum age of fresh articles (in hours)"
msgstr "Maximum kor a friss híreknek (órákban)"
-#: localized_schema.php:54
+#: localized_schema.php:55
msgid "Hide feedlist"
msgstr ""
-#: localized_schema.php:55
+#: localized_schema.php:56
msgid ""
"This option hides feedlist and allows it to be toggled on the fly, useful "
"for small screens."
msgstr ""
-#: localized_schema.php:56
+#: localized_schema.php:57
msgid "Group headlines in virtual feeds"
msgstr ""
-#: localized_schema.php:57
+#: localized_schema.php:58
msgid ""
"When this option is enabled, headlines in Special feeds and Labels are "
"grouped by feeds"
msgstr ""
-#: localized_schema.php:59
+#: localized_schema.php:60
msgid "Advanced"
msgstr ""
-#: localized_schema.php:61
+#: localized_schema.php:62
msgid "Blacklisted tags"
msgstr "Feketelistás tagek"
-#: localized_schema.php:62
+#: localized_schema.php:63
msgid ""
"When auto-detecting tags in articles these tags will not be applied (comma-"
"separated list)."
msgstr ""
-#: localized_schema.php:63
+#: localized_schema.php:64
msgid "Confirm marking feed as read"
msgstr ""
-#: localized_schema.php:64
+#: localized_schema.php:65
msgid "Enable feed icons"
msgstr ""
-#: localized_schema.php:65
+#: localized_schema.php:66
msgid "Enable labels"
msgstr ""
-#: localized_schema.php:66
+#: localized_schema.php:67
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:67
+#: localized_schema.php:68
msgid "Long date format"
msgstr ""
-#: localized_schema.php:68
+#: localized_schema.php:69
msgid "Set articles as unread on update"
msgstr ""
-#: localized_schema.php:69
+#: localized_schema.php:70
msgid "Short date format"
msgstr ""
-#: localized_schema.php:70
+#: localized_schema.php:71
msgid "Show additional information in feedlist"
msgstr ""
-#: localized_schema.php:71
+#: localized_schema.php:72
msgid "Strip unsafe tags from articles"
msgstr ""
-#: localized_schema.php:72
+#: localized_schema.php:73
msgid "Strip all but most common HTML tags when reading articles."
msgstr ""
-#: localized_schema.php:73
+#: localized_schema.php:74
msgid "Use more accessible date/time format for headlines"
msgstr ""
-#: localized_schema.php:74
+#: localized_schema.php:75
msgid "Automatically expand articles in combined mode"
msgstr ""
-#: localized_schema.php:75
+#: localized_schema.php:76
msgid "Purge unread articles"
msgstr ""
-#: localized_schema.php:76
+#: localized_schema.php:77
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: localized_schema.php:77
+#: localized_schema.php:78
msgid "Prefer more accurate feedlist counters to UI speed"
msgstr ""
-#: localized_schema.php:78
+#: localized_schema.php:79
msgid "Enable inline MP3 player"
msgstr ""
-#: localized_schema.php:79
+#: localized_schema.php:80
msgid ""
"Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
msgstr ""
-#: localized_schema.php:80
+#: localized_schema.php:81
msgid "Do not show images in articles"
msgstr ""
-#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:302
-#: modules/pref-feeds.php:495 mobile/login_form.php:59
+#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:277
+#: modules/pref-feeds.php:470 mobile/login_form.php:59
msgid "Login:"
msgstr "Felhasználó:"
-#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:306
-#: modules/pref-feeds.php:501 mobile/login_form.php:60
+#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:281
+#: modules/pref-feeds.php:476 mobile/login_form.php:60
msgid "Password:"
msgstr "Jelszó:"
@@ -1085,7 +1090,7 @@ msgstr ""
#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
#: register.php:200 register.php:213 register.php:228 register.php:246
#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162
+#: update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Vissza az RSS olvasóhoz"
@@ -1130,56 +1135,44 @@ msgstr ""
msgid "Return to preferences"
msgstr "VIssza a beállításokhoz"
-#: prefs.php:77 prefs.php:156 tt-rss.php:79
+#: prefs.php:74 prefs.php:141 tt-rss.php:76
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 ""
-#: prefs.php:104
-msgid "Unknown Error"
-msgstr "Ismeretlen Hiba"
-
-#: prefs.php:110 tt-rss.php:115
+#: prefs.php:101 tt-rss.php:116
msgid "Hello,"
msgstr "Üdv,"
-#: prefs.php:112 prefs.php:122 help/4.php:14
+#: prefs.php:103 prefs.php:113 help/4.php:14
msgid "Exit preferences"
msgstr "Kilépés a beállításokból"
-#: prefs.php:114 tt-rss.php:125 mobile/functions.php:21
+#: prefs.php:105 tt-rss.php:126 mobile/functions.php:21
msgid "Logout"
msgstr "Kijelentkezés"
-#: prefs.php:126
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Hírek törlése"
-#: prefs.php:132 tt-rss.php:117 tt-rss.php:154 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:118 tt-rss.php:156 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Beállítások"
-#: prefs.php:134 help/4.php:9
+#: prefs.php:125 help/4.php:9
msgid "My Feeds"
msgstr "Saját Feedek"
-#: prefs.php:137 help/4.php:10
-msgid "Other Feeds"
-msgstr "Mások Feedjei"
-
-#: prefs.php:140
-msgid "Published Articles"
-msgstr "Publikált Hírek"
-
-#: prefs.php:142
+#: prefs.php:127 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "File:"
-#: prefs.php:147
+#: prefs.php:132 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "Felhasználó"
@@ -1214,7 +1207,7 @@ msgid "How much is two plus two:"
msgstr ""
#: register.php:193
-msgid "Submit registration\""
+msgid "Submit registration"
msgstr ""
#: register.php:211
@@ -1315,140 +1308,144 @@ msgstr ""
msgid "Fatal Error"
msgstr "Végzetes Hiba"
-#: tt-rss.php:121
+#: tt-rss.php:122
msgid "Comments?"
msgstr "Hozzászólás?"
-#: tt-rss.php:138
+#: tt-rss.php:130
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr ""
+
+#: tt-rss.php:140
msgid "tag cloud"
msgstr "tag felhő"
-#: tt-rss.php:142
+#: tt-rss.php:144
#, fuzzy
msgid "More feeds..."
msgstr "Címke mentése"
-#: tt-rss.php:153
+#: tt-rss.php:155
#, fuzzy
msgid "Search..."
msgstr "Keresés"
-#: tt-rss.php:156
+#: tt-rss.php:158
msgid "Feed actions:"
msgstr "Feed művelet:"
-#: tt-rss.php:157
+#: tt-rss.php:159
#, fuzzy
msgid "Subscribe to feed..."
msgstr "Feliratkozás feedre"
-#: tt-rss.php:158
+#: tt-rss.php:160
#, fuzzy
msgid "Edit this feed..."
msgstr "Összes feed"
-#: tt-rss.php:159
+#: tt-rss.php:161
#, fuzzy
msgid "Clear articles"
msgstr "Minden hír"
-#: tt-rss.php:160
+#: tt-rss.php:162
#, fuzzy
msgid "Rescore feed"
msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
-#: tt-rss.php:161 modules/pref-feeds.php:397 modules/pref-feeds.php:1402
+#: tt-rss.php:163 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Leiratkozás"
-#: tt-rss.php:163
+#: tt-rss.php:165
msgid "All feeds:"
msgstr "Minden feed:"
-#: tt-rss.php:165 help/3.php:44
+#: tt-rss.php:167 help/3.php:44
#, fuzzy
msgid "(Un)hide read feeds"
msgstr "&nbsp;&nbsp;Megmutatja/elrejti az olvasott feedeket"
-#: tt-rss.php:167
+#: tt-rss.php:169
msgid "Other actions:"
msgstr "Más művelet:"
-#: tt-rss.php:170
+#: tt-rss.php:172
#, fuzzy
msgid "Create filter..."
msgstr "Szárő készítése"
-#: tt-rss.php:171
+#: tt-rss.php:173
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
-#: tt-rss.php:172
+#: tt-rss.php:174
#, fuzzy
msgid "Reset category order"
msgstr "Kiválasztott kategória eltávolítása?"
-#: tt-rss.php:174
+#: tt-rss.php:176
#, fuzzy
msgid "&nbsp;&nbsp;Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Hírek törlése"
-#: tt-rss.php:182
+#: tt-rss.php:184
#, fuzzy
msgid "Collapse feedlist"
msgstr "Minden feed"
-#: tt-rss.php:184
+#: tt-rss.php:186
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:192 mobile/functions.php:738
+#: tt-rss.php:194 mobile/functions.php:738
msgid "Search:"
msgstr "Keresés"
-#: tt-rss.php:200 mobile/functions.php:456
+#: tt-rss.php:202 mobile/functions.php:456
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:201 mobile/functions.php:457
+#: tt-rss.php:203 mobile/functions.php:457
msgid "All Articles"
msgstr "Minden hír"
-#: tt-rss.php:204
+#: tt-rss.php:206
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:205 modules/pref-feeds.php:1247 modules/pref-feeds.php:1310
+#: tt-rss.php:207 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "Frissítve"
-#: tt-rss.php:208
+#: tt-rss.php:210
#, fuzzy
msgid "Order:"
msgstr "Más:"
-#: tt-rss.php:212 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:214 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:443
#, fuzzy
msgid "Date"
msgstr "Frissítés"
-#: tt-rss.php:214
+#: tt-rss.php:216
msgid "Score"
msgstr ""
-#: tt-rss.php:218
+#: tt-rss.php:220
msgid "Limit:"
msgstr "Limit:"
-#: tt-rss.php:243 modules/pref-feeds.php:261 modules/pref-feeds.php:458
+#: tt-rss.php:245 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Frissítés"
-#: tt-rss.php:261
+#: tt-rss.php:263
msgid "Drag me to resize panels"
msgstr ""
@@ -1507,6 +1504,10 @@ msgid ""
"\t\t\tversion <b>%d</b>."
msgstr ""
+#: modules/help.php:6
+msgid "Help"
+msgstr "Segítség"
+
#: modules/help.php:17
msgid "Help topic not found."
msgstr ""
@@ -1545,30 +1546,32 @@ msgstr ""
msgid "Notice"
msgstr ""
-#: modules/popup-dialog.php:12
+#: modules/popup-dialog.php:14
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."
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
msgstr ""
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
msgid "Last update:"
msgstr ""
#: 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."
+"You are running the latest version of Tiny Tiny RSS. The fact that you are "
+"seeing this dialog is probably a bug."
msgstr ""
-#: modules/popup-dialog.php:35
+#: modules/popup-dialog.php:34
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."
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
+msgstr ""
+
+#: modules/popup-dialog.php:48
+msgid "Visit official site"
msgstr ""
#: modules/popup-dialog.php:61
@@ -1576,26 +1579,26 @@ msgstr ""
msgid "Subscribe to Feed"
msgstr "Feliratkozás feedre"
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:422 modules/pref-filters.php:403
+#: modules/popup-dialog.php:70 modules/pref-feeds.php:140
+#: modules/pref-feeds.php:397 modules/pref-filters.php:403
msgid "Feed"
msgstr ""
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:181
-#: modules/pref-feeds.php:436
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:156
+#: modules/pref-feeds.php:411
#, fuzzy
msgid "URL:"
msgstr "Feed URL:"
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:193
-#: modules/pref-feeds.php:448
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:168
+#: modules/pref-feeds.php:423
#, fuzzy
msgid "Place in category:"
msgstr "Kategória mentése"
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:297
-#: modules/pref-feeds.php:492 modules/pref-prefs.php:264
-#: modules/pref-users.php:149
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:272
+#: modules/pref-feeds.php:467 modules/pref-prefs.php:262
+#: modules/pref-users.php:142
msgid "Authentication"
msgstr "Azonosítás"
@@ -1603,23 +1606,22 @@ msgstr "Azonosítás"
msgid "This feed requires authentication."
msgstr "Ez a feed azonosítást igényel."
-#: modules/popup-dialog.php:130 modules/pref-feed-browser.php:166
-#: modules/pref-feeds.php:128
+#: modules/popup-dialog.php:130 modules/pref-feeds.php:103
msgid "Subscribe"
msgstr "Feliratkozás"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:130 modules/pref-feeds.php:402
-#: modules/pref-feeds.php:556 modules/pref-filters.php:166
-#: modules/pref-users.php:184
+#: modules/pref-feeds.php:105 modules/pref-feeds.php:377
+#: modules/pref-feeds.php:531 modules/pref-filters.php:166
+#: modules/pref-users.php:183
msgid "Cancel"
msgstr "Mégse"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feed-browser.php:125
-#: modules/pref-feeds.php:1143 modules/pref-filters.php:307
-#: modules/pref-labels.php:105 modules/pref-users.php:364
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-labels.php:96 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1692,9 +1694,9 @@ msgstr "Művelet"
msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:315
-#: modules/pref-feeds.php:510 modules/pref-filters.php:123
-#: modules/pref-users.php:165
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:290
+#: modules/pref-feeds.php:485 modules/pref-filters.php:123
+#: modules/pref-users.php:164
#, fuzzy
msgid "Options"
msgstr "Beállítások:"
@@ -1731,9 +1733,9 @@ msgstr "Tegek szerkesztése"
msgid "Tags for this article (separated by commas):"
msgstr ""
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:400
-#: modules/pref-feeds.php:554 modules/pref-filters.php:162
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:529 modules/pref-filters.php:162
+#: modules/pref-users.php:180
msgid "Save"
msgstr "Mentés"
@@ -1749,47 +1751,6 @@ msgstr "Mutasd a legnépszerűbb tageket"
msgid "browse more"
msgstr "tovább böngészik"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr "Feed böngészése letilva az adminisztrátor által."
-
-#: modules/pref-feed-browser.php:15
-msgid "Feed information:"
-msgstr "Feed információ:"
-
-#: modules/pref-feed-browser.php:39
-#, fuzzy
-msgid "Site:"
-msgstr "Cím:"
-
-#: modules/pref-feed-browser.php:41
-#, fuzzy
-msgid "Last updated:"
-msgstr "Frissítve"
-
-#: modules/pref-feed-browser.php:56
-msgid "Last headlines:"
-msgstr ""
-
-#: modules/pref-feed-browser.php:112
-msgid ""
-"Feed browser cache information is missing. Please refer to the <a "
-"class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-"FeedBrowser'>wiki</a> for more information."
-msgstr ""
-
-#: modules/pref-feed-browser.php:129
-msgid "Top"
-msgstr "Top"
-
-#: modules/pref-feed-browser.php:138
-msgid "Show"
-msgstr "Mutasd"
-
-#: modules/pref-feed-browser.php:222
-msgid "Couldn't find any feeds available for subscription."
-msgstr ""
-
#: modules/pref-feeds.php:4
msgid "Check to enable field"
msgstr ""
@@ -1798,212 +1759,235 @@ msgstr ""
msgid "Subscribed to feeds:"
msgstr "Feliratkozott feedek:"
+#: modules/pref-feeds.php:59
+msgid "Feed browser is administratively disabled."
+msgstr "Feed böngészése letilva az adminisztrátor által."
+
#: modules/pref-feeds.php:63
-msgid "Other feeds: Top 25"
-msgstr "Más feedek: Top 25"
+#, fuzzy
+msgid "Feed Browser"
+msgstr "Feed editor"
-#: modules/pref-feeds.php:67
-msgid "Showing top 25 registered feeds, sorted by popularity:"
-msgstr "Mutasd a top 25 regisztrált feedet, népszerűség szerint:"
+#: modules/pref-feeds.php:81
+msgid "Top"
+msgstr "Top"
-#: modules/pref-feeds.php:117
-#, fuzzy
-msgid "No feeds found."
-msgstr "Nem található feed a feliratkozáshoz."
+#: modules/pref-feeds.php:90
+msgid "Show"
+msgstr "Mutasd"
-#: modules/pref-feeds.php:155
+#: modules/pref-feeds.php:130
#, fuzzy
msgid "Feed Editor"
msgstr "Feed editor"
-#: modules/pref-feeds.php:210
+#: modules/pref-feeds.php:185
#, fuzzy
msgid "Link to feed:"
msgstr "Linkel ehhez:"
-#: modules/pref-feeds.php:227
+#: modules/pref-feeds.php:202
msgid "Not linked"
msgstr "Nem linkelt"
-#: modules/pref-feeds.php:275 modules/pref-feeds.php:471
+#: modules/pref-feeds.php:250 modules/pref-feeds.php:446
msgid "using"
msgstr ""
-#: modules/pref-feeds.php:287 modules/pref-feeds.php:483
+#: modules/pref-feeds.php:262 modules/pref-feeds.php:458
msgid "Article purging:"
msgstr ""
-#: modules/pref-feeds.php:329 modules/pref-feeds.php:516
+#: modules/pref-feeds.php:304 modules/pref-feeds.php:491
msgid "Hide from \"Other Feeds\""
msgstr ""
-#: modules/pref-feeds.php:340 modules/pref-feeds.php:521
+#: modules/pref-feeds.php:315 modules/pref-feeds.php:496
msgid "Right-to-left content"
msgstr ""
-#: modules/pref-feeds.php:351 modules/pref-feeds.php:526
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:501
msgid "Hide from my feed list"
msgstr ""
-#: modules/pref-feeds.php:363 modules/pref-feeds.php:532
+#: modules/pref-feeds.php:338 modules/pref-feeds.php:507
msgid "Include in e-mail digest"
msgstr ""
-#: modules/pref-feeds.php:384 modules/pref-feeds.php:540
+#: modules/pref-feeds.php:359 modules/pref-feeds.php:515
msgid "Cache images locally"
msgstr "Képek helyi tárolása"
-#: modules/pref-feeds.php:412
+#: modules/pref-feeds.php:387
#, fuzzy
msgid "Multiple Feed Editor"
msgstr "Feed editor"
-#: modules/pref-feeds.php:784 modules/pref-feeds.php:831
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:862
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:965
+#: modules/pref-feeds.php:860
+msgid "Edit subscription options"
+msgstr ""
+
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr ""
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr ""
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr ""
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Kategória létrehozása"
-#: modules/pref-feeds.php:1093
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Nincs feed kategória definiálva"
-#: modules/pref-feeds.php:1104 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:178
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-users.php:474
msgid "Remove"
msgstr "Eltávolít"
-#: modules/pref-feeds.php:1126
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "Néhány feed frissítésével gond akadt (kattints a részletekhez)"
-#: modules/pref-feeds.php:1148 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
msgid "Subscribe to feed"
msgstr "Feliratkozás feedre"
-#: modules/pref-feeds.php:1153
-msgid "Top 25"
-msgstr "Top 25"
+#: modules/pref-feeds.php:1134
+#, fuzzy
+msgid "More Feeds"
+msgstr "Címke mentése"
-#: modules/pref-feeds.php:1227
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Mutasd az utolsó hír időpontját"
-#: modules/pref-feeds.php:1244 modules/pref-feeds.php:1306
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Utolsó&nbsp;Hír"
-#: modules/pref-feeds.php:1331 modules/pref-filters.php:461
-#: modules/pref-users.php:456
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:461
+#: modules/pref-users.php:449
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1377 modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1320
+msgid "(Hidden)"
+msgstr ""
+
+#: modules/pref-feeds.php:1333
+#, php-format
+msgid "(linked to %s)"
+msgstr ""
+
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Kiválaszt:"
-#: modules/pref-feeds.php:1383
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Újrakategorizál"
-#: modules/pref-feeds.php:1392 modules/pref-filters.php:485
-#: modules/pref-users.php:479
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:485
+#: modules/pref-users.php:472
msgid "Edit"
msgstr "Szerkesztés"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Feed adatok törlése"
-#: modules/pref-feeds.php:1401 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
#, fuzzy
msgid "Rescore articles"
msgstr "Tárolt hírek"
-#: modules/pref-feeds.php:1407
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Más:"
-#: modules/pref-feeds.php:1408
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Kategóriák szerkesztése"
-#: modules/pref-feeds.php:1415
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "File:"
-#: modules/pref-feeds.php:1422
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importálás"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Exportálás OPML-be"
-#: modules/pref-feeds.php:1432
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Firefox integráció"
-#: modules/pref-feeds.php:1434
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1429
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
msgstr ""
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "Publikált hírek"
-#: modules/pref-feeds.php:1454
+#: modules/pref-feeds.php:1436
#, fuzzy
msgid "Generate another link"
msgstr "Másik cím genrálása"
+#: modules/pref-feeds.php:1502
+#, fuzzy
+msgid "No feeds found."
+msgstr "Nem található feed a feliratkozáshoz."
+
#: modules/pref-filters.php:23
#, fuzzy
msgid "Filter Editor"
@@ -2058,20 +2042,20 @@ msgstr "Nincs szűrő definiálva."
msgid "No matching filters found."
msgstr "Nincs szűrő definiálva."
-#: modules/pref-labels.php:75
+#: modules/pref-labels.php:66
#, php-format
msgid "Created label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:113 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Címke készítése"
-#: modules/pref-labels.php:184
+#: modules/pref-labels.php:175
msgid "No labels defined."
msgstr "Nincs címke definiálva."
-#: modules/pref-labels.php:186
+#: modules/pref-labels.php:177
#, fuzzy
msgid "No matching labels found."
msgstr "Nincs címke definiálva."
@@ -2088,82 +2072,87 @@ msgstr "A régi jelszó nem helyes."
msgid "The configuration was saved."
msgstr "A konfiguráció elmentve."
+#: modules/pref-prefs.php:132
+#, php-format
+msgid "Unknown option: %s"
+msgstr ""
+
#: modules/pref-prefs.php:143
msgid "E-mail has been changed."
msgstr "E-mail megváltoztatva."
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:215
+#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
msgid "The configuration was reset to defaults."
msgstr "A konfiguráció visszaállítva az alapértelmezettre."
-#: modules/pref-prefs.php:200
+#: modules/pref-prefs.php:198
msgid ""
"Your password is at default value, \n"
"\t\t\t\t\t\tplease change it."
msgstr ""
-#: modules/pref-prefs.php:227
+#: modules/pref-prefs.php:225
msgid "Personal data"
msgstr "Személyes adatok"
-#: modules/pref-prefs.php:234
+#: modules/pref-prefs.php:232
msgid "E-mail"
msgstr "E-mail"
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
#, fuzzy
msgid "Access level"
msgstr "Hozzáférési szint:"
-#: modules/pref-prefs.php:258
+#: modules/pref-prefs.php:256
msgid "Change e-mail"
msgstr "E-mail megváltoztatása"
-#: modules/pref-prefs.php:266
+#: modules/pref-prefs.php:264
msgid "Old password"
msgstr "Régi jelszó"
-#: modules/pref-prefs.php:273
+#: modules/pref-prefs.php:271
msgid "New password"
msgstr "Új jelszó"
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:279
msgid "Confirm password"
msgstr "Jelszó jóváhagyása"
-#: modules/pref-prefs.php:298
+#: modules/pref-prefs.php:296
msgid "Change password"
msgstr "Jelszó megváltoztatása"
-#: modules/pref-prefs.php:314
+#: modules/pref-prefs.php:312
msgid "Themes"
msgstr "Kinézetek"
-#: modules/pref-prefs.php:315
+#: modules/pref-prefs.php:313
msgid "Select theme"
msgstr "Kinézet választó"
-#: modules/pref-prefs.php:333
+#: modules/pref-prefs.php:331
msgid "Change theme"
msgstr "Kinlzet megváltozatása"
-#: modules/pref-prefs.php:390
+#: modules/pref-prefs.php:388
msgid "short_desc"
msgstr ""
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Igen"
-#: modules/pref-prefs.php:404 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
msgid "No"
msgstr "Nem"
-#: modules/pref-prefs.php:429
+#: modules/pref-prefs.php:427
msgid "Save configuration"
msgstr "Konfiguráció mentése"
-#: modules/pref-prefs.php:433
+#: modules/pref-prefs.php:431
msgid "Reset to defaults"
msgstr "Visszaállítás az alapértelmezettre"
@@ -2171,108 +2160,113 @@ msgstr "Visszaállítás az alapértelmezettre"
msgid "Your access level is insufficient to open this tab."
msgstr ""
-#: modules/pref-users.php:54 modules/pref-users.php:417
+#: modules/pref-users.php:17 modules/pref-users.php:470
+msgid "User details"
+msgstr "Részletek a felhasználórol "
+
+#: modules/pref-users.php:31
+#, fuzzy
+msgid "User not found"
+msgstr "Feed nem található"
+
+#: modules/pref-users.php:50 modules/pref-users.php:410
msgid "Registered"
msgstr "Regisztrált"
-#: modules/pref-users.php:55
+#: modules/pref-users.php:51
msgid "Last logged in"
msgstr "Utolsó belépés"
-#: modules/pref-users.php:72
+#: modules/pref-users.php:58
msgid "Subscribed feeds count"
msgstr ""
-#: modules/pref-users.php:76
+#: modules/pref-users.php:62
msgid "Subscribed feeds"
msgstr "Feliratkozott feedek"
-#: modules/pref-users.php:122
+#: modules/pref-users.php:108
#, fuzzy
msgid "User Editor"
msgstr "Felhasználó szerkesztő"
-#: modules/pref-users.php:152
+#: modules/pref-users.php:145
#, fuzzy
msgid "Access level: "
msgstr "Hozzáférési szint:"
-#: modules/pref-users.php:159
+#: modules/pref-users.php:158
#, fuzzy
msgid "Change password to"
msgstr "Jelszó megváltoztatása"
-#: modules/pref-users.php:168
+#: modules/pref-users.php:167
#, fuzzy
msgid "E-mail: "
msgstr "E-mail:"
-#: modules/pref-users.php:204
+#: modules/pref-users.php:203
#, php-format
msgid "Changed password of user <b>%s</b>."
msgstr ""
-#: modules/pref-users.php:252
+#: modules/pref-users.php:251
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr ""
-#: modules/pref-users.php:259
+#: modules/pref-users.php:258
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr ""
-#: modules/pref-users.php:263
+#: modules/pref-users.php:262
#, php-format
msgid "User <b>%s</b> already exists."
msgstr ""
-#: modules/pref-users.php:283
+#: modules/pref-users.php:282
#, 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:287
+#: modules/pref-users.php:286
#, php-format
msgid "Notifying <b>%s</b>."
msgstr ""
-#: modules/pref-users.php:324
+#: modules/pref-users.php:323
msgid "[tt-rss] Password change notification"
msgstr ""
-#: modules/pref-users.php:381 help/4.php:27
+#: modules/pref-users.php:374 help/4.php:27
msgid "Create user"
msgstr "Felhasználó létrehozása"
-#: modules/pref-users.php:415
+#: modules/pref-users.php:408
msgid "Login"
msgstr "Belépés"
-#: modules/pref-users.php:416
+#: modules/pref-users.php:409
msgid "Access Level"
msgstr "Hozzáférési szint"
-#: modules/pref-users.php:418
+#: modules/pref-users.php:411
msgid "Last login"
msgstr "Utolsó belépés"
-#: modules/pref-users.php:477
-msgid "User details"
-msgstr "Részletek a felhasználórol "
-
-#: modules/pref-users.php:483
+#: modules/pref-users.php:476
msgid "Reset password"
msgstr "Jelszó reset"
-#: modules/pref-users.php:488
+#: modules/pref-users.php:481
#, fuzzy
msgid "No users defined."
msgstr "Nincs szűrő definiálva."
-#: modules/pref-users.php:490
+#: modules/pref-users.php:483
msgid "No matching users found."
msgstr ""
@@ -2445,17 +2439,9 @@ msgstr ""
msgid "Press any key to close this window."
msgstr ""
-#: help/4.php:11
-msgid "Content Filtering"
-msgstr "Tartalomszűrő"
-
-#: help/4.php:12
-msgid "Label Editor"
-msgstr "Címke Szerkesztő"
-
-#: help/4.php:13
-msgid "User Manager"
-msgstr "Felhasználók kezelése"
+#: help/4.php:10
+msgid "Other Feeds"
+msgstr "Mások Feedjei"
#: help/4.php:19
#, fuzzy
@@ -2528,6 +2514,41 @@ msgstr "Egyezés ezzel:"
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "Unknown Error"
+#~ msgstr "Ismeretlen Hiba"
+
+#~ msgid "Published Articles"
+#~ msgstr "Publikált Hírek"
+
+#~ msgid "Feed information:"
+#~ msgstr "Feed információ:"
+
+#, fuzzy
+#~ msgid "Site:"
+#~ msgstr "Cím:"
+
+#, fuzzy
+#~ msgid "Last updated:"
+#~ msgstr "Frissítve"
+
+#~ msgid "Other feeds: Top 25"
+#~ msgstr "Más feedek: Top 25"
+
+#~ msgid "Showing top 25 registered feeds, sorted by popularity:"
+#~ msgstr "Mutasd a top 25 regisztrált feedet, népszerűség szerint:"
+
+#~ msgid "Top 25"
+#~ msgstr "Top 25"
+
+#~ msgid "Content Filtering"
+#~ msgstr "Tartalomszűrő"
+
+#~ msgid "Label Editor"
+#~ msgstr "Címke Szerkesztő"
+
+#~ msgid "User Manager"
+#~ msgstr "Felhasználók kezelése"
+
#~ msgid "Toggle:"
#~ msgstr "Megjelöl:"
@@ -2590,9 +2611,6 @@ msgstr ""
#~ msgid "Match SQL"
#~ msgstr "Egyezés"
-#~ msgid "Help"
-#~ msgstr "Segítség"
-
#, fuzzy
#~ msgid "[No caption]"
#~ msgstr "Aláírás"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index a7e3e66be..2d8bbe7f4 100644
--- a/locale/it_IT/LC_MESSAGES/messages.mo
+++ b/locale/it_IT/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 5a4b9c5ce..b836b01d5 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ttrss-1.2.30\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-22 00:21+0300\n"
+"POT-Creation-Date: 2009-01-25 23:34+0300\n"
"PO-Revision-Date: 2009-01-03 16:43+0100\n"
"Last-Translator: Andrea Zagli <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -78,7 +78,7 @@ msgstr "Giornalmente"
msgid "Weekly"
msgstr "Settimanalmente"
-#: backend.php:122 tt-rss.php:211 modules/pref-prefs.php:317
+#: backend.php:122 tt-rss.php:213 modules/pref-prefs.php:315
msgid "Default"
msgstr "Predefinito"
@@ -90,7 +90,7 @@ msgstr "Magpie"
msgid "SimplePie"
msgstr "SimplePie"
-#: backend.php:133 modules/pref-users.php:140
+#: backend.php:133 modules/pref-users.php:126
msgid "User"
msgstr "Utente"
@@ -169,187 +169,173 @@ msgstr ""
"Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
"configurazione del PHP"
-#: functions.php:2852 modules/popup-dialog.php:175
+#: functions.php:2808 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Tutti i notiziari"
-#: functions.php:2881 functions.php:2920 functions.php:3309 functions.php:4324
-#: functions.php:4354 modules/pref-feeds.php:1266
+#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
+#: functions.php:4248 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Senza categoria"
-#: functions.php:2910 functions.php:3505 mobile/functions.php:33
+#: functions.php:2866 functions.php:3459 mobile/functions.php:33
msgid "Special"
msgstr "Speciale"
-#: functions.php:2912 functions.php:3338 functions.php:3507 prefs.php:144
-#: mobile/functions.php:83
+#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Etichette"
-#: functions.php:2930 functions.php:3331 functions.php:4178 help/3.php:59
+#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Articoli con stella"
-#: functions.php:2932 functions.php:3335 functions.php:4185
-#: modules/pref-feeds.php:1441 help/3.php:60 mobile/functions.php:70
+#: functions.php:2888 functions.php:3291 functions.php:4079
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Articoli pubblicati"
-#: functions.php:2934 functions.php:3341 functions.php:4163 help/3.php:58
+#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Articoli nuovi"
-#: functions.php:2936 functions.php:3344 functions.php:4156 help/3.php:57
+#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Tutti gli articoli"
-#: functions.php:3295 functions.php:3297
+#: functions.php:3251 functions.php:3253
msgid "Search results"
msgstr "Risultati della ricerca"
-#: functions.php:3313 functions.php:3326 functions.php:3332 functions.php:3336
-#: functions.php:3342 functions.php:3345 functions.php:3353
+#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
+#: functions.php:3298 functions.php:3301 functions.php:3309
msgid "Searched for"
msgstr "Ricerca"
-#: functions.php:3984 functions.php:5351 modules/pref-feeds.php:1047
-#: modules/pref-feeds.php:1228 modules/pref-filters.php:366
-#: modules/pref-labels.php:138 modules/pref-users.php:408
+#: functions.php:3929
+msgid "Generated feed"
+msgstr "Notiziario generato"
+
+#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
+#: modules/pref-labels.php:129 modules/pref-users.php:401
msgid "Select:"
msgstr "Seleziona:"
-#: functions.php:3985 modules/pref-feeds.php:1048 modules/pref-feeds.php:1229
-#: modules/pref-filters.php:367 modules/pref-labels.php:139
-#: modules/pref-users.php:409 mobile/functions.php:570
+#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Tutti"
-#: functions.php:3986 functions.php:4002 tt-rss.php:203
+#: functions.php:3936 functions.php:3952 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Non letti"
-#: functions.php:3987 mobile/functions.php:573
+#: functions.php:3937 mobile/functions.php:573
msgid "Invert"
msgstr "Inverti"
-#: functions.php:3988 modules/pref-feeds.php:1049 modules/pref-feeds.php:1230
-#: modules/pref-filters.php:368 modules/pref-labels.php:140
-#: modules/pref-users.php:410 mobile/functions.php:572
+#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Nessuno"
-#: functions.php:3996 tt-rss.php:152 modules/pref-feeds.php:1389
+#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Azioni..."
-#: functions.php:4001
+#: functions.php:3951
msgid "Selection toggle:"
msgstr "Inverti selezione:"
-#: functions.php:4003 tt-rss.php:202 mobile/functions.php:459
+#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Con stella"
-#: functions.php:4004
+#: functions.php:3954
msgid "Published"
msgstr "Pubblicati"
-#: functions.php:4006
+#: functions.php:3956
msgid "Mark as read:"
msgstr "Segna come letti:"
-#: functions.php:4007 mobile/functions.php:578
+#: functions.php:3957 mobile/functions.php:578
msgid "Selection"
msgstr "Selezione"
-#: functions.php:4009 mobile/functions.php:580
+#: functions.php:3959 mobile/functions.php:580
msgid "Entire feed"
msgstr "Intero notiziario"
-#: functions.php:4013
+#: functions.php:3963
#, fuzzy
msgid "Assign label:"
msgstr "Assegna etichette"
-#: functions.php:4016 tt-rss.php:169
-#, fuzzy
-msgid "Create label..."
-msgstr "Crea etichetta"
-
-#: functions.php:4028
-#, fuzzy
-msgid "(remove)"
-msgstr "Rimuovi"
-
-#: functions.php:4065
-msgid "Generated feed"
-msgstr "Notiziario generato"
-
-#: functions.php:4110
+#: functions.php:4004
msgid "Click to collapse category"
msgstr "Fare clic per contrarre la categoria"
-#: functions.php:4374
+#: functions.php:4268
msgid "No feeds to display."
msgstr "Nessun notiziario da visualizzare."
-#: functions.php:4391 mobile/functions.php:12
+#: functions.php:4285 mobile/functions.php:12
msgid "Tags"
msgstr "Etichette"
-#: functions.php:4627
+#: functions.php:4521
msgid " - "
msgstr " - "
-#: functions.php:4682 functions.php:4683
-msgid "no tags"
-msgstr "nessuna etichetta"
-
-#: functions.php:4690
+#: functions.php:4545 functions.php:5220
msgid "Edit tags for this article"
msgstr "Modifica le etichette per questo articolo"
-#: functions.php:4698
+#: functions.php:4553
msgid "Display original article content"
msgstr "Visualizza il contenuto originale dell&apos;articolo"
-#: functions.php:4705 functions.php:5361
+#: functions.php:4560 functions.php:5211
msgid "Show article summary in new window"
msgstr "Mostra il sommario dell&apos;articolo in una nuova finestra"
-#: functions.php:4742 functions.php:5285
+#: functions.php:4593 functions.php:5135
msgid "unknown type"
msgstr "tipo sconosciuto"
-#: functions.php:4748 functions.php:5291
+#: functions.php:4599 functions.php:5141
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4784 functions.php:5325
+#: functions.php:4635 functions.php:5175
msgid "Attachment:"
msgstr "Allegato:"
-#: functions.php:4786 functions.php:5327
+#: functions.php:4637 functions.php:5177
msgid "Attachments:"
msgstr "Allegati:"
-#: functions.php:4806 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1098
+#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Chiudi questa finestra"
-#: functions.php:4862 modules/pref-feed-browser.php:75
+#: functions.php:4713
msgid "Feed not found."
msgstr "Notiziario non trovato."
-#: functions.php:4931 mobile/functions.php:423
+#: functions.php:4782 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -357,33 +343,47 @@ msgstr ""
"Impossibile visualizzare il notiziario (interrogazione fallita). Controllare "
"che l&apos;etichetta corrisponda alla sintassi o la configurazione locale."
-#: functions.php:5259
+#: functions.php:5109
msgid "Click to expand article"
msgstr "Fare clic per espandere l&apos;articolo"
-#: functions.php:5419
+#: functions.php:5246
msgid "No unread articles found to display."
msgstr "Nessun articolo non letto trovato da visualizzare."
-#: functions.php:5422
+#: functions.php:5249
#, fuzzy
msgid "No updated articles found to display."
msgstr "Nessun articolo non letto trovato da visualizzare."
-#: functions.php:5425
+#: functions.php:5252
msgid "No starred articles found to display."
msgstr "Nessun articolo con stella trovato da visualizzare."
-#: functions.php:5429
+#: functions.php:5256
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5431
+#: functions.php:5258
msgid "No articles found to display."
msgstr "Nessun articolo trovato da visualizzare."
+#: functions.php:5931 tt-rss.php:171
+#, fuzzy
+msgid "Create label..."
+msgstr "Crea etichetta"
+
+#: functions.php:5944
+#, fuzzy
+msgid "(remove)"
+msgstr "Rimuovi"
+
+#: functions.php:5988
+msgid "no tags"
+msgstr "nessuna etichetta"
+
#: localized_js.php:35
msgid "display feeds"
msgstr "visualizza notiziari"
@@ -392,7 +392,7 @@ msgstr "visualizza notiziari"
msgid "display tags"
msgstr "visualizza etichette"
-#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
+#: localized_js.php:37 prefs.php:66 prefs.php:138 tt-rss.php:68
msgid "Loading, please wait..."
msgstr "Caricamento, attendere prego..."
@@ -590,7 +590,7 @@ msgstr "Impossibile aggiornare i sommari (oggetto XML mancante)"
msgid "Could not display article (missing XML object)"
msgstr "Impossibili visualizzare l&apos;articolo (manca l&apos;oggetto XML)"
-#: localized_js.php:95 tt-rss.php:257 tt-rss.php:270
+#: localized_js.php:95 tt-rss.php:259 tt-rss.php:272
msgid "No feed selected."
msgstr "Nessun notiziario selezionato."
@@ -765,8 +765,8 @@ msgstr "Salvare i cambiamenti ai notiziari selezionati?"
msgid "Saving feeds..."
msgstr "Salvataggio notiziari..."
-#: localized_schema.php:9 tt-rss.php:213 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1241 modules/pref-feeds.php:1302
+#: localized_schema.php:9 tt-rss.php:215 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Titolo"
@@ -792,7 +792,7 @@ msgstr "Data dell&apos;articolo"
msgid "Filter article"
msgstr "Filtra articoli"
-#: localized_schema.php:16 tt-rss.php:164 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:166 mobile/functions.php:583
msgid "Mark as read"
msgstr "Segna come letto"
@@ -804,15 +804,20 @@ msgstr "Imposta con stella"
msgid "Assign tags"
msgstr "Assegna etichette"
-#: localized_schema.php:23
+#: localized_schema.php:20
+#, fuzzy
+msgid "Assign label"
+msgstr "Assegna etichette"
+
+#: localized_schema.php:24
msgid "General"
msgstr "Generali"
-#: localized_schema.php:25
+#: localized_schema.php:26
msgid "Allow duplicate posts"
msgstr "Permettere articoli duplicati"
-#: localized_schema.php:26
+#: localized_schema.php:27
msgid ""
"This option is useful when you are reading several planet-type aggregators "
"with partially colliding userbase. When disabled, it forces same posts from "
@@ -822,15 +827,15 @@ msgstr ""
"«planet» con utenti che collidono parzialmente. Quando disabilitata forza le "
"stesse notizie da differenti notiziari ad apparire una volta sola."
-#: localized_schema.php:27
+#: localized_schema.php:28
msgid "Default interval between feed updates (in minutes)"
msgstr "Intervallo predefinito tra gli aggiornamenti dei notiziari (in minuti)"
-#: localized_schema.php:28
+#: localized_schema.php:29
msgid "Enable e-mail digest"
msgstr "Abilitare email riassunto"
-#: localized_schema.php:29
+#: localized_schema.php:30
msgid ""
"This option enables sending daily digest of new (and unread) headlines on "
"your configured e-mail address"
@@ -838,28 +843,28 @@ msgstr ""
"Questa opzione abilita l&apos;invio del un riassunto giornaliero dei sommari "
"nuovi (e non letti) all&apos;indirizzo email configurato"
-#: localized_schema.php:30
+#: localized_schema.php:31
msgid "Purge old posts after this number of days (0 - disables)"
msgstr ""
"Eliminare le notizie vecchie dopo questo numero di giorni (0 - disabilitato)"
-#: localized_schema.php:31
+#: localized_schema.php:32
msgid "Update post on checksum change"
msgstr "Aggiornare la notizia al cambiamento della somma di controllo"
-#: localized_schema.php:32
+#: localized_schema.php:33
msgid "Mark articles in e-mail digest as read"
msgstr "Segna gli articoli del riassunto email come letti"
-#: localized_schema.php:34
+#: localized_schema.php:35
msgid "Interface"
msgstr "Interfaccia"
-#: localized_schema.php:36
+#: localized_schema.php:37
msgid "Combined feed display"
msgstr "Visualizzazione combinata di notiziari"
-#: localized_schema.php:37
+#: localized_schema.php:38
msgid ""
"Display expanded list of feed articles, instead of separate displays for "
"headlines and article content"
@@ -867,11 +872,11 @@ msgstr ""
"Visualizza un elenco espanso di articoli di notiziario, invece di "
"visualizzazioni separate per sommario e contenuto dell'articolo"
-#: localized_schema.php:38
+#: localized_schema.php:39
msgid "Default article limit"
msgstr "Limite articoli predefinito"
-#: localized_schema.php:39
+#: localized_schema.php:40
msgid ""
"Default limit for articles to display, any custom number you like (0 - "
"disables)."
@@ -879,23 +884,23 @@ msgstr ""
"Limite predefinito per gli articoli da visualizzare (qualunque numero) (0 - "
"disabilitato)"
-#: localized_schema.php:40
+#: localized_schema.php:41
msgid "Enable feed categories"
msgstr "Abilitare le categorie dei notiziari"
-#: localized_schema.php:41
+#: localized_schema.php:42
msgid "Enable search toolbar"
msgstr "Abilitare la barra degli strumenti di ricerca"
-#: localized_schema.php:42
+#: localized_schema.php:43
msgid "Hide feeds with no unread messages"
msgstr "Nascondere i notiziari senza messaggi non letti"
-#: localized_schema.php:43
+#: localized_schema.php:44
msgid "Mark articles as read automatically"
msgstr "Segnare gli articoli automaticamente come letti"
-#: localized_schema.php:44
+#: localized_schema.php:45
msgid ""
"This option enables marking articles as read automatically in combined mode "
"(except for Fresh articles feed) while you scroll article list."
@@ -904,11 +909,11 @@ msgstr ""
"modalità combinata (eccetto per il notiziario degli articoli nuovi) mentre "
"si fa scorrere l&apos;elenco degli articoli."
-#: localized_schema.php:45
+#: localized_schema.php:46
msgid "On catchup show next feed"
msgstr "Su lettura passare al prossimo notiziario"
-#: localized_schema.php:46
+#: localized_schema.php:47
msgid ""
"When \"Mark as read\" button is clicked in toolbar, automatically open next "
"feed with unread articles."
@@ -917,41 +922,41 @@ msgstr ""
"strumenti, automaticamente si apre il notiziario successivo con articoli non "
"letti."
-#: localized_schema.php:47
+#: localized_schema.php:48
msgid "Open article links in new browser window"
msgstr "Aprire i collegamenti degli articoli in una nuova finestra del browser"
-#: localized_schema.php:48
+#: localized_schema.php:49
msgid "Reverse headline order (oldest first)"
msgstr "Invertire l&apos;ordine del sommario (prima i più vecchi)"
-#: localized_schema.php:49
+#: localized_schema.php:50
msgid "Show content preview in headlines list"
msgstr "Mostrare l&apos;anteprima del contenuto nell&apos;elenco del sommario"
-#: localized_schema.php:50
+#: localized_schema.php:51
msgid "Sort feeds by unread articles count"
msgstr "Ordinare i notiziari per numero di articoli non letti"
-#: localized_schema.php:51
+#: localized_schema.php:52
msgid "User stylesheet URL"
msgstr "URL del foglio di stile utente"
-#: localized_schema.php:52
+#: localized_schema.php:53
msgid "Link to user stylesheet to override default style, disabled if empty."
msgstr ""
"Collegamento al foglio di stile utente per scavalcare lo stile predefinito. "
"Disabilitato se vuoto."
-#: localized_schema.php:53
+#: localized_schema.php:54
msgid "Maximum age of fresh articles (in hours)"
msgstr "Età massima degli articoli nuovi (in ore)"
-#: localized_schema.php:54
+#: localized_schema.php:55
msgid "Hide feedlist"
msgstr "Nascondere l&apos;elenco dei notiziari"
-#: localized_schema.php:55
+#: localized_schema.php:56
msgid ""
"This option hides feedlist and allows it to be toggled on the fly, useful "
"for small screens."
@@ -959,11 +964,11 @@ msgstr ""
"Questa opzione nasconde l&apos;elenco dei notiziari e permette di mostrarlo "
"al volo. Utile per schermi piccoli."
-#: localized_schema.php:56
+#: localized_schema.php:57
msgid "Group headlines in virtual feeds"
msgstr "Raggruppare i sommari in notiziari virtuali"
-#: localized_schema.php:57
+#: localized_schema.php:58
msgid ""
"When this option is enabled, headlines in Special feeds and Labels are "
"grouped by feeds"
@@ -971,15 +976,15 @@ msgstr ""
"Quando questa opzione è abilitata, i sommari nei notiziari speciali e nelle "
"etichette vengono raggruppati per notiziario"
-#: localized_schema.php:59
+#: localized_schema.php:60
msgid "Advanced"
msgstr "Avanzate"
-#: localized_schema.php:61
+#: localized_schema.php:62
msgid "Blacklisted tags"
msgstr "Etichette in lista nera"
-#: localized_schema.php:62
+#: localized_schema.php:63
msgid ""
"When auto-detecting tags in articles these tags will not be applied (comma-"
"separated list)."
@@ -988,19 +993,19 @@ msgstr ""
"articoli, queste etichette non saranno applicate (elenco separato da "
"virgola)."
-#: localized_schema.php:63
+#: localized_schema.php:64
msgid "Confirm marking feed as read"
msgstr "Richiedere conferma segnatura del notiziario come letto"
-#: localized_schema.php:64
+#: localized_schema.php:65
msgid "Enable feed icons"
msgstr "Abilitare icone notiziari"
-#: localized_schema.php:65
+#: localized_schema.php:66
msgid "Enable labels"
msgstr "Abilitare etichette"
-#: localized_schema.php:66
+#: localized_schema.php:67
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 "
@@ -1010,76 +1015,76 @@ msgstr ""
"artigianali dell&apos;utente. Questa caratteristica è molto sperimentale e "
"a questo punto non amichevole per l&apos;utente. Utilizzare con cautela."
-#: localized_schema.php:67
+#: localized_schema.php:68
msgid "Long date format"
msgstr "Formato data lunga"
-#: localized_schema.php:68
+#: localized_schema.php:69
msgid "Set articles as unread on update"
msgstr "Impostare gli articoli come non letti durante l&apos;aggiornamento"
-#: localized_schema.php:69
+#: localized_schema.php:70
msgid "Short date format"
msgstr "Formato data corta"
-#: localized_schema.php:70
+#: localized_schema.php:71
msgid "Show additional information in feedlist"
msgstr "Mostrare informazioni addizionali nell&apos;elenco notiziari"
-#: localized_schema.php:71
+#: localized_schema.php:72
msgid "Strip unsafe tags from articles"
msgstr "Togliere le etichette non buone dagli articoli"
-#: localized_schema.php:72
+#: localized_schema.php:73
msgid "Strip all but most common HTML tags when reading articles."
msgstr ""
"Toglie tutte le etichette HTML più comuni durante la lettura degli articoli."
-#: localized_schema.php:73
+#: localized_schema.php:74
msgid "Use more accessible date/time format for headlines"
msgstr "Utilizzare un formato data/ora più accessibile per i sommari"
-#: localized_schema.php:74
+#: localized_schema.php:75
msgid "Automatically expand articles in combined mode"
msgstr "Espandere automaticamente gli articoli nella modalità combinata"
-#: localized_schema.php:75
+#: localized_schema.php:76
msgid "Purge unread articles"
msgstr "Eliminare articoli non letti"
-#: localized_schema.php:76
+#: localized_schema.php:77
msgid "Show special feeds when hiding read feeds"
msgstr ""
"Mostrare i notiziari speciali quando vengono nascosti i notiziari letti"
-#: localized_schema.php:77
+#: localized_schema.php:78
msgid "Prefer more accurate feedlist counters to UI speed"
msgstr ""
"Preferire contatori di elenco notiziari più accurati per velocizzare l&apos;"
"interfaccia grafica"
-#: localized_schema.php:78
+#: localized_schema.php:79
msgid "Enable inline MP3 player"
msgstr "Abilitare riproduttore MP3 in linea"
-#: localized_schema.php:79
+#: localized_schema.php:80
msgid ""
"Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
msgstr ""
"Abilitare il riproduttore XSPF basato su Flash per riprodurre le custodie "
"podcast in formato MP3."
-#: localized_schema.php:80
+#: localized_schema.php:81
msgid "Do not show images in articles"
msgstr "Non mostrare le immagini negli articoli"
-#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:302
-#: modules/pref-feeds.php:495 mobile/login_form.php:59
+#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:277
+#: modules/pref-feeds.php:470 mobile/login_form.php:59
msgid "Login:"
msgstr "Accesso:"
-#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:306
-#: modules/pref-feeds.php:501 mobile/login_form.php:60
+#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:281
+#: modules/pref-feeds.php:476 mobile/login_form.php:60
msgid "Password:"
msgstr "Password:"
@@ -1114,7 +1119,7 @@ msgstr "Questo script è solo per installazioni di Tiny Tiny RSS su MySQL."
#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
#: register.php:200 register.php:213 register.php:228 register.php:246
#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162
+#: update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Ritorna a Tiny Tiny RSS"
@@ -1167,7 +1172,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Ritorna alle preferenze"
-#: prefs.php:77 prefs.php:156 tt-rss.php:79
+#: prefs.php:74 prefs.php:141 tt-rss.php:76
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1177,48 +1182,36 @@ msgstr ""
"\t\tda questa applicazione per funzionare correttamente. Controllare\n"
"\t\tle impostazioni del browser."
-#: prefs.php:104
-msgid "Unknown Error"
-msgstr "Errore sconosciuto"
-
-#: prefs.php:110 tt-rss.php:115
+#: prefs.php:101 tt-rss.php:116
msgid "Hello,"
msgstr "Salve,"
-#: prefs.php:112 prefs.php:122 help/4.php:14
+#: prefs.php:103 prefs.php:113 help/4.php:14
msgid "Exit preferences"
msgstr "Esci dalle preferenze"
-#: prefs.php:114 tt-rss.php:125 mobile/functions.php:21
+#: prefs.php:105 tt-rss.php:126 mobile/functions.php:21
msgid "Logout"
msgstr "Esci"
-#: prefs.php:126
+#: prefs.php:117
msgid "Keyboard shortcuts"
msgstr "Scorciatoie da tastiera"
-#: prefs.php:132 tt-rss.php:117 tt-rss.php:154 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:118 tt-rss.php:156 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Preferenze"
-#: prefs.php:134 help/4.php:9
+#: prefs.php:125 help/4.php:9
msgid "My Feeds"
msgstr "Notiziari"
-#: prefs.php:137 help/4.php:10
-msgid "Other Feeds"
-msgstr "Altri notiziari"
-
-#: prefs.php:140
-msgid "Published Articles"
-msgstr "Articoli pubblicati"
-
-#: prefs.php:142
+#: prefs.php:127 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "File:"
-#: prefs.php:147
+#: prefs.php:132 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "Utente"
@@ -1254,7 +1247,7 @@ msgid "How much is two plus two:"
msgstr ""
#: register.php:193
-msgid "Submit registration\""
+msgid "Submit registration"
msgstr ""
#: register.php:211
@@ -1382,135 +1375,139 @@ msgstr ""
msgid "Fatal Error"
msgstr "Errore fatale"
-#: tt-rss.php:121
+#: tt-rss.php:122
msgid "Comments?"
msgstr "Commenti?"
-#: tt-rss.php:138
+#: tt-rss.php:130
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr ""
+
+#: tt-rss.php:140
msgid "tag cloud"
msgstr "nuvola etichette"
-#: tt-rss.php:142
+#: tt-rss.php:144
#, fuzzy
msgid "More feeds..."
msgstr "Cambiamento del punteggio dei notiziari..."
-#: tt-rss.php:153
+#: tt-rss.php:155
#, fuzzy
msgid "Search..."
msgstr "Cerca"
-#: tt-rss.php:156
+#: tt-rss.php:158
msgid "Feed actions:"
msgstr "Azioni notiziari:"
-#: tt-rss.php:157
+#: tt-rss.php:159
#, fuzzy
msgid "Subscribe to feed..."
msgstr "Sottoscrivi il notiziario"
-#: tt-rss.php:158
+#: tt-rss.php:160
#, fuzzy
msgid "Edit this feed..."
msgstr "Modifica notiziario"
-#: tt-rss.php:159
+#: tt-rss.php:161
#, fuzzy
msgid "Clear articles"
msgstr "Filtra articoli"
-#: tt-rss.php:160
+#: tt-rss.php:162
#, fuzzy
msgid "Rescore feed"
msgstr "Cambiamento del punteggio dei notiziari..."
-#: tt-rss.php:161 modules/pref-feeds.php:397 modules/pref-feeds.php:1402
+#: tt-rss.php:163 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Annulla sottoscrizione"
-#: tt-rss.php:163
+#: tt-rss.php:165
msgid "All feeds:"
msgstr "Tutti i notiziari:"
-#: tt-rss.php:165 help/3.php:44
+#: tt-rss.php:167 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Visualizza/Nascondi notiziari letti"
-#: tt-rss.php:167
+#: tt-rss.php:169
msgid "Other actions:"
msgstr "Altre azioni:"
-#: tt-rss.php:170
+#: tt-rss.php:172
#, fuzzy
msgid "Create filter..."
msgstr "Crea filtro"
-#: tt-rss.php:171
+#: tt-rss.php:173
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;Reimposta disposizione UI"
-#: tt-rss.php:172
+#: tt-rss.php:174
#, fuzzy
msgid "Reset category order"
msgstr "Reimpostare l&apos;ordine dalla categoria?"
-#: tt-rss.php:174
+#: tt-rss.php:176
msgid "&nbsp;&nbsp;Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Scorciatoie da tastiera"
-#: tt-rss.php:182
+#: tt-rss.php:184
msgid "Collapse feedlist"
msgstr "Contrai elenco notiziari"
-#: tt-rss.php:184
+#: tt-rss.php:186
msgid "Toggle Feedlist"
msgstr "Inverti elenco notiziari"
-#: tt-rss.php:192 mobile/functions.php:738
+#: tt-rss.php:194 mobile/functions.php:738
msgid "Search:"
msgstr "Cerca:"
-#: tt-rss.php:200 mobile/functions.php:456
+#: tt-rss.php:202 mobile/functions.php:456
msgid "Adaptive"
msgstr "Adattivo"
-#: tt-rss.php:201 mobile/functions.php:457
+#: tt-rss.php:203 mobile/functions.php:457
msgid "All Articles"
msgstr "Tutti gli articoli"
-#: tt-rss.php:204
+#: tt-rss.php:206
msgid "Ignore Scoring"
msgstr "Ignora punteggio"
-#: tt-rss.php:205 modules/pref-feeds.php:1247 modules/pref-feeds.php:1310
+#: tt-rss.php:207 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "Aggiornato"
-#: tt-rss.php:208
+#: tt-rss.php:210
msgid "Order:"
msgstr "Ordine:"
-#: tt-rss.php:212 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:214 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:443
msgid "Date"
msgstr "Data"
-#: tt-rss.php:214
+#: tt-rss.php:216
msgid "Score"
msgstr "Punteggio"
-#: tt-rss.php:218
+#: tt-rss.php:220
msgid "Limit:"
msgstr "Limite:"
-#: tt-rss.php:243 modules/pref-feeds.php:261 modules/pref-feeds.php:458
+#: tt-rss.php:245 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Aggiorna"
-#: tt-rss.php:261
+#: tt-rss.php:263
msgid "Drag me to resize panels"
msgstr "Trascina per ridimensionare i riquadri"
@@ -1573,6 +1570,10 @@ msgstr ""
"Fine. Eseguito/i <b>%d</b> aggiornamento/i fino\n"
"\t\t\tallo schema versione <b>%d</b>."
+#: modules/help.php:6
+msgid "Help"
+msgstr "Aiuto"
+
#: modules/help.php:17
msgid "Help topic not found."
msgstr "Argomento dell&apos;aiuto non trovato."
@@ -1611,12 +1612,12 @@ msgstr "Errore: impossibile trovare l&apos;elemento body"
msgid "Notice"
msgstr "Notifica"
-#: modules/popup-dialog.php:12
+#: modules/popup-dialog.php:14
+#, fuzzy
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."
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
msgstr ""
"Il demone per l&apos;aggiornamento è abilitato nella configurazione,\n"
"\t\t\t\t\tma il processo del demone non è in esecuzione. Questo impedisce "
@@ -1624,25 +1625,26 @@ msgstr ""
"\t\t\t\t\tAvviare il processo del demone o contattare il proprietario "
"dell&apos;istanza."
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
msgid "Last update:"
msgstr "Ultimo aggiornamento:"
#: modules/popup-dialog.php:26
+#, fuzzy
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."
+"You are running the latest version of Tiny Tiny RSS. The fact that you are "
+"seeing this dialog is probably a bug."
msgstr ""
"Si sta eseguendo l&apos;ultima versione di Tiny Tiny RSS. Il\n"
"\t\t\t\t\t\tmotivo per il quale di vedo questo dialogo è probabilmente un "
"errore."
-#: modules/popup-dialog.php:35
+#: modules/popup-dialog.php:34
+#, fuzzy
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."
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
msgstr ""
"TT-RSS ha rilevato che il demone di aggiornamento sta impiegando troppo\n"
"\t\t\t\t\ttempo a eseguire l&apos;aggiornamento del notiziario. Questo "
@@ -1651,28 +1653,32 @@ msgstr ""
"processo\n"
"\t\t\t\t\tdel demone o contattare il proprietario dell&apos;istanza."
+#: modules/popup-dialog.php:48
+msgid "Visit official site"
+msgstr ""
+
#: modules/popup-dialog.php:61
msgid "Subscribe to Feed"
msgstr "Sottoscrivi il notiziario"
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:422 modules/pref-filters.php:403
+#: modules/popup-dialog.php:70 modules/pref-feeds.php:140
+#: modules/pref-feeds.php:397 modules/pref-filters.php:403
msgid "Feed"
msgstr "Notiziario"
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:181
-#: modules/pref-feeds.php:436
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:156
+#: modules/pref-feeds.php:411
msgid "URL:"
msgstr "URL:"
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:193
-#: modules/pref-feeds.php:448
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:168
+#: modules/pref-feeds.php:423
msgid "Place in category:"
msgstr "Mettere nella categoria:"
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:297
-#: modules/pref-feeds.php:492 modules/pref-prefs.php:264
-#: modules/pref-users.php:149
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:272
+#: modules/pref-feeds.php:467 modules/pref-prefs.php:262
+#: modules/pref-users.php:142
msgid "Authentication"
msgstr "Autenticazione"
@@ -1680,23 +1686,22 @@ msgstr "Autenticazione"
msgid "This feed requires authentication."
msgstr "Questo notiziario richiede l&apos;autenticazione"
-#: modules/popup-dialog.php:130 modules/pref-feed-browser.php:166
-#: modules/pref-feeds.php:128
+#: modules/popup-dialog.php:130 modules/pref-feeds.php:103
msgid "Subscribe"
msgstr "Sottoscrivi"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:130 modules/pref-feeds.php:402
-#: modules/pref-feeds.php:556 modules/pref-filters.php:166
-#: modules/pref-users.php:184
+#: modules/pref-feeds.php:105 modules/pref-feeds.php:377
+#: modules/pref-feeds.php:531 modules/pref-filters.php:166
+#: modules/pref-users.php:183
msgid "Cancel"
msgstr "Annulla"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feed-browser.php:125
-#: modules/pref-feeds.php:1143 modules/pref-filters.php:307
-#: modules/pref-labels.php:105 modules/pref-users.php:364
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-labels.php:96 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1763,9 +1768,9 @@ msgstr "Esegui azione"
msgid "with parameters:"
msgstr "con parametri:"
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:315
-#: modules/pref-feeds.php:510 modules/pref-filters.php:123
-#: modules/pref-users.php:165
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:290
+#: modules/pref-feeds.php:485 modules/pref-filters.php:123
+#: modules/pref-users.php:164
msgid "Options"
msgstr "Opzioni"
@@ -1801,9 +1806,9 @@ msgstr "Modifica etichette"
msgid "Tags for this article (separated by commas):"
msgstr "Etichette per questo articolo (separate da virgole):"
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:400
-#: modules/pref-feeds.php:554 modules/pref-filters.php:162
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:529 modules/pref-filters.php:162
+#: modules/pref-users.php:180
msgid "Save"
msgstr "Salva"
@@ -1819,45 +1824,6 @@ msgstr "Visualizza le etichette più popolari"
msgid "browse more"
msgstr "sfoglia altre"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr "La lettura del notiziario è bloccata dall&apos;amministratore."
-
-#: modules/pref-feed-browser.php:15
-msgid "Feed information:"
-msgstr "Informazioni notiziario:"
-
-#: modules/pref-feed-browser.php:39
-msgid "Site:"
-msgstr "Sito:"
-
-#: modules/pref-feed-browser.php:41
-msgid "Last updated:"
-msgstr "Ultimo aggiornamento:"
-
-#: modules/pref-feed-browser.php:56
-msgid "Last headlines:"
-msgstr "Ultimi sommari:"
-
-#: modules/pref-feed-browser.php:112
-msgid ""
-"Feed browser cache information is missing. Please refer to the <a "
-"class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-"FeedBrowser'>wiki</a> for more information."
-msgstr ""
-
-#: modules/pref-feed-browser.php:129
-msgid "Top"
-msgstr "N°"
-
-#: modules/pref-feed-browser.php:138
-msgid "Show"
-msgstr "Mostra"
-
-#: modules/pref-feed-browser.php:222
-msgid "Couldn't find any feeds available for subscription."
-msgstr ""
-
#: modules/pref-feeds.php:4
msgid "Check to enable field"
msgstr "Spuntare per abilitare il campo"
@@ -1866,183 +1832,202 @@ msgstr "Spuntare per abilitare il campo"
msgid "Subscribed to feeds:"
msgstr "Notiziari sottoscritti:"
+#: modules/pref-feeds.php:59
+msgid "Feed browser is administratively disabled."
+msgstr "La lettura del notiziario è bloccata dall&apos;amministratore."
+
#: modules/pref-feeds.php:63
-msgid "Other feeds: Top 25"
-msgstr "Altri notiziari: primi 25"
+#, fuzzy
+msgid "Feed Browser"
+msgstr "Editor notiziari"
-#: modules/pref-feeds.php:67
-msgid "Showing top 25 registered feeds, sorted by popularity:"
-msgstr "Mostra i primi 25 notiziari registrati, ordinati per popolarità:"
+#: modules/pref-feeds.php:81
+msgid "Top"
+msgstr "N°"
-#: modules/pref-feeds.php:117
-msgid "No feeds found."
-msgstr "Nessun notiziario trovato."
+#: modules/pref-feeds.php:90
+msgid "Show"
+msgstr "Mostra"
-#: modules/pref-feeds.php:155
+#: modules/pref-feeds.php:130
msgid "Feed Editor"
msgstr "Editor notiziari"
-#: modules/pref-feeds.php:210
+#: modules/pref-feeds.php:185
msgid "Link to feed:"
msgstr "Collega al notiziario:"
-#: modules/pref-feeds.php:227
+#: modules/pref-feeds.php:202
msgid "Not linked"
msgstr "Non collegato"
-#: modules/pref-feeds.php:275 modules/pref-feeds.php:471
+#: modules/pref-feeds.php:250 modules/pref-feeds.php:446
msgid "using"
msgstr "utilizzando"
-#: modules/pref-feeds.php:287 modules/pref-feeds.php:483
+#: modules/pref-feeds.php:262 modules/pref-feeds.php:458
msgid "Article purging:"
msgstr "Eliminazione articoli:"
-#: modules/pref-feeds.php:329 modules/pref-feeds.php:516
+#: modules/pref-feeds.php:304 modules/pref-feeds.php:491
msgid "Hide from \"Other Feeds\""
msgstr "Nascondere in \"Altri notiziari\""
-#: modules/pref-feeds.php:340 modules/pref-feeds.php:521
+#: modules/pref-feeds.php:315 modules/pref-feeds.php:496
msgid "Right-to-left content"
msgstr "Contenuto da destra a sinistra"
-#: modules/pref-feeds.php:351 modules/pref-feeds.php:526
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:501
msgid "Hide from my feed list"
msgstr "Nascondere nell&apos;elenco dei notiziari"
-#: modules/pref-feeds.php:363 modules/pref-feeds.php:532
+#: modules/pref-feeds.php:338 modules/pref-feeds.php:507
msgid "Include in e-mail digest"
msgstr "Includere nell&apos;email riassunto"
-#: modules/pref-feeds.php:384 modules/pref-feeds.php:540
+#: modules/pref-feeds.php:359 modules/pref-feeds.php:515
msgid "Cache images locally"
msgstr "Memorizzare le immagini localmente"
-#: modules/pref-feeds.php:412
+#: modules/pref-feeds.php:387
msgid "Multiple Feed Editor"
msgstr "Editor di notiziari multipli"
-#: modules/pref-feeds.php:784 modules/pref-feeds.php:831
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr "Fatto tutto."
-#: modules/pref-feeds.php:862
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Sottoscrizione avvenuta a <b>%s</b>."
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Si ha già una sottoscrizione a <b>%s</b>."
-#: modules/pref-feeds.php:965
+#: modules/pref-feeds.php:860
+msgid "Edit subscription options"
+msgstr ""
+
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Editor categorie"
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "La categoria <b>%s</b> esiste già nel database."
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "Impossibile eliminare categorie di notiziario non vuote."
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Crea categoria"
-#: modules/pref-feeds.php:1093
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Nessuna categoria notiziari definita."
-#: modules/pref-feeds.php:1104 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:178
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-users.php:474
msgid "Remove"
msgstr "Rimuovi"
-#: modules/pref-feeds.php:1126
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr ""
"Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
-#: modules/pref-feeds.php:1148 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
msgid "Subscribe to feed"
msgstr "Sottoscrivi il notiziario"
-#: modules/pref-feeds.php:1153
-msgid "Top 25"
-msgstr "Primi 25"
+#: modules/pref-feeds.php:1134
+#, fuzzy
+msgid "More Feeds"
+msgstr "Cambiamento del punteggio dei notiziari..."
-#: modules/pref-feeds.php:1227
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Mostrare l&apos;ora dell&apos;ultimo articolo"
-#: modules/pref-feeds.php:1244 modules/pref-feeds.php:1306
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Ultimo&nbsp;articolo"
-#: modules/pref-feeds.php:1331 modules/pref-filters.php:461
-#: modules/pref-users.php:456
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:461
+#: modules/pref-users.php:449
msgid "Click to edit"
msgstr "Fare clic per modificare"
-#: modules/pref-feeds.php:1377 modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1320
+msgid "(Hidden)"
+msgstr ""
+
+#: modules/pref-feeds.php:1333
+#, php-format
+msgid "(linked to %s)"
+msgstr ""
+
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Selezione:"
-#: modules/pref-feeds.php:1383
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Reimposta categoria"
-#: modules/pref-feeds.php:1392 modules/pref-filters.php:485
-#: modules/pref-users.php:479
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:485
+#: modules/pref-users.php:472
msgid "Edit"
msgstr "Modifica"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "Eliminazione manuale"
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Pulisci i dati del notiziario"
-#: modules/pref-feeds.php:1401 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
msgid "Rescore articles"
msgstr "Cambio punteggio degli articoli"
-#: modules/pref-feeds.php:1407
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Altro:"
-#: modules/pref-feeds.php:1408
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Modifica categorie"
-#: modules/pref-feeds.php:1415
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "File:"
-#: modules/pref-feeds.php:1422
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importa"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Esporta OPML"
-#: modules/pref-feeds.php:1432
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Integrazione con Firefox"
-#: modules/pref-feeds.php:1434
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2050,11 +2035,11 @@ msgstr ""
"Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di notiziari "
"di Firefox facendo clic sul collegamento qui sotto."
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1429
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
@@ -2063,14 +2048,18 @@ msgstr ""
"possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
"sotto."
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1433
msgid "Link to published articles feed."
msgstr "Collegamento al notiziario degli articoli pubblicati."
-#: modules/pref-feeds.php:1454
+#: modules/pref-feeds.php:1436
msgid "Generate another link"
msgstr "Genera altro collegamento"
+#: modules/pref-feeds.php:1502
+msgid "No feeds found."
+msgstr "Nessun notiziario trovato."
+
#: modules/pref-filters.php:23
msgid "Filter Editor"
msgstr "Editor filtri"
@@ -2121,20 +2110,20 @@ msgstr "Nessun filtro definito."
msgid "No matching filters found."
msgstr "Nessun filtro trovato che corrisponde."
-#: modules/pref-labels.php:75
+#: modules/pref-labels.php:66
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Etichetta <b>%s</b> creata"
-#: modules/pref-labels.php:113 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Crea etichetta"
-#: modules/pref-labels.php:184
+#: modules/pref-labels.php:175
msgid "No labels defined."
msgstr "Nessuna etichetta definita."
-#: modules/pref-labels.php:186
+#: modules/pref-labels.php:177
msgid "No matching labels found."
msgstr "Nessuna etichetta corrispondente trovata."
@@ -2150,15 +2139,20 @@ msgstr "La vecchia password non è corretta."
msgid "The configuration was saved."
msgstr "La configurazione è stata salvata."
+#: modules/pref-prefs.php:132
+#, php-format
+msgid "Unknown option: %s"
+msgstr ""
+
#: modules/pref-prefs.php:143
msgid "E-mail has been changed."
msgstr "L&apos;email è stata cambiata."
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:215
+#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
msgid "The configuration was reset to defaults."
msgstr "Questa configurazione è stata reimpostata ai valori predefiniti."
-#: modules/pref-prefs.php:200
+#: modules/pref-prefs.php:198
msgid ""
"Your password is at default value, \n"
"\t\t\t\t\t\tplease change it."
@@ -2166,67 +2160,67 @@ msgstr ""
"La password è impostata al valore predefinito, \n"
"\t\t\t\t\t\tcambiarla."
-#: modules/pref-prefs.php:227
+#: modules/pref-prefs.php:225
msgid "Personal data"
msgstr "Dati personali"
-#: modules/pref-prefs.php:234
+#: modules/pref-prefs.php:232
msgid "E-mail"
msgstr "Email"
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
msgid "Access level"
msgstr "Livello di accesso"
-#: modules/pref-prefs.php:258
+#: modules/pref-prefs.php:256
msgid "Change e-mail"
msgstr "Cambia email"
-#: modules/pref-prefs.php:266
+#: modules/pref-prefs.php:264
msgid "Old password"
msgstr "Vecchia password"
-#: modules/pref-prefs.php:273
+#: modules/pref-prefs.php:271
msgid "New password"
msgstr "Nuova password"
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:279
msgid "Confirm password"
msgstr "Conferma password"
-#: modules/pref-prefs.php:298
+#: modules/pref-prefs.php:296
msgid "Change password"
msgstr "Cambia password"
-#: modules/pref-prefs.php:314
+#: modules/pref-prefs.php:312
msgid "Themes"
msgstr "Temi"
-#: modules/pref-prefs.php:315
+#: modules/pref-prefs.php:313
msgid "Select theme"
msgstr "Seleziona tema"
-#: modules/pref-prefs.php:333
+#: modules/pref-prefs.php:331
msgid "Change theme"
msgstr "Cambia tema"
-#: modules/pref-prefs.php:390
+#: modules/pref-prefs.php:388
msgid "short_desc"
msgstr ""
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Sì"
-#: modules/pref-prefs.php:404 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
msgid "No"
msgstr "No"
-#: modules/pref-prefs.php:429
+#: modules/pref-prefs.php:427
msgid "Save configuration"
msgstr "Salva configurazione"
-#: modules/pref-prefs.php:433
+#: modules/pref-prefs.php:431
msgid "Reset to defaults"
msgstr "Reimposta ai valori predefiniti"
@@ -2234,59 +2228,68 @@ msgstr "Reimposta ai valori predefiniti"
msgid "Your access level is insufficient to open this tab."
msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
-#: modules/pref-users.php:54 modules/pref-users.php:417
+#: modules/pref-users.php:17 modules/pref-users.php:470
+msgid "User details"
+msgstr "Dettagli utente"
+
+#: modules/pref-users.php:31
+#, fuzzy
+msgid "User not found"
+msgstr "Notiziario non trovato."
+
+#: modules/pref-users.php:50 modules/pref-users.php:410
msgid "Registered"
msgstr "Registrato"
-#: modules/pref-users.php:55
+#: modules/pref-users.php:51
msgid "Last logged in"
msgstr "Ultimo accesso"
-#: modules/pref-users.php:72
+#: modules/pref-users.php:58
msgid "Subscribed feeds count"
msgstr "Numero notiziari sottoscritti"
-#: modules/pref-users.php:76
+#: modules/pref-users.php:62
msgid "Subscribed feeds"
msgstr "Sottoscrivi notiziari"
-#: modules/pref-users.php:122
+#: modules/pref-users.php:108
msgid "User Editor"
msgstr "Editor utente"
-#: modules/pref-users.php:152
+#: modules/pref-users.php:145
msgid "Access level: "
msgstr "Livello di accesso: "
-#: modules/pref-users.php:159
+#: modules/pref-users.php:158
msgid "Change password to"
msgstr "Cambiare la password a"
-#: modules/pref-users.php:168
+#: modules/pref-users.php:167
msgid "E-mail: "
msgstr "Email:"
-#: modules/pref-users.php:204
+#: modules/pref-users.php:203
#, php-format
msgid "Changed password of user <b>%s</b>."
msgstr "Password dell&apos;utente <b>%s</b> cambiata."
-#: modules/pref-users.php:252
+#: modules/pref-users.php:251
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "Aggiunto l&apos;utente <b>%s</b> con password <b>%s</b>"
-#: modules/pref-users.php:259
+#: modules/pref-users.php:258
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Impossibile creare l&apos;utente <b>%s<b>"
-#: modules/pref-users.php:263
+#: modules/pref-users.php:262
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "L&apos;utente <b>%s</b> esiste già."
-#: modules/pref-users.php:283
+#: modules/pref-users.php:282
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -2295,44 +2298,40 @@ msgstr ""
"Password cambiata all&apos;utente <b>%s</b>\n"
"\t\t\t\t\t a <b>%s</b>"
-#: modules/pref-users.php:287
+#: modules/pref-users.php:286
#, php-format
msgid "Notifying <b>%s</b>."
msgstr "Notifica a <b>%s</b>"
-#: modules/pref-users.php:324
+#: modules/pref-users.php:323
msgid "[tt-rss] Password change notification"
msgstr "[tt-rss] Notifica di cambio password"
-#: modules/pref-users.php:381 help/4.php:27
+#: modules/pref-users.php:374 help/4.php:27
msgid "Create user"
msgstr "Crea utente"
-#: modules/pref-users.php:415
+#: modules/pref-users.php:408
msgid "Login"
msgstr "Accesso"
-#: modules/pref-users.php:416
+#: modules/pref-users.php:409
msgid "Access Level"
msgstr "Livello di accesso"
-#: modules/pref-users.php:418
+#: modules/pref-users.php:411
msgid "Last login"
msgstr "Ultimo accesso"
-#: modules/pref-users.php:477
-msgid "User details"
-msgstr "Dettagli utente"
-
-#: modules/pref-users.php:483
+#: modules/pref-users.php:476
msgid "Reset password"
msgstr "Reimposta password"
-#: modules/pref-users.php:488
+#: modules/pref-users.php:481
msgid "No users defined."
msgstr "Nessun utente definito."
-#: modules/pref-users.php:490
+#: modules/pref-users.php:483
msgid "No matching users found."
msgstr "Nessun utente corrispondente trovato."
@@ -2499,17 +2498,9 @@ msgstr "Vai a..."
msgid "Press any key to close this window."
msgstr "Premere qualsiasi tasto per chiudere questa finestra."
-#: help/4.php:11
-msgid "Content Filtering"
-msgstr "Filtro contenuti"
-
-#: help/4.php:12
-msgid "Label Editor"
-msgstr "Editor etichette"
-
-#: help/4.php:13
-msgid "User Manager"
-msgstr "Gestore utenti"
+#: help/4.php:10
+msgid "Other Feeds"
+msgstr "Altri notiziari"
#: help/4.php:19
msgid "Panel actions"
@@ -2575,6 +2566,42 @@ msgstr "Corrisponde a:"
msgid "Internal error: Function not implemented"
msgstr "Errore interno: funzione non implementata"
+#~ msgid "Unknown Error"
+#~ msgstr "Errore sconosciuto"
+
+#~ msgid "Published Articles"
+#~ msgstr "Articoli pubblicati"
+
+#~ msgid "Feed information:"
+#~ msgstr "Informazioni notiziario:"
+
+#~ msgid "Site:"
+#~ msgstr "Sito:"
+
+#~ msgid "Last updated:"
+#~ msgstr "Ultimo aggiornamento:"
+
+#~ msgid "Last headlines:"
+#~ msgstr "Ultimi sommari:"
+
+#~ msgid "Other feeds: Top 25"
+#~ msgstr "Altri notiziari: primi 25"
+
+#~ msgid "Showing top 25 registered feeds, sorted by popularity:"
+#~ msgstr "Mostra i primi 25 notiziari registrati, ordinati per popolarità:"
+
+#~ msgid "Top 25"
+#~ msgstr "Primi 25"
+
+#~ msgid "Content Filtering"
+#~ msgstr "Filtro contenuti"
+
+#~ msgid "Label Editor"
+#~ msgstr "Editor etichette"
+
+#~ msgid "User Manager"
+#~ msgstr "Gestore utenti"
+
#~ msgid "Toggle:"
#~ msgstr "Inverti:"
@@ -2670,9 +2697,6 @@ msgstr "Errore interno: funzione non implementata"
#~ msgid "Match SQL"
#~ msgstr "SQL di corrispondenza"
-#~ msgid "Help"
-#~ msgstr "Aiuto"
-
#~ msgid "Error: SQL expression is blank."
#~ msgstr "Errore: l&apos;espressione SQL è vuota."
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index db0a25c99..3d42c69b2 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 047e27400..025d3100a 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss unstable\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-22 00:21+0300\n"
+"POT-Creation-Date: 2009-01-25 23:34+0300\n"
"PO-Revision-Date: 2008-09-25 12:43+0900\n"
"Last-Translator: Tadashi Jokagi <[email protected]>\n"
"Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -79,7 +79,7 @@ msgstr "毎日"
msgid "Weekly"
msgstr "毎週"
-#: backend.php:122 tt-rss.php:211 modules/pref-prefs.php:317
+#: backend.php:122 tt-rss.php:213 modules/pref-prefs.php:315
msgid "Default"
msgstr "標準"
@@ -91,7 +91,7 @@ msgstr "Magpie"
msgid "SimplePie"
msgstr "SimplePie"
-#: backend.php:133 modules/pref-users.php:140
+#: backend.php:133 modules/pref-users.php:126
msgid "User"
msgstr "ユーザー"
@@ -166,221 +166,221 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2852 modules/popup-dialog.php:175
+#: functions.php:2808 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "すべてのフィード"
-#: functions.php:2881 functions.php:2920 functions.php:3309 functions.php:4324
-#: functions.php:4354 modules/pref-feeds.php:1266
+#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
+#: functions.php:4248 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "カテゴリー割り当てなし"
-#: functions.php:2910 functions.php:3505 mobile/functions.php:33
+#: functions.php:2866 functions.php:3459 mobile/functions.php:33
msgid "Special"
msgstr "特別"
-#: functions.php:2912 functions.php:3338 functions.php:3507 prefs.php:144
-#: mobile/functions.php:83
+#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "ラベル"
-#: functions.php:2930 functions.php:3331 functions.php:4178 help/3.php:59
+#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "お気に入りの記事"
-#: functions.php:2932 functions.php:3335 functions.php:4185
-#: modules/pref-feeds.php:1441 help/3.php:60 mobile/functions.php:70
+#: functions.php:2888 functions.php:3291 functions.php:4079
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "公開済みの記事"
-#: functions.php:2934 functions.php:3341 functions.php:4163 help/3.php:58
+#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "新しい記事"
-#: functions.php:2936 functions.php:3344 functions.php:4156 help/3.php:57
+#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "すべての記事"
-#: functions.php:3295 functions.php:3297
+#: functions.php:3251 functions.php:3253
msgid "Search results"
msgstr "検索結果"
-#: functions.php:3313 functions.php:3326 functions.php:3332 functions.php:3336
-#: functions.php:3342 functions.php:3345 functions.php:3353
+#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
+#: functions.php:3298 functions.php:3301 functions.php:3309
#, fuzzy
msgid "Searched for"
msgstr "検索"
-#: functions.php:3984 functions.php:5351 modules/pref-feeds.php:1047
-#: modules/pref-feeds.php:1228 modules/pref-filters.php:366
-#: modules/pref-labels.php:138 modules/pref-users.php:408
+#: functions.php:3929
+msgid "Generated feed"
+msgstr "生成したフィード"
+
+#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
+#: modules/pref-labels.php:129 modules/pref-users.php:401
msgid "Select:"
msgstr "選択:"
-#: functions.php:3985 modules/pref-feeds.php:1048 modules/pref-feeds.php:1229
-#: modules/pref-filters.php:367 modules/pref-labels.php:139
-#: modules/pref-users.php:409 mobile/functions.php:570
+#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "すべて"
-#: functions.php:3986 functions.php:4002 tt-rss.php:203
+#: functions.php:3936 functions.php:3952 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "未読"
-#: functions.php:3987 mobile/functions.php:573
+#: functions.php:3937 mobile/functions.php:573
msgid "Invert"
msgstr "反転"
-#: functions.php:3988 modules/pref-feeds.php:1049 modules/pref-feeds.php:1230
-#: modules/pref-filters.php:368 modules/pref-labels.php:140
-#: modules/pref-users.php:410 mobile/functions.php:572
+#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "なし"
-#: functions.php:3996 tt-rss.php:152 modules/pref-feeds.php:1389
+#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "操作..."
-#: functions.php:4001
+#: functions.php:3951
msgid "Selection toggle:"
msgstr "選択の切り替え:"
-#: functions.php:4003 tt-rss.php:202 mobile/functions.php:459
+#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "お気に入り"
-#: functions.php:4004
+#: functions.php:3954
msgid "Published"
msgstr "公開済み"
-#: functions.php:4006
+#: functions.php:3956
msgid "Mark as read:"
msgstr "既読にする:"
-#: functions.php:4007 mobile/functions.php:578
+#: functions.php:3957 mobile/functions.php:578
msgid "Selection"
msgstr "選択"
-#: functions.php:4009 mobile/functions.php:580
+#: functions.php:3959 mobile/functions.php:580
msgid "Entire feed"
msgstr "フィードの入力"
-#: functions.php:4013
+#: functions.php:3963
#, fuzzy
msgid "Assign label:"
msgstr "タグの割り当て"
-#: functions.php:4016 tt-rss.php:169
-#, fuzzy
-msgid "Create label..."
-msgstr "ラベルを作成する"
-
-#: functions.php:4028
-#, fuzzy
-msgid "(remove)"
-msgstr "削除"
-
-#: functions.php:4065
-msgid "Generated feed"
-msgstr "生成したフィード"
-
-#: functions.php:4110
+#: functions.php:4004
msgid "Click to collapse category"
msgstr "閉じたカテゴリーのクリック"
-#: functions.php:4374
+#: functions.php:4268
msgid "No feeds to display."
msgstr "表示するフィードがありません。"
-#: functions.php:4391 mobile/functions.php:12
+#: functions.php:4285 mobile/functions.php:12
msgid "Tags"
msgstr "タグ"
-#: functions.php:4627
+#: functions.php:4521
msgid " - "
msgstr " - "
-#: functions.php:4682 functions.php:4683
-msgid "no tags"
-msgstr "タグがありません"
-
-#: functions.php:4690
+#: functions.php:4545 functions.php:5220
msgid "Edit tags for this article"
msgstr "この記事のタグを編集する"
-#: functions.php:4698
+#: functions.php:4553
#, fuzzy
msgid "Display original article content"
msgstr "記事の内容をスクロールする"
-#: functions.php:4705 functions.php:5361
+#: functions.php:4560 functions.php:5211
msgid "Show article summary in new window"
msgstr "記事の要約を新しいウィンドウで表示する"
-#: functions.php:4742 functions.php:5285
+#: functions.php:4593 functions.php:5135
msgid "unknown type"
msgstr "未知の種類"
-#: functions.php:4748 functions.php:5291
+#: functions.php:4599 functions.php:5141
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4784 functions.php:5325
+#: functions.php:4635 functions.php:5175
msgid "Attachment:"
msgstr "添付: "
-#: functions.php:4786 functions.php:5327
+#: functions.php:4637 functions.php:5177
msgid "Attachments:"
msgstr "添付:"
-#: functions.php:4806 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1098
+#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "このウィンドウを閉じる"
-#: functions.php:4862 modules/pref-feed-browser.php:75
+#: functions.php:4713
msgid "Feed not found."
msgstr "フィードが見つかりません。"
-#: functions.php:4931 mobile/functions.php:423
+#: functions.php:4782 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5259
+#: functions.php:5109
msgid "Click to expand article"
msgstr "開いた記事のクリック"
-#: functions.php:5419
+#: functions.php:5246
msgid "No unread articles found to display."
msgstr "表示する未読記事が見つかりませんでした。"
-#: functions.php:5422
+#: functions.php:5249
#, fuzzy
msgid "No updated articles found to display."
msgstr "表示する未読記事が見つかりませんでした。"
-#: functions.php:5425
+#: functions.php:5252
msgid "No starred articles found to display."
msgstr "表示するお気に入りの記事が見つかりませんでした。"
-#: functions.php:5429
+#: functions.php:5256
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5431
+#: functions.php:5258
msgid "No articles found to display."
msgstr "表示する記事が見つかりません。"
+#: functions.php:5931 tt-rss.php:171
+#, fuzzy
+msgid "Create label..."
+msgstr "ラベルを作成する"
+
+#: functions.php:5944
+#, fuzzy
+msgid "(remove)"
+msgstr "削除"
+
+#: functions.php:5988
+msgid "no tags"
+msgstr "タグがありません"
+
#: localized_js.php:35
msgid "display feeds"
msgstr "フィードの表示"
@@ -389,7 +389,7 @@ msgstr "フィードの表示"
msgid "display tags"
msgstr "タグの表示"
-#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
+#: localized_js.php:37 prefs.php:66 prefs.php:138 tt-rss.php:68
msgid "Loading, please wait..."
msgstr "読み込み中です。しばらくお待ちください。"
@@ -587,7 +587,7 @@ msgstr "ヘッドラインを更新できません (XML オブジェクトが見
msgid "Could not display article (missing XML object)"
msgstr "記事を表示できません (XML オブジェクトが見当たりません)"
-#: localized_js.php:95 tt-rss.php:257 tt-rss.php:270
+#: localized_js.php:95 tt-rss.php:259 tt-rss.php:272
msgid "No feed selected."
msgstr "フィードは選択されていません。"
@@ -760,8 +760,8 @@ msgstr "選択されたフィードの変更を保存しますか?"
msgid "Saving feeds..."
msgstr "フィードの保存中..."
-#: localized_schema.php:9 tt-rss.php:213 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1241 modules/pref-feeds.php:1302
+#: localized_schema.php:9 tt-rss.php:215 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "題名"
@@ -787,7 +787,7 @@ msgstr ""
msgid "Filter article"
msgstr "記事フィルター"
-#: localized_schema.php:16 tt-rss.php:164 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:166 mobile/functions.php:583
msgid "Mark as read"
msgstr "既読にする"
@@ -799,250 +799,255 @@ msgstr "お気に入りに設定する"
msgid "Assign tags"
msgstr "タグの割り当て"
-#: localized_schema.php:23
+#: localized_schema.php:20
+#, fuzzy
+msgid "Assign label"
+msgstr "タグの割り当て"
+
+#: localized_schema.php:24
msgid "General"
msgstr "全体"
-#: localized_schema.php:25
+#: localized_schema.php:26
msgid "Allow duplicate posts"
msgstr "複製投稿の許可"
-#: localized_schema.php:26
+#: localized_schema.php:27
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:27
+#: localized_schema.php:28
msgid "Default interval between feed updates (in minutes)"
msgstr "フィードの更新までの標準間隔 (単位:分)"
-#: localized_schema.php:28
+#: localized_schema.php:29
msgid "Enable e-mail digest"
msgstr "電子メールでのダイジェストを有効にする"
-#: localized_schema.php:29
+#: localized_schema.php:30
msgid ""
"This option enables sending daily digest of new (and unread) headlines on "
"your configured e-mail address"
msgstr ""
-#: localized_schema.php:30
+#: localized_schema.php:31
msgid "Purge old posts after this number of days (0 - disables)"
msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
-#: localized_schema.php:31
+#: localized_schema.php:32
msgid "Update post on checksum change"
msgstr ""
-#: localized_schema.php:32
+#: localized_schema.php:33
#, fuzzy
msgid "Mark articles in e-mail digest as read"
msgstr "すべての記事を既読に設定しますか?"
-#: localized_schema.php:34
+#: localized_schema.php:35
msgid "Interface"
msgstr "インターフェース"
-#: localized_schema.php:36
+#: localized_schema.php:37
msgid "Combined feed display"
msgstr "フィード表示の組み合わせ"
-#: localized_schema.php:37
+#: localized_schema.php:38
msgid ""
"Display expanded list of feed articles, instead of separate displays for "
"headlines and article content"
msgstr ""
-#: localized_schema.php:38
+#: localized_schema.php:39
msgid "Default article limit"
msgstr "標準の記事制限"
-#: localized_schema.php:39
+#: localized_schema.php:40
msgid ""
"Default limit for articles to display, any custom number you like (0 - "
"disables)."
msgstr ""
-#: localized_schema.php:40
+#: localized_schema.php:41
msgid "Enable feed categories"
msgstr "フィードカテゴリーを有効にする"
-#: localized_schema.php:41
+#: localized_schema.php:42
msgid "Enable search toolbar"
msgstr "検索ツールバーを有効にする"
-#: localized_schema.php:42
+#: localized_schema.php:43
msgid "Hide feeds with no unread messages"
msgstr "未読でないメッセージとフィードを隠す"
-#: localized_schema.php:43
+#: localized_schema.php:44
msgid "Mark articles as read automatically"
msgstr "自動的に既読として記事をマークする"
-#: localized_schema.php:44
+#: localized_schema.php:45
msgid ""
"This option enables marking articles as read automatically in combined mode "
"(except for Fresh articles feed) while you scroll article list."
msgstr ""
-#: localized_schema.php:45
+#: localized_schema.php:46
msgid "On catchup show next feed"
msgstr ""
-#: localized_schema.php:46
+#: localized_schema.php:47
msgid ""
"When \"Mark as read\" button is clicked in toolbar, automatically open next "
"feed with unread articles."
msgstr ""
-#: localized_schema.php:47
+#: localized_schema.php:48
msgid "Open article links in new browser window"
msgstr "新しいブラウザーのウィンドウで記事のリンクを開く"
-#: localized_schema.php:48
+#: localized_schema.php:49
msgid "Reverse headline order (oldest first)"
msgstr "ヘッドラインの逆順 (古いものがはじめに)"
-#: localized_schema.php:49
+#: localized_schema.php:50
msgid "Show content preview in headlines list"
msgstr "ヘッドライン一覧に内容のプレビューを表示する"
-#: localized_schema.php:50
+#: localized_schema.php:51
msgid "Sort feeds by unread articles count"
msgstr "未読記事数によるフィードの並び替え"
-#: localized_schema.php:51
+#: localized_schema.php:52
msgid "User stylesheet URL"
msgstr "ユーザースタイルシートの URL"
-#: localized_schema.php:52
+#: localized_schema.php:53
msgid "Link to user stylesheet to override default style, disabled if empty."
msgstr ""
"標準のスタイルを上書きするスタイルシートへのリンクで、空の場合は無効です。"
-#: localized_schema.php:53
+#: localized_schema.php:54
msgid "Maximum age of fresh articles (in hours)"
msgstr ""
-#: localized_schema.php:54
+#: localized_schema.php:55
msgid "Hide feedlist"
msgstr "フィード一覧を隠す"
-#: localized_schema.php:55
+#: localized_schema.php:56
msgid ""
"This option hides feedlist and allows it to be toggled on the fly, useful "
"for small screens."
msgstr ""
-#: localized_schema.php:56
+#: localized_schema.php:57
msgid "Group headlines in virtual feeds"
msgstr "仮想フィードのグループヘッドライン"
-#: localized_schema.php:57
+#: localized_schema.php:58
msgid ""
"When this option is enabled, headlines in Special feeds and Labels are "
"grouped by feeds"
msgstr ""
-#: localized_schema.php:59
+#: localized_schema.php:60
msgid "Advanced"
msgstr "高度"
-#: localized_schema.php:61
+#: localized_schema.php:62
msgid "Blacklisted tags"
msgstr ""
-#: localized_schema.php:62
+#: localized_schema.php:63
msgid ""
"When auto-detecting tags in articles these tags will not be applied (comma-"
"separated list)."
msgstr ""
-#: localized_schema.php:63
+#: localized_schema.php:64
msgid "Confirm marking feed as read"
msgstr "既読としてフィードのマーキングについて確認する"
-#: localized_schema.php:64
+#: localized_schema.php:65
msgid "Enable feed icons"
msgstr "フィードアイコンを有効にする"
-#: localized_schema.php:65
+#: localized_schema.php:66
msgid "Enable labels"
msgstr "ラベルを有効にする"
-#: localized_schema.php:66
+#: localized_schema.php:67
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:67
+#: localized_schema.php:68
msgid "Long date format"
msgstr "完全な日付の形式"
-#: localized_schema.php:68
+#: localized_schema.php:69
msgid "Set articles as unread on update"
msgstr "更新時に未読として記事を設定する"
-#: localized_schema.php:69
+#: localized_schema.php:70
msgid "Short date format"
msgstr "短い日付の形式"
-#: localized_schema.php:70
+#: localized_schema.php:71
msgid "Show additional information in feedlist"
msgstr "フィード一覧の追加情報を表示する"
-#: localized_schema.php:71
+#: localized_schema.php:72
msgid "Strip unsafe tags from articles"
msgstr "記事から安全でないタグを取り除く"
-#: localized_schema.php:72
+#: localized_schema.php:73
msgid "Strip all but most common HTML tags when reading articles."
msgstr ""
-#: localized_schema.php:73
+#: localized_schema.php:74
msgid "Use more accessible date/time format for headlines"
msgstr ""
-#: localized_schema.php:74
+#: localized_schema.php:75
msgid "Automatically expand articles in combined mode"
msgstr "組み合わせモードで記事を自動的に展開する"
-#: localized_schema.php:75
+#: localized_schema.php:76
msgid "Purge unread articles"
msgstr "未読記事を削除する"
-#: localized_schema.php:76
+#: localized_schema.php:77
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: localized_schema.php:77
+#: localized_schema.php:78
msgid "Prefer more accurate feedlist counters to UI speed"
msgstr ""
-#: localized_schema.php:78
+#: localized_schema.php:79
msgid "Enable inline MP3 player"
msgstr "インライン MP3 プレイヤーを有効にする"
-#: localized_schema.php:79
+#: localized_schema.php:80
msgid ""
"Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
msgstr ""
-#: localized_schema.php:80
+#: localized_schema.php:81
msgid "Do not show images in articles"
msgstr "記事内に画像を表示しない"
-#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:302
-#: modules/pref-feeds.php:495 mobile/login_form.php:59
+#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:277
+#: modules/pref-feeds.php:470 mobile/login_form.php:59
msgid "Login:"
msgstr "ログイン:"
-#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:306
-#: modules/pref-feeds.php:501 mobile/login_form.php:60
+#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:281
+#: modules/pref-feeds.php:476 mobile/login_form.php:60
msgid "Password:"
msgstr "パスワード:"
@@ -1079,7 +1084,7 @@ msgstr ""
#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
#: register.php:200 register.php:213 register.php:228 register.php:246
#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162
+#: update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Tiny Tiny RSS に戻る"
@@ -1125,56 +1130,44 @@ msgstr ""
msgid "Return to preferences"
msgstr "設定に戻る"
-#: prefs.php:77 prefs.php:156 tt-rss.php:79
+#: prefs.php:74 prefs.php:141 tt-rss.php:76
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 ""
-#: prefs.php:104
-msgid "Unknown Error"
-msgstr "未知のエラー"
-
-#: prefs.php:110 tt-rss.php:115
+#: prefs.php:101 tt-rss.php:116
msgid "Hello,"
msgstr "ようこそ、"
-#: prefs.php:112 prefs.php:122 help/4.php:14
+#: prefs.php:103 prefs.php:113 help/4.php:14
msgid "Exit preferences"
msgstr "設定を終了する"
-#: prefs.php:114 tt-rss.php:125 mobile/functions.php:21
+#: prefs.php:105 tt-rss.php:126 mobile/functions.php:21
msgid "Logout"
msgstr "ログアウト"
-#: prefs.php:126
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "キーボードショートカット"
-#: prefs.php:132 tt-rss.php:117 tt-rss.php:154 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:118 tt-rss.php:156 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "設定"
-#: prefs.php:134 help/4.php:9
+#: prefs.php:125 help/4.php:9
msgid "My Feeds"
msgstr "自分のフィード"
-#: prefs.php:137 help/4.php:10
-msgid "Other Feeds"
-msgstr "その他のフィード"
-
-#: prefs.php:140
-msgid "Published Articles"
-msgstr "公開された記事"
-
-#: prefs.php:142
+#: prefs.php:127 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "ファイル:"
-#: prefs.php:147
+#: prefs.php:132 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "ユーザー"
@@ -1209,7 +1202,7 @@ msgid "How much is two plus two:"
msgstr ""
#: register.php:193
-msgid "Submit registration\""
+msgid "Submit registration"
msgstr ""
#: register.php:211
@@ -1321,135 +1314,139 @@ msgstr ""
msgid "Fatal Error"
msgstr "致命的なエラー"
-#: tt-rss.php:121
+#: tt-rss.php:122
msgid "Comments?"
msgstr ""
-#: tt-rss.php:138
+#: tt-rss.php:130
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr ""
+
+#: tt-rss.php:140
msgid "tag cloud"
msgstr "タグクラウド"
-#: tt-rss.php:142
+#: tt-rss.php:144
#, fuzzy
msgid "More feeds..."
msgstr "フィードのスコアの再計算中..."
-#: tt-rss.php:153
+#: tt-rss.php:155
#, fuzzy
msgid "Search..."
msgstr "検索"
-#: tt-rss.php:156
+#: tt-rss.php:158
msgid "Feed actions:"
msgstr "フィード操作"
-#: tt-rss.php:157
+#: tt-rss.php:159
#, fuzzy
msgid "Subscribe to feed..."
msgstr "フィードを購読する"
-#: tt-rss.php:158
+#: tt-rss.php:160
#, fuzzy
msgid "Edit this feed..."
msgstr "フィードを編集する"
-#: tt-rss.php:159
+#: tt-rss.php:161
#, fuzzy
msgid "Clear articles"
msgstr "記事フィルター"
-#: tt-rss.php:160
+#: tt-rss.php:162
#, fuzzy
msgid "Rescore feed"
msgstr "フィードのスコアの再計算中..."
-#: tt-rss.php:161 modules/pref-feeds.php:397 modules/pref-feeds.php:1402
+#: tt-rss.php:163 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "購読をやめる"
-#: tt-rss.php:163
+#: tt-rss.php:165
msgid "All feeds:"
msgstr "すべてのフィード:"
-#: tt-rss.php:165 help/3.php:44
+#: tt-rss.php:167 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "読んだフィードを隠す/再表示する"
-#: tt-rss.php:167
+#: tt-rss.php:169
msgid "Other actions:"
msgstr "その他の操作:"
-#: tt-rss.php:170
+#: tt-rss.php:172
#, fuzzy
msgid "Create filter..."
msgstr "フィルターを作成する"
-#: tt-rss.php:171
+#: tt-rss.php:173
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;UI レイアウトのリセット"
-#: tt-rss.php:172
+#: tt-rss.php:174
#, fuzzy
msgid "Reset category order"
msgstr "選択されたカテゴリーの順序をリセットしますか?"
-#: tt-rss.php:174
+#: tt-rss.php:176
msgid "&nbsp;&nbsp;Keyboard shortcuts"
msgstr "&nbsp;&nbsp;キーボードショートカット"
-#: tt-rss.php:182
+#: tt-rss.php:184
msgid "Collapse feedlist"
msgstr "フィード一覧を閉じる"
-#: tt-rss.php:184
+#: tt-rss.php:186
msgid "Toggle Feedlist"
msgstr "フィード一覧を切り替える"
-#: tt-rss.php:192 mobile/functions.php:738
+#: tt-rss.php:194 mobile/functions.php:738
msgid "Search:"
msgstr "検索:"
-#: tt-rss.php:200 mobile/functions.php:456
+#: tt-rss.php:202 mobile/functions.php:456
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:201 mobile/functions.php:457
+#: tt-rss.php:203 mobile/functions.php:457
msgid "All Articles"
msgstr "すべての記事"
-#: tt-rss.php:204
+#: tt-rss.php:206
msgid "Ignore Scoring"
msgstr "スコア計算の無効化"
-#: tt-rss.php:205 modules/pref-feeds.php:1247 modules/pref-feeds.php:1310
+#: tt-rss.php:207 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "更新日時"
-#: tt-rss.php:208
+#: tt-rss.php:210
msgid "Order:"
msgstr "並べ替え:"
-#: tt-rss.php:212 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:214 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:443
msgid "Date"
msgstr "日付"
-#: tt-rss.php:214
+#: tt-rss.php:216
msgid "Score"
msgstr "スコア"
-#: tt-rss.php:218
+#: tt-rss.php:220
msgid "Limit:"
msgstr "制限:"
-#: tt-rss.php:243 modules/pref-feeds.php:261 modules/pref-feeds.php:458
+#: tt-rss.php:245 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "更新"
-#: tt-rss.php:261
+#: tt-rss.php:263
msgid "Drag me to resize panels"
msgstr "パネルの大きさを変更するにはここをドラッグします"
@@ -1513,6 +1510,10 @@ msgstr ""
"完了しました。<b>%d</b> 個のテーブルをスキーマーバージョン<b>%d</b> に更新し"
"ました。"
+#: modules/help.php:6
+msgid "Help"
+msgstr "ヘルプ"
+
#: modules/help.php:17
msgid "Help topic not found."
msgstr "ヘルプのトピックが見つかりません。"
@@ -1551,54 +1552,56 @@ msgstr "エラー: 本文要素を見つけることができませんでした�
msgid "Notice"
msgstr "通知"
-#: modules/popup-dialog.php:12
+#: modules/popup-dialog.php:14
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."
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
msgstr ""
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
msgid "Last update:"
msgstr "最終更新:"
#: 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."
+"You are running the latest version of Tiny Tiny RSS. The fact that you are "
+"seeing this dialog is probably a bug."
msgstr ""
-#: modules/popup-dialog.php:35
+#: modules/popup-dialog.php:34
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."
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
+msgstr ""
+
+#: modules/popup-dialog.php:48
+msgid "Visit official site"
msgstr ""
#: modules/popup-dialog.php:61
msgid "Subscribe to Feed"
msgstr "フィードを購読する"
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:422 modules/pref-filters.php:403
+#: modules/popup-dialog.php:70 modules/pref-feeds.php:140
+#: modules/pref-feeds.php:397 modules/pref-filters.php:403
msgid "Feed"
msgstr "フィード"
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:181
-#: modules/pref-feeds.php:436
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:156
+#: modules/pref-feeds.php:411
msgid "URL:"
msgstr "URL:"
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:193
-#: modules/pref-feeds.php:448
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:168
+#: modules/pref-feeds.php:423
msgid "Place in category:"
msgstr "カテゴリーの場所:"
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:297
-#: modules/pref-feeds.php:492 modules/pref-prefs.php:264
-#: modules/pref-users.php:149
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:272
+#: modules/pref-feeds.php:467 modules/pref-prefs.php:262
+#: modules/pref-users.php:142
msgid "Authentication"
msgstr "認証"
@@ -1606,23 +1609,22 @@ msgstr "認証"
msgid "This feed requires authentication."
msgstr "このフィードは認証を要求します。"
-#: modules/popup-dialog.php:130 modules/pref-feed-browser.php:166
-#: modules/pref-feeds.php:128
+#: modules/popup-dialog.php:130 modules/pref-feeds.php:103
msgid "Subscribe"
msgstr "購読"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:130 modules/pref-feeds.php:402
-#: modules/pref-feeds.php:556 modules/pref-filters.php:166
-#: modules/pref-users.php:184
+#: modules/pref-feeds.php:105 modules/pref-feeds.php:377
+#: modules/pref-feeds.php:531 modules/pref-filters.php:166
+#: modules/pref-users.php:183
msgid "Cancel"
msgstr "取り消し"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feed-browser.php:125
-#: modules/pref-feeds.php:1143 modules/pref-filters.php:307
-#: modules/pref-labels.php:105 modules/pref-users.php:364
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-labels.php:96 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1691,9 +1693,9 @@ msgstr "操作の実行"
msgid "with parameters:"
msgstr "パラメーター:"
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:315
-#: modules/pref-feeds.php:510 modules/pref-filters.php:123
-#: modules/pref-users.php:165
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:290
+#: modules/pref-feeds.php:485 modules/pref-filters.php:123
+#: modules/pref-users.php:164
msgid "Options"
msgstr "オプション"
@@ -1729,9 +1731,9 @@ msgstr "タグを編集する"
msgid "Tags for this article (separated by commas):"
msgstr "この記事のタグ (カンマで区切ります):"
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:400
-#: modules/pref-feeds.php:554 modules/pref-filters.php:162
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:529 modules/pref-filters.php:162
+#: modules/pref-users.php:180
msgid "Save"
msgstr "保存"
@@ -1747,45 +1749,6 @@ msgstr "もっとも人気のあるタグを表示中 "
msgid "browse more"
msgstr "もっと参照する"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr "フィードブラウザーは管理者によって無効になっています。"
-
-#: modules/pref-feed-browser.php:15
-msgid "Feed information:"
-msgstr "フィード情報:"
-
-#: modules/pref-feed-browser.php:39
-msgid "Site:"
-msgstr "サイト:"
-
-#: modules/pref-feed-browser.php:41
-msgid "Last updated:"
-msgstr "最終更新:"
-
-#: modules/pref-feed-browser.php:56
-msgid "Last headlines:"
-msgstr "最終ヘッドライン:"
-
-#: modules/pref-feed-browser.php:112
-msgid ""
-"Feed browser cache information is missing. Please refer to the <a "
-"class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-"FeedBrowser'>wiki</a> for more information."
-msgstr ""
-
-#: modules/pref-feed-browser.php:129
-msgid "Top"
-msgstr ""
-
-#: modules/pref-feed-browser.php:138
-msgid "Show"
-msgstr "表示"
-
-#: modules/pref-feed-browser.php:222
-msgid "Couldn't find any feeds available for subscription."
-msgstr ""
-
#: modules/pref-feeds.php:4
msgid "Check to enable field"
msgstr ""
@@ -1794,182 +1757,201 @@ msgstr ""
msgid "Subscribed to feeds:"
msgstr "フィードを購読する:"
+#: modules/pref-feeds.php:59
+msgid "Feed browser is administratively disabled."
+msgstr "フィードブラウザーは管理者によって無効になっています。"
+
#: modules/pref-feeds.php:63
-msgid "Other feeds: Top 25"
-msgstr "その他のフィード: トップ 25"
+#, fuzzy
+msgid "Feed Browser"
+msgstr "フィードエディター"
-#: modules/pref-feeds.php:67
-msgid "Showing top 25 registered feeds, sorted by popularity:"
-msgstr "人気順の登録フィード、トップ 25 を表示中:"
+#: modules/pref-feeds.php:81
+msgid "Top"
+msgstr ""
-#: modules/pref-feeds.php:117
-msgid "No feeds found."
-msgstr "フィードがありません。"
+#: modules/pref-feeds.php:90
+msgid "Show"
+msgstr "表示"
-#: modules/pref-feeds.php:155
+#: modules/pref-feeds.php:130
msgid "Feed Editor"
msgstr "フィードエディター"
-#: modules/pref-feeds.php:210
+#: modules/pref-feeds.php:185
msgid "Link to feed:"
msgstr "フィードへのリンク:"
-#: modules/pref-feeds.php:227
+#: modules/pref-feeds.php:202
msgid "Not linked"
msgstr "リンクされていません"
-#: modules/pref-feeds.php:275 modules/pref-feeds.php:471
+#: modules/pref-feeds.php:250 modules/pref-feeds.php:446
msgid "using"
msgstr ""
-#: modules/pref-feeds.php:287 modules/pref-feeds.php:483
+#: modules/pref-feeds.php:262 modules/pref-feeds.php:458
msgid "Article purging:"
msgstr "記事の削除:"
-#: modules/pref-feeds.php:329 modules/pref-feeds.php:516
+#: modules/pref-feeds.php:304 modules/pref-feeds.php:491
msgid "Hide from \"Other Feeds\""
msgstr "「その他のフィード」から隠す"
-#: modules/pref-feeds.php:340 modules/pref-feeds.php:521
+#: modules/pref-feeds.php:315 modules/pref-feeds.php:496
msgid "Right-to-left content"
msgstr "右から左のコンテンツ"
-#: modules/pref-feeds.php:351 modules/pref-feeds.php:526
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:501
msgid "Hide from my feed list"
msgstr "自分のフィード一覧から隠す"
-#: modules/pref-feeds.php:363 modules/pref-feeds.php:532
+#: modules/pref-feeds.php:338 modules/pref-feeds.php:507
msgid "Include in e-mail digest"
msgstr "電子メールダイジェストに含む"
-#: modules/pref-feeds.php:384 modules/pref-feeds.php:540
+#: modules/pref-feeds.php:359 modules/pref-feeds.php:515
msgid "Cache images locally"
msgstr "ローカルに画像をキャッシュする"
-#: modules/pref-feeds.php:412
+#: modules/pref-feeds.php:387
msgid "Multiple Feed Editor"
msgstr "複数フィードエディター"
-#: modules/pref-feeds.php:784 modules/pref-feeds.php:831
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr "すべて終了しました。"
-#: modules/pref-feeds.php:862
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "<b>%s</b> を購読しました。"
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "<b>%s</b> は既に購読しています。"
-#: modules/pref-feeds.php:965
+#: modules/pref-feeds.php:860
+msgid "Edit subscription options"
+msgstr ""
+
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "カテゴリーエディター"
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "殻でないフィードカテゴリーは削除できません。"
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "カテゴリーの作成"
-#: modules/pref-feeds.php:1093
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "フィードカテゴリーが定義されていません。"
-#: modules/pref-feeds.php:1104 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:178
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-users.php:474
msgid "Remove"
msgstr "削除"
-#: modules/pref-feeds.php:1126
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
-#: modules/pref-feeds.php:1148 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
msgid "Subscribe to feed"
msgstr "フィードを購読する"
-#: modules/pref-feeds.php:1153
-msgid "Top 25"
-msgstr "トップ 25"
+#: modules/pref-feeds.php:1134
+#, fuzzy
+msgid "More Feeds"
+msgstr "フィードのスコアの再計算中..."
-#: modules/pref-feeds.php:1227
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "最後の記事の時間を表示する"
-#: modules/pref-feeds.php:1244 modules/pref-feeds.php:1306
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "最後の記事"
-#: modules/pref-feeds.php:1331 modules/pref-filters.php:461
-#: modules/pref-users.php:456
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:461
+#: modules/pref-users.php:449
msgid "Click to edit"
msgstr "編集するにはクリック"
-#: modules/pref-feeds.php:1377 modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1320
+msgid "(Hidden)"
+msgstr ""
+
+#: modules/pref-feeds.php:1333
+#, php-format
+msgid "(linked to %s)"
+msgstr ""
+
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "選択:"
-#: modules/pref-feeds.php:1383
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "カテゴリー再設定"
-#: modules/pref-feeds.php:1392 modules/pref-filters.php:485
-#: modules/pref-users.php:479
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:485
+#: modules/pref-users.php:472
msgid "Edit"
msgstr "編集"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "手動削除"
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "フィードデータの消去"
-#: modules/pref-feeds.php:1401 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
msgid "Rescore articles"
msgstr "記事のスコアの再集計"
-#: modules/pref-feeds.php:1407
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "その他:"
-#: modules/pref-feeds.php:1408
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "カテゴリーの編集"
-#: modules/pref-feeds.php:1415
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "ファイル:"
-#: modules/pref-feeds.php:1422
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "インポート"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "OPML エクスポート"
-#: modules/pref-feeds.php:1432
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Firefox 統合"
-#: modules/pref-feeds.php:1434
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -1977,25 +1959,29 @@ msgstr ""
"下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
"Tiny RSS のサイトを使うことができます。"
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1429
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
msgstr ""
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "公開済みの記事"
-#: modules/pref-feeds.php:1454
+#: modules/pref-feeds.php:1436
msgid "Generate another link"
msgstr "別のリンクを生成する"
+#: modules/pref-feeds.php:1502
+msgid "No feeds found."
+msgstr "フィードがありません。"
+
#: modules/pref-filters.php:23
msgid "Filter Editor"
msgstr "フィルターエディター"
@@ -2047,20 +2033,20 @@ msgstr "フィルターが定義されていません。"
msgid "No matching filters found."
msgstr "一致するフィルターが見つかりません。"
-#: modules/pref-labels.php:75
+#: modules/pref-labels.php:66
#, php-format
msgid "Created label <b>%s</b>"
msgstr "ラベル <b>%s</b> を作成しました"
-#: modules/pref-labels.php:113 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "ラベルを作成する"
-#: modules/pref-labels.php:184
+#: modules/pref-labels.php:175
msgid "No labels defined."
msgstr "ラベルが定義されていません。"
-#: modules/pref-labels.php:186
+#: modules/pref-labels.php:177
msgid "No matching labels found."
msgstr "一致するラベルが見つかりません。"
@@ -2076,15 +2062,20 @@ msgstr "古いパスワードが不正確です。"
msgid "The configuration was saved."
msgstr "設定を保存しました。"
+#: modules/pref-prefs.php:132
+#, php-format
+msgid "Unknown option: %s"
+msgstr ""
+
#: modules/pref-prefs.php:143
msgid "E-mail has been changed."
msgstr "電子メールを変更しました。"
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:215
+#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
msgid "The configuration was reset to defaults."
msgstr "設定を標準に戻しました。"
-#: modules/pref-prefs.php:200
+#: modules/pref-prefs.php:198
msgid ""
"Your password is at default value, \n"
"\t\t\t\t\t\tplease change it."
@@ -2092,67 +2083,67 @@ msgstr ""
"パスワードが標準のままです。\n"
" 変更してください。"
-#: modules/pref-prefs.php:227
+#: modules/pref-prefs.php:225
msgid "Personal data"
msgstr "個人データ"
-#: modules/pref-prefs.php:234
+#: modules/pref-prefs.php:232
msgid "E-mail"
msgstr "電子メール"
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
msgid "Access level"
msgstr "アクセスレベル"
-#: modules/pref-prefs.php:258
+#: modules/pref-prefs.php:256
msgid "Change e-mail"
msgstr "電子メールを変更する"
-#: modules/pref-prefs.php:266
+#: modules/pref-prefs.php:264
msgid "Old password"
msgstr "現在のパスワード"
-#: modules/pref-prefs.php:273
+#: modules/pref-prefs.php:271
msgid "New password"
msgstr "新しいパスワード"
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:279
msgid "Confirm password"
msgstr "新しいパスワード(確認)"
-#: modules/pref-prefs.php:298
+#: modules/pref-prefs.php:296
msgid "Change password"
msgstr "パスワードを変更する"
-#: modules/pref-prefs.php:314
+#: modules/pref-prefs.php:312
msgid "Themes"
msgstr "テーマ"
-#: modules/pref-prefs.php:315
+#: modules/pref-prefs.php:313
msgid "Select theme"
msgstr "テーマを選択する"
-#: modules/pref-prefs.php:333
+#: modules/pref-prefs.php:331
msgid "Change theme"
msgstr "テーマを変更する"
-#: modules/pref-prefs.php:390
+#: modules/pref-prefs.php:388
msgid "short_desc"
msgstr ""
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "はい"
-#: modules/pref-prefs.php:404 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
msgid "No"
msgstr "いいえ"
-#: modules/pref-prefs.php:429
+#: modules/pref-prefs.php:427
msgid "Save configuration"
msgstr "設定を保存する"
-#: modules/pref-prefs.php:433
+#: modules/pref-prefs.php:431
msgid "Reset to defaults"
msgstr "標準に戻す"
@@ -2160,59 +2151,68 @@ msgstr "標準に戻す"
msgid "Your access level is insufficient to open this tab."
msgstr "このタブを開くにはアクセスレベルが不十分です。"
-#: modules/pref-users.php:54 modules/pref-users.php:417
+#: modules/pref-users.php:17 modules/pref-users.php:470
+msgid "User details"
+msgstr "ユーザーの詳細"
+
+#: modules/pref-users.php:31
+#, fuzzy
+msgid "User not found"
+msgstr "フィードが見つかりません。"
+
+#: modules/pref-users.php:50 modules/pref-users.php:410
msgid "Registered"
msgstr "登録済み"
-#: modules/pref-users.php:55
+#: modules/pref-users.php:51
msgid "Last logged in"
msgstr "最終ログイン"
-#: modules/pref-users.php:72
+#: modules/pref-users.php:58
msgid "Subscribed feeds count"
msgstr "購読フィード数"
-#: modules/pref-users.php:76
+#: modules/pref-users.php:62
msgid "Subscribed feeds"
msgstr "購読したフィード"
-#: modules/pref-users.php:122
+#: modules/pref-users.php:108
msgid "User Editor"
msgstr "ユーザーエディター"
-#: modules/pref-users.php:152
+#: modules/pref-users.php:145
msgid "Access level: "
msgstr "アクセスレベル: "
-#: modules/pref-users.php:159
+#: modules/pref-users.php:158
msgid "Change password to"
msgstr "次のパスワードに変更する:"
-#: modules/pref-users.php:168
+#: modules/pref-users.php:167
msgid "E-mail: "
msgstr "電子メール: "
-#: modules/pref-users.php:204
+#: modules/pref-users.php:203
#, php-format
msgid "Changed password of user <b>%s</b>."
msgstr "ユーザー <b>%s</b> のパスワードを変更しました。"
-#: modules/pref-users.php:252
+#: modules/pref-users.php:251
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "ユーザー名 <b>%s</b> とパスワード <b>%s</b> で追加しました"
-#: modules/pref-users.php:259
+#: modules/pref-users.php:258
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "ユーザー <b>%s</b> の追加中です。"
-#: modules/pref-users.php:263
+#: modules/pref-users.php:262
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "ユーザー <b>%s</b> は既に存在します。"
-#: modules/pref-users.php:283
+#: modules/pref-users.php:282
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -2221,44 +2221,40 @@ msgstr ""
"ユーザー <b>%s</b> のパスワードを\n"
" <b>%s</b>に変更しました"
-#: modules/pref-users.php:287
+#: modules/pref-users.php:286
#, php-format
msgid "Notifying <b>%s</b>."
msgstr "<b>%s</b> の通知中です。"
-#: modules/pref-users.php:324
+#: modules/pref-users.php:323
msgid "[tt-rss] Password change notification"
msgstr "[tt-rss] パスワード変更通知"
-#: modules/pref-users.php:381 help/4.php:27
+#: modules/pref-users.php:374 help/4.php:27
msgid "Create user"
msgstr "ユーザーの作成"
-#: modules/pref-users.php:415
+#: modules/pref-users.php:408
msgid "Login"
msgstr "ログイン"
-#: modules/pref-users.php:416
+#: modules/pref-users.php:409
msgid "Access Level"
msgstr "アクセスレベル"
-#: modules/pref-users.php:418
+#: modules/pref-users.php:411
msgid "Last login"
msgstr "最終ログイン"
-#: modules/pref-users.php:477
-msgid "User details"
-msgstr "ユーザーの詳細"
-
-#: modules/pref-users.php:483
+#: modules/pref-users.php:476
msgid "Reset password"
msgstr "パスワードのリセット"
-#: modules/pref-users.php:488
+#: modules/pref-users.php:481
msgid "No users defined."
msgstr "ユーザーが定義されていません。"
-#: modules/pref-users.php:490
+#: modules/pref-users.php:483
msgid "No matching users found."
msgstr "ユーザーが見つかりません。"
@@ -2410,17 +2406,9 @@ msgstr "移動..."
msgid "Press any key to close this window."
msgstr "何かキーを押して、このウィンドウを閉じてください。"
-#: help/4.php:11
-msgid "Content Filtering"
-msgstr "コンテンツフィルタリング"
-
-#: help/4.php:12
-msgid "Label Editor"
-msgstr "ラベルエディター"
-
-#: help/4.php:13
-msgid "User Manager"
-msgstr "ユーザー管理"
+#: help/4.php:10
+msgid "Other Feeds"
+msgstr "その他のフィード"
#: help/4.php:19
msgid "Panel actions"
@@ -2494,6 +2482,42 @@ msgstr "対象項目:"
msgid "Internal error: Function not implemented"
msgstr "インターナルエラー: 機能が実装されていません"
+#~ msgid "Unknown Error"
+#~ msgstr "未知のエラー"
+
+#~ msgid "Published Articles"
+#~ msgstr "公開された記事"
+
+#~ msgid "Feed information:"
+#~ msgstr "フィード情報:"
+
+#~ msgid "Site:"
+#~ msgstr "サイト:"
+
+#~ msgid "Last updated:"
+#~ msgstr "最終更新:"
+
+#~ msgid "Last headlines:"
+#~ msgstr "最終ヘッドライン:"
+
+#~ msgid "Other feeds: Top 25"
+#~ msgstr "その他のフィード: トップ 25"
+
+#~ msgid "Showing top 25 registered feeds, sorted by popularity:"
+#~ msgstr "人気順の登録フィード、トップ 25 を表示中:"
+
+#~ msgid "Top 25"
+#~ msgstr "トップ 25"
+
+#~ msgid "Content Filtering"
+#~ msgstr "コンテンツフィルタリング"
+
+#~ msgid "Label Editor"
+#~ msgstr "ラベルエディター"
+
+#~ msgid "User Manager"
+#~ msgstr "ユーザー管理"
+
#~ msgid "Toggle:"
#~ msgstr "トグル"
@@ -2573,9 +2597,6 @@ msgstr "インターナルエラー: 機能が実装されていません"
#~ msgid "Match SQL"
#~ msgstr "SQL の一致"
-#~ msgid "Help"
-#~ msgstr "ヘルプ"
-
#~ msgid "Error: SQL expression is blank."
#~ msgstr "エラー: SQL 表記が空です。"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index a31f87c90..b84e0fb28 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.mo
+++ b/locale/nb_NO/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index df0dc9868..c1c4d55ea 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS 1.2.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-22 00:21+0300\n"
+"POT-Creation-Date: 2009-01-25 23:34+0300\n"
"PO-Revision-Date: 2008-11-29 20:45+0100\n"
"Last-Translator: Christian Lomsdalen <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -79,7 +79,7 @@ msgstr "Daglig"
msgid "Weekly"
msgstr "Ukentlig"
-#: backend.php:122 tt-rss.php:211 modules/pref-prefs.php:317
+#: backend.php:122 tt-rss.php:213 modules/pref-prefs.php:315
msgid "Default"
msgstr "Standard"
@@ -91,7 +91,7 @@ msgstr "Magpie"
msgid "SimplePie"
msgstr "SimplePie"
-#: backend.php:133 modules/pref-users.php:140
+#: backend.php:133 modules/pref-users.php:126
msgid "User"
msgstr "Bruker"
@@ -169,187 +169,173 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
"SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
-#: functions.php:2852 modules/popup-dialog.php:175
+#: functions.php:2808 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
-#: functions.php:2881 functions.php:2920 functions.php:3309 functions.php:4324
-#: functions.php:4354 modules/pref-feeds.php:1266
+#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
+#: functions.php:4248 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Ukategorisert"
-#: functions.php:2910 functions.php:3505 mobile/functions.php:33
+#: functions.php:2866 functions.php:3459 mobile/functions.php:33
msgid "Special"
msgstr "Snarveier"
-#: functions.php:2912 functions.php:3338 functions.php:3507 prefs.php:144
-#: mobile/functions.php:83
+#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Merkelapper"
-#: functions.php:2930 functions.php:3331 functions.php:4178 help/3.php:59
+#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Favorittartikler"
-#: functions.php:2932 functions.php:3335 functions.php:4185
-#: modules/pref-feeds.php:1441 help/3.php:60 mobile/functions.php:70
+#: functions.php:2888 functions.php:3291 functions.php:4079
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Publiserte artikler"
-#: functions.php:2934 functions.php:3341 functions.php:4163 help/3.php:58
+#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Ferske artikler"
-#: functions.php:2936 functions.php:3344 functions.php:4156 help/3.php:57
+#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Alle artikler"
-#: functions.php:3295 functions.php:3297
+#: functions.php:3251 functions.php:3253
msgid "Search results"
msgstr "Søkeresultat"
-#: functions.php:3313 functions.php:3326 functions.php:3332 functions.php:3336
-#: functions.php:3342 functions.php:3345 functions.php:3353
+#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
+#: functions.php:3298 functions.php:3301 functions.php:3309
msgid "Searched for"
msgstr "Søkte etter"
-#: functions.php:3984 functions.php:5351 modules/pref-feeds.php:1047
-#: modules/pref-feeds.php:1228 modules/pref-filters.php:366
-#: modules/pref-labels.php:138 modules/pref-users.php:408
+#: functions.php:3929
+msgid "Generated feed"
+msgstr "Generert nyhetsstrøm"
+
+#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
+#: modules/pref-labels.php:129 modules/pref-users.php:401
msgid "Select:"
msgstr "Velg:"
-#: functions.php:3985 modules/pref-feeds.php:1048 modules/pref-feeds.php:1229
-#: modules/pref-filters.php:367 modules/pref-labels.php:139
-#: modules/pref-users.php:409 mobile/functions.php:570
+#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Alle"
-#: functions.php:3986 functions.php:4002 tt-rss.php:203
+#: functions.php:3936 functions.php:3952 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Ulest"
-#: functions.php:3987 mobile/functions.php:573
+#: functions.php:3937 mobile/functions.php:573
msgid "Invert"
msgstr "Motsatt"
-#: functions.php:3988 modules/pref-feeds.php:1049 modules/pref-feeds.php:1230
-#: modules/pref-filters.php:368 modules/pref-labels.php:140
-#: modules/pref-users.php:410 mobile/functions.php:572
+#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Ingen"
-#: functions.php:3996 tt-rss.php:152 modules/pref-feeds.php:1389
+#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Handlinger..."
-#: functions.php:4001
+#: functions.php:3951
msgid "Selection toggle:"
msgstr "Marker utvalg:"
-#: functions.php:4003 tt-rss.php:202 mobile/functions.php:459
+#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Favoritter"
-#: functions.php:4004
+#: functions.php:3954
msgid "Published"
msgstr "Publisert"
-#: functions.php:4006
+#: functions.php:3956
msgid "Mark as read:"
msgstr "Marker som lest:"
-#: functions.php:4007 mobile/functions.php:578
+#: functions.php:3957 mobile/functions.php:578
msgid "Selection"
msgstr "Utvalg"
-#: functions.php:4009 mobile/functions.php:580
+#: functions.php:3959 mobile/functions.php:580
msgid "Entire feed"
msgstr "Hele nyhetsstrømmen"
-#: functions.php:4013
+#: functions.php:3963
#, fuzzy
msgid "Assign label:"
msgstr "Tildel stikkord"
-#: functions.php:4016 tt-rss.php:169
-#, fuzzy
-msgid "Create label..."
-msgstr "Lag merkelapp"
-
-#: functions.php:4028
-#, fuzzy
-msgid "(remove)"
-msgstr "Fjern"
-
-#: functions.php:4065
-msgid "Generated feed"
-msgstr "Generert nyhetsstrøm"
-
-#: functions.php:4110
+#: functions.php:4004
msgid "Click to collapse category"
msgstr "Velg for å slå sammen kategorien"
-#: functions.php:4374
+#: functions.php:4268
msgid "No feeds to display."
msgstr "Ingen nyhetstrømmer å vise"
-#: functions.php:4391 mobile/functions.php:12
+#: functions.php:4285 mobile/functions.php:12
msgid "Tags"
msgstr "Stikkord"
-#: functions.php:4627
+#: functions.php:4521
msgid " - "
msgstr "-"
-#: functions.php:4682 functions.php:4683
-msgid "no tags"
-msgstr "Ingen stikkord"
-
-#: functions.php:4690
+#: functions.php:4545 functions.php:5220
msgid "Edit tags for this article"
msgstr "Rediger stikkordene for denne artikkelen"
-#: functions.php:4698
+#: functions.php:4553
msgid "Display original article content"
msgstr "Vis opprinnelig artikkelinnhold"
-#: functions.php:4705 functions.php:5361
+#: functions.php:4560 functions.php:5211
msgid "Show article summary in new window"
msgstr "Åpne artikkelsammendraget i nytt nettleservindu"
-#: functions.php:4742 functions.php:5285
+#: functions.php:4593 functions.php:5135
msgid "unknown type"
msgstr "Ukjent type"
-#: functions.php:4748 functions.php:5291
+#: functions.php:4599 functions.php:5141
msgid "audio/mpeg"
msgstr "Lyd/mpeg"
-#: functions.php:4784 functions.php:5325
+#: functions.php:4635 functions.php:5175
msgid "Attachment:"
msgstr "Vedlegg:"
-#: functions.php:4786 functions.php:5327
+#: functions.php:4637 functions.php:5177
msgid "Attachments:"
msgstr "Vedlegg:"
-#: functions.php:4806 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1098
+#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Lukk dette vinduet"
-#: functions.php:4862 modules/pref-feed-browser.php:75
+#: functions.php:4713
msgid "Feed not found."
msgstr "Nyhetsstrømmen ble ikke funnet"
-#: functions.php:4931 mobile/functions.php:423
+#: functions.php:4782 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -357,33 +343,47 @@ msgstr ""
"Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
"merkelappsyntaksen eller lokal konfigurasjon."
-#: functions.php:5259
+#: functions.php:5109
msgid "Click to expand article"
msgstr "Trykk for å utvide artikkel"
-#: functions.php:5419
+#: functions.php:5246
msgid "No unread articles found to display."
msgstr "Ingen uleste artikler funnet som kunne vises"
-#: functions.php:5422
+#: functions.php:5249
#, fuzzy
msgid "No updated articles found to display."
msgstr "Ingen uleste artikler funnet som kunne vises"
-#: functions.php:5425
+#: functions.php:5252
msgid "No starred articles found to display."
msgstr "Ingen markerte artikler som kan vises"
-#: functions.php:5429
+#: functions.php:5256
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5431
+#: functions.php:5258
msgid "No articles found to display."
msgstr "Ingen artikler funnet som kan vises"
+#: functions.php:5931 tt-rss.php:171
+#, fuzzy
+msgid "Create label..."
+msgstr "Lag merkelapp"
+
+#: functions.php:5944
+#, fuzzy
+msgid "(remove)"
+msgstr "Fjern"
+
+#: functions.php:5988
+msgid "no tags"
+msgstr "Ingen stikkord"
+
#: localized_js.php:35
msgid "display feeds"
msgstr "Vis nyhetsstrømmer"
@@ -392,7 +392,7 @@ msgstr "Vis nyhetsstrømmer"
msgid "display tags"
msgstr "Vis stikkord"
-#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
+#: localized_js.php:37 prefs.php:66 prefs.php:138 tt-rss.php:68
msgid "Loading, please wait..."
msgstr "laster, vennligst vent"
@@ -590,7 +590,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:257 tt-rss.php:270
+#: localized_js.php:95 tt-rss.php:259 tt-rss.php:272
msgid "No feed selected."
msgstr "Ingen valgt nyhetsstrøm"
@@ -762,8 +762,8 @@ msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
msgid "Saving feeds..."
msgstr "Lagrer Nyhetsstrømmene..."
-#: localized_schema.php:9 tt-rss.php:213 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1241 modules/pref-feeds.php:1302
+#: localized_schema.php:9 tt-rss.php:215 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Tittel"
@@ -789,7 +789,7 @@ msgstr ""
msgid "Filter article"
msgstr "Filtrer artikkel"
-#: localized_schema.php:16 tt-rss.php:164 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:166 mobile/functions.php:583
msgid "Mark as read"
msgstr "Marker som lest"
@@ -801,15 +801,20 @@ msgstr "Sett som favorittartikkel"
msgid "Assign tags"
msgstr "Tildel stikkord"
-#: localized_schema.php:23
+#: localized_schema.php:20
+#, fuzzy
+msgid "Assign label"
+msgstr "Tildel stikkord"
+
+#: localized_schema.php:24
msgid "General"
msgstr "Generelt"
-#: localized_schema.php:25
+#: localized_schema.php:26
msgid "Allow duplicate posts"
msgstr "Tillatt duplikate artikler"
-#: localized_schema.php:26
+#: localized_schema.php:27
msgid ""
"This option is useful when you are reading several planet-type aggregators "
"with partially colliding userbase. When disabled, it forces same posts from "
@@ -820,15 +825,15 @@ msgstr ""
"avskrudd kan samme post fra flere forskjellige nyhetsstrømmer vises på en "
"gang."
-#: localized_schema.php:27
+#: localized_schema.php:28
msgid "Default interval between feed updates (in minutes)"
msgstr "Standard intervall mellom nyhetsstrømsoppdateringer (i minutter)"
-#: localized_schema.php:28
+#: localized_schema.php:29
msgid "Enable e-mail digest"
msgstr "Tillatt e-postsammendrag"
-#: localized_schema.php:29
+#: localized_schema.php:30
msgid ""
"This option enables sending daily digest of new (and unread) headlines on "
"your configured e-mail address"
@@ -836,27 +841,27 @@ msgstr ""
"Dette valget muliggjør utsendingen av daglige sammendrag over nye (og "
"uleste) tittler til din e-postadresse"
-#: localized_schema.php:30
+#: localized_schema.php:31
msgid "Purge old posts after this number of days (0 - disables)"
msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
-#: localized_schema.php:31
+#: localized_schema.php:32
msgid "Update post on checksum change"
msgstr "Oppdaterer artikkel etter checksumbytte"
-#: localized_schema.php:32
+#: localized_schema.php:33
msgid "Mark articles in e-mail digest as read"
msgstr "Marker artikler i e--postsammendrag som leste"
-#: localized_schema.php:34
+#: localized_schema.php:35
msgid "Interface"
msgstr "Grensesnitt"
-#: localized_schema.php:36
+#: localized_schema.php:37
msgid "Combined feed display"
msgstr "Kombinert nyhetsstrømsvisning"
-#: localized_schema.php:37
+#: localized_schema.php:38
msgid ""
"Display expanded list of feed articles, instead of separate displays for "
"headlines and article content"
@@ -864,11 +869,11 @@ msgstr ""
"Viser en utvidet liste over nyhetsstrømsartikler isteden for en separat "
"visning av titler og artikler."
-#: localized_schema.php:38
+#: localized_schema.php:39
msgid "Default article limit"
msgstr "Standard artikkelbegrensning"
-#: localized_schema.php:39
+#: localized_schema.php:40
msgid ""
"Default limit for articles to display, any custom number you like (0 - "
"disables)."
@@ -876,23 +881,23 @@ msgstr ""
"Standard begrensning for artikler som skal vises, valgfritt antall (0 - "
"fjerner funksjonen)."
-#: localized_schema.php:40
+#: localized_schema.php:41
msgid "Enable feed categories"
msgstr "Tillatt kategorisering av nyhetsstrømmer"
-#: localized_schema.php:41
+#: localized_schema.php:42
msgid "Enable search toolbar"
msgstr "Vis søkelinjen"
-#: localized_schema.php:42
+#: localized_schema.php:43
msgid "Hide feeds with no unread messages"
msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
-#: localized_schema.php:43
+#: localized_schema.php:44
msgid "Mark articles as read automatically"
msgstr "Marker artikler som leste automatisk"
-#: localized_schema.php:44
+#: localized_schema.php:45
msgid ""
"This option enables marking articles as read automatically in combined mode "
"(except for Fresh articles feed) while you scroll article list."
@@ -901,11 +906,11 @@ msgstr ""
"kombinert modus, mens du blar i artikkellisten (med unntak for ferske "
"artikler nyhetsstrømmen)."
-#: localized_schema.php:45
+#: localized_schema.php:46
msgid "On catchup show next feed"
msgstr "Ved oppdatering vis neste nyhetsstrøm"
-#: localized_schema.php:46
+#: localized_schema.php:47
msgid ""
"When \"Mark as read\" button is clicked in toolbar, automatically open next "
"feed with unread articles."
@@ -913,41 +918,41 @@ msgstr ""
"Når \"Marker som lest\" knappen blir klikket, åpne neste nyhetsstrøm med "
"uleste artikler."
-#: localized_schema.php:47
+#: localized_schema.php:48
msgid "Open article links in new browser window"
msgstr "Åpne artikkel-lenker i nytt nettleservindu"
-#: localized_schema.php:48
+#: localized_schema.php:49
msgid "Reverse headline order (oldest first)"
msgstr "Motsatt titteloversikt (eldste først)"
-#: localized_schema.php:49
+#: localized_schema.php:50
msgid "Show content preview in headlines list"
msgstr "Vis innholdsforhåndsvisning i titteloversikten"
-#: localized_schema.php:50
+#: localized_schema.php:51
msgid "Sort feeds by unread articles count"
msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
-#: localized_schema.php:51
+#: localized_schema.php:52
msgid "User stylesheet URL"
msgstr "URL til brukerbestemt utseendemal (CSS)"
-#: localized_schema.php:52
+#: localized_schema.php:53
msgid "Link to user stylesheet to override default style, disabled if empty."
msgstr ""
"Lenke til brukerbestemt utseendemal for å overstyre standarden, avskrudd "
"hvis tomt felt."
-#: localized_schema.php:53
+#: localized_schema.php:54
msgid "Maximum age of fresh articles (in hours)"
msgstr "Maksimal alder på ferske artikler (i timer)"
-#: localized_schema.php:54
+#: localized_schema.php:55
msgid "Hide feedlist"
msgstr "Skjul nyhetskanalslisten"
-#: localized_schema.php:55
+#: localized_schema.php:56
msgid ""
"This option hides feedlist and allows it to be toggled on the fly, useful "
"for small screens."
@@ -955,11 +960,11 @@ msgstr ""
"Dette valget skjuler kanallisten og tillater at den vises etter ønske, "
"brukbart for små skjermer."
-#: localized_schema.php:56
+#: localized_schema.php:57
msgid "Group headlines in virtual feeds"
msgstr "Grupper overskriftene i virtuelle nyhetskanaler"
-#: localized_schema.php:57
+#: localized_schema.php:58
msgid ""
"When this option is enabled, headlines in Special feeds and Labels are "
"grouped by feeds"
@@ -967,15 +972,15 @@ msgstr ""
"Med dette valget haket av så vil overskriftene i spesielle nyhetskanaler og "
"merkelapper grupperes etter nyhetskanalene"
-#: localized_schema.php:59
+#: localized_schema.php:60
msgid "Advanced"
msgstr "Avansert"
-#: localized_schema.php:61
+#: localized_schema.php:62
msgid "Blacklisted tags"
msgstr "Svartelistede stikkord"
-#: localized_schema.php:62
+#: localized_schema.php:63
msgid ""
"When auto-detecting tags in articles these tags will not be applied (comma-"
"separated list)."
@@ -983,19 +988,19 @@ msgstr ""
"Når stikkord blir automatisk funnet i artikler skal følgende stikkord ikke "
"bli oppdaget (komma-separert liste)"
-#: localized_schema.php:63
+#: localized_schema.php:64
msgid "Confirm marking feed as read"
msgstr "Bekreft markeringen av nyhetsstrøm som lest"
-#: localized_schema.php:64
+#: localized_schema.php:65
msgid "Enable feed icons"
msgstr "Bruk nyhetsstrømsikoner"
-#: localized_schema.php:65
+#: localized_schema.php:66
msgid "Enable labels"
msgstr "Tillat merkelapper"
-#: localized_schema.php:66
+#: localized_schema.php:67
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 "
@@ -1005,73 +1010,73 @@ msgstr ""
"spørringer. Denne funksjonen er veldig eksperimentel og er på nåværende "
"tidspunkt ikke brukervennlig. Benytt med varsomhet."
-#: localized_schema.php:67
+#: localized_schema.php:68
msgid "Long date format"
msgstr "Langt datoformat"
-#: localized_schema.php:68
+#: localized_schema.php:69
msgid "Set articles as unread on update"
msgstr "Sett artikler som uleste ved oppdatering"
-#: localized_schema.php:69
+#: localized_schema.php:70
msgid "Short date format"
msgstr "Kort datoformat"
-#: localized_schema.php:70
+#: localized_schema.php:71
msgid "Show additional information in feedlist"
msgstr "Vis tilleggsinformasjon i nyhetsstrømslisten"
-#: localized_schema.php:71
+#: localized_schema.php:72
msgid "Strip unsafe tags from articles"
msgstr "Fjern utrygge html-koder fra artiklene"
-#: localized_schema.php:72
+#: localized_schema.php:73
msgid "Strip all but most common HTML tags when reading articles."
msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
-#: localized_schema.php:73
+#: localized_schema.php:74
msgid "Use more accessible date/time format for headlines"
msgstr "Bruk mer brukervennlige dato/tidsformater for artiklene"
-#: localized_schema.php:74
+#: localized_schema.php:75
msgid "Automatically expand articles in combined mode"
msgstr "Utvid artikler automatisk i kombinert modus"
-#: localized_schema.php:75
+#: localized_schema.php:76
msgid "Purge unread articles"
msgstr "Slett uleste artikler"
-#: localized_schema.php:76
+#: localized_schema.php:77
msgid "Show special feeds when hiding read feeds"
msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
-#: localized_schema.php:77
+#: localized_schema.php:78
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:78
+#: localized_schema.php:79
msgid "Enable inline MP3 player"
msgstr "Skru på den innebygde MP3-spilleren"
-#: localized_schema.php:79
+#: localized_schema.php:80
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:80
+#: localized_schema.php:81
msgid "Do not show images in articles"
msgstr "Ikke vis bilder i artiklene"
-#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:302
-#: modules/pref-feeds.php:495 mobile/login_form.php:59
+#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:277
+#: modules/pref-feeds.php:470 mobile/login_form.php:59
msgid "Login:"
msgstr "Brukernavn:"
-#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:306
-#: modules/pref-feeds.php:501 mobile/login_form.php:60
+#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:281
+#: modules/pref-feeds.php:476 mobile/login_form.php:60
msgid "Password:"
msgstr "Passord:"
@@ -1107,7 +1112,7 @@ msgstr ""
#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
#: register.php:200 register.php:213 register.php:228 register.php:246
#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162
+#: update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Returner til Tiny Tiny RSS"
@@ -1158,7 +1163,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Returner til innstillinger"
-#: prefs.php:77 prefs.php:156 tt-rss.php:79
+#: prefs.php:74 prefs.php:141 tt-rss.php:76
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1168,49 +1173,37 @@ msgstr ""
"\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
"\t\tnettlesers instillinger."
-#: prefs.php:104
-msgid "Unknown Error"
-msgstr "Ukjent feil"
-
-#: prefs.php:110 tt-rss.php:115
+#: prefs.php:101 tt-rss.php:116
msgid "Hello,"
msgstr "Hei, "
-#: prefs.php:112 prefs.php:122 help/4.php:14
+#: prefs.php:103 prefs.php:113 help/4.php:14
msgid "Exit preferences"
msgstr "Forlat innstillinger"
-#: prefs.php:114 tt-rss.php:125 mobile/functions.php:21
+#: prefs.php:105 tt-rss.php:126 mobile/functions.php:21
msgid "Logout"
msgstr "Logg ut"
-#: prefs.php:126
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "Tastatursnarveier"
-#: prefs.php:132 tt-rss.php:117 tt-rss.php:154 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:118 tt-rss.php:156 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Innstillinger"
-#: prefs.php:134 help/4.php:9
+#: prefs.php:125 help/4.php:9
msgid "My Feeds"
msgstr "Mine nyhetsstrømmer"
-#: prefs.php:137 help/4.php:10
-msgid "Other Feeds"
-msgstr "Andres nyhetsstrømmer"
-
-#: prefs.php:140
-msgid "Published Articles"
-msgstr "Publiserte artikler"
-
-#: prefs.php:142
+#: prefs.php:127 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "Fil:"
-#: prefs.php:147
+#: prefs.php:132 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "Bruker"
@@ -1245,7 +1238,7 @@ msgid "How much is two plus two:"
msgstr ""
#: register.php:193
-msgid "Submit registration\""
+msgid "Submit registration"
msgstr ""
#: register.php:211
@@ -1368,135 +1361,139 @@ msgstr ""
msgid "Fatal Error"
msgstr "Alvorlig feil"
-#: tt-rss.php:121
+#: tt-rss.php:122
msgid "Comments?"
msgstr "Kommentarer?"
-#: tt-rss.php:138
+#: tt-rss.php:130
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr ""
+
+#: tt-rss.php:140
msgid "tag cloud"
msgstr "Tag-sky"
-#: tt-rss.php:142
+#: tt-rss.php:144
#, fuzzy
msgid "More feeds..."
msgstr "Setter poeng på nytt for nyhetskanalene..."
-#: tt-rss.php:153
+#: tt-rss.php:155
#, fuzzy
msgid "Search..."
msgstr "Søk"
-#: tt-rss.php:156
+#: tt-rss.php:158
msgid "Feed actions:"
msgstr "Nyhetsstrømshandlinger:"
-#: tt-rss.php:157
+#: tt-rss.php:159
#, fuzzy
msgid "Subscribe to feed..."
msgstr "Abonner på nyhetsstrøm"
-#: tt-rss.php:158
+#: tt-rss.php:160
#, fuzzy
msgid "Edit this feed..."
msgstr "Rediger nyhetsstrømmen"
-#: tt-rss.php:159
+#: tt-rss.php:161
#, fuzzy
msgid "Clear articles"
msgstr "Filtrer artikkel"
-#: tt-rss.php:160
+#: tt-rss.php:162
#, fuzzy
msgid "Rescore feed"
msgstr "Setter poeng på nytt for nyhetskanalene..."
-#: tt-rss.php:161 modules/pref-feeds.php:397 modules/pref-feeds.php:1402
+#: tt-rss.php:163 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Avabonner"
-#: tt-rss.php:163
+#: tt-rss.php:165
msgid "All feeds:"
msgstr "Alle nyhetsstrømmer:"
-#: tt-rss.php:165 help/3.php:44
+#: tt-rss.php:167 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "Skjul/vis leste nyhetsstrømmer"
-#: tt-rss.php:167
+#: tt-rss.php:169
msgid "Other actions:"
msgstr "Andre handlinger:"
-#: tt-rss.php:170
+#: tt-rss.php:172
#, fuzzy
msgid "Create filter..."
msgstr "Lag filter"
-#: tt-rss.php:171
+#: tt-rss.php:173
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;Tilbakestill de grafiske instillingene"
-#: tt-rss.php:172
+#: tt-rss.php:174
#, fuzzy
msgid "Reset category order"
msgstr "Tilbakestill kategorirekkefølgen?"
-#: tt-rss.php:174
+#: tt-rss.php:176
msgid "&nbsp;&nbsp;Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Tastatursnarveier"
-#: tt-rss.php:182
+#: tt-rss.php:184
msgid "Collapse feedlist"
msgstr "Skjul nyhetskanalsslisten"
-#: tt-rss.php:184
+#: tt-rss.php:186
msgid "Toggle Feedlist"
msgstr "Vis nyhetskanallisten"
-#: tt-rss.php:192 mobile/functions.php:738
+#: tt-rss.php:194 mobile/functions.php:738
msgid "Search:"
msgstr "Søk:"
-#: tt-rss.php:200 mobile/functions.php:456
+#: tt-rss.php:202 mobile/functions.php:456
msgid "Adaptive"
msgstr "Tilpasset"
-#: tt-rss.php:201 mobile/functions.php:457
+#: tt-rss.php:203 mobile/functions.php:457
msgid "All Articles"
msgstr "Alle artikler"
-#: tt-rss.php:204
+#: tt-rss.php:206
msgid "Ignore Scoring"
msgstr "Ignorer poenggivning"
-#: tt-rss.php:205 modules/pref-feeds.php:1247 modules/pref-feeds.php:1310
+#: tt-rss.php:207 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "Oppdatert"
-#: tt-rss.php:208
+#: tt-rss.php:210
msgid "Order:"
msgstr "Rekkefølge:"
-#: tt-rss.php:212 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:214 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:443
msgid "Date"
msgstr "Dato"
-#: tt-rss.php:214
+#: tt-rss.php:216
msgid "Score"
msgstr "Poeng"
-#: tt-rss.php:218
+#: tt-rss.php:220
msgid "Limit:"
msgstr "Antall:"
-#: tt-rss.php:243 modules/pref-feeds.php:261 modules/pref-feeds.php:458
+#: tt-rss.php:245 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Oppdater"
-#: tt-rss.php:261
+#: tt-rss.php:263
msgid "Drag me to resize panels"
msgstr "Dra i meg for å endre størrelsen på panelene."
@@ -1559,6 +1556,10 @@ msgstr ""
"Ferdig. <b>%d</b> utførte oppdatering(er)i følge skjema\n"
"\t\t\tversjon <b>%d</b>."
+#: modules/help.php:6
+msgid "Help"
+msgstr "Hjelp"
+
#: modules/help.php:17
msgid "Help topic not found."
msgstr "Hjelp-emne kunne ikke bli funnet"
@@ -1597,64 +1598,69 @@ msgstr "Feil: Kan ikke finne hovedelement."
msgid "Notice"
msgstr "Notis"
-#: modules/popup-dialog.php:12
+#: modules/popup-dialog.php:14
+#, fuzzy
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."
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
msgstr ""
"Oppdateringsprosessen er åpnet for i konfigurasjonsfilen, men \n"
"\t\t\t\t\tprosessen blir ikke kjørt, noe som gjør at ingen nyhetsstrømmer "
"blir oppdatert. Vennligst\n"
"\t\t\t\t\tstart prosessen eller konakt administratoren."
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
msgid "Last update:"
msgstr "Siste oppdatering:"
#: modules/popup-dialog.php:26
+#, fuzzy
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."
+"You are running the latest version of Tiny Tiny RSS. The fact that you are "
+"seeing this dialog is probably a bug."
msgstr ""
"Du kjører siste utgave av Tiny Tiny RSS. Det at du ser denne dialogboksen er "
"mest sannsynlig en feil."
-#: modules/popup-dialog.php:35
+#: modules/popup-dialog.php:34
+#, fuzzy
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."
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
msgstr ""
"TT-RSS har oppdaget at oppdateringsmetoden bruker for lang tid å oppdatere "
"nyhetsstrømmene. Dette kan indikere et krasj eller at noe henger. Vennligst "
"sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
"nyhetsstrømmen"
+#: modules/popup-dialog.php:48
+msgid "Visit official site"
+msgstr ""
+
#: modules/popup-dialog.php:61
msgid "Subscribe to Feed"
msgstr "Abonner på nyhetsstrøm"
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:422 modules/pref-filters.php:403
+#: modules/popup-dialog.php:70 modules/pref-feeds.php:140
+#: modules/pref-feeds.php:397 modules/pref-filters.php:403
msgid "Feed"
msgstr "Nyhetsstrøm"
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:181
-#: modules/pref-feeds.php:436
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:156
+#: modules/pref-feeds.php:411
msgid "URL:"
msgstr "Nettadresse:"
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:193
-#: modules/pref-feeds.php:448
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:168
+#: modules/pref-feeds.php:423
msgid "Place in category:"
msgstr "Plasser i kategori..."
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:297
-#: modules/pref-feeds.php:492 modules/pref-prefs.php:264
-#: modules/pref-users.php:149
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:272
+#: modules/pref-feeds.php:467 modules/pref-prefs.php:262
+#: modules/pref-users.php:142
msgid "Authentication"
msgstr "Autentifisering"
@@ -1662,23 +1668,22 @@ msgstr "Autentifisering"
msgid "This feed requires authentication."
msgstr "Denne nyhetsstrømmen krever autentifisering"
-#: modules/popup-dialog.php:130 modules/pref-feed-browser.php:166
-#: modules/pref-feeds.php:128
+#: modules/popup-dialog.php:130 modules/pref-feeds.php:103
msgid "Subscribe"
msgstr "Abonner"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:130 modules/pref-feeds.php:402
-#: modules/pref-feeds.php:556 modules/pref-filters.php:166
-#: modules/pref-users.php:184
+#: modules/pref-feeds.php:105 modules/pref-feeds.php:377
+#: modules/pref-feeds.php:531 modules/pref-filters.php:166
+#: modules/pref-users.php:183
msgid "Cancel"
msgstr "Avbryt"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feed-browser.php:125
-#: modules/pref-feeds.php:1143 modules/pref-filters.php:307
-#: modules/pref-labels.php:105 modules/pref-users.php:364
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-labels.php:96 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1745,9 +1750,9 @@ msgstr "Utfør handlingen"
msgid "with parameters:"
msgstr "med parametrene:"
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:315
-#: modules/pref-feeds.php:510 modules/pref-filters.php:123
-#: modules/pref-users.php:165
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:290
+#: modules/pref-feeds.php:485 modules/pref-filters.php:123
+#: modules/pref-users.php:164
msgid "Options"
msgstr "Alternativer:"
@@ -1783,9 +1788,9 @@ msgstr "Endre Stikkord"
msgid "Tags for this article (separated by commas):"
msgstr "Denne artikkelens stikkord (separert med kommaer):"
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:400
-#: modules/pref-feeds.php:554 modules/pref-filters.php:162
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:529 modules/pref-filters.php:162
+#: modules/pref-users.php:180
msgid "Save"
msgstr "Lagre"
@@ -1801,45 +1806,6 @@ msgstr "Vis mest populære stikkord"
msgid "browse more"
msgstr "utforsk videre"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr "Nyhetsstrømsutforsker er administrativt avskrudd"
-
-#: modules/pref-feed-browser.php:15
-msgid "Feed information:"
-msgstr "Nyhetsstrømsinformasjon:"
-
-#: modules/pref-feed-browser.php:39
-msgid "Site:"
-msgstr "Side:"
-
-#: modules/pref-feed-browser.php:41
-msgid "Last updated:"
-msgstr "Siste oppdatering:"
-
-#: modules/pref-feed-browser.php:56
-msgid "Last headlines:"
-msgstr "Siste artikler:"
-
-#: modules/pref-feed-browser.php:112
-msgid ""
-"Feed browser cache information is missing. Please refer to the <a "
-"class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-"FeedBrowser'>wiki</a> for more information."
-msgstr ""
-
-#: modules/pref-feed-browser.php:129
-msgid "Top"
-msgstr "Topp"
-
-#: modules/pref-feed-browser.php:138
-msgid "Show"
-msgstr "Vis"
-
-#: modules/pref-feed-browser.php:222
-msgid "Couldn't find any feeds available for subscription."
-msgstr ""
-
#: modules/pref-feeds.php:4
msgid "Check to enable field"
msgstr "Marker for å tillate felt"
@@ -1848,182 +1814,201 @@ msgstr "Marker for å tillate felt"
msgid "Subscribed to feeds:"
msgstr "Abonnerer på følgende nyhetsstrømmer:"
+#: modules/pref-feeds.php:59
+msgid "Feed browser is administratively disabled."
+msgstr "Nyhetsstrømsutforsker er administrativt avskrudd"
+
#: modules/pref-feeds.php:63
-msgid "Other feeds: Top 25"
-msgstr "Andre nyhetsstrømmer: Topp 25"
+#, fuzzy
+msgid "Feed Browser"
+msgstr "Nyhetsstrømsredigerer"
-#: modules/pref-feeds.php:67
-msgid "Showing top 25 registered feeds, sorted by popularity:"
-msgstr "Viser topp 25 nyhetsstrømmer, sortert etter popularitet:"
+#: modules/pref-feeds.php:81
+msgid "Top"
+msgstr "Topp"
-#: modules/pref-feeds.php:117
-msgid "No feeds found."
-msgstr "Ingen nyhetsstrømmer ble funnet."
+#: modules/pref-feeds.php:90
+msgid "Show"
+msgstr "Vis"
-#: modules/pref-feeds.php:155
+#: modules/pref-feeds.php:130
msgid "Feed Editor"
msgstr "Nyhetsstrømsredigerer"
-#: modules/pref-feeds.php:210
+#: modules/pref-feeds.php:185
msgid "Link to feed:"
msgstr "Lenk til nyhetsstrøm:"
-#: modules/pref-feeds.php:227
+#: modules/pref-feeds.php:202
msgid "Not linked"
msgstr "Ikke linket til"
-#: modules/pref-feeds.php:275 modules/pref-feeds.php:471
+#: modules/pref-feeds.php:250 modules/pref-feeds.php:446
msgid "using"
msgstr "bruker"
-#: modules/pref-feeds.php:287 modules/pref-feeds.php:483
+#: modules/pref-feeds.php:262 modules/pref-feeds.php:458
msgid "Article purging:"
msgstr "Slett artikler:"
-#: modules/pref-feeds.php:329 modules/pref-feeds.php:516
+#: modules/pref-feeds.php:304 modules/pref-feeds.php:491
msgid "Hide from \"Other Feeds\""
msgstr "Skjul fra \"Andre nyhetsstrømmer\""
-#: modules/pref-feeds.php:340 modules/pref-feeds.php:521
+#: modules/pref-feeds.php:315 modules/pref-feeds.php:496
msgid "Right-to-left content"
msgstr "Innhold som vises fra høyre til venstre"
-#: modules/pref-feeds.php:351 modules/pref-feeds.php:526
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:501
msgid "Hide from my feed list"
msgstr "Skjul fra min nyhetsstrømslisten"
-#: modules/pref-feeds.php:363 modules/pref-feeds.php:532
+#: modules/pref-feeds.php:338 modules/pref-feeds.php:507
msgid "Include in e-mail digest"
msgstr "Inkluder i e-postsammendraget"
-#: modules/pref-feeds.php:384 modules/pref-feeds.php:540
+#: modules/pref-feeds.php:359 modules/pref-feeds.php:515
msgid "Cache images locally"
msgstr "Mellomlagre bilder lokalt på serveren"
-#: modules/pref-feeds.php:412
+#: modules/pref-feeds.php:387
msgid "Multiple Feed Editor"
msgstr "Nyhetsstrømsredigerer"
-#: modules/pref-feeds.php:784 modules/pref-feeds.php:831
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr "Alt ferdig."
-#: modules/pref-feeds.php:862
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Abonnerer på <b>%s</b>"
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Abonnerer allerede på <b>%s</b>"
-#: modules/pref-feeds.php:965
+#: modules/pref-feeds.php:860
+msgid "Edit subscription options"
+msgstr ""
+
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Kategoriredigerer"
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "Kunne ikke slette kategorien, den var ikke tom"
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Lag kategori"
-#: modules/pref-feeds.php:1093
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Ingen kategorier ble markert"
-#: modules/pref-feeds.php:1104 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:178
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-users.php:474
msgid "Remove"
msgstr "Fjern"
-#: modules/pref-feeds.php:1126
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
-#: modules/pref-feeds.php:1148 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
msgid "Subscribe to feed"
msgstr "Abonner på nyhetsstrøm"
-#: modules/pref-feeds.php:1153
-msgid "Top 25"
-msgstr "Topp 25"
+#: modules/pref-feeds.php:1134
+#, fuzzy
+msgid "More Feeds"
+msgstr "Setter poeng på nytt for nyhetskanalene..."
-#: modules/pref-feeds.php:1227
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Vis tidspunktene for siste artikkel"
-#: modules/pref-feeds.php:1244 modules/pref-feeds.php:1306
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Siste&nbsp;Artikkel"
-#: modules/pref-feeds.php:1331 modules/pref-filters.php:461
-#: modules/pref-users.php:456
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:461
+#: modules/pref-users.php:449
msgid "Click to edit"
msgstr "Trykk for å endre"
-#: modules/pref-feeds.php:1377 modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1320
+msgid "(Hidden)"
+msgstr ""
+
+#: modules/pref-feeds.php:1333
+#, php-format
+msgid "(linked to %s)"
+msgstr ""
+
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
msgstr "Utvalg:"
-#: modules/pref-feeds.php:1383
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Rekategoriser"
-#: modules/pref-feeds.php:1392 modules/pref-filters.php:485
-#: modules/pref-users.php:479
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:485
+#: modules/pref-users.php:472
msgid "Edit"
msgstr "Rediger"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "Slett manuelt"
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Slett nyhetsstrømsdata"
-#: modules/pref-feeds.php:1401 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
msgid "Rescore articles"
msgstr "Tilbakestill poengsummene for artiklene"
-#: modules/pref-feeds.php:1407
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Andre:"
-#: modules/pref-feeds.php:1408
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Rediger kategorier"
-#: modules/pref-feeds.php:1415
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "Fil:"
-#: modules/pref-feeds.php:1422
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importer"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Eksporter OPML"
-#: modules/pref-feeds.php:1432
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Firefox integrering"
-#: modules/pref-feeds.php:1434
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2031,11 +2016,11 @@ msgstr ""
"Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
"ved å trykke på lenken nedenfor."
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1429
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
@@ -2043,15 +2028,19 @@ msgstr ""
"Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
"kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "Publiserte artikler"
-#: modules/pref-feeds.php:1454
+#: modules/pref-feeds.php:1436
msgid "Generate another link"
msgstr "Genererer en ny adresse"
+#: modules/pref-feeds.php:1502
+msgid "No feeds found."
+msgstr "Ingen nyhetsstrømmer ble funnet."
+
#: modules/pref-filters.php:23
msgid "Filter Editor"
msgstr "Filteradministrering"
@@ -2103,20 +2092,20 @@ msgstr "Ingen filtre er valgt"
msgid "No matching filters found."
msgstr "Ingen filtre ble funnet."
-#: modules/pref-labels.php:75
+#: modules/pref-labels.php:66
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Laget merkelappen <b>%s</b>"
-#: modules/pref-labels.php:113 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Lag merkelapp"
-#: modules/pref-labels.php:184
+#: modules/pref-labels.php:175
msgid "No labels defined."
msgstr "Ingen merkelapper er valgt"
-#: modules/pref-labels.php:186
+#: modules/pref-labels.php:177
msgid "No matching labels found."
msgstr "Ingen passende merkelapper ble funnet."
@@ -2132,15 +2121,20 @@ msgstr "Gammelt passord er feil"
msgid "The configuration was saved."
msgstr "Konfigurasjonen er lagret."
+#: modules/pref-prefs.php:132
+#, php-format
+msgid "Unknown option: %s"
+msgstr ""
+
#: modules/pref-prefs.php:143
msgid "E-mail has been changed."
msgstr "E-post har blitt endret."
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:215
+#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
msgid "The configuration was reset to defaults."
msgstr "Konfigurasjonen er satt tilbake til standard"
-#: modules/pref-prefs.php:200
+#: modules/pref-prefs.php:198
msgid ""
"Your password is at default value, \n"
"\t\t\t\t\t\tplease change it."
@@ -2148,67 +2142,67 @@ msgstr ""
"Passordet ditt er et standardpassord, \n"
"\t\t\t\t\t\tVennligst bytt."
-#: modules/pref-prefs.php:227
+#: modules/pref-prefs.php:225
msgid "Personal data"
msgstr "Personlig informasjon"
-#: modules/pref-prefs.php:234
+#: modules/pref-prefs.php:232
msgid "E-mail"
msgstr "E-post"
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
msgid "Access level"
msgstr "Tilgangsnivå"
-#: modules/pref-prefs.php:258
+#: modules/pref-prefs.php:256
msgid "Change e-mail"
msgstr "Skift e-post"
-#: modules/pref-prefs.php:266
+#: modules/pref-prefs.php:264
msgid "Old password"
msgstr "Gammelt passord"
-#: modules/pref-prefs.php:273
+#: modules/pref-prefs.php:271
msgid "New password"
msgstr "Nytt passord"
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:279
msgid "Confirm password"
msgstr "Bekreft passord"
-#: modules/pref-prefs.php:298
+#: modules/pref-prefs.php:296
msgid "Change password"
msgstr "Endre passord"
-#: modules/pref-prefs.php:314
+#: modules/pref-prefs.php:312
msgid "Themes"
msgstr "Utseender"
-#: modules/pref-prefs.php:315
+#: modules/pref-prefs.php:313
msgid "Select theme"
msgstr "Velg utseende"
-#: modules/pref-prefs.php:333
+#: modules/pref-prefs.php:331
msgid "Change theme"
msgstr "Endre utseende"
-#: modules/pref-prefs.php:390
+#: modules/pref-prefs.php:388
msgid "short_desc"
msgstr "kort beskrivelse"
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Ja"
-#: modules/pref-prefs.php:404 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
msgid "No"
msgstr "Nei"
-#: modules/pref-prefs.php:429
+#: modules/pref-prefs.php:427
msgid "Save configuration"
msgstr "Lagre konfigurasjonen"
-#: modules/pref-prefs.php:433
+#: modules/pref-prefs.php:431
msgid "Reset to defaults"
msgstr "Tilbake til standard"
@@ -2216,59 +2210,68 @@ msgstr "Tilbake til standard"
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:54 modules/pref-users.php:417
+#: modules/pref-users.php:17 modules/pref-users.php:470
+msgid "User details"
+msgstr "Brukerdetaljer"
+
+#: modules/pref-users.php:31
+#, fuzzy
+msgid "User not found"
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: modules/pref-users.php:50 modules/pref-users.php:410
msgid "Registered"
msgstr "Registrert"
-#: modules/pref-users.php:55
+#: modules/pref-users.php:51
msgid "Last logged in"
msgstr "Sist innlogget"
-#: modules/pref-users.php:72
+#: modules/pref-users.php:58
msgid "Subscribed feeds count"
msgstr "Antall nyhetsstrømmer som abonneres på"
-#: modules/pref-users.php:76
+#: modules/pref-users.php:62
msgid "Subscribed feeds"
msgstr "Nyhetsstrømmer som abonneres på"
-#: modules/pref-users.php:122
+#: modules/pref-users.php:108
msgid "User Editor"
msgstr "Brukeradministrering"
-#: modules/pref-users.php:152
+#: modules/pref-users.php:145
msgid "Access level: "
msgstr "Tilgangsnivå:"
-#: modules/pref-users.php:159
+#: modules/pref-users.php:158
msgid "Change password to"
msgstr "Endre passordet til"
-#: modules/pref-users.php:168
+#: modules/pref-users.php:167
msgid "E-mail: "
msgstr "E-post: "
-#: modules/pref-users.php:204
+#: modules/pref-users.php:203
#, php-format
msgid "Changed password of user <b>%s</b>."
msgstr "Byttet passord for bruker <b>%s</b>."
-#: modules/pref-users.php:252
+#: modules/pref-users.php:251
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
-#: modules/pref-users.php:259
+#: modules/pref-users.php:258
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Kunne ikke lage brukeren <b>%s</b>"
-#: modules/pref-users.php:263
+#: modules/pref-users.php:262
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "Brukeren <b>%s</b> finnes allerede."
-#: modules/pref-users.php:283
+#: modules/pref-users.php:282
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -2277,44 +2280,40 @@ msgstr ""
"Byttet passord forbruker <b>%s</b>\n"
"\t\t\t\t\t til <b>%s</b>"
-#: modules/pref-users.php:287
+#: modules/pref-users.php:286
#, php-format
msgid "Notifying <b>%s</b>."
msgstr "Gir beskjed til <b>%s</b>"
-#: modules/pref-users.php:324
+#: modules/pref-users.php:323
msgid "[tt-rss] Password change notification"
msgstr "[tt-rss] Varsel om endring av passord"
-#: modules/pref-users.php:381 help/4.php:27
+#: modules/pref-users.php:374 help/4.php:27
msgid "Create user"
msgstr "Lag bruker"
-#: modules/pref-users.php:415
+#: modules/pref-users.php:408
msgid "Login"
msgstr "Logg inn"
-#: modules/pref-users.php:416
+#: modules/pref-users.php:409
msgid "Access Level"
msgstr "Tilgangsnivå"
-#: modules/pref-users.php:418
+#: modules/pref-users.php:411
msgid "Last login"
msgstr "Siste innlogging"
-#: modules/pref-users.php:477
-msgid "User details"
-msgstr "Brukerdetaljer"
-
-#: modules/pref-users.php:483
+#: modules/pref-users.php:476
msgid "Reset password"
msgstr "Nullstill passordet"
-#: modules/pref-users.php:488
+#: modules/pref-users.php:481
msgid "No users defined."
msgstr "Ingen brukere er valgt"
-#: modules/pref-users.php:490
+#: modules/pref-users.php:483
msgid "No matching users found."
msgstr "Ingen matchende brukere ble funnet"
@@ -2480,17 +2479,9 @@ msgstr "Gå til..."
msgid "Press any key to close this window."
msgstr "Trykk på en knapp for å lukk dette vinduet"
-#: help/4.php:11
-msgid "Content Filtering"
-msgstr "Innholdsfilter"
-
-#: help/4.php:12
-msgid "Label Editor"
-msgstr "Merkelappredigerer"
-
-#: help/4.php:13
-msgid "User Manager"
-msgstr "Brukeradministrering"
+#: help/4.php:10
+msgid "Other Feeds"
+msgstr "Andres nyhetsstrømmer"
#: help/4.php:19
msgid "Panel actions"
@@ -2561,6 +2552,42 @@ msgstr "Match på:"
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "Unknown Error"
+#~ msgstr "Ukjent feil"
+
+#~ msgid "Published Articles"
+#~ msgstr "Publiserte artikler"
+
+#~ msgid "Feed information:"
+#~ msgstr "Nyhetsstrømsinformasjon:"
+
+#~ msgid "Site:"
+#~ msgstr "Side:"
+
+#~ msgid "Last updated:"
+#~ msgstr "Siste oppdatering:"
+
+#~ msgid "Last headlines:"
+#~ msgstr "Siste artikler:"
+
+#~ msgid "Other feeds: Top 25"
+#~ msgstr "Andre nyhetsstrømmer: Topp 25"
+
+#~ msgid "Showing top 25 registered feeds, sorted by popularity:"
+#~ msgstr "Viser topp 25 nyhetsstrømmer, sortert etter popularitet:"
+
+#~ msgid "Top 25"
+#~ msgstr "Topp 25"
+
+#~ msgid "Content Filtering"
+#~ msgstr "Innholdsfilter"
+
+#~ msgid "Label Editor"
+#~ msgstr "Merkelappredigerer"
+
+#~ msgid "User Manager"
+#~ msgstr "Brukeradministrering"
+
#~ msgid "Toggle:"
#~ msgstr "Vis:"
@@ -2656,9 +2683,6 @@ msgstr ""
#~ msgid "Match SQL"
#~ msgstr "Match SQL"
-#~ msgid "Help"
-#~ msgstr "Hjelp"
-
#~ msgid "Error: SQL expression is blank."
#~ msgstr "Feil: SQL uttrykket er blankt."
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index d58a19030..cc4709d62 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.mo
+++ b/locale/pt_BR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 7083b34a5..616eaa709 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: 2009-01-22 00:21+0300\n"
+"POT-Creation-Date: 2009-01-25 23:34+0300\n"
"PO-Revision-Date: 2007-10-24 00:47-0200\n"
"Last-Translator: Marcelo Jorge VIeira (metal) <[email protected]>\n"
"Language-Team: Portuguese/Brazil\n"
@@ -81,7 +81,7 @@ msgstr "Diariamente"
msgid "Weekly"
msgstr "Semanalmente"
-#: backend.php:122 tt-rss.php:211 modules/pref-prefs.php:317
+#: backend.php:122 tt-rss.php:213 modules/pref-prefs.php:315
msgid "Default"
msgstr "Padrão"
@@ -94,7 +94,7 @@ msgstr "Página"
msgid "SimplePie"
msgstr ""
-#: backend.php:133 modules/pref-users.php:140
+#: backend.php:133 modules/pref-users.php:126
msgid "User"
msgstr "Usuário"
@@ -166,226 +166,226 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2852 modules/popup-dialog.php:175
+#: functions.php:2808 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Todos os feeds"
-#: functions.php:2881 functions.php:2920 functions.php:3309 functions.php:4324
-#: functions.php:4354 modules/pref-feeds.php:1266
+#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
+#: functions.php:4248 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Não Categorizado"
-#: functions.php:2910 functions.php:3505 mobile/functions.php:33
+#: functions.php:2866 functions.php:3459 mobile/functions.php:33
msgid "Special"
msgstr "Especial"
-#: functions.php:2912 functions.php:3338 functions.php:3507 prefs.php:144
-#: mobile/functions.php:83
+#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr ""
-#: functions.php:2930 functions.php:3331 functions.php:4178 help/3.php:59
+#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr ""
-#: functions.php:2932 functions.php:3335 functions.php:4185
-#: modules/pref-feeds.php:1441 help/3.php:60 mobile/functions.php:70
+#: functions.php:2888 functions.php:3291 functions.php:4079
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr ""
-#: functions.php:2934 functions.php:3341 functions.php:4163 help/3.php:58
+#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr ""
-#: functions.php:2936 functions.php:3344 functions.php:4156 help/3.php:57
+#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "Favoritos"
-#: functions.php:3295 functions.php:3297
+#: functions.php:3251 functions.php:3253
msgid "Search results"
msgstr ""
-#: functions.php:3313 functions.php:3326 functions.php:3332 functions.php:3336
-#: functions.php:3342 functions.php:3345 functions.php:3353
+#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
+#: functions.php:3298 functions.php:3301 functions.php:3309
msgid "Searched for"
msgstr ""
-#: functions.php:3984 functions.php:5351 modules/pref-feeds.php:1047
-#: modules/pref-feeds.php:1228 modules/pref-filters.php:366
-#: modules/pref-labels.php:138 modules/pref-users.php:408
+#: functions.php:3929
+msgid "Generated feed"
+msgstr ""
+
+#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
+#: modules/pref-labels.php:129 modules/pref-users.php:401
msgid "Select:"
msgstr "Selecione:"
-#: functions.php:3985 modules/pref-feeds.php:1048 modules/pref-feeds.php:1229
-#: modules/pref-filters.php:367 modules/pref-labels.php:139
-#: modules/pref-users.php:409 mobile/functions.php:570
+#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Todos"
-#: functions.php:3986 functions.php:4002 tt-rss.php:203
+#: functions.php:3936 functions.php:3952 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Não Lido"
-#: functions.php:3987 mobile/functions.php:573
+#: functions.php:3937 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(Inverso)"
-#: functions.php:3988 modules/pref-feeds.php:1049 modules/pref-feeds.php:1230
-#: modules/pref-filters.php:368 modules/pref-labels.php:140
-#: modules/pref-users.php:410 mobile/functions.php:572
+#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Nenhum"
-#: functions.php:3996 tt-rss.php:152 modules/pref-feeds.php:1389
+#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Ações..."
-#: functions.php:4001
+#: functions.php:3951
#, fuzzy
msgid "Selection toggle:"
msgstr "Seleção"
-#: functions.php:4003 tt-rss.php:202 mobile/functions.php:459
+#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Favoritos"
-#: functions.php:4004
+#: functions.php:3954
msgid "Published"
msgstr "Publicado"
-#: functions.php:4006
+#: functions.php:3956
msgid "Mark as read:"
msgstr "Marcar como lido:"
-#: functions.php:4007 mobile/functions.php:578
+#: functions.php:3957 mobile/functions.php:578
msgid "Selection"
msgstr "Seleção"
-#: functions.php:4009 mobile/functions.php:580
+#: functions.php:3959 mobile/functions.php:580
msgid "Entire feed"
msgstr ""
-#: functions.php:4013
+#: functions.php:3963
msgid "Assign label:"
msgstr ""
-#: functions.php:4016 tt-rss.php:169
-#, fuzzy
-msgid "Create label..."
-msgstr "Criar um usuário"
-
-#: functions.php:4028
-#, fuzzy
-msgid "(remove)"
-msgstr "Remover"
-
-#: functions.php:4065
-msgid "Generated feed"
-msgstr ""
-
-#: functions.php:4110
+#: functions.php:4004
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4374
+#: functions.php:4268
msgid "No feeds to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:4391 mobile/functions.php:12
+#: functions.php:4285 mobile/functions.php:12
msgid "Tags"
msgstr "Tags"
-#: functions.php:4627
+#: functions.php:4521
#, fuzzy
msgid " - "
msgstr " - por "
-#: functions.php:4682 functions.php:4683
-msgid "no tags"
-msgstr "sem tags"
-
-#: functions.php:4690
+#: functions.php:4545 functions.php:5220
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4698
+#: functions.php:4553
msgid "Display original article content"
msgstr ""
-#: functions.php:4705 functions.php:5361
+#: functions.php:4560 functions.php:5211
msgid "Show article summary in new window"
msgstr ""
-#: functions.php:4742 functions.php:5285
+#: functions.php:4593 functions.php:5135
#, fuzzy
msgid "unknown type"
msgstr "Erro desconhecido"
-#: functions.php:4748 functions.php:5291
+#: functions.php:4599 functions.php:5141
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4784 functions.php:5325
+#: functions.php:4635 functions.php:5175
msgid "Attachment:"
msgstr ""
-#: functions.php:4786 functions.php:5327
+#: functions.php:4637 functions.php:5177
msgid "Attachments:"
msgstr ""
-#: functions.php:4806 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1098
+#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Fechar esta janela"
-#: functions.php:4862 modules/pref-feed-browser.php:75
+#: functions.php:4713
msgid "Feed not found."
msgstr "Feed não encontrado."
-#: functions.php:4931 mobile/functions.php:423
+#: functions.php:4782 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr ""
-#: functions.php:5259
+#: functions.php:5109
#, fuzzy
msgid "Click to expand article"
msgstr "Favoritos"
-#: functions.php:5419
+#: functions.php:5246
#, fuzzy
msgid "No unread articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5422
+#: functions.php:5249
#, fuzzy
msgid "No updated articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5425
+#: functions.php:5252
#, fuzzy
msgid "No starred articles found to display."
msgstr "Sem Feeds para exibir."
-#: functions.php:5429
+#: functions.php:5256
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5431
+#: functions.php:5258
#, fuzzy
msgid "No articles found to display."
msgstr "Sem Feeds para exibir."
+#: functions.php:5931 tt-rss.php:171
+#, fuzzy
+msgid "Create label..."
+msgstr "Criar um usuário"
+
+#: functions.php:5944
+#, fuzzy
+msgid "(remove)"
+msgstr "Remover"
+
+#: functions.php:5988
+msgid "no tags"
+msgstr "sem tags"
+
#: localized_js.php:35
msgid "display feeds"
msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
msgid "display tags"
msgstr ""
-#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
+#: localized_js.php:37 prefs.php:66 prefs.php:138 tt-rss.php:68
msgid "Loading, please wait..."
msgstr ""
@@ -592,7 +592,7 @@ msgstr ""
msgid "Could not display article (missing XML object)"
msgstr ""
-#: localized_js.php:95 tt-rss.php:257 tt-rss.php:270
+#: localized_js.php:95 tt-rss.php:259 tt-rss.php:272
msgid "No feed selected."
msgstr "Nenhum feed foi selecionado."
@@ -772,8 +772,8 @@ msgstr "Remover os filtros selecionados?"
msgid "Saving feeds..."
msgstr "Salvando o Feed..."
-#: localized_schema.php:9 tt-rss.php:213 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1241 modules/pref-feeds.php:1302
+#: localized_schema.php:9 tt-rss.php:215 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Título"
@@ -799,7 +799,7 @@ msgstr ""
msgid "Filter article"
msgstr ""
-#: localized_schema.php:16 tt-rss.php:164 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:166 mobile/functions.php:583
msgid "Mark as read"
msgstr "Marcar como lido"
@@ -811,249 +811,253 @@ msgstr "Marcar como favorito"
msgid "Assign tags"
msgstr ""
-#: localized_schema.php:23
+#: localized_schema.php:20
+msgid "Assign label"
+msgstr ""
+
+#: localized_schema.php:24
msgid "General"
msgstr "Geral"
-#: localized_schema.php:25
+#: localized_schema.php:26
msgid "Allow duplicate posts"
msgstr "Permitir publicações duplicadas"
-#: localized_schema.php:26
+#: localized_schema.php:27
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:27
+#: localized_schema.php:28
msgid "Default interval between feed updates (in minutes)"
msgstr ""
-#: localized_schema.php:28
+#: localized_schema.php:29
msgid "Enable e-mail digest"
msgstr ""
-#: localized_schema.php:29
+#: localized_schema.php:30
msgid ""
"This option enables sending daily digest of new (and unread) headlines on "
"your configured e-mail address"
msgstr ""
-#: localized_schema.php:30
+#: localized_schema.php:31
msgid "Purge old posts after this number of days (0 - disables)"
msgstr ""
-#: localized_schema.php:31
+#: localized_schema.php:32
msgid "Update post on checksum change"
msgstr ""
-#: localized_schema.php:32
+#: localized_schema.php:33
#, fuzzy
msgid "Mark articles in e-mail digest as read"
msgstr "Marcando todos os feeds como lidos..."
-#: localized_schema.php:34
+#: localized_schema.php:35
msgid "Interface"
msgstr "Interface"
-#: localized_schema.php:36
+#: localized_schema.php:37
msgid "Combined feed display"
msgstr ""
-#: localized_schema.php:37
+#: localized_schema.php:38
msgid ""
"Display expanded list of feed articles, instead of separate displays for "
"headlines and article content"
msgstr ""
-#: localized_schema.php:38
+#: localized_schema.php:39
msgid "Default article limit"
msgstr ""
-#: localized_schema.php:39
+#: localized_schema.php:40
msgid ""
"Default limit for articles to display, any custom number you like (0 - "
"disables)."
msgstr ""
-#: localized_schema.php:40
+#: localized_schema.php:41
msgid "Enable feed categories"
msgstr ""
-#: localized_schema.php:41
+#: localized_schema.php:42
msgid "Enable search toolbar"
msgstr ""
-#: localized_schema.php:42
+#: localized_schema.php:43
msgid "Hide feeds with no unread messages"
msgstr ""
-#: localized_schema.php:43
+#: localized_schema.php:44
msgid "Mark articles as read automatically"
msgstr ""
-#: localized_schema.php:44
+#: localized_schema.php:45
msgid ""
"This option enables marking articles as read automatically in combined mode "
"(except for Fresh articles feed) while you scroll article list."
msgstr ""
-#: localized_schema.php:45
+#: localized_schema.php:46
msgid "On catchup show next feed"
msgstr ""
-#: localized_schema.php:46
+#: localized_schema.php:47
msgid ""
"When \"Mark as read\" button is clicked in toolbar, automatically open next "
"feed with unread articles."
msgstr ""
-#: localized_schema.php:47
+#: localized_schema.php:48
msgid "Open article links in new browser window"
msgstr ""
-#: localized_schema.php:48
+#: localized_schema.php:49
msgid "Reverse headline order (oldest first)"
msgstr ""
-#: localized_schema.php:49
+#: localized_schema.php:50
msgid "Show content preview in headlines list"
msgstr ""
-#: localized_schema.php:50
+#: localized_schema.php:51
msgid "Sort feeds by unread articles count"
msgstr ""
-#: localized_schema.php:51
+#: localized_schema.php:52
msgid "User stylesheet URL"
msgstr ""
-#: localized_schema.php:52
+#: localized_schema.php:53
msgid "Link to user stylesheet to override default style, disabled if empty."
msgstr ""
-#: localized_schema.php:53
+#: localized_schema.php:54
msgid "Maximum age of fresh articles (in hours)"
msgstr ""
-#: localized_schema.php:54
+#: localized_schema.php:55
msgid "Hide feedlist"
msgstr ""
-#: localized_schema.php:55
+#: localized_schema.php:56
msgid ""
"This option hides feedlist and allows it to be toggled on the fly, useful "
"for small screens."
msgstr ""
-#: localized_schema.php:56
+#: localized_schema.php:57
msgid "Group headlines in virtual feeds"
msgstr ""
-#: localized_schema.php:57
+#: localized_schema.php:58
msgid ""
"When this option is enabled, headlines in Special feeds and Labels are "
"grouped by feeds"
msgstr ""
-#: localized_schema.php:59
+#: localized_schema.php:60
msgid "Advanced"
msgstr "Avançado"
-#: localized_schema.php:61
+#: localized_schema.php:62
msgid "Blacklisted tags"
msgstr ""
-#: localized_schema.php:62
+#: localized_schema.php:63
msgid ""
"When auto-detecting tags in articles these tags will not be applied (comma-"
"separated list)."
msgstr ""
-#: localized_schema.php:63
+#: localized_schema.php:64
msgid "Confirm marking feed as read"
msgstr "Confirme marcando o Feed como lido"
-#: localized_schema.php:64
+#: localized_schema.php:65
msgid "Enable feed icons"
msgstr ""
-#: localized_schema.php:65
+#: localized_schema.php:66
msgid "Enable labels"
msgstr ""
-#: localized_schema.php:66
+#: localized_schema.php:67
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:67
+#: localized_schema.php:68
msgid "Long date format"
msgstr "Formato de data longo"
-#: localized_schema.php:68
+#: localized_schema.php:69
msgid "Set articles as unread on update"
msgstr ""
-#: localized_schema.php:69
+#: localized_schema.php:70
msgid "Short date format"
msgstr "Formato de data curto"
-#: localized_schema.php:70
+#: localized_schema.php:71
msgid "Show additional information in feedlist"
msgstr ""
-#: localized_schema.php:71
+#: localized_schema.php:72
msgid "Strip unsafe tags from articles"
msgstr ""
-#: localized_schema.php:72
+#: localized_schema.php:73
msgid "Strip all but most common HTML tags when reading articles."
msgstr ""
-#: localized_schema.php:73
+#: localized_schema.php:74
msgid "Use more accessible date/time format for headlines"
msgstr ""
-#: localized_schema.php:74
+#: localized_schema.php:75
msgid "Automatically expand articles in combined mode"
msgstr ""
-#: localized_schema.php:75
+#: localized_schema.php:76
msgid "Purge unread articles"
msgstr ""
-#: localized_schema.php:76
+#: localized_schema.php:77
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: localized_schema.php:77
+#: localized_schema.php:78
msgid "Prefer more accurate feedlist counters to UI speed"
msgstr ""
-#: localized_schema.php:78
+#: localized_schema.php:79
msgid "Enable inline MP3 player"
msgstr ""
-#: localized_schema.php:79
+#: localized_schema.php:80
msgid ""
"Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
msgstr ""
-#: localized_schema.php:80
+#: localized_schema.php:81
msgid "Do not show images in articles"
msgstr ""
-#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:302
-#: modules/pref-feeds.php:495 mobile/login_form.php:59
+#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:277
+#: modules/pref-feeds.php:470 mobile/login_form.php:59
msgid "Login:"
msgstr "Login:"
-#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:306
-#: modules/pref-feeds.php:501 mobile/login_form.php:60
+#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:281
+#: modules/pref-feeds.php:476 mobile/login_form.php:60
msgid "Password:"
msgstr "Senha:"
@@ -1089,7 +1093,7 @@ msgstr ""
#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
#: register.php:200 register.php:213 register.php:228 register.php:246
#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162
+#: update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr ""
@@ -1136,56 +1140,44 @@ msgstr ""
msgid "Return to preferences"
msgstr "Retornar às preferências"
-#: prefs.php:77 prefs.php:156 tt-rss.php:79
+#: prefs.php:74 prefs.php:141 tt-rss.php:76
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 ""
-#: prefs.php:104
-msgid "Unknown Error"
-msgstr "Erro desconhecido"
-
-#: prefs.php:110 tt-rss.php:115
+#: prefs.php:101 tt-rss.php:116
msgid "Hello,"
msgstr "Olá,"
-#: prefs.php:112 prefs.php:122 help/4.php:14
+#: prefs.php:103 prefs.php:113 help/4.php:14
msgid "Exit preferences"
msgstr "Sair das preferências"
-#: prefs.php:114 tt-rss.php:125 mobile/functions.php:21
+#: prefs.php:105 tt-rss.php:126 mobile/functions.php:21
msgid "Logout"
msgstr "Sair"
-#: prefs.php:126
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Criar filtro"
-#: prefs.php:132 tt-rss.php:117 tt-rss.php:154 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:118 tt-rss.php:156 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Preferências"
-#: prefs.php:134 help/4.php:9
+#: prefs.php:125 help/4.php:9
msgid "My Feeds"
msgstr "Meus Feeds"
-#: prefs.php:137 help/4.php:10
-msgid "Other Feeds"
-msgstr "Outros Feeds"
-
-#: prefs.php:140
-msgid "Published Articles"
-msgstr ""
-
-#: prefs.php:142
+#: prefs.php:127 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "Arquivo:"
-#: prefs.php:147
+#: prefs.php:132 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "Usuário"
@@ -1219,7 +1211,7 @@ msgid "How much is two plus two:"
msgstr ""
#: register.php:193
-msgid "Submit registration\""
+msgid "Submit registration"
msgstr ""
#: register.php:211
@@ -1322,139 +1314,143 @@ msgstr ""
msgid "Fatal Error"
msgstr "Erro Fatal"
-#: tt-rss.php:121
+#: tt-rss.php:122
#, fuzzy
msgid "Comments?"
msgstr "Conteúdo"
-#: tt-rss.php:138
+#: tt-rss.php:130
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr ""
+
+#: tt-rss.php:140
msgid "tag cloud"
msgstr "núvem de tags"
-#: tt-rss.php:142
+#: tt-rss.php:144
#, fuzzy
msgid "More feeds..."
msgstr "Removendo o Feed..."
-#: tt-rss.php:153
+#: tt-rss.php:155
msgid "Search..."
msgstr ""
-#: tt-rss.php:156
+#: tt-rss.php:158
msgid "Feed actions:"
msgstr "Ações do Feed:"
-#: tt-rss.php:157
+#: tt-rss.php:159
#, fuzzy
msgid "Subscribe to feed..."
msgstr "Removendo o Feed..."
-#: tt-rss.php:158
+#: tt-rss.php:160
#, fuzzy
msgid "Edit this feed..."
msgstr "Editar"
-#: tt-rss.php:159
+#: tt-rss.php:161
#, fuzzy
msgid "Clear articles"
msgstr "Favoritos"
-#: tt-rss.php:160
+#: tt-rss.php:162
#, fuzzy
msgid "Rescore feed"
msgstr "Removendo o Feed..."
-#: tt-rss.php:161 modules/pref-feeds.php:397 modules/pref-feeds.php:1402
+#: tt-rss.php:163 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr ""
-#: tt-rss.php:163
+#: tt-rss.php:165
msgid "All feeds:"
msgstr "Todos os Feeds:"
-#: tt-rss.php:165 help/3.php:44
+#: tt-rss.php:167 help/3.php:44
msgid "(Un)hide read feeds"
msgstr ""
-#: tt-rss.php:167
+#: tt-rss.php:169
msgid "Other actions:"
msgstr "Outras ações:"
-#: tt-rss.php:170
+#: tt-rss.php:172
#, fuzzy
msgid "Create filter..."
msgstr "Criar um usuário"
-#: tt-rss.php:171
+#: tt-rss.php:173
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;Editar esse Feed"
-#: tt-rss.php:172
+#: tt-rss.php:174
#, fuzzy
msgid "Reset category order"
msgstr "Remover as categorias selecionadas?"
-#: tt-rss.php:174
+#: tt-rss.php:176
#, fuzzy
msgid "&nbsp;&nbsp;Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Criar filtro"
-#: tt-rss.php:182
+#: tt-rss.php:184
#, fuzzy
msgid "Collapse feedlist"
msgstr "Todos os feeds"
-#: tt-rss.php:184
+#: tt-rss.php:186
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:192 mobile/functions.php:738
+#: tt-rss.php:194 mobile/functions.php:738
msgid "Search:"
msgstr ""
-#: tt-rss.php:200 mobile/functions.php:456
+#: tt-rss.php:202 mobile/functions.php:456
msgid "Adaptive"
msgstr ""
-#: tt-rss.php:201 mobile/functions.php:457
+#: tt-rss.php:203 mobile/functions.php:457
msgid "All Articles"
msgstr ""
-#: tt-rss.php:204
+#: tt-rss.php:206
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:205 modules/pref-feeds.php:1247 modules/pref-feeds.php:1310
+#: tt-rss.php:207 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "Atualizado"
-#: tt-rss.php:208
+#: tt-rss.php:210
#, fuzzy
msgid "Order:"
msgstr "Onde:"
-#: tt-rss.php:212 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:214 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:443
#, fuzzy
msgid "Date"
msgstr "Atualizar"
-#: tt-rss.php:214
+#: tt-rss.php:216
msgid "Score"
msgstr ""
-#: tt-rss.php:218
+#: tt-rss.php:220
msgid "Limit:"
msgstr "Limite:"
-#: tt-rss.php:243 modules/pref-feeds.php:261 modules/pref-feeds.php:458
+#: tt-rss.php:245 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Atualizar"
-#: tt-rss.php:261
+#: tt-rss.php:263
msgid "Drag me to resize panels"
msgstr ""
@@ -1513,6 +1509,11 @@ msgid ""
"\t\t\tversion <b>%d</b>."
msgstr ""
+#: modules/help.php:6
+#, fuzzy
+msgid "Help"
+msgstr "Olá,"
+
#: modules/help.php:17
msgid "Help topic not found."
msgstr "Tópico de ajuda não encontrado."
@@ -1551,56 +1552,58 @@ msgstr ""
msgid "Notice"
msgstr ""
-#: modules/popup-dialog.php:12
+#: modules/popup-dialog.php:14
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."
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
msgstr ""
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
msgid "Last update:"
msgstr ""
#: 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."
+"You are running the latest version of Tiny Tiny RSS. The fact that you are "
+"seeing this dialog is probably a bug."
msgstr ""
-#: modules/popup-dialog.php:35
+#: modules/popup-dialog.php:34
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."
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
+msgstr ""
+
+#: modules/popup-dialog.php:48
+msgid "Visit official site"
msgstr ""
#: modules/popup-dialog.php:61
msgid "Subscribe to Feed"
msgstr ""
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:422 modules/pref-filters.php:403
+#: modules/popup-dialog.php:70 modules/pref-feeds.php:140
+#: modules/pref-feeds.php:397 modules/pref-filters.php:403
msgid "Feed"
msgstr "Feed"
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:181
-#: modules/pref-feeds.php:436
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:156
+#: modules/pref-feeds.php:411
#, fuzzy
msgid "URL:"
msgstr "Feed URL:"
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:193
-#: modules/pref-feeds.php:448
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:168
+#: modules/pref-feeds.php:423
#, fuzzy
msgid "Place in category:"
msgstr "Salvando categoria..."
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:297
-#: modules/pref-feeds.php:492 modules/pref-prefs.php:264
-#: modules/pref-users.php:149
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:272
+#: modules/pref-feeds.php:467 modules/pref-prefs.php:262
+#: modules/pref-users.php:142
msgid "Authentication"
msgstr ""
@@ -1608,23 +1611,22 @@ msgstr ""
msgid "This feed requires authentication."
msgstr "Este feed requer autenticação."
-#: modules/popup-dialog.php:130 modules/pref-feed-browser.php:166
-#: modules/pref-feeds.php:128
+#: modules/popup-dialog.php:130 modules/pref-feeds.php:103
msgid "Subscribe"
msgstr ""
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:130 modules/pref-feeds.php:402
-#: modules/pref-feeds.php:556 modules/pref-filters.php:166
-#: modules/pref-users.php:184
+#: modules/pref-feeds.php:105 modules/pref-feeds.php:377
+#: modules/pref-feeds.php:531 modules/pref-filters.php:166
+#: modules/pref-users.php:183
msgid "Cancel"
msgstr "Cancelar"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feed-browser.php:125
-#: modules/pref-feeds.php:1143 modules/pref-filters.php:307
-#: modules/pref-labels.php:105 modules/pref-users.php:364
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-labels.php:96 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1694,9 +1696,9 @@ msgstr "Ação"
msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:315
-#: modules/pref-feeds.php:510 modules/pref-filters.php:123
-#: modules/pref-users.php:165
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:290
+#: modules/pref-feeds.php:485 modules/pref-filters.php:123
+#: modules/pref-users.php:164
#, fuzzy
msgid "Options"
msgstr "Opções:"
@@ -1733,9 +1735,9 @@ msgstr "Editar Tags"
msgid "Tags for this article (separated by commas):"
msgstr ""
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:400
-#: modules/pref-feeds.php:554 modules/pref-filters.php:162
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:529 modules/pref-filters.php:162
+#: modules/pref-users.php:180
msgid "Save"
msgstr "Salvar"
@@ -1751,47 +1753,6 @@ msgstr "Exibir as Tags mais populares."
msgid "browse more"
msgstr ""
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr ""
-
-#: modules/pref-feed-browser.php:15
-msgid "Feed information:"
-msgstr "Informações do Feed:"
-
-#: modules/pref-feed-browser.php:39
-#, fuzzy
-msgid "Site:"
-msgstr "Título"
-
-#: modules/pref-feed-browser.php:41
-#, fuzzy
-msgid "Last updated:"
-msgstr "Atualizado"
-
-#: modules/pref-feed-browser.php:56
-msgid "Last headlines:"
-msgstr ""
-
-#: modules/pref-feed-browser.php:112
-msgid ""
-"Feed browser cache information is missing. Please refer to the <a "
-"class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-"FeedBrowser'>wiki</a> for more information."
-msgstr ""
-
-#: modules/pref-feed-browser.php:129
-msgid "Top"
-msgstr ""
-
-#: modules/pref-feed-browser.php:138
-msgid "Show"
-msgstr ""
-
-#: modules/pref-feed-browser.php:222
-msgid "Couldn't find any feeds available for subscription."
-msgstr ""
-
#: modules/pref-feeds.php:4
msgid "Check to enable field"
msgstr ""
@@ -1800,212 +1761,235 @@ msgstr ""
msgid "Subscribed to feeds:"
msgstr ""
-#: modules/pref-feeds.php:63
-msgid "Other feeds: Top 25"
+#: modules/pref-feeds.php:59
+msgid "Feed browser is administratively disabled."
msgstr ""
-#: modules/pref-feeds.php:67
-msgid "Showing top 25 registered feeds, sorted by popularity:"
+#: modules/pref-feeds.php:63
+#, fuzzy
+msgid "Feed Browser"
+msgstr "Editor de Feed"
+
+#: modules/pref-feeds.php:81
+msgid "Top"
msgstr ""
-#: modules/pref-feeds.php:117
-#, fuzzy
-msgid "No feeds found."
-msgstr "Sem Feeds para exibir."
+#: modules/pref-feeds.php:90
+msgid "Show"
+msgstr ""
-#: modules/pref-feeds.php:155
+#: modules/pref-feeds.php:130
#, fuzzy
msgid "Feed Editor"
msgstr "Editor de Feed"
-#: modules/pref-feeds.php:210
+#: modules/pref-feeds.php:185
msgid "Link to feed:"
msgstr ""
-#: modules/pref-feeds.php:227
+#: modules/pref-feeds.php:202
msgid "Not linked"
msgstr ""
-#: modules/pref-feeds.php:275 modules/pref-feeds.php:471
+#: modules/pref-feeds.php:250 modules/pref-feeds.php:446
msgid "using"
msgstr ""
-#: modules/pref-feeds.php:287 modules/pref-feeds.php:483
+#: modules/pref-feeds.php:262 modules/pref-feeds.php:458
msgid "Article purging:"
msgstr ""
-#: modules/pref-feeds.php:329 modules/pref-feeds.php:516
+#: modules/pref-feeds.php:304 modules/pref-feeds.php:491
msgid "Hide from \"Other Feeds\""
msgstr ""
-#: modules/pref-feeds.php:340 modules/pref-feeds.php:521
+#: modules/pref-feeds.php:315 modules/pref-feeds.php:496
msgid "Right-to-left content"
msgstr ""
-#: modules/pref-feeds.php:351 modules/pref-feeds.php:526
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:501
msgid "Hide from my feed list"
msgstr ""
-#: modules/pref-feeds.php:363 modules/pref-feeds.php:532
+#: modules/pref-feeds.php:338 modules/pref-feeds.php:507
msgid "Include in e-mail digest"
msgstr ""
-#: modules/pref-feeds.php:384 modules/pref-feeds.php:540
+#: modules/pref-feeds.php:359 modules/pref-feeds.php:515
msgid "Cache images locally"
msgstr ""
-#: modules/pref-feeds.php:412
+#: modules/pref-feeds.php:387
#, fuzzy
msgid "Multiple Feed Editor"
msgstr "Editor de Feed"
-#: modules/pref-feeds.php:784 modules/pref-feeds.php:831
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:862
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:965
+#: modules/pref-feeds.php:860
+msgid "Edit subscription options"
+msgstr ""
+
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Editor de Categoria"
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "A categoria <b>$%s</b> já existe na base de dados."
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr ""
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Criar categoria"
-#: modules/pref-feeds.php:1093
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr ""
-#: modules/pref-feeds.php:1104 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:178
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-users.php:474
msgid "Remove"
msgstr "Remover"
-#: modules/pref-feeds.php:1126
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
-#: modules/pref-feeds.php:1148 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
msgid "Subscribe to feed"
msgstr ""
-#: modules/pref-feeds.php:1153
-msgid "Top 25"
-msgstr ""
+#: modules/pref-feeds.php:1134
+#, fuzzy
+msgid "More Feeds"
+msgstr "Removendo o Feed..."
-#: modules/pref-feeds.php:1227
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr ""
-#: modules/pref-feeds.php:1244 modules/pref-feeds.php:1306
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr ""
-#: modules/pref-feeds.php:1331 modules/pref-filters.php:461
-#: modules/pref-users.php:456
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:461
+#: modules/pref-users.php:449
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1377 modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1320
+msgid "(Hidden)"
+msgstr ""
+
+#: modules/pref-feeds.php:1333
+#, php-format
+msgid "(linked to %s)"
+msgstr ""
+
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
#, fuzzy
msgid "Selection:"
msgstr "Seleção"
-#: modules/pref-feeds.php:1383
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr ""
-#: modules/pref-feeds.php:1392 modules/pref-filters.php:485
-#: modules/pref-users.php:479
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:485
+#: modules/pref-users.php:472
msgid "Edit"
msgstr "Editar"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr ""
-#: modules/pref-feeds.php:1401 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
#, fuzzy
msgid "Rescore articles"
msgstr "Favoritos"
-#: modules/pref-feeds.php:1407
+#: modules/pref-feeds.php:1389
#, fuzzy
msgid "Other:"
msgstr "Onde:"
-#: modules/pref-feeds.php:1408
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Editar categorias"
-#: modules/pref-feeds.php:1415
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "Arquivo:"
-#: modules/pref-feeds.php:1422
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Importar"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Exportar OPML"
-#: modules/pref-feeds.php:1432
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1434
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1429
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
msgstr ""
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1433
msgid "Link to published articles feed."
msgstr ""
-#: modules/pref-feeds.php:1454
+#: modules/pref-feeds.php:1436
#, fuzzy
msgid "Generate another link"
msgstr "Gerar um outro endereço"
+#: modules/pref-feeds.php:1502
+#, fuzzy
+msgid "No feeds found."
+msgstr "Sem Feeds para exibir."
+
#: modules/pref-filters.php:23
#, fuzzy
msgid "Filter Editor"
@@ -2058,20 +2042,20 @@ msgstr ""
msgid "No matching filters found."
msgstr ""
-#: modules/pref-labels.php:75
+#: modules/pref-labels.php:66
#, php-format
msgid "Created label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:113 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr ""
-#: modules/pref-labels.php:184
+#: modules/pref-labels.php:175
msgid "No labels defined."
msgstr ""
-#: modules/pref-labels.php:186
+#: modules/pref-labels.php:177
msgid "No matching labels found."
msgstr ""
@@ -2087,15 +2071,20 @@ msgstr "Senha antiga incorreta"
msgid "The configuration was saved."
msgstr ""
+#: modules/pref-prefs.php:132
+#, php-format
+msgid "Unknown option: %s"
+msgstr ""
+
#: modules/pref-prefs.php:143
msgid "E-mail has been changed."
msgstr "E-mail alterado."
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:215
+#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
msgid "The configuration was reset to defaults."
msgstr ""
-#: modules/pref-prefs.php:200
+#: modules/pref-prefs.php:198
msgid ""
"Your password is at default value, \n"
"\t\t\t\t\t\tplease change it."
@@ -2103,68 +2092,68 @@ msgstr ""
"Sua senha é a padrão, \n"
"\t\t\t\t\t\tvocê deve mudá-la."
-#: modules/pref-prefs.php:227
+#: modules/pref-prefs.php:225
msgid "Personal data"
msgstr ""
-#: modules/pref-prefs.php:234
+#: modules/pref-prefs.php:232
msgid "E-mail"
msgstr "E-mail"
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
#, fuzzy
msgid "Access level"
msgstr "Nível de acesso:"
-#: modules/pref-prefs.php:258
+#: modules/pref-prefs.php:256
msgid "Change e-mail"
msgstr "Mudar E-mail"
-#: modules/pref-prefs.php:266
+#: modules/pref-prefs.php:264
msgid "Old password"
msgstr "Senha antiga"
-#: modules/pref-prefs.php:273
+#: modules/pref-prefs.php:271
msgid "New password"
msgstr "Senha nova"
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:279
msgid "Confirm password"
msgstr "Confirmar senha"
-#: modules/pref-prefs.php:298
+#: modules/pref-prefs.php:296
msgid "Change password"
msgstr "Mudar senha"
-#: modules/pref-prefs.php:314
+#: modules/pref-prefs.php:312
msgid "Themes"
msgstr "Temas"
-#: modules/pref-prefs.php:315
+#: modules/pref-prefs.php:313
msgid "Select theme"
msgstr "Selecionar o tema"
-#: modules/pref-prefs.php:333
+#: modules/pref-prefs.php:331
msgid "Change theme"
msgstr "Mudar Tema"
-#: modules/pref-prefs.php:390
+#: modules/pref-prefs.php:388
msgid "short_desc"
msgstr "short_desc"
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Sim"
-#: modules/pref-prefs.php:404 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
msgid "No"
msgstr "Não"
-#: modules/pref-prefs.php:429
+#: modules/pref-prefs.php:427
msgid "Save configuration"
msgstr "Salvar configuração"
-#: modules/pref-prefs.php:433
+#: modules/pref-prefs.php:431
msgid "Reset to defaults"
msgstr ""
@@ -2173,64 +2162,73 @@ msgstr ""
msgid "Your access level is insufficient to open this tab."
msgstr "Seu nível de acesso é insuficiente para executar esse script."
-#: modules/pref-users.php:54 modules/pref-users.php:417
+#: modules/pref-users.php:17 modules/pref-users.php:470
+msgid "User details"
+msgstr "Detalhes do usuário"
+
+#: modules/pref-users.php:31
+#, fuzzy
+msgid "User not found"
+msgstr "Feed não encontrado."
+
+#: modules/pref-users.php:50 modules/pref-users.php:410
msgid "Registered"
msgstr ""
-#: modules/pref-users.php:55
+#: modules/pref-users.php:51
#, fuzzy
msgid "Last logged in"
msgstr "Último Login"
-#: modules/pref-users.php:72
+#: modules/pref-users.php:58
msgid "Subscribed feeds count"
msgstr ""
-#: modules/pref-users.php:76
+#: modules/pref-users.php:62
msgid "Subscribed feeds"
msgstr ""
-#: modules/pref-users.php:122
+#: modules/pref-users.php:108
#, fuzzy
msgid "User Editor"
msgstr "Editor de usuário"
-#: modules/pref-users.php:152
+#: modules/pref-users.php:145
#, fuzzy
msgid "Access level: "
msgstr "Nível de acesso:"
-#: modules/pref-users.php:159
+#: modules/pref-users.php:158
#, fuzzy
msgid "Change password to"
msgstr "Mudar senha"
-#: modules/pref-users.php:168
+#: modules/pref-users.php:167
#, fuzzy
msgid "E-mail: "
msgstr "E-mail:"
-#: modules/pref-users.php:204
+#: modules/pref-users.php:203
#, php-format
msgid "Changed password of user <b>%s</b>."
msgstr "Alterada a senha do usuário <b>%s</b>."
-#: modules/pref-users.php:252
+#: modules/pref-users.php:251
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "Adicionado usuário <b>%s</b> com senha <b>%s</b>"
-#: modules/pref-users.php:259
+#: modules/pref-users.php:258
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Não pode criar o usuário <b>%s</b>"
-#: modules/pref-users.php:263
+#: modules/pref-users.php:262
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "O usuário <b>%s</b> já existe."
-#: modules/pref-users.php:283
+#: modules/pref-users.php:282
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -2239,45 +2237,41 @@ msgstr ""
"Alterada a senha do usuário <b>%s</b>\n"
"\t\t\t\t\t para <b>%s</b>"
-#: modules/pref-users.php:287
+#: modules/pref-users.php:286
#, fuzzy, php-format
msgid "Notifying <b>%s</b>."
msgstr "Adicionando a categoria <b>%s</b>."
-#: modules/pref-users.php:324
+#: modules/pref-users.php:323
msgid "[tt-rss] Password change notification"
msgstr ""
-#: modules/pref-users.php:381 help/4.php:27
+#: modules/pref-users.php:374 help/4.php:27
msgid "Create user"
msgstr "Criar um usuário"
-#: modules/pref-users.php:415
+#: modules/pref-users.php:408
msgid "Login"
msgstr "Login"
-#: modules/pref-users.php:416
+#: modules/pref-users.php:409
msgid "Access Level"
msgstr "Nível de acesso"
-#: modules/pref-users.php:418
+#: modules/pref-users.php:411
msgid "Last login"
msgstr "Último Login"
-#: modules/pref-users.php:477
-msgid "User details"
-msgstr "Detalhes do usuário"
-
-#: modules/pref-users.php:483
+#: modules/pref-users.php:476
msgid "Reset password"
msgstr ""
-#: modules/pref-users.php:488
+#: modules/pref-users.php:481
#, fuzzy
msgid "No users defined."
msgstr "Nenhum usuário foi selecionado."
-#: modules/pref-users.php:490
+#: modules/pref-users.php:483
msgid "No matching users found."
msgstr ""
@@ -2450,17 +2444,9 @@ msgstr ""
msgid "Press any key to close this window."
msgstr "Fechar esta janela"
-#: help/4.php:11
-msgid "Content Filtering"
-msgstr "Filtrando o conteúdo"
-
-#: help/4.php:12
-msgid "Label Editor"
-msgstr ""
-
-#: help/4.php:13
-msgid "User Manager"
-msgstr "Gerência de usuário"
+#: help/4.php:10
+msgid "Other Feeds"
+msgstr "Outros Feeds"
#: help/4.php:19
#, fuzzy
@@ -2533,6 +2519,26 @@ msgstr ""
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "Unknown Error"
+#~ msgstr "Erro desconhecido"
+
+#~ msgid "Feed information:"
+#~ msgstr "Informações do Feed:"
+
+#, fuzzy
+#~ msgid "Site:"
+#~ msgstr "Título"
+
+#, fuzzy
+#~ msgid "Last updated:"
+#~ msgstr "Atualizado"
+
+#~ msgid "Content Filtering"
+#~ msgstr "Filtrando o conteúdo"
+
+#~ msgid "User Manager"
+#~ msgstr "Gerência de usuário"
+
#~ msgid "&nbsp;&nbsp;Edit this feed"
#~ msgstr "&nbsp;&nbsp;Editar esse Feed"
@@ -2574,10 +2580,6 @@ msgstr ""
#~ msgid "Content contains"
#~ msgstr "Filtrando o conteúdo"
-#, fuzzy
-#~ msgid "Help"
-#~ msgstr "Olá,"
-
#~ msgid "SQL Expression"
#~ msgstr "Expressão SQL"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 3343caec1..c4df17709 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index f97370ba8..1377044c7 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-22 00:21+0300\n"
-"PO-Revision-Date: 2008-12-16 13:32+0400\n"
+"POT-Creation-Date: 2009-01-25 23:34+0300\n"
+"PO-Revision-Date: 2009-01-25 21:56+0400\n"
"Last-Translator: Max Kamashev <[email protected]>\n"
"Language-Team: Русский <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@ msgstr "Раз в день"
msgid "Weekly"
msgstr "Раз в неделю"
-#: backend.php:122 tt-rss.php:211 modules/pref-prefs.php:317
+#: backend.php:122 tt-rss.php:213 modules/pref-prefs.php:315
msgid "Default"
msgstr "По умолчанию"
@@ -97,7 +97,7 @@ msgstr "Magpie"
msgid "SimplePie"
msgstr "SimplePie"
-#: backend.php:133 modules/pref-users.php:140
+#: backend.php:133 modules/pref-users.php:126
msgid "User"
msgstr "Пользователь"
@@ -172,188 +172,174 @@ msgstr ""
#: errors.php:32
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
+"неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
+"конфигурацию PHP"
-#: functions.php:2852 modules/popup-dialog.php:175
+#: functions.php:2808 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "Все каналы"
-#: functions.php:2881 functions.php:2920 functions.php:3309 functions.php:4324
-#: functions.php:4354 modules/pref-feeds.php:1266
+#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
+#: functions.php:4248 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "Нет категории"
-#: functions.php:2910 functions.php:3505 mobile/functions.php:33
+#: functions.php:2866 functions.php:3459 mobile/functions.php:33
msgid "Special"
msgstr "Особые"
-#: functions.php:2912 functions.php:3338 functions.php:3507 prefs.php:144
-#: mobile/functions.php:83
+#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "Метки"
-#: functions.php:2930 functions.php:3331 functions.php:4178 help/3.php:59
+#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "Отмеченные"
-#: functions.php:2932 functions.php:3335 functions.php:4185
-#: modules/pref-feeds.php:1441 help/3.php:60 mobile/functions.php:70
+#: functions.php:2888 functions.php:3291 functions.php:4079
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "Опубликованные"
-#: functions.php:2934 functions.php:3341 functions.php:4163 help/3.php:58
+#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
#: mobile/functions.php:52
msgid "Fresh articles"
msgstr "Свежие"
-#: functions.php:2936 functions.php:3344 functions.php:4156 help/3.php:57
+#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
#: mobile/functions.php:43
-#, fuzzy
msgid "All articles"
msgstr "Все статьи"
-#: functions.php:3295 functions.php:3297
+#: functions.php:3251 functions.php:3253
msgid "Search results"
msgstr "Результаты поиска"
-#: functions.php:3313 functions.php:3326 functions.php:3332 functions.php:3336
-#: functions.php:3342 functions.php:3345 functions.php:3353
+#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
+#: functions.php:3298 functions.php:3301 functions.php:3309
msgid "Searched for"
msgstr "Поиск"
-#: functions.php:3984 functions.php:5351 modules/pref-feeds.php:1047
-#: modules/pref-feeds.php:1228 modules/pref-filters.php:366
-#: modules/pref-labels.php:138 modules/pref-users.php:408
+#: functions.php:3929
+msgid "Generated feed"
+msgstr "Генерировать канал"
+
+#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
+#: modules/pref-labels.php:129 modules/pref-users.php:401
msgid "Select:"
msgstr "Выбрать:"
-#: functions.php:3985 modules/pref-feeds.php:1048 modules/pref-feeds.php:1229
-#: modules/pref-filters.php:367 modules/pref-labels.php:139
-#: modules/pref-users.php:409 mobile/functions.php:570
+#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "Все"
-#: functions.php:3986 functions.php:4002 tt-rss.php:203
+#: functions.php:3936 functions.php:3952 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "Новые"
-#: functions.php:3987 mobile/functions.php:573
+#: functions.php:3937 mobile/functions.php:573
msgid "Invert"
msgstr "Инвертировать"
-#: functions.php:3988 modules/pref-feeds.php:1049 modules/pref-feeds.php:1230
-#: modules/pref-filters.php:368 modules/pref-labels.php:140
-#: modules/pref-users.php:410 mobile/functions.php:572
+#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "Ничего"
-#: functions.php:3996 tt-rss.php:152 modules/pref-feeds.php:1389
+#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "Действия..."
-#: functions.php:4001
+#: functions.php:3951
msgid "Selection toggle:"
msgstr "Переключить выбранное:"
-#: functions.php:4003 tt-rss.php:202 mobile/functions.php:459
+#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "Отмеченные"
-#: functions.php:4004
+#: functions.php:3954
msgid "Published"
msgstr "Опубликован"
-#: functions.php:4006
+#: functions.php:3956
msgid "Mark as read:"
msgstr "Пометить как прочит.:"
-#: functions.php:4007 mobile/functions.php:578
+#: functions.php:3957 mobile/functions.php:578
msgid "Selection"
msgstr "Выбранные"
-#: functions.php:4009 mobile/functions.php:580
+#: functions.php:3959 mobile/functions.php:580
msgid "Entire feed"
msgstr "Весь канал"
-#: functions.php:4013
-#, fuzzy
+#: functions.php:3963
msgid "Assign label:"
-msgstr "Применить теги"
-
-#: functions.php:4016 tt-rss.php:169
-#, fuzzy
-msgid "Create label..."
-msgstr "Создать метку"
-
-#: functions.php:4028
-#, fuzzy
-msgid "(remove)"
-msgstr "Удалить"
+msgstr "Применить метку:"
-#: functions.php:4065
-msgid "Generated feed"
-msgstr "Генерировать канал"
-
-#: functions.php:4110
+#: functions.php:4004
msgid "Click to collapse category"
msgstr "Щёлкните, чтобы развернуть категорию"
-#: functions.php:4374
+#: functions.php:4268
msgid "No feeds to display."
msgstr "Нет каналов для отображения."
-#: functions.php:4391 mobile/functions.php:12
+#: functions.php:4285 mobile/functions.php:12
msgid "Tags"
msgstr "Теги"
-#: functions.php:4627
+#: functions.php:4521
msgid " - "
msgstr " - "
-#: functions.php:4682 functions.php:4683
-msgid "no tags"
-msgstr "нет тегов"
-
-#: functions.php:4690
+#: functions.php:4545 functions.php:5220
msgid "Edit tags for this article"
msgstr "Редактировать теги статьи"
-#: functions.php:4698
+#: functions.php:4553
msgid "Display original article content"
msgstr "Показать оригинальное содержимое статьи"
-#: functions.php:4705 functions.php:5361
+#: functions.php:4560 functions.php:5211
msgid "Show article summary in new window"
msgstr "Показать детали статьи в новом окне"
-#: functions.php:4742 functions.php:5285
+#: functions.php:4593 functions.php:5135
msgid "unknown type"
msgstr "Неизвестный тип"
-#: functions.php:4748 functions.php:5291
+#: functions.php:4599 functions.php:5141
msgid "audio/mpeg"
msgstr "audio/mpeg"
-#: functions.php:4784 functions.php:5325
+#: functions.php:4635 functions.php:5175
msgid "Attachment:"
msgstr "Вложение:"
-#: functions.php:4786 functions.php:5327
+#: functions.php:4637 functions.php:5177
msgid "Attachments:"
msgstr "Вложения:"
-#: functions.php:4806 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1098
+#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "Закрыть это окно"
-#: functions.php:4862 modules/pref-feed-browser.php:75
+#: functions.php:4713
msgid "Feed not found."
msgstr "Канал не найден."
-#: functions.php:4931 mobile/functions.php:423
+#: functions.php:4782 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
@@ -361,33 +347,46 @@ msgstr ""
"Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис "
"или локальную конфигурацию."
-#: functions.php:5259
+#: functions.php:5109
msgid "Click to expand article"
msgstr "Щёлкните чтобы развернуть статью"
-#: functions.php:5419
+#: functions.php:5246
msgid "No unread articles found to display."
msgstr "Не найдено не прочитанных статей"
-#: functions.php:5422
-#, fuzzy
+#: functions.php:5249
msgid "No updated articles found to display."
-msgstr "Не найдено не прочитанных статей"
+msgstr "Не найдено не прочитанных статей."
-#: functions.php:5425
+#: functions.php:5252
msgid "No starred articles found to display."
msgstr "Не найдено отмеченных статей"
-#: functions.php:5429
+#: functions.php:5256
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
+"Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
+"Действия) или используйте фильтр."
-#: functions.php:5431
+#: functions.php:5258
msgid "No articles found to display."
msgstr "Статей не найдено."
+#: functions.php:5931 tt-rss.php:171
+msgid "Create label..."
+msgstr "Создать метку..."
+
+#: functions.php:5944
+msgid "(remove)"
+msgstr "(удалить)"
+
+#: functions.php:5988
+msgid "no tags"
+msgstr "нет тегов"
+
#: localized_js.php:35
msgid "display feeds"
msgstr "показать каналы"
@@ -396,7 +395,7 @@ msgstr "показать каналы"
msgid "display tags"
msgstr "показать теги"
-#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
+#: localized_js.php:37 prefs.php:66 prefs.php:138 tt-rss.php:68
msgid "Loading, please wait..."
msgstr "Идет загрузка..."
@@ -594,7 +593,7 @@ msgstr "Не могу обновить заголовки (отсутствуе�
msgid "Could not display article (missing XML object)"
msgstr "Не могу показать статью (отсутствует XML объект)"
-#: localized_js.php:95 tt-rss.php:257 tt-rss.php:270
+#: localized_js.php:95 tt-rss.php:259 tt-rss.php:272
msgid "No feed selected."
msgstr "Канал не выбран."
@@ -735,9 +734,8 @@ msgid "Rescoring feeds..."
msgstr "Переоценка каналов..."
#: localized_js.php:138
-#, fuzzy
msgid "You can't rescore this kind of feed."
-msgstr "Вы не можете переоценить этот канал."
+msgstr "Вы не можете снова оценить этот канал."
#: localized_js.php:139
#, php-format
@@ -768,8 +766,8 @@ msgstr "Сохранить изменения выбранных каналов?
msgid "Saving feeds..."
msgstr "Сохраняются каналы..."
-#: localized_schema.php:9 tt-rss.php:213 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1241 modules/pref-feeds.php:1302
+#: localized_schema.php:9 tt-rss.php:215 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "Заголовок"
@@ -795,7 +793,7 @@ msgstr "Дата Статьи"
msgid "Filter article"
msgstr "Отфильтровать статью"
-#: localized_schema.php:16 tt-rss.php:164 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:166 mobile/functions.php:583
msgid "Mark as read"
msgstr "Как прочитанные"
@@ -807,15 +805,19 @@ msgstr "Отметить"
msgid "Assign tags"
msgstr "Применить теги"
-#: localized_schema.php:23
+#: localized_schema.php:20
+msgid "Assign label"
+msgstr "Применить метку"
+
+#: localized_schema.php:24
msgid "General"
msgstr "Общие"
-#: localized_schema.php:25
+#: localized_schema.php:26
msgid "Allow duplicate posts"
msgstr "Разрешить дубликаты статей"
-#: localized_schema.php:26
+#: localized_schema.php:27
msgid ""
"This option is useful when you are reading several planet-type aggregators "
"with partially colliding userbase. When disabled, it forces same posts from "
@@ -824,15 +826,15 @@ msgstr ""
"Эта опция полезна, если вы читаете несколько агрегаторов типа \"планета\" с "
"пересекающимися статьями. Когда запрещено, статья показывается лишь один раз."
-#: localized_schema.php:27
+#: localized_schema.php:28
msgid "Default interval between feed updates (in minutes)"
msgstr "Интервал между обновлениями каналов по умолчанию (в минутах)"
-#: localized_schema.php:28
+#: localized_schema.php:29
msgid "Enable e-mail digest"
msgstr "Включить почтовый дайджест"
-#: localized_schema.php:29
+#: localized_schema.php:30
msgid ""
"This option enables sending daily digest of new (and unread) headlines on "
"your configured e-mail address"
@@ -840,27 +842,27 @@ msgstr ""
"Эта опция разрешает отправку ежедневного обзора новых (и непрочитанных) "
"заголовков на ваш адрес электронной почты"
-#: localized_schema.php:30
+#: localized_schema.php:31
msgid "Purge old posts after this number of days (0 - disables)"
msgstr "Стирать статьи старше этого количества дней (0 - выключает)"
-#: localized_schema.php:31
+#: localized_schema.php:32
msgid "Update post on checksum change"
msgstr "Обновлять статью при изменении контрольной суммы"
-#: localized_schema.php:32
+#: localized_schema.php:33
msgid "Mark articles in e-mail digest as read"
msgstr "Отметить все статьи в e-mail дайджесте как прочитанные?"
-#: localized_schema.php:34
+#: localized_schema.php:35
msgid "Interface"
msgstr "Интерфейс"
-#: localized_schema.php:36
+#: localized_schema.php:37
msgid "Combined feed display"
msgstr "Комбинированный режим отображения"
-#: localized_schema.php:37
+#: localized_schema.php:38
msgid ""
"Display expanded list of feed articles, instead of separate displays for "
"headlines and article content"
@@ -868,11 +870,11 @@ msgstr ""
"Показывать развёрнутый список статей, вместо разделения экрана на заголовки "
"и содержимое статей"
-#: localized_schema.php:38
+#: localized_schema.php:39
msgid "Default article limit"
msgstr "Количество статей по умолчанию"
-#: localized_schema.php:39
+#: localized_schema.php:40
msgid ""
"Default limit for articles to display, any custom number you like (0 - "
"disables)."
@@ -880,23 +882,23 @@ msgstr ""
"По умолчанию ограничивать количество статей для показа. Любое число, какое "
"вам нравится (0 - выключить)"
-#: localized_schema.php:40
+#: localized_schema.php:41
msgid "Enable feed categories"
msgstr "Включить категории каналов"
-#: localized_schema.php:41
+#: localized_schema.php:42
msgid "Enable search toolbar"
msgstr "Разрешить панель поиска"
-#: localized_schema.php:42
+#: localized_schema.php:43
msgid "Hide feeds with no unread messages"
msgstr "Спрятать каналы без непрочитанных статей"
-#: localized_schema.php:43
+#: localized_schema.php:44
msgid "Mark articles as read automatically"
msgstr "Отмечать статьи как прочитанные автоматически"
-#: localized_schema.php:44
+#: localized_schema.php:45
msgid ""
"This option enables marking articles as read automatically in combined mode "
"(except for Fresh articles feed) while you scroll article list."
@@ -905,11 +907,11 @@ msgstr ""
"комбинированном режиме (исключение для специального канала \"Свежие статьи"
"\" ), пока вы прокручиваете список статей."
-#: localized_schema.php:45
+#: localized_schema.php:46
msgid "On catchup show next feed"
msgstr "Показывать следующий канал при отметке как прочитанный"
-#: localized_schema.php:46
+#: localized_schema.php:47
msgid ""
"When \"Mark as read\" button is clicked in toolbar, automatically open next "
"feed with unread articles."
@@ -917,41 +919,41 @@ msgstr ""
"После выбора опции \"Отметить как прочитанное\" в верхней панели, "
"автоматически открывать следующий канал с не прочитанными статьями."
-#: localized_schema.php:47
+#: localized_schema.php:48
msgid "Open article links in new browser window"
msgstr "Открыть ссылку на статью в новом окне браузера"
-#: localized_schema.php:48
+#: localized_schema.php:49
msgid "Reverse headline order (oldest first)"
msgstr "Обратный порядок заголовков (старые впереди)"
-#: localized_schema.php:49
+#: localized_schema.php:50
msgid "Show content preview in headlines list"
msgstr "Показать предпросмотр содержимого в списке заголовков"
-#: localized_schema.php:50
+#: localized_schema.php:51
msgid "Sort feeds by unread articles count"
msgstr "Сортировать каналы по количеству непрочитанных статей"
-#: localized_schema.php:51
+#: localized_schema.php:52
msgid "User stylesheet URL"
msgstr "URL пользовательского файла стилей"
-#: localized_schema.php:52
+#: localized_schema.php:53
msgid "Link to user stylesheet to override default style, disabled if empty."
msgstr ""
"Ссылка на пользовательский файл стилей замещает файл стилей по умолчанию, "
"запрещает если пусто"
-#: localized_schema.php:53
+#: localized_schema.php:54
msgid "Maximum age of fresh articles (in hours)"
msgstr "Максимальный возраст свежих статей (в часах)"
-#: localized_schema.php:54
+#: localized_schema.php:55
msgid "Hide feedlist"
msgstr "Спрятать список каналов"
-#: localized_schema.php:55
+#: localized_schema.php:56
msgid ""
"This option hides feedlist and allows it to be toggled on the fly, useful "
"for small screens."
@@ -959,11 +961,11 @@ msgstr ""
"Эта опция скрывает список каналов и позволяет его переключать на лету, "
"удобно для маленьких экранов"
-#: localized_schema.php:56
+#: localized_schema.php:57
msgid "Group headlines in virtual feeds"
msgstr "Группировать заголовки в виртуальные каналы"
-#: localized_schema.php:57
+#: localized_schema.php:58
msgid ""
"When this option is enabled, headlines in Special feeds and Labels are "
"grouped by feeds"
@@ -971,15 +973,15 @@ msgstr ""
"Когда эта опция включена, заголовки в Особом канале и Метки группируются по "
"каналам"
-#: localized_schema.php:59
+#: localized_schema.php:60
msgid "Advanced"
msgstr "Расширенные"
-#: localized_schema.php:61
+#: localized_schema.php:62
msgid "Blacklisted tags"
msgstr "Черный список тегов"
-#: localized_schema.php:62
+#: localized_schema.php:63
msgid ""
"When auto-detecting tags in articles these tags will not be applied (comma-"
"separated list)."
@@ -987,19 +989,19 @@ msgstr ""
"Когда автоопределение тегов в статьях, эти теги не будут применяться (список "
"значений, разделённых запятыми)."
-#: localized_schema.php:63
+#: localized_schema.php:64
msgid "Confirm marking feed as read"
msgstr "Подтвердить отметку каналка как прочитанный"
-#: localized_schema.php:64
+#: localized_schema.php:65
msgid "Enable feed icons"
msgstr "Разрешить иконки каналов"
-#: localized_schema.php:65
+#: localized_schema.php:66
msgid "Enable labels"
msgstr "Включить метки"
-#: localized_schema.php:66
+#: localized_schema.php:67
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 "
@@ -1009,72 +1011,72 @@ msgstr ""
"группировках SQL запросов. Эта возможность строго экспериментальная и не "
"удобна в работе. Использовать с осторожностью."
-#: localized_schema.php:67
+#: localized_schema.php:68
msgid "Long date format"
msgstr "Длинный формат даты"
-#: localized_schema.php:68
+#: localized_schema.php:69
msgid "Set articles as unread on update"
msgstr "Установить статьи как не прочитанные при обновлении"
-#: localized_schema.php:69
+#: localized_schema.php:70
msgid "Short date format"
msgstr "Короткий формат даты"
-#: localized_schema.php:70
+#: localized_schema.php:71
msgid "Show additional information in feedlist"
msgstr "Показывать расширенную информацию в списке каналов"
-#: localized_schema.php:71
+#: localized_schema.php:72
msgid "Strip unsafe tags from articles"
msgstr "Вырезать небезопасные теги из статей"
-#: localized_schema.php:72
+#: localized_schema.php:73
msgid "Strip all but most common HTML tags when reading articles."
msgstr "Вырезать все, кроме основных HTML тегов при показе статей."
-#: localized_schema.php:73
+#: localized_schema.php:74
msgid "Use more accessible date/time format for headlines"
msgstr "Использовать более удобный формат отображения даты/времени"
-#: localized_schema.php:74
+#: localized_schema.php:75
msgid "Automatically expand articles in combined mode"
msgstr "Автоматически раскрывать статьи в комбинированном режиме"
-#: localized_schema.php:75
+#: localized_schema.php:76
msgid "Purge unread articles"
msgstr "Очистить непрочитанные статьи"
-#: localized_schema.php:76
+#: localized_schema.php:77
msgid "Show special feeds when hiding read feeds"
msgstr "Показывать специальные каналы, когда скрываются прочитанные каналы"
-#: localized_schema.php:77
+#: localized_schema.php:78
msgid "Prefer more accurate feedlist counters to UI speed"
msgstr ""
"Предпочитать более точные счётчики списка каналов для скорости "
"пользовательского интерфейса"
-#: localized_schema.php:78
+#: localized_schema.php:79
msgid "Enable inline MP3 player"
msgstr "Разрешить встроенный MP3 плеер"
-#: localized_schema.php:79
+#: localized_schema.php:80
msgid ""
"Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
msgstr "Разрешить XSPF Flash плеер для проигрывания подкастов в MP3 формате"
-#: localized_schema.php:80
+#: localized_schema.php:81
msgid "Do not show images in articles"
msgstr "Не показывать изображения в статьях"
-#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:302
-#: modules/pref-feeds.php:495 mobile/login_form.php:59
+#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:277
+#: modules/pref-feeds.php:470 mobile/login_form.php:59
msgid "Login:"
msgstr "Логин:"
-#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:306
-#: modules/pref-feeds.php:501 mobile/login_form.php:60
+#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:281
+#: modules/pref-feeds.php:476 mobile/login_form.php:60
msgid "Password:"
msgstr "Пароль:"
@@ -1092,7 +1094,7 @@ msgstr "Создать новый аккаунт"
#: login_form.php:148
msgid "Limit bandwidth usage"
-msgstr ""
+msgstr "Ограничить скорость передачи"
#: mysql_convert_unicode.php:20 update.php:19
msgid "Your access level is insufficient to run this script."
@@ -1104,12 +1106,12 @@ msgstr "Кодировка обновлений MySQL"
#: mysql_convert_unicode.php:53
msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
-msgstr ""
+msgstr "Этот скрипт для инсталяции Tiny Tiny RSS только с MySQL бекендом."
#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
#: register.php:200 register.php:213 register.php:228 register.php:246
#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162
+#: update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "Вернуться к Tiny Tiny RSS"
@@ -1125,6 +1127,12 @@ msgid ""
"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
"php to 'utf8'."
msgstr ""
+"Этот скрипт переконвертирует вашу базу данных Tiny Tiny RSS в кодировку UTF-"
+"8. \n"
+"\t\t\tЗависит от текущей кодировки базы данных и может испортить данные "
+"(потерянные символы знака ударения, умляуты, и т.д.) \n"
+"\t\t\tПосле обновления, вам нужно установить опцию <b>MYSQL_CHARSET</b> в "
+"файле config.php в 'utf8'."
#: mysql_convert_unicode.php:69 update.php:118
msgid "Perform updates"
@@ -1154,7 +1162,7 @@ msgstr "Расширение DOMXML не найдено. Оно необходи
msgid "Return to preferences"
msgstr "Вернуться к настройкам"
-#: prefs.php:77 prefs.php:156 tt-rss.php:79
+#: prefs.php:74 prefs.php:141 tt-rss.php:76
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1164,56 +1172,41 @@ msgstr ""
"\t\tдля функционала этой программы. Пожалуйста, проверьте\n"
"\t\tнастройки вашего браузера."
-#: prefs.php:104
-msgid "Unknown Error"
-msgstr "Неизвестная ошибка"
-
-#: prefs.php:110 tt-rss.php:115
+#: prefs.php:101 tt-rss.php:116
msgid "Hello,"
msgstr "Привет,"
-#: prefs.php:112 prefs.php:122 help/4.php:14
+#: prefs.php:103 prefs.php:113 help/4.php:14
msgid "Exit preferences"
msgstr "Закрыть настройки"
-#: prefs.php:114 tt-rss.php:125 mobile/functions.php:21
+#: prefs.php:105 tt-rss.php:126 mobile/functions.php:21
msgid "Logout"
msgstr "Выход"
-#: prefs.php:126
+#: prefs.php:117
msgid "Keyboard shortcuts"
msgstr "Горячие Клавиши"
-#: prefs.php:132 tt-rss.php:117 tt-rss.php:154 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:118 tt-rss.php:156 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "Настройки"
-#: prefs.php:134 help/4.php:9
+#: prefs.php:125 help/4.php:9
msgid "My Feeds"
msgstr "Мои каналы"
-#: prefs.php:137 help/4.php:10
-msgid "Other Feeds"
-msgstr "Другие каналы"
-
-#: prefs.php:140
-msgid "Published Articles"
-msgstr "Опубликованные статьи"
-
-#: prefs.php:142
-#, fuzzy
+#: prefs.php:127 help/4.php:11
msgid "Filters"
-msgstr "Файл:"
+msgstr "Фильтры"
-#: prefs.php:147
-#, fuzzy
+#: prefs.php:132 help/4.php:13
msgid "Users"
-msgstr "Пользователь"
+msgstr "Пользователи"
#: register.php:152
-#, fuzzy
msgid "New user registrations are administratively disabled."
-msgstr "Другие каналы отключены администратором"
+msgstr "Регистрация новых пользователей запрещена."
#: register.php:176
msgid ""
@@ -1221,48 +1214,48 @@ msgid ""
"were not logged in once, are erased automatically 24 hours after temporary "
"password is sent."
msgstr ""
+"Временный пароль будет отправлен на указанный e-mail. Если аккаунт не будет "
+"активирован в течении 24 часов, то он будет удалён."
#: register.php:182
msgid "Desired login:"
-msgstr ""
+msgstr "Желаемый логин:"
#: register.php:185
msgid "Check availability"
-msgstr ""
+msgstr "Проверить доступность"
#: register.php:187
-#, fuzzy
msgid "Email:"
msgstr "E-mail: "
#: register.php:190
msgid "How much is two plus two:"
-msgstr ""
+msgstr "Сколько будет, два плюс два:"
#: register.php:193
-msgid "Submit registration\""
-msgstr ""
+msgid "Submit registration"
+msgstr "Зарегистрироваться"
#: register.php:211
msgid "Your registration information is incomplete."
-msgstr ""
+msgstr "Не полностью заполнена ваша регистрационная информация."
#: register.php:226
msgid "Sorry, this username is already taken."
-msgstr ""
+msgstr "Извините, такое имя пользователя уже существует."
#: register.php:244
-#, fuzzy
msgid "Registration failed."
-msgstr "Тест конфигурации неудачен"
+msgstr "Неудачная регистрация."
#: register.php:328
msgid "Account created successfully."
-msgstr ""
+msgstr "Аккаунт успешно создан."
#: register.php:350
msgid "New user registrations are currently closed."
-msgstr ""
+msgstr "Регистрация новых пользователей временно закрыта."
#: sanity_check.php:8
msgid ""
@@ -1364,137 +1357,132 @@ msgstr ""
msgid "Fatal Error"
msgstr "Фатальная Ошибка"
-#: tt-rss.php:121
+#: tt-rss.php:122
msgid "Comments?"
msgstr "Комментарии?"
-#: tt-rss.php:138
+#: tt-rss.php:130
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr "Доступная новая версия Tiny Tiny RSS!"
+
+#: tt-rss.php:140
msgid "tag cloud"
msgstr "облако тегов"
-#: tt-rss.php:142
-#, fuzzy
+#: tt-rss.php:144
msgid "More feeds..."
-msgstr "Переоценка каналов..."
+msgstr "Больше каналов..."
-#: tt-rss.php:153
-#, fuzzy
+#: tt-rss.php:155
msgid "Search..."
-msgstr "Поиск"
+msgstr "Поиск..."
-#: tt-rss.php:156
+#: tt-rss.php:158
msgid "Feed actions:"
msgstr "Действия над каналами:"
-#: tt-rss.php:157
-#, fuzzy
+#: tt-rss.php:159
msgid "Subscribe to feed..."
-msgstr "Подписаться на канал"
+msgstr "Подписаться на канал..."
-#: tt-rss.php:158
-#, fuzzy
+#: tt-rss.php:160
msgid "Edit this feed..."
-msgstr "Редактировать канал"
+msgstr "Редактировать канал..."
-#: tt-rss.php:159
-#, fuzzy
+#: tt-rss.php:161
msgid "Clear articles"
-msgstr "Отфильтровать статью"
+msgstr "Очистить статьи"
-#: tt-rss.php:160
-#, fuzzy
+#: tt-rss.php:162
msgid "Rescore feed"
-msgstr "Переоценка каналов..."
+msgstr "Заново оценить канал"
-#: tt-rss.php:161 modules/pref-feeds.php:397 modules/pref-feeds.php:1402
+#: tt-rss.php:163 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "Отписаться"
-#: tt-rss.php:163
+#: tt-rss.php:165
msgid "All feeds:"
msgstr "Все каналы:"
-#: tt-rss.php:165 help/3.php:44
+#: tt-rss.php:167 help/3.php:44
msgid "(Un)hide read feeds"
msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
-#: tt-rss.php:167
+#: tt-rss.php:169
msgid "Other actions:"
msgstr "Другие действия:"
-#: tt-rss.php:170
-#, fuzzy
+#: tt-rss.php:172
msgid "Create filter..."
-msgstr "Создать фильтр"
+msgstr "Создать фильтр..."
-#: tt-rss.php:171
-#, fuzzy
+#: tt-rss.php:173
msgid "Reset UI layout"
-msgstr "&nbsp;&nbsp;Сбросить UI расположение"
+msgstr "Сбросить панели"
-#: tt-rss.php:172
-#, fuzzy
+#: tt-rss.php:174
msgid "Reset category order"
-msgstr "Сбросить порядок категорий?"
+msgstr "Сбросить порядок категорий"
-#: tt-rss.php:174
+#: tt-rss.php:176
msgid "&nbsp;&nbsp;Keyboard shortcuts"
msgstr "&nbsp;&nbsp;Горячие клавиши"
-#: tt-rss.php:182
+#: tt-rss.php:184
msgid "Collapse feedlist"
msgstr "Свернуть список каналов"
-#: tt-rss.php:184
+#: tt-rss.php:186
msgid "Toggle Feedlist"
msgstr "Переключить Список Каналов"
-#: tt-rss.php:192 mobile/functions.php:738
+#: tt-rss.php:194 mobile/functions.php:738
msgid "Search:"
msgstr "Искать:"
-#: tt-rss.php:200 mobile/functions.php:456
+#: tt-rss.php:202 mobile/functions.php:456
msgid "Adaptive"
msgstr "Адаптивно"
-#: tt-rss.php:201 mobile/functions.php:457
+#: tt-rss.php:203 mobile/functions.php:457
msgid "All Articles"
msgstr "Все статьи"
-#: tt-rss.php:204
+#: tt-rss.php:206
msgid "Ignore Scoring"
msgstr "Игнорировать Оценки"
-#: tt-rss.php:205 modules/pref-feeds.php:1247 modules/pref-feeds.php:1310
+#: tt-rss.php:207 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "Обновлено"
-#: tt-rss.php:208
+#: tt-rss.php:210
msgid "Order:"
msgstr "Порядок:"
-#: tt-rss.php:212 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:214 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:443
msgid "Date"
msgstr "Дата"
-#: tt-rss.php:214
+#: tt-rss.php:216
msgid "Score"
msgstr "Оценка"
-#: tt-rss.php:218
+#: tt-rss.php:220
msgid "Limit:"
msgstr "Сколько:"
-#: tt-rss.php:243 modules/pref-feeds.php:261 modules/pref-feeds.php:458
+#: tt-rss.php:245 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "Обновить"
-#: tt-rss.php:261
+#: tt-rss.php:263
msgid "Drag me to resize panels"
-msgstr "Потяни за меня изменения размера панелей"
+msgstr "Потяни за меня для изменения размера панелей"
#: update.php:44
msgid "Database Updater"
@@ -1532,11 +1520,11 @@ msgstr "Идет обновление..."
#: update.php:129
#, php-format
msgid "Updating to version %d..."
-msgstr "Обновляю до версии %d..."
+msgstr "Обновляется до версии %d..."
#: update.php:142
msgid "Checking version... "
-msgstr "Проверяю версию... "
+msgstr "Проверяется версия... "
#: update.php:148
msgid "OK!"
@@ -1552,6 +1540,12 @@ msgid ""
"Finished. Performed <b>%d</b> update(s) up to schema\n"
"\t\t\tversion <b>%d</b>."
msgstr ""
+"Обновление завершено. Выполнено <b>%d</b> обновление(ий) схемы базы данных "
+"до версии <b>%d</b>."
+
+#: modules/help.php:6
+msgid "Help"
+msgstr "Помощь"
#: modules/help.php:17
msgid "Help topic not found."
@@ -1591,54 +1585,64 @@ msgstr "Ошибка: не могу найти тело элемента"
msgid "Notice"
msgstr "Сообщение"
-#: modules/popup-dialog.php:12
+#: modules/popup-dialog.php:14
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."
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
msgstr ""
+"Демон обновлений разрешён в вашей конфигурации, но процесс демона не "
+"запущен. Он необходим для обновления всех каналов.\n"
+"Пожалуйста, запустите демон обновлений или сообщите администратору."
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
msgid "Last update:"
msgstr "Последнее обновление:"
#: 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."
+"You are running the latest version of Tiny Tiny RSS. The fact that you are "
+"seeing this dialog is probably a bug."
msgstr ""
+"Вы запустили последнюю версию Tiny Tiny RSS. Если вы видите этот диалог, "
+"скорее всего обозначает ошибку."
-#: modules/popup-dialog.php:35
+#: modules/popup-dialog.php:34
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."
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
msgstr ""
+"Tiny Tiny RSS определил что демон обновлений не работает уже очень давно.\n"
+"Это обозначает что существует проблема подобная краху или зависанию демона.\n"
+"Пожалуйста проверьте процесс демона или сообщите администратору."
+
+#: modules/popup-dialog.php:48
+msgid "Visit official site"
+msgstr "Посетить официальный сайт"
#: modules/popup-dialog.php:61
msgid "Subscribe to Feed"
msgstr "Подписаться на канал"
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:422 modules/pref-filters.php:403
+#: modules/popup-dialog.php:70 modules/pref-feeds.php:140
+#: modules/pref-feeds.php:397 modules/pref-filters.php:403
msgid "Feed"
msgstr "Канал"
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:181
-#: modules/pref-feeds.php:436
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:156
+#: modules/pref-feeds.php:411
msgid "URL:"
msgstr "URL:"
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:193
-#: modules/pref-feeds.php:448
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:168
+#: modules/pref-feeds.php:423
msgid "Place in category:"
msgstr "Поместить в категорию..."
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:297
-#: modules/pref-feeds.php:492 modules/pref-prefs.php:264
-#: modules/pref-users.php:149
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:272
+#: modules/pref-feeds.php:467 modules/pref-prefs.php:262
+#: modules/pref-users.php:142
msgid "Authentication"
msgstr "Авторизация"
@@ -1646,23 +1650,22 @@ msgstr "Авторизация"
msgid "This feed requires authentication."
msgstr "Этот канал требует авторизации."
-#: modules/popup-dialog.php:130 modules/pref-feed-browser.php:166
-#: modules/pref-feeds.php:128
+#: modules/popup-dialog.php:130 modules/pref-feeds.php:103
msgid "Subscribe"
msgstr "Подписаться"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:130 modules/pref-feeds.php:402
-#: modules/pref-feeds.php:556 modules/pref-filters.php:166
-#: modules/pref-users.php:184
+#: modules/pref-feeds.php:105 modules/pref-feeds.php:377
+#: modules/pref-feeds.php:531 modules/pref-filters.php:166
+#: modules/pref-users.php:183
msgid "Cancel"
msgstr "Отмена"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feed-browser.php:125
-#: modules/pref-feeds.php:1143 modules/pref-filters.php:307
-#: modules/pref-labels.php:105 modules/pref-users.php:364
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-labels.php:96 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1710,7 +1713,7 @@ msgstr "после"
#: modules/popup-dialog.php:268 modules/pref-filters.php:70
msgid "Check it"
-msgstr ""
+msgstr "Проверить"
#: modules/popup-dialog.php:271 modules/pref-filters.php:73
msgid "on field"
@@ -1728,9 +1731,9 @@ msgstr "Выполнить действия"
msgid "with parameters:"
msgstr "с параметрами:"
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:315
-#: modules/pref-feeds.php:510 modules/pref-filters.php:123
-#: modules/pref-users.php:165
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:290
+#: modules/pref-feeds.php:485 modules/pref-filters.php:123
+#: modules/pref-users.php:164
msgid "Options"
msgstr "Опции:"
@@ -1766,9 +1769,9 @@ msgstr "Редактировать теги"
msgid "Tags for this article (separated by commas):"
msgstr "Теги для этой статьи (разделенные запятыми):"
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:400
-#: modules/pref-feeds.php:554 modules/pref-filters.php:162
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:529 modules/pref-filters.php:162
+#: modules/pref-users.php:180
msgid "Save"
msgstr "Сохранить"
@@ -1784,232 +1787,209 @@ msgstr "Самые популярные теги "
msgid "browse more"
msgstr "еще"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr "Другие каналы отключены администратором"
-
-#: modules/pref-feed-browser.php:15
-msgid "Feed information:"
-msgstr "Информация о канале:"
-
-#: modules/pref-feed-browser.php:39
-msgid "Site:"
-msgstr "Сайт:"
-
-#: modules/pref-feed-browser.php:41
-msgid "Last updated:"
-msgstr "Последнее обновление"
-
-#: modules/pref-feed-browser.php:56
-msgid "Last headlines:"
-msgstr "Последние заголовки:"
-
-#: modules/pref-feed-browser.php:112
-msgid ""
-"Feed browser cache information is missing. Please refer to the <a "
-"class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-"FeedBrowser'>wiki</a> for more information."
-msgstr ""
-
-#: modules/pref-feed-browser.php:129
-msgid "Top"
-msgstr "Топ"
-
-#: modules/pref-feed-browser.php:138
-msgid "Show"
-msgstr "Показать"
-
-#: modules/pref-feed-browser.php:222
-msgid "Couldn't find any feeds available for subscription."
-msgstr ""
-
#: modules/pref-feeds.php:4
msgid "Check to enable field"
-msgstr ""
+msgstr "Проверить доступность поля"
#: modules/pref-feeds.php:44
msgid "Subscribed to feeds:"
msgstr "Подписаны каналы:"
+#: modules/pref-feeds.php:59
+msgid "Feed browser is administratively disabled."
+msgstr "Другие каналы отключены администратором"
+
#: modules/pref-feeds.php:63
-msgid "Other feeds: Top 25"
-msgstr "Топ 25 каналов"
+msgid "Feed Browser"
+msgstr "Обзор Каналов"
-#: modules/pref-feeds.php:67
-msgid "Showing top 25 registered feeds, sorted by popularity:"
-msgstr "Топ 25 популярных каналов:"
+#: modules/pref-feeds.php:81
+msgid "Top"
+msgstr "Топ"
-#: modules/pref-feeds.php:117
-msgid "No feeds found."
-msgstr "Каналы не найдены."
+#: modules/pref-feeds.php:90
+msgid "Show"
+msgstr "Показать"
-#: modules/pref-feeds.php:155
+#: modules/pref-feeds.php:130
msgid "Feed Editor"
msgstr "Редактор канала"
-#: modules/pref-feeds.php:210
+#: modules/pref-feeds.php:185
msgid "Link to feed:"
msgstr "Связать с:"
-#: modules/pref-feeds.php:227
+#: modules/pref-feeds.php:202
msgid "Not linked"
msgstr "Нет связей"
-#: modules/pref-feeds.php:275 modules/pref-feeds.php:471
+#: modules/pref-feeds.php:250 modules/pref-feeds.php:446
msgid "using"
msgstr "использование"
-#: modules/pref-feeds.php:287 modules/pref-feeds.php:483
+#: modules/pref-feeds.php:262 modules/pref-feeds.php:458
msgid "Article purging:"
msgstr "Удаление сообщений:"
-#: modules/pref-feeds.php:329 modules/pref-feeds.php:516
+#: modules/pref-feeds.php:304 modules/pref-feeds.php:491
msgid "Hide from \"Other Feeds\""
msgstr "Спрятать из \"Других каналов\""
-#: modules/pref-feeds.php:340 modules/pref-feeds.php:521
+#: modules/pref-feeds.php:315 modules/pref-feeds.php:496
msgid "Right-to-left content"
msgstr "Язык канала пишется справа налево"
-#: modules/pref-feeds.php:351 modules/pref-feeds.php:526
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:501
msgid "Hide from my feed list"
msgstr "Спрятать из моего списка каналов"
-#: modules/pref-feeds.php:363 modules/pref-feeds.php:532
+#: modules/pref-feeds.php:338 modules/pref-feeds.php:507
msgid "Include in e-mail digest"
msgstr "Включить в e-mail дайджест"
-#: modules/pref-feeds.php:384 modules/pref-feeds.php:540
+#: modules/pref-feeds.php:359 modules/pref-feeds.php:515
msgid "Cache images locally"
msgstr "Кэшировать изображения локально"
-#: modules/pref-feeds.php:412
-#, fuzzy
+#: modules/pref-feeds.php:387
msgid "Multiple Feed Editor"
msgstr "Редактор канала"
-#: modules/pref-feeds.php:784 modules/pref-feeds.php:831
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr "Всё выполнено."
-#: modules/pref-feeds.php:862
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Добавлена подписка на <b>%s</b>."
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Канал <b>%s</b> уже подписан."
-#: modules/pref-feeds.php:965
+#: modules/pref-feeds.php:860
+msgid "Edit subscription options"
+msgstr "Редактировать опции подписки"
+
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "Редактор категорий"
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "Категория <b>$%s</b> уже существует."
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "Не могу удалить не пустую категорию"
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "Создать категорию"
-#: modules/pref-feeds.php:1093
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "Категории отсутствуют."
-#: modules/pref-feeds.php:1104 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:178
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-users.php:474
msgid "Remove"
msgstr "Удалить"
-#: modules/pref-feeds.php:1126
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
-#: modules/pref-feeds.php:1148 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
msgid "Subscribe to feed"
msgstr "Подписаться на канал"
-#: modules/pref-feeds.php:1153
-msgid "Top 25"
-msgstr "Топ 25"
+#: modules/pref-feeds.php:1134
+#, fuzzy
+msgid "More Feeds"
+msgstr "Больше каналов..."
-#: modules/pref-feeds.php:1227
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "Показать дату последней статьи"
-#: modules/pref-feeds.php:1244 modules/pref-feeds.php:1306
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "Последняя&nbsp;статья"
-#: modules/pref-feeds.php:1331 modules/pref-filters.php:461
-#: modules/pref-users.php:456
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:461
+#: modules/pref-users.php:449
msgid "Click to edit"
msgstr "Щёлкните для редактирования"
-#: modules/pref-feeds.php:1377 modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1320
#, fuzzy
+msgid "(Hidden)"
+msgstr "Скрыто"
+
+#: modules/pref-feeds.php:1333
+#, fuzzy, php-format
+msgid "(linked to %s)"
+msgstr "ссылка на"
+
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
msgid "Selection:"
-msgstr "Выбрать:"
+msgstr "Выбрано:"
-#: modules/pref-feeds.php:1383
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "Изменить категорию"
-#: modules/pref-feeds.php:1392 modules/pref-filters.php:485
-#: modules/pref-users.php:479
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:485
+#: modules/pref-users.php:472
msgid "Edit"
msgstr "Редактировать"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr "Ручная очистка"
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1382
msgid "Clear feed data"
msgstr "Очистить данные канала."
-#: modules/pref-feeds.php:1401 modules/pref-filters.php:324
-#, fuzzy
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
msgid "Rescore articles"
-msgstr "Отмеченные"
+msgstr "Заново оценить статьи"
-#: modules/pref-feeds.php:1407
+#: modules/pref-feeds.php:1389
msgid "Other:"
msgstr "Другой:"
-#: modules/pref-feeds.php:1408
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "Редактировать категории"
-#: modules/pref-feeds.php:1415
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1401
msgid "File:"
msgstr "Файл:"
-#: modules/pref-feeds.php:1422
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "Импортировать"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "Экспортировать OPML"
-#: modules/pref-feeds.php:1432
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr "Интеграция в Firefox"
-#: modules/pref-feeds.php:1434
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -2017,11 +1997,11 @@ msgstr ""
"Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
"Для этого щёлкните по ссылке ниже."
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1429
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
@@ -2029,14 +2009,18 @@ msgstr ""
"Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
"быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1433
msgid "Link to published articles feed."
msgstr "Ссылка на общий канал со статьями."
-#: modules/pref-feeds.php:1454
+#: modules/pref-feeds.php:1436
msgid "Generate another link"
msgstr "Создать другую ссылку"
+#: modules/pref-feeds.php:1502
+msgid "No feeds found."
+msgstr "Каналы не найдены."
+
#: modules/pref-filters.php:23
msgid "Filter Editor"
msgstr "Редактор фильтров"
@@ -2056,13 +2040,14 @@ msgid "Create filter"
msgstr "Создать фильтр"
#: modules/pref-filters.php:392
+#, fuzzy
msgid "filter_type_descr"
-msgstr ""
+msgstr "описание типа фильтра"
#: modules/pref-filters.php:393
#, fuzzy
msgid "action_description"
-msgstr "описание"
+msgstr "описание действия"
#: modules/pref-filters.php:404
msgid "Field"
@@ -2088,20 +2073,20 @@ msgstr "Фильтры отсутствуют."
msgid "No matching filters found."
msgstr "Не найдено совпадений с фильтром."
-#: modules/pref-labels.php:75
+#: modules/pref-labels.php:66
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Добавлена метка <b>%s</b>"
-#: modules/pref-labels.php:113 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "Создать метку"
-#: modules/pref-labels.php:184
+#: modules/pref-labels.php:175
msgid "No labels defined."
msgstr "Метки отсутствуют."
-#: modules/pref-labels.php:186
+#: modules/pref-labels.php:177
msgid "No matching labels found."
msgstr "Не найдено совпадений с метками."
@@ -2117,15 +2102,20 @@ msgstr "Старый пароль неправилен."
msgid "The configuration was saved."
msgstr "Конфигурация сохранена."
+#: modules/pref-prefs.php:132
+#, fuzzy, php-format
+msgid "Unknown option: %s"
+msgstr "Неизвестная опция:"
+
#: modules/pref-prefs.php:143
msgid "E-mail has been changed."
msgstr "E-mail был изменен."
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:215
+#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
msgid "The configuration was reset to defaults."
msgstr "Настройки были сброшены по-умолчанию."
-#: modules/pref-prefs.php:200
+#: modules/pref-prefs.php:198
msgid ""
"Your password is at default value, \n"
"\t\t\t\t\t\tplease change it."
@@ -2133,67 +2123,68 @@ msgstr ""
"Используется пароль по умолчанию, \n"
"\t\t\t\t\t\tпожалуйста, измените его."
-#: modules/pref-prefs.php:227
+#: modules/pref-prefs.php:225
msgid "Personal data"
msgstr "Личные данные"
-#: modules/pref-prefs.php:234
+#: modules/pref-prefs.php:232
msgid "E-mail"
msgstr "E-mail"
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
msgid "Access level"
msgstr "Уровень доступа:"
-#: modules/pref-prefs.php:258
+#: modules/pref-prefs.php:256
msgid "Change e-mail"
msgstr "Изменить e-mail"
-#: modules/pref-prefs.php:266
+#: modules/pref-prefs.php:264
msgid "Old password"
msgstr "Старый пароль"
-#: modules/pref-prefs.php:273
+#: modules/pref-prefs.php:271
msgid "New password"
msgstr "Новый пароль"
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:279
msgid "Confirm password"
msgstr "Подтверждение пароля"
-#: modules/pref-prefs.php:298
+#: modules/pref-prefs.php:296
msgid "Change password"
msgstr "Изменить пароль"
-#: modules/pref-prefs.php:314
+#: modules/pref-prefs.php:312
msgid "Themes"
msgstr "Темы"
-#: modules/pref-prefs.php:315
+#: modules/pref-prefs.php:313
msgid "Select theme"
msgstr "Выбор темы"
-#: modules/pref-prefs.php:333
+#: modules/pref-prefs.php:331
msgid "Change theme"
msgstr "Изменить тему"
-#: modules/pref-prefs.php:390
+#: modules/pref-prefs.php:388
+#, fuzzy
msgid "short_desc"
-msgstr ""
+msgstr "краткое описание"
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "Да"
-#: modules/pref-prefs.php:404 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
msgid "No"
msgstr "Нет"
-#: modules/pref-prefs.php:429
+#: modules/pref-prefs.php:427
msgid "Save configuration"
msgstr "Сохранить конфигурацию"
-#: modules/pref-prefs.php:433
+#: modules/pref-prefs.php:431
msgid "Reset to defaults"
msgstr "Сбросить настройки"
@@ -2201,104 +2192,108 @@ msgstr "Сбросить настройки"
msgid "Your access level is insufficient to open this tab."
msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
-#: modules/pref-users.php:54 modules/pref-users.php:417
+#: modules/pref-users.php:17 modules/pref-users.php:470
+msgid "User details"
+msgstr "Подробнее..."
+
+#: modules/pref-users.php:31
+#, fuzzy
+msgid "User not found"
+msgstr "Канал не найден."
+
+#: modules/pref-users.php:50 modules/pref-users.php:410
msgid "Registered"
msgstr "Зарегистрирован"
-#: modules/pref-users.php:55
+#: modules/pref-users.php:51
msgid "Last logged in"
msgstr "Последний вход"
-#: modules/pref-users.php:72
+#: modules/pref-users.php:58
msgid "Subscribed feeds count"
msgstr "Количество подписанных каналов"
-#: modules/pref-users.php:76
-#, fuzzy
+#: modules/pref-users.php:62
msgid "Subscribed feeds"
-msgstr "Подписаны каналы:"
+msgstr "Подписан на каналы"
-#: modules/pref-users.php:122
+#: modules/pref-users.php:108
msgid "User Editor"
msgstr "Редактор пользователей"
-#: modules/pref-users.php:152
+#: modules/pref-users.php:145
msgid "Access level: "
msgstr "Уровень доступа:"
-#: modules/pref-users.php:159
+#: modules/pref-users.php:158
msgid "Change password to"
msgstr "Изменить пароль на"
-#: modules/pref-users.php:168
+#: modules/pref-users.php:167
msgid "E-mail: "
msgstr "E-mail: "
-#: modules/pref-users.php:204
+#: modules/pref-users.php:203
#, php-format
msgid "Changed password of user <b>%s</b>."
msgstr "Пароль пользователя <b>%s</b> изменен."
-#: modules/pref-users.php:252
+#: modules/pref-users.php:251
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
-#: modules/pref-users.php:259
+#: modules/pref-users.php:258
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "Не могу добавить пользователя <b>%s</b>"
-#: modules/pref-users.php:263
+#: modules/pref-users.php:262
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "Пользователь <b>%s</b> уже существует."
-#: modules/pref-users.php:283
+#: modules/pref-users.php:282
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
"\t\t\t\t\t to <b>%s</b>"
msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
-#: modules/pref-users.php:287
+#: modules/pref-users.php:286
#, php-format
msgid "Notifying <b>%s</b>."
msgstr "Уведомление <b>%s</b>."
-#: modules/pref-users.php:324
+#: modules/pref-users.php:323
msgid "[tt-rss] Password change notification"
msgstr "[tt-rss] Уведомление о смене пароля"
-#: modules/pref-users.php:381 help/4.php:27
+#: modules/pref-users.php:374 help/4.php:27
msgid "Create user"
msgstr "Добавить пользователя"
-#: modules/pref-users.php:415
+#: modules/pref-users.php:408
msgid "Login"
msgstr "Пользователь:"
-#: modules/pref-users.php:416
+#: modules/pref-users.php:409
msgid "Access Level"
msgstr "Уровень доступа:"
-#: modules/pref-users.php:418
+#: modules/pref-users.php:411
msgid "Last login"
msgstr "Последний вход"
-#: modules/pref-users.php:477
-msgid "User details"
-msgstr "Подробнее..."
-
-#: modules/pref-users.php:483
+#: modules/pref-users.php:476
msgid "Reset password"
msgstr "Сбросить пароль"
-#: modules/pref-users.php:488
+#: modules/pref-users.php:481
msgid "No users defined."
msgstr "Пользователи не определены."
-#: modules/pref-users.php:490
+#: modules/pref-users.php:483
msgid "No matching users found."
msgstr "Подходящих пользователей не найдено."
@@ -2313,6 +2308,11 @@ msgid ""
"newsfeed, specified field is matched against regular expression and some "
"action is taken. Regular expression matching is case-insensitive."
msgstr ""
+"Tiny Tiny RSS поддерживает фильтрацию (обработку) статей. Фильтрация "
+"выполняется однажды, когда новая статья импортируется в базу данных из "
+"новостного канала, затем ищется совпадение с заданным регулярным выражением "
+"и выполняется заданное действие. Регулярное выражение не чувствительно к "
+"регистру."
#: help/2.php:5
msgid ""
@@ -2320,6 +2320,10 @@ msgid ""
"set starred, assign tag(s), and set score. Filters can be defined globally "
"and for some specific feed."
msgstr ""
+"Поддерживаются события: фильтр (не импорт) статьи, отметить статью как "
+"прочитанную, пометить статью, назначить тег, и установить оценку. Фильтры "
+"могут быть определены глобально и локально для некоторых специфических "
+"каналов."
#: help/2.php:7
msgid ""
@@ -2329,6 +2333,11 @@ msgid ""
"XYZZY in title with inverse flag will match all articles, except those "
"containing string XYZZY in title."
msgstr ""
+"Составные и инверсионные фильтры поддерживаются. Все совпадения фильтров "
+"обсчитываются при импорте статьей и все действия выполняются "
+"последовательно. Инверсное совпадение возвращает результат совпадения, т.е. "
+"фильтр совпадающий с XYZZY в заголовке с инверсным флагом, отфильтрует все "
+"статьи кроме тех, где заголовок содержит строку XYZZY."
#: help/2.php:9
msgid "See also:"
@@ -2399,9 +2408,8 @@ msgid "Collapse sidebar"
msgstr "Развернуть боковую панель"
#: help/3.php:33
-#, fuzzy
msgid "Toggle category reordering mode"
-msgstr "Удалить выбранные категории?"
+msgstr "Переключить изменение режима категории"
#: help/3.php:34 help/4.php:34
msgid "Display this help dialog"
@@ -2441,7 +2449,7 @@ msgstr "Отметить все каналы как прочитанные"
#: help/3.php:51
msgid "If viewing category, (un)collapse it"
-msgstr ""
+msgstr "Если котегория видна, (раз)свернуть её"
#: help/3.php:54 help/4.php:5
msgid "Go to..."
@@ -2451,17 +2459,9 @@ msgstr "Перейти к.."
msgid "Press any key to close this window."
msgstr "Нажмите любую клавишу для закрытия этого окна"
-#: help/4.php:11
-msgid "Content Filtering"
-msgstr "Фильтры"
-
-#: help/4.php:12
-msgid "Label Editor"
-msgstr "Редактор Меток"
-
-#: help/4.php:13
-msgid "User Manager"
-msgstr "Пользователи"
+#: help/4.php:10
+msgid "Other Feeds"
+msgstr "Другие каналы"
#: help/4.php:19
msgid "Panel actions"
@@ -2527,6 +2527,84 @@ msgstr "Соответствие:"
msgid "Internal error: Function not implemented"
msgstr "Внутренняя ошибка: Функция не реализована"
+#~ msgid ""
+#~ "This program requires XmlHttpRequest to function properly. Your browser "
+#~ "doesn't seem to support it."
+#~ msgstr ""
+#~ "Программе требуется функционал XmlHttpRequest. Ваш браузер его не "
+#~ "поддерживает."
+
+#~ msgid ""
+#~ "This program requires cookies to function properly. Your browser doesn't "
+#~ "seem to support them."
+#~ msgstr ""
+#~ "Для работы программы необходимы куки. Ваш браузер их не поддерживает."
+
+#~ msgid "Modify score"
+#~ msgstr "Изменить оценку"
+
+#~ msgid "<h1>User not found</h1>"
+#~ msgstr "<h1>Пользователь не найден</h1>"
+
+#~ msgid ""
+#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+#~ "configuration and your access level."
+#~ msgstr ""
+#~ "<b>Замечание:</b> не все действия могут быть доступны. Это зависит от "
+#~ "конфигурации Tiny Tiny RSS и вашего уровня доступа."
+
+#~ msgid "Tiny Tiny RSS - Subscribe to feed..."
+#~ msgstr "Tiny Tiny RSS - Подписка на канал..."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Неизвестная ошибка"
+
+#~ msgid "Published Articles"
+#~ msgstr "Опубликованные статьи"
+
+#~ msgid "Feed information:"
+#~ msgstr "Информация о канале:"
+
+#~ msgid "Site:"
+#~ msgstr "Сайт:"
+
+#~ msgid "Last updated:"
+#~ msgstr "Последнее обновление"
+
+#~ msgid "Last headlines:"
+#~ msgstr "Последние заголовки:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Feed browser cache information is missing. Please refer to the <a "
+#~ "class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
+#~ "FeedBrowser'>wiki</a> for more information."
+#~ msgstr ""
+#~ "Feed browser cache information is missing. Для большей информации "
+#~ "смотрите тут <a class='visibleLink' target='_blank' href='http://tt-rss."
+#~ "org/trac/wiki/FeedBrowser'>wiki</a>."
+
+#~ msgid "Couldn't find any feeds available for subscription."
+#~ msgstr "Не удалось найти каналы доступные для подписки."
+
+#~ msgid "Other feeds: Top 25"
+#~ msgstr "Топ 25 каналов"
+
+#~ msgid "Showing top 25 registered feeds, sorted by popularity:"
+#~ msgstr "Топ 25 популярных каналов:"
+
+#~ msgid "Top 25"
+#~ msgstr "Топ 25"
+
+#~ msgid "Content Filtering"
+#~ msgstr "Фильтры"
+
+#~ msgid "Label Editor"
+#~ msgstr "Редактор Меток"
+
+#~ msgid "User Manager"
+#~ msgstr "Пользователи"
+
#~ msgid "Toggle:"
#~ msgstr "Изменить:"
@@ -2551,9 +2629,8 @@ msgstr "Внутренняя ошибка: Функция не реализов�
#~ msgid "&nbsp;&nbsp;(Un)hide read feeds"
#~ msgstr "&nbsp;&nbsp;Спрятать прочитанные"
-#, fuzzy
#~ msgid "&nbsp;&nbsp;Create label"
-#~ msgstr "&nbsp;&nbsp;Создать фильтр"
+#~ msgstr "&nbsp;&nbsp;Создать метку"
#~ msgid "&nbsp;&nbsp;Create filter"
#~ msgstr "&nbsp;&nbsp;Создать фильтр"
@@ -2561,6 +2638,13 @@ msgstr "Внутренняя ошибка: Функция не реализов�
#~ msgid "&nbsp;&nbsp;Reset category order"
#~ msgstr "&nbsp;&nbsp;Сбросить порядок категорий"
+#~ msgid ""
+#~ "This panel shows feeds subscribed by other users of this system, just in "
+#~ "case you are interested in them too."
+#~ msgstr ""
+#~ "Эта панель показывает каналы на которые подписаны другие пользователи "
+#~ "системы, только в случае если вам они тоже интересны."
+
#~ msgid "Stored articles"
#~ msgstr "Сохранённые статьи"
@@ -2606,9 +2690,6 @@ msgstr "Внутренняя ошибка: Функция не реализов�
#~ msgid "Match SQL"
#~ msgstr "Совпадение SQL"
-#~ msgid "Help"
-#~ msgstr "Помощь"
-
#~ msgid "Error: SQL expression is blank."
#~ msgstr "Ошибка: пустое SQL выражение."
@@ -2646,19 +2727,6 @@ msgstr "Внутренняя ошибка: Функция не реализов�
#~ msgid "Test"
#~ msgstr "Проверить"
-#~ msgid ""
-#~ "This program requires XmlHttpRequest to function properly. Your browser "
-#~ "doesn't seem to support it."
-#~ msgstr ""
-#~ "Программе требуется функционал XmlHttpRequest. Ваш браузер его не "
-#~ "поддерживает."
-
-#~ msgid ""
-#~ "This program requires cookies to function properly. Your browser doesn't "
-#~ "seem to support them."
-#~ msgstr ""
-#~ "Для работы программы необходимы куки. Ваш браузер их не поддерживает."
-
#, fuzzy
#~ msgid "Perform action"
#~ msgstr "Применить обновления"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 0286f8a94..87431259e 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 66afff929..8e4339727 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: 2009-01-22 00:21+0300\n"
+"POT-Creation-Date: 2009-01-25 23:34+0300\n"
"PO-Revision-Date: 2007-08-19 19:03+0800\n"
"Last-Translator: sluke <[email protected]>\n"
"Language-Team: hicode.org <[email protected]>\n"
@@ -77,7 +77,7 @@ msgstr "每天"
msgid "Weekly"
msgstr "每周"
-#: backend.php:122 tt-rss.php:211 modules/pref-prefs.php:317
+#: backend.php:122 tt-rss.php:213 modules/pref-prefs.php:315
msgid "Default"
msgstr "默认"
@@ -90,7 +90,7 @@ msgstr "页"
msgid "SimplePie"
msgstr ""
-#: backend.php:133 modules/pref-users.php:140
+#: backend.php:133 modules/pref-users.php:126
msgid "User"
msgstr "用户"
@@ -162,230 +162,230 @@ msgstr ""
msgid "SQL escaping test failed, check your database and PHP configuration"
msgstr ""
-#: functions.php:2852 modules/popup-dialog.php:175
+#: functions.php:2808 modules/popup-dialog.php:175
#: modules/pref-filters.php:413 mobile/functions.php:744
msgid "All feeds"
msgstr "所有feed"
-#: functions.php:2881 functions.php:2920 functions.php:3309 functions.php:4324
-#: functions.php:4354 modules/pref-feeds.php:1266
+#: functions.php:2837 functions.php:2876 functions.php:3265 functions.php:4218
+#: functions.php:4248 modules/pref-feeds.php:1247
msgid "Uncategorized"
msgstr "未分类"
-#: functions.php:2910 functions.php:3505 mobile/functions.php:33
+#: functions.php:2866 functions.php:3459 mobile/functions.php:33
msgid "Special"
msgstr "专用"
-#: functions.php:2912 functions.php:3338 functions.php:3507 prefs.php:144
-#: mobile/functions.php:83
+#: functions.php:2868 functions.php:3294 functions.php:3461 prefs.php:129
+#: help/4.php:12 mobile/functions.php:83
msgid "Labels"
msgstr "标记"
-#: functions.php:2930 functions.php:3331 functions.php:4178 help/3.php:59
+#: functions.php:2886 functions.php:3287 functions.php:4072 help/3.php:59
#: mobile/functions.php:61
msgid "Starred articles"
msgstr "星级文章"
-#: functions.php:2932 functions.php:3335 functions.php:4185
-#: modules/pref-feeds.php:1441 help/3.php:60 mobile/functions.php:70
+#: functions.php:2888 functions.php:3291 functions.php:4079
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
msgid "Published articles"
msgstr "已发布文章"
-#: functions.php:2934 functions.php:3341 functions.php:4163 help/3.php:58
+#: functions.php:2890 functions.php:3297 functions.php:4057 help/3.php:58
#: mobile/functions.php:52
#, fuzzy
msgid "Fresh articles"
msgstr "星级文章"
-#: functions.php:2936 functions.php:3344 functions.php:4156 help/3.php:57
+#: functions.php:2892 functions.php:3300 functions.php:4050 help/3.php:57
#: mobile/functions.php:43
#, fuzzy
msgid "All articles"
msgstr "所有文章"
-#: functions.php:3295 functions.php:3297
+#: functions.php:3251 functions.php:3253
msgid "Search results"
msgstr "搜索结果"
-#: functions.php:3313 functions.php:3326 functions.php:3332 functions.php:3336
-#: functions.php:3342 functions.php:3345 functions.php:3353
+#: functions.php:3269 functions.php:3282 functions.php:3288 functions.php:3292
+#: functions.php:3298 functions.php:3301 functions.php:3309
msgid "Searched for"
msgstr "搜索"
-#: functions.php:3984 functions.php:5351 modules/pref-feeds.php:1047
-#: modules/pref-feeds.php:1228 modules/pref-filters.php:366
-#: modules/pref-labels.php:138 modules/pref-users.php:408
+#: functions.php:3929
+msgid "Generated feed"
+msgstr "产生feed"
+
+#: functions.php:3934 functions.php:5201 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:1209 modules/pref-filters.php:366
+#: modules/pref-labels.php:129 modules/pref-users.php:401
msgid "Select:"
msgstr "选择:"
-#: functions.php:3985 modules/pref-feeds.php:1048 modules/pref-feeds.php:1229
-#: modules/pref-filters.php:367 modules/pref-labels.php:139
-#: modules/pref-users.php:409 mobile/functions.php:570
+#: functions.php:3935 modules/pref-feeds.php:1029 modules/pref-feeds.php:1210
+#: modules/pref-filters.php:367 modules/pref-labels.php:130
+#: modules/pref-users.php:402 mobile/functions.php:570
msgid "All"
msgstr "所有"
-#: functions.php:3986 functions.php:4002 tt-rss.php:203
+#: functions.php:3936 functions.php:3952 tt-rss.php:205
#: mobile/functions.php:458 mobile/functions.php:571
msgid "Unread"
msgstr "未读"
-#: functions.php:3987 mobile/functions.php:573
+#: functions.php:3937 mobile/functions.php:573
#, fuzzy
msgid "Invert"
msgstr "(逆)"
-#: functions.php:3988 modules/pref-feeds.php:1049 modules/pref-feeds.php:1230
-#: modules/pref-filters.php:368 modules/pref-labels.php:140
-#: modules/pref-users.php:410 mobile/functions.php:572
+#: functions.php:3938 modules/pref-feeds.php:1030 modules/pref-feeds.php:1211
+#: modules/pref-filters.php:368 modules/pref-labels.php:131
+#: modules/pref-users.php:403 mobile/functions.php:572
msgid "None"
msgstr "无"
-#: functions.php:3996 tt-rss.php:152 modules/pref-feeds.php:1389
+#: functions.php:3946 tt-rss.php:154 modules/pref-feeds.php:1371
msgid "Actions..."
msgstr "激活..."
-#: functions.php:4001
+#: functions.php:3951
#, fuzzy
msgid "Selection toggle:"
msgstr "选择:"
-#: functions.php:4003 tt-rss.php:202 mobile/functions.php:459
+#: functions.php:3953 tt-rss.php:204 mobile/functions.php:459
msgid "Starred"
msgstr "星级"
-#: functions.php:4004
+#: functions.php:3954
msgid "Published"
msgstr "已发布"
-#: functions.php:4006
+#: functions.php:3956
msgid "Mark as read:"
msgstr "标记为已读:"
-#: functions.php:4007 mobile/functions.php:578
+#: functions.php:3957 mobile/functions.php:578
msgid "Selection"
msgstr "选择:"
-#: functions.php:4009 mobile/functions.php:580
+#: functions.php:3959 mobile/functions.php:580
msgid "Entire feed"
msgstr "输入feed"
-#: functions.php:4013
+#: functions.php:3963
#, fuzzy
msgid "Assign label:"
msgstr "指定标签"
-#: functions.php:4016 tt-rss.php:169
-#, fuzzy
-msgid "Create label..."
-msgstr "创建标记"
-
-#: functions.php:4028
-#, fuzzy
-msgid "(remove)"
-msgstr "移除"
-
-#: functions.php:4065
-msgid "Generated feed"
-msgstr "产生feed"
-
-#: functions.php:4110
+#: functions.php:4004
msgid "Click to collapse category"
msgstr ""
-#: functions.php:4374
+#: functions.php:4268
msgid "No feeds to display."
msgstr "无feed显示。"
-#: functions.php:4391 mobile/functions.php:12
+#: functions.php:4285 mobile/functions.php:12
msgid "Tags"
msgstr "标签"
-#: functions.php:4627
+#: functions.php:4521
#, fuzzy
msgid " - "
msgstr ", 由 - "
-#: functions.php:4682 functions.php:4683
-msgid "no tags"
-msgstr "无标签"
-
-#: functions.php:4690
+#: functions.php:4545 functions.php:5220
msgid "Edit tags for this article"
msgstr ""
-#: functions.php:4698
+#: functions.php:4553
#, fuzzy
msgid "Display original article content"
msgstr "显示最近文章时间"
-#: functions.php:4705 functions.php:5361
+#: functions.php:4560 functions.php:5211
#, fuzzy
msgid "Show article summary in new window"
msgstr "新窗口打开文章连结"
-#: functions.php:4742 functions.php:5285
+#: functions.php:4593 functions.php:5135
#, fuzzy
msgid "unknown type"
msgstr "未知错误"
-#: functions.php:4748 functions.php:5291
+#: functions.php:4599 functions.php:5141
msgid "audio/mpeg"
msgstr ""
-#: functions.php:4784 functions.php:5325
+#: functions.php:4635 functions.php:5175
msgid "Attachment:"
msgstr ""
-#: functions.php:4786 functions.php:5327
+#: functions.php:4637 functions.php:5177
msgid "Attachments:"
msgstr ""
-#: functions.php:4806 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1098
+#: functions.php:4657 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
msgid "Close this window"
msgstr "关闭此窗口"
-#: functions.php:4862 modules/pref-feed-browser.php:75
+#: functions.php:4713
msgid "Feed not found."
msgstr "未找到Feed."
-#: functions.php:4931 mobile/functions.php:423
+#: functions.php:4782 mobile/functions.php:423
msgid ""
"Could not display feed (query failed). Please check label match syntax or "
"local configuration."
msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
-#: functions.php:5259
+#: functions.php:5109
#, fuzzy
msgid "Click to expand article"
msgstr "星级文章"
-#: functions.php:5419
+#: functions.php:5246
#, fuzzy
msgid "No unread articles found to display."
msgstr "未找到文章。"
-#: functions.php:5422
+#: functions.php:5249
#, fuzzy
msgid "No updated articles found to display."
msgstr "未找到文章。"
-#: functions.php:5425
+#: functions.php:5252
#, fuzzy
msgid "No starred articles found to display."
msgstr "未找到文章。"
-#: functions.php:5429
+#: functions.php:5256
msgid ""
"No articles found to display. You can assign articles to labels manually "
"(see the Actions menu above) or use a filter."
msgstr ""
-#: functions.php:5431
+#: functions.php:5258
#, fuzzy
msgid "No articles found to display."
msgstr "未找到文章。"
+#: functions.php:5931 tt-rss.php:171
+#, fuzzy
+msgid "Create label..."
+msgstr "创建标记"
+
+#: functions.php:5944
+#, fuzzy
+msgid "(remove)"
+msgstr "移除"
+
+#: functions.php:5988
+msgid "no tags"
+msgstr "无标签"
+
#: localized_js.php:35
msgid "display feeds"
msgstr "显示Feed"
@@ -394,7 +394,7 @@ msgstr "显示Feed"
msgid "display tags"
msgstr "显示标签"
-#: localized_js.php:37 prefs.php:69 prefs.php:153 tt-rss.php:71
+#: localized_js.php:37 prefs.php:66 prefs.php:138 tt-rss.php:68
msgid "Loading, please wait..."
msgstr "读取中,请等待..."
@@ -592,7 +592,7 @@ msgstr "更新提要失败(缺少XML支持)"
msgid "Could not display article (missing XML object)"
msgstr "显示条目失败(缺少XML支持)"
-#: localized_js.php:95 tt-rss.php:257 tt-rss.php:270
+#: localized_js.php:95 tt-rss.php:259 tt-rss.php:272
msgid "No feed selected."
msgstr "无选定feed."
@@ -780,8 +780,8 @@ msgstr "无选定文章。"
msgid "Saving feeds..."
msgstr "保存feed中..."
-#: localized_schema.php:9 tt-rss.php:213 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1241 modules/pref-feeds.php:1302
+#: localized_schema.php:9 tt-rss.php:215 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
#: mobile/functions.php:775
msgid "Title"
msgstr "标题"
@@ -807,7 +807,7 @@ msgstr ""
msgid "Filter article"
msgstr "过滤文章"
-#: localized_schema.php:16 tt-rss.php:164 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:166 mobile/functions.php:583
msgid "Mark as read"
msgstr "标记为已读"
@@ -819,15 +819,20 @@ msgstr "设置星级"
msgid "Assign tags"
msgstr "指定标签"
-#: localized_schema.php:23
+#: localized_schema.php:20
+#, fuzzy
+msgid "Assign label"
+msgstr "指定标签"
+
+#: localized_schema.php:24
msgid "General"
msgstr "常规"
-#: localized_schema.php:25
+#: localized_schema.php:26
msgid "Allow duplicate posts"
msgstr "允许重复文章"
-#: localized_schema.php:26
+#: localized_schema.php:27
msgid ""
"This option is useful when you are reading several planet-type aggregators "
"with partially colliding userbase. When disabled, it forces same posts from "
@@ -836,239 +841,239 @@ msgstr ""
"当遇到一些有行星状主从结构聚合,程序出现写入冲突的时候,这个选项是有用的。当"
"该选项被禁用时,强制来自不用RSS源的同一文章只显示一次。"
-#: localized_schema.php:27
+#: localized_schema.php:28
msgid "Default interval between feed updates (in minutes)"
msgstr "默认更新间隔时间(以分钟为单位)"
-#: localized_schema.php:28
+#: localized_schema.php:29
msgid "Enable e-mail digest"
msgstr "开启电子邮件摘要"
-#: localized_schema.php:29
+#: localized_schema.php:30
msgid ""
"This option enables sending daily digest of new (and unread) headlines on "
"your configured e-mail address"
msgstr "启用这个选项将每天发送新的(和未读的) 标题摘要到您设置的电子邮箱"
-#: localized_schema.php:30
+#: localized_schema.php:31
msgid "Purge old posts after this number of days (0 - disables)"
msgstr "从这个天数之后清除旧的文章(0为不启用)"
-#: localized_schema.php:31
+#: localized_schema.php:32
msgid "Update post on checksum change"
msgstr "更新后校验修改"
-#: localized_schema.php:32
+#: localized_schema.php:33
#, fuzzy
msgid "Mark articles in e-mail digest as read"
msgstr "标记 %s 中所有访问过的主题为已读"
-#: localized_schema.php:34
+#: localized_schema.php:35
msgid "Interface"
msgstr "界面"
-#: localized_schema.php:36
+#: localized_schema.php:37
msgid "Combined feed display"
msgstr "feed联合显示。"
-#: localized_schema.php:37
+#: localized_schema.php:38
msgid ""
"Display expanded list of feed articles, instead of separate displays for "
"headlines and article content"
msgstr "展开显示feed文章,替代分开显示提要和文章内容的形式"
-#: localized_schema.php:38
+#: localized_schema.php:39
msgid "Default article limit"
msgstr "默认文章限制"
-#: localized_schema.php:39
+#: localized_schema.php:40
msgid ""
"Default limit for articles to display, any custom number you like (0 - "
"disables)."
msgstr ""
-#: localized_schema.php:40
+#: localized_schema.php:41
msgid "Enable feed categories"
msgstr "开启feed分类"
-#: localized_schema.php:41
+#: localized_schema.php:42
msgid "Enable search toolbar"
msgstr ""
-#: localized_schema.php:42
+#: localized_schema.php:43
msgid "Hide feeds with no unread messages"
msgstr "隐藏feed源以读信息"
-#: localized_schema.php:43
+#: localized_schema.php:44
msgid "Mark articles as read automatically"
msgstr "自动标志文章为已读"
-#: localized_schema.php:44
+#: localized_schema.php:45
#, fuzzy
msgid ""
"This option enables marking articles as read automatically in combined mode "
"(except for Fresh articles feed) while you scroll article list."
msgstr "启用该选项时,当你在联合模式下滚动文章列表时自动编辑文章为已读。"
-#: localized_schema.php:45
+#: localized_schema.php:46
msgid "On catchup show next feed"
msgstr "自动显示未读"
-#: localized_schema.php:46
+#: localized_schema.php:47
msgid ""
"When \"Mark as read\" button is clicked in toolbar, automatically open next "
"feed with unread articles."
msgstr ""
"当工具栏上 \"标志为已读 \" 按钮被点击时,自动打开下一个RSS源中未读文章。"
-#: localized_schema.php:47
+#: localized_schema.php:48
msgid "Open article links in new browser window"
msgstr "新窗口打开文章连结"
-#: localized_schema.php:48
+#: localized_schema.php:49
msgid "Reverse headline order (oldest first)"
msgstr "反向提要排列(从旧到新)"
-#: localized_schema.php:49
+#: localized_schema.php:50
msgid "Show content preview in headlines list"
msgstr "在提要列表中显示内容预览"
-#: localized_schema.php:50
+#: localized_schema.php:51
msgid "Sort feeds by unread articles count"
msgstr "以未读文章数量排序feed源"
-#: localized_schema.php:51
+#: localized_schema.php:52
msgid "User stylesheet URL"
msgstr "用户样式表 URL"
-#: localized_schema.php:52
+#: localized_schema.php:53
msgid "Link to user stylesheet to override default style, disabled if empty."
msgstr "用户样式表优先,留空为不启用。"
-#: localized_schema.php:53
+#: localized_schema.php:54
msgid "Maximum age of fresh articles (in hours)"
msgstr ""
-#: localized_schema.php:54
+#: localized_schema.php:55
#, fuzzy
msgid "Hide feedlist"
msgstr "隐藏我的Feed列表"
-#: localized_schema.php:55
+#: localized_schema.php:56
msgid ""
"This option hides feedlist and allows it to be toggled on the fly, useful "
"for small screens."
msgstr ""
-#: localized_schema.php:56
+#: localized_schema.php:57
msgid "Group headlines in virtual feeds"
msgstr ""
-#: localized_schema.php:57
+#: localized_schema.php:58
msgid ""
"When this option is enabled, headlines in Special feeds and Labels are "
"grouped by feeds"
msgstr ""
-#: localized_schema.php:59
+#: localized_schema.php:60
msgid "Advanced"
msgstr "高级"
-#: localized_schema.php:61
+#: localized_schema.php:62
msgid "Blacklisted tags"
msgstr "被列入黑名单的标签"
-#: localized_schema.php:62
+#: localized_schema.php:63
msgid ""
"When auto-detecting tags in articles these tags will not be applied (comma-"
"separated list)."
msgstr "自动检测文章中标签时,这些标签不适用(用半角逗号隔开)"
-#: localized_schema.php:63
+#: localized_schema.php:64
msgid "Confirm marking feed as read"
msgstr "确认标记所有Feed为已读..."
-#: localized_schema.php:64
+#: localized_schema.php:65
#, fuzzy
msgid "Enable feed icons"
msgstr "开启feed分类"
-#: localized_schema.php:65
+#: localized_schema.php:66
msgid "Enable labels"
msgstr "开启标签"
-#: localized_schema.php:66
+#: localized_schema.php:67
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 "SQL支持,这是测试功能,请谨慎使用。"
-#: localized_schema.php:67
+#: localized_schema.php:68
msgid "Long date format"
msgstr "长的时间格式"
-#: localized_schema.php:68
+#: localized_schema.php:69
msgid "Set articles as unread on update"
msgstr "更新后标记文章为未读"
-#: localized_schema.php:69
+#: localized_schema.php:70
msgid "Short date format"
msgstr "短的时间格式"
-#: localized_schema.php:70
+#: localized_schema.php:71
msgid "Show additional information in feedlist"
msgstr "在feed列表中显示附加信息"
-#: localized_schema.php:71
+#: localized_schema.php:72
msgid "Strip unsafe tags from articles"
msgstr "从文章中过滤不安全标签"
-#: localized_schema.php:72
+#: localized_schema.php:73
msgid "Strip all but most common HTML tags when reading articles."
msgstr "阅读文章时过滤所有常见html标签"
-#: localized_schema.php:73
+#: localized_schema.php:74
msgid "Use more accessible date/time format for headlines"
msgstr "提要使用更方便的 日期/时间 格式"
-#: localized_schema.php:74
+#: localized_schema.php:75
msgid "Automatically expand articles in combined mode"
msgstr ""
-#: localized_schema.php:75
+#: localized_schema.php:76
#, fuzzy
msgid "Purge unread articles"
msgstr "星级文章"
-#: localized_schema.php:76
+#: localized_schema.php:77
msgid "Show special feeds when hiding read feeds"
msgstr ""
-#: localized_schema.php:77
+#: localized_schema.php:78
msgid "Prefer more accurate feedlist counters to UI speed"
msgstr ""
-#: localized_schema.php:78
+#: localized_schema.php:79
msgid "Enable inline MP3 player"
msgstr ""
-#: localized_schema.php:79
+#: localized_schema.php:80
msgid ""
"Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
msgstr ""
-#: localized_schema.php:80
+#: localized_schema.php:81
msgid "Do not show images in articles"
msgstr ""
-#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:302
-#: modules/pref-feeds.php:495 mobile/login_form.php:59
+#: login_form.php:108 modules/popup-dialog.php:107 modules/pref-feeds.php:277
+#: modules/pref-feeds.php:470 mobile/login_form.php:59
msgid "Login:"
msgstr "登陆:"
-#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:306
-#: modules/pref-feeds.php:501 mobile/login_form.php:60
+#: login_form.php:111 modules/popup-dialog.php:111 modules/pref-feeds.php:281
+#: modules/pref-feeds.php:476 mobile/login_form.php:60
msgid "Password:"
msgstr "密码:"
@@ -1104,7 +1109,7 @@ msgstr ""
#: mysql_convert_unicode.php:56 mysql_convert_unicode.php:97 register.php:155
#: register.php:200 register.php:213 register.php:228 register.php:246
#: register.php:331 register.php:341 register.php:353 update.php:94
-#: update.php:162
+#: update.php:162 modules/pref-feeds.php:865
msgid "Return to Tiny Tiny RSS"
msgstr "返回Tiny Tiny RSS"
@@ -1150,56 +1155,44 @@ msgstr "未检测到DOMXML 扩展, 要求PHP5以下版本。"
msgid "Return to preferences"
msgstr "返回 我的最爱"
-#: prefs.php:77 prefs.php:156 tt-rss.php:79
+#: prefs.php:74 prefs.php:141 tt-rss.php:76
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 "您的浏览器不支持Javascript, 请检查设置。"
-#: prefs.php:104
-msgid "Unknown Error"
-msgstr "未知错误"
-
-#: prefs.php:110 tt-rss.php:115
+#: prefs.php:101 tt-rss.php:116
msgid "Hello,"
msgstr "你好,"
-#: prefs.php:112 prefs.php:122 help/4.php:14
+#: prefs.php:103 prefs.php:113 help/4.php:14
msgid "Exit preferences"
msgstr "退出我的最爱"
-#: prefs.php:114 tt-rss.php:125 mobile/functions.php:21
+#: prefs.php:105 tt-rss.php:126 mobile/functions.php:21
msgid "Logout"
msgstr "注销"
-#: prefs.php:126
+#: prefs.php:117
#, fuzzy
msgid "Keyboard shortcuts"
msgstr "&nbsp;&nbsp;创建过滤器"
-#: prefs.php:132 tt-rss.php:117 tt-rss.php:154 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:118 tt-rss.php:156 help/3.php:62 help/4.php:8
msgid "Preferences"
msgstr "我的最爱"
-#: prefs.php:134 help/4.php:9
+#: prefs.php:125 help/4.php:9
msgid "My Feeds"
msgstr "我的feed"
-#: prefs.php:137 help/4.php:10
-msgid "Other Feeds"
-msgstr "其他feed"
-
-#: prefs.php:140
-msgid "Published Articles"
-msgstr "已发布文章"
-
-#: prefs.php:142
+#: prefs.php:127 help/4.php:11
#, fuzzy
msgid "Filters"
msgstr "标题:"
-#: prefs.php:147
+#: prefs.php:132 help/4.php:13
#, fuzzy
msgid "Users"
msgstr "用户"
@@ -1234,7 +1227,7 @@ msgid "How much is two plus two:"
msgstr ""
#: register.php:193
-msgid "Submit registration\""
+msgid "Submit registration"
msgstr ""
#: register.php:211
@@ -1344,141 +1337,145 @@ msgstr ""
msgid "Fatal Error"
msgstr "致命错误"
-#: tt-rss.php:121
+#: tt-rss.php:122
#, fuzzy
msgid "Comments?"
msgstr "内容"
-#: tt-rss.php:138
+#: tt-rss.php:130
+msgid "New version of Tiny Tiny RSS is available!"
+msgstr ""
+
+#: tt-rss.php:140
msgid "tag cloud"
msgstr "标签簇"
-#: tt-rss.php:142
+#: tt-rss.php:144
#, fuzzy
msgid "More feeds..."
msgstr "移除feed中..."
-#: tt-rss.php:153
+#: tt-rss.php:155
#, fuzzy
msgid "Search..."
msgstr "搜索"
-#: tt-rss.php:156
+#: tt-rss.php:158
msgid "Feed actions:"
msgstr "Feed 操作:"
-#: tt-rss.php:157
+#: tt-rss.php:159
#, fuzzy
msgid "Subscribe to feed..."
msgstr "订阅feed"
-#: tt-rss.php:158
+#: tt-rss.php:160
#, fuzzy
msgid "Edit this feed..."
msgstr "输入feed"
-#: tt-rss.php:159
+#: tt-rss.php:161
#, fuzzy
msgid "Clear articles"
msgstr "过滤文章"
-#: tt-rss.php:160
+#: tt-rss.php:162
#, fuzzy
msgid "Rescore feed"
msgstr "移除feed中..."
-#: tt-rss.php:161 modules/pref-feeds.php:397 modules/pref-feeds.php:1402
+#: tt-rss.php:163 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
msgid "Unsubscribe"
msgstr "退订"
-#: tt-rss.php:163
+#: tt-rss.php:165
msgid "All feeds:"
msgstr "所有feed:"
-#: tt-rss.php:165 help/3.php:44
+#: tt-rss.php:167 help/3.php:44
#, fuzzy
msgid "(Un)hide read feeds"
msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
-#: tt-rss.php:167
+#: tt-rss.php:169
msgid "Other actions:"
msgstr "其他操作:"
-#: tt-rss.php:170
+#: tt-rss.php:172
#, fuzzy
msgid "Create filter..."
msgstr "创建过滤器"
-#: tt-rss.php:171
+#: tt-rss.php:173
#, fuzzy
msgid "Reset UI layout"
msgstr "&nbsp;&nbsp;订阅feed"
-#: tt-rss.php:172
+#: tt-rss.php:174
#, fuzzy
msgid "Reset category order"
msgstr "移除选定分类?"
-#: tt-rss.php:174
+#: tt-rss.php:176
#, fuzzy
msgid "&nbsp;&nbsp;Keyboard shortcuts"
msgstr "&nbsp;&nbsp;创建过滤器"
-#: tt-rss.php:182
+#: tt-rss.php:184
#, fuzzy
msgid "Collapse feedlist"
msgstr "隐藏我的Feed列表"
-#: tt-rss.php:184
+#: tt-rss.php:186
msgid "Toggle Feedlist"
msgstr ""
-#: tt-rss.php:192 mobile/functions.php:738
+#: tt-rss.php:194 mobile/functions.php:738
msgid "Search:"
msgstr "搜索:"
-#: tt-rss.php:200 mobile/functions.php:456
+#: tt-rss.php:202 mobile/functions.php:456
msgid "Adaptive"
msgstr "自适应"
-#: tt-rss.php:201 mobile/functions.php:457
+#: tt-rss.php:203 mobile/functions.php:457
msgid "All Articles"
msgstr "所有文章"
-#: tt-rss.php:204
+#: tt-rss.php:206
msgid "Ignore Scoring"
msgstr ""
-#: tt-rss.php:205 modules/pref-feeds.php:1247 modules/pref-feeds.php:1310
+#: tt-rss.php:207 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
#: mobile/functions.php:501 mobile/functions.php:504
msgid "Updated"
msgstr "已更新"
-#: tt-rss.php:208
+#: tt-rss.php:210
#, fuzzy
msgid "Order:"
msgstr "地点:"
-#: tt-rss.php:212 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:214 modules/popup-dialog.php:250 modules/pref-filters.php:51
#: modules/pref-filters.php:443
#, fuzzy
msgid "Date"
msgstr "更新"
-#: tt-rss.php:214
+#: tt-rss.php:216
msgid "Score"
msgstr ""
-#: tt-rss.php:218
+#: tt-rss.php:220
msgid "Limit:"
msgstr "限制:"
-#: tt-rss.php:243 modules/pref-feeds.php:261 modules/pref-feeds.php:458
+#: tt-rss.php:245 modules/pref-feeds.php:236 modules/pref-feeds.php:433
#: mobile/functions.php:436
msgid "Update"
msgstr "更新"
-#: tt-rss.php:261
+#: tt-rss.php:263
msgid "Drag me to resize panels"
msgstr ""
@@ -1539,6 +1536,11 @@ msgstr ""
"完成。完成 <b>%d</b> 更新(s) schema\n"
"\t\t\t版本 <b>%d</b>."
+#: modules/help.php:6
+#, fuzzy
+msgid "Help"
+msgstr "你好,"
+
#: modules/help.php:17
msgid "Help topic not found."
msgstr "未找到帮助主题。"
@@ -1577,62 +1579,67 @@ msgstr "错误:未找到body元素"
msgid "Notice"
msgstr "公告"
-#: modules/popup-dialog.php:12
+#: modules/popup-dialog.php:14
+#, fuzzy
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."
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
msgstr ""
"您已经设置后台更新程序,但是\n"
"\t\t\t\t\t该进程未运行, 当所有feed不能更新时,请\n"
"\t\t\t\t\t开始更新程序或检查设置。"
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
msgid "Last update:"
msgstr ""
#: modules/popup-dialog.php:26
+#, fuzzy
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."
+"You are running the latest version of Tiny Tiny RSS. The fact that you are "
+"seeing this dialog is probably a bug."
msgstr ""
"您正使用最新版本的Tiny Tiny RSS.实际上,您看到的这个对话框,可能是一个BUG,呵"
"呵。 "
-#: modules/popup-dialog.php:35
+#: modules/popup-dialog.php:34
+#, fuzzy
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."
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
msgstr "TT-RSS检测到更新时间过长,请刷新或者检查RSS源地址。"
+#: modules/popup-dialog.php:48
+msgid "Visit official site"
+msgstr ""
+
#: modules/popup-dialog.php:61
#, fuzzy
msgid "Subscribe to Feed"
msgstr "订阅feed"
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:422 modules/pref-filters.php:403
+#: modules/popup-dialog.php:70 modules/pref-feeds.php:140
+#: modules/pref-feeds.php:397 modules/pref-filters.php:403
msgid "Feed"
msgstr "Feed"
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:181
-#: modules/pref-feeds.php:436
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:156
+#: modules/pref-feeds.php:411
#, fuzzy
msgid "URL:"
msgstr "Feed URL:"
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:193
-#: modules/pref-feeds.php:448
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:168
+#: modules/pref-feeds.php:423
#, fuzzy
msgid "Place in category:"
msgstr "保存分类..."
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:297
-#: modules/pref-feeds.php:492 modules/pref-prefs.php:264
-#: modules/pref-users.php:149
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:272
+#: modules/pref-feeds.php:467 modules/pref-prefs.php:262
+#: modules/pref-users.php:142
msgid "Authentication"
msgstr "认证"
@@ -1640,23 +1647,22 @@ msgstr "认证"
msgid "This feed requires authentication."
msgstr "这个feed需要认证"
-#: modules/popup-dialog.php:130 modules/pref-feed-browser.php:166
-#: modules/pref-feeds.php:128
+#: modules/popup-dialog.php:130 modules/pref-feeds.php:103
msgid "Subscribe"
msgstr "订阅"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:130 modules/pref-feeds.php:402
-#: modules/pref-feeds.php:556 modules/pref-filters.php:166
-#: modules/pref-users.php:184
+#: modules/pref-feeds.php:105 modules/pref-feeds.php:377
+#: modules/pref-feeds.php:531 modules/pref-filters.php:166
+#: modules/pref-users.php:183
msgid "Cancel"
msgstr "取消"
#: modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feed-browser.php:125
-#: modules/pref-feeds.php:1143 modules/pref-filters.php:307
-#: modules/pref-labels.php:105 modules/pref-users.php:364
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:78
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-labels.php:96 modules/pref-users.php:363
#: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
#: mobile/functions.php:783
msgid "Search"
@@ -1728,9 +1734,9 @@ msgstr "完成更新"
msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:315
-#: modules/pref-feeds.php:510 modules/pref-filters.php:123
-#: modules/pref-users.php:165
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:290
+#: modules/pref-feeds.php:485 modules/pref-filters.php:123
+#: modules/pref-users.php:164
#, fuzzy
msgid "Options"
msgstr "选项:"
@@ -1767,9 +1773,9 @@ msgstr "编辑标签"
msgid "Tags for this article (separated by commas):"
msgstr "本文的标签,请用逗号分开:"
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:400
-#: modules/pref-feeds.php:554 modules/pref-filters.php:162
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:375
+#: modules/pref-feeds.php:529 modules/pref-filters.php:162
+#: modules/pref-users.php:180
msgid "Save"
msgstr "保存"
@@ -1785,47 +1791,6 @@ msgstr "显示最热标签"
msgid "browse more"
msgstr "浏览更多"
-#: modules/pref-feed-browser.php:5 modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr "Feed 浏览器有限制"
-
-#: modules/pref-feed-browser.php:15
-msgid "Feed information:"
-msgstr "Feed 信息:"
-
-#: modules/pref-feed-browser.php:39
-#, fuzzy
-msgid "Site:"
-msgstr "标题:"
-
-#: modules/pref-feed-browser.php:41
-#, fuzzy
-msgid "Last updated:"
-msgstr "已更新"
-
-#: modules/pref-feed-browser.php:56
-msgid "Last headlines:"
-msgstr "最新提要:"
-
-#: modules/pref-feed-browser.php:112
-msgid ""
-"Feed browser cache information is missing. Please refer to the <a "
-"class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-"FeedBrowser'>wiki</a> for more information."
-msgstr ""
-
-#: modules/pref-feed-browser.php:129
-msgid "Top"
-msgstr "Top"
-
-#: modules/pref-feed-browser.php:138
-msgid "Show"
-msgstr "显示"
-
-#: modules/pref-feed-browser.php:222
-msgid "Couldn't find any feeds available for subscription."
-msgstr ""
-
#: modules/pref-feeds.php:4
msgid "Check to enable field"
msgstr ""
@@ -1834,217 +1799,240 @@ msgstr ""
msgid "Subscribed to feeds:"
msgstr "订阅feed:"
+#: modules/pref-feeds.php:59
+msgid "Feed browser is administratively disabled."
+msgstr "Feed 浏览器有限制"
+
#: modules/pref-feeds.php:63
-msgid "Other feeds: Top 25"
-msgstr " 其他feed: Top 25"
+#, fuzzy
+msgid "Feed Browser"
+msgstr "Feed编辑"
-#: modules/pref-feeds.php:67
-msgid "Showing top 25 registered feeds, sorted by popularity:"
-msgstr "显示按受欢迎度排序的25个注册feed:"
+#: modules/pref-feeds.php:81
+msgid "Top"
+msgstr "Top"
-#: modules/pref-feeds.php:117
-#, fuzzy
-msgid "No feeds found."
-msgstr "无feed可订阅。"
+#: modules/pref-feeds.php:90
+msgid "Show"
+msgstr "显示"
-#: modules/pref-feeds.php:155
+#: modules/pref-feeds.php:130
#, fuzzy
msgid "Feed Editor"
msgstr "Feed编辑"
-#: modules/pref-feeds.php:210
+#: modules/pref-feeds.php:185
#, fuzzy
msgid "Link to feed:"
msgstr "链接:"
-#: modules/pref-feeds.php:227
+#: modules/pref-feeds.php:202
msgid "Not linked"
msgstr "无链接"
-#: modules/pref-feeds.php:275 modules/pref-feeds.php:471
+#: modules/pref-feeds.php:250 modules/pref-feeds.php:446
msgid "using"
msgstr ""
-#: modules/pref-feeds.php:287 modules/pref-feeds.php:483
+#: modules/pref-feeds.php:262 modules/pref-feeds.php:458
msgid "Article purging:"
msgstr "文章清理:"
-#: modules/pref-feeds.php:329 modules/pref-feeds.php:516
+#: modules/pref-feeds.php:304 modules/pref-feeds.php:491
msgid "Hide from \"Other Feeds\""
msgstr "隐藏\"其他 Feed\""
-#: modules/pref-feeds.php:340 modules/pref-feeds.php:521
+#: modules/pref-feeds.php:315 modules/pref-feeds.php:496
msgid "Right-to-left content"
msgstr "由右-左阅读习惯"
-#: modules/pref-feeds.php:351 modules/pref-feeds.php:526
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:501
msgid "Hide from my feed list"
msgstr "隐藏我的Feed列表"
-#: modules/pref-feeds.php:363 modules/pref-feeds.php:532
+#: modules/pref-feeds.php:338 modules/pref-feeds.php:507
msgid "Include in e-mail digest"
msgstr "包括电子邮件文摘"
-#: modules/pref-feeds.php:384 modules/pref-feeds.php:540
+#: modules/pref-feeds.php:359 modules/pref-feeds.php:515
msgid "Cache images locally"
msgstr ""
-#: modules/pref-feeds.php:412
+#: modules/pref-feeds.php:387
#, fuzzy
msgid "Multiple Feed Editor"
msgstr "Feed编辑"
-#: modules/pref-feeds.php:784 modules/pref-feeds.php:831
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:862
+#: modules/pref-feeds.php:836
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "订阅到 <b>%s</b>."
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:838
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "已经订阅到 <b>%s</b>."
-#: modules/pref-feeds.php:965
+#: modules/pref-feeds.php:860
+msgid "Edit subscription options"
+msgstr ""
+
+#: modules/pref-feeds.php:946
msgid "Category editor"
msgstr "分类编辑"
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:969
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "分类 <b>$%s</b>已经存在."
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:997
msgid "Unable to delete non empty feed categories."
msgstr "不能删除非空分类。"
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1014
msgid "Create category"
msgstr "创建分类"
-#: modules/pref-feeds.php:1093
+#: modules/pref-feeds.php:1074
msgid "No feed categories defined."
msgstr "未定义feed分类"
-#: modules/pref-feeds.php:1104 modules/pref-filters.php:156
-#: modules/pref-filters.php:487 modules/pref-labels.php:178
-#: modules/pref-users.php:481
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:169
+#: modules/pref-users.php:474
msgid "Remove"
msgstr "移除"
-#: modules/pref-feeds.php:1126
+#: modules/pref-feeds.php:1107
msgid "Some feeds have update errors (click for details)"
msgstr "有些feed更新错误(点击了解详情) "
-#: modules/pref-feeds.php:1148 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
msgid "Subscribe to feed"
msgstr "订阅feed"
-#: modules/pref-feeds.php:1153
-msgid "Top 25"
-msgstr "Top 25"
+#: modules/pref-feeds.php:1134
+#, fuzzy
+msgid "More Feeds"
+msgstr "移除feed中..."
-#: modules/pref-feeds.php:1227
+#: modules/pref-feeds.php:1208
msgid "Show last article times"
msgstr "显示最近文章时间"
-#: modules/pref-feeds.php:1244 modules/pref-feeds.php:1306
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
msgid "Last&nbsp;Article"
msgstr "最后&nbsp;文章"
-#: modules/pref-feeds.php:1331 modules/pref-filters.php:461
-#: modules/pref-users.php:456
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:461
+#: modules/pref-users.php:449
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1377 modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1320
+msgid "(Hidden)"
+msgstr ""
+
+#: modules/pref-feeds.php:1333
+#, php-format
+msgid "(linked to %s)"
+msgstr ""
+
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
#, fuzzy
msgid "Selection:"
msgstr "选择:"
-#: modules/pref-feeds.php:1383
+#: modules/pref-feeds.php:1365
msgid "Recategorize"
msgstr "再分类"
-#: modules/pref-feeds.php:1392 modules/pref-filters.php:485
-#: modules/pref-users.php:479
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:485
+#: modules/pref-users.php:472
msgid "Edit"
msgstr "编辑"
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1378
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1382
#, fuzzy
msgid "Clear feed data"
msgstr "所有Feed已更新。"
-#: modules/pref-feeds.php:1401 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
#, fuzzy
msgid "Rescore articles"
msgstr "星级文章"
-#: modules/pref-feeds.php:1407
+#: modules/pref-feeds.php:1389
#, fuzzy
msgid "Other:"
msgstr "地点:"
-#: modules/pref-feeds.php:1408
+#: modules/pref-feeds.php:1390
msgid "Edit categories"
msgstr "编辑分类"
-#: modules/pref-feeds.php:1415
+#: modules/pref-feeds.php:1397
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1401
#, fuzzy
msgid "File:"
msgstr "标题:"
-#: modules/pref-feeds.php:1422
+#: modules/pref-feeds.php:1404
msgid "Import"
msgstr "导入"
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1411
msgid "Export OPML"
msgstr "导出OPML"
-#: modules/pref-feeds.php:1432
+#: modules/pref-feeds.php:1414
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1434
+#: modules/pref-feeds.php:1416
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1420
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1429
#, fuzzy
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
msgstr "本站文章作为一个公开的RSS源,可以被大众订阅。"
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1433
#, fuzzy
msgid "Link to published articles feed."
msgstr "已发布文章"
-#: modules/pref-feeds.php:1454
+#: modules/pref-feeds.php:1436
#, fuzzy
msgid "Generate another link"
msgstr "生成另一个地址"
+#: modules/pref-feeds.php:1502
+#, fuzzy
+msgid "No feeds found."
+msgstr "无feed可订阅。"
+
#: modules/pref-filters.php:23
#, fuzzy
msgid "Filter Editor"
@@ -2100,20 +2088,20 @@ msgstr "未定义过滤器。"
msgid "No matching filters found."
msgstr "未找到文章。"
-#: modules/pref-labels.php:75
+#: modules/pref-labels.php:66
#, php-format
msgid "Created label <b>%s</b>"
msgstr "创建标记 <b>%s</b>"
-#: modules/pref-labels.php:113 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:104 help/3.php:30 help/4.php:26
msgid "Create label"
msgstr "创建标记"
-#: modules/pref-labels.php:184
+#: modules/pref-labels.php:175
msgid "No labels defined."
msgstr "未定义标记."
-#: modules/pref-labels.php:186
+#: modules/pref-labels.php:177
#, fuzzy
msgid "No matching labels found."
msgstr "未找到文章。"
@@ -2130,84 +2118,89 @@ msgstr "原密码错误."
msgid "The configuration was saved."
msgstr "设置已保存."
+#: modules/pref-prefs.php:132
+#, php-format
+msgid "Unknown option: %s"
+msgstr ""
+
#: modules/pref-prefs.php:143
#, fuzzy
msgid "E-mail has been changed."
msgstr "密码已更改."
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:215
+#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
msgid "The configuration was reset to defaults."
msgstr "设置重置为默认"
-#: modules/pref-prefs.php:200
+#: modules/pref-prefs.php:198
msgid ""
"Your password is at default value, \n"
"\t\t\t\t\t\tplease change it."
msgstr "您的密码是默认的,请修改。"
-#: modules/pref-prefs.php:227
+#: modules/pref-prefs.php:225
msgid "Personal data"
msgstr "个人数据"
-#: modules/pref-prefs.php:234
+#: modules/pref-prefs.php:232
#, fuzzy
msgid "E-mail"
msgstr "E-mail:"
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
#, fuzzy
msgid "Access level"
msgstr "等级:"
-#: modules/pref-prefs.php:258
+#: modules/pref-prefs.php:256
msgid "Change e-mail"
msgstr "更改 e-mail"
-#: modules/pref-prefs.php:266
+#: modules/pref-prefs.php:264
msgid "Old password"
msgstr "原密码"
-#: modules/pref-prefs.php:273
+#: modules/pref-prefs.php:271
msgid "New password"
msgstr "新密码"
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:279
msgid "Confirm password"
msgstr "验证密码"
-#: modules/pref-prefs.php:298
+#: modules/pref-prefs.php:296
msgid "Change password"
msgstr "更改密码"
-#: modules/pref-prefs.php:314
+#: modules/pref-prefs.php:312
msgid "Themes"
msgstr "模板"
-#: modules/pref-prefs.php:315
+#: modules/pref-prefs.php:313
msgid "Select theme"
msgstr "选择模板"
-#: modules/pref-prefs.php:333
+#: modules/pref-prefs.php:331
msgid "Change theme"
msgstr "更改模板"
-#: modules/pref-prefs.php:390
+#: modules/pref-prefs.php:388
msgid "short_desc"
msgstr "short_desc"
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
msgid "Yes"
msgstr "是"
-#: modules/pref-prefs.php:404 modules/pref-prefs.php:407
+#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
msgid "No"
msgstr "否"
-#: modules/pref-prefs.php:429
+#: modules/pref-prefs.php:427
msgid "Save configuration"
msgstr "保存设置"
-#: modules/pref-prefs.php:433
+#: modules/pref-prefs.php:431
msgid "Reset to defaults"
msgstr "恢复到默认?"
@@ -2216,66 +2209,75 @@ msgstr "恢复到默认?"
msgid "Your access level is insufficient to open this tab."
msgstr "权限不足。"
-#: modules/pref-users.php:54 modules/pref-users.php:417
+#: modules/pref-users.php:17 modules/pref-users.php:470
+msgid "User details"
+msgstr "用户详细"
+
+#: modules/pref-users.php:31
+#, fuzzy
+msgid "User not found"
+msgstr "未找到Feed."
+
+#: modules/pref-users.php:50 modules/pref-users.php:410
msgid "Registered"
msgstr ""
-#: modules/pref-users.php:55
+#: modules/pref-users.php:51
#, fuzzy
msgid "Last logged in"
msgstr "最后登陆"
-#: modules/pref-users.php:72
+#: modules/pref-users.php:58
#, fuzzy
msgid "Subscribed feeds count"
msgstr "订阅feed:"
-#: modules/pref-users.php:76
+#: modules/pref-users.php:62
#, fuzzy
msgid "Subscribed feeds"
msgstr "订阅feed:"
-#: modules/pref-users.php:122
+#: modules/pref-users.php:108
#, fuzzy
msgid "User Editor"
msgstr "用户编辑"
-#: modules/pref-users.php:152
+#: modules/pref-users.php:145
#, fuzzy
msgid "Access level: "
msgstr "等级:"
-#: modules/pref-users.php:159
+#: modules/pref-users.php:158
#, fuzzy
msgid "Change password to"
msgstr "更改密码"
-#: modules/pref-users.php:168
+#: modules/pref-users.php:167
#, fuzzy
msgid "E-mail: "
msgstr "E-mail:"
-#: modules/pref-users.php:204
+#: modules/pref-users.php:203
#, php-format
msgid "Changed password of user <b>%s</b>."
msgstr "更改用<b>%s</b>密码"
-#: modules/pref-users.php:252
+#: modules/pref-users.php:251
#, php-format
msgid "Added user <b>%s</b> with password <b>%s</b>"
msgstr "添加用 <b>%s</b> ,密码为<b>%s</b>"
-#: modules/pref-users.php:259
+#: modules/pref-users.php:258
#, php-format
msgid "Could not create user <b>%s</b>"
msgstr "创建用户 <b>%s</b> 失败"
-#: modules/pref-users.php:263
+#: modules/pref-users.php:262
#, php-format
msgid "User <b>%s</b> already exists."
msgstr "用户 <b>%s</b> 已存在。"
-#: modules/pref-users.php:283
+#: modules/pref-users.php:282
#, php-format
msgid ""
"Changed password of user <b>%s</b>\n"
@@ -2284,45 +2286,41 @@ msgstr ""
"更改用户 <b>%s</b>\n"
"\t\t\t\t\t 的密码为 <b>%s</b>"
-#: modules/pref-users.php:287
+#: modules/pref-users.php:286
#, fuzzy, php-format
msgid "Notifying <b>%s</b>."
msgstr "添加分类 <b>%s</b>."
-#: modules/pref-users.php:324
+#: modules/pref-users.php:323
msgid "[tt-rss] Password change notification"
msgstr ""
-#: modules/pref-users.php:381 help/4.php:27
+#: modules/pref-users.php:374 help/4.php:27
msgid "Create user"
msgstr "创建用户"
-#: modules/pref-users.php:415
+#: modules/pref-users.php:408
msgid "Login"
msgstr "登陆"
-#: modules/pref-users.php:416
+#: modules/pref-users.php:409
msgid "Access Level"
msgstr "等级:"
-#: modules/pref-users.php:418
+#: modules/pref-users.php:411
msgid "Last login"
msgstr "最后登陆"
-#: modules/pref-users.php:477
-msgid "User details"
-msgstr "用户详细"
-
-#: modules/pref-users.php:483
+#: modules/pref-users.php:476
msgid "Reset password"
msgstr "重置密码"
-#: modules/pref-users.php:488
+#: modules/pref-users.php:481
#, fuzzy
msgid "No users defined."
msgstr "未定义过滤器。"
-#: modules/pref-users.php:490
+#: modules/pref-users.php:483
#, fuzzy
msgid "No matching users found."
msgstr "未找到文章。"
@@ -2500,17 +2498,9 @@ msgstr ""
msgid "Press any key to close this window."
msgstr "关闭此窗口"
-#: help/4.php:11
-msgid "Content Filtering"
-msgstr "内容过滤器"
-
-#: help/4.php:12
-msgid "Label Editor"
-msgstr "标记编辑"
-
-#: help/4.php:13
-msgid "User Manager"
-msgstr "用户管理"
+#: help/4.php:10
+msgid "Other Feeds"
+msgstr "其他feed"
#: help/4.php:19
#, fuzzy
@@ -2584,6 +2574,44 @@ msgstr "匹配:"
msgid "Internal error: Function not implemented"
msgstr ""
+#~ msgid "Unknown Error"
+#~ msgstr "未知错误"
+
+#~ msgid "Published Articles"
+#~ msgstr "已发布文章"
+
+#~ msgid "Feed information:"
+#~ msgstr "Feed 信息:"
+
+#, fuzzy
+#~ msgid "Site:"
+#~ msgstr "标题:"
+
+#, fuzzy
+#~ msgid "Last updated:"
+#~ msgstr "已更新"
+
+#~ msgid "Last headlines:"
+#~ msgstr "最新提要:"
+
+#~ msgid "Other feeds: Top 25"
+#~ msgstr " 其他feed: Top 25"
+
+#~ msgid "Showing top 25 registered feeds, sorted by popularity:"
+#~ msgstr "显示按受欢迎度排序的25个注册feed:"
+
+#~ msgid "Top 25"
+#~ msgstr "Top 25"
+
+#~ msgid "Content Filtering"
+#~ msgstr "内容过滤器"
+
+#~ msgid "Label Editor"
+#~ msgstr "标记编辑"
+
+#~ msgid "User Manager"
+#~ msgstr "用户管理"
+
#~ msgid "Toggle:"
#~ msgstr "触发:"
@@ -2657,10 +2685,6 @@ msgstr ""
#~ msgid "Match SQL"
#~ msgstr "匹配"
-#, fuzzy
-#~ msgid "Help"
-#~ msgstr "你好,"
-
#~ msgid "Saved label <b>%s</b>"
#~ msgstr "已保存标记<b>%s</b>"